Merge pull request #1277 from folio-org/release_10.0.1

Release 10.0.1
folio-org · Nov 9, 2023 · b3150d4 · b3150d4
2 parents 86fbca3 + f290f7c
commit b3150d4
Show file tree

Hide file tree

Showing 15 changed files with 960 additions and 165 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Change history for ui-agreements
 
+## 10.0.1 2023-11-09
+* ERM-3082 Backport grouping and spaces fix for Poppy
+* ERM-3065 Agreement lines are displayed by default on the "Agreement lines" pane.
+* ERM-3061 On setting document filter spaces are stripped from filter value
+
 ## 10.0.0 2023-10-12
 * ERM-3052 In Document filter builder OR displays on screen instead of AND
 * ERM-3046 Agreement lines search MCL - Implement MCL Next/Previous pagination

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@folio/agreements",
-  "version": "10.0.0",
+  "version": "10.0.1",
   "description": "ERM agreement functionality for Stripes",
   "main": "src/index.js",
   "publishConfig": {
@@ -46,7 +46,7 @@
   },
   "dependencies": {
     "@folio/stripes-acq-components": "^5.0.0",
-    "@k-int/stripes-kint-components": "^5.1.1",
+    "@k-int/stripes-kint-components": "^5.2.3",
     "@rehooks/local-storage": "^2.4.4",
     "compose-function": "^3.0.3",
     "final-form": "^4.18.4",

diff --git a/src/components/AgreementContentFilter/AgreementContentFilter.js b/src/components/AgreementContentFilter/AgreementContentFilter.js
@@ -58,13 +58,13 @@ const AgreementContentFieldArray = ({ handleSubmit }) => {
                       dataOptions={[
                         { value: '', label: '' },
                         {
-                          value: 'isNotEmpty',
+                          value: ' isNotEmpty', // The space is part of the comparator
                           label: intl.formatMessage({
                             id: 'ui-agreements.agreementContent.filter.has',
                           }),
                         },
                         {
-                          value: 'isEmpty',
+                          value: ' isEmpty', // The space is part of the comparator
                           label: intl.formatMessage({
                             id: 'ui-agreements.agreementContent.filter.hasNot',
                           }),
@@ -246,7 +246,7 @@ const AgreementContentFilter = ({
                   path: 'inwardRelationships',
                   comparator: curr.attribute,
                 },
-                curr.attribute === 'isEmpty' ? '&&' : '||',
+                curr.attribute === ' isEmpty' ? '&&' : '||',
                 {
                   path: 'outwardRelationships',
                   comparator: curr.attribute,
@@ -279,8 +279,6 @@ const AgreementContentFilter = ({
         // FIXME this isn't ideal, KIWT should accept spaces in query -- Ask Steve
         agreementContent: [
           deparseKiwtQueryFilters(kiwtQueryFilterShape)
-            .replaceAll(' || ', '||')
-            .replaceAll(' && ', '&&'),
         ],
       });
     }

diff --git a/src/components/AgreementDocumentFilter/AgreementDocumentFilter.js b/src/components/AgreementDocumentFilter/AgreementDocumentFilter.js
@@ -85,7 +85,7 @@ const AgreementDocumentFilter = ({ activeFilters, filterHandlers }) => {
       documents: [
         // Currently the deparse function returns a query string containing whitespace which leads to grouping errors
         // This regex removes all whitespace from the querystring
-        deparseKiwtQueryFilters(kiwtQueryShape).replaceAll(/\s/g, ''),
+        deparseKiwtQueryFilters(kiwtQueryShape),
       ],
     });
     setEditingFilters(false);

diff --git a/src/routes/AgreementLinesRoute/AgreementLinesRoute.js b/src/routes/AgreementLinesRoute/AgreementLinesRoute.js
@@ -71,7 +71,7 @@ const AgreementLinesRoute = ({
       return ky.get(`${AGREEMENT_LINES_ENDPOINT}?${params?.join('&')}`).json();
     },
     {
-      enabled: !!currentPage
+      enabled: (!!query?.filters || !!query?.query) && !!currentPage
     }
   );
 

diff --git a/translations/ui-agreements/cs_CZ.json b/translations/ui-agreements/cs_CZ.json
@@ -769,24 +769,24 @@
     "titles.identifiers": "Identifikátory",
     "titles.alternateResourceName": "Alternativní název",
     "titles.description": "Popis",
-    "packages.name": "Name",
-    "packages.identifiers": "Identifiers",
-    "packages.alternateResourceName": "Alternative name",
-    "packages.description": "Description",
-    "documentFilter.documents": "Documents",
-    "documentFilter.filtersApplied": "{filtersLength} document filters applied",
-    "documentFilter.editDocumentFilters": "Edit document filters",
-    "documentFilter.documentFilterBuilder": "Document filter builder",
-    "documentFilter.deleteFilterIndex": "Delete filter {number}",
-    "documentFilter.documentFilterIndex": "Document filter {number}",
-    "documentFilter.addFilter": "Add filter",
-    "documentFilter.attribute": "Attribute",
-    "documentFilter.comparator": "Comparator",
-    "documentFilter.addRule": "Add rule",
-    "documentFilter.removeRule": "Remove rule {number}",
-    "agreements.contentTypes": "Content types",
-    "agreementContent": "Agreement content",
-    "agreementContent.filter.addFilter": "Add filter",
-    "agreementContent.filter.has": "Has",
-    "agreementContent.filter.hasNot": "Has not"
+    "packages.name": "Jméno",
+    "packages.identifiers": "Identifikátory",
+    "packages.alternateResourceName": "Alternativní název",
+    "packages.description": "Popis",
+    "documentFilter.documents": "Dokumenty",
+    "documentFilter.filtersApplied": "{filtersLength} použité filtry dokumentů",
+    "documentFilter.editDocumentFilters": "Upravit filtry dokumentů",
+    "documentFilter.documentFilterBuilder": "Tvůrce filtru dokumentů",
+    "documentFilter.deleteFilterIndex": "Smazat filtr {number}",
+    "documentFilter.documentFilterIndex": "Filtr dokumentů {number}",
+    "documentFilter.addFilter": "Přidat filtr",
+    "documentFilter.attribute": "Atribut",
+    "documentFilter.comparator": "Porovnávač",
+    "documentFilter.addRule": "Přidat pravidlo",
+    "documentFilter.removeRule": "Odebrat pravidlo {number}",
+    "agreements.contentTypes": "Typy obsahu",
+    "agreementContent": "Obsah smlouvy",
+    "agreementContent.filter.addFilter": "Přidat filtr",
+    "agreementContent.filter.has": "Má",
+    "agreementContent.filter.hasNot": "Nemá"
 }
diff --git a/translations/ui-agreements/de.json b/translations/ui-agreements/de.json
@@ -433,7 +433,7 @@
     "default": "Standard",
     "eresources.relatedTitle": "Zugehöriger Titel \"{name}\"",
     "identifier.eissn.issn": "eISSN/ISSN",
-    "eresources.contentType": "Paketinhaltstyp",
+    "eresources.contentType": "Inhaltstyp",
     "eresources.holdingStatus": "Bestandsstatus",
     "eresources.selected": "Ausgewählt",
     "eresources.notSelected": "Nicht ausgewählt",
@@ -747,14 +747,14 @@
     "packages": "Pakete",
     "permission.packages.view": "Vereinbarungen: Pakete suchen und anzeigen",
     "packages.source": "Quelle (externe Datenquelle)",
-    "agreements.agreementContentType": "Content type",
-    "agreements.addAgreementContentType": "Add content type",
-    "eresources.proxiedAndCustomizedUrls": "Proxied and customized URLs",
-    "eresources.proxiesCustomizers": "Proxies/Customizers",
+    "agreements.agreementContentType": "Inhaltstyp",
+    "agreements.addAgreementContentType": "Inhaltstyp hinzufügen",
+    "eresources.proxiedAndCustomizedUrls": "Proxy- und angepasste URLs",
+    "eresources.proxiesCustomizers": "Proxys/Anpasser",
     "eresources.url": "URL",
-    "agreements.agreementLineCount": "Agreement has {count, number} agreement {count, plural, one {line} other {lines}}",
-    "open.linkInNewTab": "(opens in new tab)",
-    "agreementLineCountHeader": "{count, number} Agreement {count, plural, one {line} other {lines}}",
+    "agreements.agreementLineCount": "Vereinbarung hat {count, number} {count, plural, one {Vereinbarungskomponente} other {Vereinbarungskomponenten}}",
+    "open.linkInNewTab": "(öffnet in neuem Tab)",
+    "agreementLineCountHeader": "{count, number} {count, plural, one {Vereinbarungskomponente} other {Vereinbarungskomponenten}}\"",
     "relationship.inward.supersedes": "wird ersetzt durch",
     "relationship.inward.provides_post-cancellation_access_for": "hat Post-Cancellation-Access in",
     "relationship.inward.tracks_demand-driven_acquisitions_for": "hat Demand-Driven-Acquisition in",
@@ -766,27 +766,27 @@
     "relationship.outward.has_backfile_in": "hat Backfile in",
     "relationship.outward.related_to": "zugehörig zu",
     "titles.name": "Name",
-    "titles.identifiers": "Identifiers",
-    "titles.alternateResourceName": "Alternative name",
-    "titles.description": "Description",
+    "titles.identifiers": "Identifikator",
+    "titles.alternateResourceName": "Alternativer Name",
+    "titles.description": "Beschreibung",
     "packages.name": "Name",
-    "packages.identifiers": "Identifiers",
-    "packages.alternateResourceName": "Alternative name",
-    "packages.description": "Description",
-    "documentFilter.documents": "Documents",
-    "documentFilter.filtersApplied": "{filtersLength} document filters applied",
-    "documentFilter.editDocumentFilters": "Edit document filters",
-    "documentFilter.documentFilterBuilder": "Document filter builder",
-    "documentFilter.deleteFilterIndex": "Delete filter {number}",
-    "documentFilter.documentFilterIndex": "Document filter {number}",
-    "documentFilter.addFilter": "Add filter",
-    "documentFilter.attribute": "Attribute",
-    "documentFilter.comparator": "Comparator",
-    "documentFilter.addRule": "Add rule",
-    "documentFilter.removeRule": "Remove rule {number}",
-    "agreements.contentTypes": "Content types",
-    "agreementContent": "Agreement content",
-    "agreementContent.filter.addFilter": "Add filter",
-    "agreementContent.filter.has": "Has",
-    "agreementContent.filter.hasNot": "Has not"
+    "packages.identifiers": "Identifikator",
+    "packages.alternateResourceName": "Alternativer Name",
+    "packages.description": "Beschreibung",
+    "documentFilter.documents": "Dokumente",
+    "documentFilter.filtersApplied": "{filtersLength} Dokumentfilter angewendet",
+    "documentFilter.editDocumentFilters": "Dokumentfilter bearbeiten",
+    "documentFilter.documentFilterBuilder": "Dokumentfilter-Baukasten",
+    "documentFilter.deleteFilterIndex": "Filter {number} löschen",
+    "documentFilter.documentFilterIndex": "Dokumentfilter {number}",
+    "documentFilter.addFilter": "Filter hinzufügen",
+    "documentFilter.attribute": "Attribut",
+    "documentFilter.comparator": "Komparator",
+    "documentFilter.addRule": "Regel hinzufügen",
+    "documentFilter.removeRule": "Regel {number} entfernen",
+    "agreements.contentTypes": "Inhaltstypen",
+    "agreementContent": "Vereinbarungsinhalt",
+    "agreementContent.filter.addFilter": "Filter hinzufügen",
+    "agreementContent.filter.has": "Hat",
+    "agreementContent.filter.hasNot": "Hat nicht"
 }
diff --git a/translations/ui-agreements/es.json b/translations/ui-agreements/es.json
@@ -769,24 +769,24 @@
     "titles.identifiers": "Identifiers",
     "titles.alternateResourceName": "Alternative name",
     "titles.description": "Description",
-    "packages.name": "Name",
+    "packages.name": "Nombre",
     "packages.identifiers": "Identifiers",
     "packages.alternateResourceName": "Alternative name",
     "packages.description": "Description",
-    "documentFilter.documents": "Documents",
+    "documentFilter.documents": "Documentos",
     "documentFilter.filtersApplied": "{filtersLength} document filters applied",
     "documentFilter.editDocumentFilters": "Edit document filters",
     "documentFilter.documentFilterBuilder": "Document filter builder",
     "documentFilter.deleteFilterIndex": "Delete filter {number}",
     "documentFilter.documentFilterIndex": "Document filter {number}",
     "documentFilter.addFilter": "Add filter",
-    "documentFilter.attribute": "Attribute",
+    "documentFilter.attribute": "Atributo",
     "documentFilter.comparator": "Comparator",
-    "documentFilter.addRule": "Add rule",
+    "documentFilter.addRule": "Añadir regla",
     "documentFilter.removeRule": "Remove rule {number}",
     "agreements.contentTypes": "Content types",
     "agreementContent": "Agreement content",
-    "agreementContent.filter.addFilter": "Add filter",
-    "agreementContent.filter.has": "Has",
+    "agreementContent.filter.addFilter": "Añadir filtro",
+    "agreementContent.filter.has": "Tiene",
     "agreementContent.filter.hasNot": "Has not"
 }
diff --git a/translations/ui-agreements/es_419.json b/translations/ui-agreements/es_419.json
@@ -769,24 +769,24 @@
     "titles.identifiers": "Identificadores",
     "titles.alternateResourceName": "Nombre alternativo",
     "titles.description": "Descripción",
-    "packages.name": "Name",
+    "packages.name": "Nombre",
     "packages.identifiers": "Identifiers",
     "packages.alternateResourceName": "Alternative name",
     "packages.description": "Description",
-    "documentFilter.documents": "Documents",
+    "documentFilter.documents": "Documentos",
     "documentFilter.filtersApplied": "{filtersLength} document filters applied",
     "documentFilter.editDocumentFilters": "Edit document filters",
     "documentFilter.documentFilterBuilder": "Document filter builder",
     "documentFilter.deleteFilterIndex": "Delete filter {number}",
     "documentFilter.documentFilterIndex": "Document filter {number}",
     "documentFilter.addFilter": "Add filter",
-    "documentFilter.attribute": "Attribute",
+    "documentFilter.attribute": "Atributo",
     "documentFilter.comparator": "Comparator",
-    "documentFilter.addRule": "Add rule",
+    "documentFilter.addRule": "Añadir regla",
     "documentFilter.removeRule": "Remove rule {number}",
     "agreements.contentTypes": "Content types",
     "agreementContent": "Agreement content",
-    "agreementContent.filter.addFilter": "Add filter",
-    "agreementContent.filter.has": "Has",
+    "agreementContent.filter.addFilter": "Añadir filtro",
+    "agreementContent.filter.has": "Tiene",
     "agreementContent.filter.hasNot": "Has not"
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -71,7 +71,7 @@ const AgreementLinesRoute = ({ @@
           return ky.get(`${AGREEMENT_LINES_ENDPOINT}?${params?.join('&')}`).json();
         },
         {
-          enabled: !!currentPage
+          enabled: (!!query?.filters || !!query?.query) && !!currentPage
         }
       );
@@ Expand Down @@