Merge branch 'refs/heads/master' into UIBULKED-599

# Conflicts: # CHANGELOG.md # src/components/BulkEditPane/BulkEditListResult/BulkEditInApp/ContentUpdatesForm/helpers.js # src/constants/inAppActions.js
folio-org · Jan 17, 2025 · 18b2884 · 18b2884
2 parents 606fcb3 + 24cd110
commit 18b2884
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@
 * [UIBULKED-574](https://folio-org.atlassian.net/browse/UIBULKED-574) Updates to Errors component.
 * [UIBULKED-571](https://folio-org.atlassian.net/browse/UIBULKED-571) Errors in response to UI calls.
 * [UIBULKED-568](https://folio-org.atlassian.net/browse/UIBULKED-568) Populating Are you sure? form
+* [UIBULKED-543](https://folio-org.atlassian.net/browse/UIBULKED-543) Rename Find (full field search) to Find.
 * [UIBULKED-599](https://folio-org.atlassian.net/browse/UIBULKED-599) Change Administrative note type is not supported for MARC instances.
 
 ## [4.2.2](https://github.com/folio-org/ui-bulk-edit/tree/v4.2.2) (2024-11-15)

diff --git a/src/components/BulkEditPane/BulkEditListResult/BulkEditInApp/ContentUpdatesForm/helpers.js b/src/components/BulkEditPane/BulkEditListResult/BulkEditInApp/ContentUpdatesForm/helpers.js
@@ -24,6 +24,7 @@ import {
   electronicAccess,
   statisticalCodeActions,
   noteActionsMarc,
+  electronicAccessWithFindFullField,
 } from '../../../../../constants';
 import { getActionParameters } from '../../../../../constants/actionParameters';
 
@@ -101,6 +102,7 @@ export const getDefaultActions = ({
   const noteWithMarcDefaultActions = noteActionsWithMarc();
   const noteDuplicateDefaultActions = noteActionsWithDuplicate();
   const electronicAccessActions = electronicAccess();
+  const electronicAccessFindFullFieldActions = electronicAccessWithFindFullField();
 
   const replaceClearInitialVal = replaceClearDefaultActions[0].value;
 
@@ -339,9 +341,9 @@ export const getDefaultActions = ({
         actions: [
           null,
           {
-            actionsList: electronicAccessActions,
+            actionsList: electronicAccessFindFullFieldActions,
             controlType: () => CONTROL_TYPES.ELECTRONIC_ACCESS_RELATIONSHIP_SELECT,
-            [ACTION_VALUE_KEY]: electronicAccessActions[0].value,
+            [ACTION_VALUE_KEY]: electronicAccessFindFullFieldActions[0].value,
             [FIELD_VALUE_KEY]: '',
           },
         ],

diff --git a/...mponents/BulkEditPane/BulkEditListResult/BulkEditInApp/ContentUpdatesForm/helpers.test.js b/...mponents/BulkEditPane/BulkEditListResult/BulkEditInApp/ContentUpdatesForm/helpers.test.js
@@ -641,7 +641,7 @@ describe('ContentUpdatesForm helpers', () => {
                       },
                       {
                         value: ACTIONS.FIND,
-                        label: <FormattedMessage id="ui-bulk-edit.actions.findFullField" />,
+                        label: <FormattedMessage id="ui-bulk-edit.actions.find" />,
                         disabled: false,
                       },
                       {
@@ -713,7 +713,7 @@ describe('ContentUpdatesForm helpers', () => {
                   },
                   {
                     value: ACTIONS.FIND,
-                    label: <FormattedMessage id="ui-bulk-edit.actions.findFullField" />,
+                    label: <FormattedMessage id="ui-bulk-edit.actions.find" />,
                     disabled: false,
                   },
                   {
@@ -818,7 +818,7 @@ describe('ContentUpdatesForm helpers', () => {
                     },
                     {
                       value: ACTIONS.FIND,
-                      label: <FormattedMessage id="ui-bulk-edit.actions.findFullField" />,
+                      label: <FormattedMessage id="ui-bulk-edit.actions.find" />,
                       disabled: false,
                     },
                     {
@@ -907,7 +907,7 @@ describe('ContentUpdatesForm helpers', () => {
                     },
                     {
                       value: ACTIONS.FIND,
-                      label: <FormattedMessage id="ui-bulk-edit.actions.findFullField" />,
+                      label: <FormattedMessage id="ui-bulk-edit.actions.find" />,
                       disabled: false,
                     },
                     {
@@ -1082,7 +1082,7 @@ describe('ContentUpdatesForm helpers', () => {
               },
               {
                 value: ACTIONS.FIND,
-                label: <FormattedMessage id="ui-bulk-edit.actions.findFullField" />,
+                label: <FormattedMessage id="ui-bulk-edit.actions.find" />,
                 disabled: false,
               },
               {

diff --git a/src/constants/inAppActions.js b/src/constants/inAppActions.js
@@ -161,7 +161,7 @@ export const noteActionsMarc = () => [
   getPlaceholder(),
   getAddToExistingAction(),
   getRemoveAllAction(),
-  getFindFullFieldAction(),
+  getFindAction(),
 ];
 
 export const noteActions = () => [
@@ -175,23 +175,31 @@ export const noteActionsWithMarc = () => [
   getRemoveMarcAsStuffOnlyAction(),
   getAddToExistingAction(),
   getRemoveAllAction(),
-  getFindFullFieldAction(),
+  getFindAction(),
   getChangeNoteTypeAction(),
 ];
 
 export const electronicAccess = () => [
+  getPlaceholder(),
+  getClearAction(),
+  getFindAction(),
+  getReplaceAction(),
+];
+
+export const electronicAccessWithFindFullField = () => [
   getPlaceholder(),
   getClearAction(),
   getFindFullFieldAction(),
   getReplaceAction(),
 ];
+
 export const noteActionsWithDuplicate = () => [
   getPlaceholder(),
   getMarcAsStuffOnlyAction(),
   getRemoveMarcAsStuffOnlyAction(),
   getAddToExistingAction(),
   getRemoveAllAction(),
-  getFindFullFieldAction(),
+  getFindAction(),
   getChangeNoteTypeAction(),
   getDuplicateToNoteAction(),
 ];