Merge branch 'master' into UIBULKED-351

# Conflicts: # CHANGELOG.md
folio-org · Sep 28, 2023 · 8fa64da · 8fa64da
2 parents 862d767 + 9c3450f
commit 8fa64da
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -45,6 +45,7 @@
 * [UIBULKED-312](https://issues.folio.org/browse/UIBULKED-312) CSV: On cancel button click uploaded file should be deleted.
 * [UIBULKED-346](https://issues.folio.org/browse/UIBULKED-346) *BREAKING* bump `react-intl` to `v6.4.4`.
 * [UIBULKED-343](https://issues.folio.org/browse/UIBULKED-343) Refactor logic for downloading file from actions menu.
+* [UIBULKED-341](https://issues.folio.org/browse/UIBULKED-341) Separate Item notes in different columns based on the note type
 * [UIBULKED-351](https://issues.folio.org/browse/UIBULKED-351) Hide Query tab
 
 ## [3.0.5](https://github.com/folio-org/ui-bulk-edit/tree/v3.0.5) (2023-03-22)

diff --git a/src/components/BulkEditActionMenu/BulkEditActionMenu.js b/src/components/BulkEditActionMenu/BulkEditActionMenu.js
@@ -85,7 +85,7 @@ const BulkEditActionMenu = ({
 
   const columnsOptions = columns.map(item => ({
     ...item,
-    label: intl.formatMessage({ id: `ui-bulk-edit.columns.${capability}.${item.label}` }),
+    label: item.ignoreTranslation ? item.label : intl.formatMessage({ id: `ui-bulk-edit.columns.${capability}.${item.label}` }),
     disabled: isLastUnselectedColumn(item.value) || !countOfRecords,
   }));
 

diff --git a/src/utils/mappers/mappers.js b/src/utils/mappers/mappers.js
@@ -51,10 +51,11 @@ export const getMappedTableData = ({ data, capabilities, intl }) => {
     value: cell.value,
     disabled: false,
     selected: !cell.visible,
+    ignoreTranslation: cell.ignoreTranslation,
   }));
 
-  const columnMapping = columns.reduce((acc, { value, label }) => {
-    acc[value] = intl.formatMessage({ id: `ui-bulk-edit.columns.${capabilities}.${label}` });
+  const columnMapping = columns.reduce((acc, { value, label, ignoreTranslation }) => {
+    acc[value] = ignoreTranslation ? value : intl.formatMessage({ id: `ui-bulk-edit.columns.${capabilities}.${label}` });
 
     return acc;
   }, {});