Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into UIBULKED-553
Browse files Browse the repository at this point in the history
vashjs authored Oct 20, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
2 parents 44bdd8d + 3ec4533 commit 0f810b4
Showing 4 changed files with 14 additions and 9 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -61,6 +61,9 @@
* [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.
* [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)

Original file line number Diff line number Diff line change
@@ -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;
}
14 changes: 7 additions & 7 deletions src/constants/selectOptions.js
Original file line number Diff line number Diff line change
@@ -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 = [
2 changes: 2 additions & 0 deletions translations/ui-bulk-edit/en.json
Original file line number Diff line number Diff line change
@@ -241,6 +241,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",
@@ -299,6 +300,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",

0 comments on commit 0f810b4

Please sign in to comment.