diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form.component.html index 5684f4eac9..8b84b592d7 100644 --- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form.component.html +++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form.component.html @@ -2,7 +2,7 @@ [formId]="formId" [group]="formGroup" [hasErrorMessaging]="model.hasErrorMessages" - [hidden]="model.hidden" + [hidden]="model.hidden"linke [layout]="formLayout" [model]="model" [ngClass]="[getClass(model, 'element', 'host'), getClass(model, 'grid', 'host')]" diff --git a/src/app/shared/testing/submission-service.stub.ts b/src/app/shared/testing/submission-service.stub.ts index 93192371c6..d9d28bde0e 100644 --- a/src/app/shared/testing/submission-service.stub.ts +++ b/src/app/shared/testing/submission-service.stub.ts @@ -20,7 +20,7 @@ export class SubmissionServiceStub { getSubmissionStatus = jasmine.createSpy('getSubmissionStatus'); getSubmissionSaveProcessingStatus = jasmine.createSpy('getSubmissionSaveProcessingStatus'); getSubmissionDepositProcessingStatus = jasmine.createSpy('getSubmissionDepositProcessingStatus'); - hasNotSavedModification = jasmine.createSpy('hasNotSavedModification'); + hasUnsavedModification = jasmine.createSpy('hasUnsavedModification'); isSectionHidden = jasmine.createSpy('isSectionHidden'); isSubmissionLoading = jasmine.createSpy('isSubmissionLoading'); notifyNewSection = jasmine.createSpy('notifyNewSection'); diff --git a/src/app/submission/form/footer/submission-form-footer.component.html b/src/app/submission/form/footer/submission-form-footer.component.html index 29bfff2660..459241ae1c 100644 --- a/src/app/submission/form/footer/submission-form-footer.component.html +++ b/src/app/submission/form/footer/submission-form-footer.component.html @@ -12,7 +12,7 @@ diff --git a/src/app/submission/form/footer/submission-form-footer.component.spec.ts b/src/app/submission/form/footer/submission-form-footer.component.spec.ts index aa5e7f996b..704346f445 100644 --- a/src/app/submission/form/footer/submission-form-footer.component.spec.ts +++ b/src/app/submission/form/footer/submission-form-footer.component.spec.ts @@ -225,7 +225,7 @@ describe('SubmissionFormFooterComponent Component', () => { }); it('should disable save button when all modifications had been saved', () => { - comp.hasNotSavedModification = observableOf(false); + comp.hasUnsavedModification = observableOf(false); fixture.detectChanges(); const saveBtn: any = fixture.debugElement.query(By.css('#save')); @@ -233,7 +233,7 @@ describe('SubmissionFormFooterComponent Component', () => { }); it('should enable save button when there are not saved modifications', () => { - comp.hasNotSavedModification = observableOf(true); + comp.hasUnsavedModification = observableOf(true); fixture.detectChanges(); const saveBtn: any = fixture.debugElement.query(By.css('#save')); diff --git a/src/app/submission/form/footer/submission-form-footer.component.ts b/src/app/submission/form/footer/submission-form-footer.component.ts index be1faf57ec..9cabdcbf6d 100644 --- a/src/app/submission/form/footer/submission-form-footer.component.ts +++ b/src/app/submission/form/footer/submission-form-footer.component.ts @@ -52,7 +52,7 @@ export class SubmissionFormFooterComponent implements OnChanges { /** * A boolean representing if submission form has unsaved modifications */ - public hasNotSavedModification: Observable; + public hasUnsavedModification: Observable; /** * Initialize instance variables @@ -78,7 +78,7 @@ export class SubmissionFormFooterComponent implements OnChanges { this.processingSaveStatus = this.submissionService.getSubmissionSaveProcessingStatus(this.submissionId); this.processingDepositStatus = this.submissionService.getSubmissionDepositProcessingStatus(this.submissionId); this.showDepositAndDiscard = observableOf(this.submissionService.getSubmissionScope() === SubmissionScopeType.WorkspaceItem); - this.hasNotSavedModification = this.submissionService.hasNotSavedModification(); + this.hasUnsavedModification = this.submissionService.hasUnsavedModification(); } } diff --git a/src/app/submission/submission.service.spec.ts b/src/app/submission/submission.service.spec.ts index f601239387..3894787e48 100644 --- a/src/app/submission/submission.service.spec.ts +++ b/src/app/submission/submission.service.spec.ts @@ -757,13 +757,13 @@ describe('SubmissionService test suite', () => { }); }); - describe('hasNotSavedModification', () => { + describe('hasUnsavedModification', () => { it('should call jsonPatchOperationService hasPendingOperation observable', () => { (service as any).jsonPatchOperationService.hasPendingOperations = jasmine.createSpy('hasPendingOperations') .and.returnValue(observableOf(true)); scheduler = getTestScheduler(); - scheduler.schedule(() => service.hasNotSavedModification()); + scheduler.schedule(() => service.hasUnsavedModification()); scheduler.flush(); expect((service as any).jsonPatchOperationService.hasPendingOperations).toHaveBeenCalledWith('sections'); diff --git a/src/app/submission/submission.service.ts b/src/app/submission/submission.service.ts index f7bfa3fbed..92f0e116ea 100644 --- a/src/app/submission/submission.service.ts +++ b/src/app/submission/submission.service.ts @@ -437,7 +437,7 @@ export class SubmissionService { * @return Observable * observable with submission unsaved modification presence */ - hasNotSavedModification(): Observable { + hasUnsavedModification(): Observable { return this.jsonPatchOperationService.hasPendingOperations('sections'); }