@eeacms/volto-clms-theme 1.0.118 → 1.0.119

package/CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+### [1.0.119](https://github.com/eea/volto-clms-theme/compare/1.0.118...1.0.119) - 1 September 2022
+
+#### :bug: Bug Fixes
+
+- fix: restore taxonomy item ordering [Mikel Larreategi - [`5080a9f`](https://github.com/eea/volto-clms-theme/commit/5080a9f456888bba77042b673f62e3db5cfe86fb)]
+- fix: reverse checkbox label ordering [ionlizarazu - [`cd2ea37`](https://github.com/eea/volto-clms-theme/commit/cd2ea377f9f6c4cdd584dd9c5df41e3574fcd686)]
+- fix: search facet checkbox functionality. Order by title and replace starting text 00# from the checkbox labels [ionlizarazu - [`df69da5`](https://github.com/eea/volto-clms-theme/commit/df69da5124b25ac098b4204e20663524c2ebb91a)]
+
 ### [1.0.118](https://github.com/eea/volto-clms-theme/compare/1.0.117...1.0.118) - 1 September 2022
 
 #### :bug: Bug Fixes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-clms-theme",
-  "version": "1.0.118",
+  "version": "1.0.119",
   "description": "volto-clms-theme: Volto theme for CLMS site",
   "main": "src/index.js",
   "author": "CodeSyntax for the European Environment Agency",

package/src/components/Blocks/CustomTemplates/VoltoSearchBlock/CheckboxTreeParentFacet.jsx

@@ -10,7 +10,7 @@ import {
   selectFacetStateToValue,
   selectFacetValueToQuery,
 } from '@plone/volto/components/manage/Blocks/Search/components/base';
-import { checkAllChildren } from './utils';
+import { checkAllChildren, uncheckOptionAndChildren } from './utils';
 
 const hasAllChildrensSelected = (value, childrens) => {
   var result = true;
@@ -92,16 +92,9 @@ const CheckboxListParent = ({ option, key, onChange, value, id }) => {
                     ...checkAllChildren(value, option).map((f) => f.value),
                   ])
                 : onChange(id, [
-                    ...value
-                      .filter((item) => item.value !== option.value)
-                      .filter(
-                        (item) =>
-                          option.childrens?.length > 0 &&
-                          !option.childrens
-                            .map((ch) => ch.value)
-                            .includes(item.value),
-                      )
-                      .map((f) => f.value),
+                    ...uncheckOptionAndChildren(value, option).map(
+                      (f) => f.value,
+                    ),
                   ]);
             }}
             label={

package/src/components/Blocks/CustomTemplates/VoltoSearchBlock/rewriteOptions.js

@@ -80,6 +80,20 @@ const rewriteOptions = (name, choices) => {
         return 0;
       });
   }
+  if (name === 'taxonomy_technical_library_categorization') {
+    result = choices
+      .sort((a, b) => {
+        if (a.label < b.label) {
+          return -1;
+        } else if (a.label > b.label) {
+          return 1;
+        }
+        return 0;
+      })
+      .map((opt) => {
+        return { ...opt, label: opt.label.replace(/^[0-9][0-9]#/, '') };
+      });
+  }
   return result;
 };
 

package/src/components/Blocks/CustomTemplates/VoltoSearchBlock/utils.js

@@ -7,5 +7,17 @@ export const checkAllChildren = (value, option) => {
       value.push(ch);
     }
   });
-  return value;
+  return [...value, { label: option.label, value: option.value }];
+};
+
+export const uncheckOptionAndChildren = (value, option) => {
+  return value
+    .filter((item) => item.value !== option.value)
+    .filter((item) => {
+      if (option.childrens?.length > 0) {
+        return !option.childrens.map((ch) => ch.value).includes(item.value);
+      } else {
+        return true;
+      }
+    });
 };

package/src/components/Widgets/TaxonomyWidget.jsx

@@ -180,7 +180,7 @@ const CheckboxListParent = ({ option, key, onChange, value, id }) => {
                 }}
                 label={
                   <label htmlFor={`field-${option.value}`}>
-                    {option.label}
+                    {option.label.replace(/^[0-9][0-9]#/, '')}
                   </label>
                 }
                 checked={

package/src/components/Widgets/taxonomyUtils.js

@@ -46,5 +46,6 @@ export const structure_taxonomy_terms = (choices) => {
   // });
 
   // return sort_array_items_by_key(options, 'label');
-  return options.reverse();
+  //return options.reverse();
+  return options;
 };