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

Fixed an issue occurred while removing an item from a qualdrop group

Browse Source
This commit is contained in:
Giuseppe
2018-08-31 17:51:44 +02:00
parent ffeee8f1a1
commit 820e3909ca
2 changed files with 60 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/app/submission/sections/form/form-operations.service.ts
View File

@@ -65,10 +65,14 @@ export class FormOperationsService {
return isNotUndefined(fieldIndex) ? fieldIndex : 0;
}
public getComboboxMap(event): Map<string, any> {
public getQualdropValueMap(event): Map<string, any> {
const metadataValueMap = new Map();
(event.model.parent.parent as DynamicFormArrayGroupModel).context.groups.forEach((arrayModel: DynamicFormArrayGroupModel) => {
const context = this.formBuilder.isQualdropGroup(event.model)
? (event.model.parent as DynamicFormArrayGroupModel).context
: (event.model.parent.parent as DynamicFormArrayGroupModel).context;
context.groups.forEach((arrayModel: DynamicFormArrayGroupModel) => {
const groupModel = arrayModel.group[0] as DynamicQualdropModel;
const metadataValueList = metadataValueMap.get(groupModel.qualdropId) ? metadataValueMap.get(groupModel.qualdropId) : [];
if (groupModel.value) {
@@ -80,15 +84,40 @@ export class FormOperationsService {
return metadataValueMap;
}
public getFieldPathFromChangeEvent(event: DynamicFormControlEvent) {
public getFieldPathFromEvent(event: DynamicFormControlEvent): string {
const fieldIndex = this.getArrayIndexFromEvent(event);
const fieldId = this.getFieldPathSegmentedFromChangeEvent(event);
return (isNotUndefined(fieldIndex)) ? fieldId + '/' + fieldIndex : fieldId;
}
public getQualdropItemPathFromEvent(event: DynamicFormControlEvent, valueMap: Map<string, any>): string {
const fieldIndex = this.getArrayIndexFromEvent(event);
const metadataValueMap = new Map();
let path;
const context = this.formBuilder.isQualdropGroup(event.model)
? (event.model.parent as DynamicFormArrayGroupModel).context
: (event.model.parent.parent as DynamicFormArrayGroupModel).context;
context.groups.forEach((arrayModel: DynamicFormArrayGroupModel, index: number) => {
const groupModel = arrayModel.group[0] as DynamicQualdropModel;
const metadataValueList = metadataValueMap.get(groupModel.qualdropId) ? metadataValueMap.get(groupModel.qualdropId) : [];
if (groupModel.value) {
metadataValueList.push(groupModel.value);
metadataValueMap.set(groupModel.qualdropId, metadataValueList);
}
if (index === fieldIndex) {
path = groupModel.qualdropId + '/' + (metadataValueMap.get(groupModel.qualdropId).length - 1)
}
});
return path;
}
public getFieldPathSegmentedFromChangeEvent(event: DynamicFormControlEvent) {
let fieldId;
if (this.formBuilder.isQualdropGroup(event.model.parent as DynamicFormControlModel)) {
if (this.formBuilder.isQualdropGroup(event.model as DynamicFormControlModel)) {
fieldId = (event.model as any).qualdropId;
} else if (this.formBuilder.isQualdropGroup(event.model.parent as DynamicFormControlModel)) {
fieldId = (event.model.parent as any).qualdropId;
} else {
fieldId = this.formBuilder.getId(event.model);
@@ -147,10 +176,10 @@ export class FormOperationsService {
protected dispatchOperationsFromRemoveEvent(pathCombiner: JsonPatchOperationPathCombiner,
event: DynamicFormControlEvent,
previousValue: FormFieldPreviousValueObject) {
const path = this.getFieldPathFromChangeEvent(event);
const path = this.getFieldPathFromEvent(event);
const value = this.getFieldValueFromChangeEvent(event);
if (this.formBuilder.isQualdropGroup(event.model.parent as DynamicFormControlModel)) {
this.dispatchOperationsFromMap(this.getComboboxMap(event), pathCombiner, event, previousValue);
if (this.formBuilder.isQualdropGroup(event.model as DynamicFormControlModel)) {
this.dispatchOperationsFromMap(this.getQualdropValueMap(event), pathCombiner, event, previousValue);
} else if (isNotEmpty(value)) {
this.operationsBuilder.remove(pathCombiner.getPath(path));
}
@@ -160,13 +189,13 @@ export class FormOperationsService {
event: DynamicFormControlEvent,
previousValue: FormFieldPreviousValueObject,
hasStoredValue: boolean) {
const path = this.getFieldPathFromChangeEvent(event);
const path = this.getFieldPathFromEvent(event);
const segmentedPath = this.getFieldPathSegmentedFromChangeEvent(event);
const value = this.getFieldValueFromChangeEvent(event);
// Detect which operation must be dispatched
if (this.formBuilder.isQualdropGroup(event.model.parent as DynamicFormControlModel)) {
// It's a qualdrup model
this.dispatchOperationsFromMap(this.getComboboxMap(event), pathCombiner, event, previousValue);
this.dispatchOperationsFromMap(this.getQualdropValueMap(event), pathCombiner, event, previousValue);
} else if (this.formBuilder.isRelationGroup(event.model)) {
// It's a relation model
this.dispatchOperationsFromMap(this.getValueMap(value), pathCombiner, event, previousValue);
@@ -215,6 +244,10 @@ export class FormOperationsService {
event: DynamicFormControlEvent,
previousValue: FormFieldPreviousValueObject) {
const currentValueMap = valueMap;
if (event.type === 'remove') {
const path = this.getQualdropItemPathFromEvent(event, currentValueMap);
this.operationsBuilder.remove(pathCombiner.getPath(path));
} else {
if (previousValue.isPathEqual(this.formBuilder.getPath(event.model))) {
previousValue.value.forEach((entry, index) => {
const currentValue = currentValueMap.get(index);
@@ -236,6 +269,7 @@ export class FormOperationsService {
this.operationsBuilder.add(pathCombiner.getPath(index), entry, true);
}
});
}
previousValue.delete();
}

2
src/app/submission/sections/form/section-form.component.ts
View File

@@ -223,7 +223,7 @@ export class FormSectionComponent extends SectionModelComponent implements OnDes
const path = this.formBuilderService.getPath(event.model);
if (this.formBuilderService.hasMappedGroupValue(event.model)) {
this.previousValue.path = path;
this.previousValue.value = this.formOperationsService.getComboboxMap(event);
this.previousValue.value = this.formOperationsService.getQualdropValueMap(event);
} else if (isNotEmpty(value) && ((typeof value === 'object' && isNotEmpty(value.value)) || (typeof value === 'string'))) {
this.previousValue.path = path;
this.previousValue.value = value;