@eeacms/volto-arcgis-block 0.1.22 → 0.1.26

package/CHANGELOG.md

@@ -4,8 +4,71 @@ 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.26](https://github.com/eea/volto-arcgis-block/compare/0.1.25...0.1.26)
+
+- Bug fixing [`#88`](https://github.com/eea/volto-arcgis-block/pull/88)
+- Bugs n improvements [`#87`](https://github.com/eea/volto-arcgis-block/pull/87)
+- Develop [`#86`](https://github.com/eea/volto-arcgis-block/pull/86)
+- Time slider drag/drop [`#85`](https://github.com/eea/volto-arcgis-block/pull/85)
+- Use cases [`#84`](https://github.com/eea/volto-arcgis-block/pull/84)
+- Develop [`#81`](https://github.com/eea/volto-arcgis-block/pull/81)
+- Downloadable dataset [`c48eea9`](https://github.com/eea/volto-arcgis-block/commit/c48eea93b0f71134f9aa8fee1f5d6b4cf7e1368b)
+- add flattenToAppURL to send the correct url to the MapViewerConfig action [`ca5f684`](https://github.com/eea/volto-arcgis-block/commit/ca5f684ae683e0df249d3fab3534f579583f03a8)
+- ESLint fix [`7f43112`](https://github.com/eea/volto-arcgis-block/commit/7f4311224483fb599e7cecfe65096166ed5f2026)
+- Use case highlight [`2279a5a`](https://github.com/eea/volto-arcgis-block/commit/2279a5ad669172545588e9030e3cf49ca4e30dfa)
+
+#### [0.1.25](https://github.com/eea/volto-arcgis-block/compare/0.1.24...0.1.25)
+
+> 5 January 2022
+
+- Develop [`#83`](https://github.com/eea/volto-arcgis-block/pull/83)
+- 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)
+- ESLint fix [`974d62b`](https://github.com/eea/volto-arcgis-block/commit/974d62bd5b66025e12fa85dffcd0d1a5ae04cba4)
+- ESLint fix [`5c4b0d7`](https://github.com/eea/volto-arcgis-block/commit/5c4b0d76de50edd85809c35449f2fb364a9e9312)
+- ESLint fix [`d57d144`](https://github.com/eea/volto-arcgis-block/commit/d57d144fd0e3dbbbbc95195f289d50e6c4b03375)
+- ESLint fix [`9eb0a0c`](https://github.com/eea/volto-arcgis-block/commit/9eb0a0c17d018ac1b25bde422ac149b46b146ff4)
+- ESLint fix [`5fd3772`](https://github.com/eea/volto-arcgis-block/commit/5fd3772f197a3a380067962a5638dbf901a4624e)
+- Pixel info [`1ccef39`](https://github.com/eea/volto-arcgis-block/commit/1ccef39a9adcc3ee94655c77a5a166b613600a08)
+- NUTS bug fix [`37fe7f3`](https://github.com/eea/volto-arcgis-block/commit/37fe7f3fad2c005e3b7c234b3b0564d5df92fa8c)
+
+#### [0.1.23](https://github.com/eea/volto-arcgis-block/compare/0.1.22...0.1.23)
+
+> 17 December 2021
+
+- Develop [`#75`](https://github.com/eea/volto-arcgis-block/pull/75)
+- Use cases region highlight [`#71`](https://github.com/eea/volto-arcgis-block/pull/71)
+- Bugs n improvements [`#74`](https://github.com/eea/volto-arcgis-block/pull/74)
+- Add NUTS 2 in the Map viewer [`#72`](https://github.com/eea/volto-arcgis-block/pull/72)
+- Mapviewer menu widget correction [`#73`](https://github.com/eea/volto-arcgis-block/pull/73)
+- Update highlight service [`fbec327`](https://github.com/eea/volto-arcgis-block/commit/fbec3279c44900ec1100affed350a517133997fb)
+- ESLint fix [`4a695e3`](https://github.com/eea/volto-arcgis-block/commit/4a695e39ab3d276483ad2922e7ee2b446826db2c)
+- ESLint fix [`62e6a10`](https://github.com/eea/volto-arcgis-block/commit/62e6a1034a6317a0a45f682248ef1c1bc12081a6)
+- NUTS layer order [`4942c25`](https://github.com/eea/volto-arcgis-block/commit/4942c25ef0fe7c7f239015f8d14910b3ac2238fe)
+- Remove debugger [`bcbb107`](https://github.com/eea/volto-arcgis-block/commit/bcbb1076f80fe773ff3dd2ffb5dc038e5c8f4733)
+- Update layers array key values to unique IDs [`066951d`](https://github.com/eea/volto-arcgis-block/commit/066951d571fc77a96b98cc0650d36d1a22665e49)
+- Remove unused variable [`830349f`](https://github.com/eea/volto-arcgis-block/commit/830349f17e8549f8883acd805302ecb65d35dec4)
+- Add individual region highlight [`6e4cb62`](https://github.com/eea/volto-arcgis-block/commit/6e4cb62d26a493da83e53a10bba8f64ea9df80e3)
+- Update LegendWidget.jsx [`3273d53`](https://github.com/eea/volto-arcgis-block/commit/3273d53183ef17328ddfce7913910671eb5a43a9)
+- Change legend text [`09eb6e0`](https://github.com/eea/volto-arcgis-block/commit/09eb6e08e4199cab914d6300c62af633876579cb)
+
 #### [0.1.22](https://github.com/eea/volto-arcgis-block/compare/0.1.21...0.1.22)
 
+> 10 December 2021
+
+- Develop [`#70`](https://github.com/eea/volto-arcgis-block/pull/70)
 - ESLint fix [`#69`](https://github.com/eea/volto-arcgis-block/pull/69)
 - Bugs n improvements [`#68`](https://github.com/eea/volto-arcgis-block/pull/68)
 - Change services URLs to discomap [`ed4dc62`](https://github.com/eea/volto-arcgis-block/commit/ed4dc62df3af66a71acbe981b3e74a4a621ef2c4)

package/Jenkinsfile

@@ -4,7 +4,7 @@ pipeline {
   environment {
         GIT_NAME = "volto-arcgis-block"
         NAMESPACE = "@eeacms"
-        SONARQUBE_TAGS = "volto.eea.europa.eu,clms.land.copernicus.eu"
+        SONARQUBE_TAGS = "volto.eea.europa.eu,clms.land.copernicus.eu,water.europa.eu-freshwater"
         DEPENDENCIES = ""
     }
 
@@ -31,8 +31,8 @@ pipeline {
       when {
         allOf {
           environment name: 'CHANGE_ID', value: ''
-          not { branch 'master' }
           not { changelog '.*^Automated release [0-9\\.]+$' }
+          not { branch 'master' }
         }
       }
       steps {
@@ -63,7 +63,10 @@ pipeline {
       when {
         allOf {
           environment name: 'CHANGE_ID', value: ''
-          not { changelog '.*^Automated release [0-9\\.]+$' }
+          anyOf {
+           not { changelog '.*^Automated release [0-9\\.]+$' }
+           branch 'master'
+          }
         }
       }
       steps {
@@ -108,7 +111,10 @@ pipeline {
       when {
         allOf {
           environment name: 'CHANGE_ID', value: ''
-          not { changelog '.*^Automated release [0-9\\.]+$' }
+          anyOf {
+           not { changelog '.*^Automated release [0-9\\.]+$' }
+           branch 'master'
+          }
         }
       }
       steps {
@@ -118,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 {
@@ -136,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 {
@@ -159,12 +166,16 @@ pipeline {
 
     stage('Report to SonarQube') {
       when {
+        allOf {
           environment name: 'CHANGE_ID', value: ''
           anyOf {
             branch 'master'
-            branch 'develop'
+            allOf {
+              branch 'develop'
+              not { changelog '.*^Automated release [0-9\\.]+$' }
+            }
           }
-          not { changelog '.*^Automated release [0-9\\.]+$' }
+        }
       }
       steps {
         node(label: 'swarm') {

package/README.md

@@ -1,7 +1,18 @@
 # [WIP] Volto Arcgis Block
+
 [![Releases](https://img.shields.io/github/v/release/eea/volto-arcgis-block)](https://github.com/eea/volto-arcgis-block/releases)
+
 [![Pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto-addons%2Fvolto-arcgis-block%2Fmaster&subject=master)](https://ci.eionet.europa.eu/view/Github/job/volto-addons/job/volto-arcgis-block/job/master/display/redirect)
+[![Lines of Code](https://sonarqube.eea.europa.eu/api/project_badges/measure?project=volto-arcgis-block-master&metric=ncloc)](https://sonarqube.eea.europa.eu/dashboard?id=volto-arcgis-block-master)
+[![Coverage](https://sonarqube.eea.europa.eu/api/project_badges/measure?project=volto-arcgis-block-master&metric=coverage)](https://sonarqube.eea.europa.eu/dashboard?id=volto-arcgis-block-master)
+[![Bugs](https://sonarqube.eea.europa.eu/api/project_badges/measure?project=volto-arcgis-block-master&metric=bugs)](https://sonarqube.eea.europa.eu/dashboard?id=volto-arcgis-block-master)
+[![Duplicated Lines (%)](https://sonarqube.eea.europa.eu/api/project_badges/measure?project=volto-arcgis-block-master&metric=duplicated_lines_density)](https://sonarqube.eea.europa.eu/dashboard?id=volto-arcgis-block-master)
+
 [![Pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto-addons%2Fvolto-arcgis-block%2Fdevelop&subject=develop)](https://ci.eionet.europa.eu/view/Github/job/volto-addons/job/volto-arcgis-block/job/develop/display/redirect)
+[![Lines of Code](https://sonarqube.eea.europa.eu/api/project_badges/measure?project=volto-arcgis-block-develop&metric=ncloc)](https://sonarqube.eea.europa.eu/dashboard?id=volto-arcgis-block-develop)
+[![Coverage](https://sonarqube.eea.europa.eu/api/project_badges/measure?project=volto-arcgis-block-develop&metric=coverage)](https://sonarqube.eea.europa.eu/dashboard?id=volto-arcgis-block-develop)
+[![Bugs](https://sonarqube.eea.europa.eu/api/project_badges/measure?project=volto-arcgis-block-develop&metric=bugs)](https://sonarqube.eea.europa.eu/dashboard?id=volto-arcgis-block-develop)
+[![Duplicated Lines (%)](https://sonarqube.eea.europa.eu/api/project_badges/measure?project=volto-arcgis-block-develop&metric=duplicated_lines_density)](https://sonarqube.eea.europa.eu/dashboard?id=volto-arcgis-block-develop)
 
 ## ArcGIS Map integration for Volto blocks
 ****This product is in development, at this time it is not recommended to use it.***
@@ -64,4 +75,84 @@ const customBlocks = (config) => ({
     "@eeacms/volto-clms-theme"
   ],
 ````
-![Style example volto-arcgis-block](docs/styles_example.gif)
+![Style example volto-arcgis-block](docs/styles_example.gif)
+
+## Release
+
+### Automatic release using Jenkins
+
+*  The automatic release is started by creating a [Pull Request](../../compare/master...develop) from `develop` to `master`. The pull request status checks correlated to the branch and PR Jenkins jobs need to be processed successfully. 1 review from a github user with rights is mandatory.
+* It runs on every commit on `master` branch, which is protected from direct commits, only allowing pull request merge commits.
+* The automatic release is done by [Jenkins](https://ci.eionet.europa.eu). The status of the release job can be seen both in the Readme.md badges and the green check/red cross/yellow circle near the last commit information. If you click on the icon, you will have the list of checks that were run. The `continuous-integration/jenkins/branch` link goes to the Jenkins job execution webpage.
+* Automated release scripts are located in the `eeacms/gitflow` docker image, specifically [js-release.sh](https://github.com/eea/eea.docker.gitflow/blob/master/src/js-release.sh) script. It  uses the `release-it` tool.
+* As long as a PR request is open from develop to master, the PR Jenkins job will automatically re-create the CHANGELOG.md and package.json files to be production-ready.
+* The version format must be MAJOR.MINOR.PATCH. By default, next release is set to next minor version (with patch 0).
+* You can manually change the version in `package.json`.  The new version must not be already present in the tags/releases of the repository, otherwise it will be automatically increased by the script. Any changes to the version will trigger a `CHANGELOG.md` re-generation.
+* Automated commits and commits with [JENKINS] or [YARN] in the commit log are excluded from `CHANGELOG.md` file.
+
+### Manual release from the develop branch ( beta release )
+
+#### Installation and configuration of release-it
+
+You need to first install the [release-it](https://github.com/release-it/release-it)  client.
+
+   ```
+   npm install -g release-it
+   ```
+
+Release-it uses the configuration written in the [`.release-it.json`](./.release-it.json) file located in the root of the repository.
+
+Release-it is a tool that automates 4 important steps in the release process:
+
+1. Version increase in `package.json` ( increased from the current version in `package.json`)
+2. `CHANGELOG.md` automatic generation from commit messages ( grouped by releases )
+3. GitHub release on the commit with the changelog and package.json modification on the develop branch
+4. NPM release ( by default it's disabled, but can be enabled in the configuration file )
+
+To configure the authentification, you need to export GITHUB_TOKEN for [GitHub](https://github.com/settings/tokens)
+
+   ```
+   export GITHUB_TOKEN=XXX-XXXXXXXXXXXXXXXXXXXXXX
+   ```
+
+ To configure npm, you can use the `npm login` command or use a configuration file with a TOKEN :
+
+   ```
+   echo "//registry.npmjs.org/:_authToken=YYYYYYYYYYYYYYYYYYYYYYYYYYYYYY" > .npmrc
+   ```
+
+#### Using release-it tool
+
+There are 3 yarn scripts that can be run to do the release
+
+##### yarn release-beta
+
+Automatically calculates and presents 3 beta versions - patch, minor and major for you to choose ( or Other for manual input).
+
+```
+? Select increment (next version):
+❯ prepatch (0.1.1-beta.0)
+  preminor (0.2.0-beta.0)
+  premajor (1.0.0-beta.0)
+  Other, please specify...
+```
+
+##### yarn release-major-beta
+
+Same as `yarn release-beta`, but with premajor version pre-selected.
+
+##### yarn release
+
+Generic command, does not automatically add the `beta` to version, but you can still manually write it if you choose Other.
+
+#### Important notes
+
+> Do not use release-it tool on master branch, the commit on CHANGELOG.md file and the version increase in the package.json file can't be done without a PULL REQUEST.
+
+> Do not keep Pull Requests from develop to master branches open when you are doing beta releases from the develop branch. As long as a PR to master is open, an automatic script will run on every commit and will update both the version and the changelog to a production-ready state - ( MAJOR.MINOR.PATCH mandatory format for version).
+
+
+## How to contribute
+
+See [DEVELOP.md](https://github.com/eea/volto-arcgis-block/blob/master/DEVELOP.md).
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-arcgis-block",
-  "version": "0.1.22",
+  "version": "0.1.26",
   "description": "volto-arcgis-block: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: CodeSyntax",
@@ -21,6 +21,8 @@
   "scripts": {
     "i18n": "NODE_ENV=production node src/i18n.js",
     "release": "release-it",
+    "release-major-beta": "release-it major --preRelease=beta",
+    "release-beta": "release-it --preRelease=beta",
     "bootstrap": "npm install -g ejs; npm link ejs; node bootstrap",
     "stylelint": "../../../node_modules/stylelint/bin/stylelint.js --allow-empty-input 'src/**/*.{css,less}'",
     "stylelint:overrides": "../../../node_modules/.bin/stylelint --syntax less --allow-empty-input 'theme/**/*.overrides' 'src/**/*.overrides'",
@@ -38,7 +40,9 @@
     "@fortawesome/fontawesome-svg-core": "1.2.35",
     "@fortawesome/free-solid-svg-icons": "5.15.3",
     "@fortawesome/react-fontawesome": "0.1.14",
-    "@eeacms/volto-clms-utils": "0.1.1"
+    "@eeacms/volto-clms-utils": "0.1.1",
+    "highcharts": "^9.3.2",
+    "highcharts-react-official": "^3.1.0"
   },
   "devDependencies": {
     "@cypress/code-coverage": "^3.9.5",

package/src/components/MapViewer/AreaWidget.jsx

@@ -1,7 +1,4 @@
 import React, { createRef } from 'react';
-//import "@arcgis/core/assets/esri/css/main.css";
-//import "./css/ArcgisMap.css";
-//import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { loadModules } from 'esri-loader';
 
 var Graphic,
@@ -111,6 +108,9 @@ class AreaWidget extends React.Component {
   nuts1handler(e) {
     this.loadNutsService(e.target.value, 1);
   }
+  nuts2handler(e) {
+    this.loadNutsService(e.target.value, 2);
+  }
   nuts3handler(e) {
     this.loadNutsService(e.target.value, 3);
   }
@@ -127,6 +127,18 @@ class AreaWidget extends React.Component {
       definitionExpression: 'LEVL_CODE=' + level,
     });
     this.nutsGroupLayer.add(layer);
+    let index = this.getHighestIndex();
+    this.props.map.reorder(this.nutsGroupLayer, index + 1);
+  }
+  getHighestIndex() {
+    let index = 0;
+    document.querySelectorAll('.active-layer').forEach((layer) => {
+      let value = parseInt(layer.getAttribute('layer-order'));
+      if (value > index) {
+        index = value;
+      }
+    });
+    return index;
   }
   rectanglehandler() {
     this.clearWidget();
@@ -187,33 +199,43 @@ class AreaWidget extends React.Component {
     });
     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);
+      if (
+        (this.props.mapViewer.activeWidget === this || this.props.download) &&
+        (this.props.mapViewer.activeWidget
+          ? !this.props.mapViewer.activeWidget.container.current.classList.contains(
+              'info-container',
+            )
+          : true)
+      ) {
+        this.props.view.hitTest(event).then((response) => {
+          if (response.results.length > 0) {
+            let graphic = response.results.filter((result) => {
+              let layer;
+              if ('nuts0 nuts1 nuts2 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');
@@ -284,6 +306,22 @@ class AreaWidget extends React.Component {
                     <span>NUTS 1</span>
                   </label>
                 </div>
+                <div className="ccl-form-group">
+                  <input
+                    type="radio"
+                    id="download_area_select_nuts2"
+                    name="downloadAreaSelect"
+                    value="nuts2"
+                    className="ccl-checkbox ccl-required ccl-form-check-input"
+                    onClick={this.nuts2handler.bind(this)}
+                  ></input>
+                  <label
+                    className="ccl-form-radio-label"
+                    htmlFor="download_area_select_nuts2"
+                  >
+                    <span>NUTS 2</span>
+                  </label>
+                </div>
                 <div className="ccl-form-group">
                   <input
                     type="radio"

package/src/components/MapViewer/BasemapWidget.jsx

@@ -15,7 +15,7 @@ class BasemapWidget extends React.Component {
     //not be showing the basemap panel
     this.state = { showMapMenu: false };
     this.menuClass =
-      'esri-icon-basemap esri-widget--button esri-widget esri-interactive esri-icon-basemap';
+      'esri-icon-basemap esri-widget--button esri-widget esri-interactive';
     this.loadFirst = true;
   }