Skip to content

Commit b3150d4

Browse files
EthanFreestoneEthanFreestone
authored
Merge pull request #1277 from folio-org/release_10.0.1
Release 10.0.1
2 parents 86fbca3 + f290f7c commit b3150d4

File tree

15 files changed

+960
-165
lines changed

15 files changed

+960
-165
lines changed

‎CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Change history for ui-agreements
22

3+
## 10.0.1 2023-11-09
4+
* ERM-3082 Backport grouping and spaces fix for Poppy
5+
* ERM-3065 Agreement lines are displayed by default on the "Agreement lines" pane.
6+
* ERM-3061 On setting document filter spaces are stripped from filter value
7+
38
## 10.0.0 2023-10-12
49
* ERM-3052 In Document filter builder OR displays on screen instead of AND
510
* ERM-3046 Agreement lines search MCL - Implement MCL Next/Previous pagination

‎package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@folio/agreements",
3-
"version": "10.0.0",
3+
"version": "10.0.1",
44
"description": "ERM agreement functionality for Stripes",
55
"main": "src/index.js",
66
"publishConfig": {
@@ -46,7 +46,7 @@
4646
},
4747
"dependencies": {
4848
"@folio/stripes-acq-components": "^5.0.0",
49-
"@k-int/stripes-kint-components": "^5.1.1",
49+
"@k-int/stripes-kint-components": "^5.2.3",
5050
"@rehooks/local-storage": "^2.4.4",
5151
"compose-function": "^3.0.3",
5252
"final-form": "^4.18.4",

‎src/components/AgreementContentFilter/AgreementContentFilter.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ const AgreementContentFieldArray = ({ handleSubmit }) => {
5858
dataOptions={[
5959
{ value: '', label: '' },
6060
{
61-
value: 'isNotEmpty',
61+
value: ' isNotEmpty', // The space is part of the comparator
6262
label: intl.formatMessage({
6363
id: 'ui-agreements.agreementContent.filter.has',
6464
}),
6565
},
6666
{
67-
value: 'isEmpty',
67+
value: ' isEmpty', // The space is part of the comparator
6868
label: intl.formatMessage({
6969
id: 'ui-agreements.agreementContent.filter.hasNot',
7070
}),
@@ -246,7 +246,7 @@ const AgreementContentFilter = ({
246246
path: 'inwardRelationships',
247247
comparator: curr.attribute,
248248
},
249-
curr.attribute === 'isEmpty' ? '&&' : '||',
249+
curr.attribute === ' isEmpty' ? '&&' : '||',
250250
{
251251
path: 'outwardRelationships',
252252
comparator: curr.attribute,
@@ -279,8 +279,6 @@ const AgreementContentFilter = ({
279279
// FIXME this isn't ideal, KIWT should accept spaces in query -- Ask Steve
280280
agreementContent: [
281281
deparseKiwtQueryFilters(kiwtQueryFilterShape)
282-
.replaceAll(' || ', '||')
283-
.replaceAll(' && ', '&&'),
284282
],
285283
});
286284
}

‎src/components/AgreementDocumentFilter/AgreementDocumentFilter.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ const AgreementDocumentFilter = ({ activeFilters, filterHandlers }) => {
8585
documents: [
8686
// Currently the deparse function returns a query string containing whitespace which leads to grouping errors
8787
// This regex removes all whitespace from the querystring
88-
deparseKiwtQueryFilters(kiwtQueryShape).replaceAll(/\s/g, ''),
88+
deparseKiwtQueryFilters(kiwtQueryShape),
8989
],
9090
});
9191
setEditingFilters(false);

‎src/routes/AgreementLinesRoute/AgreementLinesRoute.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ const AgreementLinesRoute = ({
7171
return ky.get(`${AGREEMENT_LINES_ENDPOINT}?${params?.join('&')}`).json();
7272
},
7373
{
74-
enabled: !!currentPage
74+
enabled: (!!query?.filters || !!query?.query) && !!currentPage
7575
}
7676
);
7777

‎translations/ui-agreements/cs_CZ.json

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -769,24 +769,24 @@
769769
"titles.identifiers": "Identifikátory",
770770
"titles.alternateResourceName": "Alternativní název",
771771
"titles.description": "Popis",
772-
"packages.name": "Name",
773-
"packages.identifiers": "Identifiers",
774-
"packages.alternateResourceName": "Alternative name",
775-
"packages.description": "Description",
776-
"documentFilter.documents": "Documents",
777-
"documentFilter.filtersApplied": "{filtersLength} document filters applied",
778-
"documentFilter.editDocumentFilters": "Edit document filters",
779-
"documentFilter.documentFilterBuilder": "Document filter builder",
780-
"documentFilter.deleteFilterIndex": "Delete filter {number}",
781-
"documentFilter.documentFilterIndex": "Document filter {number}",
782-
"documentFilter.addFilter": "Add filter",
783-
"documentFilter.attribute": "Attribute",
784-
"documentFilter.comparator": "Comparator",
785-
"documentFilter.addRule": "Add rule",
786-
"documentFilter.removeRule": "Remove rule {number}",
787-
"agreements.contentTypes": "Content types",
788-
"agreementContent": "Agreement content",
789-
"agreementContent.filter.addFilter": "Add filter",
790-
"agreementContent.filter.has": "Has",
791-
"agreementContent.filter.hasNot": "Has not"
772+
"packages.name": "Jméno",
773+
"packages.identifiers": "Identifikátory",
774+
"packages.alternateResourceName": "Alternativní název",
775+
"packages.description": "Popis",
776+
"documentFilter.documents": "Dokumenty",
777+
"documentFilter.filtersApplied": "{filtersLength} použité filtry dokumentů",
778+
"documentFilter.editDocumentFilters": "Upravit filtry dokumentů",
779+
"documentFilter.documentFilterBuilder": "Tvůrce filtru dokumentů",
780+
"documentFilter.deleteFilterIndex": "Smazat filtr {number}",
781+
"documentFilter.documentFilterIndex": "Filtr dokumentů {number}",
782+
"documentFilter.addFilter": "Přidat filtr",
783+
"documentFilter.attribute": "Atribut",
784+
"documentFilter.comparator": "Porovnávač",
785+
"documentFilter.addRule": "Přidat pravidlo",
786+
"documentFilter.removeRule": "Odebrat pravidlo {number}",
787+
"agreements.contentTypes": "Typy obsahu",
788+
"agreementContent": "Obsah smlouvy",
789+
"agreementContent.filter.addFilter": "Přidat filtr",
790+
"agreementContent.filter.has": "Má",
791+
"agreementContent.filter.hasNot": "Nemá"
792792
}

‎translations/ui-agreements/de.json

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@
433433
"default": "Standard",
434434
"eresources.relatedTitle": "Zugehöriger Titel \"{name}\"",
435435
"identifier.eissn.issn": "eISSN/ISSN",
436-
"eresources.contentType": "Paketinhaltstyp",
436+
"eresources.contentType": "Inhaltstyp",
437437
"eresources.holdingStatus": "Bestandsstatus",
438438
"eresources.selected": "Ausgewählt",
439439
"eresources.notSelected": "Nicht ausgewählt",
@@ -747,14 +747,14 @@
747747
"packages": "Pakete",
748748
"permission.packages.view": "Vereinbarungen: Pakete suchen und anzeigen",
749749
"packages.source": "Quelle (externe Datenquelle)",
750-
"agreements.agreementContentType": "Content type",
751-
"agreements.addAgreementContentType": "Add content type",
752-
"eresources.proxiedAndCustomizedUrls": "Proxied and customized URLs",
753-
"eresources.proxiesCustomizers": "Proxies/Customizers",
750+
"agreements.agreementContentType": "Inhaltstyp",
751+
"agreements.addAgreementContentType": "Inhaltstyp hinzufügen",
752+
"eresources.proxiedAndCustomizedUrls": "Proxy- und angepasste URLs",
753+
"eresources.proxiesCustomizers": "Proxys/Anpasser",
754754
"eresources.url": "URL",
755-
"agreements.agreementLineCount": "Agreement has {count, number} agreement {count, plural, one {line} other {lines}}",
756-
"open.linkInNewTab": "(opens in new tab)",
757-
"agreementLineCountHeader": "{count, number} Agreement {count, plural, one {line} other {lines}}",
755+
"agreements.agreementLineCount": "Vereinbarung hat {count, number} {count, plural, one {Vereinbarungskomponente} other {Vereinbarungskomponenten}}",
756+
"open.linkInNewTab": "(öffnet in neuem Tab)",
757+
"agreementLineCountHeader": "{count, number} {count, plural, one {Vereinbarungskomponente} other {Vereinbarungskomponenten}}\"",
758758
"relationship.inward.supersedes": "wird ersetzt durch",
759759
"relationship.inward.provides_post-cancellation_access_for": "hat Post-Cancellation-Access in",
760760
"relationship.inward.tracks_demand-driven_acquisitions_for": "hat Demand-Driven-Acquisition in",
@@ -766,27 +766,27 @@
766766
"relationship.outward.has_backfile_in": "hat Backfile in",
767767
"relationship.outward.related_to": "zugehörig zu",
768768
"titles.name": "Name",
769-
"titles.identifiers": "Identifiers",
770-
"titles.alternateResourceName": "Alternative name",
771-
"titles.description": "Description",
769+
"titles.identifiers": "Identifikator",
770+
"titles.alternateResourceName": "Alternativer Name",
771+
"titles.description": "Beschreibung",
772772
"packages.name": "Name",
773-
"packages.identifiers": "Identifiers",
774-
"packages.alternateResourceName": "Alternative name",
775-
"packages.description": "Description",
776-
"documentFilter.documents": "Documents",
777-
"documentFilter.filtersApplied": "{filtersLength} document filters applied",
778-
"documentFilter.editDocumentFilters": "Edit document filters",
779-
"documentFilter.documentFilterBuilder": "Document filter builder",
780-
"documentFilter.deleteFilterIndex": "Delete filter {number}",
781-
"documentFilter.documentFilterIndex": "Document filter {number}",
782-
"documentFilter.addFilter": "Add filter",
783-
"documentFilter.attribute": "Attribute",
784-
"documentFilter.comparator": "Comparator",
785-
"documentFilter.addRule": "Add rule",
786-
"documentFilter.removeRule": "Remove rule {number}",
787-
"agreements.contentTypes": "Content types",
788-
"agreementContent": "Agreement content",
789-
"agreementContent.filter.addFilter": "Add filter",
790-
"agreementContent.filter.has": "Has",
791-
"agreementContent.filter.hasNot": "Has not"
773+
"packages.identifiers": "Identifikator",
774+
"packages.alternateResourceName": "Alternativer Name",
775+
"packages.description": "Beschreibung",
776+
"documentFilter.documents": "Dokumente",
777+
"documentFilter.filtersApplied": "{filtersLength} Dokumentfilter angewendet",
778+
"documentFilter.editDocumentFilters": "Dokumentfilter bearbeiten",
779+
"documentFilter.documentFilterBuilder": "Dokumentfilter-Baukasten",
780+
"documentFilter.deleteFilterIndex": "Filter {number} löschen",
781+
"documentFilter.documentFilterIndex": "Dokumentfilter {number}",
782+
"documentFilter.addFilter": "Filter hinzufügen",
783+
"documentFilter.attribute": "Attribut",
784+
"documentFilter.comparator": "Komparator",
785+
"documentFilter.addRule": "Regel hinzufügen",
786+
"documentFilter.removeRule": "Regel {number} entfernen",
787+
"agreements.contentTypes": "Inhaltstypen",
788+
"agreementContent": "Vereinbarungsinhalt",
789+
"agreementContent.filter.addFilter": "Filter hinzufügen",
790+
"agreementContent.filter.has": "Hat",
791+
"agreementContent.filter.hasNot": "Hat nicht"
792792
}

‎translations/ui-agreements/es.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -769,24 +769,24 @@
769769
"titles.identifiers": "Identifiers",
770770
"titles.alternateResourceName": "Alternative name",
771771
"titles.description": "Description",
772-
"packages.name": "Name",
772+
"packages.name": "Nombre",
773773
"packages.identifiers": "Identifiers",
774774
"packages.alternateResourceName": "Alternative name",
775775
"packages.description": "Description",
776-
"documentFilter.documents": "Documents",
776+
"documentFilter.documents": "Documentos",
777777
"documentFilter.filtersApplied": "{filtersLength} document filters applied",
778778
"documentFilter.editDocumentFilters": "Edit document filters",
779779
"documentFilter.documentFilterBuilder": "Document filter builder",
780780
"documentFilter.deleteFilterIndex": "Delete filter {number}",
781781
"documentFilter.documentFilterIndex": "Document filter {number}",
782782
"documentFilter.addFilter": "Add filter",
783-
"documentFilter.attribute": "Attribute",
783+
"documentFilter.attribute": "Atributo",
784784
"documentFilter.comparator": "Comparator",
785-
"documentFilter.addRule": "Add rule",
785+
"documentFilter.addRule": "Añadir regla",
786786
"documentFilter.removeRule": "Remove rule {number}",
787787
"agreements.contentTypes": "Content types",
788788
"agreementContent": "Agreement content",
789-
"agreementContent.filter.addFilter": "Add filter",
790-
"agreementContent.filter.has": "Has",
789+
"agreementContent.filter.addFilter": "Añadir filtro",
790+
"agreementContent.filter.has": "Tiene",
791791
"agreementContent.filter.hasNot": "Has not"
792792
}

‎translations/ui-agreements/es_419.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -769,24 +769,24 @@
769769
"titles.identifiers": "Identificadores",
770770
"titles.alternateResourceName": "Nombre alternativo",
771771
"titles.description": "Descripción",
772-
"packages.name": "Name",
772+
"packages.name": "Nombre",
773773
"packages.identifiers": "Identifiers",
774774
"packages.alternateResourceName": "Alternative name",
775775
"packages.description": "Description",
776-
"documentFilter.documents": "Documents",
776+
"documentFilter.documents": "Documentos",
777777
"documentFilter.filtersApplied": "{filtersLength} document filters applied",
778778
"documentFilter.editDocumentFilters": "Edit document filters",
779779
"documentFilter.documentFilterBuilder": "Document filter builder",
780780
"documentFilter.deleteFilterIndex": "Delete filter {number}",
781781
"documentFilter.documentFilterIndex": "Document filter {number}",
782782
"documentFilter.addFilter": "Add filter",
783-
"documentFilter.attribute": "Attribute",
783+
"documentFilter.attribute": "Atributo",
784784
"documentFilter.comparator": "Comparator",
785-
"documentFilter.addRule": "Add rule",
785+
"documentFilter.addRule": "Añadir regla",
786786
"documentFilter.removeRule": "Remove rule {number}",
787787
"agreements.contentTypes": "Content types",
788788
"agreementContent": "Agreement content",
789-
"agreementContent.filter.addFilter": "Add filter",
790-
"agreementContent.filter.has": "Has",
789+
"agreementContent.filter.addFilter": "Añadir filtro",
790+
"agreementContent.filter.has": "Tiene",
791791
"agreementContent.filter.hasNot": "Has not"
792792
}

0 commit comments

Comments
 (0)