From 6773ad967b68e98759e3a88441413ed27590aba3 Mon Sep 17 00:00:00 2001 From: Kristof De Langhe Date: Mon, 2 Jan 2023 13:17:41 +0100 Subject: [PATCH] 93747: Feedback 2022-12-21 - fixing move patch --- .../dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts | 7 ++++--- src/assets/i18n/en.json5 | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts index b97c838ffb..2c584fb534 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts @@ -440,11 +440,12 @@ export class DsoEditMetadataForm { const valuesWithoutRemoved = values.filter((value: DsoEditMetadataValue) => value.change !== DsoEditMetadataChangeType.REMOVE); const moveOperations = moveAnalyser .diff( - valuesWithoutRemoved - .map((value: DsoEditMetadataValue) => value.newValue.place), [...valuesWithoutRemoved] .sort((a: DsoEditMetadataValue, b: DsoEditMetadataValue) => a.originalValue.place - b.originalValue.place) - .map((value: DsoEditMetadataValue) => value.newValue.place)) + .map((value: DsoEditMetadataValue) => value.originalValue.place), + [...valuesWithoutRemoved] + .sort((a: DsoEditMetadataValue, b: DsoEditMetadataValue) => a.newValue.place - b.newValue.place) + .map((value: DsoEditMetadataValue) => value.originalValue.place)) .map((operation: MoveOperation) => new MetadataPatchMoveOperation(field, +operation.from.substr(1), +operation.path.substr(1)).toOperation()); operations.push(...moveOperations); }); diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index f8afd69efe..0140bad6dd 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -1837,7 +1837,7 @@ "item.edit.metadata.reinstate-button": "Undo", - "item.edit.metadata.reset-order-button": "Reset value order", + "item.edit.metadata.reset-order-button": "Undo reorder", "item.edit.metadata.save-button": "Save",