hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-18 07:23:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

[835] Auto-save in new Item Submission form breaks the form

Browse Source 
Methods renaming
This commit is contained in:
Alessandro Martelli
2020-12-15 10:35:55 +01:00
parent 0794c50d19
commit 451881ef08
7 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form.component.html
View File

@@ -2,7 +2,7 @@
[formId]="formId" [formId]="formId"
[group]="formGroup" [group]="formGroup"
[hasErrorMessaging]="model.hasErrorMessages" [hasErrorMessaging]="model.hasErrorMessages"
[hidden]="model.hidden" [hidden]="model.hidden"linke
[layout]="formLayout" [layout]="formLayout"
[model]="model" [model]="model"
[ngClass]="[getClass(model, 'element', 'host'), getClass(model, 'grid', 'host')]" [ngClass]="[getClass(model, 'element', 'host'), getClass(model, 'grid', 'host')]"

2
src/app/shared/testing/submission-service.stub.ts
View File

@@ -20,7 +20,7 @@ export class SubmissionServiceStub {
getSubmissionStatus = jasmine.createSpy('getSubmissionStatus'); getSubmissionStatus = jasmine.createSpy('getSubmissionStatus');
getSubmissionSaveProcessingStatus = jasmine.createSpy('getSubmissionSaveProcessingStatus'); getSubmissionSaveProcessingStatus = jasmine.createSpy('getSubmissionSaveProcessingStatus');
getSubmissionDepositProcessingStatus = jasmine.createSpy('getSubmissionDepositProcessingStatus'); getSubmissionDepositProcessingStatus = jasmine.createSpy('getSubmissionDepositProcessingStatus');
hasNotSavedModification = jasmine.createSpy('hasNotSavedModification'); hasUnsavedModification = jasmine.createSpy('hasUnsavedModification');
isSectionHidden = jasmine.createSpy('isSectionHidden'); isSectionHidden = jasmine.createSpy('isSectionHidden');
isSubmissionLoading = jasmine.createSpy('isSubmissionLoading'); isSubmissionLoading = jasmine.createSpy('isSubmissionLoading');
notifyNewSection = jasmine.createSpy('notifyNewSection'); notifyNewSection = jasmine.createSpy('notifyNewSection');

2
src/app/submission/form/footer/submission-form-footer.component.html
View File

@@ -12,7 +12,7 @@
<button type="button" <button type="button"
class="btn btn-info" class="btn btn-info"
id="save" id="save"
[disabled]="(processingSaveStatus | async) || !(hasNotSavedModification | async)" [disabled]="(processingSaveStatus | async) || !(hasUnsavedModification | async)"
(click)="save($event)"> (click)="save($event)">
<span>{{'submission.general.save' | translate}}</span> <span>{{'submission.general.save' | translate}}</span>
</button> </button>

4
src/app/submission/form/footer/submission-form-footer.component.spec.ts
View File

@@ -225,7 +225,7 @@ describe('SubmissionFormFooterComponent Component', () => {
}); });
it('should disable save button when all modifications had been saved', () => { it('should disable save button when all modifications had been saved', () => {
comp.hasNotSavedModification = observableOf(false); comp.hasUnsavedModification = observableOf(false);
fixture.detectChanges(); fixture.detectChanges();
const saveBtn: any = fixture.debugElement.query(By.css('#save')); 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', () => { it('should enable save button when there are not saved modifications', () => {
comp.hasNotSavedModification = observableOf(true); comp.hasUnsavedModification = observableOf(true);
fixture.detectChanges(); fixture.detectChanges();
const saveBtn: any = fixture.debugElement.query(By.css('#save')); const saveBtn: any = fixture.debugElement.query(By.css('#save'));

4
src/app/submission/form/footer/submission-form-footer.component.ts
View File

@@ -52,7 +52,7 @@ export class SubmissionFormFooterComponent implements OnChanges {
/** /**
* A boolean representing if submission form has unsaved modifications * A boolean representing if submission form has unsaved modifications
*/ */
public hasNotSavedModification: Observable<boolean>; public hasUnsavedModification: Observable<boolean>;
/** /**
* Initialize instance variables * Initialize instance variables
@@ -78,7 +78,7 @@ export class SubmissionFormFooterComponent implements OnChanges {
this.processingSaveStatus = this.submissionService.getSubmissionSaveProcessingStatus(this.submissionId); this.processingSaveStatus = this.submissionService.getSubmissionSaveProcessingStatus(this.submissionId);
this.processingDepositStatus = this.submissionService.getSubmissionDepositProcessingStatus(this.submissionId); this.processingDepositStatus = this.submissionService.getSubmissionDepositProcessingStatus(this.submissionId);
this.showDepositAndDiscard = observableOf(this.submissionService.getSubmissionScope() === SubmissionScopeType.WorkspaceItem); this.showDepositAndDiscard = observableOf(this.submissionService.getSubmissionScope() === SubmissionScopeType.WorkspaceItem);
this.hasNotSavedModification = this.submissionService.hasNotSavedModification(); this.hasUnsavedModification = this.submissionService.hasUnsavedModification();
} }
} }

4
src/app/submission/submission.service.spec.ts
View File

@@ -757,13 +757,13 @@ describe('SubmissionService test suite', () => {
}); });
}); });
describe('hasNotSavedModification', () => { describe('hasUnsavedModification', () => {
it('should call jsonPatchOperationService hasPendingOperation observable', () => { it('should call jsonPatchOperationService hasPendingOperation observable', () => {
(service as any).jsonPatchOperationService.hasPendingOperations = jasmine.createSpy('hasPendingOperations') (service as any).jsonPatchOperationService.hasPendingOperations = jasmine.createSpy('hasPendingOperations')
.and.returnValue(observableOf(true)); .and.returnValue(observableOf(true));
scheduler = getTestScheduler(); scheduler = getTestScheduler();
scheduler.schedule(() => service.hasNotSavedModification()); scheduler.schedule(() => service.hasUnsavedModification());
scheduler.flush(); scheduler.flush();
expect((service as any).jsonPatchOperationService.hasPendingOperations).toHaveBeenCalledWith('sections'); expect((service as any).jsonPatchOperationService.hasPendingOperations).toHaveBeenCalledWith('sections');

2
src/app/submission/submission.service.ts
View File

@@ -437,7 +437,7 @@ export class SubmissionService {
* @return Observable<boolean> * @return Observable<boolean>
* observable with submission unsaved modification presence * observable with submission unsaved modification presence
*/ */
hasNotSavedModification(): Observable<boolean> { hasUnsavedModification(): Observable<boolean> {
return this.jsonPatchOperationService.hasPendingOperations('sections'); return this.jsonPatchOperationService.hasPendingOperations('sections');
} }