diff --git a/src/app/core/submission/models/edititem.model.ts b/src/app/core/submission/models/edititem.model.ts deleted file mode 100644 index 9c8da2ab5a..0000000000 --- a/src/app/core/submission/models/edititem.model.ts +++ /dev/null @@ -1,4 +0,0 @@ -import { Workspaceitem } from './workspaceitem.model'; - -export class EditItem extends Workspaceitem { -} diff --git a/src/app/core/submission/models/normalized-edititem.model.ts b/src/app/core/submission/models/normalized-edititem.model.ts deleted file mode 100644 index 5615512399..0000000000 --- a/src/app/core/submission/models/normalized-edititem.model.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { inheritSerialization } from 'cerialize'; -import { mapsTo } from '../../cache/builders/build-decorators'; -import { NormalizedSubmissionObject } from './normalized-submission-object.model'; -import { EditItem } from './edititem.model'; - -@mapsTo(EditItem) -@inheritSerialization(NormalizedSubmissionObject) -export class NormalizedEditItem extends NormalizedSubmissionObject { - -} diff --git a/src/app/core/submission/submission-resource-type.ts b/src/app/core/submission/submission-resource-type.ts index 8718fc55d3..f5b8e2c423 100644 --- a/src/app/core/submission/submission-resource-type.ts +++ b/src/app/core/submission/submission-resource-type.ts @@ -11,7 +11,6 @@ export enum SubmissionResourceType { Group = 'group', WorkspaceItem = 'workspaceitem', WorkflowItem = 'workflowitem', - EditItem = 'edititem', SubmissionDefinitions = 'submissiondefinitions', SubmissionDefinition = 'submissiondefinition', SubmissionForm = 'submissionform', diff --git a/src/app/core/submission/submission-response-parsing.service.ts b/src/app/core/submission/submission-response-parsing.service.ts index d793b90e56..20dfb43cbd 100644 --- a/src/app/core/submission/submission-response-parsing.service.ts +++ b/src/app/core/submission/submission-response-parsing.service.ts @@ -13,7 +13,6 @@ import { ObjectCacheService } from '../cache/object-cache.service'; import { SubmissionResourceType } from './submission-resource-type'; import { NormalizedWorkspaceItem } from './models/normalized-workspaceitem.model'; import { NormalizedWorkflowItem } from './models/normalized-workflowitem.model'; -import { NormalizedEditItem } from './models/normalized-edititem.model'; import { FormFieldMetadataValueObject } from '../../shared/form/builder/models/form-field-metadata-value.model'; import { SubmissionObject } from './models/submission-object.model'; import { NormalizedObjectFactory } from '../cache/models/normalized-object-factory'; @@ -127,8 +126,7 @@ export class SubmissionResponseParsingService extends BaseResponseParsingService let normalizedItem = Object.assign({}, item); // In case data is an Instance of NormalizedWorkspaceItem normalize field value of all the section of type form if (item instanceof NormalizedWorkspaceItem - || item instanceof NormalizedWorkflowItem - || item instanceof NormalizedEditItem) { + || item instanceof NormalizedWorkflowItem) { if (item.sections) { const precessedSection = Object.create({}); // Iterate over all workspaceitem's sections diff --git a/src/app/core/submission/submission-scope-type.ts b/src/app/core/submission/submission-scope-type.ts index 80d57c853f..6ed32d3b4e 100644 --- a/src/app/core/submission/submission-scope-type.ts +++ b/src/app/core/submission/submission-scope-type.ts @@ -1,5 +1,4 @@ export enum SubmissionScopeType { WorkspaceItem = 'WORKSPACE', - WorkflowItem = 'WORKFLOW', - EditItem = 'ITEM', + WorkflowItem = 'WORKFLOW' } diff --git a/src/app/submission/submission.service.spec.ts b/src/app/submission/submission.service.spec.ts index a35cf8329c..d764f09538 100644 --- a/src/app/submission/submission.service.spec.ts +++ b/src/app/submission/submission.service.spec.ts @@ -660,9 +660,6 @@ describe('SubmissionService test suite', () => { router.setRoute('/workflowitems/826/edit'); expect(service.getSubmissionScope()).toBe(expected); - expected = SubmissionScopeType.EditItem; - router.setRoute('/items/9e79b1f2-ae0f-4737-9a4b-990952a8857c/edit'); - expect(service.getSubmissionScope()).toBe(expected); }); }); diff --git a/src/app/submission/submission.service.ts b/src/app/submission/submission.service.ts index 11b26e2b5e..82185a8eae 100644 --- a/src/app/submission/submission.service.ts +++ b/src/app/submission/submission.service.ts @@ -65,7 +65,7 @@ export class SubmissionService { * @param {GlobalConfig} EnvConfig * @param {NotificationsService} notificationsService * @param {SubmissionRestService} restService - * @param {Router} restSerroutervice + * @param {Router} router * @param {RouteService} routeService * @param {Store} store * @param {TranslateService} translate @@ -202,6 +202,8 @@ export class SubmissionService { * * @param submissionId * The submission id + * @param sectionId + * The section id */ dispatchSaveSection(submissionId, sectionId) { this.store.dispatch(new SaveSubmissionSectionFormAction(submissionId, sectionId)); @@ -327,9 +329,6 @@ export class SubmissionService { case 'workflowitems': scope = SubmissionScopeType.WorkflowItem; break; - case 'edititems': - scope = SubmissionScopeType.EditItem; - break; } return scope; } @@ -400,8 +399,8 @@ export class SubmissionService { /** * Return the visibility status of the specified section * - * @param submissionId - * The submission id + * @param sectionData + * The section data * @return boolean * true if section is hidden, false otherwise */ @@ -432,6 +431,8 @@ export class SubmissionService { * The submission id * @param sectionId * The section id + * @param sectionType + * The section type */ notifyNewSection(submissionId: string, sectionId: string, sectionType?: SectionsType) { const m = this.translate.instant('submission.sections.general.metadata-extracted-new-section', { sectionId });