@eeacms/volto-clms-theme 1.1.59 → 1.1.61

package/CHANGELOG.md

@@ -4,6 +4,13 @@ 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.61](https://github.com/eea/volto-clms-theme/compare/1.1.60...1.1.61) - 18 October 2023
+
+#### :hammer_and_wrench: Others
+
+- CLMS-2641 use new field content for the grid image [Mikel Larreategi - [`d29a0e1`](https://github.com/eea/volto-clms-theme/commit/d29a0e142e8ff284232251b39b01b6761a9b1a7c)]
+### [1.1.60](https://github.com/eea/volto-clms-theme/compare/1.1.59...1.1.60) - 18 October 2023
+
 ### [1.1.59](https://github.com/eea/volto-clms-theme/compare/1.1.58...1.1.59) - 17 October 2023
 
 ### [1.1.58](https://github.com/eea/volto-clms-theme/compare/1.1.57...1.1.58) - 17 October 2023

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-clms-theme",
-  "version": "1.1.59",
+  "version": "1.1.61",
   "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

@@ -228,7 +228,24 @@ const CLMSCartContent = (props) => {
     ref.scrollIntoView({ behavior: 'smooth' });
   };
 
-  const { tooManyInQueue } = props;
+  const { tooManyInQueue, howManyInQueue, maxInQueue } = props;
+
+  const tooManySelected = () => {
+    let selectedItems = getSelectedCartItems();
+    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;
+  };
 
   return (
     <>
@@ -530,13 +547,22 @@ const CLMSCartContent = (props) => {
         <>
           {tooManyInQueue && (
             <strong>
-              You have 5 items in the download queue. Wait until the queue is
-              reduced before requesting more.
+              You have {maxInQueue} items in the download queue. Wait until the
+              queue is reduced before requesting more.
+            </strong>
+          )}
+          {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>
           )}
           <CclButton
             onClick={() => downloadModal()}
-            disabled={cartSelection.length === 0 || tooManyInQueue}
+            disabled={
+              cartSelection.length === 0 || tooManyInQueue || tooManySelected()
+            }
           >
             Start downloading
           </CclButton>

package/src/components/CLMSDownloadCartView/CLMSDownloadCartView.jsx

@@ -102,11 +102,11 @@ const CLMSDownloadCartView = (props) => {
   }, [dispatch]);
 
   const downloadtool = useSelector((state) => state.downloadtool);
-  const tooManyInQueue =
+  const maxInQueue = 5;
+  const howManyInQueue =
     Object.keys(downloadtool?.download_queued).length +
-      Object.keys(downloadtool?.download_in_progress).length >=
-    5;
-
+    Object.keys(downloadtool?.download_in_progress).length;
+  const tooManyInQueue = howManyInQueue >= maxInQueue;
   return (
     <>
       <Helmet title={helmetTitle(formatMessage(messages.Cart), content)} />
@@ -167,6 +167,8 @@ const CLMSDownloadCartView = (props) => {
                 localSessionCart={cart}
                 getNutsIDList={getNutsIDList}
                 tooManyInQueue={tooManyInQueue}
+                howManyInQueue={howManyInQueue}
+                maxInQueue={maxInQueue}
               />
             </div>
           </>

package/src/components/CclDownloadTable/CclDownloadTable.jsx

@@ -295,7 +295,10 @@ function CclDownloadTable(props) {
                     <div className="image-modal">
                       <img
                         src={
-                          prepackage_grid_image
+                          props.dataset.download_grid_image_for_prepackages
+                            ? props.dataset.download_grid_image_for_prepackages
+                                .download
+                            : prepackage_grid_image
                             ? prepackage_grid_image
                             : PlaceHolder
                         }