From f45d4bf42061d13d9c18554bef692cb40b3a6fb7 Mon Sep 17 00:00:00 2001 From: valentinab25 Date: Fri, 17 Nov 2023 20:00:50 +0200 Subject: [PATCH 1/3] test: [JENKINS] Use java17 for sonarqube scanner --- Jenkinsfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 42ab600c..acf9be49 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,4 +1,7 @@ pipeline { + tools { + jdk 'Java17' + } agent any environment { From bbd5bd3f5b884d20729d1fbcc6a1b750ae3a21fe Mon Sep 17 00:00:00 2001 From: Urkorue Date: Mon, 20 Nov 2023 08:22:42 +0100 Subject: [PATCH 2/3] CLMS-2806 (Bug): Fixed bug --- src/components/MapViewer/SwipeWidget.jsx | 92 ++++++++++++------------ 1 file changed, 48 insertions(+), 44 deletions(-) diff --git a/src/components/MapViewer/SwipeWidget.jsx b/src/components/MapViewer/SwipeWidget.jsx index 1ddd98c1..a5e2204f 100644 --- a/src/components/MapViewer/SwipeWidget.jsx +++ b/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, + ), + ); + } } } }); From 0ceacc35ad81b68b654ee33502b2a11c818274ee Mon Sep 17 00:00:00 2001 From: EEA Jenkins <@users.noreply.github.com> Date: Mon, 20 Nov 2023 08:03:36 +0000 Subject: [PATCH 3/3] Automated release 0.1.236 --- CHANGELOG.md | 5 +++++ package.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 05f035cd..addd9ce8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ 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.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 diff --git a/package.json b/package.json index 67c1a40b..8547bfca 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@eeacms/volto-arcgis-block", - "version": "0.1.235", + "version": "0.1.236", "description": "volto-arcgis-block: Volto add-on", "main": "src/index.js", "author": "European Environment Agency: CodeSyntax",