UIBULKED-411 Call action notes request on identifier and query tabs (#…

…483)
folio-org · Feb 16, 2024 · 7deecaf · 7deecaf
1 parent f538dc6
commit 7deecaf
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 18 deletions.
diff --git a/src/components/BulkEditList/BulkEditList.js b/src/components/BulkEditList/BulkEditList.js
@@ -59,7 +59,6 @@ export const BulkEditList = () => {
   const { id: bulkOperationId } = usePathParams('/bulk-edit/:id');
   const {
     step,
-    capabilities,
     criteria,
     initialFileName
   } = useSearchParams();
@@ -221,7 +220,6 @@ export const BulkEditList = () => {
         >
           <BulkEditInApp
             onContentUpdatesChanged={setContentUpdates}
-            capabilities={capabilities}
           />
         </BulkEditInAppLayer>
 

diff --git a/src/components/BulkEditList/BulkEditListResult/BulkEditInApp/BulkEditInApp.js b/src/components/BulkEditList/BulkEditListResult/BulkEditInApp/BulkEditInApp.js
@@ -8,12 +8,10 @@ import {
   Layout,
 } from '@folio/stripes/components';
 
-import { useLocation } from 'react-router';
 import { BulkEditInAppTitle } from './BulkEditInAppTitle/BulkEditInAppTitle';
 import { ContentUpdatesForm } from './ContentUpdatesForm/ContentUpdatesForm';
 import {
   CAPABILITIES,
-  CRITERIA,
   getHoldingsOptions,
   getInstanceOptions,
   getItemsOptions,
@@ -22,24 +20,22 @@ import {
 import { useItemNotes } from '../../../../hooks/api/useItemNotes';
 import { useHoldingsNotes } from '../../../../hooks/api/useHoldingsNotes';
 import { sortAlphabetically } from '../../../../utils/sortAlphabetically';
+import { useSearchParams } from '../../../../hooks/useSearchParams';
 
 export const BulkEditInApp = ({
   onContentUpdatesChanged,
-  capabilities,
 }) => {
   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 {
+    currentRecordType,
+    initialFileName
+  } = useSearchParams();
 
-  const fileUploadedName = search.get('fileName');
-  const isItemCapability = capabilities === CAPABILITIES.ITEM;
-  const isHoldingsCapability = capabilities === CAPABILITIES.HOLDING;
+  const isItemRecordType = currentRecordType === CAPABILITIES.ITEM;
+  const isHoldingsRecordType = currentRecordType === CAPABILITIES.HOLDING;
 
-  const { itemNotes, isItemNotesLoading } = useItemNotes({ enabled: isItemCapability });
-  const { holdingsNotes, isHoldingsNotesLoading } = useHoldingsNotes({ enabled: isHoldingsCapability });
+  const { itemNotes, isItemNotesLoading } = useItemNotes({ enabled: isItemRecordType });
+  const { holdingsNotes, isHoldingsNotesLoading } = useHoldingsNotes({ enabled: isHoldingsRecordType });
 
   const optionsMap = {
     [CAPABILITIES.ITEM]: getItemsOptions(intl.formatMessage, itemNotes),
@@ -48,14 +44,14 @@ export const BulkEditInApp = ({
     [CAPABILITIES.INSTANCE]: getInstanceOptions(intl.formatMessage),
   };
 
-  const options = optionsMap[key];
+  const options = optionsMap[currentRecordType];
   const showContentUpdatesForm = options && !isItemNotesLoading && !isHoldingsNotesLoading;
   const sortedOptions = sortAlphabetically(options, intl.formatMessage({ id:'ui-bulk-edit.options.placeholder' }));
 
   return (
     <>
       <Headline size="large" margin="medium">
-        <FormattedMessage id="ui-bulk-edit.preview.file.title" values={{ fileUploadedName }} />
+        <FormattedMessage id="ui-bulk-edit.preview.file.title" values={{ fileUploadedName: initialFileName }} />
       </Headline>
       <Accordion
         label={<FormattedMessage id="ui-bulk-edit.layer.title" />}
@@ -77,6 +73,5 @@ export const BulkEditInApp = ({
 };
 
 BulkEditInApp.propTypes = {
-  capabilities: PropTypes.string,
   onContentUpdatesChanged: PropTypes.func,
 };