@eeacms/volto-clms-theme 1.1.146 → 1.1.147

package/CHANGELOG.md

@@ -4,11 +4,16 @@ 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.1.146](https://github.com/eea/volto-clms-theme/compare/1.1.145...1.1.146) - 7 May 2024
+### [1.1.147](https://github.com/eea/volto-clms-theme/compare/1.1.146...1.1.147) - 10 May 2024
 
 #### :hammer_and_wrench: Others
 
-- cart modifications [Ion Lizarazu - [`0a0fb2f`](https://github.com/eea/volto-clms-theme/commit/0a0fb2f3b92d73f0ffdadac135f3de663101f2c9)]
+- fix cart funtionalities [Ion Lizarazu - [`d845e41`](https://github.com/eea/volto-clms-theme/commit/d845e4136ed578e60f9c50f52d7ec2cdecb6afdf)]
+- remove unneeded state [Ion Lizarazu - [`cd4fbfa`](https://github.com/eea/volto-clms-theme/commit/cd4fbfaddbe2c81130738b06513ceb788f875a18)]
+- remove the nuts request optimization try [Ion Lizarazu - [`c0a17c6`](https://github.com/eea/volto-clms-theme/commit/c0a17c652b6496ed2b6209d945874f68995732ea)]
+- include CclLoginModal component in the Unauthorized file [Ion Lizarazu - [`e348186`](https://github.com/eea/volto-clms-theme/commit/e348186bb8fc854d1c1c5431c4f576e1150dc404)]
+### [1.1.146](https://github.com/eea/volto-clms-theme/compare/1.1.145...1.1.146) - 7 May 2024
+
 ### [1.1.145](https://github.com/eea/volto-clms-theme/compare/1.1.144...1.1.145) - 7 May 2024
 
 #### :house: Internal changes
@@ -429,7 +434,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 - to render nothing, return null [Mikel Larreategi - [`2fb3580`](https://github.com/eea/volto-clms-theme/commit/2fb35802b23e3aba5fd166aeefd103c929ffb5d1)]
 - simplify condtioin [Mikel Larreategi - [`f9b43da`](https://github.com/eea/volto-clms-theme/commit/f9b43da91d360e0028402f9a7ba762f16b0d9b22)]
-- test: [JENKINS] Use java17 for sonarqube scanner [valentinab25 - [`7c6e9ca`](https://github.com/eea/volto-clms-theme/commit/7c6e9cac9da0c06d0f24711303404f5055fba7d1)]
 ### [1.1.80](https://github.com/eea/volto-clms-theme/compare/1.1.79...1.1.80) - 17 November 2023
 
 #### :bug: Bug Fixes
@@ -440,7 +444,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :hammer_and_wrench: Others
 
-- test: [JENKINS] Run cypress in started frontend container [valentinab25 - [`37c3299`](https://github.com/eea/volto-clms-theme/commit/37c3299dd19c95057e70d48152bfef2365f2416c)]
 - CLMS-2509 (Bug): Lint [Urkorue - [`1bbc011`](https://github.com/eea/volto-clms-theme/commit/1bbc011481c0ee1feb68d0cf57c4a5a9f4c224ca)]
 - CLMS-2509 (Bug): Timeseries icon centered [Urkorue - [`fc38685`](https://github.com/eea/volto-clms-theme/commit/fc3868598ab592f01bb3ee23f985ada5c11227d4)]
 ### [1.1.78](https://github.com/eea/volto-clms-theme/compare/1.1.77...1.1.78) - 16 November 2023
@@ -493,17 +496,14 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :hammer_and_wrench: Others
 
-- test: [JENKINS] Add cpu limit on cypress docker [valentinab25 - [`c55db1c`](https://github.com/eea/volto-clms-theme/commit/c55db1c20cfef1eb34c587343a4822fa4bde3c54)]
 ### [1.1.73](https://github.com/eea/volto-clms-theme/compare/1.1.72...1.1.73) - 6 November 2023
 
 #### :hammer_and_wrench: Others
 
-- test: [JENKINS] Increase shm-size to cypress docker [valentinab25 - [`3a543b9`](https://github.com/eea/volto-clms-theme/commit/3a543b9000c1168d54edfb8003eb08dfa7c85031)]
 - comment Integration tests [Ion Lizarazu - [`74713f8`](https://github.com/eea/volto-clms-theme/commit/74713f8f78d77ba193d8c27462cc8787d698ab81)]
 - uncomment cypress tests [Ion Lizarazu - [`3526a5c`](https://github.com/eea/volto-clms-theme/commit/3526a5c46481667b0518c6cce0927e67726c6f6c)]
 - use chrome instead of chromium to run cypress tests [Ion Lizarazu - [`6ae3a06`](https://github.com/eea/volto-clms-theme/commit/6ae3a06dbec1914c06a55c0dcb826c49b75f9739)]
 - ccltabs activeTab condition having first child [Ion Lizarazu - [`3cf9376`](https://github.com/eea/volto-clms-theme/commit/3cf9376d55f5f41b7e42c25e5925cd871ec71d81)]
-- test: [JENKINS] Improve cypress time [valentinab25 - [`f41ecfe`](https://github.com/eea/volto-clms-theme/commit/f41ecfea8b5a1e409303ffcc7befe7f51316d652)]
 ### [1.1.72](https://github.com/eea/volto-clms-theme/compare/1.1.71...1.1.72) - 2 November 2023
 
 ### [1.1.71](https://github.com/eea/volto-clms-theme/compare/1.1.70...1.1.71) - 31 October 2023
@@ -514,7 +514,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :house: Internal changes
 
-- chore: [JENKINS] Refactor automated testing [valentinab25 - [`67ca3bb`](https://github.com/eea/volto-clms-theme/commit/67ca3bb111f34842569c12b9c87a2a91bd14b09e)]
 
 #### :hammer_and_wrench: Others
 
@@ -611,7 +610,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 - readme [Mikel Larreategi - [`3c0ab05`](https://github.com/eea/volto-clms-theme/commit/3c0ab051981a4efad7712bc46182eed9d79fd10f)]
 - remove from addons [Mikel Larreategi - [`89c2e7d`](https://github.com/eea/volto-clms-theme/commit/89c2e7d793193e6bb64642f0b06a01cd3c81108a)]
-- yarn.lock added after running yarn [Unai - [`ad307be`](https://github.com/eea/volto-clms-theme/commit/ad307be72bbfe753f7571ea4d784a09978e0f7f2)]
 - prettier issue fix [Unai - [`8bc0650`](https://github.com/eea/volto-clms-theme/commit/8bc0650918f9fa1065d19d2c15ce153a5fc5abbb)]
 - set a limit of 5 items in the download queue [Mikel Larreategi - [`b81cc83`](https://github.com/eea/volto-clms-theme/commit/b81cc8383165bafbbff52fbeeb365d413051802e)]
 - adjust logo size [Mikel Larreategi - [`b90a72c`](https://github.com/eea/volto-clms-theme/commit/b90a72c07102025a7e90607b25d34611ddd4f4f6)]
@@ -753,7 +751,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 - fix cart items concat function [Ion Lizarazu - [`4b72249`](https://github.com/eea/volto-clms-theme/commit/4b72249ef17a0cda22661809fce5be7c2d1f6649)]
 - revert Jenkinsfile [Ion Lizarazu - [`64f6cd0`](https://github.com/eea/volto-clms-theme/commit/64f6cd08100357843b507c00d3286d7debe0ef04)]
-- yarn.lock file [Ion Lizarazu - [`8444ad1`](https://github.com/eea/volto-clms-theme/commit/8444ad1606b3939e4609bdd186e5ace2252588a8)]
 - packages.json versions order [Ion Lizarazu - [`4fd7a86`](https://github.com/eea/volto-clms-theme/commit/4fd7a86ab43238841b421e1ed10ebd52ab420a15)]
 - downloadablefilestablewidget param modification [Ion Lizarazu - [`5dd794a`](https://github.com/eea/volto-clms-theme/commit/5dd794a33a8eddd042a753b7ab47e7d2a323b011)]
 - add technical_documents_accordion_text field to the dataset view [Ion Lizarazu - [`96ed1e5`](https://github.com/eea/volto-clms-theme/commit/96ed1e5e2c2b501bd303bc76b333a70ad1614c16)]
@@ -878,7 +875,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 - remove NUTS text for area naming in the cart [ionlizarazu - [`062e0a3`](https://github.com/eea/volto-clms-theme/commit/062e0a375f5352bc13c18ff7ec33fad4bcc59f2f)]
 - dependencies [ionlizarazu - [`405ef96`](https://github.com/eea/volto-clms-theme/commit/405ef96090fe7bd4af73a49d3285a92fad712e3b)]
-- yarn.lock [ionlizarazu - [`7132119`](https://github.com/eea/volto-clms-theme/commit/71321195c4dd4fceed67f2f0872f3e24bba61c17)]
 - volto-blocks-grid module mapping [ionlizarazu - [`4fec3ca`](https://github.com/eea/volto-clms-theme/commit/4fec3cabc437322ad92ed90d682250bd123ccaaf)]
 - volto-blocks-grid v7.0.2 [ionlizarazu - [`2557e60`](https://github.com/eea/volto-clms-theme/commit/2557e6039d3cea33ca0bd11a0a3ef4764c611f78)]
 - remove styling from teaser block [ionlizarazu - [`879e684`](https://github.com/eea/volto-clms-theme/commit/879e684057c88f52f60f0fa54cbaa155c7d14688)]
@@ -966,7 +962,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :house: Internal changes
 
-- chore: [JENKINS] Remove alpha testing version [valentinab25 - [`b4cbf65`](https://github.com/eea/volto-clms-theme/commit/b4cbf6557fbc67f7fc4cea5aa2cb19804f3d7e3c)]
 
 #### :hammer_and_wrench: Others
 
@@ -2165,7 +2160,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)]
@@ -2316,7 +2310,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
@@ -3221,13 +3214,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.1.146",
+  "version": "1.1.147",
   "description": "volto-clms-theme: Volto theme for CLMS site",
   "main": "src/index.js",
   "author": "CodeSyntax for the European Environment Agency",

package/src/components/CLMSDownloadCartView/CLMSCartContent.jsx

@@ -500,6 +500,12 @@ const CLMSCartContent = (props) => {
                               <button
                                 onClick={() => {
                                   removeCartItem(item?.unique_id);
+                                  setCartItems(
+                                    cartItems.filter(
+                                      (i) => item?.unique_id !== i.unique_id,
+                                    ),
+                                  );
+
                                   if (
                                     pagination.length === 1 &&
                                     currentPage > 1

package/src/components/CLMSDownloadCartView/CLMSDownloadCartView.jsx

@@ -32,7 +32,7 @@ const CLMSDownloadCartView = (props) => {
   const cart = useSelector((state) => state.cart_items.items);
   const content = useSelector((state) => state.content.data);
   const datasetTimeseries = useSelector((state) => state.datasetTimeseries);
-  const nutsnames = useSelector((state) => state.nutsnames);
+  // const nutsnames = useSelector((state) => state.nutsnames);
 
   const { isLoggedIn } = useCartState();
   const { formatMessage } = useIntl();
@@ -85,15 +85,16 @@ const CLMSDownloadCartView = (props) => {
       });
     }
     if (localsessionNutsIDList.length > 0) {
-      if (nutsnames.nutsnames) {
-        const missingnn = localsessionNutsIDList.filter(
-          (nid) => !nutsnames.nutsnames[nid],
-        );
-        if (missingnn.length > 0)
-          dispatch(getNutsNames(localsessionNutsIDList));
-      } else {
-        dispatch(getNutsNames(localsessionNutsIDList));
-      }
+      dispatch(getNutsNames(localsessionNutsIDList));
+      // if (nutsnames.nutsnames) {
+      //   const missingnn = localsessionNutsIDList.filter(
+      //     (nid) => !nutsnames.nutsnames[nid],
+      //   );
+      //   if (missingnn.length > 0)
+      //     dispatch(getNutsNames(localsessionNutsIDList));
+      // } else {
+      //   dispatch(getNutsNames(localsessionNutsIDList));
+      // }
     }
 
     return () => {};

package/src/components/CLMSDownloadCartView/Fields/ProjectionNaming.jsx

@@ -19,6 +19,23 @@ export const ProjectionNaming = ({ item, cartItems, setCartItems }) => {
 
   let [choices, setChoices] = useState([]);
 
+  useEffect(() => {
+    choices.length > 0 &&
+      setProjectionValue(
+        item?.unique_id,
+        item?.projection
+          ? item.projection
+          : choices.find((ch) => ch.default)
+          ? choices.find((ch) => ch.default).key
+          : choices[0].key,
+        cartItems,
+      );
+    setTimeout(() => {
+      setLoading(false);
+    }, 200);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [choices]);
+
   useEffect(() => {
     if (
       projections_uid?.[item.dataset_uid] &&
@@ -50,24 +67,10 @@ export const ProjectionNaming = ({ item, cartItems, setCartItems }) => {
             };
           }),
       );
-      setTimeout(() => {
-        choices.length > 0 &&
-          setProjectionValue(
-            item?.unique_id,
-            item?.projection
-              ? item.projection
-              : choices.find((ch) => ch.default)
-              ? choices.find((ch) => ch.default).key
-              : choices[0].key,
-            cartItems,
-          );
-        setTimeout(() => {
-          setLoading(false);
-        }, 200);
-      }, 200);
     } else {
       setLoading(true);
     }
+    return () => {};
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [JSON.stringify(projections_uid?.[item.dataset_uid]), item.unique_id]);

package/src/customizations/volto/components/theme/Unauthorized/Unauthorized.jsx

@@ -1,14 +1,116 @@
 /**
  * @module components/theme/Unauthorized/Unauthorized
  */
-import React from 'react';
+import React, { useEffect } from 'react';
 import { FormattedMessage } from 'react-intl';
-import { useSelector } from 'react-redux';
+import { useDispatch, useSelector } from 'react-redux';
 import { Link } from 'react-router-dom';
 import { Container } from 'semantic-ui-react';
 
 import { withServerErrorCode } from '@plone/volto/helpers/Utils/Utils';
-import CclLoginModal from '@eeacms/volto-clms-theme/components/CclLoginModal/CclLoginModal';
+// import CclLoginModal from '@eeacms/volto-clms-theme/components/CclLoginModal/CclLoginModal';
+
+import { UniversalLink } from '@plone/volto/components';
+import config from '@plone/volto/registry';
+import { getRegistry } from '@eeacms/volto-clms-theme/actions';
+import CclModal from '@eeacms/volto-clms-theme/components/CclModal/CclModal';
+import { toBase64 } from '../../../../../components/CclUtils';
+
+const CclLoginModal = (props) => {
+  let {
+    classname = 'header-login-link',
+    triggerComponent = () => (
+      <span className={classname}>
+        <FormattedMessage id="loginRegister" defaultMessage="Register/Login" />
+      </span>
+    ),
+    otherPath = undefined,
+  } = props;
+  const dispatch = useDispatch();
+  const registryRecords = useSelector((state) => state?.registry?.records);
+  const [loginUrl, setLoginUrl] = React.useState('');
+  const registry_key = config.settings?.registry?.login_url || null;
+
+  useEffect(() => {
+    if (registryRecords && registry_key in registryRecords) {
+      if (otherPath) {
+        setLoginUrl(
+          `${registryRecords[registry_key]}?came_from=${toBase64(otherPath)}`,
+        );
+      } else {
+        setLoginUrl(
+          `${registryRecords[registry_key]}?came_from=${toBase64(
+            window.location.href,
+          )}`,
+        );
+      }
+    }
+  }, [otherPath, registryRecords, registry_key]);
+
+  function modalStatus(status) {
+    if (status === true) {
+      dispatch(getRegistry(registry_key));
+    }
+  }
+
+  return (
+    <CclModal
+      trigger={triggerComponent()}
+      size="tiny"
+      modalStatus={modalStatus}
+    >
+      <div className="content">
+        <div className="modal-login-title">
+          This website uses EU Login for user authentication.
+        </div>
+        <div className="modal-login-text">
+          <p>
+            {' '}
+            EU Login, the European Commission Authentication Service, enables
+            you to access various web applications centrally using the same
+            e-mail and password. You can read more{' '}
+            <UniversalLink
+              openLinkInNewTab
+              href="https://ecas.ec.europa.eu/cas/about.html"
+            >
+              here
+            </UniversalLink>
+            .
+          </p>
+          <p>
+            {' '}
+            If you have EU Login account, please click 'Login using EU Login'.
+          </p>
+          <p>
+            If you don't have EU Login account, please follow this{' '}
+            <UniversalLink
+              openLinkInNewTab
+              href="https://ecas.ec.europa.eu/cas/eim/external/register.cgi"
+            >
+              link
+            </UniversalLink>{' '}
+            to create it.
+          </p>
+          <p>
+            If you have other questions, please contact our
+            <UniversalLink openLinkInNewTab href="/en/contact-service-helpdesk">
+              {' '}
+              Service desk
+            </UniversalLink>
+            .
+          </p>
+        </div>
+      </div>
+      <div className="actions">
+        <div className="modal-buttons">
+          <a href={loginUrl || '#'} className="ccl-button ccl-button-green">
+            Login using EU Login
+          </a>
+        </div>
+      </div>
+    </CclModal>
+  );
+};
 
 /**
  * unauthorized function.