@eeacms/volto-clms-theme 1.1.201 → 1.1.203

package/CHANGELOG.md

@@ -4,6 +4,14 @@ 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.203](https://github.com/eea/volto-clms-theme/compare/1.1.202...1.1.203) - 3 December 2024
+
+### [1.1.202](https://github.com/eea/volto-clms-theme/compare/1.1.201...1.1.202) - 20 November 2024
+
+#### :bug: Bug Fixes
+
+- fix: If the Privacy policy check box is selected and then deselected again, the form will not be validated and sent - refs #280425 [ana-oprea - [`300b9c9`](https://github.com/eea/volto-clms-theme/commit/300b9c98f61e95050896ab62c5827f1a081e73b2)]
+
 ### [1.1.201](https://github.com/eea/volto-clms-theme/compare/1.1.200...1.1.201) - 20 November 2024
 
 #### :hammer_and_wrench: Others

package/package.json

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

package/src/components/Blocks/customBlocks.js

@@ -603,6 +603,7 @@ const customBlocks = (config) => ({
         id: 'checkbox_html',
         label: 'Checkbox with html',
         component: CheckboxHtmlWidget,
+        isValid: (formData, name) => formData[name]?.value,
       },
       {
         id: 'text_widget',

package/src/components/CLMSDownloadCartView/CLMSCartContent.jsx

@@ -48,6 +48,8 @@ import paginationRightSVG from '@plone/volto/icons/right-key.svg';
 
 import './cart-table.less';
 
+const MAX_PREPACKAGED = 100;
+
 const DownloadModal = ({
   openedModal,
   onConfirm,
@@ -129,6 +131,30 @@ const getSelectedCartItems = (ci, cs) => {
   return ci.filter((item) => cs.indexOf(item?.unique_id) > -1);
 };
 
+const tooManySelected = ({ selectedCartItems, howManyInQueue, maxInQueue }) => {
+  const hasPrepackaged =
+    selectedCartItems.filter((item) => item?.file_id).length > 0;
+  const hasMapSelection =
+    selectedCartItems.filter((item) => !item?.file_id).length > 0;
+  let count = 0;
+  if (hasPrepackaged) {
+    count = count + 1;
+  }
+  if (hasMapSelection) {
+    count = count + 1;
+  }
+
+  return howManyInQueue + count > maxInQueue;
+};
+
+const tooManyPrepackaged = ({ selectedCartItems }) => {
+  const prepackageCount = selectedCartItems.filter(
+    (item) => item?.source === 'Pre-packaged', // see utils.js getCartObjectFromPrepackaged
+  ).length;
+
+  return prepackageCount > MAX_PREPACKAGED;
+};
+
 /* eslint-disable react-hooks/exhaustive-deps */
 /**
  * CLMSCartContent container.
@@ -333,23 +359,6 @@ const CLMSCartContent = (props) => {
     ref.scrollIntoView({ behavior: 'smooth' });
   };
 
-  const tooManySelected = () => {
-    let selectedItems = getSelectedCartItems(cartItems, cartSelection);
-    const hasPrepackaged =
-      selectedItems.filter((item) => item?.file_id).length > 0;
-    const hasMapSelection =
-      selectedItems.filter((item) => !item?.file_id).length > 0;
-    let count = 0;
-    if (hasPrepackaged) {
-      count = count + 1;
-    }
-    if (hasMapSelection) {
-      count = count + 1;
-    }
-
-    return howManyInQueue + count > maxInQueue;
-  };
-
   const selectedCartItems = getSelectedCartItems(cartItems, cartSelection);
 
   const datasetTimeseriesUids = Object.keys(datasetTimeseries?.datasets || {});
@@ -363,6 +372,14 @@ const CLMSCartContent = (props) => {
           item.download_show_auxiliary_calendar),
     ).length > 0;
 
+  const _tooManySelected = tooManySelected({
+    selectedCartItems,
+    howManyInQueue,
+    maxInQueue,
+  });
+
+  const _tooManyPrepackaged = tooManyPrepackaged({ selectedCartItems });
+
   return (
     <>
       {pagination?.length !== 0 ? (
@@ -695,19 +712,27 @@ const CLMSCartContent = (props) => {
               items.
             </strong>
           )}
-          {tooManySelected() && (
+          {_tooManySelected && (
             <strong>
               With the selection that you have made, you will have {maxInQueue}{' '}
               or more items in the download queue. Please change your selection
               in order to request a download.
             </strong>
           )}
+          {_tooManyPrepackaged && (
+            <strong>
+              No more than {MAX_PREPACKAGED} prepackage downloads are allowed in
+              the same request. <br />
+              Please change your selection in order to request a download.
+            </strong>
+          )}
           <CclButton
             onClick={() => downloadModal(cartItems, cartSelection)}
             disabled={
               cartSelection.length === 0 ||
               tooManyInQueue ||
-              tooManySelected() ||
+              _tooManySelected ||
+              _tooManyPrepackaged ||
               needDateSelected
             }
           >