diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts index 711e200c3f..172644c08f 100644 --- a/src/app/core/core.module.ts +++ b/src/app/core/core.module.ts @@ -24,7 +24,7 @@ import { DSOResponseParsingService } from './data/dso-response-parsing.service'; import { SearchResponseParsingService } from './data/search-response-parsing.service'; import { DSpaceRESTv2Service } from './dspace-rest-v2/dspace-rest-v2.service'; import { FormBuilderService } from '../shared/form/builder/form-builder.service'; -import { FormOperationsService } from '../submission/sections/form/form-operations.service'; +import { SectionFormOperationsService } from '../submission/sections/form/section-form-operations.service'; import { FormService } from '../shared/form/form.service'; import { GroupEpersonService } from './eperson/group-eperson.service'; import { HostWindowService } from '../shared/host-window.service'; @@ -104,7 +104,7 @@ const PROVIDERS = [ DynamicFormService, DynamicFormValidationService, FormBuilderService, - FormOperationsService, + SectionFormOperationsService, FormService, EpersonResponseParsingService, GroupEpersonService, diff --git a/src/app/shared/mocks/mock-form-operations-service.ts b/src/app/shared/mocks/mock-form-operations-service.ts index 910e309251..ce8ca6d4e5 100644 --- a/src/app/shared/mocks/mock-form-operations-service.ts +++ b/src/app/shared/mocks/mock-form-operations-service.ts @@ -1,7 +1,7 @@ -import { FormOperationsService } from '../../submission/sections/form/form-operations.service'; +import { SectionFormOperationsService } from '../../submission/sections/form/section-form-operations.service'; -export function getMockFormOperationsService(): FormOperationsService { - return jasmine.createSpyObj('FormOperationsService', { +export function getMockFormOperationsService(): SectionFormOperationsService { + return jasmine.createSpyObj('SectionFormOperationsService', { dispatchOperationsFromEvent: jasmine.createSpy('dispatchOperationsFromEvent'), getArrayIndexFromEvent: jasmine.createSpy('getArrayIndexFromEvent'), isPartOfArrayOfGroup: jasmine.createSpy('isPartOfArrayOfGroup'), diff --git a/src/app/submission/sections/form/form-operations.service.ts b/src/app/submission/sections/form/section-form-operations.service.ts similarity index 99% rename from src/app/submission/sections/form/form-operations.service.ts rename to src/app/submission/sections/form/section-form-operations.service.ts index b024f3226d..6423c559a5 100644 --- a/src/app/submission/sections/form/form-operations.service.ts +++ b/src/app/submission/sections/form/section-form-operations.service.ts @@ -22,7 +22,7 @@ import { DynamicQualdropModel } from '../../../shared/form/builder/ds-dynamic-fo import { DynamicRelationGroupModel } from '../../../shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.model'; @Injectable() -export class FormOperationsService { +export class SectionFormOperationsService { constructor(private formBuilder: FormBuilderService, private operationsBuilder: JsonPatchOperationsBuilder) { } diff --git a/src/app/submission/sections/form/section-form.component.spec.ts b/src/app/submission/sections/form/section-form.component.spec.ts index 30f93772ce..ff134c620a 100644 --- a/src/app/submission/sections/form/section-form.component.spec.ts +++ b/src/app/submission/sections/form/section-form.component.spec.ts @@ -16,7 +16,7 @@ import { FormSectionComponent } from './section-form.component'; import { FormBuilderService } from '../../../shared/form/builder/form-builder.service'; import { getMockFormBuilderService } from '../../../shared/mocks/mock-form-builder-service'; import { getMockFormOperationsService } from '../../../shared/mocks/mock-form-operations-service'; -import { FormOperationsService } from './form-operations.service'; +import { SectionFormOperationsService } from './section-form-operations.service'; import { getMockFormService } from '../../../shared/mocks/mock-form-service'; import { FormService } from '../../../shared/form/form.service'; import { SubmissionFormsConfigService } from '../../../core/config/submission-forms-config.service'; @@ -168,7 +168,7 @@ describe('FormSectionComponent test suite', () => { ], providers: [ { provide: FormBuilderService, useValue: getMockFormBuilderService() }, - { provide: FormOperationsService, useValue: getMockFormOperationsService() }, + { provide: SectionFormOperationsService, useValue: getMockFormOperationsService() }, { provide: FormService, useValue: getMockFormService() }, { provide: SubmissionFormsConfigService, useValue: getMockSubmissionFormsConfigService() }, { provide: NotificationsService, useClass: NotificationsServiceStub }, @@ -220,7 +220,7 @@ describe('FormSectionComponent test suite', () => { formService = TestBed.get(FormService); formConfigService = TestBed.get(SubmissionFormsConfigService); formBuilderService = TestBed.get(FormBuilderService); - formOperationsService = TestBed.get(FormOperationsService); + formOperationsService = TestBed.get(SectionFormOperationsService); translateService = TestBed.get(TranslateService); notificationsServiceStub = TestBed.get(NotificationsService); diff --git a/src/app/submission/sections/form/section-form.component.ts b/src/app/submission/sections/form/section-form.component.ts index dbe8832479..56ba30cb04 100644 --- a/src/app/submission/sections/form/section-form.component.ts +++ b/src/app/submission/sections/form/section-form.component.ts @@ -24,7 +24,7 @@ import { SectionDataObject } from '../models/section-data.model'; import { renderSectionFor } from '../sections-decorator'; import { SectionsType } from '../sections-type'; import { SubmissionService } from '../../submission.service'; -import { FormOperationsService } from './form-operations.service'; +import { SectionFormOperationsService } from './section-form-operations.service'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { SectionsService } from '../sections.service'; import { difference } from '../../../shared/object.util'; @@ -52,7 +52,7 @@ export class FormSectionComponent extends SectionModelComponent { constructor(protected cdr: ChangeDetectorRef, protected formBuilderService: FormBuilderService, - protected formOperationsService: FormOperationsService, + protected formOperationsService: SectionFormOperationsService, protected formService: FormService, protected formConfigService: SubmissionFormsConfigService, protected notificationsService: NotificationsService, diff --git a/src/app/submission/sections/license/section-license.component.ts b/src/app/submission/sections/license/section-license.component.ts index 4c322f49ae..55159b842d 100644 --- a/src/app/submission/sections/license/section-license.component.ts +++ b/src/app/submission/sections/license/section-license.component.ts @@ -26,7 +26,7 @@ import { SectionDataObject } from '../models/section-data.model'; import { WorkspaceitemSectionLicenseObject } from '../../../core/submission/models/workspaceitem-section-license.model'; import { SubmissionService } from '../../submission.service'; import { SectionsService } from '../sections.service'; -import { FormOperationsService } from '../form/form-operations.service'; +import { SectionFormOperationsService } from '../form/section-form-operations.service'; import { FormComponent } from '../../../shared/form/form.component'; @Component({ @@ -51,7 +51,7 @@ export class LicenseSectionComponent extends SectionModelComponent { constructor(protected changeDetectorRef: ChangeDetectorRef, protected collectionDataService: CollectionDataService, protected formBuilderService: FormBuilderService, - protected formOperationsService: FormOperationsService, + protected formOperationsService: SectionFormOperationsService, protected formService: FormService, protected operationsBuilder: JsonPatchOperationsBuilder, protected sectionService: SectionsService,