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

Merge branch 'main' into w2p-87382_circular-dependency-fixes

Browse Source
This commit is contained in:
lotte
2022-04-05 16:35:00 +02:00
parent 41ad172796 c1e6976502
commit 30b7e8eb39
890 changed files with 48746 additions and 17465 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -198,19 +198,26 @@ 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').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, false, true).pipe(
getFirstSucceededRemoteDataPayload(),
map((submissionObject: SubmissionObject) => [submissionObject])
);
}
return response$.pipe(
map((response: SubmissionObject[]) => {
if (this.canDeposit(response)) {
return new DepositSubmissionAction(action.payload.submissionId);
} else {
this.notificationsService.warning(null, this.translate.get('submission.sections.general.sections_not_valid'));
return this.parseSaveResponse((currentState.submission as SubmissionState).objects[action.payload.submissionId],
response, action.payload.submissionId, currentState.forms);
return new SaveSubmissionFormSuccessAction(action.payload.submissionId, response);
}
}),
catchError(() => observableOf(new SaveSubmissionFormErrorAction(action.payload.submissionId))));
@@ -351,6 +358,8 @@ export class SubmissionObjectEffects {
* The submission object retrieved from REST
* @param submissionId
* The submission id
* @param forms
* The forms state
* @param notify
* A boolean that indicate if show notification or not
* @return SubmissionObjectAction[]
@@ -360,7 +369,7 @@ export class SubmissionObjectEffects {
currentState: SubmissionObjectEntry,
response: SubmissionObject[],
submissionId: string,
forms,
forms: FormState,
notify: boolean = true): SubmissionObjectAction[] {
const mappedActions = [];