@eeacms/volto-clms-theme 1.0.138 → 1.0.140

package/CHANGELOG.md

@@ -4,6 +4,30 @@ 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.140](https://github.com/eea/volto-clms-theme/compare/1.0.139...1.0.140) - 7 November 2022
+
+#### :bug: Bug Fixes
+
+- fix: use UniversalLink to render the final link, and include the download url of the file [Mikel Larreategi - [`8a490db`](https://github.com/eea/volto-clms-theme/commit/8a490db836f72e1330aa2e22db5e8222fd7dbc53)]
+
+#### :house: Internal changes
+
+- chore: use UniversalLink [Mikel Larreategi - [`f304971`](https://github.com/eea/volto-clms-theme/commit/f304971e4d555dd16498ceccc5ff43586d81626b)]
+
+#### :hammer_and_wrench: Others
+
+- new sorting for geographical classification facet [Mikel Larreategi - [`4faaa55`](https://github.com/eea/volto-clms-theme/commit/4faaa55ac2bc2bd8b783d929b30faffa025bae38)]
+### [1.0.139](https://github.com/eea/volto-clms-theme/compare/1.0.138...1.0.139) - 4 November 2022
+
+#### :bug: Bug Fixes
+
+- fix: check parent when children is checked [ionlizarazu - [`9f82598`](https://github.com/eea/volto-clms-theme/commit/9f825985c8e0705c4a568629a6c535d4ecd369d8)]
+- fix: small bugfixes [ionlizarazu - [`7db1b27`](https://github.com/eea/volto-clms-theme/commit/7db1b2782ac824ed97d0e820f02153edfcf58f0e)]
+
+#### :hammer_and_wrench: Others
+
+- taxonomyWidget checkbox behavior [ionlizarazu - [`91575e5`](https://github.com/eea/volto-clms-theme/commit/91575e581ad07ef19a1d012d6bc9862e5080725d)]
+- add Interval hook to dispatch the query every 60 seconds [ionlizarazu - [`39fb6da`](https://github.com/eea/volto-clms-theme/commit/39fb6da38af389b48df04d57196f445c8317f097)]
 ### [1.0.138](https://github.com/eea/volto-clms-theme/compare/1.0.137...1.0.138) - 27 October 2022
 
 #### :bug: Bug Fixes
@@ -460,7 +484,6 @@ 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)]
@@ -611,7 +634,6 @@ 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
@@ -1516,13 +1538,11 @@ 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.138",
+  "version": "1.0.140",
   "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/VoltoListingBlock/CclListingCards.jsx

@@ -5,6 +5,7 @@ import { flattenToAppURL } from '@plone/volto/helpers';
 
 import { isInternalURL } from '@plone/volto/helpers/Url/Url';
 import { useSelector } from 'react-redux';
+import { UniversalLink } from '@plone/volto/components';
 
 import CclCard from '@eeacms/volto-clms-theme/components/CclCard/CclCard';
 
@@ -27,7 +28,7 @@ const CclListingCards = (props) => {
       </ConditionalLink>
     );
   } else if (href) {
-    link = <a href={href}>{linkTitle || href}</a>;
+    link = <UniversalLink href={href}>{linkTitle || href}</UniversalLink>;
   }
   let containerClass = '';
   if (['news', 'event'].includes(variation)) {

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

@@ -53,10 +53,10 @@ const DoubleRangeFacet = (props) => {
 
   const startingValues = convertToRange(choices);
 
-  const onChangeRange = (rValue, onChangeR, sValue) => {
+  const onChangeRange = (nValue, onChangeR, sValue) => {
     const fixedValue = {
-      min: rValue.min < sValue.min ? sValue.min : rValue.min,
-      max: rValue.max > sValue.max ? sValue.max : rValue.max,
+      min: nValue.min < sValue.min ? sValue.min : nValue.min,
+      max: nValue.max > sValue.max ? sValue.max : nValue.max,
     };
     onChangeR(
       facet.field.value,
@@ -83,7 +83,7 @@ const DoubleRangeFacet = (props) => {
           <InputRange
             minValue={startingValues.min}
             maxValue={startingValues.max}
-            step={facet.step ?? 1}
+            step={facet.step ? parseInt(facet.step) : 1}
             value={
               facetValue.length > 0
                 ? convertToRange(facetValue)

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

@@ -52,6 +52,13 @@ const rewriteOptions = (name, choices) => {
     'Document',
   ];
 
+  const dataset_geographical_classification = [
+    'EEA',
+    'Northern hemisphere',
+    'Southern hemisphere',
+    'Global',
+  ];
+
   if (name === 'portal_type') {
     result = choices
       .filter((opt) => portal_types.includes(opt.value))
@@ -114,6 +121,16 @@ const rewriteOptions = (name, choices) => {
       return 0;
     });
   }
+
+  if (name === 'dataset_geographical_classification') {
+    result = choices.sort((a, b) => {
+      return (
+        dataset_geographical_classification.indexOf(a.value) -
+        dataset_geographical_classification.indexOf(b.value)
+      );
+    });
+  }
+
   return result;
 };
 

package/src/components/CLMSDownloadsView/CLMSDownloadsView.jsx

@@ -1,25 +1,45 @@
-/**
- * CLMSDownloadsView.
- * @module components/CLMSDownloadsView/CLMSDownloadsView
- */
+import React, { useEffect, useState } from 'react';
+import { defineMessages, useIntl } from 'react-intl';
+import { useDispatch, useSelector } from 'react-redux';
 
 import { Forbidden, Unauthorized } from '@plone/volto/components';
-import React, { useEffect } from 'react';
-import { defineMessages, useIntl } from 'react-intl';
+import { Helmet } from '@plone/volto/helpers';
+import useCartState from '@eeacms/volto-clms-utils/cart/useCartState';
+import { Segment } from 'semantic-ui-react';
+
 import {
   getDatasetsByUid,
   getExtraBreadcrumbItems,
   getDownloadtool,
 } from '../../actions';
-import { useDispatch, useSelector } from 'react-redux';
-
 import CLMSDownloadTask from './CLMSDownloadTasks';
-import { Helmet } from '@plone/volto/helpers';
-import useCartState from '@eeacms/volto-clms-utils/cart/useCartState';
+
+/**
+ * CLMSDownloadsView.
+ * @module components/CLMSDownloadsView/CLMSDownloadsView
+ */
+
+const useInterval = (f, delay) => {
+  const [timer, setTimer] = useState(undefined);
+  const start = () => {
+    if (timer) return;
+    setTimer(setInterval(f, delay));
+  };
+  const stop = () => {
+    if (!timer) return;
+    setTimer(clearInterval(timer));
+  };
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  useEffect(() => stop, []);
+  return start;
+};
 
 const CLMSDownloadsView = (props) => {
   const dispatch = useDispatch();
   const downloadtool = useSelector((state) => state.downloadtool);
+  const datasetsByUid = useSelector((state) => state.datasetsByUid);
+  /* DISPATCH THE getDownloadtool ACTION EVERY 60 SECONDS */
+  const start = useInterval((_) => dispatch(getDownloadtool()), 60000);
   const { isLoggedIn } = useCartState();
 
   const { formatMessage } = useIntl();
@@ -109,7 +129,9 @@ const CLMSDownloadsView = (props) => {
   useEffect(() => {
     if (downloadtool.delete_download_in_progress) {
       dispatch(getDownloadtool());
+      start();
     }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [dispatch, downloadtool.delete_download_in_progress]);
 
   return (
@@ -137,7 +159,12 @@ const CLMSDownloadsView = (props) => {
               {formatMessage(messages.CartDownloads)}
             </h1>
             <div className="ccl-container">
-              <CLMSDownloadTask />
+              <Segment
+                basic
+                loading={downloadtool.loading || datasetsByUid.loading}
+              >
+                <CLMSDownloadTask />
+              </Segment>
             </div>
           </>
         )}

package/src/components/CclCard/CclCard.jsx

@@ -13,6 +13,7 @@ import { Icon as VoltoIcon } from '@plone/volto/components';
 
 import PlaceHolder from '@eeacms/volto-clms-theme/../theme/clms/img/ccl-thumbnail-placeholder.jpg';
 import { cclDateFormat } from '@eeacms/volto-clms-theme/components/CclUtils';
+import { UniversalLink } from '@plone/volto/components';
 
 const CardImage = ({ card, size = 'preview', isCustomCard }) => {
   return card?.image_field ? (
@@ -142,7 +143,12 @@ function CclCard(props) {
                 </div>
                 <div className="card-text">
                   <div className="card-file-title">
-                    <CardLink url={url}>{card?.title}</CardLink>
+                    <UniversalLink
+                      openLinkInNewTab={true}
+                      href={url + '/@@download/file'}
+                    >
+                      {card?.title}
+                    </UniversalLink>
                   </div>
                   {showDates && (
                     <div className="card-file-date">

package/src/components/Widgets/TaxonomyWidget.jsx

@@ -170,12 +170,27 @@ const CheckboxListParent = ({ option, key, onChange, value, id }) => {
                 onChange={(event, { checked }) => {
                   checked
                     ? onChange(id, [
-                        ...value,
+                        ...value.filter(
+                          (v) =>
+                            option.childrens.filter(
+                              (ch) => ch.value === v.token,
+                            ).length === 0,
+                        ),
                         { title: option.original, token: option.value },
+                        ...option.childrens.map((ch) => {
+                          return { title: ch.original, token: ch.value };
+                        }),
                       ])
                     : onChange(
                         id,
-                        value.filter((item) => item.token !== option.value),
+                        value
+                          .filter((item) => item.token !== option.value)
+                          .filter(
+                            (v) =>
+                              option.childrens.filter(
+                                (ch) => ch.value === v.token,
+                              ).length === 0,
+                          ),
                       );
                 }}
                 label={
@@ -218,6 +233,11 @@ const CheckboxListParent = ({ option, key, onChange, value, id }) => {
                             ? onChange(id, [
                                 ...value,
                                 { title: child.original, token: child.value },
+                                value.filter((v) => v.token === option.value)
+                                  .length === 0 && {
+                                  title: option.original,
+                                  token: option.value,
+                                },
                               ])
                             : onChange(
                                 id,