@eeacms/volto-clms-theme 1.0.127 → 1.0.129

package/CHANGELOG.md

@@ -4,7 +4,58 @@ 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.127](https://github.com/eea/volto-clms-theme/compare/1.0.126...1.0.127) - 20 September 2022
+### [1.0.129](https://github.com/eea/volto-clms-theme/compare/1.0.128...1.0.129) - 26 September 2022
+
+#### :bug: Bug Fixes
+
+- fix: prevent extra url data coming from search [ionlizarazu - [`210badf`](https://github.com/eea/volto-clms-theme/commit/210badfd72e3efa37db157e4f69feb475f0d5631)]
+- fix: eslint [Mikel Larreategi - [`bc8f97f`](https://github.com/eea/volto-clms-theme/commit/bc8f97f957bfdc1798a6197af7a208bad0b3f991)]
+- fix: add new field file, show and use it in the download cart and prepackaged files table. CLMS-1202 [Mikel Larreategi - [`4ebd4eb`](https://github.com/eea/volto-clms-theme/commit/4ebd4eb93b5fbaf4e539aba9e27c7e9525babe96)]
+- fix: show meeting register status only to managers [ionlizarazu - [`aed5137`](https://github.com/eea/volto-clms-theme/commit/aed5137882b03e47cd928ba820b4974018bbdbb5)]
+- fix: routing in new tab [ionlizarazu - [`cf038d5`](https://github.com/eea/volto-clms-theme/commit/cf038d5b5a4f0a85667a580709fb75b226195d8a)]
+- fix: remove inexisting attribute from a tag [Mikel Larreategi - [`3160125`](https://github.com/eea/volto-clms-theme/commit/3160125a31b5509343ee8f4cc43ea5a243700181)]
+- fix: global search taxonomy filters count [ionlizarazu - [`087d78e`](https://github.com/eea/volto-clms-theme/commit/087d78e190531eda4de503abf0261a98e717144a)]
+- fix: match with regex current tab from the location hash and add slugify function [ionlizarazu - [`6bd11ae`](https://github.com/eea/volto-clms-theme/commit/6bd11ae040b104fa9b07887c042599f99114d250)]
+- fix: vertical and verticalFAQ tabs block now uses tab title to set the hash [Unai - [`dc5375b`](https://github.com/eea/volto-clms-theme/commit/dc5375b16bed78c72a821a172fd133e22a4395ba)]
+
+#### :hammer_and_wrench: Others
+
+- CLMS-1405 Hide the topic in the Use case details [joewdavies - [`c907b88`](https://github.com/eea/volto-clms-theme/commit/c907b88d38a3d3b71d7652a3f42d4b7a7feffbfc)]
+- ESlint fix [joewdavies - [`9c689e6`](https://github.com/eea/volto-clms-theme/commit/9c689e6026e84b6c7c8f7e915f99c803c014feea)]
+- CLMS-1341 [joewdavies - [`dbdfe60`](https://github.com/eea/volto-clms-theme/commit/dbdfe60a9e2e9b26782481ce2ecc170634a997c4)]
+- CLMS-1218 [joewdavies - [`f1fc506`](https://github.com/eea/volto-clms-theme/commit/f1fc506a26aa1adf7a8768c8fcc77d0081ac26e4)]
+- CLMS-1346 [joewdavies - [`a402538`](https://github.com/eea/volto-clms-theme/commit/a4025384dafa0eabdd499d61e5f7c99f9bfb25ce)]
+- CLMS-1344 [joewdavies - [`4e26a60`](https://github.com/eea/volto-clms-theme/commit/4e26a606e6cd57f79ce074bf86910fa09bb94133)]
+- absolute path to import widgets [ionlizarazu - [`e284cb9`](https://github.com/eea/volto-clms-theme/commit/e284cb9868fb74e3628eeba7c7d3ff539610b263)]
+- ESlint fix [joewdavies - [`3870362`](https://github.com/eea/volto-clms-theme/commit/3870362deaf735c35400404bfb39f84ac670177f)]
+- Revert "hide View in the pa viewer button for anon" [ionlizarazu - [`05210c0`](https://github.com/eea/volto-clms-theme/commit/05210c0bb256604edfe12805b4c6ea21f76481d6)]
+- Revert "disable view in the map viewer button for anon" [ionlizarazu - [`e4ff0da`](https://github.com/eea/volto-clms-theme/commit/e4ff0dac484fd1a340d13d33e934c4f8a8636ad5)]
+- disable view in the map viewer button for anon [ionlizarazu - [`3e87a19`](https://github.com/eea/volto-clms-theme/commit/3e87a19cce034e3af6255c8aac9551a2f104d4d7)]
+- hide View in the pa viewer button for anon [ionlizarazu - [`79bf226`](https://github.com/eea/volto-clms-theme/commit/79bf2268a30e5830e44dd93cb8a71ec26c6999aa)]
+- use UniversalLink [ionlizarazu - [`1150208`](https://github.com/eea/volto-clms-theme/commit/115020873957edf27820addafad56a845bd040c9)]
+- sort imports [ionlizarazu - [`6725c87`](https://github.com/eea/volto-clms-theme/commit/6725c87b6957bb20019290dc08d2f15cf51de606)]
+- add agree privacy policy for register meeting [ionlizarazu - [`bc8d1ca`](https://github.com/eea/volto-clms-theme/commit/bc8d1ca21c6bc64a34a1bf8c52f86fa9c8b36bc8)]
+### [1.0.128](https://github.com/eea/volto-clms-theme/compare/1.0.127...1.0.128) - 22 September 2022
+
+#### :bug: Bug Fixes
+
+- fix: CLMS-1381 remove cart when deleting the user-profile [Mikel Larreategi - [`87b043d`](https://github.com/eea/volto-clms-theme/commit/87b043dee950bbaa86f1669eebbaa0938329bdc1)]
+- fix: vertical and verticalFAQ tabs block now uses tab title to set the hash [Unai - [`505573c`](https://github.com/eea/volto-clms-theme/commit/505573c33d63948c4201d3b8c0038809ca479407)]
+
+#### :hammer_and_wrench: Others
+
+- Revert "add agree privacy policy for register meeting" [Mikel Larreategi - [`0cb5061`](https://github.com/eea/volto-clms-theme/commit/0cb5061d40d9f299c0f35c8066d76a7f23cf4b45)]
+- Revert "sort imports" [Mikel Larreategi - [`1a54e00`](https://github.com/eea/volto-clms-theme/commit/1a54e006ed3486bff9687ff2318914ec30f085c9)]
+- Revert "use UniversalLink" [Mikel Larreategi - [`7dedeba`](https://github.com/eea/volto-clms-theme/commit/7dedeba760099b10b0c36b7b57a4da4758a6262d)]
+- Revert "hide View in the pa viewer button for anon" [Mikel Larreategi - [`57a2d1a`](https://github.com/eea/volto-clms-theme/commit/57a2d1a8e5a79adfa45b4ee297ef82c3cbf66100)]
+- Revert "disable view in the map viewer button for anon" [Mikel Larreategi - [`84759e6`](https://github.com/eea/volto-clms-theme/commit/84759e66c2fde33a6e679516f2624e83bf21bdc2)]
+- Revert "fix: vertical and verticalFAQ tabs block now uses tab title to set the hash" [Mikel Larreategi - [`59cc5e5`](https://github.com/eea/volto-clms-theme/commit/59cc5e5dc0e7acb92354c0f6e9e00c65fe26ce12)]
+- disable view in the map viewer button for anon [ionlizarazu - [`bb1809d`](https://github.com/eea/volto-clms-theme/commit/bb1809d66b5b8c077270ceac61143f3297350be5)]
+- hide View in the pa viewer button for anon [ionlizarazu - [`6f0b29e`](https://github.com/eea/volto-clms-theme/commit/6f0b29e2731564d1ac9039b99a1566b25dae2043)]
+- use UniversalLink [ionlizarazu - [`489cb6d`](https://github.com/eea/volto-clms-theme/commit/489cb6d62c02565c36845ac364b71c0299aad053)]
+- sort imports [ionlizarazu - [`d33d3d8`](https://github.com/eea/volto-clms-theme/commit/d33d3d8f655c82a216a93194474de44a66ef4a95)]
+- add agree privacy policy for register meeting [ionlizarazu - [`0f50bcb`](https://github.com/eea/volto-clms-theme/commit/0f50bcbe0a1d77bee6ebcdada1f2a27cc02d78ca)]
+### [1.0.127](https://github.com/eea/volto-clms-theme/compare/1.0.126...1.0.127) - 21 September 2022
 
 #### :hammer_and_wrench: Others
 

package/package.json

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

package/src/components/Blocks/CclUseCaseList/CclUseCaseListEdit.jsx

@@ -89,9 +89,9 @@ const CclUseCaseListEdit = (props) => {
                         {useCase.title}
                       </div>
                       <div className="use-case-element-description">
-                        <span>
+                        {/* <span>
                           {useCase.topics.map((topic) => topic.title)}
-                        </span>
+                        </span> */}
                         <span>{cclDateTimeFormat(useCase?.effective)}</span>
                         <span>{useCase.responsibleOrganization}</span>
                       </div>

package/src/components/Blocks/CclUseCaseList/CclUseCaseListView.jsx

@@ -81,9 +81,9 @@ const CclUseCaseListView = (props) => {
                           {useCase.title}
                         </div>
                         <div className="use-case-element-description">
-                          <span>
+                          {/* <span>
                             {useCase.topics.map((topic) => topic.title)}
-                          </span>
+                          </span> */}
                           <span>
                             {new Date(useCase?.effective).toLocaleDateString()}
                           </span>

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

@@ -59,12 +59,13 @@ const FilterList = (props) => {
   // }
   const currentFiltersToCount = {};
   Object.keys(currentFilters).forEach((filterKey) => {
-    currentFiltersToCount[filterKey] =
-      typeof currentFilters[filterKey] === 'object'
-        ? currentFilters[filterKey].filter((filter) => {
-            return !filtersToAvoidSet.has(filter);
-          })
-        : null;
+    if (typeof currentFilters[filterKey] === 'object') {
+      currentFiltersToCount[filterKey] = currentFilters[filterKey].filter(
+        (filter) => {
+          return !filtersToAvoidSet.has(filter);
+        },
+      );
+    }
   });
   // const totalFilters = [].concat.apply([], Object.values(currentFilters))
   //   .length;

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

@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react';
+import React from 'react';
 import { Button, Input } from 'semantic-ui-react';
 import { defineMessages, useIntl } from 'react-intl';
 import { Icon } from '@plone/volto/components';
@@ -22,9 +22,11 @@ const SearchInput = (props) => {
   } = props;
   const intl = useIntl();
 
-  useEffect(() => {
-    onTriggerSearch(rest.searchedText);
-    setSearchText(rest.searchedText);
+  React.useEffect(() => {
+    if (rest.searchedText !== '') {
+      onTriggerSearch(rest.searchedText);
+      setSearchText(rest.searchedText);
+    }
     return () => {};
   }, [rest.searchedText, onTriggerSearch, setSearchText]);
 

package/src/components/Blocks/CustomTemplates/VoltoTabsBlock/CclVerticalFaqTabsView.jsx

@@ -10,6 +10,7 @@ import { connect } from 'react-redux';
 import cx from 'classnames';
 import { withRouter } from 'react-router';
 import { withScrollToTarget } from '@eeacms/volto-tabs-block/hocs';
+import { slugify } from '../../utils';
 
 const CclVerticalFaqTabsView = (props) => {
   const { metadata = {}, tabsList = [] } = props;
@@ -23,8 +24,10 @@ const CclVerticalFaqTabsView = (props) => {
     return (
       <div className="right-content cont-w-75">
         {tabsList.map((tab, index) => {
+          const title = tabs[tab].title;
+          const tabHash = slugify(title);
           return (
-            <Route to={'#' + activeTab}>
+            <Route to={'#' + tabHash}>
               <div
                 key={index}
                 className={cx('panel', tab === activeTab && 'panel-selected')}
@@ -61,10 +64,11 @@ const CclVerticalFaqTabsView = (props) => {
             const nextSubTab =
               tabs[tabsList[tabIndex]]?.subTab?.subtab || false;
             const defaultTitle = `Tab ${tabIndex}`;
+            const tabHash = title.split(' ').join('-');
             return (
               <div
                 key={index}
-                id={tabIndex}
+                id={tabHash}
                 className={cx(
                   'card',
                   tab === activeTab && 'active',
@@ -75,7 +79,7 @@ const CclVerticalFaqTabsView = (props) => {
                   <span>{title || defaultTitle}</span>
                 ) : (
                   <NavLink
-                    to={'#tab=' + tabIndex}
+                    to={'#' + tabHash}
                     className="collapsed"
                     onClick={(e) => {
                       handleActive(activeTab, tab, setActiveTab);

package/src/components/Blocks/CustomTemplates/VoltoTabsBlock/CclVerticalTabsView.jsx

@@ -1,15 +1,17 @@
-import './fontawesome';
-
-import { NavLink, Route } from 'react-router-dom';
-
 import React from 'react';
-import { RenderBlocks } from '@plone/volto/components';
-import { compose } from 'redux';
 import { connect } from 'react-redux';
-import cx from 'classnames';
 import { withRouter } from 'react-router';
+import { NavLink, Route } from 'react-router-dom';
+import { compose } from 'redux';
+
+import { RenderBlocks } from '@plone/volto/components';
 import { withScrollToTarget } from '@eeacms/volto-tabs-block/hocs';
 
+import { slugify } from '../../utils';
+import './fontawesome';
+
+import cx from 'classnames';
+
 const CclVerticalTabsView = (props) => {
   const {
     metadata = {},
@@ -34,8 +36,10 @@ const CclVerticalTabsView = (props) => {
     return (
       <div className="right-content cont-w-75">
         {tabsList.map((tab, index) => {
+          const title = tabs[tab].title;
+          const tabHash = slugify(title);
           return (
-            <Route key={index} to={'#' + activeTab}>
+            <Route key={index} to={'#' + tabHash}>
               <div
                 className={cx('panel', tab === activeTab && 'panel-selected')}
                 role="tabpanel"
@@ -66,10 +70,11 @@ const CclVerticalTabsView = (props) => {
             const nextSubTab =
               tabs[tabsList[tabIndex]]?.subTab?.subtab || false;
             const defaultTitle = `Tab ${tabIndex}`;
+            const tabHash = slugify(title);
             return (
               <div
                 key={index}
-                id={tabIndex}
+                id={tabHash}
                 className={cx(
                   'card',
                   tab === activeTab && 'active',
@@ -80,7 +85,7 @@ const CclVerticalTabsView = (props) => {
                   <span>{title || defaultTitle}</span>
                 ) : (
                   <NavLink
-                    to={'#tab=' + tabIndex}
+                    to={'#' + tabHash}
                     className="collapsed"
                     onClick={(e) => {
                       handleClick(e, tab, activeTab, setActiveTab);

package/src/components/Blocks/CustomTemplates/VoltoTabsBlock/RoutingHOC.jsx

@@ -1,8 +1,10 @@
 import React from 'react';
+import { slugify } from '../../utils';
 
 const RoutingHOC = (TabView) =>
   function Component(props) {
     const { tabsList = [], tabs, activeTabIndex = 0, setActiveTab } = props;
+
     function reloadTab(window, rTabs, rTabsList) {
       if (
         window.location.hash.length === 0 &&
@@ -16,11 +18,28 @@ const RoutingHOC = (TabView) =>
       ) {
         return rTabsList[0];
       }
+      const tabsDict = Object.entries(rTabs).map((t) => {
+        return { title: t[1].title, id: t[0] };
+      });
+      // Deprecated, now we use tab title to set the hash
+      // if (
+      //   window.location.hash.match(/.*&?#?tab=(.*)/) &&
+      //   window.location.hash.match(/.*&?#?tab=(.*)/).length > 1
+      // ) {
+      //   return rTabsList[window.location.hash.match(/.*&?#?tab=(.*)/)[1] - 1];
+      // }
       if (
-        window.location.hash.match(/.*&?#?tab=(.*)/) &&
-        window.location.hash.match(/.*&?#?tab=(.*)/).length > 1
+        window.location.hash.match(/.*&?(#.*)/) &&
+        window.location.hash.match(/.*&?(#.*)/).length > 1
       ) {
-        return rTabsList[window.location.hash.match(/.*&?#?tab=(.*)/)[1] - 1];
+        const hashMatch = window.location.hash
+          .match(/.*&?(#.*)/)[1]
+          .replace('#', '');
+        const result = tabsDict.filter((t) => slugify(t.title) === hashMatch);
+        if (result.length > 0) {
+          return result[0].id;
+        }
+        return '';
       }
     }
     React.useEffect(() => {
@@ -30,7 +49,8 @@ const RoutingHOC = (TabView) =>
         String(window.performance.getEntriesByType('navigation')[0].type) ===
           'reload';
       if (isReload) {
-        setActiveTab(reloadTab(window, tabs, tabsList));
+        const existingTab = reloadTab(window, tabs, tabsList);
+        if (existingTab) setActiveTab(existingTab);
       }
       // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [activeTabIndex]);

package/src/components/Blocks/customBlocks.js

@@ -71,9 +71,9 @@ import linkSVG from '@plone/volto/icons/link.svg';
 import navSVG from '@plone/volto/icons/nav.svg';
 import upSVG from '@plone/volto/icons/up-key.svg';
 import ImageWidget from '@eeacms/volto-clms-theme/components/Widgets/ImageWidget';
-import TextWidget from '../../customizations/volto/components/manage/Widgets/TextWidget';
-import TextareaWidget from '../../customizations/volto/components/manage/Widgets/TextareaWidget';
-import EmailWidget from '../../customizations/volto/components/manage/Widgets/EmailWidget';
+import TextWidget from '@plone/volto/components/manage/Widgets/TextWidget';
+import TextareaWidget from '@plone/volto/components/manage/Widgets/TextareaWidget';
+import EmailWidget from '@plone/volto/components/manage/Widgets/EmailWidget';
 
 export const customGroupBlocksOrder = [
   {

package/src/components/Blocks/utils.js

@@ -25,3 +25,10 @@ export const getPanels = (data) => {
     data.blocks?.[id],
   ]);
 };
+
+export const slugify = (string) => {
+  return string
+    .toLowerCase()
+    .replace(/[\s-]+/g, '_')
+    .replace(/[^\w]+/g, '');
+};

package/src/components/CLMSDatasetDetailView/DownloadDataSetContent.jsx

@@ -50,7 +50,7 @@ const DownloadDataSetContent = (data, token) => {
 
       {data?.mapviewer_viewservice?.length > 0 && (
         <div className="dataset-download-area">
-          <h2>Custom download</h2>
+          <h2>Download by area</h2>
           <p>
             Use this option if you would like to download the dataset for
             area(s) of interest.
@@ -58,11 +58,11 @@ const DownloadDataSetContent = (data, token) => {
           {user?.['@id'] ? (
             data.mapviewer_istimeseries === true ? (
               <CclButton url={location.pathname + '/download-by-area'}>
-                Go to custom download
+                Go to download by area and time
               </CclButton>
             ) : (
               <CclButton url={location.pathname + '/download-by-area'}>
-                Go to custom download
+                Go to download by area
               </CclButton>
             )
           ) : (
@@ -74,7 +74,7 @@ const DownloadDataSetContent = (data, token) => {
                 >
                   <FormattedMessage
                     id="downloadByArea"
-                    defaultMessage="Go to custom download"
+                    defaultMessage="Go to download by area"
                   />
                 </CclButton>
               }
@@ -141,15 +141,15 @@ const DownloadDataSetContent = (data, token) => {
               url={location.pathname + '/download-by-area'}
               disabled={true}
             >
-              Go to custom download
+              Go to download by area
             </CclButton>
           ) : data.mapviewer_istimeseries === true ? (
             <CclButton url={location.pathname + '/download-by-area'}>
-              Go to custom download and time
+              Go to download by area and time
             </CclButton>
           ) : (
             <CclButton url={location.pathname + '/download-by-area'}>
-              Go to custom download
+              Go to download by area
             </CclButton>
           )} */}
         </div>

package/src/components/CLMSDownloadCartView/CLMSCartContent.jsx

@@ -207,7 +207,9 @@ const CLMSCartContent = (props) => {
       case 'nuts':
         return 'NUTS: ' + (item.area.valueName || item.area.value);
       case undefined:
-        return item.area || '-';
+        return item.area || item.file || '-';
+      case typeof item.area === 'string':
+        return item.area || item.file || '-';
       default:
         return '-';
     }

package/src/components/CLMSDownloadCartView/cartUtils.js

@@ -45,6 +45,7 @@ export const getCartObjectFromPrepackaged = (file_data, dataset_data) => {
   return {
     name: dataset_data.title,
     title: file_data.title,
+    file: file_data.file,
     area: file_data.area,
     format: file_data.format?.token || file_data.format,
     resolution: file_data.resolution,
@@ -68,6 +69,7 @@ export const getCartObjectFromMapviewer = (
   nutsnames,
 ) => {
   const area = local_cart_data.area;
+  const file = local_cart_data.file;
   if (area?.type === 'nuts' && Object.keys(nutsnames).includes(area.value)) {
     area.valueName = nutsnames[area.value];
   }
@@ -85,6 +87,7 @@ export const getCartObjectFromMapviewer = (
   return {
     name: dataset_data.title || '-',
     area: area || '-',
+    file: file || '-',
     format: type_options.length > 0 ? type_options[0].full_format : null,
     original_format:
       type_options.length > 0 ? type_options[0].full_format : null,

package/src/components/CLMSMeetingView/CLMSMeetingView.jsx

@@ -1,29 +1,32 @@
-import './meetingstyles.less';
-
+import React, { useState } from 'react';
+import AnimateHeight from 'react-animate-height';
 import { FormattedMessage, defineMessages, injectIntl } from 'react-intl';
+import { useDispatch, useSelector } from 'react-redux';
+import { useHistory, useLocation } from 'react-router-dom';
+import { toast } from 'react-toastify';
 import { Header, Image, Message, Segment } from 'semantic-ui-react';
+import { Accordion } from 'semantic-ui-react';
+
+import { createContent } from '@plone/volto/actions';
 import { Icon, Toast, UniversalLink } from '@plone/volto/components';
 import {
   Recurrence,
   When,
 } from '@plone/volto/components/theme/View/EventDatesInfo';
-import { useDispatch, useSelector } from 'react-redux';
-import { useHistory, useLocation } from 'react-router-dom';
-
+import checkSVG from '@plone/volto/icons/check.svg';
+import config from '@plone/volto/registry';
+import CclListingCards from '@eeacms/volto-clms-theme/components/Blocks/CustomTemplates/VoltoListingBlock/CclListingCards';
 import CclButton from '@eeacms/volto-clms-theme/components/CclButton/CclButton';
-import React from 'react';
 import { StringToHTML } from '@eeacms/volto-clms-theme/components/CclUtils';
-import checkSVG from '@plone/volto/icons/check.svg';
-import { createContent } from '@plone/volto/actions';
-import jwtDecode from 'jwt-decode';
+
 import { postMeetingRegister } from '../../actions';
-import { toast } from 'react-toastify';
-import { LightGalleryListing } from './CclLightGallery';
-import CclListingCards from '@eeacms/volto-clms-theme/components/Blocks/CustomTemplates/VoltoListingBlock/CclListingCards';
-import config from '@plone/volto/registry';
-import AnimateHeight from 'react-animate-height';
-import { Accordion } from 'semantic-ui-react';
 import { CLMSRelatedItems } from '../CLMSRelatedItems';
+import { LightGalleryListing } from './CclLightGallery';
+import './meetingstyles.less';
+import { RegisterButtonReasons } from './utils';
+
+import jwtDecode from 'jwt-decode';
+
 export const CLMSMeetingView = (props) => {
   const { content, intl } = props;
   const dispatch = useDispatch();
@@ -100,6 +103,14 @@ export const CLMSMeetingView = (props) => {
       defaultMessage:
         'Some anonymous registration form parameters are not ready to go',
     },
+    agreePrivacyPolicy: {
+      id: 'agreePrivacyPolicy',
+      defaultMessage: 'I agree to the ',
+    },
+    agreePrivacyPolicyLinkText: {
+      id: 'agreePrivacyPolicyLinkText',
+      defaultMessage: 'privacy policy.',
+    },
   });
 
   function createForm() {
@@ -115,7 +126,13 @@ export const CLMSMeetingView = (props) => {
   const files = content.items
     ? content.items.filter((item) => item['@type'] === 'File')
     : [];
-  const RegistrationButton = ({ rContent, rMeeting_register, rIsLoggedIn }) => {
+  const RegistrationButton = ({
+    rContent,
+    rMeeting_register,
+    rIsLoggedIn,
+    locale,
+  }) => {
+    const [privacy, setPrivacy] = useState(false);
     return (
       <>
         {rContent.is_registered ||
@@ -130,9 +147,32 @@ export const CLMSMeetingView = (props) => {
           </Message>
         ) : (
           rIsLoggedIn && (
-            <CclButton onClick={() => handleRegister()}>
-              <FormattedMessage id="Register" defaultMessage="Register" />
-            </CclButton>
+            <>
+              <div>
+                <input
+                  type="checkbox"
+                  id={`footer_privacy-register`}
+                  name={`footer_privacy-register`}
+                  value={privacy}
+                  onClick={() => setPrivacy(!privacy)}
+                  className="ccl-checkbox ccl-form-check-input"
+                  required={true}
+                />
+                <label
+                  className="ccl-form-check-label"
+                  htmlFor={`footer_privacy-register`}
+                >
+                  {intl.formatMessage(messages.agreePrivacyPolicy)}
+                  <UniversalLink href={`/${locale}/personal-data-protection`}>
+                    {intl.formatMessage(messages.agreePrivacyPolicyLinkText)}
+                  </UniversalLink>
+                </label>
+              </div>
+              <br />
+              <CclButton disabled={!privacy} onClick={() => handleRegister()}>
+                <FormattedMessage id="Register" defaultMessage="Register" />
+              </CclButton>
+            </>
           )
         )}
       </>
@@ -389,7 +429,9 @@ export const CLMSMeetingView = (props) => {
             </div>
           </>
         )}
-
+        {user.roles &&
+          user.roles.includes('Manager') &&
+          RegisterButtonReasons(content)}
         {content.registrations_open && (
           <div className="meeting-info-container right-content">
             <div className="card-button">
@@ -407,11 +449,14 @@ export const CLMSMeetingView = (props) => {
                     )}
                 </>
               ) : (
-                <RegistrationButton
-                  rContent={content}
-                  rMeeting_register={meeting_register}
-                  rIsLoggedIn={isLoggedIn}
-                />
+                <>
+                  <RegistrationButton
+                    rContent={content}
+                    rMeeting_register={meeting_register}
+                    rIsLoggedIn={isLoggedIn}
+                    locale={props.intl.locale}
+                  />
+                </>
               )}
             </div>
           </div>

package/src/components/CLMSMeetingView/utils.js

@@ -0,0 +1,29 @@
+export const RegisterButtonReasons = (content) => {
+  let results = [];
+  if (!content.registrations_open) {
+    results.push('Registrations are closed');
+  } else {
+    if (content.allow_anonymous_registration) {
+      if (!content.anonymous_registration_form) {
+        results.push('Registration form is missing');
+      } else {
+        if (!content.anonymous_registration_form?.published) {
+          results.push('Registration form is private');
+        } else if (!content.anonymous_registration_form?.email) {
+          results.push('Registration form has no email');
+        } else if (!content.anonymous_registration_form?.fullname) {
+          results.push('Registration form has no fullname');
+        }
+      }
+    }
+  }
+  return results.length > 0 ? (
+    <ul>
+      {results.map((result) => (
+        <li style={{ color: 'red' }}>{result}</li>
+      ))}
+    </ul>
+  ) : (
+    <></>
+  );
+};

package/src/components/CLMSProfileView/CLMSDeleteProfileView.jsx

@@ -1,5 +1,6 @@
 import React from 'react';
 import { injectIntl } from 'react-intl';
+import { FormattedMessage } from 'react-intl';
 import { useDispatch, useSelector } from 'react-redux';
 import { useHistory } from 'react-router-dom';
 import { Container } from 'semantic-ui-react';
@@ -7,9 +8,9 @@ import { Modal, Segment } from 'semantic-ui-react';
 
 import { logout } from '@plone/volto/actions';
 import CclButton from '@eeacms/volto-clms-theme/components/CclButton/CclButton';
+import useCartState from '@eeacms/volto-clms-utils/cart/useCartState';
 
 import { delProfile } from '../../actions';
-import { FormattedMessage } from 'react-intl';
 
 /**
  * CLMSProfileView container.
@@ -26,11 +27,14 @@ export const CLMSDeleteProfileView = (props) => {
 
   const deleting = useSelector((state) => state.profile_delete.loading);
 
+  const { removeAllCart } = useCartState();
+
   function handleClick() {
     dispatch(delProfile());
   }
 
   if (isDeleted === true) {
+    removeAllCart();
     history.push('/');
     dispatch(logout());
   }

package/src/components/CclCard/cards.less

@@ -397,6 +397,8 @@
 }
 
 .card-doc-size {
+  align-self: center;
+  margin-bottom: 1rem;
   margin-left: 1rem;
   white-space: nowrap;
 }

package/src/components/CclDownloadTable/CclDownloadTable.jsx

@@ -139,6 +139,7 @@ function CclDownloadTable(props) {
         UID: item.UID,
         file_id: item['@id'],
         area: item.area,
+        file: item.file,
         unique_id: item.unique_id,
       }));
     addCartItem(selectedCartItems);
@@ -174,6 +175,7 @@ function CclDownloadTable(props) {
 
   const columns = [
     hasSome('title'),
+    hasSome('file'),
     hasSome('area'),
     hasSome('year'),
     hasSome('version'),
@@ -241,9 +243,8 @@ function CclDownloadTable(props) {
                   </th>
                 )}
                 {columns.includes('title') && <th>Title</th>}
-                {columns.includes('area') && (
-                  <th>{dataset.download_table_area_of_interest_title}</th>
-                )}
+                {columns.includes('file') && <th>File name</th>}
+                {columns.includes('area') && <th>Area of interest</th>}
                 {columns.includes('year') && <th>Year</th>}
                 {columns.includes('version') && <th>Version</th>}
                 {columns.includes('resolution') && <th>Resolution</th>}
@@ -273,6 +274,9 @@ function CclDownloadTable(props) {
                         {columns.includes('title') && (
                           <td>{contentOrDash(dataset_file?.title)}</td>
                         )}
+                        {columns.includes('file') && (
+                          <td>{contentOrDash(dataset_file?.file)}</td>
+                        )}
                         {columns.includes('area') && (
                           <td>{contentOrDash(dataset_file?.area)}</td>
                         )}

package/src/components/Widgets/DownloadableFilesTableWidget.jsx

@@ -9,6 +9,11 @@ const ItemSchema = () => ({
       description: 'Enter the title of this file.',
       type: 'string',
     },
+    file: {
+      title: 'File name',
+      description: 'Enter the file name.',
+      type: 'string',
+    },
     area: {
       title: 'Area of interest',
       description: 'Enter the area of this file.',
@@ -68,6 +73,7 @@ const ItemSchema = () => ({
       title: 'File',
       fields: [
         'title',
+        'file',
         'area',
         'year',
         'version',

package/src/components/Widgets/taxonomyUtils.js

@@ -29,13 +29,24 @@ export const structure_taxonomy_terms = (choices) => {
       childrens: [],
     };
     splitted_option.length === 1 && options.push(modified_option);
+  });
+  choices.forEach((choice) => {
+    var splitted_option = choice.label.split(' » ');
+    var modified_option = {
+      value: choice.value,
+      label:
+        splitted_option.length > 1
+          ? splitted_option.slice(-1).pop()
+          : choice.label,
+      original: choice.label,
+      childrens: [],
+    };
     if (splitted_option.length > 1) {
       var parent_option = splitted_option.slice(0, -1).pop();
-      options.map((opt) => {
+      options.forEach((opt) => {
         if (opt.label === parent_option) {
           opt.childrens.push(modified_option);
         }
-        return '';
       });
     }
   });

package/src/customizations/volto/components/manage/UniversalLink/UniversalLink.jsx

@@ -97,7 +97,6 @@ const UniversalLink = ({
         href={url}
         title={title}
         target={!checkedURL.isMail && !checkedURL.isTelephone ? '_blank' : null}
-        openLinkInNewTab={true}
         rel="noopener noreferrer"
         className={className}
         {...props}

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

@@ -219,10 +219,30 @@ class Header extends Component {
                 </ul>
                 <div
                   onMouseOut={(e) => {
-                    this.setState({ mobileSearchBoxOpen: false });
+                    // this event might be a touch on the search button, make sure it isnt.
+                    // ccl-header-search-show
+                    if (
+                      !e.currentTarget.classList.contains(
+                        'ccl-header-search-show',
+                      ) &&
+                      !e.currentTarget.classList.contains(
+                        'ccl-header-search-hidden',
+                      )
+                    ) {
+                      this.setState({ mobileSearchBoxOpen: false });
+                    }
                   }}
                   onBlur={(e) => {
-                    this.setState({ mobileSearchBoxOpen: false });
+                    if (
+                      !e.currentTarget.classList.contains(
+                        'ccl-header-search-show',
+                      ) &&
+                      !e.currentTarget.classList.contains(
+                        'ccl-header-search-hidden',
+                      )
+                    ) {
+                      this.setState({ mobileSearchBoxOpen: false });
+                    }
                   }}
                   className={
                     this.state.mobileSearchBoxOpen
@@ -247,7 +267,12 @@ class Header extends Component {
                     : 'ccl-main-menu'
                 }
               >
-                <Navigation pathname={this.props.pathname} />
+                <Navigation
+                  pathname={this.props.pathname}
+                  setHeaderState={(p) => {
+                    this.setState(p);
+                  }}
+                />
                 <ul className="ccl-header-menu-tools ccl-collapsible-toolmenu">
                   <CclTopMainMenu></CclTopMainMenu>
                   <li className="header-vertical-line">

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

@@ -94,10 +94,10 @@ class Navigation extends Component {
    * @returns {undefined}
    */
   closeMobileMenu() {
-    if (!this.state.isMobileMenuOpen) {
-      return;
-    }
     this.setState({ isMobileMenuOpen: false });
+    this.props.setHeaderState({
+      mobileMenuOpen: false,
+    });
   }
 
   /**
@@ -121,6 +121,7 @@ class Navigation extends Component {
                   ? item.url === `/${lang}`
                   : item.url === ''
               }
+              onClick={this.closeMobileMenu}
             >
               {item.title}
             </NavLink>

package/theme/clms/css/header.css

@@ -137,11 +137,17 @@
   }
 }
 
-/* full width search bar on mobile */
+/* CLMS-1128 */
 @media (max-width: 500px) {
+  /* full width search bar on mobile */
   #main > div:nth-child(2) > header > div.ccl-header-tools > div > div.ccl-header-tools-container > div > form > div{
     width: 100%
   }
+
+  /* align search icon right*/
+  .ccl-search-collapse-button {
+    margin-left: auto !important;
+  }
 }
 
 .ccl-header .ccl-header-tools .ccl-header-search input {

package/theme/clms/css/ownstyles.less

@@ -1286,7 +1286,7 @@ main .search-form button {
 }
 
 .left-menu-detail .menu-detail-image {
-  height: 8rem;
+  height: 12rem;
   margin-bottom: 0.25rem;
 }
 
@@ -1294,7 +1294,6 @@ main .search-form button {
   width: 100%;
   height: 100%;
   object-fit: cover;
-  opacity: 0.5;
 }
 
 .left-menu-detail .menu-detail-button:not(:last-of-type) {

package/theme/clms/css/styles.less

@@ -530,7 +530,7 @@ body:not(.contenttype-lrf:not(.section-cart):not(.section-profile))
 }
 
 .left-menu-detail .menu-detail-image {
-  height: 8rem;
+  height: 12rem;
   margin-bottom: 0.25rem;
 }
 
@@ -538,7 +538,6 @@ body:not(.contenttype-lrf:not(.section-cart):not(.section-profile))
   width: 100%;
   height: 100%;
   object-fit: cover;
-  opacity: 0.5;
 }
 
 .left-menu-detail .menu-detail-button:not(:last-of-type) {
@@ -1243,3 +1242,9 @@ div#page-document h1.documentFirstHeading {
 #page-sitemap ul > li > ul > li {
   margin-bottom: 0;
 }
+
+// CLMS-1344
+#sidebar-metadata .react-select__option {
+  white-space: nowrap;
+  width: fit-content;
+}