UIBULKED-404: fix merge from master

folio-org · Feb 14, 2024 · 73f9b69 · 73f9b69
1 parent 50e9337
commit 73f9b69
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 13 deletions.
diff --git a/src/components/BulkEditActionMenu/BulkEditActionMenu.js b/src/components/BulkEditActionMenu/BulkEditActionMenu.js
@@ -21,6 +21,7 @@ import {
   BULK_VISIBLE_COLUMNS,
   FILE_SEARCH_PARAMS,
   FILE_TO_LINK,
+  CRITERIA,
 } from '../../constants';
 import {
   useBulkPermissions,
@@ -43,8 +44,12 @@ const BulkEditActionMenu = ({
   const perms = useBulkPermissions();
   const search = new URLSearchParams(location.search);
   const capability = search.get('capabilities');
+  const criteria = search.get('criteria');
+  const queryRecordType = search.get('queryRecordType');
   const step = search.get('step');
 
+  const key = criteria === CRITERIA.QUERY ? queryRecordType : capability;
+
   const [columnSearch, setColumnSearch] = useState('');
 
   const {
@@ -60,10 +65,10 @@ const BulkEditActionMenu = ({
 
   const [fileInfo, setFileInfo] = useState(null);
 
-  const hasEditPerm = (hasHoldingsInventoryEdit && capability === CAPABILITIES.HOLDING)
-      || (hasItemInventoryEdit && capability === CAPABILITIES.ITEM)
-      || (hasUserEditInAppPerm && capability === CAPABILITIES.USER)
-      || (hasInstanceInventoryEdit && capability === CAPABILITIES.INSTANCE);
+  const hasEditPerm = (hasHoldingsInventoryEdit && key === CAPABILITIES.HOLDING)
+      || (hasItemInventoryEdit && key === CAPABILITIES.ITEM)
+      || (hasUserEditInAppPerm && key === CAPABILITIES.USER)
+      || (hasInstanceInventoryEdit && key === CAPABILITIES.INSTANCE);
 
 
   useFileDownload({
@@ -96,7 +101,7 @@ const BulkEditActionMenu = ({
 
   const columnsOptions = columns.map(item => ({
     ...item,
-    label: item.ignoreTranslation ? item.label : intl.formatMessage({ id: `ui-bulk-edit.columns.${capability}.${item.label}` }),
+    label: item.ignoreTranslation ? item.label : intl.formatMessage({ id: `ui-bulk-edit.columns.${key}.${item.label}` }),
     disabled: isLastUnselectedColumn(item.value) || !countOfRecords,
   }));
 

diff --git a/src/components/BulkEditList/BulkEditListResult/BulkEditInApp/BulkEditInApp.js b/src/components/BulkEditList/BulkEditListResult/BulkEditInApp/BulkEditInApp.js
@@ -13,6 +13,7 @@ import { BulkEditInAppTitle } from './BulkEditInAppTitle/BulkEditInAppTitle';
 import { ContentUpdatesForm } from './ContentUpdatesForm/ContentUpdatesForm';
 import {
   CAPABILITIES,
+  CRITERIA,
   getHoldingsOptions,
   getInstanceOptions,
   getItemsOptions,
@@ -29,6 +30,9 @@ export const BulkEditInApp = ({
   const intl = useIntl();
   const location = useLocation();
   const search = new URLSearchParams(location.search);
+  const criteria = search.get('criteria');
+  const queryRecordType = search.get('queryRecordType');
+  const key = criteria === CRITERIA.QUERY ? queryRecordType : capabilities;
 
   const fileUploadedName = search.get('fileName');
   const isItemCapability = capabilities === CAPABILITIES.ITEM;
@@ -44,7 +48,7 @@ export const BulkEditInApp = ({
     [CAPABILITIES.INSTANCE]: getInstanceOptions(intl.formatMessage),
   };
 
-  const options = optionsMap[capabilities];
+  const options = optionsMap[key];
   const showContentUpdatesForm = options && !isItemNotesLoading && !isHoldingsNotesLoading;
   const sortedOptions = sortAlphabetically(options, intl.formatMessage({ id:'ui-bulk-edit.options.placeholder' }));
 

diff --git a/src/components/BulkEditList/BulkEditListResult/Preview/Preview.js b/src/components/BulkEditList/BulkEditListResult/Preview/Preview.js
@@ -1,12 +1,14 @@
+import React from 'react';
 import { FormattedMessage } from 'react-intl';
+import { useLocation } from 'react-router-dom';
+import PropTypes from 'prop-types';
+
 import {
   Headline,
   AccordionStatus,
   MessageBanner,
 } from '@folio/stripes/components';
-import PropTypes from 'prop-types';
-import { useLocation } from 'react-router-dom';
-import React from 'react';
+
 import css from './Preview.css';
 import { PreviewAccordion } from './PreviewAccordion';
 import { ErrorsAccordion } from './ErrorsAccordion';
@@ -15,7 +17,6 @@ import {
   useErrorsPreview,
   useRecordsPreview
 } from '../../../../hooks/api';
-
 import {
   CRITERIA,
   EDITING_STEPS,
@@ -30,6 +31,7 @@ export const Preview = ({ id, title, isInitial, bulkDetails }) => {
   const search = new URLSearchParams(location.search);
   const step = search.get('step');
   const capabilities = search.get('capabilities');
+  const queryRecordType = search.get('queryRecordType');
   const criteria = search.get('criteria');
 
   const totalRecords = step === EDITING_STEPS.COMMIT ? bulkDetails?.processedNumOfRecords : bulkDetails?.matchedNumOfRecords;
@@ -51,6 +53,8 @@ export const Preview = ({ id, title, isInitial, bulkDetails }) => {
     id,
     step,
     capabilities,
+    criteria,
+    queryRecordType,
     ...pagination,
   });
 

diff --git a/src/hooks/api/useRecordsPreview.js b/src/hooks/api/useRecordsPreview.js
@@ -19,6 +19,8 @@ export const useRecordsPreview = ({
   capabilities,
   limit,
   offset,
+  criteria,
+  queryRecordType
 }) => {
   const intl = useIntl();
   const { setVisibleColumns } = useContext(RootContext);
@@ -40,6 +42,8 @@ export const useRecordsPreview = ({
     data,
     intl,
     capabilities,
+    criteria,
+    queryRecordType
   }), [data]);
 
   // set initial and visible columns

diff --git a/src/utils/mappers/mappers.js b/src/utils/mappers/mappers.js
@@ -9,6 +9,7 @@ import {
 
 import {
   CAPABILITIES,
+  CRITERIA,
   CUSTOM_ENTITY_COLUMNS,
 } from '../../constants';
 import {
@@ -44,7 +45,7 @@ const formatData = ({ capability, column, data }) => {
   }
 };
 
-export const getMappedTableData = ({ data, capabilities, intl }) => {
+export const getMappedTableData = ({ data, capabilities, criteria, queryRecordType, intl }) => {
   if (!data) {
     return {
       contentData: null,
@@ -53,6 +54,8 @@ export const getMappedTableData = ({ data, capabilities, intl }) => {
     };
   }
 
+  const key = criteria === CRITERIA.QUERY ? queryRecordType : capabilities;
+
   const columns = data.header.map((cell) => ({
     label: cell.value,
     value: cell.value,
@@ -63,7 +66,7 @@ export const getMappedTableData = ({ data, capabilities, intl }) => {
   }));
 
   const columnMapping = columns.reduce((acc, { value, label, ignoreTranslation }) => {
-    acc[value] = ignoreTranslation ? value : intl.formatMessage({ id: `ui-bulk-edit.columns.${capabilities}.${label}` });
+    acc[value] = ignoreTranslation ? value : intl.formatMessage({ id: `ui-bulk-edit.columns.${key}.${label}` });
 
     return acc;
   }, {});
@@ -74,7 +77,7 @@ export const getMappedTableData = ({ data, capabilities, intl }) => {
 
       acc[column.value] = formatData({
         column,
-        capability: capabilities,
+        capability: key,
         data: item,
       });