diff --git a/src/app/core/config/config-response-parsing.service.spec.ts b/src/app/core/config/config-response-parsing.service.spec.ts index 87a7057078..50585b5e8f 100644 --- a/src/app/core/config/config-response-parsing.service.spec.ts +++ b/src/app/core/config/config-response-parsing.service.spec.ts @@ -179,6 +179,7 @@ describe('ConfigResponseParsingService', () => { Object.assign(new SubmissionDefinitionModel(), { isDefault: true, name: 'traditional', + id: 'traditional', type: 'submissiondefinition', _links: { sections: { href: 'https://rest.api/config/submissiondefinitions/traditional/sections' }, @@ -189,6 +190,7 @@ describe('ConfigResponseParsingService', () => { header: 'submit.progressbar.describe.stepone', mandatory: true, sectionType: 'submission-form', + id: 'traditionalpageone', visibility: { main: null, other: 'READONLY' @@ -203,6 +205,7 @@ describe('ConfigResponseParsingService', () => { header: 'submit.progressbar.describe.steptwo', mandatory: true, sectionType: 'submission-form', + id: 'traditionalpagetwo', visibility: { main: null, other: 'READONLY' @@ -217,6 +220,7 @@ describe('ConfigResponseParsingService', () => { header: 'submit.progressbar.upload', mandatory: false, sectionType: 'upload', + id: 'upload', visibility: { main: null, other: 'READONLY' @@ -231,6 +235,7 @@ describe('ConfigResponseParsingService', () => { header: 'submit.progressbar.license', mandatory: true, sectionType: 'license', + id: 'license', visibility: { main: null, other: 'READONLY' diff --git a/src/app/submission/objects/submission-objects.effects.spec.ts b/src/app/submission/objects/submission-objects.effects.spec.ts index 3ee370a254..5c08874e50 100644 --- a/src/app/submission/objects/submission-objects.effects.spec.ts +++ b/src/app/submission/objects/submission-objects.effects.spec.ts @@ -48,6 +48,9 @@ import { MockStore } from '../../shared/testing/mock-store'; import { AppState } from '../../app.reducer'; import parseSectionErrors from '../utils/parseSectionErrors'; import { Item } from '../../core/shared/item.model'; +import { WorkspaceitemDataService } from '../../core/submission/workspaceitem-data.service'; +import { WorkflowItemDataService } from '../../core/submission/workflowitem-data.service'; +import { HALEndpointService } from '../../core/shared/hal-endpoint.service'; describe('SubmissionObjectEffects test suite', () => { let submissionObjectEffects: SubmissionObjectEffects; @@ -84,6 +87,10 @@ describe('SubmissionObjectEffects test suite', () => { { provide: SectionsService, useClass: SectionsServiceStub }, { provide: SubmissionService, useValue: submissionServiceStub }, { provide: SubmissionJsonPatchOperationsService, useValue: submissionJsonPatchOperationsServiceStub }, + { provide: WorkspaceitemDataService, useValue: {} }, + { provide: WorkflowItemDataService, useValue: {} }, + { provide: WorkflowItemDataService, useValue: {} }, + { provide: HALEndpointService, useValue: {} }, ], }); diff --git a/src/app/submission/objects/submission-objects.effects.ts b/src/app/submission/objects/submission-objects.effects.ts index 386453c5e7..aac34ee51e 100644 --- a/src/app/submission/objects/submission-objects.effects.ts +++ b/src/app/submission/objects/submission-objects.effects.ts @@ -2,24 +2,23 @@ import { Injectable } from '@angular/core'; import { Actions, Effect, ofType } from '@ngrx/effects'; import { Store } from '@ngrx/store'; import { TranslateService } from '@ngx-translate/core'; -import { union } from 'lodash'; +import { isEqual, union } from 'lodash'; -import { from as observableFrom, Observable, of as observableOf, EMPTY as observableEmpty } from 'rxjs'; +import { from as observableFrom, Observable, of as observableOf } from 'rxjs'; import { catchError, filter, map, mergeMap, switchMap, take, tap, withLatestFrom } from 'rxjs/operators'; import { SubmissionObject } from '../../core/submission/models/submission-object.model'; import { WorkflowItem } from '../../core/submission/models/workflowitem.model'; import { WorkspaceitemSectionUploadObject } from '../../core/submission/models/workspaceitem-section-upload.model'; -import { WorkspaceitemSectionDataType, WorkspaceitemSectionsObject } from '../../core/submission/models/workspaceitem-sections.model'; +import { WorkspaceitemSectionsObject } from '../../core/submission/models/workspaceitem-sections.model'; import { WorkspaceItem } from '../../core/submission/models/workspaceitem.model'; import { SubmissionJsonPatchOperationsService } from '../../core/submission/submission-json-patch-operations.service'; -import { isEmpty, isNotEmpty, isNotUndefined, hasValue } from '../../shared/empty.util'; +import { isEmpty, isNotEmpty, isNotUndefined } from '../../shared/empty.util'; import { NotificationsService } from '../../shared/notifications/notifications.service'; import { SectionsType } from '../sections/sections-type'; import { SectionsService } from '../sections/sections.service'; import { SubmissionState } from '../submission.reducers'; import { SubmissionService } from '../submission.service'; import parseSectionErrors from '../utils/parseSectionErrors'; -import { isEqual } from 'lodash'; import { CompleteInitSubmissionFormAction, DepositSubmissionAction, @@ -46,15 +45,9 @@ import { import { SubmissionObjectEntry, SubmissionSectionObject } from './submission-objects.reducer'; import { Item } from '../../core/shared/item.model'; import { RemoteData } from '../../core/data/remote-data'; -import { - getRemoteDataPayload, - getSucceededRemoteData, - getFirstSucceededRemoteDataPayload, getAllSucceededRemoteData, getAllSucceededRemoteDataPayload -} from '../../core/shared/operators'; -import { MetadataMap, MetadataValue } from '../../core/shared/metadata.models'; +import { getFirstSucceededRemoteDataPayload } from '../../core/shared/operators'; import { SubmissionObjectDataService } from '../../core/submission/submission-object-data.service'; import { followLink } from '../../shared/utils/follow-link-config.model'; -import { ItemDataService } from '../../core/data/item-data.service'; @Injectable() export class SubmissionObjectEffects {