@eeacms/volto-arcgis-block 0.1.24 → 0.1.25

package/CHANGELOG.md

@@ -4,8 +4,19 @@ 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.25](https://github.com/eea/volto-arcgis-block/compare/0.1.24...0.1.25)
+
+- Bugs n improvements [`#82`](https://github.com/eea/volto-arcgis-block/pull/82)
+- ESLint fix [`c129348`](https://github.com/eea/volto-arcgis-block/commit/c129348ee3886e0419029dd2bfe835c28878444c)
+- Filter by product and dataset [`c89711a`](https://github.com/eea/volto-arcgis-block/commit/c89711acf4f46c8426c7e34add2baf4debe67697)
+- ESLint fix [`406842a`](https://github.com/eea/volto-arcgis-block/commit/406842a54f1964bf2b4b0e709719028a5a47a903)
+- Timeslider bug fixing [`c7a8345`](https://github.com/eea/volto-arcgis-block/commit/c7a834538a54a8c48e2e34259d3d733a1194007a)
+
 #### [0.1.24](https://github.com/eea/volto-arcgis-block/compare/0.1.23...0.1.24)
 
+> 21 December 2021
+
+- Develop [`#77`](https://github.com/eea/volto-arcgis-block/pull/77)
 - Bugs n improvements [`#80`](https://github.com/eea/volto-arcgis-block/pull/80)
 - The area array to a json object and added a unique_id to the cart [`#79`](https://github.com/eea/volto-arcgis-block/pull/79)
 - Remove Global from legend [`#76`](https://github.com/eea/volto-arcgis-block/pull/76)

package/Jenkinsfile

@@ -124,7 +124,7 @@ pipeline {
             node(label: 'docker') {
               script {
                 try {
-                  sh '''docker pull plone; docker run -d --name="$BUILD_TAG-plone" -e SITE="Plone" -e PROFILES="profile-plone.restapi:blocks" plone fg'''
+                  sh '''docker pull plone; docker run -d --rm --name="$BUILD_TAG-plone" -e SITE="Plone" -e PROFILES="profile-plone.restapi:blocks" plone fg'''
                   sh '''docker pull plone/volto-addon-ci; docker run -i --name="$BUILD_TAG-cypress" --link $BUILD_TAG-plone:plone -e NAMESPACE="$NAMESPACE" -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e DEPENDENCIES="$DEPENDENCIES" -e NODE_ENV=test plone/volto-addon-ci cypress'''
                 } finally {
                   try {
@@ -142,7 +142,8 @@ pipeline {
                              reportName: 'CypressCoverage',
                              reportTitles: 'Integration Tests Code Coverage'])
                     }
-                    archiveArtifacts artifacts: 'cypress-reports/videos/*.mp4', fingerprint: true
+                    sh '''touch empty_file; for ok_test in $(grep -E 'file=.*failures="0"' $(grep 'testsuites .*failures="0"' $(find cypress-results -name *.xml) empty_file | awk -F: '{print $1}') empty_file | sed 's/.* file="\\(.*\\)" time.*/\\1/' | sed 's#^cypress/integration/##g' | sed 's#^../../../node_modules/@eeacms/##g'); do rm -f cypress-reports/videos/$ok_test.mp4; rm -f cypress-reports/$ok_test.mp4; done'''
+                    archiveArtifacts artifacts: 'cypress-reports/**/*.mp4', fingerprint: true, allowEmptyArchive: true
                     stash name: "cypress-coverage", includes: "cypress-coverage/**", allowEmpty: true
                   }
                   finally {

package/package.json

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

package/src/components/MapViewer/InfoWidget.jsx

@@ -71,7 +71,7 @@ class InfoWidget extends React.Component {
     this.props.view.on('click', (e) => {
       if (this.props.mapViewer.activeWidget === this) {
         let timeLayers = this.map.layers.items.filter(
-          (a) => a.timeInfo && a.visible,
+          (a) => a.isTimeSeries && a.visible,
         );
         let layer = timeLayers[timeLayers.length - 1];
         let title;

package/src/components/MapViewer/MenuWidget.jsx

@@ -316,6 +316,25 @@ class MenuWidget extends React.Component {
     }
     //to watch the component
     this.setState({});
+    this.checkUrl();
+  }
+
+  checkUrl() {
+    let url = new URL(window.location.href);
+    let product = url.searchParams.get('product');
+    let dataset = url.searchParams.get('dataset');
+    if (product || dataset) {
+      let event = new MouseEvent('click', {
+        view: window,
+        bubbles: true,
+        cancelable: false,
+      });
+      let elem = product
+        ? '[productid="' + product + '"]'
+        : '[datasetid="' + dataset + '"]';
+      let node = document.querySelector(elem + ' input');
+      node.dispatchEvent(event);
+    }
   }
 
   /**
@@ -416,6 +435,7 @@ class MenuWidget extends React.Component {
       <div
         className="map-menu-product-dropdown"
         id={'product_' + inheritedIndexProduct}
+        productid={product.ProductId}
         key={'a' + prodIndex}
       >
         <fieldset className="ccl-fieldset" key={'b' + prodIndex}>
@@ -523,8 +543,6 @@ class MenuWidget extends React.Component {
         dataset.Layer[0].LayerId + '_' + inheritedIndexDataset + '_0',
       );
     }
-    // ./dataset-catalogue/dataset-info.html
-    // ./dataset-catalogue/dataset-download.html
 
     return (
       <div
@@ -638,6 +656,7 @@ class MenuWidget extends React.Component {
               legendUrl: urlWMS + legendRequest + layer.LayerId,
             },
           ],
+          isTimeSeries: isTimeSeries,
         });
       } else if (urlWMS.toLowerCase().includes('wmts')) {
         this.layers[layer.LayerId + '_' + inheritedIndexLayer] = new WMTSLayer({
@@ -648,6 +667,7 @@ class MenuWidget extends React.Component {
             id: layer.LayerId,
             title: layer.Title,
           },
+          isTimeSeries: isTimeSeries,
         });
       } else {
         this.layers[
@@ -657,6 +677,7 @@ class MenuWidget extends React.Component {
           id: layer.LayerId,
           title: layer.Title,
           popupEnabled: true,
+          isTimeSeries: isTimeSeries,
         });
       }
     }
@@ -701,7 +722,6 @@ class MenuWidget extends React.Component {
     if (!this.visibleLayers) this.visibleLayers = {};
     if (!this.timeLayers) this.timeLayers = {};
     let parentId = elem.getAttribute('parentid');
-    let layerId = elem.getAttribute('layerid');
     if (elem.checked) {
       this.map.add(this.layers[elem.id]);
       this.visibleLayers[elem.id] = ['fas', 'eye'];
@@ -714,7 +734,10 @@ class MenuWidget extends React.Component {
       if (nuts) {
         this.map.reorder(nuts, this.map.layers.items.length + 1);
       }
-      if (Object.keys(this.timeLayers).length > 0) {
+      if (
+        this.map.layers.items.filter((a) => a.isTimeSeries && a.visible)
+          .length > 0
+      ) {
         if (!document.querySelector('.info-container')) {
           let div = document.createElement('div');
           document.querySelector('.esri-ui-top-right').appendChild(div);
@@ -732,23 +755,15 @@ class MenuWidget extends React.Component {
         }
       }
     } else {
-      let checkboxes = document.getElementsByName('layerCheckbox');
-      let repeatedLayers = [];
-      for (let checkbox = 0; checkbox < checkboxes.length - 1; checkbox++) {
-        if (checkboxes[checkbox].getAttribute('layerid') === layerId) {
-          if (checkboxes[checkbox].checked) repeatedLayers.push(repeatedLayers);
-        }
-      }
-      if (repeatedLayers.length === 0) {
-        this.map.remove(this.layers[elem.id]);
-        delete this.activeLayersJSON[elem.id];
-        delete this.visibleLayers[elem.id];
-        delete this.timeLayers[elem.id];
-      }
+      this.map.remove(this.layers[elem.id]);
+      delete this.activeLayersJSON[elem.id];
+      delete this.visibleLayers[elem.id];
+      delete this.timeLayers[elem.id];
     }
     this.updateCheckDataset(parentId);
     if (
-      Object.keys(this.timeLayers).length === 0 &&
+      this.map.layers.items.filter((a) => a.isTimeSeries && a.visible)
+        .length === 0 &&
       document.querySelector('.info-container')
     ) {
       this.props.mapViewer.closeActiveWidget();
@@ -920,10 +935,13 @@ class MenuWidget extends React.Component {
     let reorder_elem = document.querySelector('#active_layers').firstChild;
     if (!reorder_elem) return;
     reorder_elem.setAttribute('layer-order', counter++);
-    this.layerReorder(reorder_elem.id, counter);
+    this.layerReorder(reorder_elem.getAttribute('layer-id'), counter);
     while ((reorder_elem = reorder_elem.nextSibling)) {
       reorder_elem.setAttribute('layer-order', counter++);
-      this.layerReorder(this.layers[reorder_elem.id], counter);
+      this.layerReorder(
+        this.layers[reorder_elem.getAttribute('layer-id')],
+        counter,
+      );
     }
   }
 
@@ -986,15 +1004,15 @@ class MenuWidget extends React.Component {
             document.querySelector('#download_label').classList.add('locked');
           this.activeLayersJSON[elem.id] = this.addActiveLayer(elem, order);
         } else {
-          if (this.visibleLayers[elem.id][1] === 'eye') {
-            this.layers[elem.id].visible = false;
-            this.visibleLayers[elem.id] = ['fas', 'eye-slash'];
+          if (this.visibleLayers[layerId][1] === 'eye') {
+            this.layers[layerId].visible = false;
+            this.visibleLayers[layerId] = ['fas', 'eye-slash'];
           }
           document
-            .querySelector('.active-layer[layer-id="' + elem.id + '"]')
+            .querySelector('.active-layer[layer-id="' + layerId + '"]')
             .classList.add('locked');
-          this.activeLayersJSON[elem.id] = this.addActiveLayer(
-            document.getElementById(elem.id),
+          this.activeLayersJSON[layerId] = this.addActiveLayer(
+            document.getElementById(layerId),
             order,
           );
         }
@@ -1028,16 +1046,16 @@ class MenuWidget extends React.Component {
               document.querySelector('.esri-ui-bottom-right'),
             );
         } else {
-          if (this.visibleLayers[elem.id][1] === 'eye-slash') {
-            this.layers[elem.id].visible = true;
-            this.visibleLayers[elem.id] = ['fas', 'eye'];
-            this.activeLayersJSON[elem.id] = this.addActiveLayer(
-              document.getElementById(elem.id),
+          if (this.visibleLayers[layerId][1] === 'eye-slash') {
+            this.layers[layerId].visible = true;
+            this.visibleLayers[layerId] = ['fas', 'eye'];
+            this.activeLayersJSON[layerId] = this.addActiveLayer(
+              document.getElementById(layerId),
               order,
             );
           }
           document
-            .querySelector('.active-layer[layer-id="' + elem.id + '"]')
+            .querySelector('.active-layer[layer-id="' + layerId + '"]')
             .classList.remove('locked');
         }
       });

package/src/components/MapViewer/TimesliderWidget.jsx

@@ -57,6 +57,9 @@ class TimesliderWidget extends React.Component {
     });
 
     this.TimesliderWidget.watch('timeExtent', (timeExtent) => {
+      if (!this.container.current ? true : false) {
+        this.TimesliderWidget.stop();
+      }
       let start = new Date(timeExtent.start).getTime();
       let end = new Date(timeExtent.end).getTime();
       this.props.time.elem.setAttribute('time-start', start);