UIBULKED-380 Always include column with edited properties on Are you …

…sure form
folio-org · Dec 13, 2023 · c828367 · c828367
1 parent a9a5794
commit c828367
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 10 deletions.
diff --git a/src/components/BulkEditActionMenu/BulkEditActionMenu.js b/src/components/BulkEditActionMenu/BulkEditActionMenu.js
@@ -32,6 +32,7 @@ import {
   useBulkOperationDetails,
   useFileDownload
 } from '../../hooks/api';
+import { getVisibleColumnsKeys } from '../../utils/helpers';
 
 const BulkEditActionMenu = ({
   onEdit,
@@ -78,7 +79,7 @@ const BulkEditActionMenu = ({
 
   const { countOfRecords, visibleColumns, setVisibleColumns } = useContext(RootContext);
   const columns = visibleColumns || [];
-  const selectedValues = columns.filter(item => !item.selected).map(item => item.value);
+  const visibleColumnKeys = getVisibleColumnsKeys(columns);
 
   const isStartBulkCsvActive = hasUserEditLocalPerm && capability === CAPABILITIES.USER;
   const isInitialStep = step === EDITING_STEPS.UPLOAD;
@@ -88,7 +89,7 @@ const BulkEditActionMenu = ({
     && [JOB_STATUSES.DATA_MODIFICATION, JOB_STATUSES.REVIEW_CHANGES].includes(bulkDetails?.status);
 
   const isLastUnselectedColumn = (value) => {
-    return selectedValues?.length === 1 && selectedValues?.[0] === value;
+    return visibleColumnKeys?.length === 1 && visibleColumnKeys?.[0] === value;
   };
 
   const columnsOptions = columns.map(item => ({
@@ -101,7 +102,7 @@ const BulkEditActionMenu = ({
     const changedColumns = columns.map(col => {
       return ({
         ...col,
-        selected: !values.includes(col.value),
+        selected: values.includes(col.value),
       });
     });
 
@@ -184,7 +185,7 @@ const BulkEditActionMenu = ({
           dataOptions={filteredColumns}
           name="filter"
           onChange={handleColumnChange}
-          selectedValues={selectedValues}
+          selectedValues={visibleColumnKeys}
         />
       </div>
     );

diff --git a/...ts/BulkEditList/BulkEditListResult/BulkEditInAppPreviewModal/BulkEditInAppPreviewModal.js b/...ts/BulkEditList/BulkEditListResult/BulkEditInAppPreviewModal/BulkEditInAppPreviewModal.js
@@ -30,6 +30,7 @@ import { getContentUpdatesBody } from '../BulkEditInApp/ContentUpdatesForm/helpe
 import { BulkEditInAppPreviewModalFooter } from './BulkEditInAppPreviewModalFooter';
 
 import css from './BulkEditInAppPreviewModal.css';
+import { getVisibleColumnsKeys } from '../../../../utils/helpers';
 
 const BulkEditInAppPreviewModal = ({
   open,
@@ -94,7 +95,7 @@ const BulkEditInAppPreviewModal = ({
     },
   });
 
-  const visibleColumnKeys = visibleColumns?.filter(item => !item.selected).map(item => item.value);
+  const visibleColumnKeys = getVisibleColumnsKeys(visibleColumns);
 
   const isChangedPreviewReady = bulkDetails && Object.hasOwn(bulkDetails, FILE_KEYS.PROPOSED_CHANGES_LINK);
 

diff --git a/src/components/BulkEditList/BulkEditListResult/Preview/PreviewAccordion/PreviewAccordion.js b/src/components/BulkEditList/BulkEditListResult/Preview/PreviewAccordion/PreviewAccordion.js
@@ -1,4 +1,4 @@
-import { memo, useMemo } from 'react';
+import { memo } from 'react';
 import { PropTypes } from 'prop-types';
 import { FormattedMessage } from 'react-intl';
 import {
@@ -8,6 +8,7 @@ import {
   MultiColumnList,
 } from '@folio/stripes/components';
 import { PREVIEW_COLUMN_WIDTHS } from '../../../../PermissionsModal/constants/lists';
+import { getVisibleColumnsKeys } from '../../../../../utils/helpers';
 
 
 const PreviewAccordion = ({ contentData, columnMapping, visibleColumns, isInitial, step }) => {
@@ -16,9 +17,7 @@ const PreviewAccordion = ({ contentData, columnMapping, visibleColumns, isInitia
 
   const accordionLabel = <FormattedMessage id={`ui-bulk-edit.list.preview.${translationKey}`} />;
 
-  const visibleColumnKeys = useMemo(() => {
-    return visibleColumns?.filter(item => !item.selected).map(item => item.value);
-  }, [visibleColumns]);
+  const visibleColumnKeys = getVisibleColumnsKeys(visibleColumns);
 
   return (
     <Accordion

diff --git a/src/utils/helpers.js b/src/utils/helpers.js
@@ -71,4 +71,7 @@ export const getMappedAndSortedNotes = ({
   return mappedNotes.sort((a, b) => a.label.localeCompare(b.label));
 };
 
+export const getVisibleColumnsKeys = (columns) => {
+  return columns?.filter(item => item.selected).map(item => item.value);
+};
 
diff --git a/src/utils/mappers/mappers.js b/src/utils/mappers/mappers.js
@@ -55,7 +55,7 @@ export const getMappedTableData = ({ data, capabilities, intl }) => {
     label: cell.value,
     value: cell.value,
     disabled: false,
-    selected: !cell.visible,
+    selected: cell.visible || cell.forceVisible,
     ignoreTranslation: cell.ignoreTranslation,
   }));