@eeacms/volto-arcgis-block 0.1.13 → 0.1.17

package/CHANGELOG.md

@@ -4,8 +4,69 @@ 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.17](https://github.com/eea/volto-arcgis-block/compare/0.1.16...0.1.17)
+
+- Fixed layer management & add WMTS Layer implementation [`#46`](https://github.com/eea/volto-arcgis-block/pull/46)
+- Use cases [`#50`](https://github.com/eea/volto-arcgis-block/pull/50)
+- Config service [`#49`](https://github.com/eea/volto-arcgis-block/pull/49)
+- Develop [`#48`](https://github.com/eea/volto-arcgis-block/pull/48)
+- Changed @eeacms/volto-clms-theme to @eeacms/volto-clms-utils [`#47`](https://github.com/eea/volto-arcgis-block/pull/47)
+- Fixed mark and unmark checkbox [`#44`](https://github.com/eea/volto-arcgis-block/pull/44)
+- Config service [`#43`](https://github.com/eea/volto-arcgis-block/pull/43)
+- Update legend text [`#42`](https://github.com/eea/volto-arcgis-block/pull/42)
+- Map widgets fix [`#39`](https://github.com/eea/volto-arcgis-block/pull/39)
+- ESLint fix [`ac9ea58`](https://github.com/eea/volto-arcgis-block/commit/ac9ea585ea63629179e881056846e7dbf89973a3)
+- Styles improvements [`a177578`](https://github.com/eea/volto-arcgis-block/commit/a177578a4651d862c2074d62943a42b3a3efd52c)
+- ESLint fix [`b6f3600`](https://github.com/eea/volto-arcgis-block/commit/b6f3600f739e6df9adc774c33fa83a4bbb3413bc)
+- Add volto-clms-utils [`a9a5c5f`](https://github.com/eea/volto-arcgis-block/commit/a9a5c5f1c2b27f2cc6e15045d7de9e51a11f354a)
+- Refs #142010 - Optimize Volto-addons gitflow pipelines [`8ff9e6f`](https://github.com/eea/volto-arcgis-block/commit/8ff9e6f6b5628450d61c1478059e4f9895840f17)
+- WMTS Layer implementation and minor bugfix [`60037db`](https://github.com/eea/volto-arcgis-block/commit/60037db96134bc165a127f8915ad4f216d48b382)
+- General map viewer download [`927ccba`](https://github.com/eea/volto-arcgis-block/commit/927ccbab4848fbb0a12cc94e9daf4898e0dd4653)
+- changed @eeacms/volto-clms-utils package to npm dependency [`d9db479`](https://github.com/eea/volto-arcgis-block/commit/d9db479c2436a9ab7bbdff1ea758020dce26b20c)
+- Changed @eeacms/volto-clms-theme/utils/useCartState to @eeacms/volto-clms-utils [`bc3ce5b`](https://github.com/eea/volto-arcgis-block/commit/bc3ce5b4be46408bdc57ef5b68b43ca5616fc158)
+- Fixed layer management [`b4e2ae3`](https://github.com/eea/volto-arcgis-block/commit/b4e2ae360ddb7256885422d16b56e54aa800fde9)
+- Select time extent [`857c228`](https://github.com/eea/volto-arcgis-block/commit/857c22805f2d30e4a09a802adb35920e2ab1f56c)
+- ESLint fix [`6a75130`](https://github.com/eea/volto-arcgis-block/commit/6a75130d016fbfb8a531f16d6c8d1c67a2a4ed7b)
+- ESLint fix [`41d68d6`](https://github.com/eea/volto-arcgis-block/commit/41d68d6d9de5665f5d994e6a47ef907c1c60c688)
+- ESLint fix [`983d9c4`](https://github.com/eea/volto-arcgis-block/commit/983d9c47be32e6a449d880ef2a07e84442658449)
+- Add to cart [`b18b48e`](https://github.com/eea/volto-arcgis-block/commit/b18b48e9f56a939ec7d8a822cc25bc32e8264742)
+
+#### [0.1.16](https://github.com/eea/volto-arcgis-block/compare/0.1.15...0.1.16)
+
+> 3 November 2021
+
+- Develop [`#40`](https://github.com/eea/volto-arcgis-block/pull/40)
+- Added contact info, improved popup width and added legend on zoom-in [`#38`](https://github.com/eea/volto-arcgis-block/pull/38)
+- Added legend to zoom-in [`b902e1f`](https://github.com/eea/volto-arcgis-block/commit/b902e1fb77ce020917f72ca8a20d3e7093694812)
+- Added contact info and improved popup width [`790a0a9`](https://github.com/eea/volto-arcgis-block/commit/790a0a9a5812ec5ef37f67ed5cca6cd0892dded2)
+
+#### [0.1.15](https://github.com/eea/volto-arcgis-block/compare/0.1.14...0.1.15)
+
+> 26 October 2021
+
+- Develop [`#37`](https://github.com/eea/volto-arcgis-block/pull/37)
+- Minor improvements on UseCasesMap [`#36`](https://github.com/eea/volto-arcgis-block/pull/36)
+- Add missing . [`a835328`](https://github.com/eea/volto-arcgis-block/commit/a835328fdf7c23618c5b9b9398dea1eca4766906)
+- Minor improvement [`361fa79`](https://github.com/eea/volto-arcgis-block/commit/361fa797e8b1b5f789fda6b067733d3201abb8f4)
+- Minor improvements on UseCsaesMap [`a2c19a1`](https://github.com/eea/volto-arcgis-block/commit/a2c19a1a4a9205c9cf46e3a388a4d74ca9d202da)
+
+#### [0.1.14](https://github.com/eea/volto-arcgis-block/compare/0.1.13...0.1.14)
+
+> 22 October 2021
+
+- Develop [`#35`](https://github.com/eea/volto-arcgis-block/pull/35)
+- Bugfix on popup [`#34`](https://github.com/eea/volto-arcgis-block/pull/34)
+- Removed setTimeout [`8de18d1`](https://github.com/eea/volto-arcgis-block/commit/8de18d1991294bb7a5ff56afd320160fb038bad2)
+- Update 'const' & 'let', extracted variables to a config file [`f11b76c`](https://github.com/eea/volto-arcgis-block/commit/f11b76c8443353287850437f1c5299ae41fee187)
+- Fixed popup data when changing continent [`3329795`](https://github.com/eea/volto-arcgis-block/commit/33297951141425738cd40a588ae861226a743e25)
+- Code refactorization [`1e144a8`](https://github.com/eea/volto-arcgis-block/commit/1e144a802dd40cba572d6711e166d31c82b164ef)
+- Added selectedPoint to be able to go back [`4c61116`](https://github.com/eea/volto-arcgis-block/commit/4c611163a9b23afb57a52cb39e345614e2824d92)
+
 #### [0.1.13](https://github.com/eea/volto-arcgis-block/compare/0.1.12...0.1.13)
 
+> 21 October 2021
+
+- Develop [`#33`](https://github.com/eea/volto-arcgis-block/pull/33)
 - Bugfix and improvements on use-cases [`#32`](https://github.com/eea/volto-arcgis-block/pull/32)
 - Map bottom margin [`0790f2c`](https://github.com/eea/volto-arcgis-block/commit/0790f2c870fb87073aa2b15d57edf66a9548b41e)
 - Calculate corresponding zoom with given bbox [`a766e7c`](https://github.com/eea/volto-arcgis-block/commit/a766e7cb04e957eb1d8d08e403dfd4995690bc7c)

package/Jenkinsfile

@@ -11,6 +11,13 @@ pipeline {
   stages {
 
     stage('Code') {
+      when {
+        allOf {
+          environment name: 'CHANGE_ID', value: ''
+          not { branch 'master' }
+          not { changelog '.*^Automated release [0-9\\.]+$' }
+        }
+      }
       steps {
         parallel(
 
@@ -36,6 +43,13 @@ pipeline {
     }
 
     stage('Tests') {
+      when {
+        allOf {
+          environment name: 'CHANGE_ID', value: ''
+          not { branch 'master' }
+          not { changelog '.*^Automated release [0-9\\.]+$' }
+        }
+      }
       steps {
         parallel(
 
@@ -75,6 +89,13 @@ pipeline {
     }
 
     stage('Integration tests') {
+      when {
+        allOf {
+          environment name: 'CHANGE_ID', value: ''
+          not { branch 'master' }
+          not { changelog '.*^Automated release [0-9\\.]+$' }
+        }
+      }
       steps {
         parallel(
 
@@ -122,11 +143,13 @@ pipeline {
     }
 
     stage('Report to SonarQube') {
-      // Exclude Pull-Requests
       when {
-        allOf {
           environment name: 'CHANGE_ID', value: ''
-        }
+          anyOf {
+            branch 'master'
+            branch 'develop'
+          }
+          not { changelog '.*^Automated release [0-9\\.]+$' }
       }
       steps {
         node(label: 'swarm') {
@@ -156,8 +179,8 @@ pipeline {
       steps {
         node(label: 'docker') {
           script {
-            if ( env.CHANGE_BRANCH != "develop" &&  !( env.CHANGE_BRANCH.startsWith("hotfix")) ) {
-                error "Pipeline aborted due to PR not made from develop or hotfix branch"
+            if ( env.CHANGE_BRANCH != "develop" ) {
+                error "Pipeline aborted due to PR not made from develop branch"
             }
            withCredentials([string(credentialsId: 'eea-jenkins-token', variable: 'GITHUB_TOKEN')]) {
             sh '''docker pull eeacms/gitflow'''

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-arcgis-block",
-  "version": "0.1.13",
+  "version": "0.1.17",
   "description": "volto-arcgis-block: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: CodeSyntax",
@@ -15,6 +15,9 @@
     "type": "git",
     "url": "git@github.com:eea/volto-arcgis-block.git"
   },
+  "addons": [
+    "@eeacms/volto-clms-utils"
+  ],
   "scripts": {
     "i18n": "NODE_ENV=production node src/i18n.js",
     "release": "release-it",
@@ -34,7 +37,8 @@
     "esri-loader": "3.1.0",
     "@fortawesome/fontawesome-svg-core": "1.2.35",
     "@fortawesome/free-solid-svg-icons": "5.15.3",
-    "@fortawesome/react-fontawesome": "0.1.14"
+    "@fortawesome/react-fontawesome": "0.1.14",
+    "@eeacms/volto-clms-utils": "0.1.1"
   },
   "devDependencies": {
     "@cypress/code-coverage": "^3.9.5",

package/src/components/MapViewer/AreaWidget.jsx

@@ -4,7 +4,13 @@ import React, { createRef } from 'react';
 //import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { loadModules } from 'esri-loader';
 
-var Graphic, Extent, FeatureLayer, GroupLayer;
+var Graphic,
+  Extent,
+  FeatureLayer,
+  GroupLayer,
+  Color,
+  SimpleLineSymbol,
+  SimpleFillSymbol;
 
 class AreaWidget extends React.Component {
   /**
@@ -32,14 +38,38 @@ class AreaWidget extends React.Component {
       'esri/geometry/Extent',
       'esri/layers/FeatureLayer',
       'esri/layers/GroupLayer',
-    ]).then(([_Graphic, _Extent, _FeatureLayer, _GroupLayer]) => {
-      [Graphic, Extent, FeatureLayer, GroupLayer] = [
+      'esri/Color',
+      'esri/symbols/SimpleLineSymbol',
+      'esri/symbols/SimpleFillSymbol',
+    ]).then(
+      ([
         _Graphic,
         _Extent,
         _FeatureLayer,
         _GroupLayer,
-      ];
-    });
+        _Color,
+        _SimpleLineSymbol,
+        _SimpleFillSymbol,
+      ]) => {
+        [
+          Graphic,
+          Extent,
+          FeatureLayer,
+          GroupLayer,
+          Color,
+          SimpleLineSymbol,
+          SimpleFillSymbol,
+        ] = [
+          _Graphic,
+          _Extent,
+          _FeatureLayer,
+          _GroupLayer,
+          _Color,
+          _SimpleLineSymbol,
+          _SimpleFillSymbol,
+        ];
+      },
+    );
   }
 
   /**
@@ -93,7 +123,7 @@ class AreaWidget extends React.Component {
       url: url,
       id: id,
       outFields: ['*'],
-      popupEnabled: true,
+      popupEnabled: false,
       definitionExpression: 'LEVL_CODE=' + level,
     });
     this.nutsGroupLayer.add(layer);
@@ -129,6 +159,7 @@ class AreaWidget extends React.Component {
           }),
           symbol: fillSymbol,
         });
+        this.props.updateArea({ origin: e.origin, end: { x: e.x, y: e.y } });
         this.props.view.graphics.add(extentGraphic);
       }
     });
@@ -139,9 +170,11 @@ class AreaWidget extends React.Component {
     if (this.state.ShowGraphics) {
       this.state.ShowGraphics.remove();
       this.setState({ ShowGraphics: null });
+      this.props.updateArea();
     }
     this.nutsGroupLayer.removeAll();
     this.props.view.graphics.removeAll();
+    this.props.updateArea();
   }
   /**
    * This method is executed after the rener method is executed
@@ -153,10 +186,39 @@ class AreaWidget extends React.Component {
       opacity: 0.5,
     });
     this.props.map.add(this.nutsGroupLayer);
+    this.props.view.on('click', (event) => {
+      this.props.view.hitTest(event).then((response) => {
+        if (response.results.length > 0) {
+          let graphic = response.results.filter((result) => {
+            let layer;
+            if ('nuts0 nuts1 nuts3'.includes(result.graphic.layer.id)) {
+              layer = result.graphic;
+            }
+            return layer;
+          })[0].graphic;
+          if (graphic) {
+            let geometry = graphic.geometry;
+            if (geometry.type === 'polygon') {
+              let nuts = graphic.attributes.NUTS_ID;
+              this.props.updateArea(nuts);
+              let symbol = new SimpleFillSymbol(
+                'solid',
+                new SimpleLineSymbol('solid', new Color([232, 104, 80]), 2),
+                new Color([232, 104, 80, 0.25]),
+              );
+              let highlight = new Graphic(geometry, symbol);
+              this.props.view.graphics.removeAll();
+              this.props.view.graphics.add(highlight);
+            }
+          }
+        }
+      });
+    });
     this.props.download
       ? this.props.view.ui.add(this.container)
       : this.props.view.ui.add(this.container.current, 'top-right');
   }
+
   /**
    * This method renders the component
    * @returns jsx
@@ -258,40 +320,30 @@ class AreaWidget extends React.Component {
                     </div>
                   </label>
                 </div>
-                {this.props.download && (
-                  <div>
-                    {/* <div class="map-download-resource">
-                      <div class="ccl-form">
-                        <div class="map-download-header">
-                          <label for="download_area_select" class="map-download-header-title">Download resource as</label>
-                          <span class="info-icon" tooltip="Info" direction="up">
-                            <FontAwesomeIcon
-                              className="map-menu-icon"
-                              icon={['fas', 'info-circle']}
-                            />
-                          </span>
-                        </div>
+                <div>
+                  {/* <div class="map-download-resource">
+                    <div class="ccl-form">
+                      <div class="map-download-header">
+                        <label for="download_area_select" class="map-download-header-title">Download resource as</label>
+                        <span class="info-icon" tooltip="Info" direction="up">
+                          <FontAwesomeIcon
+                            className="map-menu-icon"
+                            icon={['fas', 'info-circle']}
+                          />
+                        </span>
+                      </div>
+                      <div class="ccl-select-container">
                         <div class="ccl-select-container">
-                          <div class="ccl-select-container">
-                            <select class="ccl-select" id="download_area_select" name="" >
-                              <option value="option1">GeoTiff</option>
-                              <option value="option2">ESRI Geodatabase</option>
-                              <option value="option3">SQLite Database</option>
-                            </select>
-                          </div>
+                          <select class="ccl-select" id="download_area_select" name="" >
+                            <option value="option1">GeoTiff</option>
+                            <option value="option2">ESRI Geodatabase</option>
+                            <option value="option3">SQLite Database</option>
+                          </select>
                         </div>
                       </div>
-                    </div> */}
-                    <div class="map-download-buttons">
-                      <button class="ccl-button ccl-button-green">
-                        Add to cart
-                      </button>
-                      <button class="ccl-button ccl-button--default">
-                        Cancel
-                      </button>
                     </div>
-                  </div>
-                )}
+                  </div> */}
+                </div>
               </fieldset>
             </div>
           </div>
@@ -300,5 +352,4 @@ class AreaWidget extends React.Component {
     );
   }
 }
-
 export default AreaWidget;

package/src/components/MapViewer/LegendWidget.jsx

@@ -33,6 +33,7 @@ class LegendWidget extends React.Component {
    */
   openMenu() {
     if (this.state.showMapMenu) {
+      this.props.mapViewer.setActiveWidget();
       this.container.current.querySelector('.legend-panel').style.display =
         'none';
       this.container.current
@@ -42,6 +43,7 @@ class LegendWidget extends React.Component {
       // and ensure that the component is rendered again
       this.setState({ showMapMenu: false });
     } else {
+      this.props.mapViewer.setActiveWidget(this);
       this.container.current
         .querySelector('.esri-widget--button')
         .classList.replace('esri-icon-legend', 'esri-icon-right-arrow');

package/src/components/MapViewer/MapViewer.jsx

@@ -37,6 +37,11 @@ class MapViewer extends React.Component {
     this.mapClass = classNames('map-container', {
       [`${props.customClass}`]: props.customClass || null,
     });
+    this.state = {};
+  }
+
+  updateArea(shared_value) {
+    this.mapViewer.setState({ area: shared_value });
   }
 
   loader() {
@@ -142,6 +147,7 @@ class MapViewer extends React.Component {
           map={this.map}
           mapViewer={this}
           download={this.props.mapviewer_config.Download}
+          updateArea={this.updateArea}
         />
       );
   }
@@ -159,6 +165,8 @@ class MapViewer extends React.Component {
           download={this.props.mapviewer_config.Download}
           map={this.map}
           mapViewer={this}
+          updateArea={this.updateArea}
+          area={this.state.area}
         />
       ); //call conf
   }