From 488635a35247440f9200d52823929c17b88f76f3 Mon Sep 17 00:00:00 2001
From: UladzislauKutarkin
 <72550466+UladzislauKutarkin@users.noreply.github.com>
Date: Thu, 9 Nov 2023 17:58:58 +0400
Subject: [PATCH 1/2] UIBULKED-377: Not all note types are displayed using
 "Change note type" (#408)

---
 CHANGELOG.md                                         |  1 +
 .../BulkEditInApp/ContentUpdatesForm/ValuesColumn.js | 12 ------------
 .../BulkEditInApp/ContentUpdatesForm/helpers.js      |  2 +-
 src/constants/core.js                                |  1 -
 4 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 667ab7a2..34e70781 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 * [UIBULKED-331](https://issues.folio.org/browse/UIBULKED-331) Bulk edit actions for holdings notes - add and remove notes.
 * [UIBULKED-332](https://issues.folio.org/browse/UIBULKED-332) Bulk edit actions for holdings notes - find and replace or remove.
 * [UIBULKED-333](https://issues.folio.org/browse/UIBULKED-333) Bulk edit actions for holdings notes - change note type.
+* [UIBULKED-377](https://issues.folio.org/browse/UIBULKED-377) Not all note types are displayed using "Change note type".
 
 ## [4.0.0](https://github.com/folio-org/ui-bulk-edit/tree/v4.0.0) (2023-10-12)
 
diff --git a/src/components/BulkEditList/BulkEditListResult/BulkEditInApp/ContentUpdatesForm/ValuesColumn.js b/src/components/BulkEditList/BulkEditListResult/BulkEditInApp/ContentUpdatesForm/ValuesColumn.js
index 946e0b7d..393fb0b6 100644
--- a/src/components/BulkEditList/BulkEditListResult/BulkEditInApp/ContentUpdatesForm/ValuesColumn.js
+++ b/src/components/BulkEditList/BulkEditListResult/BulkEditInApp/ContentUpdatesForm/ValuesColumn.js
@@ -204,17 +204,6 @@ export const ValuesColumn = ({ action, actionIndex, onChange, option }) => {
   />
   );
 
-  const renderNoteHoldingsTypeSelect = () => controlType === CONTROL_TYPES.HOLDINGS_NOTE && (
-    <Select
-      id="noteHoldingsType"
-      value={action.value}
-      loading={isHoldingsNotesLoading}
-      onChange={e => onChange({ actionIndex, value: e.target.value, fieldName: FIELD_VALUE_KEY })}
-      dataOptions={sortedHoldingsNotes}
-      aria-label={formatMessage({ id: 'ui-bulk-edit.ariaLabel.loanTypeSelect' })}
-    />
-  );
-
   return (
     <Col xs={2} sm={2}>
       {renderTextField()}
@@ -226,7 +215,6 @@ export const ValuesColumn = ({ action, actionIndex, onChange, option }) => {
       {renderLoanTypeSelect()}
       {renderNoteTypeSelect()}
       {renderNoteDuplicateTypeSelect()}
-      {renderNoteHoldingsTypeSelect()}
     </Col>
   );
 };
diff --git a/src/components/BulkEditList/BulkEditListResult/BulkEditInApp/ContentUpdatesForm/helpers.js b/src/components/BulkEditList/BulkEditListResult/BulkEditInApp/ContentUpdatesForm/helpers.js
index 691b55e2..93595337 100644
--- a/src/components/BulkEditList/BulkEditListResult/BulkEditInApp/ContentUpdatesForm/helpers.js
+++ b/src/components/BulkEditList/BulkEditListResult/BulkEditInApp/ContentUpdatesForm/helpers.js
@@ -282,7 +282,7 @@ export const getDefaultActions = (option, options, formatMessage) => {
             actionsList: noteWithMarkDefaultActions,
             controlType: (action) => {
               return action === ACTIONS.CHANGE_TYPE
-                ? CONTROL_TYPES.HOLDINGS_NOTE
+                ? CONTROL_TYPES.NOTE_SELECT
                 : CONTROL_TYPES.TEXTAREA;
             },
             [ACTION_VALUE_KEY]: noteWithMarkDefaultActions[0].value,
diff --git a/src/constants/core.js b/src/constants/core.js
index 0bc36587..3177ae11 100644
--- a/src/constants/core.js
+++ b/src/constants/core.js
@@ -75,7 +75,6 @@ export const CONTROL_TYPES = {
   TEXTAREA: 'TEXTAREA',
   NOTE_SELECT: 'NOTE_SELECT',
   NOTE_DUPLICATE_SELECT: 'NOTE_DUPLICATE_SELECT',
-  HOLDINGS_NOTE: 'HOLDINGS_NOTE'
 };
 
 export const TRANSLATION_SUFFIX = {

From 8c67b303481951d983c85e8ad9237afa7add2711 Mon Sep 17 00:00:00 2001
From: UladzislauKutarkin
 <72550466+UladzislauKutarkin@users.noreply.github.com>
Date: Tue, 14 Nov 2023 09:18:11 +0400
Subject: [PATCH 2/2] UIBULKED-372: Bulk edit - Element IDs are not unique.
 (#407)

---
 CHANGELOG.md                                                  | 1 +
 .../BulkEditInAppPreviewModal/BulkEditInAppPreviewModal.js    | 2 ++
 .../BulkEditList/BulkEditListResult/Preview/Preview.js        | 1 +
 .../Preview/PreviewAccordion/PreviewAccordion.js              | 4 +++-
 .../Preview/PreviewAccordion/PreviewAccordion.test.js         | 1 +
 5 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 34e70781..136d71f0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@
 * [UIBULKED-332](https://issues.folio.org/browse/UIBULKED-332) Bulk edit actions for holdings notes - find and replace or remove.
 * [UIBULKED-333](https://issues.folio.org/browse/UIBULKED-333) Bulk edit actions for holdings notes - change note type.
 * [UIBULKED-377](https://issues.folio.org/browse/UIBULKED-377) Not all note types are displayed using "Change note type".
+* [UIBULKED-372](https://issues.folio.org/browse/UIBULKED-372) Bulk edit - Element IDs are not unique.
 
 ## [4.0.0](https://github.com/folio-org/ui-bulk-edit/tree/v4.0.0) (2023-10-12)
 
diff --git a/src/components/BulkEditList/BulkEditListResult/BulkEditInAppPreviewModal/BulkEditInAppPreviewModal.js b/src/components/BulkEditList/BulkEditListResult/BulkEditInAppPreviewModal/BulkEditInAppPreviewModal.js
index 40905310..d83b1fcc 100644
--- a/src/components/BulkEditList/BulkEditListResult/BulkEditInAppPreviewModal/BulkEditInAppPreviewModal.js
+++ b/src/components/BulkEditList/BulkEditListResult/BulkEditInAppPreviewModal/BulkEditInAppPreviewModal.js
@@ -44,6 +44,7 @@ const BulkEditInAppPreviewModal = ({
   const history = useHistory();
   const search = new URLSearchParams(history.location.search);
   const capabilities = search.get('capabilities');
+  const step = search.get('step');
   const { visibleColumns } = useContext(RootContext);
 
   const swwCallout = () => (
@@ -176,6 +177,7 @@ const BulkEditInAppPreviewModal = ({
             columnMapping={columnMapping}
             visibleColumns={visibleColumnKeys}
             maxHeight={300}
+            columnIdPrefix={step}
           />
         </>
       ) : <Preloader />}
diff --git a/src/components/BulkEditList/BulkEditListResult/Preview/Preview.js b/src/components/BulkEditList/BulkEditListResult/Preview/Preview.js
index 012d6d99..6f0d0a33 100644
--- a/src/components/BulkEditList/BulkEditListResult/Preview/Preview.js
+++ b/src/components/BulkEditList/BulkEditListResult/Preview/Preview.js
@@ -72,6 +72,7 @@ export const Preview = ({ id, title, isInitial, bulkDetails }) => {
             contentData={contentData}
             columnMapping={columnMapping}
             visibleColumns={visibleColumns}
+            step={step}
           />
         )}
         {Boolean(errors?.length) && (
diff --git a/src/components/BulkEditList/BulkEditListResult/Preview/PreviewAccordion/PreviewAccordion.js b/src/components/BulkEditList/BulkEditListResult/Preview/PreviewAccordion/PreviewAccordion.js
index 322cf09f..cb9dc692 100644
--- a/src/components/BulkEditList/BulkEditListResult/Preview/PreviewAccordion/PreviewAccordion.js
+++ b/src/components/BulkEditList/BulkEditListResult/Preview/PreviewAccordion/PreviewAccordion.js
@@ -9,7 +9,7 @@ import {
 } from '@folio/stripes/components';
 
 
-const PreviewAccordion = ({ contentData, columnMapping, visibleColumns, isInitial }) => {
+const PreviewAccordion = ({ contentData, columnMapping, visibleColumns, isInitial, step }) => {
   const translationKey = isInitial ? 'title' : 'titleChanged';
   const maxHeight = window.innerHeight * 0.4;
 
@@ -31,6 +31,7 @@ const PreviewAccordion = ({ contentData, columnMapping, visibleColumns, isInitia
             columnMapping={columnMapping}
             visibleColumns={visibleColumnKeys}
             maxHeight={maxHeight}
+            columnIdPrefix={step}
           />
         </Col>
       </Row>
@@ -43,6 +44,7 @@ PreviewAccordion.propTypes = {
   columnMapping: PropTypes.object,
   visibleColumns: PropTypes.arrayOf(PropTypes.object),
   isInitial: PropTypes.bool,
+  step: PropTypes.string,
 };
 
 export default memo(PreviewAccordion);
diff --git a/src/components/BulkEditList/BulkEditListResult/Preview/PreviewAccordion/PreviewAccordion.test.js b/src/components/BulkEditList/BulkEditListResult/Preview/PreviewAccordion/PreviewAccordion.test.js
index 3d24114c..b0403f81 100644
--- a/src/components/BulkEditList/BulkEditListResult/Preview/PreviewAccordion/PreviewAccordion.test.js
+++ b/src/components/BulkEditList/BulkEditListResult/Preview/PreviewAccordion/PreviewAccordion.test.js
@@ -77,6 +77,7 @@ const renderPreviewAccordion = ({
         visibleColumns={visibleColumns}
         columnMapping={columnMapping}
         initial={initial}
+        step="UPLOAD"
       />
     </RootContext.Provider>,
   );