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

85262: Get submission object instead of sending empty patch + revert empty patch code

Browse Source
This commit is contained in:
Kristof De Langhe
2021-12-10 14:18:51 +01:00
parent ed2c774d86
commit 549529c889
3 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/app/submission/objects/submission-objects.effects.spec.ts
View File

@@ -54,6 +54,8 @@ 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';
import { SubmissionObjectDataService } from '../../core/submission/submission-object-data.service';
import { mockSubmissionObjectDataService } from '../../shared/testing/submission-oject-data-service.mock';
describe('SubmissionObjectEffects test suite', () => {
let submissionObjectEffects: SubmissionObjectEffects;
@@ -63,6 +65,7 @@ describe('SubmissionObjectEffects test suite', () => {
let notificationsServiceStub;
let submissionServiceStub;
let submissionJsonPatchOperationsServiceStub;
let submissionObjectDataServiceStub;
const collectionId: string = mockSubmissionCollectionId;
const submissionId: string = mockSubmissionId;
const submissionDefinitionResponse: any = mockSubmissionDefinitionResponse;
@@ -75,6 +78,9 @@ describe('SubmissionObjectEffects test suite', () => {
notificationsServiceStub = new NotificationsServiceStub();
submissionServiceStub = new SubmissionServiceStub();
submissionJsonPatchOperationsServiceStub = new SubmissionJsonPatchOperationsServiceStub();
submissionObjectDataServiceStub = mockSubmissionObjectDataService;
submissionServiceStub.hasUnsavedModification.and.returnValue(observableOf(true));
TestBed.configureTestingModule({
imports: [
@@ -99,6 +105,7 @@ describe('SubmissionObjectEffects test suite', () => {
{ provide: WorkflowItemDataService, useValue: {} },
{ provide: WorkflowItemDataService, useValue: {} },
{ provide: HALEndpointService, useValue: {} },
{ provide: SubmissionObjectDataService, useValue: submissionObjectDataServiceStub },
],
});

22
src/app/submission/objects/submission-objects.effects.ts
View File

@@ -196,13 +196,21 @@ export class SubmissionObjectEffects {
*/
@Effect() saveAndDeposit$ = this.actions$.pipe(
ofType(SubmissionObjectActionTypes.SAVE_AND_DEPOSIT_SUBMISSION),
withLatestFrom(this.store$),
switchMap(([action, currentState]: [SaveAndDepositSubmissionAction, any]) => {
return this.operationsService.jsonPatchByResourceType(
this.submissionService.getSubmissionObjectLinkName(),
action.payload.submissionId,
'sections',
true).pipe(
withLatestFrom(this.submissionService.hasUnsavedModification()),
switchMap(([action, hasUnsavedModification]: [SaveAndDepositSubmissionAction, boolean]) => {
let response$: Observable<SubmissionObject[]>;
if (hasUnsavedModification) {
response$ = this.operationsService.jsonPatchByResourceType(
this.submissionService.getSubmissionObjectLinkName(),
action.payload.submissionId,
'sections') as Observable<SubmissionObject[]>;
} else {
response$ = this.submissionObjectService.findById(action.payload.submissionId).pipe(
getFirstSucceededRemoteDataPayload(),
map((submissionObject: SubmissionObject) => [submissionObject])
);
}
return response$.pipe(
map((response: SubmissionObject[]) => {
if (this.canDeposit(response)) {
return new DepositSubmissionAction(action.payload.submissionId);