@eeacms/volto-clms-theme 1.1.37 → 1.1.39

package/CHANGELOG.md

@@ -4,11 +4,29 @@ 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.37](https://github.com/eea/volto-clms-theme/compare/1.1.36...1.1.37) - 30 August 2023
+### [1.1.39](https://github.com/eea/volto-clms-theme/compare/1.1.38...1.1.39) - 11 September 2023
+
+#### :hammer_and_wrench: Others
+
+- remove duplications [Ion Lizarazu - [`80b0a43`](https://github.com/eea/volto-clms-theme/commit/80b0a435926157d2a5d9f0ea2416431356f3d7a4)]
+- Add expanded by default option to the search block facets [Ion Lizarazu - [`f0a30f8`](https://github.com/eea/volto-clms-theme/commit/f0a30f868eca3ab6860e8465647178bdb33c9eb8)]
+- replace newsletter with CLMS updates and modify some footer stuff [Ion Lizarazu - [`1f7255a`](https://github.com/eea/volto-clms-theme/commit/1f7255a81001de686e23c29b36e7f4d855fe2285)]
+### [1.1.38](https://github.com/eea/volto-clms-theme/compare/1.1.37...1.1.38) - 7 September 2023
 
 #### :hammer_and_wrench: Others
 
-- margin left for nested uls [Mikel Larreategi - [`d439cd3`](https://github.com/eea/volto-clms-theme/commit/d439cd3c9528e2b2d5ff53cb606057b90bc5a712)]
+- 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)]
+- move Validation status below the description [Ion Lizarazu - [`3e45c25`](https://github.com/eea/volto-clms-theme/commit/3e45c255880f3fc182746d21752dc0a2fa974cb1)]
+- fix [CLMS-2541] check if conversionTable[value] is not null [Ion Lizarazu - [`232df08`](https://github.com/eea/volto-clms-theme/commit/232df087fa32f88eb4da50e3db20abd8b7e0c4c5)]
+- add to cart at the first position [Ion Lizarazu - [`1c648a6`](https://github.com/eea/volto-clms-theme/commit/1c648a66be0bcbfaf360d524096d1f37f801c131)]
+- test: EN locales, pre-commit fix, feature PRs checks Refs #257193 [valentinab25 - [`b992431`](https://github.com/eea/volto-clms-theme/commit/b9924318282e7fb6f6ce0ff15ab24e5b1faec7f1)]
+### [1.1.37](https://github.com/eea/volto-clms-theme/compare/1.1.36...1.1.37) - 30 August 2023
+
 ### [1.1.36](https://github.com/eea/volto-clms-theme/compare/1.1.35...1.1.36) - 30 August 2023
 
 #### :hammer_and_wrench: Others

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-clms-theme",
-  "version": "1.1.37",
+  "version": "1.1.39",
   "description": "volto-clms-theme: Volto theme for CLMS site",
   "main": "src/index.js",
   "author": "CodeSyntax for the European Environment Agency",
@@ -47,6 +47,7 @@
     "@eeacms/volto-tabs-block": "3.0.1",
     "@eeacms/volto-taxonomy": "3.0.1",
     "@fortawesome/fontawesome-svg-core": "1.2.35",
+    "@fortawesome/free-brands-svg-icons": "6.4.2",
     "@fortawesome/free-regular-svg-icons": "5.15.3",
     "@fortawesome/free-solid-svg-icons": "5.15.3",
     "@fortawesome/react-fontawesome": "0.1.14",
@@ -81,6 +82,7 @@
     "eslint-plugin-react-app": "^6.2.2",
     "husky": "7.0.4",
     "jsconfig": "^0.2.0",
+    "lint-staged": "*",
     "md5": "^2.3.0",
     "prettier": "2.0.5",
     "prettier-eslint": "^12.0.0",

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

@@ -1,10 +1,10 @@
 import { Checkbox, List } from 'semantic-ui-react';
 import React from 'react';
 import {
-  selectFacetSchemaEnhancer,
   selectFacetStateToValue,
   selectFacetValueToQuery,
 } from '@plone/volto/components/manage/Blocks/Search/components/base';
+import { enhanceExpandedByDefault } from './utils.js';
 
 const AccordionFacet = (props) => {
   const {
@@ -17,7 +17,7 @@ const AccordionFacet = (props) => {
     typeName,
   } = props;
   const facetValue = value;
-  var [open, setOpen] = React.useState(false);
+  var [open, setOpen] = React.useState(facet.expandedByDefault ?? false);
   function isChoiceValue(isChecked, choiceValue) {
     return isChecked ? choiceValue : null;
   }
@@ -92,7 +92,7 @@ const AccordionFacet = (props) => {
   );
 };
 
-AccordionFacet.schemaEnhancer = selectFacetSchemaEnhancer;
+AccordionFacet.schemaEnhancer = enhanceExpandedByDefault;
 AccordionFacet.stateToValue = selectFacetStateToValue;
 AccordionFacet.valueToQuery = selectFacetValueToQuery;
 export default AccordionFacet;

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

@@ -5,11 +5,11 @@ import { Checkbox, List } from 'semantic-ui-react';
 import { structure_taxonomy_terms } from '@eeacms/volto-clms-theme/components';
 
 import {
-  selectFacetSchemaEnhancer,
   selectFacetStateToValue,
   selectFacetValueToQuery,
 } from '@plone/volto/components/manage/Blocks/Search/components/base';
 import { checkAllChildren } from './utils';
+import { enhanceExpandedByDefault } from './utils.js';
 
 const hasAllChildrensSelected = (value, childrens) => {
   var result = true;
@@ -40,7 +40,7 @@ const CheckboxTreeFacet = (props) => {
   const { facet, choices, onChange, value, typeName } = props;
 
   const facetValue = value;
-  var [open, setOpen] = useState(false);
+  var [open, setOpen] = useState(facet.expandedByDefault ?? false);
   let options = [];
   if (choices?.length > 0) {
     options = structure_taxonomy_terms(choices);
@@ -161,7 +161,7 @@ const CheckboxListParent = ({ option, key, onChange, value, id }) => {
   );
 };
 
-CheckboxTreeFacet.schemaEnhancer = selectFacetSchemaEnhancer;
+CheckboxTreeFacet.schemaEnhancer = enhanceExpandedByDefault;
 CheckboxTreeFacet.stateToValue = selectFacetStateToValue;
 CheckboxTreeFacet.valueToQuery = selectFacetValueToQuery;
 export default CheckboxTreeFacet;

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

@@ -5,11 +5,11 @@ import { Checkbox, List } from 'semantic-ui-react';
 import { structure_taxonomy_terms } from '@eeacms/volto-clms-theme/components';
 
 import {
-  selectFacetSchemaEnhancer,
   selectFacetStateToValue,
   selectFacetValueToQuery,
 } from '@plone/volto/components/manage/Blocks/Search/components/base';
 import { checkAllChildren, uncheckOptionAndChildren } from './utils';
+import { enhanceExpandedByDefault } from './utils.js';
 
 const hasAllChildrensSelected = (value, childrens) => {
   var result = true;
@@ -39,7 +39,7 @@ const Wrapper = ({ typeName, children }) => {
 const CheckboxTreeParentFacet = (props) => {
   const { facet, choices, onChange, value, typeName } = props;
   const facetValue = value;
-  var [open, setOpen] = useState(false);
+  var [open, setOpen] = useState(facet.expandedByDefault ?? false);
   let options = [];
   if (choices?.length > 0) {
     options = structure_taxonomy_terms(choices);
@@ -153,7 +153,7 @@ const CheckboxListParent = ({ option, key, onChange, value, id }) => {
   );
 };
 
-CheckboxTreeParentFacet.schemaEnhancer = selectFacetSchemaEnhancer;
+CheckboxTreeParentFacet.schemaEnhancer = enhanceExpandedByDefault;
 CheckboxTreeParentFacet.stateToValue = selectFacetStateToValue;
 CheckboxTreeParentFacet.valueToQuery = selectFacetValueToQuery;
 export default CheckboxTreeParentFacet;

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

@@ -8,30 +8,12 @@ import {
   selectFacetStateToValue,
   selectFacetValueToQuery,
 } from '@plone/volto/components/manage/Blocks/Search/components/base';
-
-const doubleRangeFacetSchemaEnhancer = ({ schema, formData }) => {
-  // adds (enables) the 'multiple' field after the 'type' dropdown
-  let { fields } = schema.fieldsets[0];
-  const pos = fields.indexOf('type') + 1;
-  fields = [
-    ...fields.slice(0, pos),
-    'step',
-    'multiple',
-    ...fields.slice(pos, fields.length),
-  ];
-
-  schema.properties = {
-    ...schema.properties,
-    step: { title: 'Step', type: 'number', default: 1 },
-  };
-  schema.fieldsets[0].fields = fields;
-  return schema;
-};
+import { doubleRangeFacetSchemaEnhancer } from './utils.js';
 
 const DoubleRangeFacet = (props) => {
   const { facet, choices, onChange, value } = props;
   const facetValue = value;
-  var [open, setOpen] = React.useState(false);
+  var [open, setOpen] = React.useState(facet.expandedByDefault ?? false);
 
   const convertToRange = (values) => {
     return {
@@ -111,6 +93,7 @@ const DoubleRangeFacet = (props) => {
 };
 
 DoubleRangeFacet.schemaEnhancer = doubleRangeFacetSchemaEnhancer;
+
 DoubleRangeFacet.stateToValue = selectFacetStateToValue;
 DoubleRangeFacet.valueToQuery = selectFacetValueToQuery;
 export default DoubleRangeFacet;

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

@@ -8,25 +8,7 @@ import {
   selectFacetStateToValue,
   selectFacetValueToQuery,
 } from '@plone/volto/components/manage/Blocks/Search/components/base';
-
-const doubleRangeSpatialFacetSchemaEnhancer = ({ schema, formData }) => {
-  // adds (enables) the 'multiple' field after the 'type' dropdown
-  let { fields } = schema.fieldsets[0];
-  const pos = fields.indexOf('type') + 1;
-  fields = [
-    ...fields.slice(0, pos),
-    'step',
-    'multiple',
-    ...fields.slice(pos, fields.length),
-  ];
-
-  schema.properties = {
-    ...schema.properties,
-    step: { title: 'Step', type: 'number', default: 1 },
-  };
-  schema.fieldsets[0].fields = fields;
-  return schema;
-};
+import { doubleRangeFacetSchemaEnhancer } from './utils.js';
 
 const mToKm = (m) => {
   return m >= 1000 ? Math.round((m / 1000) * 10) / 10 + 'km' : m + 'm';
@@ -82,7 +64,7 @@ const convertToRange = (values, step) => {
 const DoubleRangeSpatialFacet = (props) => {
   const { facet, choices, onChange, value } = props;
   const facetValue = value;
-  var [open, setOpen] = React.useState(false);
+  var [open, setOpen] = React.useState(facet.expandedByDefault ?? false);
 
   const startingValues = convertToRange(choices, facet?.step);
 
@@ -156,7 +138,7 @@ const DoubleRangeSpatialFacet = (props) => {
   );
 };
 
-DoubleRangeSpatialFacet.schemaEnhancer = doubleRangeSpatialFacetSchemaEnhancer;
+DoubleRangeSpatialFacet.schemaEnhancer = doubleRangeFacetSchemaEnhancer;
 DoubleRangeSpatialFacet.stateToValue = selectFacetStateToValue;
 DoubleRangeSpatialFacet.valueToQuery = selectFacetValueToQuery;
 export default DoubleRangeSpatialFacet;

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

@@ -21,3 +21,39 @@ export const uncheckOptionAndChildren = (value, option) => {
       }
     });
 };
+
+export const enhanceExpandedByDefault = ({ schema, formData }) => {
+  return expandedByDefault(schema);
+};
+
+export const doubleRangeFacetSchemaEnhancer = ({ schema, formData }) => {
+  // adds (enables) the 'multiple' field after the 'type' dropdown
+  let { fields } = schema.fieldsets[0];
+  const pos = fields.indexOf('type') + 1;
+  fields = [
+    ...fields.slice(0, pos),
+    'step',
+    'multiple',
+    ...fields.slice(pos, fields.length),
+  ];
+
+  schema.properties = {
+    ...schema.properties,
+    step: { title: 'Step', type: 'number', default: 1 },
+  };
+  schema.fieldsets[0].fields = fields;
+  return expandedByDefault(schema);
+};
+
+export const expandedByDefault = (schema) => {
+  schema.properties = {
+    ...schema.properties,
+    expandedByDefault: {
+      title: 'Expanded by default',
+      type: 'boolean',
+      default: false,
+    },
+  };
+  schema.fieldsets[0].fields.push('expandedByDefault');
+  return schema;
+};

package/src/components/CLMSDatasetDetailView/DataSetInfoContent.jsx

@@ -106,15 +106,6 @@ const DataSetInfoContent = (props) => {
 
   return (
     <div>
-      {validation?.data &&
-        validation?.data !== '<p><br/></p>' &&
-        validation?.data !== '<p></p>' && (
-          <CclCitation
-            title="Validation status"
-            marginBottom={true}
-            children={<StringToHTML string={validation.data} />}
-          ></CclCitation>
-        )}
       <CclInfoContainer>
         {props?.description ? (
           <CclInfoDescription
@@ -124,6 +115,15 @@ const DataSetInfoContent = (props) => {
           ''
         )}
       </CclInfoContainer>
+      {validation?.data &&
+        validation?.data !== '<p><br/></p>' &&
+        validation?.data !== '<p></p>' && (
+          <CclCitation
+            title="Validation status"
+            marginBottom={true}
+            children={<StringToHTML string={validation.data} />}
+          ></CclCitation>
+        )}
       {citation?.data &&
         citation?.data !== '<p><br/></p>' &&
         citation?.data !== '<p></p>' && (
@@ -314,6 +314,17 @@ const DataSetInfoContent = (props) => {
                       duration={500}
                       height={'auto'}
                     >
+                      {props.technical_documents_accordion_text?.data &&
+                        props.technical_documents_accordion_text?.data !==
+                          '<p><br/></p>' &&
+                        props.technical_documents_accordion_text?.data !==
+                          '<p></p>' && (
+                          <StringToHTML
+                            string={
+                              props.technical_documents_accordion_text?.data
+                            }
+                          />
+                        )}
                       <CclRelatedListingView
                         id={'dataset-info-technicals'}
                         properties={{ ...props }}

package/src/components/CLMSDownloadCartView/AreaNaming.jsx

@@ -1,7 +1,7 @@
 import { Label } from 'semantic-ui-react';
 export const AreaNaming = (areaProps) => {
   const { item } = areaProps;
-  switch (item.area?.type) {
+  switch (item?.area?.type) {
     case 'polygon':
       return (
         <>
@@ -9,22 +9,22 @@ export const AreaNaming = (areaProps) => {
           <br />
           <span className="cart-bounding-boxes">
             <span className="cart-bounding-box-row">
-              <Label>{`N: ${item.area.value[1].toFixed(1)}º`}</Label>&nbsp;
-              <Label>{`E: ${item.area.value[2].toFixed(1)}º`}</Label>&nbsp;
+              <Label>{`N: ${item?.area.value[1].toFixed(1)}º`}</Label>&nbsp;
+              <Label>{`E: ${item?.area.value[2].toFixed(1)}º`}</Label>&nbsp;
               {/* </span>
             <span className="cart-bounding-box-row"> */}
-              <Label>{`S: ${item.area.value[3].toFixed(1)}º`}</Label>&nbsp;
-              <Label>{`W: ${item.area.value[0].toFixed(1)}º`}</Label>
+              <Label>{`S: ${item?.area.value[3].toFixed(1)}º`}</Label>&nbsp;
+              <Label>{`W: ${item?.area.value[0].toFixed(1)}º`}</Label>
             </span>
           </span>
         </>
       );
     case 'nuts':
-      return item.area.valueName || item.area.value;
+      return item?.area.valueName || item?.area.value;
     case undefined:
-      return item.area || item.file || '-';
-    case typeof item.area === 'string':
-      return item.area || item.file || '-';
+      return item?.area || item?.file || '-';
+    case typeof item?.area === 'string':
+      return item?.area || item?.file || '-';
     default:
       return '-';
   }

package/src/components/CLMSDownloadCartView/CLMSCartContent.jsx

@@ -90,11 +90,11 @@ const CLMSCartContent = (props) => {
   }, [cartItems]);
   useEffect(() => {
     const array_ids =
-      cart.length > 0 ? cart?.map((item) => item.unique_id) : [];
+      cart.length > 0 ? cart?.map((item) => item?.unique_id) : [];
     const newCart = cartItems.filter((item) =>
-      array_ids.includes(item.unique_id),
+      array_ids.includes(item?.unique_id),
     );
-    setCartItems(cleanDuplicatesEntries(newCart));
+
     let localsessionNutsIDList = [...new Set(getNutsIDList(cart))];
 
     if (
@@ -112,6 +112,8 @@ const CLMSCartContent = (props) => {
         projections,
         nutsnames.nutsnames,
       );
+    } else {
+      setCartItems(cleanDuplicatesEntries(newCart));
     }
   }, [cart, datasets_items, nutsnames]);
 
@@ -119,8 +121,8 @@ const CLMSCartContent = (props) => {
     if (checked && cartItems.length > 0) {
       setCartSelection(
         cartItems
-          .filter((item) => item.task_in_progress === false)
-          .map((item, key) => item.unique_id),
+          .filter((item) => item?.task_in_progress === false)
+          .map((item, key) => item?.unique_id),
       );
     } else {
       setCartSelection([]);
@@ -134,7 +136,7 @@ const CLMSCartContent = (props) => {
 
   const getSelectedCartItems = () => {
     return cartItems.filter(
-      (item) => cartSelection.indexOf(item.unique_id) > -1,
+      (item) => cartSelection.indexOf(item?.unique_id) > -1,
     );
   };
 
@@ -190,7 +192,7 @@ const CLMSCartContent = (props) => {
     const body = getDownloadToolPostBody(selectedItems);
     const unique_ids =
       selectedItems.length > 0
-        ? selectedItems.map((item) => item.unique_id)
+        ? selectedItems.map((item) => item?.unique_id)
         : [];
     dispatch(postDownloadtool(body, unique_ids));
   };
@@ -198,9 +200,9 @@ const CLMSCartContent = (props) => {
   const downloadModal = () => {
     let selectedItems = getSelectedCartItems();
     const hasPrepackaged =
-      selectedItems.filter((item) => item.file_id).length > 0;
+      selectedItems.filter((item) => item?.file_id).length > 0;
     const hasMapSelection =
-      selectedItems.filter((item) => !item.file_id).length > 0;
+      selectedItems.filter((item) => !item?.file_id).length > 0;
     if (!(hasMapSelection && hasPrepackaged)) {
       startDownloading();
     } else {
@@ -259,16 +261,16 @@ const CLMSCartContent = (props) => {
                     <tr
                       key={key}
                       style={
-                        item.task_in_progress
+                        item?.task_in_progress
                           ? { opacity: 0.5, backgroundColor: '#f5f5f5' }
                           : {}
                       }
                     >
                       <td className="table-td-warning hidden-warning">
-                        {!!item.warning && (
+                        {!!item?.warning && (
                           <span
                             className="info-icon"
-                            tooltip={item.warning}
+                            tooltip={item?.warning}
                             direction="up"
                           >
                             <FontAwesomeIcon
@@ -282,10 +284,10 @@ const CLMSCartContent = (props) => {
                           <div className="ccl-form-group">
                             <Checkbox
                               onChange={(e, data) =>
-                                selectCart(item.unique_id, data.checked)
+                                selectCart(item?.unique_id, data.checked)
                               }
-                              checked={cartSelection.includes(item.unique_id)}
-                              disabled={item.task_in_progress}
+                              checked={cartSelection.includes(item?.unique_id)}
+                              disabled={item?.task_in_progress}
                             />
                           </div>
                         </div>
@@ -293,11 +295,11 @@ const CLMSCartContent = (props) => {
                       <td>
                         <div className="mb-2">
                           <strong>Name: </strong>
-                          {contentOrDash(item.name)}
+                          {contentOrDash(item?.name)}
                         </div>
                         <div className="mb-2">
                           <strong>Source: </strong>
-                          {contentOrDash(item.source)}
+                          {contentOrDash(item?.source)}
                         </div>
                         <div className="mb-2">
                           <strong>Area: </strong>
@@ -364,10 +366,10 @@ const CLMSCartContent = (props) => {
                         )}
                       </td>
                       <td className="table-td-projections">
-                        {!item.file_id ? (
+                        {!item?.file_id ? (
                           <Select
                             placeholder="Select projection"
-                            value={item.projection}
+                            value={item?.projection}
                             options={
                               projections.length > 0 &&
                               projections?.map((projection) => {
@@ -379,7 +381,7 @@ const CLMSCartContent = (props) => {
                               })
                             }
                             onChange={(e, data) => {
-                              setProjectionValue(item.unique_id, data.value);
+                              setProjectionValue(item?.unique_id, data.value);
                             }}
                           />
                         ) : (
@@ -387,16 +389,18 @@ const CLMSCartContent = (props) => {
                         )}
                       </td>
                       <td>
-                        {datasetTimeseries.datasets[item.dataset_uid]?.start ? (
+                        {datasetTimeseries.datasets[item?.dataset_uid]
+                          ?.start ? (
                           <TimeseriesPicker
                             start={
-                              datasetTimeseries.datasets[item.dataset_uid].start
+                              datasetTimeseries.datasets[item?.dataset_uid]
+                                .start
                             }
                             end={
-                              datasetTimeseries.datasets[item.dataset_uid].end
+                              datasetTimeseries.datasets[item?.dataset_uid].end
                             }
                             period={
-                              datasetTimeseries.datasets[item.dataset_uid]
+                              datasetTimeseries.datasets[item?.dataset_uid]
                                 .period
                             }
                             item={item}
@@ -408,9 +412,9 @@ const CLMSCartContent = (props) => {
                       </td>
                       <td className="text-end">
                         <div style={{ display: 'flex' }}>
-                          {item.task_in_progress ? (
+                          {item?.task_in_progress ? (
                             <FontAwesomeIcon icon="spinner" spin />
-                          ) : !item.file_id ? (
+                          ) : !item?.file_id ? (
                             <span
                               className="info-icon"
                               tooltip="Add a duplicated row below"
@@ -419,7 +423,7 @@ const CLMSCartContent = (props) => {
                               <button
                                 onClick={() => {
                                   duplicateCartItem(
-                                    item.unique_id,
+                                    item?.unique_id,
                                     cartItems,
                                     setCartItems,
                                     updateCart,
@@ -442,7 +446,7 @@ const CLMSCartContent = (props) => {
                             <></>
                           )}
 
-                          {item.task_in_progress ? (
+                          {item?.task_in_progress ? (
                             <FontAwesomeIcon icon="spinner" spin />
                           ) : (
                             <span
@@ -452,7 +456,7 @@ const CLMSCartContent = (props) => {
                             >
                               <button
                                 onClick={() => {
-                                  removeCartItem(item.unique_id);
+                                  removeCartItem(item?.unique_id);
                                   if (
                                     pagination.length === 1 &&
                                     currentPage > 1
@@ -559,8 +563,8 @@ const CLMSCartContent = (props) => {
                 {[
                   ...new Set(
                     getSelectedCartItems()
-                      .filter((item) => item.file_id)
-                      .map((item) => item.name),
+                      .filter((item) => item?.file_id)
+                      .map((item) => item?.name),
                   ),
                 ]
                   .sort()
@@ -574,8 +578,8 @@ const CLMSCartContent = (props) => {
                 {[
                   ...new Set(
                     getSelectedCartItems()
-                      .filter((item) => !item.file_id)
-                      .map((item) => item.name),
+                      .filter((item) => !item?.file_id)
+                      .map((item) => item?.name),
                   ),
                 ].map((item, key) => (
                   <li key={key}>{item}</li>

package/src/components/CLMSDownloadCartView/CollectionNaming.jsx

@@ -8,23 +8,23 @@ export const CollectionNaming = ({
   cartItems,
   setCartItems,
 }) => {
-  if (item.file_id) {
+  if (item?.file_id) {
     return '-';
-  } else if (!item.type) {
+  } else if (!item?.type) {
     return '-';
   }
   const this_type_collections = item?.type_options.filter(
     (o) =>
-      o.name === item?.type_options.find((t_o) => t_o.id === item.type).name,
+      o.name === item?.type_options.find((t_o) => t_o.id === item?.type).name,
   );
   return this_type_collections.length > 1 ? (
     <Select
       placeholder="Select type"
       className="collection-selector"
       value={
-        item.type
-          ? item.type
-          : item.type_options.length > 0 && item.type_options[0].id
+        item?.type
+          ? item?.type
+          : item?.type_options.length > 0 && item?.type_options[0].id
       }
       options={
         item?.type_options?.length > 0 &&
@@ -39,16 +39,16 @@ export const CollectionNaming = ({
       onChange={(e, data) => {
         const new_cartItems = [...cartItems];
         const objIndex = new_cartItems.findIndex(
-          (obj) => obj.unique_id === item.unique_id,
+          (obj) => obj.unique_id === item?.unique_id,
         );
         new_cartItems[objIndex].type = data.value;
         const dataset = datasets_items
-          ? datasets_items.find((req) => req.UID === item.dataset_uid)
+          ? datasets_items.find((req) => req.UID === item?.dataset_uid)
           : false;
         const format_item = dataset.dataset_download_information.items.find(
           (item) => item['@id'] === data.value,
         );
-        new_cartItems[objIndex].format = format_item.full_format;
+        new_cartItems[objIndex].format = format_item?.full_format;
         setCartItems([...new_cartItems]);
       }}
     />

package/src/components/CLMSDownloadCartView/FormatNaming.jsx

@@ -14,7 +14,7 @@ export const FormatNaming = ({
     originalFormatNaming(item),
   );
   const item_format_name = formatNaming(item);
-  return !item.file_id ? (
+  return !item?.file_id ? (
     format_options.length > 1 ? (
       <Select
         placeholder="Select format"
@@ -23,7 +23,7 @@ export const FormatNaming = ({
         options={format_options}
         onChange={(e, data) => {
           const objIndex = cartItems.findIndex(
-            (obj) => obj.unique_id === item.unique_id,
+            (obj) => obj.unique_id === item?.unique_id,
           );
           cartItems[objIndex].format = data.value;
           setCartItems([...cartItems]);

package/src/components/CLMSDownloadCartView/LayerNaming.jsx

@@ -1,15 +1,15 @@
 import { Select } from 'semantic-ui-react';
 export const LayerNaming = ({ item, cartItems, setCartItems }) => {
-  if (item.file_id) {
+  if (item?.file_id) {
     return '-';
-  } else if (!item.type) {
+  } else if (!item?.type) {
     return '-';
   }
 
   const this_type_layers = item?.type_options.filter(
     (o) =>
       o.collection ===
-      item?.type_options.find((t_o) => t_o.id === item.type).collection,
+      item?.type_options.find((t_o) => t_o.id === item?.type).collection,
   );
 
   return this_type_layers.length > 0 &&
@@ -18,8 +18,8 @@ export const LayerNaming = ({ item, cartItems, setCartItems }) => {
       placeholder="Select layer"
       className="layer-selector"
       value={
-        item.layer
-          ? item.layer
+        item?.layer
+          ? item?.layer
           : this_type_layers[0].layers.length > 0 &&
             this_type_layers[0].layers[0]
       }
@@ -36,7 +36,7 @@ export const LayerNaming = ({ item, cartItems, setCartItems }) => {
       onChange={(e, data) => {
         const new_cartItems = [...cartItems];
         const objIndex = new_cartItems.findIndex(
-          (obj) => obj.unique_id === item.unique_id,
+          (obj) => obj.unique_id === item?.unique_id,
         );
         new_cartItems[objIndex].layer = data.value;
         setCartItems([...new_cartItems]);

package/src/components/CLMSDownloadCartView/TypeNaming.jsx

@@ -10,15 +10,15 @@ export const TypeNaming = ({
 }) => {
   const types_options =
     item?.type_options?.length > 0
-      ? [...new Set(item.type_options.map((ddi) => ddi.name))]
+      ? [...new Set(item?.type_options.map((ddi) => ddi.name))]
       : [];
-  if (item.file_id) {
+  if (item?.file_id) {
     return (
       <span className={'tag tag-' + item?.type?.toLowerCase()}>
-        {contentOrDash(item.type)}
+        {contentOrDash(item?.type)}
       </span>
     );
-  } else if (!item.type) {
+  } else if (!item?.type) {
     return '-';
   } else {
     let defaultType = getCollectionByItem(item);
@@ -40,19 +40,19 @@ export const TypeNaming = ({
         onChange={(e, data) => {
           const new_cartItems = [...cartItems];
           const objIndex = new_cartItems.findIndex(
-            (obj) => obj.unique_id === item.unique_id,
+            (obj) => obj.unique_id === item?.unique_id,
           );
-          const first_type_id = item.type_options.filter(
+          const first_type_id = item?.type_options.filter(
             (t_o) => t_o.name === data.value,
           )[0].id;
           new_cartItems[objIndex].type = first_type_id;
           const dataset = datasets_items
-            ? datasets_items.find((req) => req.UID === item.dataset_uid)
+            ? datasets_items.find((req) => req.UID === item?.dataset_uid)
             : false;
           const format_item = dataset.dataset_download_information.items.find(
             (item) => item['@id'] === first_type_id,
           );
-          new_cartItems[objIndex].format = format_item.full_format;
+          new_cartItems[objIndex].format = format_item?.full_format;
           setCartItems([...new_cartItems]);
         }}
       />

package/src/components/CLMSDownloadCartView/cartUtils.js

@@ -13,7 +13,7 @@ export const originalFormatNaming = (item) => {
 
 export const getCollectionByItem = (item) => {
   return item?.type_options
-    ? item.type_options.find((t_o) => t_o['id'] === item.type)
+    ? item?.type_options.find((t_o) => t_o['id'] === item?.type)
     : { id: '' };
 };
 
@@ -21,41 +21,41 @@ export const getDownloadToolPostBody = (selectedItems) => {
   const datasetList = selectedItems.map((item) => {
     let body_extras = {};
 
-    if (item.file_id) {
-      body_extras['FileID'] = item.file_id;
+    if (item?.file_id) {
+      body_extras['FileID'] = item?.file_id;
     } else {
-      if (item.area?.type === 'polygon') {
-        body_extras['BoundingBox'] = item.area.value;
+      if (item?.area?.type === 'polygon') {
+        body_extras['BoundingBox'] = item?.area.value;
       }
-      if (item.area?.type === 'nuts') {
-        body_extras['NUTS'] = item.area.value;
+      if (item?.area?.type === 'nuts') {
+        body_extras['NUTS'] = item?.area.value;
       }
-      // if (item.timeExtent?.length > 0) {
+      // if (item?.timeExtent?.length > 0) {
       //   body_extras['TemporalFilter'] = {
-      //     StartDate: item.timeExtent[0],
-      //     EndDate: item.timeExtent[1],
+      //     StartDate: item?.timeExtent[0],
+      //     EndDate: item?.timeExtent[1],
       //   };
       // }
-      if (item.format) {
+      if (item?.format) {
         body_extras['OutputFormat'] = formatNaming(item);
       }
-      if (item.projection) {
-        body_extras['OutputGCS'] = item.projection;
+      if (item?.projection) {
+        body_extras['OutputGCS'] = item?.projection;
       }
-      if (item.type) {
-        body_extras['DatasetDownloadInformationID'] = item.type;
+      if (item?.type) {
+        body_extras['DatasetDownloadInformationID'] = item?.type;
       }
-      if (item.layer) {
-        body_extras['Layer'] = item.layer;
+      if (item?.layer) {
+        body_extras['Layer'] = item?.layer;
       }
-      if (item.TemporalFilter) {
+      if (item?.TemporalFilter) {
         body_extras['TemporalFilter'] = {
-          StartDate: new Date(item.TemporalFilter?.StartDate).getTime(),
-          EndDate: new Date(item.TemporalFilter?.EndDate).getTime(),
+          StartDate: new Date(item?.TemporalFilter?.StartDate).getTime(),
+          EndDate: new Date(item?.TemporalFilter?.EndDate).getTime(),
         };
       }
     }
-    return { DatasetID: item.dataset_uid, ...body_extras };
+    return { DatasetID: item?.dataset_uid, ...body_extras };
   });
   return {
     Datasets: datasetList,
@@ -99,9 +99,9 @@ export const getCartObjectFromMapviewer = (
     dataset_data.dataset_download_information.items.forEach((item) => {
       type_options.push({
         id: item['@id'],
-        name: item.name,
-        full_format: item.full_format,
-        collection: item.collection,
+        name: item?.name,
+        full_format: item?.full_format,
+        collection: item?.collection,
         layers: item?.layers || [],
       });
     });
@@ -149,8 +149,8 @@ export const duplicateCartItem = (
         unique_id: cartItems[itemIndex].unique_id + '-copy',
       },
     );
-    while (cartItems.some((c_i) => c_i.unique_id === new_item.unique_id)) {
-      new_item['unique_id'] = new_item.unique_id + '-copy';
+    while (cartItems.some((c_i) => c_i.unique_id === new_item?.unique_id)) {
+      new_item['unique_id'] = new_item?.unique_id + '-copy';
     }
     cartItems.splice(itemIndex + 1, 0, new_item);
     refreshCart(cartItems, setCartItems, updateCart);
@@ -182,40 +182,43 @@ export const concatRequestedCartItem = (
   projections,
   nutsnames,
 ) => {
-  let newCartItems = [...cartItems];
-  [...localSessionCart].reverse().forEach((localItem) => {
-    const requestedItem = datasets_items
-      ? datasets_items.find((req) => req.UID === localItem.UID)
-      : false;
-    if (requestedItem) {
-      const file_data = requestedItem?.downloadable_files?.items.find(
-        (item) => item['@id'] === localItem.file_id,
-      );
-      if (file_data) {
-        newCartItems.push(
-          getCartObjectFromPrepackaged(file_data, requestedItem),
-        );
-        setCartItems(cleanDuplicatesEntries(newCartItems));
-      } else {
-        newCartItems.push(
-          getCartObjectFromMapviewer(
-            localItem,
-            requestedItem,
-            projections,
-            nutsnames,
-          ),
-        );
-        setCartItems(cleanDuplicatesEntries(newCartItems));
-      }
-    }
-  });
+  setCartItems(
+    cleanDuplicatesEntries(
+      [...localSessionCart]
+        .reverse()
+        .filter((localItem) => {
+          const requestedItem = datasets_items
+            ? datasets_items.find((req) => req.UID === localItem?.UID)
+            : false;
+          return requestedItem;
+        })
+        .map((localItem) => {
+          const requestedItem = datasets_items
+            ? datasets_items.find((req) => req.UID === localItem?.UID)
+            : false;
+          const file_data = requestedItem?.downloadable_files?.items.find(
+            (item) => item['@id'] === localItem?.file_id,
+          );
+          if (file_data) {
+            return getCartObjectFromPrepackaged(file_data, requestedItem);
+          } else {
+            return getCartObjectFromMapviewer(
+              localItem,
+              requestedItem,
+              projections,
+              nutsnames,
+            );
+          }
+        }),
+    ),
+  );
 };
 
 export const isChecked = (cartSelectionCh, cartItemsCh) => {
   return cartItemsCh.length > 0
     ? cartItemsCh
-        .filter((item) => item.task_in_progress === false)
-        .map((item, key) => item.unique_id)
+        .filter((item) => item?.task_in_progress === false)
+        .map((item, key) => item?.unique_id)
         .every(function (val) {
           return cartSelectionCh.indexOf(val) !== -1;
         })

package/src/components/CLMSDownloadCartView/conversion.js

@@ -1,6 +1,9 @@
 export const getAvailableConversion = (conversionTable, defaultValue) => {
   if (conversionTable) {
-    if (conversionTable[defaultValue] === undefined) {
+    if (
+      conversionTable[defaultValue] === undefined ||
+      conversionTable[defaultValue] === null
+    ) {
       defaultValue = Object.keys(conversionTable)[0];
     }
     const keys = Object.keys(conversionTable[defaultValue]);
@@ -24,7 +27,10 @@ export const initializeIfNotCompatibleConversion = (
   conversionTable,
   defaultValue,
 ) => {
-  if (conversionTable[defaultValue] === undefined) {
+  if (
+    conversionTable[defaultValue] === undefined ||
+    conversionTable[defaultValue] === null
+  ) {
     defaultValue = Object.keys(conversionTable)[0];
   }
   return defaultValue;

package/src/components/CLMSProfileView/CLMSNewsletterSubscriberView.jsx

@@ -24,7 +24,7 @@ class CLMSNewsletterSubscriberView extends Component {
     this.handleClick = this.handleClick.bind(this);
     this.state = {
       download: false,
-      headers: [{ label: 'Newsletter subscribers', key: 'email' }],
+      headers: [{ label: 'CLMS updates subscribers', key: 'email' }],
     };
   }
   componentDidMount() {
@@ -45,10 +45,10 @@ class CLMSNewsletterSubscriberView extends Component {
       <Container>
         <div>
           <h1 className="page-title">
-            Download a list of newsletter subscribers
+            Download a list of CLMS updates subscribers
           </h1>
           <p>
-            Click in the button below to download a list of all the newsletter
+            Click in the button below to download a list of all the CLMS updates
             subscribers.
           </p>
           <CclButton mode={'filled'} onClick={this.handleClick}>

package/src/components/CLMSProfileView/CLMSProfileView.jsx

@@ -69,7 +69,7 @@ class CLMSProfileView extends Component {
             </div>
             {(this.props.roles?.includes('Manager') ||
               this.props.roles?.includes('Site Administrator')) && (
-              <div tabTitle="Newsletter subscribers">
+              <div tabTitle="CLMS updates subscribers">
                 <CLMSNewsletterSubscriberView />
               </div>
             )}

package/src/components/CLMSSubscriptionView/SubscriptionView.jsx

@@ -275,7 +275,7 @@ class SubscriptionView extends Component {
                     this.props.type === 'events'
                       ? 'event'
                       : this.props.type === 'newsletter'
-                      ? 'the newsletter'
+                      ? 'the CLMS updates'
                       : this.props.type,
                 })}
               {this.props.isUnsubscribe === false &&
@@ -284,7 +284,7 @@ class SubscriptionView extends Component {
                     this.props.type === 'events'
                       ? 'event'
                       : this.props.type === 'newsletter'
-                      ? 'the newsletter'
+                      ? 'the CLMS updates'
                       : this.props.type,
                 })}{' '}
               {this.props.type !== 'newsletter' &&
@@ -320,7 +320,7 @@ class SubscriptionView extends Component {
                         {
                           type:
                             this.props.type === 'newsletter'
-                              ? 'the newsletter'
+                              ? 'the CLMS updates'
                               : this.props.type === 'events'
                               ? 'event'
                               : this.props.type,
@@ -420,7 +420,11 @@ class SubscriptionView extends Component {
                   }}
                 >
                   {'Click here if you would like to unsubscribe from our'}{' '}
-                  {this.props.type === 'events' ? 'event' : this.props.type}
+                  {this.props.type === 'events'
+                    ? 'event'
+                    : this.props.type === 'newsletter'
+                    ? 'CLMS updates'
+                    : this.props.type}
                   {this.props.type === 'newsletter' ? '' : ' notifications'}
                 </Link>
               </>

package/src/components/CLMSSubscriptionView/subscription_utils.js

@@ -1,6 +1,6 @@
 export const AVAILABLE_SUBSCRIPTIONS = [
   {
-    title: 'Subscribe to the newsletter',
+    title: 'Subscribe to the CLMS updates',
     type: 'newsletter',
     back_url: 'newsletter',
   },

package/src/components/Widgets/DownloadableFilesTableWidget.jsx

@@ -48,7 +48,16 @@ const DownloadableFilesTableWidget = (props) => {
   const { schema, uiSchema, ready } = data;
   const { setSchema, setUISchema, setSchemaHandler } = functions;
   const [edited, setEdited] = React.useState(false);
-
+  const table_value =
+    props.value?.items.length > 0
+      ? [
+          ...props.value?.items.map((i) =>
+            JSON.parse(orderKeysBy(['@id', ...uiSchema['ui:order']], i)),
+          ),
+        ]
+      : props.default?.items.length > 0
+      ? props.default?.items
+      : [];
   return (
     <>
       <div className="ui container">
@@ -137,15 +146,7 @@ const DownloadableFilesTableWidget = (props) => {
           schema={schema}
           csvexport={true}
           csvimport={true}
-          value={
-            [
-              ...props.value?.items.map((i) =>
-                JSON.parse(orderKeysBy(['@id', ...uiSchema['ui:order']], i)),
-              ),
-            ] ||
-            props.default?.items ||
-            []
-          }
+          value={table_value}
           onChange={(id, value) =>
             props.onChange(id, {
               ...props.value,

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

@@ -2,28 +2,29 @@
  * Footer component.
  * @module components/theme/Footer/Footer
  */
-
 import React, { Component } from 'react';
 import { defineMessages, injectIntl } from 'react-intl';
+import { connect } from 'react-redux';
+import { Link } from 'react-router-dom';
+import { ReactSVG } from 'react-svg';
+import { toast } from 'react-toastify';
+import { compose } from 'redux';
 
+import { Toast } from '@plone/volto/components';
 import AtmosphereImage from '@eeacms/volto-clms-theme/../theme/clms/img/ccl-icon-atmosphere.svg';
-import CclFooterColumn from '@eeacms/volto-clms-theme/components/CclFooterColumn/CclFooterColumn';
-import CclFooterMenu from '@eeacms/volto-clms-theme/components/CclTopMainMenu/CclFooterMenu';
 import ClimateImage from '@eeacms/volto-clms-theme/../theme/clms/img/ccl-icon-climate.svg';
-import CopernicusImage from '@eeacms/volto-clms-theme/../theme/clms/img/copernicus_eu_logo_white.svg';
-import ECImage from '@eeacms/volto-clms-theme/../theme/clms/img/eea-logo.svg';
-import EEAImage from '@eeacms/volto-clms-theme/../theme/clms/img/ec-logo-white.svg';
 import EmergencyImage from '@eeacms/volto-clms-theme/../theme/clms/img/ccl-icon-emergency.svg';
 import LandImage from '@eeacms/volto-clms-theme/../theme/clms/img/ccl-icon-land.svg';
-import { Link } from 'react-router-dom';
 import MarineImage from '@eeacms/volto-clms-theme/../theme/clms/img/ccl-icon-marine.svg';
-import { ReactSVG } from 'react-svg';
 import SecurityImage from '@eeacms/volto-clms-theme/../theme/clms/img/ccl-icon-security.svg';
-import { Toast } from '@plone/volto/components';
-import { compose } from 'redux';
-import { connect } from 'react-redux';
+import CopernicusImage from '@eeacms/volto-clms-theme/../theme/clms/img/copernicus_eu_logo_white.svg';
+import EEAImage from '@eeacms/volto-clms-theme/../theme/clms/img/ec-logo-white.svg';
+import ECImage from '@eeacms/volto-clms-theme/../theme/clms/img/eea-logo.svg';
+import CclFooterColumn from '@eeacms/volto-clms-theme/components/CclFooterColumn/CclFooterColumn';
+import CclFooterMenu from '@eeacms/volto-clms-theme/components/CclTopMainMenu/CclFooterMenu';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { subscribeTo } from '../../../../../actions';
-import { toast } from 'react-toastify';
+import { faLinkedin } from '@fortawesome/free-brands-svg-icons';
 import validator from 'validator';
 
 const messages = defineMessages({
@@ -370,7 +371,7 @@ class Footer extends Component {
             </CclFooterColumn>
             <div className="ccl-footer-col">
               <div className="ccl-footer-form-title">
-                Sign up to our newsletter
+                Sign up to CLMS updates
               </div>
               <form action="" className="ccl-footer-form">
                 <div className="ccl-footer-newsletter">
@@ -435,7 +436,7 @@ class Footer extends Component {
               </div>
               <div className="ccl-footer-social">
                 <a
-                  href="https://www.youtube.com/channel/UCpuwnbuwGG20enAdE50g6TA"
+                  href="https://www.youtube.com/playlist?list=PL1_QSyumTz7CZQEZ-1foOTeTOelKDQmxu"
                   target="_blank"
                   rel="noreferrer"
                   aria-label="Youtube"
@@ -458,8 +459,17 @@ class Footer extends Component {
                 >
                   <span className="ccl-icon-facebook"></span>
                 </a>
+                <a
+                  href="https://www.linkedin.com/showcase/copernicus-eea"
+                  target="_blank"
+                  rel="noreferrer"
+                  aria-label="Linkedin"
+                >
+                  <FontAwesomeIcon icon={faLinkedin} />
+                </a>
               </div>
             </div>
+
             <CclFooterColumn title={'Implemented by'}>
               <div className="footer-implemented footer-implemented-eea">
                 <a
@@ -497,9 +507,17 @@ class Footer extends Component {
                     wrapper="div"
                   />
                 </a>
-                <span>
-                  {this.props.intl.formatMessage(messages.jointResearchCenter)}
-                </span>
+                <a
+                  href="https://joint-research-centre.ec.europa.eu/index_en"
+                  target="_blank"
+                  rel="noreferrer"
+                >
+                  <span>
+                    {this.props.intl.formatMessage(
+                      messages.jointResearchCenter,
+                    )}
+                  </span>
+                </a>
               </div>
               {/* <div className="ccl-footer-col-title">
               {intl.formatMessage(messages.expertSupportProvidedBy)}