@eeacms/volto-arcgis-block 0.1.119 → 0.1.120

package/CHANGELOG.md

@@ -4,6 +4,11 @@ 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.120](https://github.com/eea/volto-arcgis-block/compare/0.1.119...0.1.120) - 23 March 2023
+
+#### :hammer_and_wrench: Others
+
+- CLMS-1765 (fix):TOC menu for datasets with no service but downloadable takes into account the settings [Urkorue - [`cf4949a`](https://github.com/eea/volto-arcgis-block/commit/cf4949a98b0c181760fbcf6044532c599450781e)]
 ### [0.1.119](https://github.com/eea/volto-arcgis-block/compare/0.1.118...0.1.119) - 22 March 2023
 
 #### :hammer_and_wrench: Others

package/package.json

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

package/src/components/MapViewer/MenuWidget.jsx

@@ -819,11 +819,7 @@ class MenuWidget extends React.Component {
       // CLMS-1544
       // dont show the product if all of its datasets has the auxiliary service as its ViewService URL
       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(
@@ -898,14 +894,8 @@ class MenuWidget extends React.Component {
         var idDataset = 'map_dataset_' + inheritedIndexProduct + '_' + index;
         dataset_def.push(idDataset);
       }
-
       // 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 +1891,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 +1982,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 +2123,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 +2163,7 @@ class MenuWidget extends React.Component {
             elem,
             order,
             fromDownload,
+            hideCalendar,
           );
         } else {
           if (
@@ -2741,7 +2737,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 +2761,7 @@ class MenuWidget extends React.Component {
           logged={isLoggedIn}
           fromDownload={fromDownload}
           area={this.props.area}
+          hideCalendar={hideCalendar}
         />,
         document.querySelector('.esri-ui-bottom-right'),
       );
@@ -2785,7 +2782,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,