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

fix issue where combining entities and authority control in the same field wouldn't work

Browse Source
This commit is contained in:
Art Lowel
2020-09-01 14:25:50 +02:00
parent 92207cf66d
commit f167d5a629
8 changed files with 76 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,10 +2,19 @@ import { Injectable } from '@angular/core';
import { Actions, Effect, ofType } from '@ngrx/effects';
import { Store } from '@ngrx/store';
import { TranslateService } from '@ngx-translate/core';
import { union } from 'lodash';
import { isEqual, union } from 'lodash';
import { from as observableFrom, Observable, of as observableOf } from 'rxjs';
import { catchError, filter, map, mergeMap, switchMap, take, tap, withLatestFrom } from 'rxjs/operators';
import {
catchError,
filter,
map,
mergeMap,
switchMap,
take,
tap,
withLatestFrom
} from 'rxjs/operators';
import { SubmissionObject } from '../../core/submission/models/submission-object.model';
import { WorkflowItem } from '../../core/submission/models/workflowitem.model';
import { WorkspaceitemSectionUploadObject } from '../../core/submission/models/workspaceitem-section-upload.model';
@@ -49,8 +58,6 @@ import { RemoteData } from '../../core/data/remote-data';
import { getFirstSucceededRemoteDataPayload } from '../../core/shared/operators';
import { SubmissionObjectDataService } from '../../core/submission/submission-object-data.service';
import { followLink } from '../../shared/utils/follow-link-config.model';
import { normalizeSectionData } from '../../core/submission/submission-response-parsing.service';
import { difference } from '../../shared/object.util';
@Injectable()
export class SubmissionObjectEffects {
@@ -72,9 +79,7 @@ export class SubmissionObjectEffects {
if (sectionDefinition.sectionType !== SectionsType.SubmissionForm) {
sectionData = (isNotUndefined(action.payload.sections) && isNotUndefined(action.payload.sections[sectionId])) ? action.payload.sections[sectionId] : Object.create(null);
} else {
// Normalize item metadata before to init section
// TODO to review after https://github.com/DSpace/dspace-angular/issues/818 is resolved
sectionData = normalizeSectionData(action.payload.item.metadata);
sectionData = action.payload.item.metadata;
}
const sectionErrors = null;
mappedActions.push(
@@ -253,7 +258,7 @@ export class SubmissionObjectEffects {
@Effect() addAllMetadataToSectionData = this.actions$.pipe(
ofType(SubmissionObjectActionTypes.UPDATE_SECTION_DATA),
switchMap((action: UpdateSectionDataAction) => {
return this.sectionService.getSectionState(action.payload.submissionId, action.payload.sectionId)
return this.sectionService.getSectionState(action.payload.submissionId, action.payload.sectionId, SectionsType.Upload)
.pipe(map((section: SubmissionSectionObject) => [action, section]), take(1));
}),
filter(([action, section]: [UpdateSectionDataAction, SubmissionSectionObject]) => section.sectionType === SectionsType.SubmissionForm),
@@ -271,15 +276,8 @@ export class SubmissionObjectEffects {
return item$.pipe(
map((item: Item) => item.metadata),
map((metadata: any) => {
if (!this.isEqual(action.payload.data, normalizeSectionData(metadata))) {
// Normalize item metadata before to update section
// TODO to review after https://github.com/DSpace/dspace-angular/issues/818 is resolved
return new UpdateSectionDataAction(action.payload.submissionId, action.payload.sectionId, normalizeSectionData(metadata), action.payload.errors)
} else {
return new UpdateSectionDataSuccessAction();
}
})
filter((metadata) => !isEqual(action.payload.data, metadata)),
map((metadata: any) => new UpdateSectionDataAction(action.payload.submissionId, action.payload.sectionId, metadata, action.payload.errors))
);
} else {
return observableOf(new UpdateSectionDataSuccessAction());
@@ -397,31 +395,4 @@ export class SubmissionObjectEffects {
}
return mappedActions;
}
/**
* Check if the section data has been enriched by the server
*
* @param sectionData
* the section metadata retrieved from the server
* @param itemData
* the item data retrieved from the server
*/
isEqual(sectionData: any, itemData: any): boolean {
const diffResult = [];
// compare current form data state with section data retrieved from store
const diffObj = difference(sectionData, itemData);
// iterate over differences to check whether they are actually different
Object.keys(diffObj)
.forEach((key) => {
diffObj[key].forEach((value) => {
if (value.hasOwnProperty('value')) {
diffResult.push(value);
}
});
});
return isEmpty(diffResult);
}
}