@eeacms/volto-clms-theme 1.0.203 → 1.0.204

package/CHANGELOG.md

@@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+### [1.0.204](https://github.com/eea/volto-clms-theme/compare/1.0.203...1.0.204) - 17 May 2023
+
+#### :rocket: New Features
+
+- feat: clms-2139 band selection [Mikel Larreategi - [`8d1d099`](https://github.com/eea/volto-clms-theme/commit/8d1d09968e7648ab90ac1567552aaa5b0bb3c6f9)]
+- feat: CLMS-2199 style fix for block chooser happening inside tabs block [Unai - [`49f303e`](https://github.com/eea/volto-clms-theme/commit/49f303efb523b0a3d7c592c02df365ce082a60be)]
+
+#### :hammer_and_wrench: Others
+
+- refactor last commit so style is only applyed inside tabs block [Unai - [`df12af5`](https://github.com/eea/volto-clms-theme/commit/df12af543eb61e743a403a5a1b8fad0abb49ce61)]
 ### [1.0.203](https://github.com/eea/volto-clms-theme/compare/1.0.202...1.0.203) - 12 May 2023
 
 #### :rocket: New Features
@@ -1106,7 +1116,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 #### :hammer_and_wrench: Others
 
 - related products and datasets added to news and meeting views and login-plone route created [Unai - [`5704a1a`](https://github.com/eea/volto-clms-theme/commit/5704a1a766148746162b60efaf232ea90dc20cf4)]
-- Revert "[JENKINS] Use eeacms/plone-backend and Volto alpha version- Refs #151967" [Mikel Larreategi - [`46eb694`](https://github.com/eea/volto-clms-theme/commit/46eb69415280a3c982405299135027ae4221426a)]
 - sort items according to the lowercased label and put those with special meaning at the end [Mikel Larreategi - [`6410abe`](https://github.com/eea/volto-clms-theme/commit/6410abe096f60dcad54dced2026c9df9b7946d68)]
 - lint fix [Unai - [`1264a7a`](https://github.com/eea/volto-clms-theme/commit/1264a7adfe8d679fea1bd821ad087add20f4271d)]
 - footer newsletter subscription change, global search maxLength change from 8000 to 200 and /login design change [Unai - [`a09d24a`](https://github.com/eea/volto-clms-theme/commit/a09d24adbb6fa053fb2a2cc0071506b906593b42)]
@@ -1257,7 +1266,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - search block new features [ionlizarazu - [`8e814cb`](https://github.com/eea/volto-clms-theme/commit/8e814cbd359782540c21fe37b37ef146d331f0d6)]
 - language selector cookie management [ionlizarazu - [`1385ac9`](https://github.com/eea/volto-clms-theme/commit/1385ac95795702206d3623ba6e780faa43a89e0a)]
 - toolbar cookie management [ionlizarazu - [`5c23200`](https://github.com/eea/volto-clms-theme/commit/5c23200790b20e1d4f1bc966463c37bf4c808f47)]
-- Add Sonarqube tag using clms-frontend addons list [EEA Jenkins - [`0316a0d`](https://github.com/eea/volto-clms-theme/commit/0316a0d8b6fb0fa14af13002415f3c95d9f8ede3)]
 ### [1.0.84](https://github.com/eea/volto-clms-theme/compare/1.0.83...1.0.84) - 18 March 2022
 
 #### :hammer_and_wrench: Others
@@ -2162,13 +2170,11 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 #### :hammer_and_wrench: Others
 
 - replace @collective/volto-dropdownmenu with volto-dropdownmenu [ionlizarazu - [`07f004f`](https://github.com/eea/volto-clms-theme/commit/07f004fe0219e403fb51bc045c83d34f3b981f76)]
-- yarn.lock [ionlizarazu - [`fe1ca04`](https://github.com/eea/volto-clms-theme/commit/fe1ca04889d29fe7b653db4c69af2751b84b8a1a)]
 - add NODE_ENV parameter [ionlizarazu - [`101f27c`](https://github.com/eea/volto-clms-theme/commit/101f27c25b8fbd192e1b11865e95cf5ffee08c1b)]
 - upgrade volto-dropdownmenu version [ionlizarazu - [`2081855`](https://github.com/eea/volto-clms-theme/commit/2081855301f4c708776e0dbab39db143cee00dbc)]
 - HomeSearch block missing url behaviour [ionlizarazu - [`d20a378`](https://github.com/eea/volto-clms-theme/commit/d20a378ce3f254b8343692348f314bf281974542)]
 - babel configuration [ionlizarazu - [`203ea2d`](https://github.com/eea/volto-clms-theme/commit/203ea2de07f99ca3403e4ca220ca74d7ce69b61d)]
 - prettier [ionlizarazu - [`e79e26b`](https://github.com/eea/volto-clms-theme/commit/e79e26bf2fa40ba7b4eb53a24dabd87928221c28)]
-- add yarn lock [ionlizarazu - [`e1ab28b`](https://github.com/eea/volto-clms-theme/commit/e1ab28b060d5a74431c368b0de82a68dabce1eab)]
 - Jenkinsfile cypress test [ionlizarazu - [`b385d65`](https://github.com/eea/volto-clms-theme/commit/b385d65986f717c60f8c434a08fc11b829d08eb4)]
 - cypress [ionlizarazu - [`a243cf0`](https://github.com/eea/volto-clms-theme/commit/a243cf0182fa3dd113c16ff495c71e310252d83b)]
 - some fixes [ionlizarazu - [`046279b`](https://github.com/eea/volto-clms-theme/commit/046279b9d05bea8a64eca03eed493e02621534c9)]

package/package.json

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

@@ -141,13 +141,22 @@ const CLMSCartContent = (props) => {
           <Toast
             success
             autoClose={5000}
-            title={'Selected file(s) added to the downloading process.'}
+            title={'Downloading process started'}
+            content={'Selected file(s) added to the downloading process.'}
           />,
         );
       })
       .catch(function (error) {
         setLoadingTable(false);
-        toast.error(<Toast autoClose={5000} title={'Something went wrong.'} />);
+        toast.error(
+          <Toast
+            autoClose={5000}
+            title={'Something went wrong.'}
+            error={
+              'There was an error when requesting the download, please try again.'
+            }
+          />,
+        );
       });
   };
 
@@ -189,12 +198,12 @@ const CLMSCartContent = (props) => {
           <>
             <span>Bounding Box</span>
             <br />
-            <span class="cart-bounding-boxes">
-              <span class="cart-bounding-box-row">
+            <span className="cart-bounding-boxes">
+              <span className="cart-bounding-box-row">
                 <span>{`N: ${item.area.value[0].toFixed(1)}º `}</span>&nbsp;
                 <span>{`E: ${item.area.value[1].toFixed(1)}º `}</span>
               </span>
-              <span class="cart-bounding-box-row">
+              <span className="cart-bounding-box-row">
                 <span>{`S: ${item.area.value[2].toFixed(1)}º `}</span>&nbsp;
                 <span>{`W: ${item.area.value[3].toFixed(1)}º `}</span>
               </span>
@@ -343,6 +352,53 @@ const CLMSCartContent = (props) => {
     );
   };
 
+  const LayerNaming = ({ item }) => {
+    if (item.file_id) {
+      return '-';
+    } 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,
+    );
+
+    return this_type_layers.length > 0 &&
+      this_type_layers[0].layers.length > 0 ? (
+      <Select
+        placeholder="Select layer"
+        value={
+          item.layer
+            ? item.layer
+            : this_type_layers[0].layers.length > 0 &&
+              this_type_layers[0].layers[0]
+        }
+        options={
+          this_type_layers[0]?.layers.length > 0 &&
+          this_type_layers[0].layers.map((option) => {
+            return {
+              key: option,
+              value: option,
+              text: option,
+            };
+          })
+        }
+        onChange={(e, data) => {
+          const new_cartItems = [...cartItems];
+          const objIndex = new_cartItems.findIndex(
+            (obj) => obj.unique_id === item.unique_id,
+          );
+          new_cartItems[objIndex].layer = data.value;
+          setCartItems([...new_cartItems]);
+        }}
+      />
+    ) : (
+      '-'
+    );
+  };
+
   const contentOrDash = (content) => {
     return content || '-';
   };
@@ -373,6 +429,7 @@ const CLMSCartContent = (props) => {
                   <th>Type</th>
                   <th>Collection</th>
                   <th>Format</th>
+                  <th>Layer/Band</th>
                   <th>Projection</th>
                   <th></th>
                   <th></th>
@@ -440,6 +497,9 @@ const CLMSCartContent = (props) => {
                           />
                         )}
                       </td>
+                      <td className="table-td-format">
+                        <LayerNaming item={item} />
+                      </td>
                       <td className="table-td-projections">
                         {!item.file_id ? (
                           <Select
@@ -491,7 +551,7 @@ const CLMSCartContent = (props) => {
                                 outline: 'inherit',
                               }}
                             >
-                              <Icon name={addDocumentSVG} size={25} />
+                              <Icon name={addDocumentSVG} size={'41'} />
                             </button>
                           </span>
                         ) : (
@@ -523,7 +583,7 @@ const CLMSCartContent = (props) => {
                             >
                               <Icon
                                 name={removeSVG}
-                                size={25}
+                                size={'45'}
                                 color="#e40166"
                               />
                             </button>

package/src/components/CLMSDownloadCartView/cartUtils.js

@@ -20,6 +20,7 @@ export const getCollectionByItem = (item) => {
 export const getDownloadToolPostBody = (selectedItems) => {
   const datasetList = selectedItems.map((item) => {
     let body_extras = {};
+
     if (item.file_id) {
       body_extras['FileID'] = item.file_id;
     } else {
@@ -44,6 +45,9 @@ export const getDownloadToolPostBody = (selectedItems) => {
       if (item.type) {
         body_extras['DatasetDownloadInformationID'] = item.type;
       }
+      if (item.layer) {
+        body_extras['Layer'] = item.layer;
+      }
     }
     return { DatasetID: item.dataset_uid, ...body_extras };
   });
@@ -92,9 +96,11 @@ export const getCartObjectFromMapviewer = (
         name: item.name,
         full_format: item.full_format,
         collection: item.collection,
+        layers: item?.layers || [],
       });
     });
   }
+
   return {
     name: dataset_data.title || '-',
     area: area || '-',

package/src/components/Widgets/DatasetDownloadInformationWidget.jsx

@@ -49,6 +49,13 @@ const ItemSchema = () => ({
       description: '',
       type: 'string',
     },
+    layers: {
+      title: 'Layers / Bands',
+      description:
+        'Some datasets provide options to download specific layers. Write here the layer names, one per line',
+      type: 'string',
+      widget: 'token',
+    },
   },
   fieldsets: [
     {
@@ -61,6 +68,7 @@ const ItemSchema = () => ({
         'full_format',
         'full_source',
         'wekeo_choices',
+        'layers',
       ],
     },
   ],

package/theme/clms/css/volto-block-style-override.css

@@ -389,3 +389,11 @@ body:not(.is-authenticated):not(.document_wide_view).stretch {
     margin: 0 -1.3vw;
   }
 }
+
+.tabs-block {
+  .blocks-chooser {
+    right: 0;
+    left: auto !important;
+    margin-top: 50px;
+  }
+}