@eeacms/volto-arcgis-block 0.1.235 → 0.1.237

package/CHANGELOG.md

@@ -4,6 +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.237](https://github.com/eea/volto-arcgis-block/compare/0.1.236...0.1.237) - 22 November 2023
+
+#### :hammer_and_wrench: Others
+
+- CLMS-2273 (chore): Added descriptive label under the title for filterable hotspot datasets in the menu widget [ujbolivar - [`349ac11`](https://github.com/eea/volto-arcgis-block/commit/349ac114d654419c9bbbb9fb289292e2acedc9c0)]
+- CLMS-2317 (chore): Redirected fetch requests for hotspot filter data to our backend [ujbolivar - [`e6274f4`](https://github.com/eea/volto-arcgis-block/commit/e6274f475892b0743c4c7d880daf770a2d1c9cf4)]
+### [0.1.236](https://github.com/eea/volto-arcgis-block/compare/0.1.235...0.1.236) - 20 November 2023
+
+#### :hammer_and_wrench: Others
+
+- test: [JENKINS] Use java17 for sonarqube scanner [valentinab25 - [`f45d4bf`](https://github.com/eea/volto-arcgis-block/commit/f45d4bf42061d13d9c18554bef692cb40b3a6fb7)]
 ### [0.1.235](https://github.com/eea/volto-arcgis-block/compare/0.1.234...0.1.235) - 16 November 2023
 
 ### [0.1.234](https://github.com/eea/volto-arcgis-block/compare/0.1.233...0.1.234) - 15 November 2023

package/Jenkinsfile

@@ -1,4 +1,7 @@
 pipeline {
+  tools {
+    jdk 'Java17'
+  }
   agent any
 
   environment {

package/package.json

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

package/src/components/MapViewer/MenuWidget.jsx

@@ -1250,11 +1250,13 @@ class MenuWidget extends React.Component {
                                 Zoom in to view on map
                               </div>
                             </div>
-                          ) : dataset.productId ===
-                            'd764e020485a402598551fa461bf1db2' ? (
-                            <div className="hotspot-filter-message-container">
+                          ) : dataset.DatasetId ===
+                              '9827d711d3e148aabccc76dd501a4b86' ||
+                            dataset.DatasetId ===
+                              'e27dbc8330084b58bb5e282231fca74d' ? (
+                            <div className="zoom-in-message-container">
                               <span>{dataset.DatasetTitle}</span>
-                              <div className="hotspot-filter-message hotspot-filter-message-dataset">
+                              <div className="zoom-in-message">
                                 Use the filter to visualize a KLC area
                               </div>
                             </div>

package/src/components/MapViewer/SwipeWidget.jsx

@@ -75,10 +75,10 @@ class SwipeWidget extends React.Component {
       this.map.layers.on('change', () => {
         if (this.hasSwipe) {
           this.map.layers.removeAll();
-          if (this.swipe.leadingLayers.items[0]) {
+          if (this.swipe.leadingLayers && this.swipe.leadingLayers.items[0]) {
             this.map.layers.add(this.swipe.leadingLayers.items[0]);
           }
-          if (this.swipe.trailingLayers.items[0]) {
+          if (this.swipe.trailingLayers && this.swipe.trailingLayers.items[0]) {
             this.map.layers.add(this.swipe.trailingLayers.items[0]);
           }
         }
@@ -162,49 +162,53 @@ class SwipeWidget extends React.Component {
               layerId = this.layers['pa_filter'].id;
             }
           }
-          if (
-            this.swipe.leadingLayers &&
-            this.swipe.leadingLayers.items[0] &&
-            this.swipe.leadingLayers.items[0].id === layerId
-          ) {
-            selectLeadingLayer.options.add(
-              new Option(
-                this.getLayerTitle(this.layers[layer]),
-                layerId,
-                true,
-                true,
-              ),
-            );
-          } else {
-            selectLeadingLayer.options.add(
-              new Option(
-                this.getLayerTitle(this.layers[layer]),
-                layerId,
-                false,
-              ),
-            );
+          if (selectLeadingLayer) {
+            if (
+              this.swipe.leadingLayers &&
+              this.swipe.leadingLayers.items[0] &&
+              this.swipe.leadingLayers.items[0].id === layerId
+            ) {
+              selectLeadingLayer.options.add(
+                new Option(
+                  this.getLayerTitle(this.layers[layer]),
+                  layerId,
+                  true,
+                  true,
+                ),
+              );
+            } else {
+              selectLeadingLayer.options.add(
+                new Option(
+                  this.getLayerTitle(this.layers[layer]),
+                  layerId,
+                  false,
+                ),
+              );
+            }
           }
-          if (
-            this.swipe.trailingLayers &&
-            this.swipe.trailingLayers.items[0] &&
-            this.swipe.trailingLayers.items[0].id === layerId
-          ) {
-            selectTrailingLayer.options.add(
-              new Option(
-                this.getLayerTitle(this.layers[layer]),
-                layerId,
-                true,
-                true,
-              ),
-            );
-          } else {
-            selectTrailingLayer.options.add(
-              new Option(
-                this.getLayerTitle(this.layers[layer]),
-                layerId,
-                false,
-              ),
-            );
+          if (selectTrailingLayer) {
+            if (
+              this.swipe.trailingLayers &&
+              this.swipe.trailingLayers.items[0] &&
+              this.swipe.trailingLayers.items[0].id === layerId
+            ) {
+              selectTrailingLayer.options.add(
+                new Option(
+                  this.getLayerTitle(this.layers[layer]),
+                  layerId,
+                  true,
+                  true,
+                ),
+              );
+            } else {
+              selectTrailingLayer.options.add(
+                new Option(
+                  this.getLayerTitle(this.layers[layer]),
+                  layerId,
+                  false,
+                ),
+              );
+            }
           }
         }
       });

package/src/components/MapViewer/config.js

@@ -227,11 +227,13 @@ const config = {
       'https://geospatial.jrc.ec.europa.eu/geoserver/hotspots/wms?request=GetLegendGraphic&version=1.0.0&format=image/png&layer=all_lcc_b_pol',
     cop_klc:
       'https://geospatial.jrc.ec.europa.eu/geoserver/hotspots/wms?request=GetLegendGraphic&version=1.0.0&format=image/png&layer=cop_klc',
-    klc_bbox: 'https://land.copernicus.eu/global/hsm/php/klc_bbox.php',
+    klc_bbox:
+      'https://land.copernicus.eu/en/products/lclcc-hot-spots/json-files/klc_bbox.php/@@download/file',
     legendLinkUrl:
       'https://geospatial.jrc.ec.europa.eu/geoserver/hotspots/ows?service=WMS&request=GetLegendGraphic&format=image%2Fpng&width=20&height=20&layer=',
     serviceUrl: 'https://geospatial.jrc.ec.europa.eu/geoserver/hotspots/wms',
-    all_geo_klc: 'https://land.copernicus.eu/global/hsm/all_geo_klc_json',
+    all_geo_klc:
+      'https://land.copernicus.eu/en/products/lclcc-hot-spots/json-files/all_geo_klc.json/@@download/file',
     positronCompositeThumbnail:
       'https://gisco-services.ec.europa.eu/maps/wmts/OSMPositronComposite/EPSG3857/0/0/0.png',
     positronCompositeTemplate:

package/src/components/MapViewer/css/ArcgisMap.css

@@ -1252,7 +1252,7 @@ input[type='range']::-ms-track {
 
 .zoom-in-message,
 .hotspot-filter-message {
-  padding: 0.1rem 0.6rem 0.1rem 0.6rem;
+  padding: 0.3rem 0.6rem 0.1rem 0.6rem;
   margin-top: 0.2rem;
   background: #a0b128;
   border-radius: 10px;