@eeacms/volto-arcgis-block 0.1.216 → 0.1.218

package/CHANGELOG.md

@@ -4,7 +4,14 @@ 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.216](https://github.com/eea/volto-arcgis-block/compare/0.1.215...0.1.216) - 19 October 2023
+### [0.1.218](https://github.com/eea/volto-arcgis-block/compare/0.1.217...0.1.218) - 23 October 2023
+
+### [0.1.217](https://github.com/eea/volto-arcgis-block/compare/0.1.216...0.1.217) - 23 October 2023
+
+#### :hammer_and_wrench: Others
+
+- use land.copernicus.eu tag [Mikel Larreategi - [`fbf56a8`](https://github.com/eea/volto-arcgis-block/commit/fbf56a8a1dcdd64d28081a1bcc985ab4249d12ae)]
+### [0.1.216](https://github.com/eea/volto-arcgis-block/compare/0.1.215...0.1.216) - 20 October 2023
 
 #### :house: Internal changes
 
@@ -1006,10 +1013,13 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 #### :hammer_and_wrench: Others
 
 - Merge pull request #148 from eea/develop [KCarpinteroBM - [`24266fb`](https://github.com/eea/volto-arcgis-block/commit/24266fb3a0c1662d22ae0529dc1d5a25c711cf97)]
+- Revert "[JENKINS] Use eeacms/plone-backend and Volto alpha version- Refs #151967" [Mikel Larreategi - [`f751f69`](https://github.com/eea/volto-arcgis-block/commit/f751f69f652f0340ae55af6a4dab89d6bdc80906)]
 - Revert "Revert "Mapviewer menu and map viewer options persistence"" [Mikel Larreategi - [`ad6e440`](https://github.com/eea/volto-arcgis-block/commit/ad6e440cdc160cffb1e86e1b26e501dbe648476c)]
 - Revert "code coverage removal" [Mikel Larreategi - [`376f2d1`](https://github.com/eea/volto-arcgis-block/commit/376f2d1cd6e4e5110b3b63d5114af1bcfebe094b)]
 - Revert "Update cypress.json" [Mikel Larreategi - [`43d01a0`](https://github.com/eea/volto-arcgis-block/commit/43d01a0a95a58ef5215c6cbf18223ca30a11b9cc)]
 - Revert "Update cypress.json" [Mikel Larreategi - [`054c4ae`](https://github.com/eea/volto-arcgis-block/commit/054c4ae1767e1f26e6ec7e96a0e26a9711f29f04)]
+- Revert "revert [JENKINS] Use eeacms/plone-backend and Volto alpha version- Refs #151967" [Mikel Larreategi - [`64ab56e`](https://github.com/eea/volto-arcgis-block/commit/64ab56e0f1f8dddc26f26039509a028e34653e64)]
+- revert [JENKINS] Use eeacms/plone-backend and Volto alpha version- Refs #151967 [Mikel Larreategi - [`85ee194`](https://github.com/eea/volto-arcgis-block/commit/85ee1941e029df2b7dc910bf75231c75ffeca8c2)]
 - Update cypress.json [KCarpinteroBM - [`be285ff`](https://github.com/eea/volto-arcgis-block/commit/be285fff0c53e06a0180d5318cce81195eabcf80)]
 - Update cypress.json [KCarpinteroBM - [`a7f2118`](https://github.com/eea/volto-arcgis-block/commit/a7f2118acb7b048b4cef85aa9663c2244a1c9ca0)]
 - linting fix [KCarpinteroBM - [`27e969a`](https://github.com/eea/volto-arcgis-block/commit/27e969a7a411fd4646e0e742ce846efc0d79703e)]
@@ -1069,6 +1079,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - UX improvements [rodriama - [`151dc4b`](https://github.com/eea/volto-arcgis-block/commit/151dc4b02d0a73fdd66de9d594620ac0fa5f1dbf)]
 - deleted failing tests [KCarpinteroBM - [`ddaa9e6`](https://github.com/eea/volto-arcgis-block/commit/ddaa9e6f06db6960a4c214d3be2420c48b26715d)]
 - cleaning unnecessary files [KCarpinteroBM - [`2c02199`](https://github.com/eea/volto-arcgis-block/commit/2c021990912beb02b603a1de89aecd62e0063769)]
+- Reverting to Automated release 0.1.39 [KCarpinteroBM - [`fb9f317`](https://github.com/eea/volto-arcgis-block/commit/fb9f3176ccdea18fceb329eaac13ced0566ee648)]
 - commands added [KCarpinteroBM - [`049e60b`](https://github.com/eea/volto-arcgis-block/commit/049e60b7d124d1c05abd0b2775b510795f4ed59f)]
 - Mapviewer testing implementation [KCarpinteroBM - [`0103002`](https://github.com/eea/volto-arcgis-block/commit/0103002869eea108e16e3b5ff2e77a725dcc7c4b)]
 ### [0.1.39](https://github.com/eea/volto-arcgis-block/compare/0.1.38...0.1.39) - 24 March 2022
@@ -1088,6 +1099,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - ESLint fix [rodriama - [`75dae9b`](https://github.com/eea/volto-arcgis-block/commit/75dae9b5bba18ab6d9624f6c99714b4bd2179003)]
 - Remove section title [rodriama - [`ece860e`](https://github.com/eea/volto-arcgis-block/commit/ece860eae3519c7e611abac16e8d53c9a9408b34)]
 - Es-Lint [manuelmartinezbilbomatica - [`39d8d11`](https://github.com/eea/volto-arcgis-block/commit/39d8d11b9096fd603df8510c119d2e12817415d6)]
+- Add Sonarqube tag using clms-frontend addons list [EEA Jenkins - [`bf9f683`](https://github.com/eea/volto-arcgis-block/commit/bf9f683dd35a9edb4cfd9111affcb8f8edbeae89)]
 - FEAT: Parser Time implemented [manuelmartinezbilbomatica - [`689c99e`](https://github.com/eea/volto-arcgis-block/commit/689c99e55221fee6c7c7fafc4ab95ae7a646d3dd)]
 ### [0.1.38](https://github.com/eea/volto-arcgis-block/compare/0.1.37...0.1.38) - 18 March 2022
 
@@ -1182,6 +1194,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - ESLint fix [rodriama - [`5fd3772`](https://github.com/eea/volto-arcgis-block/commit/5fd3772f197a3a380067962a5638dbf901a4624e)]
 - Pixel info [rodriama - [`1ccef39`](https://github.com/eea/volto-arcgis-block/commit/1ccef39a9adcc3ee94655c77a5a166b613600a08)]
 - NUTS bug fix [rodriama - [`37fe7f3`](https://github.com/eea/volto-arcgis-block/commit/37fe7f3fad2c005e3b7c234b3b0564d5df92fa8c)]
+- Add Sonarqube tag using freshwater-frontend addons list [EEA Jenkins - [`ea5af8b`](https://github.com/eea/volto-arcgis-block/commit/ea5af8b02a5f2ee25b9b0be67cf3792bbbe84ed7)]
 ### [0.1.23](https://github.com/eea/volto-arcgis-block/compare/0.1.22...0.1.23) - 17 December 2021
 
 #### :hammer_and_wrench: Others
@@ -1426,6 +1439,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - Trying to delay ArcGIS modules load [gonzalezsd - [`ff16985`](https://github.com/eea/volto-arcgis-block/commit/ff169858e42d30bfcacc423ffc27762bb9ef05a4)]
 - Run bootstrap to fix files [valentinab25 - [`236893f`](https://github.com/eea/volto-arcgis-block/commit/236893f03314eb638b7667f81b1f91491a98ee17)]
 - fix git_name [valentinab25 - [`c7806c3`](https://github.com/eea/volto-arcgis-block/commit/c7806c312964425dc23e5d4c6973de8b81ddaeac)]
+- Add Sonarqube tag using frontend addons list [EEA Jenkins - [`e3afb51`](https://github.com/eea/volto-arcgis-block/commit/e3afb515dda459ee03e2b5d4b56465d2d4ad1503)]
 - Trying to change imports [gonzalezsd - [`d83d7e2`](https://github.com/eea/volto-arcgis-block/commit/d83d7e2f68da4b2a284735847f93c0763a7e13b6)]
 - default design [bipoza - [`88fbe0b`](https://github.com/eea/volto-arcgis-block/commit/88fbe0b2bc73e732e2993324a567f53902e85506)]
 - cleanup of unused code [bipoza - [`b167677`](https://github.com/eea/volto-arcgis-block/commit/b1676771f637f056cad50cb0bc186f2ea79e8517)]

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,water.europa.eu-freshwater,clmsdemo.devel6cph.eea.europa.eu"
+        SONARQUBE_TAGS = "volto.eea.europa.eu,clms.land.copernicus.eu,water.europa.eu-freshwater,clmsdemo.devel6cph.eea.europa.eu,land.copernicus.eu"
         DEPENDENCIES = ""
         VOLTO = "15.16.0"
     }

package/package.json

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

package/src/components/MapViewer/AreaWidget.jsx

@@ -32,6 +32,8 @@ class AreaWidget extends React.Component {
       'esri-icon-cursor-marquee esri-widget--button esri-widget esri-interactive';
     // Enable defaultPopup option to charge popup and highlifght feature
     this.props.mapViewer.view.popup.defaultPopupTemplateEnabled = true;
+    this.nutsUrl = '';
+    this.initFMI = this.initFMI.bind(this);
   }
 
   loader() {
@@ -145,8 +147,7 @@ class AreaWidget extends React.Component {
       var layer = new FeatureLayer({
         id: id,
         //url: this.props.urls.nutsHandler,
-        url:
-          'https://land.discomap.eea.europa.eu/arcgis/rest/services/CLMS_Portal/NUTS_2021_Improved/MapServer/',
+        url: this.nutsUrl,
         layerId: level,
         outFields: ['*'],
         popupEnabled: false,
@@ -339,6 +340,7 @@ class AreaWidget extends React.Component {
    */
   async componentDidMount() {
     await this.loader();
+    await this.initFMI();
     this.nutsGroupLayer = new GroupLayer({
       title: 'nuts',
       //opacity: 0.5,
@@ -414,6 +416,62 @@ class AreaWidget extends React.Component {
     this.props.download && this.props.view.ui.add(popup, 'top-right');
   }
 
+  async initFMI() {
+    let currentUrl = window.location.href.split('.eu');
+    let fetchUrl = '';
+    if (currentUrl[0] === 'https://land.copernicus') {
+      fetchUrl = 'https://land.copernicus.eu';
+      if (this.getAuthToken()) {
+        fetchUrl = fetchUrl + '/++api++/@registry';
+      } else {
+        fetchUrl = fetchUrl + '/++api++/@anon-registry';
+      }
+    } else if (currentUrl[0] === 'https://clmsdemo.devel6cph.eea') {
+      fetchUrl = 'https://clmsdemo.devel6cph.eea.europa.eu';
+      if (this.getAuthToken()) {
+        fetchUrl = fetchUrl + '/++api++/@registry';
+      } else {
+        fetchUrl = fetchUrl + '/++api++/@anon-registry';
+      }
+    } else {
+      fetchUrl = 'https://land.copernicus.eu/++api++/@anon-registry';
+    }
+    try {
+      let nutsResponse = await fetch(fetchUrl + this.props.urls.nutsHandler);
+      if (nutsResponse.status === 200) {
+        this.nutsUrl = await nutsResponse.json();
+      } else {
+        throw new Error(nutsResponse.status);
+      }
+    } catch (error) {
+      //console.error('There was a problem with the fetch operation:', error);
+    }
+  }
+  getAuthToken() {
+    let tokenResult = null;
+    if (this.getCookie('auth_token')) {
+      tokenResult = true;
+    } else {
+      tokenResult = false;
+    }
+    return tokenResult;
+  }
+  getCookie(name) {
+    var dc = document.cookie;
+    var prefix = name + '=';
+    var begin = dc.indexOf('; ' + prefix);
+    if (begin === -1) {
+      begin = dc.indexOf(prefix);
+      if (begin !== 0) return null;
+    } else {
+      begin += 2;
+      var end = document.cookie.indexOf(';', begin);
+      if (end === -1) {
+        end = dc.length;
+      }
+    }
+    return decodeURI(dc.substring(begin + prefix.length, end));
+  }
   /**
    * This method renders the component
    * @returns jsx

package/src/components/MapViewer/config.js

@@ -214,8 +214,7 @@ const config = {
     },
   ],
   Urls: {
-    nutsHandler:
-      'https://land.discomap.eea.europa.eu/arcgis/rest/services/CLMS_Portal/NUTS_2021_Improved/MapServer/',
+    nutsHandler: '/clms.downloadtool.fme_config_controlpanel.nuts_service',
     outsideEu:
       'https://land.discomap.eea.europa.eu/arcgis/rest/services/CLMS_Portal/World_countries_except_EU37/MapServer',
     all_present_lc_a_pol:

package/src/components/UseCasesMapViewer/UseCasesMapViewer.jsx

@@ -32,25 +32,26 @@ class UseCasesMapViewer extends React.Component {
     this.id = props.id;
     this.popupOnce = false;
     this.popupRegion = '';
+    this.initFMI = this.initFMI.bind(this);
     this.mapClass = classNames('map-container', {
       [`${props.customClass}`]: props.customClass || null,
     });
     this.spatialConfig = {
       id: 'spatialLayer',
-      url: props.cfg.Services.SpatialCoverageLayer,
+      url: '',
       render: props.cfg.SpatialRenderer,
       showLegend: true,
     };
     this.regionConfig = {
       id: 'regionLayer',
-      url: props.cfg.Services.RegionLayer,
+      url: '',
       render: props.cfg.RegionMarkerRenderer,
       label: props.cfg.RegionLabel,
       showLegend: false,
     };
     this.HighlightConfig = {
       id: 'HightlightLayer',
-      url: props.cfg.Services.Highlight_service,
+      url: '',
       render: props.cfg.HightlightRenderer,
       showLegend: false,
     };
@@ -97,7 +98,7 @@ class UseCasesMapViewer extends React.Component {
   async componentDidMount() {
     loadCss();
     await this.loader();
-
+    await this.initFMI();
     this.basemap = new Basemap({
       title: 'Countries World',
       thumbnailUrl:
@@ -196,7 +197,84 @@ class UseCasesMapViewer extends React.Component {
     //react component to render itself again
     this.setState(() => ({ useCaseLevel: 1 }));
   }
-
+  async initFMI() {
+    let currentUrl = window.location.href.split('.eu');
+    let fetchUrl = '';
+    if (currentUrl[0] === 'https://land.copernicus') {
+      fetchUrl = 'https://land.copernicus.eu';
+      if (this.getAuthToken()) {
+        fetchUrl = fetchUrl + '/++api++/@registry';
+      } else {
+        fetchUrl = fetchUrl + '/++api++/@anon-registry';
+      }
+    } else if (currentUrl[0] === 'https://clmsdemo.devel6cph.eea') {
+      fetchUrl = 'https://clmsdemo.devel6cph.eea.europa.eu';
+      if (this.getAuthToken()) {
+        fetchUrl = fetchUrl + '/++api++/@registry';
+      } else {
+        fetchUrl = fetchUrl + '/++api++/@anon-registry';
+      }
+    } else {
+      fetchUrl = 'https://land.copernicus.eu/++api++/@anon-registry';
+    }
+    try {
+      let highlightResponse = await fetch(
+        fetchUrl + this.serviceCfg.Highlight_service,
+      );
+      if (highlightResponse.status === 200) {
+        this.HighlightConfig.url = await highlightResponse.json();
+      } else {
+        throw new Error(highlightResponse.status);
+      }
+      let regionResponse = await fetch(fetchUrl + this.serviceCfg.RegionLayer);
+      if (regionResponse.status === 200) {
+        this.regionConfig.url = await regionResponse.json();
+      } else {
+        throw new Error(regionResponse.status);
+      }
+      let spatialResponse = await fetch(
+        fetchUrl + this.serviceCfg.SpatialCoverageLayer,
+      );
+      if (spatialResponse.status === 200) {
+        this.spatialConfig.url = await spatialResponse.json();
+      } else {
+        throw new Error(spatialResponse.status);
+      }
+      let thumbnailResponse = await fetch(fetchUrl + this.thumbnail);
+      if (thumbnailResponse.status === 200) {
+        this.thumbnail = await thumbnailResponse.json();
+      } else {
+        throw new Error(thumbnailResponse.status);
+      }
+    } catch (error) {
+      //console.error('There was a problem with the fetch operation:', error);
+    }
+  }
+  getAuthToken() {
+    let tokenResult = null;
+    if (this.getCookie('auth_token')) {
+      tokenResult = true;
+    } else {
+      tokenResult = false;
+    }
+    return tokenResult;
+  }
+  getCookie(name) {
+    var dc = document.cookie;
+    var prefix = name + '=';
+    var begin = dc.indexOf('; ' + prefix);
+    if (begin === -1) {
+      begin = dc.indexOf(prefix);
+      if (begin !== 0) return null;
+    } else {
+      begin += 2;
+      var end = document.cookie.indexOf(';', begin);
+      if (end === -1) {
+        end = dc.length;
+      }
+    }
+    return decodeURI(dc.substring(begin + prefix.length, end));
+  }
   /**
    * This method will disable all the functionalities on the map
    * @param {MapView} view

package/src/components/UseCasesMapViewer/config.js

@@ -34,15 +34,11 @@ const config = {
     ],
   },
   Services: {
-    Highlight_service:
-      'https://land.discomap.eea.europa.eu/arcgis/rest/services/CLMS_Portal/UseCasesWorldCountries/MapServer/1',
-    RegionLayer:
-      'https://land.discomap.eea.europa.eu/arcgis/rest/services/CLMS_Portal/UseCasesRegion_count/MapServer/0',
-    SpatialCoverageLayer:
-      'https://land.discomap.eea.europa.eu/arcgis/rest/services/CLMS_Portal/UseCasesSpatialCoverage/MapServer/0',
+    Highlight_service: '/clms.types.usecase_fme.highlight_service',
+    RegionLayer: '/clms.types.usecase_fme.region_layer',
+    SpatialCoverageLayer: '/clms.types.usecase_fme.spatial_coverage_layer',
   },
-  Thumbnail:
-    'https://clmsdemo.devel6cph.eea.europa.eu/static/media/ccl-thumbnail-placeholder.2ccfd334.jpg',
+  Thumbnail: '/clms.types.usecase_fme.thumbnail',
 
   Codes: {
     EU: [