From b5bebc30e684c8f43fee7dfae347a2e27500b141 Mon Sep 17 00:00:00 2001 From: UladzislauKutarkin <72550466+UladzislauKutarkin@users.noreply.github.com> Date: Thu, 17 Oct 2024 10:45:12 +0400 Subject: [PATCH 1/3] UIBULKED-555: Rearrange item statuses order (#613) --- CHANGELOG.md | 1 + src/constants/selectOptions.js | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3842b857..08e08c5d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -61,6 +61,7 @@ * [UIBULKED-501](https://folio-org.atlassian.net/browse/UIBULKED-501) Downloading .mrc file from Confirmation form * [UIBULKED-539](https://folio-org.atlassian.net/browse/UIBULKED-539) Handle validation cases for “In.1“, “In.2“, "Subfield" fields on Bulk edit MARC fields form. * [UIBULKED-549](https://folio-org.atlassian.net/browse/UIBULKED-549) Add additional item status. +* [UIBULKED-555](https://folio-org.atlassian.net/browse/UIBULKED-555)Rearrange item statuses order. ## [4.1.4](https://github.com/folio-org/ui-bulk-edit/tree/v4.1.4) (2024-05-29) diff --git a/src/constants/selectOptions.js b/src/constants/selectOptions.js index 833da1fb..170132b3 100644 --- a/src/constants/selectOptions.js +++ b/src/constants/selectOptions.js @@ -403,14 +403,19 @@ export const getItemStatusOptions = (formatMessage) => [ label: formatMessage({ id: 'ui-bulk-edit.layer.options.available' }), disabled: false, }, + { + value: 'Missing', + label: formatMessage({ id: 'ui-bulk-edit.layer.options.missing' }), + disabled: false, + }, { value: 'Withdrawn', label: formatMessage({ id: 'ui-bulk-edit.layer.options.withdrawn' }), disabled: false, }, { - value: 'Missing', - label: formatMessage({ id: 'ui-bulk-edit.layer.options.missing' }), + value: 'IN_PROCESS', + label: formatMessage({ id: 'ui-bulk-edit.layer.options.inProcess' }), disabled: false, }, { @@ -443,11 +448,6 @@ export const getItemStatusOptions = (formatMessage) => [ label: formatMessage({ id: 'ui-bulk-edit.layer.options.unknown' }), disabled: false, }, - { - value: 'IN_PROCESS', - label: formatMessage({ id: 'ui-bulk-edit.layer.options.inProcess' }), - disabled: false, - } ]; export const EDIT_CAPABILITIES_OPTIONS = [ From afaf987d441e5d57bc5910c6efd972c370086839 Mon Sep 17 00:00:00 2001 From: UladzislauKutarkin <72550466+UladzislauKutarkin@users.noreply.github.com> Date: Thu, 17 Oct 2024 17:01:28 +0400 Subject: [PATCH 2/3] UIBULKED-559: Update subfield validation in MARC form (#612) --- CHANGELOG.md | 1 + .../BulkEditListResult/BulkEditMark/validation.js | 4 ++-- src/hooks/api/useElectronicAccessEsc.js | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 08e08c5d..f6760857 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -62,6 +62,7 @@ * [UIBULKED-539](https://folio-org.atlassian.net/browse/UIBULKED-539) Handle validation cases for “In.1“, “In.2“, "Subfield" fields on Bulk edit MARC fields form. * [UIBULKED-549](https://folio-org.atlassian.net/browse/UIBULKED-549) Add additional item status. * [UIBULKED-555](https://folio-org.atlassian.net/browse/UIBULKED-555)Rearrange item statuses order. +* [UIBULKED-559](https://folio-org.atlassian.net/browse/UIBULKED-559) Update subfield validation in MARC form. ## [4.1.4](https://github.com/folio-org/ui-bulk-edit/tree/v4.1.4) (2024-05-29) diff --git a/src/components/BulkEditPane/BulkEditListResult/BulkEditMark/validation.js b/src/components/BulkEditPane/BulkEditListResult/BulkEditMark/validation.js index a56597fb..6a57b1db 100644 --- a/src/components/BulkEditPane/BulkEditListResult/BulkEditMark/validation.js +++ b/src/components/BulkEditPane/BulkEditListResult/BulkEditMark/validation.js @@ -10,7 +10,7 @@ const subfieldSchema = { .test( 'is-valid-subfield', 'ui-bulk-edit.layer.marc.error.subfield', - (value) => /^[a-zA-Z0-9]+$/.test(value) // Латинские буквы и цифры + (value) => /^[a-z-0-9]+$/.test(value), ), actions: array(object({ name: string() @@ -31,7 +31,7 @@ const subfieldSchema = { (value, context) => { const { key } = context.parent; if (key === 'SUBFIELD') { - return /^[a-zA-Z0-9]+$/.test(value); + return /^[a-z-0-9]+$/.test(value); } return true; } diff --git a/src/hooks/api/useElectronicAccessEsc.js b/src/hooks/api/useElectronicAccessEsc.js index 610c970f..58a31a57 100644 --- a/src/hooks/api/useElectronicAccessEsc.js +++ b/src/hooks/api/useElectronicAccessEsc.js @@ -13,7 +13,7 @@ export const useElectronicAccessEsc = (tenants, options = {}) => { (tenantData, tenantName) => tenantData.response?.electronicAccessRelationships?.map(type => ({ ...type, name: `${type.name} (${tenantName})`, - tenantName, + tenantName, })), options ); From 3ec45339925769ae76ba09efac2ef4b96a6cdd3a Mon Sep 17 00:00:00 2001 From: UladzislauKutarkin <72550466+UladzislauKutarkin@users.noreply.github.com> Date: Thu, 17 Oct 2024 18:17:07 +0400 Subject: [PATCH 3/3] UIBULKED-558: Add translation for new "Member" column (#615) --- CHANGELOG.md | 1 + translations/ui-bulk-edit/en.json | 2 ++ 2 files changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f6760857..841dc0db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -63,6 +63,7 @@ * [UIBULKED-549](https://folio-org.atlassian.net/browse/UIBULKED-549) Add additional item status. * [UIBULKED-555](https://folio-org.atlassian.net/browse/UIBULKED-555)Rearrange item statuses order. * [UIBULKED-559](https://folio-org.atlassian.net/browse/UIBULKED-559) Update subfield validation in MARC form. +* [UIBULKED-558](https://folio-org.atlassian.net/browse/UIBULKED-558) Add translation for new "Member" column. ## [4.1.4](https://github.com/folio-org/ui-bulk-edit/tree/v4.1.4) (2024-05-29) diff --git a/translations/ui-bulk-edit/en.json b/translations/ui-bulk-edit/en.json index 2f818de8..4c89e058 100644 --- a/translations/ui-bulk-edit/en.json +++ b/translations/ui-bulk-edit/en.json @@ -245,6 +245,7 @@ "columns.ITEM.Item UUID": "Item UUID", "columns.ITEM.Instance (Title, Publisher, Publication date)": "Instance (Title, Publisher, Publication date)", "columns.ITEM.Holdings UUID": "Holdings UUID", + "columns.ITEM.Member": "Member", "columns.HOLDINGS_RECORD.Holdings record id": "Holdings ID", "columns.HOLDINGS_RECORD.Version": "Version", @@ -303,6 +304,7 @@ "columns.HOLDINGS_RECORD.Electronic bookplate": "Electronic bookplate note", "columns.HOLDINGS_RECORD.Provenance": "Provenance note", "columns.HOLDINGS_RECORD.Reproduction": "Reproduction note", + "columns.HOLDINGS_RECORD.Member": "Member", "columns.INSTANCE.Suppress from discovery": "Suppress from discovery", "columns.INSTANCE.Instance HRID": "Instance HRID",