Revert "UIBULKED-315 Group holdings record properties using optgroup …

…component (#396)"

This reverts commit 988d3fb.

CHANGELOG.md

@@ -3,7 +3,6 @@
 ## In progress
 
 * [UIBULKED-355](https://issues.folio.org/browse/UIBULKED-355) Remove reference to Query tab on the landing page.
-* [UIBULKED-315](https://issues.folio.org/browse/UIBULKED-315) Group holdings record properties using optgroup component
 
 ## [4.0.0](https://github.com/folio-org/ui-bulk-edit/tree/v4.0.0) (2023-10-12)
 

package.json

@@ -101,8 +101,7 @@
         "subPermissions": [
           "ui-bulk-edit.app-view",
           "ui-bulk-edit.edit.base",
-          "inventory-storage.item-note-types.collection.get",
-          "inventory-storage.holdings-note-types.collection.get"
+          "inventory-storage.item-note-types.collection.get"
         ],
         "visible": true
       },

src/components/BulkEditList/BulkEditListFilters/BulkEditListFilters.js

@@ -30,7 +30,7 @@ import {
 } from '../../../hooks/api';
 import { useBulkPermissions, useLocationFilters } from '../../../hooks';
 import { LogsFilters } from './LogsFilters/LogsFilters';
-import { getCapabilityOptions, isCapabilityDisabled } from '../../../utils/helpers';
+import { getCapabilityOptions, isCapabilityDisabled } from '../../../utils/filters';
 import FilterTabs from './FilterTabs/FilterTabs';
 import Capabilities from './Capabilities/Capabilities';
 import { getIsDisabledByPerm } from './utils/getIsDisabledByPerm';

src/components/BulkEditList/BulkEditListResult/BulkEditInApp/BulkEditInApp.js

@@ -13,7 +13,6 @@ import { BulkEditInAppTitle } from './BulkEditInAppTitle/BulkEditInAppTitle';
 import { ContentUpdatesForm } from './ContentUpdatesForm/ContentUpdatesForm';
 import { CAPABILITIES, getHoldingsOptions, getItemsOptions, getUserOptions } from '../../../../constants';
 import { useItemNotes } from '../../../../hooks/api/useItemNotes';
-import { useHoldingsNotes } from '../../../../hooks/api/useHoldingsNotes';
 
 export const BulkEditInApp = ({
   onContentUpdatesChanged,
@@ -25,19 +24,17 @@ export const BulkEditInApp = ({
 
   const fileUploadedName = search.get('fileName');
   const isItemCapability = capabilities === CAPABILITIES.ITEM;
-  const isHoldingsCapability = capabilities === CAPABILITIES.HOLDING;
 
   const { itemNotes, isItemNotesLoading } = useItemNotes({ enabled: isItemCapability });
-  const { holdingNotes, isHoldingsNotesLoading } = useHoldingsNotes({ enabled: isHoldingsCapability });
 
   const optionsMap = {
     [CAPABILITIES.ITEM]: getItemsOptions(intl.formatMessage, itemNotes),
     [CAPABILITIES.USER]: getUserOptions(intl.formatMessage),
-    [CAPABILITIES.HOLDING]: getHoldingsOptions(intl.formatMessage, holdingNotes),
+    [CAPABILITIES.HOLDING]: getHoldingsOptions(intl.formatMessage),
   };
 
   const options = optionsMap[capabilities];
-  const showContentUpdatesForm = options && !isItemNotesLoading && !isHoldingsNotesLoading;
+  const showContentUpdatesForm = options && !isItemNotesLoading;
 
   return (
     <>

src/components/BulkEditList/BulkEditListResult/BulkEditInApp/BulkEditInApp.test.js

@@ -1,6 +1,6 @@
 import { MemoryRouter } from 'react-router-dom';
 import { QueryClientProvider } from 'react-query';
-import { act, render, screen, waitFor } from '@testing-library/react';
+import { act, render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
 import { useOkapiKy } from '@folio/stripes/core';
@@ -256,16 +256,11 @@ describe('BulkEditInApp', () => {
     expect(optionPatronGroup.selected).toBeTruthy();
   });
 
-  it('should display holdings permanent location', async () => {
+  it('should display holdings permanent location', () => {
     renderBulkEditInApp({ capability: CAPABILITIES.HOLDING });
 
-    let selectOption;
-    let optionStatus;
-
-    await waitFor(() => {
-      selectOption = screen.getByTestId('select-option-0');
-      optionStatus = screen.getByRole('option', { name: /layer.options.holdings.permanentLocation/ });
-    });
+    const selectOption = screen.getByTestId('select-option-0');
+    const optionStatus = screen.getByRole('option', { name: /layer.options.holdings.permanentLocation/ });
 
     act(() => userEvent.selectOptions(selectOption, optionStatus));
 

src/components/BulkEditList/BulkEditListResult/BulkEditInApp/ContentUpdatesForm/ContentUpdatesForm.js

@@ -24,7 +24,7 @@ import {
   getFilteredFields,
   getExtraActions,
 } from './helpers';
-import { groupByCategory } from '../../../../../utils/helpers';
+import { groupByCategory } from '../../../../../utils/filters';
 
 export const ContentUpdatesForm = ({
   onContentUpdatesChanged,

src/constants/selectOptions.js

@@ -19,15 +19,13 @@ export const OPTIONS = {
   TEMPORARY_HOLDINGS_LOCATION: 'TEMPORARY_HOLDINGS_LOCATION',
   PERMANENT_HOLDINGS_LOCATION: 'PERMANENT_HOLDINGS_LOCATION',
   ITEM_NOTE: 'ITEM_NOTE',
-  HOLDINGS_NOTE: 'HOLDINGS_NOTE',
   ADMINISTRATIVE_NOTE: 'ADMINISTRATIVE_NOTE',
   CHECK_IN_NOTE: 'CHECK_IN_NOTE',
   CHECK_OUT_NOTE: 'CHECK_OUT_NOTE',
 };
 
 export const PARAMETERS_KEYS = {
   ITEM_NOTE_TYPE_ID_KEY: 'ITEM_NOTE_TYPE_ID_KEY',
-  HOLDINGS_NOTE_TYPE_ID_KEY: 'HOLDINGS_NOTE_TYPE_ID_KEY',
 };
 
 export const OPTIONS_WITH_ADDITIONAL_PARAMETERS = [
@@ -170,30 +168,20 @@ export const getUserOptions = (formatMessage) => [
   },
 ];
 
-export const getHoldingsOptions = (formatMessage, holdingsNotes = []) => [
+export const getHoldingsOptions = (formatMessage) => [
   {
     value: '',
     label: formatMessage({ id: 'ui-bulk-edit.options.placeholder' }),
     disabled: true,
   },
-  {
-    value: OPTIONS.ADMINISTRATIVE_NOTE,
-    label: formatMessage({ id: 'ui-bulk-edit.layer.options.administrativeNote' }),
-    disabled: false,
-  },
-  {
-    value: OPTIONS.TEMPORARY_HOLDINGS_LOCATION,
+  { value: OPTIONS.TEMPORARY_HOLDINGS_LOCATION,
     label: formatMessage({ id: 'ui-bulk-edit.layer.options.holdings.temporaryLocation' }),
-    disabled: false,
-    categoryName: 'Holdings location'
-  },
+    disabled: false },
   {
     value: OPTIONS.PERMANENT_HOLDINGS_LOCATION,
     label: formatMessage({ id: 'ui-bulk-edit.layer.options.holdings.permanentLocation' }),
     disabled: false,
-    categoryName: 'Holdings location'
   },
-  ...holdingsNotes,
   {
     value: OPTIONS.SUPPRESS_FROM_DISCOVERY,
     label: formatMessage({ id: 'ui-bulk-edit.layer.options.holdings.suppress' }),

src/hooks/api/useItemNotes.js

@@ -2,7 +2,6 @@ import { useOkapiKy } from '@folio/stripes/core';
 import { useQuery } from 'react-query';
 import { useIntl } from 'react-intl';
 import { OPTIONS, PARAMETERS_KEYS } from '../../constants';
-import { getMappedAndSortedNotes } from '../../utils/helpers';
 
 export const useItemNotes = (options = {}) => {
   const ky = useOkapiKy();
@@ -18,12 +17,19 @@ export const useItemNotes = (options = {}) => {
     },
   );
 
-  const itemNotes = getMappedAndSortedNotes({
-    notes: data?.itemNoteTypes,
-    categoryName: formatMessage({ id: 'ui-bulk-edit.category.itemNotes' }),
+  const mappedNotes = data?.itemNoteTypes?.map(type => ({
+    label: type.name,
+    value: type.id,
     type: OPTIONS.ITEM_NOTE,
-    key: PARAMETERS_KEYS.ITEM_NOTE_TYPE_ID_KEY,
-  });
+    parameters: [{
+      key: PARAMETERS_KEYS.ITEM_NOTE_TYPE_ID_KEY,
+      value: type.id,
+    }],
+    disabled: false,
+    categoryName: formatMessage({ id: 'ui-bulk-edit.category.itemNotes' }),
+  })) || [];
+
+  const itemNotes = mappedNotes.sort((a, b) => a.label.localeCompare(b.label));
 
   return {
     itemNotes,

src/utils/helpers.js → src/utils/filters.js

@@ -50,25 +50,4 @@ export const groupByCategory = (array) => {
   }, {});
 };
 
-export const getMappedAndSortedNotes = ({
-  notes,
-  categoryName,
-  key,
-  type
-}) => {
-  const mappedNotes = notes?.map(note => ({
-    label: note.name,
-    value: note.id,
-    type,
-    parameters: [{
-      key,
-      value: note.id,
-    }],
-    disabled: false,
-    categoryName,
-  })) || [];
-
-  return mappedNotes.sort((a, b) => a.label.localeCompare(b.label));
-};
-
 

translations/ui-bulk-edit/en.json

@@ -116,7 +116,6 @@
   "category.loanType": "Loan type",
   "category.location": "Location",
   "category.itemNotes": "Item notes",
-  "category.holdingNotes": "Holdings notes",
 
   "columns.USER.User name": "Username",
   "columns.USER.User id": "User id",