From 04e4022c5d3832045ddf1c26902130caed8a9cad Mon Sep 17 00:00:00 2001 From: vashjs Date: Thu, 16 Jan 2025 12:33:41 +0100 Subject: [PATCH 1/4] UIBULKED-543 Rename Find (full field search) to Find --- .../BulkEditInApp/ContentUpdatesForm/helpers.js | 6 ++++-- src/constants/inAppActions.js | 14 +++++++++++--- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/components/BulkEditPane/BulkEditListResult/BulkEditInApp/ContentUpdatesForm/helpers.js b/src/components/BulkEditPane/BulkEditListResult/BulkEditInApp/ContentUpdatesForm/helpers.js index 9dd8a644..c6fa9c5a 100644 --- a/src/components/BulkEditPane/BulkEditListResult/BulkEditInApp/ContentUpdatesForm/helpers.js +++ b/src/components/BulkEditPane/BulkEditListResult/BulkEditInApp/ContentUpdatesForm/helpers.js @@ -22,6 +22,7 @@ import { noteActionsWithDuplicate, electronicAccess, statisticalCodeActions, + electronicAccessWithFindFullField, } from '../../../../../constants'; import { getActionParameters } from '../../../../../constants/actionParameters'; @@ -97,6 +98,7 @@ export const getDefaultActions = ({ const noteWithMarcDefaultActions = noteActionsWithMarc(); const noteDuplicateDefaultActions = noteActionsWithDuplicate(); const electronicAccessActions = electronicAccess(); + const electronicAccessFindFullFieldActions = electronicAccessWithFindFullField(); const replaceClearInitialVal = replaceClearDefaultActions[0].value; @@ -333,9 +335,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/src/constants/inAppActions.js b/src/constants/inAppActions.js index 18d7c32b..f15a0ec1 100644 --- a/src/constants/inAppActions.js +++ b/src/constants/inAppActions.js @@ -161,7 +161,7 @@ export const noteActions = () => [ getPlaceholder(), getAddToExistingAction(), getRemoveAllAction(), - getFindFullFieldAction(), + getFindAction(), getChangeNoteTypeAction(), ]; @@ -171,23 +171,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(), ]; From 1ade2e9eefac2542916cdbbe9054f87bfbe9450c Mon Sep 17 00:00:00 2001 From: vashjs Date: Thu, 16 Jan 2025 12:34:40 +0100 Subject: [PATCH 2/4] update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f5885f86..89b85a3f 100644 --- 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. ## [4.2.2](https://github.com/folio-org/ui-bulk-edit/tree/v4.2.2) (2024-11-15) From 4d5cbb918d69f44c0f7ce4971c70bfce064f7461 Mon Sep 17 00:00:00 2001 From: vashjs Date: Thu, 16 Jan 2025 12:38:14 +0100 Subject: [PATCH 3/4] remove extra space --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 89b85a3f..78daf4fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +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-543](https://folio-org.atlassian.net/browse/UIBULKED-543) Rename Find (full field search) to Find. ## [4.2.2](https://github.com/folio-org/ui-bulk-edit/tree/v4.2.2) (2024-11-15) From 2fa4fe7c218f79b3a09f7789a3708ca7f79b03bd Mon Sep 17 00:00:00 2001 From: vashjs Date: Thu, 16 Jan 2025 13:10:18 +0100 Subject: [PATCH 4/4] fix tests --- .../BulkEditInApp/ContentUpdatesForm/helpers.test.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/BulkEditPane/BulkEditListResult/BulkEditInApp/ContentUpdatesForm/helpers.test.js b/src/components/BulkEditPane/BulkEditListResult/BulkEditInApp/ContentUpdatesForm/helpers.test.js index ce8fbf5b..97d7e473 100644 --- a/src/components/BulkEditPane/BulkEditListResult/BulkEditInApp/ContentUpdatesForm/helpers.test.js +++ b/src/components/BulkEditPane/BulkEditListResult/BulkEditInApp/ContentUpdatesForm/helpers.test.js @@ -640,7 +640,7 @@ describe('ContentUpdatesForm helpers', () => { }, { value: ACTIONS.FIND, - label: , + label: , disabled: false, }, { @@ -712,7 +712,7 @@ describe('ContentUpdatesForm helpers', () => { }, { value: ACTIONS.FIND, - label: , + label: , disabled: false, }, { @@ -817,7 +817,7 @@ describe('ContentUpdatesForm helpers', () => { }, { value: ACTIONS.FIND, - label: , + label: , disabled: false, }, { @@ -861,7 +861,7 @@ describe('ContentUpdatesForm helpers', () => { }, { value: ACTIONS.FIND, - label: , + label: , disabled: false, }, { @@ -1036,7 +1036,7 @@ describe('ContentUpdatesForm helpers', () => { }, { value: ACTIONS.FIND, - label: , + label: , disabled: false, }, {