@eeacms/volto-arcgis-block 0.1.121 → 0.1.123

package/CHANGELOG.md

@@ -4,6 +4,20 @@ 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).
 
+### [0.1.123](https://github.com/eea/volto-arcgis-block/compare/0.1.122...0.1.123) - 24 March 2023
+
+#### :hammer_and_wrench: Others
+
+- CLMS-1975-1634 (fix): finished implementing these tickets and ran linting scripts [ujbolivar - [`fe41bc0`](https://github.com/eea/volto-arcgis-block/commit/fe41bc0e1e44beb350a340a18625e34c61d41437)]
+- CLMS-1975-1634 (FIX): Changes for CLMS-1975 and CLMS-1634 completed [ujbolivar - [`4d13b79`](https://github.com/eea/volto-arcgis-block/commit/4d13b7965e9691fe1d66d2cc25b51a1c05f0d0e1)]
+- CLMS-1975 [Amanda Rodriguez - [`182755c`](https://github.com/eea/volto-arcgis-block/commit/182755c7edb0348c505d1906d803c64fc4e18eb6)]
+### [0.1.122](https://github.com/eea/volto-arcgis-block/compare/0.1.121...0.1.122) - 23 March 2023
+
+#### :hammer_and_wrench: Others
+
+- CLMS-1765-and-CLMS-1975 (chore): Commented a completed task and ran linting scripts [ujbolivar - [`894352f`](https://github.com/eea/volto-arcgis-block/commit/894352f3e25d9a1bc8143092c9683d348651222f)]
+- CLMS-1756 and CLMS-1975 (lint): Ran linting scripts [ujbolivar - [`e5fb127`](https://github.com/eea/volto-arcgis-block/commit/e5fb127413d91ee36457c2530f61fa01488a2de8)]
+- CLMS-1765 AND CLMS-1975 (fix): Corrected issues with datasets loading. Pushing latest team changes [ujbolivar - [`473fcc9`](https://github.com/eea/volto-arcgis-block/commit/473fcc9de87c6137b5e877c4bc8684e79df4a205)]
 ### [0.1.121](https://github.com/eea/volto-arcgis-block/compare/0.1.120...0.1.121) - 23 March 2023
 
 #### :hammer_and_wrench: Others

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-arcgis-block",
-  "version": "0.1.121",
+  "version": "0.1.123",
   "description": "volto-arcgis-block: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: CodeSyntax",

package/src/components/MapViewer/MenuWidget.jsx

@@ -366,10 +366,10 @@ class MenuWidget extends React.Component {
               node.style.display = zoom > 6 ? 'none' : 'block';
             }
           }
-          if (dropDownActive.includes('dropdown_2_0')) {
+          if (dropDownActive.includes('dropdown_2_1')) {
             let checks = document
-              .getElementById('dropdown_2_0')
-              .nextSibling.querySelectorAll('[parentid="map_product_2_0"]');
+              .getElementById('dropdown_2_1')
+              .nextSibling.querySelectorAll('[parentid="map_product_2_1"]');
             let checksList = Array.prototype.slice.call(checks);
             if (checksList && checksList !== null) {
               checksList.forEach((check) => {
@@ -417,9 +417,17 @@ class MenuWidget extends React.Component {
     );
   }
 
+  waitForDataFill = async () => {
+    while (this.compCfg.length === 0) {
+      await new Promise((resolve) => setTimeout(resolve, 100)); // wait for 100ms
+    }
+    return this.compCfg;
+  };
+
   // get custom TMS layer JSON
   getTMSLayersJSON() {
     let promises = []; // download JSON file calls
+    this.waitForDataFill();
     this.compCfg.forEach((component) => {
       component.Products.forEach((product) => {
         product.Datasets.forEach((dataset) => {
@@ -818,12 +826,10 @@ class MenuWidget extends React.Component {
     for (var i in component.Products) {
       // CLMS-1544
       // dont show the product if all of its datasets has the auxiliary service as its ViewService URL
+      //CLMS-1756
+      //don´t show the product if MarkAsDownloadableNoServiceToVisualize is true
       const isAuxiliary = (dataset) =>
-        dataset.ViewService.toLowerCase() ===
-          'https://trial.discomap.eea.europa.eu/arcgis/services/clms/worldcountries/mapserver/wmsserver' ||
-        dataset.ViewService.toLowerCase() ===
-          'https://trial.discomap.eea.europa.eu/arcgis/services/clms/worldcountries/mapserver/wmsserver?';
-
+        dataset.MarkAsDownloadableNoServiceToVisualize;
       if (!component.Products[i].Datasets.every(isAuxiliary)) {
         products.push(
           this.metodProcessProduct(
@@ -900,12 +906,7 @@ class MenuWidget extends React.Component {
       }
 
       // CLMS-1545
-      if (
-        product.Datasets[i].ViewService.toLowerCase() !==
-          'https://trial.discomap.eea.europa.eu/arcgis/services/clms/worldcountries/mapserver/wmsserver' &&
-        product.Datasets[i].ViewService.toLowerCase() !==
-          'https://trial.discomap.eea.europa.eu/arcgis/services/clms/worldcountries/mapserver/wmsserver?'
-      ) {
+      if (!product.Datasets[i].MarkAsDownloadableNoServiceToVisualize) {
         datasets.push(
           this.metodProcessDataset(
             product.Datasets[i],
@@ -1901,7 +1902,7 @@ class MenuWidget extends React.Component {
    * Method to show Active Layers of the map
    * @param {*} elem From the click event
    */
-  addActiveLayer(elem, order, fromDownload) {
+  addActiveLayer(elem, order, fromDownload, hideCalendar) {
     return (
       <div
         className="active-layer"
@@ -1992,7 +1993,12 @@ class MenuWidget extends React.Component {
             />
           </span>
           {this.timeLayers[elem.id][1] === 'stop' &&
-            this.renderTimeslider(elem, this.layers[elem.id], fromDownload)}
+            this.renderTimeslider(
+              elem,
+              this.layers[elem.id],
+              fromDownload,
+              hideCalendar,
+            )}
         </div>
       </div>
     );
@@ -2128,7 +2134,7 @@ class MenuWidget extends React.Component {
    * @param {*} id id from elem
    */
 
-  showTimeSlider(elem, fromDownload) {
+  showTimeSlider(elem, fromDownload, hideCalendar) {
     if (
       sessionStorage.key('timeSliderTag') &&
       sessionStorage.getItem('timeSliderTag') === 'true'
@@ -2168,6 +2174,7 @@ class MenuWidget extends React.Component {
             elem,
             order,
             fromDownload,
+            hideCalendar,
           );
         } else {
           if (
@@ -2741,7 +2748,7 @@ class MenuWidget extends React.Component {
     }
   }
 
-  renderTimeslider(elem, layer, fromDownload) {
+  renderTimeslider(elem, layer, fromDownload, hideCalendar) {
     if (this.props.view && layer) {
       let activeLayer = document.querySelector('#active_' + elem.id);
       let time = { elem: activeLayer };
@@ -2765,6 +2772,7 @@ class MenuWidget extends React.Component {
           logged={isLoggedIn}
           fromDownload={fromDownload}
           area={this.props.area}
+          hideCalendar={hideCalendar}
         />,
         document.querySelector('.esri-ui-bottom-right'),
       );
@@ -2785,7 +2793,7 @@ class MenuWidget extends React.Component {
         .querySelector('[datasetid="' + id + '"] input')
         .getAttribute('defcheck');
       setTimeout(() => {
-        this.showTimeSlider(document.getElementById(layerId), false);
+        this.showTimeSlider(document.getElementById(layerId), true, true);
       }, 100);
     }
   }

package/src/components/MapViewer/TimesliderWidget.jsx

@@ -26,7 +26,8 @@ class TimesliderWidget extends React.Component {
       timeSelectedValuesC: [], //To compare time slider stored values with new selected values
       showDatePanel: false,
       lockDatePanel: true,
-      showCalendar: this.props.fromDownload ? true : false,
+      showCalendar:
+        this.props.fromDownload && !this.props.hideCalendar ? true : false,
       dateStart: this.props.time.start ? new Date(this.props.time.start) : null,
       dateEnd: this.props.time.end ? new Date(this.props.time.end) : null,
       periodicity: null,