@eeacms/volto-arcgis-block 0.1.21 → 0.1.22

package/CHANGELOG.md

@@ -4,8 +4,17 @@ 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.22](https://github.com/eea/volto-arcgis-block/compare/0.1.21...0.1.22)
+
+- 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)
+
 #### [0.1.21](https://github.com/eea/volto-arcgis-block/compare/0.1.20...0.1.21)
 
+> 3 December 2021
+
+- Develop [`#66`](https://github.com/eea/volto-arcgis-block/pull/66)
 - Bugs n improvements [`#65`](https://github.com/eea/volto-arcgis-block/pull/65)
 - ESLint fix [`758889e`](https://github.com/eea/volto-arcgis-block/commit/758889e6443cad21af9115d12f521170388fef77)
 - Download message bug fix [`4ff3ba4`](https://github.com/eea/volto-arcgis-block/commit/4ff3ba4c94eb4463474369fb21727a617a9ee666)

package/Jenkinsfile

@@ -10,6 +10,23 @@ pipeline {
 
   stages {
 
+    stage('Release') {
+      when {
+        allOf {
+          environment name: 'CHANGE_ID', value: ''
+          branch 'master'
+        }
+      }
+      steps {
+        node(label: 'docker') {
+          withCredentials([string(credentialsId: 'eea-jenkins-token', variable: 'GITHUB_TOKEN'),string(credentialsId: 'eea-jenkins-npm-token', variable: 'NPM_TOKEN')]) {
+            sh '''docker pull eeacms/gitflow'''
+            sh '''docker run -i --rm --name="$BUILD_TAG-gitflow-master" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_NAME="$GIT_NAME" -e GIT_TOKEN="$GITHUB_TOKEN" -e NPM_TOKEN="$NPM_TOKEN" -e LANGUAGE=javascript eeacms/gitflow'''
+          }
+        }
+      }
+    }
+
     stage('Code') {
       when {
         allOf {
@@ -46,7 +63,6 @@ pipeline {
       when {
         allOf {
           environment name: 'CHANGE_ID', value: ''
-          not { branch 'master' }
           not { changelog '.*^Automated release [0-9\\.]+$' }
         }
       }
@@ -92,7 +108,6 @@ pipeline {
       when {
         allOf {
           environment name: 'CHANGE_ID', value: ''
-          not { branch 'master' }
           not { changelog '.*^Automated release [0-9\\.]+$' }
         }
       }
@@ -191,23 +206,6 @@ pipeline {
       }
     }
 
-    stage('Release') {
-      when {
-        allOf {
-          environment name: 'CHANGE_ID', value: ''
-          branch 'master'
-        }
-      }
-      steps {
-        node(label: 'docker') {
-          withCredentials([string(credentialsId: 'eea-jenkins-token', variable: 'GITHUB_TOKEN'),string(credentialsId: 'eea-jenkins-npm-token', variable: 'NPM_TOKEN')]) {
-            sh '''docker pull eeacms/gitflow'''
-            sh '''docker run -i --rm --name="$BUILD_TAG-gitflow-master" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_NAME="$GIT_NAME" -e GIT_TOKEN="$GITHUB_TOKEN" -e NPM_TOKEN="$NPM_TOKEN" -e LANGUAGE=javascript eeacms/gitflow'''
-          }
-        }
-      }
-    }
-
   }
 
   post {

package/package.json

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

package/src/components/MapViewer/AreaWidget.jsx

@@ -118,7 +118,7 @@ class AreaWidget extends React.Component {
     this.clearWidget();
 
     var url =
-      'https://bm-eugis.tk/arcgis/rest/services/CLMS/NUTS_2021/MapServer/0';
+      'https://trial.discomap.eea.europa.eu/arcgis/rest/services/CLMS/NUTS_2021/MapServer/0';
     var layer = new FeatureLayer({
       url: url,
       id: id,

package/src/components/UseCasesMapViewer/InfoWidget.jsx

@@ -46,7 +46,14 @@ class InfoWidget extends React.Component {
             ></span>
           </div>
           <div className="use-case-detail-image">
-            <img src={UseCase.Link_to_image} alt="Use Case" />
+            <img
+              src={
+                UseCase.Link_to_image
+                  ? UseCase.Link_to_image
+                  : this.props.thumbnail
+              }
+              alt="Use Case"
+            />
           </div>
           <div className="use-case-detail-content">
             <div className="use-case-detail-product">

package/src/components/UseCasesMapViewer/UseCasesMapViewer.jsx

@@ -27,6 +27,7 @@ class UseCasesMapViewer extends React.Component {
     this.serviceCfg = props.cfg.Services;
     this.compCfg = this.props.cfg.Components;
     this.url = this.props.cfg.url;
+    this.thumbnail = this.props.cfg.Thumbnail;
     this.map = null;
     this.id = props.id;
     this.popupOnce = false;
@@ -422,6 +423,7 @@ class UseCasesMapViewer extends React.Component {
           layerControl={layerControl}
           navigationControl={navigationControl}
           layerSpatial={layerSpatial}
+          thumbnail={this.thumbnail}
           layerNUTS={layerNUTS}
         />
       );

package/src/components/UseCasesMapViewer/config.js

@@ -34,12 +34,15 @@ const config = {
   },
   Services: {
     NUTS_service:
-      'https://bm-eugis.tk/arcgis/rest/services/CLMS/NUTS_2021/MapServer/0',
+      'https://trial.discomap.eea.europa.eu/arcgis/rest/services/CLMS/NUTS_2021/MapServer/0',
     RegionLayer:
-      'https://bm-eugis.tk/arcgis/rest/services/CLMS/UseCasesRegion_count/MapServer/0',
+      'https://trial.discomap.eea.europa.eu/arcgis/rest/services/CLMS/UseCasesRegion_count/MapServer/0',
     SpatialCoverageLayer:
-      'https://bm-eugis.tk/arcgis/rest/services/CLMS/UseCasesSpatialCoverage/MapServer/0',
+      'https://trial.discomap.eea.europa.eu/arcgis/rest/services/CLMS/UseCasesSpatialCoverage/MapServer/0',
   },
+  Thumbnail:
+    'https://eu-copernicus.github.io/copernicus-component-library/assets/images/image_placeholder.jpg',
+
   Codes: {
     EU: [
       'BE',