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

ensure PUTs are always executed after the PATCH for a move operation

Browse Source
This commit is contained in:
Art Lowel
2020-04-15 17:13:43 +02:00
parent 2c3d8fd031
commit 9a68969eec
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts
View File

@@ -34,7 +34,7 @@ import {
} from '../../../../../../core/shared/operators'; } from '../../../../../../core/shared/operators';
import { SubmissionObject } from '../../../../../../core/submission/models/submission-object.model'; import { SubmissionObject } from '../../../../../../core/submission/models/submission-object.model';
import { SubmissionObjectDataService } from '../../../../../../core/submission/submission-object-data.service'; import { SubmissionObjectDataService } from '../../../../../../core/submission/submission-object-data.service';
import { hasValue } from '../../../../../empty.util'; import { hasValue, isNotEmpty } from '../../../../../empty.util';
import { FormFieldMetadataValueObject } from '../../../models/form-field-metadata-value.model'; import { FormFieldMetadataValueObject } from '../../../models/form-field-metadata-value.model';
import { import {
Reorderable, Reorderable,
@@ -181,16 +181,14 @@ export class DsDynamicFormArrayComponent extends DynamicFormArrayComponent imple
this.reorderables = reorderables; this.reorderables = reorderables;
if (shouldPropagateChanges) { if (shouldPropagateChanges) {
const updatedReorderables: Array<Observable<any>> = []; const movedReoRels: Array<Reorderable> = [];
let hasMetadataField = false; let hasMetadataField = false;
this.reorderables.forEach((reorderable: Reorderable, index: number) => { this.reorderables.forEach((reorderable: Reorderable, index: number) => {
if (reorderable.hasMoved) { if (reorderable.hasMoved) {
const prevIndex = reorderable.oldIndex;
const updatedReorderable = reorderable.update().pipe(take(1));
updatedReorderables.push(updatedReorderable);
if (reorderable instanceof ReorderableFormFieldMetadataValue) { if (reorderable instanceof ReorderableFormFieldMetadataValue) {
const prevIndex = reorderable.oldIndex;
hasMetadataField = true; hasMetadataField = true;
updatedReorderable.subscribe((v) => { reorderable.update().pipe(take(1)).subscribe((v) => {
const reoMD = reorderable as ReorderableFormFieldMetadataValue; const reoMD = reorderable as ReorderableFormFieldMetadataValue;
reoMD.model.value = reoMD.metadataValue; reoMD.model.value = reoMD.metadataValue;
this.onChange({ this.onChange({
@@ -202,18 +200,22 @@ export class DsDynamicFormArrayComponent extends DynamicFormArrayComponent imple
type: DynamicFormControlEventType.Change type: DynamicFormControlEventType.Change
}); });
}); });
} else if (reorderable instanceof ReorderableRelationship) {
movedReoRels.push(reorderable)
} }
} }
}); });
observableCombineLatest(updatedReorderables).pipe( if (isNotEmpty(movedReoRels) && hasMetadataField && hasValue(this.model.relationshipConfig)) {
// if it's a mix between entities and regular metadata fields,
// we need to save, since they use different endpoints and
// otherwise they'll get out of sync.
this.submissionService.dispatchSave(this.model.submissionId);
}
observableCombineLatest(
movedReoRels.map((movedReoRel) => movedReoRel.update().pipe(take(1)))
).subscribe(() => { ).subscribe(() => {
if (hasMetadataField && hasValue(this.model.relationshipConfig)) {
// if it's a mix between entities and regular metadata fields,
// we need to save after every operation, since they use different
// endpoints and otherwise they'll get out of sync.
this.submissionService.dispatchSave(this.model.submissionId);
}
this.changeDetectorRef.detectChanges(); this.changeDetectorRef.detectChanges();
}); });
} }