@eeacms/volto-bise-policy 1.3.3 → 1.3.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +28 -1
- package/package.json +1 -1
- package/src/components/Widgets/EUNISObjectListWidget.jsx +8 -6
- package/src/components/Widgets/GeolocationWidgetMapContainer.jsx +7 -2
- package/src/components/manage/Blocks/CaseStudyExplorer/CaseStudyMap.jsx +6 -2
- package/src/constants.js +7 -0
- package/theme/globals/eunismarinehabitat.less +26 -10
package/CHANGELOG.md
CHANGED
|
@@ -4,10 +4,26 @@ All notable changes to this project will be documented in this file. Dates are d
|
|
|
4
4
|
|
|
5
5
|
Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
6
6
|
|
|
7
|
-
### [1.3.
|
|
7
|
+
### [1.3.5](https://github.com/eea/volto-bise-policy/compare/1.3.4...1.3.5) - 5 August 2026
|
|
8
|
+
|
|
9
|
+
#### :rocket: New Features
|
|
10
|
+
|
|
11
|
+
- feat(widgets): add fallback url for EUNIS code [laszlocseh - [`2ad4400`](https://github.com/eea/volto-bise-policy/commit/2ad4400ac0dbb17ff7e207125d8b40c5b4a268cf)]
|
|
12
|
+
|
|
13
|
+
#### :bug: Bug Fixes
|
|
14
|
+
|
|
15
|
+
- fix(css): fix Marine EUNIS Habitat content type css [laszlocseh - [`e818c10`](https://github.com/eea/volto-bise-policy/commit/e818c10d5806f42b181f1ab3c51a565de5bb36e9)]
|
|
16
|
+
|
|
17
|
+
### [1.3.4](https://github.com/eea/volto-bise-policy/compare/1.3.3...1.3.4) - 10 July 2026
|
|
18
|
+
|
|
19
|
+
#### :hammer_and_wrench: Others
|
|
20
|
+
|
|
21
|
+
- enable attributions for osm [Claudia Ifrim - [`de583af`](https://github.com/eea/volto-bise-policy/commit/de583af4eff7c7a3a91a9845eb372e2bfa86fec1)]
|
|
22
|
+
### [1.3.3](https://github.com/eea/volto-bise-policy/compare/1.3.2...1.3.3) - 9 July 2026
|
|
8
23
|
|
|
9
24
|
#### :house: Internal changes
|
|
10
25
|
|
|
26
|
+
- chore: [JENKINSFILE] sanitize sonarqube command [valentinab25 - [`8e2dc1a`](https://github.com/eea/volto-bise-policy/commit/8e2dc1a14f3230f197f009a76bf87587724b6e3a)]
|
|
11
27
|
|
|
12
28
|
#### :hammer_and_wrench: Others
|
|
13
29
|
|
|
@@ -111,6 +127,8 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
|
111
127
|
|
|
112
128
|
#### :house: Internal changes
|
|
113
129
|
|
|
130
|
+
- chore: [JENKINSFILE] add package version in sonarqube [valentinab25 - [`4c2d75b`](https://github.com/eea/volto-bise-policy/commit/4c2d75bbf6dca47929c6613749169b40ed483985)]
|
|
131
|
+
- chore: [JENKINSFILE] use sonarqube branches [EEA Jenkins - [`f99c622`](https://github.com/eea/volto-bise-policy/commit/f99c622726cfd711704f50218a2f1fe833974ec3)]
|
|
114
132
|
|
|
115
133
|
#### :hammer_and_wrench: Others
|
|
116
134
|
|
|
@@ -373,6 +391,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
|
373
391
|
- chore: customize root theme to use volto-spotlight - refs #259794 [ana-oprea - [`347f96e`](https://github.com/eea/volto-bise-policy/commit/347f96e335139f9656abd34c308c531b05de85e7)]
|
|
374
392
|
- chore: change the theme and alias to volto-spotlight and add volto-spotlight to package.json - refs #259794 [ana-oprea - [`52732a1`](https://github.com/eea/volto-bise-policy/commit/52732a17b3247a04ffae0a3f5118e173afa98157)]
|
|
375
393
|
- chore: change theme to eea-volto-theme, change config.alias - refs #259794 [ana-oprea - [`c2d08ea`](https://github.com/eea/volto-bise-policy/commit/c2d08ea08a7f0e5f6f7d32149e60ea3f3e901923)]
|
|
394
|
+
- chore: [JENKINS] Refactor automated testing [valentinab25 - [`a3c9488`](https://github.com/eea/volto-bise-policy/commit/a3c9488c5d09ba97fe5976675524d436080a2460)]
|
|
376
395
|
- chore: husky, lint-staged use fixed versions [valentinab25 - [`fddc30f`](https://github.com/eea/volto-bise-policy/commit/fddc30f11a1d8ec290edaca2d924282f5e113bc6)]
|
|
377
396
|
- chore:volto 16 in tests, update docs, fix stylelint overrides [valentinab25 - [`005ce74`](https://github.com/eea/volto-bise-policy/commit/005ce742dbd014fde27e417059251233365766dd)]
|
|
378
397
|
|
|
@@ -385,9 +404,17 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
|
385
404
|
- test: Update jest,Jenkinsfile,lint to volto-addons-template PR30 [valentinab25 - [`c1277ba`](https://github.com/eea/volto-bise-policy/commit/c1277bacf840ee9feccbfd6a2c85f0b25a9a9125)]
|
|
386
405
|
- test: Update jest,Jenkinsfile,lint to volto-addons-template PR30 [valentinab25 - [`c944153`](https://github.com/eea/volto-bise-policy/commit/c944153710fd53c5d48863cf363464273e25f52e)]
|
|
387
406
|
- test: Update jest,Jenkinsfile,lint to volto-addons-template PR30 [valentinab25 - [`d648d52`](https://github.com/eea/volto-bise-policy/commit/d648d525a2fc5076577fe0f75ff9782bf0d1d4e9)]
|
|
407
|
+
- test: [JENKINS] fix jest config, fail with logs on coverage [valentinab25 - [`2a7affe`](https://github.com/eea/volto-bise-policy/commit/2a7affe33d737704bdba117c4a5c8c6748ef7a47)]
|
|
408
|
+
- test: [JENKINS] fix jest config, fail with logs on coverage [valentinab25 - [`5929642`](https://github.com/eea/volto-bise-policy/commit/59296420105d0e8c1f1547aa0cd17a019e478c2b)]
|
|
409
|
+
- test: [JENKINS] fix jest config, fail with logs on coverage [valentinab25 - [`b1142f1`](https://github.com/eea/volto-bise-policy/commit/b1142f1da3667a9f56720f65bebce897a5dd8005)]
|
|
388
410
|
- test: cypress should not wait for navigation, actions, types - refs #259794 [ana-oprea - [`188637c`](https://github.com/eea/volto-bise-policy/commit/188637c78a0cae71b5ee48022507d559dfaceb3e)]
|
|
411
|
+
- test: [JENKINS] Use java17 for sonarqube scanner [valentinab25 - [`fa4e473`](https://github.com/eea/volto-bise-policy/commit/fa4e473018386ec3f09d7300d655c8cccdc19a0e)]
|
|
412
|
+
- test: [JENKINS] Run cypress in started frontend container [valentinab25 - [`1d9135b`](https://github.com/eea/volto-bise-policy/commit/1d9135bb878b3c7a1b828085b99b9d27d78ce60e)]
|
|
389
413
|
- remove cypress tests as it doesn t work on bise [Dobricean Ioan Dorian - [`ba7e2de`](https://github.com/eea/volto-bise-policy/commit/ba7e2defea2dcfd01537c3abb41fa9515ff0a3e3)]
|
|
390
414
|
- add mega menu layout settings as #259794 said [dobri1408 - [`b9a3683`](https://github.com/eea/volto-bise-policy/commit/b9a3683e7d85f8c88ad8feac975c47c434f62c4a)]
|
|
415
|
+
- test: [JENKINS] Add cpu limit on cypress docker [valentinab25 - [`9181908`](https://github.com/eea/volto-bise-policy/commit/9181908c7f4b51bdf83a34f8c7f25827de9b1cc6)]
|
|
416
|
+
- test: [JENKINS] Increase shm-size to cypress docker [valentinab25 - [`099d796`](https://github.com/eea/volto-bise-policy/commit/099d79669471e6924bf1e0bc51a79d54379c3a1a)]
|
|
417
|
+
- test: [JENKINS] Improve cypress time [valentinab25 - [`6d5d8e2`](https://github.com/eea/volto-bise-policy/commit/6d5d8e29b04ddb92628245570055067ca3dcbb6c)]
|
|
391
418
|
- test: fix comment [valentinab25 - [`4f27d5a`](https://github.com/eea/volto-bise-policy/commit/4f27d5af2e8895c7af4f1157521ca42682b96e23)]
|
|
392
419
|
- test: EN locales, pre-commit fix, feature PRs checks Refs #257193 [valentinab25 - [`4c2fcb0`](https://github.com/eea/volto-bise-policy/commit/4c2fcb01065e1ef962317ba7be788fd1df079618)]
|
|
393
420
|
- test: Update Makefile and docker-compose to align it with Jenkinsfile [valentinab25 - [`89afaa1`](https://github.com/eea/volto-bise-policy/commit/89afaa15892930452027ef8c8593fc6d193cda70)]
|
package/package.json
CHANGED
|
@@ -14,6 +14,7 @@ import deleteSVG from '@plone/volto/icons/delete.svg';
|
|
|
14
14
|
import addSVG from '@plone/volto/icons/add.svg';
|
|
15
15
|
import dragSVG from '@plone/volto/icons/drag.svg';
|
|
16
16
|
import { v4 as uuid } from 'uuid';
|
|
17
|
+
import { useSelector } from 'react-redux';
|
|
17
18
|
|
|
18
19
|
import { EuropeanRedListVocab, countryCodesVocab } from './vocabularies';
|
|
19
20
|
import './styles.less';
|
|
@@ -254,16 +255,17 @@ export const EUNISMSFDView = ({ value }) => {
|
|
|
254
255
|
);
|
|
255
256
|
};
|
|
256
257
|
|
|
257
|
-
export const EUNISCodeView = ({ value }) => {
|
|
258
|
+
export const EUNISCodeView = ({ value, content }) => {
|
|
259
|
+
const storeData = useSelector((state) => state.content?.data);
|
|
258
260
|
if (!value) return value;
|
|
259
261
|
|
|
262
|
+
const contentData = content ?? storeData;
|
|
263
|
+
const altUrl = contentData?.['eunis_code_alt_url']?.trim();
|
|
264
|
+
const href = altUrl || `/habitats_eunis_revised/EUNISrev_${value}`;
|
|
265
|
+
|
|
260
266
|
return (
|
|
261
267
|
<span>
|
|
262
|
-
<a
|
|
263
|
-
href={`/habitats_eunis_revised/EUNISrev_${value}`}
|
|
264
|
-
target="_blank"
|
|
265
|
-
rel="noopener"
|
|
266
|
-
>
|
|
268
|
+
<a href={href} target="_blank" rel="noopener">
|
|
267
269
|
{value}
|
|
268
270
|
</a>
|
|
269
271
|
</span>
|
|
@@ -9,6 +9,7 @@ import {
|
|
|
9
9
|
} from '@eeacms/volto-openlayers-map/api';
|
|
10
10
|
import React, { useState } from 'react';
|
|
11
11
|
import { useMapContext } from '@eeacms/volto-openlayers-map/hocs';
|
|
12
|
+
import { GISCO_OSM_ATTRIBUTION } from '@eeacms/volto-bise-policy/constants';
|
|
12
13
|
|
|
13
14
|
function PinInteraction({ longitude, latitude, onChange, ol }) {
|
|
14
15
|
const mapContext = useMapContext();
|
|
@@ -77,6 +78,7 @@ const TileSetLoader = (props) => {
|
|
|
77
78
|
setTileWMSSources([
|
|
78
79
|
new ol.source.TileWMS({
|
|
79
80
|
url: 'https://gisco-services.ec.europa.eu/maps/service',
|
|
81
|
+
attributions: GISCO_OSM_ATTRIBUTION,
|
|
80
82
|
params: {
|
|
81
83
|
LAYERS: 'OSMBlossomComposite',
|
|
82
84
|
TILED: true,
|
|
@@ -102,10 +104,13 @@ const MapContainer = (props) => {
|
|
|
102
104
|
zoom: 15,
|
|
103
105
|
}}
|
|
104
106
|
pixelRatio={1}
|
|
105
|
-
controls={ol.control.defaults({ attribution: false })}
|
|
106
107
|
>
|
|
107
108
|
<Layers>
|
|
108
|
-
<Controls
|
|
109
|
+
<Controls
|
|
110
|
+
attribution={true}
|
|
111
|
+
attributionOptions={{ collapsible: false }}
|
|
112
|
+
zoom={false}
|
|
113
|
+
/>
|
|
109
114
|
<PinInteraction
|
|
110
115
|
ol={ol}
|
|
111
116
|
latitude={latitude}
|
|
@@ -10,6 +10,7 @@ import {
|
|
|
10
10
|
useMapContext,
|
|
11
11
|
} from '@eeacms/volto-openlayers-map/api';
|
|
12
12
|
import { withOpenLayers } from '@eeacms/volto-openlayers-map';
|
|
13
|
+
import { GISCO_OSM_ATTRIBUTION } from '@eeacms/volto-bise-policy/constants';
|
|
13
14
|
|
|
14
15
|
import InfoOverlay from './InfoOverlay';
|
|
15
16
|
import FeatureInteraction from './FeatureInteraction';
|
|
@@ -45,6 +46,7 @@ function CaseStudyMap(props) {
|
|
|
45
46
|
const [tileWMSSources] = React.useState([
|
|
46
47
|
new ol.source.TileWMS({
|
|
47
48
|
url: 'https://gisco-services.ec.europa.eu/maps/service',
|
|
49
|
+
attributions: GISCO_OSM_ATTRIBUTION,
|
|
48
50
|
params: {
|
|
49
51
|
// LAYERS: 'OSMBlossomComposite', OSMCartoComposite, OSMPositronComposite
|
|
50
52
|
LAYERS: 'OSMPositronComposite',
|
|
@@ -130,9 +132,11 @@ function CaseStudyMap(props) {
|
|
|
130
132
|
zoom: 4,
|
|
131
133
|
}}
|
|
132
134
|
pixelRatio={1}
|
|
133
|
-
// controls={ol.control.defaults({ attribution: false })}
|
|
134
135
|
>
|
|
135
|
-
<Controls
|
|
136
|
+
<Controls
|
|
137
|
+
attribution={true}
|
|
138
|
+
attributionOptions={{ collapsible: false }}
|
|
139
|
+
/>
|
|
136
140
|
<Layers>
|
|
137
141
|
{hideFilters ? null : (
|
|
138
142
|
<button
|
package/src/constants.js
ADDED
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
// Basemap attribution strings. OpenStreetMap-derived basemaps (GISCO OSM*
|
|
2
|
+
// composites) must credit "© OpenStreetMap contributors" per the ODbL —
|
|
3
|
+
// https://www.openstreetmap.org/copyright
|
|
4
|
+
export const OSM_ATTRIBUTION =
|
|
5
|
+
'© <a href="https://www.openstreetmap.org/copyright" target="_blank" rel="noopener noreferrer">OpenStreetMap</a> contributors';
|
|
6
|
+
|
|
7
|
+
export const GISCO_OSM_ATTRIBUTION = `${OSM_ATTRIBUTION}, © <a href="https://ec.europa.eu/eurostat/web/gisco" target="_blank" rel="noopener noreferrer">Eurostat/GISCO</a>`;
|
|
@@ -22,23 +22,40 @@
|
|
|
22
22
|
box-shadow: none;
|
|
23
23
|
}
|
|
24
24
|
|
|
25
|
-
.contenttype-marine_eunis_habitat
|
|
26
|
-
|
|
25
|
+
.is-adding-contenttype-marine_eunis_habitat {
|
|
26
|
+
.slate_wysiwyg_box {
|
|
27
|
+
background-color: white;
|
|
28
|
+
padding: 5px;
|
|
29
|
+
border: 1px solid #c7d5d8;
|
|
30
|
+
}
|
|
27
31
|
}
|
|
28
32
|
|
|
29
|
-
.contenttype-marine_eunis_habitat
|
|
30
|
-
|
|
33
|
+
.contenttype-marine_eunis_habitat,
|
|
34
|
+
.is-adding-contenttype-marine_eunis_habitat {
|
|
35
|
+
.help.slate_wysiwyg p.help {
|
|
36
|
+
white-space: break-spaces;
|
|
37
|
+
}
|
|
31
38
|
}
|
|
32
39
|
|
|
33
|
-
.contenttype-marine_eunis_habitat
|
|
34
|
-
|
|
40
|
+
.is-adding-contenttype-marine_eunis_habitat,
|
|
41
|
+
.contenttype-marine_eunis_habitat {
|
|
42
|
+
.bise-objectlist-widget p.help {
|
|
43
|
+
white-space: break-spaces;
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
.is-adding-contenttype-marine_eunis_habitat,
|
|
48
|
+
.contenttype-marine_eunis_habitat {
|
|
49
|
+
.eea.banner .gradient {
|
|
50
|
+
background: none;
|
|
51
|
+
}
|
|
35
52
|
}
|
|
36
53
|
|
|
37
54
|
.contenttype-nrr_measure .eea.banner .gradient {
|
|
38
55
|
background: none;
|
|
39
56
|
}
|
|
40
57
|
|
|
41
|
-
.bise-objectlist-widget .inline.field
|
|
58
|
+
.bise-objectlist-widget .inline.field>.ui.grid {
|
|
42
59
|
margin: 0;
|
|
43
60
|
}
|
|
44
61
|
|
|
@@ -46,7 +63,6 @@
|
|
|
46
63
|
color: var(--text-color-secondary, #289588);
|
|
47
64
|
}
|
|
48
65
|
|
|
49
|
-
.contenttype-nrr_measure
|
|
50
|
-
.top.aligned.four.wide.computer.twelve.wide.mobile.four.wide.column {
|
|
66
|
+
.contenttype-nrr_measure .top.aligned.four.wide.computer.twelve.wide.mobile.four.wide.column {
|
|
51
67
|
background-color: #f9f9f9;
|
|
52
|
-
}
|
|
68
|
+
}
|