Merge pull request #764 from folio-org/release/11.1.1

Release 11.1.1
folio-org · Nov 29, 2024 · 2a9d394 · 2a9d394
2 parents 771c23f + faf296c
commit 2a9d394
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Change history for ui-licenses
 
+## 11.1.1 2024-11-29
+  * ERM-3437 The License content filter is not set back to it's original state of two empty dropdown selection boxes
+  * ERM-3426 Search and sort results MCL scrolling does not work as expected
+  * ERM-3421 The incorrect header is displayed for the 'S3 bucket region' section
+
 ## 11.1.0 2024-11-01
   * ERM-3379 Update module license and guidance for ui-licenses
   * ERM-3353 Review and cleanup Module Descriptor for ui-licenses

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@folio/licenses",
-  "version": "11.1.0",
+  "version": "11.1.1",
   "description": "ERM License functionality for Stripes",
   "main": "src/index.js",
   "repository": "",
@@ -223,5 +223,8 @@
         "title": "Amendment"
       }
     ]
-  }
+  },
+  "resolutions": {
+    "nwsapi": "2.2.13"
+  }  
 }
diff --git a/src/components/Amendments/Amendments.js b/src/components/Amendments/Amendments.js
@@ -260,7 +260,6 @@ const Amendments = ({
                     sortDirection={sortOrder.startsWith('-') ? 'descending' : 'ascending'}
                     sortOrder={sortOrder.replace(/^-/, '').replace(/,.*/, '')}
                     totalCount={count}
-                    virtualize
                     visibleColumns={['name', 'status', 'startDate', 'endDate', 'parentLicense']}
                   />
                 </Pane>

diff --git a/src/components/ContentFilter/ContentFilter.js b/src/components/ContentFilter/ContentFilter.js
@@ -76,6 +76,7 @@ const ContentFieldArray = ({ handleSubmit, contentOptions, name }) => {
                       }}
                     />
                     <Field
+                      key={values[name][index]?.content}
                       component={MultiSelection}
                       dataOptions={translatedContentOptions}
                       id={`${filter}-content-multi-select`}

diff --git a/src/components/Licenses/Licenses.js b/src/components/Licenses/Licenses.js
@@ -330,7 +330,6 @@ const Licenses = ({
                       sortDirection={sortOrder.startsWith('-') ? 'descending' : 'ascending'}
                       sortOrder={sortOrder.replace(/^-/, '').replace(/,.*/, '')}
                       totalCount={count}
-                      virtualize
                       visibleColumns={['selected', 'name', 'type', 'status', 'startDate', 'endDate']}
                     />
                   </Pane>

diff --git a/translations/ui-licenses/en.json b/translations/ui-licenses/en.json
@@ -227,6 +227,7 @@
   "settings.fileStorage.s3ObjectPrefix": "S3 object prefix",
   "settings.fileStorage.s3SecretKey": "S3 secret key",
   "settings.fileStorage.storageEngine": "Storage engine",
+  "settings.fileStorage.s3BucketRegion": "S3 bucket region",
   "settings.customProperties.all": "All",
   "settings.customProperties.none": "None",
 

diff --git a/translations/ui-licenses/pl.json b/translations/ui-licenses/pl.json
@@ -208,7 +208,7 @@
     "customProperties.description": "Opis",
     "customProperties.category": "Lista wyboru",
     "customProperties.defaultVisibility": "Widoczność",
-    "customProperties.value": "Value(s)",
+    "customProperties.value": "Wartość(i)",
     "customProperties.visibility": "Widoczność",
     "customProperties.type.com.k_int.web.toolkit.custprops.types.CustomPropertyBlob": "Blob",
     "customProperties.type.com.k_int.web.toolkit.custprops.types.CustomPropertyBoolean": "Boolean",
@@ -246,7 +246,7 @@
     "customProperty.removeRule": "Remove rule",
     "comparator": "Operator",
     "value": "Wartość",
-    "valueOrValues": "Value(s)",
+    "valueOrValues": "Wartość(i)",
     "addRule": "Add rule",
     "AND": "I",
     "OR": "LUB",
@@ -280,7 +280,7 @@
     "terms.all": "Wszystko",
     "terms.none": "None",
     "license.noLicenseLinked": "No license linked",
-    "license.linkLicense": "Link license",
+    "license.linkLicense": "Połącz licencje",
     "license.linkLicenseToStart": "Link a license to get started",
     "license.replaceLicense": "Replace license",
     "license.replaceLicenseSpecific": "Replace license {licenseName}",

diff --git a/translations/ui-licenses/pt_BR.json b/translations/ui-licenses/pt_BR.json
@@ -44,7 +44,7 @@
     "supplementaryDocs.add": "Adicionar documento suplementar",
     "supplementaryDocs.none": "Nenhum documento suplementar foi adicionado",
     "loading": "Carregando...",
-    "searchInputLabel": "Pesquisa de licenças",
+    "searchInputLabel": "Buscar licenças",
     "closeEditLicense": "Fechar o painel de edição de licença",
     "create": "Criar",
     "section.internalContacts": "Contatos internos",
@@ -114,7 +114,7 @@
     "errors.noDeleteHasLinkedAgreements": "<strong>A licença não foi excluída</strong> porque está em uso em um ou mais contratos.",
     "errors.noDeleteLicenseBackendError": "<strong>A licença não foi excluída:</strong> {message}",
     "settings.label": "Rótulo",
-    "permission.licenses.view": "Licenças: Pesquisar e ver licenças",
+    "permission.licenses.view": "Licenças: Buscar e ver licenças",
     "permission.licenses.edit": "Licenças: Editar licenças",
     "permission.licenses.delete": "Licenças: Excluir licenças",
     "permission.picklists.manage": "Configurações (Licenças): Pode gerenciar listas de seleção e valores",