@eeacms/volto-clms-theme 1.0.116 → 1.0.119

package/CHANGELOG.md

@@ -4,6 +4,49 @@ 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
+
+- fix: show also Document content-types in global search labelled as Page [Mikel Larreategi - [`9d36803`](https://github.com/eea/volto-clms-theme/commit/9d36803e7ac998e747d12c0860140e9887068660)]
+- fix: inputValue is true on unsubscribe view [Unai - [`5fd025c`](https://github.com/eea/volto-clms-theme/commit/5fd025cdc012e8d7861af61b20daeba6fa397eed)]
+- fix: slint [Unai - [`920d214`](https://github.com/eea/volto-clms-theme/commit/920d21442b61ea90503e8177c213b91ca0293dbb)]
+- fix(loginmodal): removed toPublicURL [Unai - [`a62804e`](https://github.com/eea/volto-clms-theme/commit/a62804eead7c7013a8270e4ef00da41e1e47e868)]
+
+### [1.0.117](https://github.com/eea/volto-clms-theme/compare/1.0.116...1.0.117) - 1 September 2022
+
+#### :bug: Bug Fixes
+
+- fix: do not force to open EU login link in a new window [Mikel Larreategi - [`13bcaad`](https://github.com/eea/volto-clms-theme/commit/13bcaadd631d96127411cca61b9b1428aec763e4)]
+- fix: fix typo [Mikel Larreategi - [`8714026`](https://github.com/eea/volto-clms-theme/commit/87140265aa55ea8e49674809355170d4593318f5)]
+- fix: sort gemet vocabulary values CLMS-1158 [Mikel Larreategi - [`46a5b97`](https://github.com/eea/volto-clms-theme/commit/46a5b97506d1297aaa31d53dafebd1c23b273a3d)]
+- fix: display the dropdown above the footer [ionlizarazu - [`e480a94`](https://github.com/eea/volto-clms-theme/commit/e480a947a12a5b7977a8bf59b4afe0c071734d67)]
+- fix: CLMS-1067 [Mikel Larreategi - [`e1b0346`](https://github.com/eea/volto-clms-theme/commit/e1b03468ebd2041e423a804dc4ae6ea4fbf5f3fb)]
+
+#### :nail_care: Enhancements
+
+- refactor(news events and datasets): remove related datasets and product accordions from news and events and replaced image scale used in datasets [Unai - [`6ec497e`](https://github.com/eea/volto-clms-theme/commit/6ec497eba91bc7345e281a9996e77df2420175e3)]
+- refactor(meeting): changed from Meeting Registration to Event Registration [Unai - [`f493ce7`](https://github.com/eea/volto-clms-theme/commit/f493ce768376f4ca30172810c54302c81d5c9610)]
+- refactor(widget): changed used widget in datetime cases [Unai - [`a4d8b8e`](https://github.com/eea/volto-clms-theme/commit/a4d8b8e099278f76ec2e5e7fd0d0ab7376f6dd00)]
+
+#### :hammer_and_wrench: Others
+
+- Revert "refactor(widget): changed used widget in datetime cases" [Mikel Larreategi - [`3d8da47`](https://github.com/eea/volto-clms-theme/commit/3d8da47a479c8fb3687360adaa577cc45e9c0873)]
+- Revert "refactor(meeting): changed from Meeting Registration to Event Registration" [Mikel Larreategi - [`c62583c`](https://github.com/eea/volto-clms-theme/commit/c62583ccf79429508a8f23d215acd16921ef7f1b)]
+- Revert "refactor(news events and datasets): remove related datasets and product accordions from news and events and replaced image scale used in datasets" [Mikel Larreategi - [`8d3699b`](https://github.com/eea/volto-clms-theme/commit/8d3699b98e7aafb4d97ecae4679b2c6e25b6e4bb)]
+- Revert "new version of volto-form-block and modifications to add links to checkbox description" [Mikel Larreategi - [`369478c`](https://github.com/eea/volto-clms-theme/commit/369478c74ee083d9e2225fefe098b833ded6e66d)]
+- Revert "fix: CLMS-1067" [Mikel Larreategi - [`2ed3159`](https://github.com/eea/volto-clms-theme/commit/2ed31599ece70dbe5792abbdd7e325cb74c6f29e)]
+- Revert "fix: display the dropdown above the footer" [Mikel Larreategi - [`5538ec6`](https://github.com/eea/volto-clms-theme/commit/5538ec6c73fbd7c94769aa98a8100a4e6ee8871c)]
+- Revert "fix: sort gemet vocabulary values CLMS-1158" [Mikel Larreategi - [`0f7535e`](https://github.com/eea/volto-clms-theme/commit/0f7535e902a684317eb78391b7372856b395007d)]
+- new version of volto-form-block and modifications to add links to checkbox description [ionlizarazu - [`b129e04`](https://github.com/eea/volto-clms-theme/commit/b129e04d8769e34a3acc3dc3feb1898ab18f2b51)]
 ### [1.0.116](https://github.com/eea/volto-clms-theme/compare/1.0.115...1.0.116) - 30 August 2022
 
 #### :hammer_and_wrench: Others
@@ -100,6 +143,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 #### :hammer_and_wrench: Others
 
 - related products and datasets added to news and meeting views and login-plone route created [Unai - [`5704a1a`](https://github.com/eea/volto-clms-theme/commit/5704a1a766148746162b60efaf232ea90dc20cf4)]
+- Revert "[JENKINS] Use eeacms/plone-backend and Volto alpha version- Refs #151967" [Mikel Larreategi - [`46eb694`](https://github.com/eea/volto-clms-theme/commit/46eb69415280a3c982405299135027ae4221426a)]
 - sort items according to the lowercased label and put those with special meaning at the end [Mikel Larreategi - [`6410abe`](https://github.com/eea/volto-clms-theme/commit/6410abe096f60dcad54dced2026c9df9b7946d68)]
 - lint fix [Unai - [`1264a7a`](https://github.com/eea/volto-clms-theme/commit/1264a7adfe8d679fea1bd821ad087add20f4271d)]
 - footer newsletter subscription change, global search maxLength change from 8000 to 200 and /login design change [Unai - [`a09d24a`](https://github.com/eea/volto-clms-theme/commit/a09d24adbb6fa053fb2a2cc0071506b906593b42)]
@@ -250,6 +294,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - search block new features [ionlizarazu - [`8e814cb`](https://github.com/eea/volto-clms-theme/commit/8e814cbd359782540c21fe37b37ef146d331f0d6)]
 - language selector cookie management [ionlizarazu - [`1385ac9`](https://github.com/eea/volto-clms-theme/commit/1385ac95795702206d3623ba6e780faa43a89e0a)]
 - toolbar cookie management [ionlizarazu - [`5c23200`](https://github.com/eea/volto-clms-theme/commit/5c23200790b20e1d4f1bc966463c37bf4c808f47)]
+- Add Sonarqube tag using clms-frontend addons list [EEA Jenkins - [`0316a0d`](https://github.com/eea/volto-clms-theme/commit/0316a0d8b6fb0fa14af13002415f3c95d9f8ede3)]
 ### [1.0.84](https://github.com/eea/volto-clms-theme/compare/1.0.83...1.0.84) - 18 March 2022
 
 #### :hammer_and_wrench: Others
@@ -1154,11 +1199,13 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 #### :hammer_and_wrench: Others
 
 - replace @collective/volto-dropdownmenu with volto-dropdownmenu [ionlizarazu - [`07f004f`](https://github.com/eea/volto-clms-theme/commit/07f004fe0219e403fb51bc045c83d34f3b981f76)]
+- yarn.lock [ionlizarazu - [`fe1ca04`](https://github.com/eea/volto-clms-theme/commit/fe1ca04889d29fe7b653db4c69af2751b84b8a1a)]
 - add NODE_ENV parameter [ionlizarazu - [`101f27c`](https://github.com/eea/volto-clms-theme/commit/101f27c25b8fbd192e1b11865e95cf5ffee08c1b)]
 - upgrade volto-dropdownmenu version [ionlizarazu - [`2081855`](https://github.com/eea/volto-clms-theme/commit/2081855301f4c708776e0dbab39db143cee00dbc)]
 - HomeSearch block missing url behaviour [ionlizarazu - [`d20a378`](https://github.com/eea/volto-clms-theme/commit/d20a378ce3f254b8343692348f314bf281974542)]
 - babel configuration [ionlizarazu - [`203ea2d`](https://github.com/eea/volto-clms-theme/commit/203ea2de07f99ca3403e4ca220ca74d7ce69b61d)]
 - prettier [ionlizarazu - [`e79e26b`](https://github.com/eea/volto-clms-theme/commit/e79e26bf2fa40ba7b4eb53a24dabd87928221c28)]
+- add yarn lock [ionlizarazu - [`e1ab28b`](https://github.com/eea/volto-clms-theme/commit/e1ab28b060d5a74431c368b0de82a68dabce1eab)]
 - Jenkinsfile cypress test [ionlizarazu - [`b385d65`](https://github.com/eea/volto-clms-theme/commit/b385d65986f717c60f8c434a08fc11b829d08eb4)]
 - cypress [ionlizarazu - [`a243cf0`](https://github.com/eea/volto-clms-theme/commit/a243cf0182fa3dd113c16ff495c71e310252d83b)]
 - some fixes [ionlizarazu - [`046279b`](https://github.com/eea/volto-clms-theme/commit/046279b9d05bea8a64eca03eed493e02621534c9)]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-clms-theme",
-  "version": "1.0.116",
+  "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

@@ -7,6 +7,7 @@ export const portal_types_labels = {
   WorkOpportunity: 'Job vacancy',
   Tender: 'Tender',
   TechnicalLibrary: 'Product documentation',
+  Document: 'Page',
 };
 
 export const category_labels = {
@@ -48,6 +49,7 @@ const rewriteOptions = (name, choices) => {
     'WorkOpportunity',
     'Tender',
     'TechnicalLibrary',
+    'Document',
   ];
   if (name === 'portal_type') {
     result = choices
@@ -78,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/CLMSDatasetDetailView/DataSetInfoContent.jsx

@@ -85,13 +85,15 @@ const DataSetInfoContent = (props) => {
           ></CclInfoDescription>
         )}
       </CclInfoContainer>
-      {citation?.data && citation?.data !== '<p><br/></p>' && (
-        <CclCitation
-          title="Citation status"
-          marginBottom={true}
-          children={<StringToHTML string={citation?.data} />}
-        ></CclCitation>
-      )}
+      {citation?.data &&
+        citation?.data !== '<p><br/></p>' &&
+        citation?.data !== '<p></p>' && (
+          <CclCitation
+            title="Citation status"
+            marginBottom={true}
+            children={<StringToHTML string={citation?.data} />}
+          ></CclCitation>
+        )}
       <div className="dataset-info-documents dropdown">
         <div className="accordion-block">
           {renderAccordion(geonetwork_identifiers?.items, libraries) && (

package/src/components/CLMSLoginView/CLMSLogin.jsx

@@ -45,7 +45,7 @@ function CLMSLoginView(props) {
             If you have EU Login account, please click 'Login using EU Login'.
           </p>
           <p>
-            If you don't have EU Login account, please folloe this{' '}
+            If you don't have EU Login account, please follow this{' '}
             <UniversalLink
               openLinkInNewTab
               href="https://ecas.ec.europa.eu/cas/eim/external/register.cgi"
@@ -68,7 +68,6 @@ function CLMSLoginView(props) {
         <div className="modal-buttons">
           <UniversalLink
             href={toPublicURL(loginUrl) || '#'}
-            openLinkInNewTab
             className="ccl-button ccl-button-green"
           >
             Login using EU Login

package/src/components/CLMSSubscriptionView/SubscriptionView.jsx

@@ -121,7 +121,7 @@ class SubscriptionView extends Component {
     this.state = {
       value: '',
       type_conf: null,
-      inputValue: false,
+      inputValue: this.props.isUnsubscribe ? true : false,
     };
   }
 

package/src/components/CclLoginModal/CclLoginModal.jsx

@@ -4,7 +4,6 @@ import { useDispatch, useSelector } from 'react-redux';
 import { getRegistry } from '@eeacms/volto-clms-theme/actions';
 import { FormattedMessage } from 'react-intl';
 import config from '@plone/volto/registry';
-import { toPublicURL } from '@plone/volto/helpers/Url/Url';
 import { UniversalLink } from '@plone/volto/components';
 import './ccl-login-modal.css';
 /**
@@ -70,7 +69,7 @@ function CclLoginModal(props) {
             If you have EU Login account, please click 'Login using EU Login'.
           </p>
           <p>
-            If you don't have EU Login account, please folloe this{' '}
+            If you don't have EU Login account, please follow this{' '}
             <UniversalLink
               openLinkInNewTab
               href="https://ecas.ec.europa.eu/cas/eim/external/register.cgi"
@@ -92,8 +91,7 @@ function CclLoginModal(props) {
       <div className="actions">
         <div className="modal-buttons">
           <UniversalLink
-            href={toPublicURL(loginUrl) || '#'}
-            openLinkInNewTab
+            href={loginUrl || '#'}
             className="ccl-button ccl-button-green"
           >
             Login using EU Login

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;
 };