@eeacms/volto-n2k 1.1.0 → 1.1.2
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 +16 -1
- package/package.json +2 -2
- package/src/components/manage/Blocks/ContactBlock/schema.js +1 -1
- package/src/components/manage/Blocks/ExplodedPiesChart/schema.js +1 -1
- package/src/components/manage/Blocks/ExploreHabitats/View.jsx +71 -66
- package/src/components/manage/Blocks/HabitatsBanner/View.jsx +4 -1
- package/src/components/manage/Blocks/SpeciesBanner/View.jsx +1 -0
package/CHANGELOG.md
CHANGED
|
@@ -4,6 +4,15 @@ 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.1.2](https://github.com/eea/volto-n2k/compare/1.1.1...1.1.2) - 11 December 2024
|
|
8
|
+
|
|
9
|
+
#### :hammer_and_wrench: Others
|
|
10
|
+
|
|
11
|
+
- don't run cypress [Miu Razvan - [`3ff98b8`](https://github.com/eea/volto-n2k/commit/3ff98b8b0da5b594e701c517c562df31f8bdaf82)]
|
|
12
|
+
- fix tests [Miu Razvan - [`0b2d0e0`](https://github.com/eea/volto-n2k/commit/0b2d0e0c5317bc6ac81da56d2bb225ae8d782085)]
|
|
13
|
+
- Fix habitats/species banner, ref #278618 [Miu Razvan - [`b73d5c7`](https://github.com/eea/volto-n2k/commit/b73d5c73ca3f6d77c0bf0058bed453d404015e03)]
|
|
14
|
+
### [1.1.1](https://github.com/eea/volto-n2k/compare/1.1.0...1.1.1) - 13 November 2024
|
|
15
|
+
|
|
7
16
|
### [1.1.0](https://github.com/eea/volto-n2k/compare/1.0.35...1.1.0) - 7 November 2024
|
|
8
17
|
|
|
9
18
|
#### :bug: Bug Fixes
|
|
@@ -24,7 +33,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
|
24
33
|
- update [Miu Razvan - [`6389bfc`](https://github.com/eea/volto-n2k/commit/6389bfc6b11c76fbce0a4fc1e052b8d08223fe9c)]
|
|
25
34
|
- lint fix [Miu Razvan - [`e56a7be`](https://github.com/eea/volto-n2k/commit/e56a7be93d345f80342724a1c75e70ae54db01c5)]
|
|
26
35
|
- merge develop into volto-17 [Miu Razvan - [`be4c9c1`](https://github.com/eea/volto-n2k/commit/be4c9c1ca6edad395e6412669e6ee4294605c65b)]
|
|
27
|
-
- fix package compatibility with latest updates, ref #278618 [Miu Razvan - [`fc85878`](https://github.com/eea/volto-n2k/commit/fc858786e0ae0373a6c4447a93dc9f1fce522f75)]
|
|
28
36
|
- test: Update to volto 17 PR30 [valentinab25 - [`9d6a983`](https://github.com/eea/volto-n2k/commit/9d6a98313fbb24092de9879ae790af2c33220830)]
|
|
29
37
|
### [1.0.35](https://github.com/eea/volto-n2k/compare/1.0.34...1.0.35) - 17 May 2024
|
|
30
38
|
|
|
@@ -40,6 +48,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
|
40
48
|
|
|
41
49
|
#### :house: Internal changes
|
|
42
50
|
|
|
51
|
+
- chore: [JENKINS] Refactor automated testing [valentinab25 - [`e4f9fc8`](https://github.com/eea/volto-n2k/commit/e4f9fc800b753b97cca7c685bc47dd48804276f0)]
|
|
43
52
|
- chore: husky, lint-staged use fixed versions [valentinab25 - [`647d621`](https://github.com/eea/volto-n2k/commit/647d621d52400c50f5bc629b3ddc4f2121f14ffa)]
|
|
44
53
|
- chore:volto 16 in tests, update docs, fix stylelint overrides [valentinab25 - [`60d94b6`](https://github.com/eea/volto-n2k/commit/60d94b61ff8826abc57af9616793a1a247f585b5)]
|
|
45
54
|
|
|
@@ -54,6 +63,11 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
|
54
63
|
- try to use volto-spotlight theme in jenkins [Miu Razvan - [`ec0b952`](https://github.com/eea/volto-n2k/commit/ec0b9525b967f907922ae660bd9f520119cd80c1)]
|
|
55
64
|
- remove waitForResourceToLoad [ana-oprea - [`eaded9b`](https://github.com/eea/volto-n2k/commit/eaded9b9ecd1ca2eb78aa8dd65838c063d95db85)]
|
|
56
65
|
- update image size from 300 to 800 px [Claudia Ifrim - [`8d9270a`](https://github.com/eea/volto-n2k/commit/8d9270a09506278ceaea25e8a72abdf5b22fcc78)]
|
|
66
|
+
- test: [JENKINS] Use java17 for sonarqube scanner [valentinab25 - [`350f8a6`](https://github.com/eea/volto-n2k/commit/350f8a6928aafbf168472b572f8041a79f71f577)]
|
|
67
|
+
- test: [JENKINS] Run cypress in started frontend container [valentinab25 - [`99b3a84`](https://github.com/eea/volto-n2k/commit/99b3a84a266710fadf7d430117359b741cadede8)]
|
|
68
|
+
- test: [JENKINS] Add cpu limit on cypress docker [valentinab25 - [`050ac98`](https://github.com/eea/volto-n2k/commit/050ac982ec39e9a1b4885b665cdc118fca7b1283)]
|
|
69
|
+
- test: [JENKINS] Increase shm-size to cypress docker [valentinab25 - [`3546040`](https://github.com/eea/volto-n2k/commit/35460409817f496fc752ab34e37d6d33a069b2e9)]
|
|
70
|
+
- test: [JENKINS] Improve cypress time [valentinab25 - [`06a4ab1`](https://github.com/eea/volto-n2k/commit/06a4ab151799b8cdf4a316dbcb0c323e0f568e30)]
|
|
57
71
|
- test: EN locales, pre-commit fix, feature PRs checks Refs #257193 [valentinab25 - [`4850d6a`](https://github.com/eea/volto-n2k/commit/4850d6a65349fe49dbe9244c30592ae38c9aeaba)]
|
|
58
72
|
- test: Update Makefile and docker-compose to align it with Jenkinsfile [valentinab25 - [`2c91856`](https://github.com/eea/volto-n2k/commit/2c9185688a2fe6b36e5eeb2963f6c8676e3c5628)]
|
|
59
73
|
### [1.0.33](https://github.com/eea/volto-n2k/compare/1.0.32...1.0.33) - 3 July 2023
|
|
@@ -310,6 +324,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
|
310
324
|
- Update [razvanMiu - [`42ab50e`](https://github.com/eea/volto-n2k/commit/42ab50e6681a47251d15ac06b836c6f8c27157fa)]
|
|
311
325
|
- Added bubble chart [razvanMiu - [`89fba5e`](https://github.com/eea/volto-n2k/commit/89fba5e5db41aa955ba2d0ed58c9f0042c461504)]
|
|
312
326
|
- Group species by id_eunis in species list [razvanMiu - [`543c957`](https://github.com/eea/volto-n2k/commit/543c9573b53acd8eecc9afbb6ae7beeddba53966)]
|
|
327
|
+
- Add Sonarqube tag using frontend addons list [EEA Jenkins - [`2ca3e4c`](https://github.com/eea/volto-n2k/commit/2ca3e4c092211f92339791d71db81f5b4ca2d562)]
|
|
313
328
|
- update maps - species and habitats distribution maps [Claudia Ifrim - [`ad12eb1`](https://github.com/eea/volto-n2k/commit/ad12eb141907d6f28444f1eafc3f687735d2a68d)]
|
|
314
329
|
- update format for common name and author [Claudia Ifrim - [`26b7a2f`](https://github.com/eea/volto-n2k/commit/26b7a2f3d20c7701b57fb24f39fc7dfeceec3ce8)]
|
|
315
330
|
- update format for species name (common / scientific) [Claudia Ifrim - [`abdedcf`](https://github.com/eea/volto-n2k/commit/abdedcfe645665031dedf050fd2c5cdde8c14a50)]
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@eeacms/volto-n2k",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.2",
|
|
4
4
|
"description": "volto-n2k: Volto add-on",
|
|
5
5
|
"main": "src/index.js",
|
|
6
6
|
"author": "European Environment Agency: IDM2 A-Team",
|
|
@@ -27,8 +27,8 @@
|
|
|
27
27
|
"@eeacms/volto-datablocks": "*",
|
|
28
28
|
"@eeacms/volto-openlayers-map": "*",
|
|
29
29
|
"@eeacms/volto-resize-helper": "*",
|
|
30
|
-
"@eeacms/volto-spotlight": "*",
|
|
31
30
|
"@eeacms/volto-tabs-block": "*",
|
|
31
|
+
"@eeacms/volto-spotlight": "*",
|
|
32
32
|
"d3": "^7.6.1",
|
|
33
33
|
"d3-shape": "^3.1.0",
|
|
34
34
|
"react-lazy-load-image-component": "1.5.1",
|
|
@@ -104,77 +104,82 @@ const View = (props) => {
|
|
|
104
104
|
/* eslint-disable-next-line */
|
|
105
105
|
}, [JSON.stringify(activePageResults)]);
|
|
106
106
|
|
|
107
|
+
if (__SERVER__) return null;
|
|
108
|
+
|
|
107
109
|
return (
|
|
108
|
-
|
|
109
|
-
<div className="explore-habitats">
|
|
110
|
-
<
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
<
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
color: '#00A390',
|
|
132
|
-
// color: '#F8E473',
|
|
133
|
-
width: 3,
|
|
134
|
-
}),
|
|
135
|
-
image: new style.Circle({
|
|
136
|
-
radius: 5,
|
|
137
|
-
fill: new style.Fill({ color: 'rgba(4, 167, 125,0.6)' }),
|
|
138
|
-
// fill: new style.Fill({ color: 'rgba(248,228,115,0.6)' }),
|
|
110
|
+
__CLIENT__ && (
|
|
111
|
+
<div className="explore-habitats-wrapper full-width">
|
|
112
|
+
<div className="explore-habitats">
|
|
113
|
+
<Map
|
|
114
|
+
view={{
|
|
115
|
+
center: proj.fromLonLat([20, 50]),
|
|
116
|
+
showFullExtent: true,
|
|
117
|
+
zoom: 5,
|
|
118
|
+
...(options.extent ? { extent: options.extent } : {}),
|
|
119
|
+
}}
|
|
120
|
+
pixelRatio={1}
|
|
121
|
+
>
|
|
122
|
+
<Layers>
|
|
123
|
+
<Layer.Tile source={tileWMSSources[0]} zIndex={0} />
|
|
124
|
+
<Layer.Tile source={tileWMSSources[1]} zIndex={1} />
|
|
125
|
+
<Layer.Vector
|
|
126
|
+
source={vectorSource}
|
|
127
|
+
title="highlightLayer"
|
|
128
|
+
style={
|
|
129
|
+
new style.Style({
|
|
130
|
+
fill: new style.Fill({
|
|
131
|
+
color: 'rgba(255,255,255,0.4)',
|
|
132
|
+
}),
|
|
139
133
|
stroke: new style.Stroke({
|
|
140
|
-
color: '
|
|
141
|
-
|
|
134
|
+
color: '#00A390',
|
|
135
|
+
// color: '#F8E473',
|
|
136
|
+
width: 3,
|
|
137
|
+
}),
|
|
138
|
+
image: new style.Circle({
|
|
139
|
+
radius: 5,
|
|
140
|
+
fill: new style.Fill({ color: 'rgba(4, 167, 125,0.6)' }),
|
|
141
|
+
// fill: new style.Fill({ color: 'rgba(248,228,115,0.6)' }),
|
|
142
|
+
stroke: new style.Stroke({
|
|
143
|
+
color: 'rgba(242, 180, 87, 1)',
|
|
144
|
+
width: 2,
|
|
145
|
+
}),
|
|
142
146
|
}),
|
|
143
|
-
})
|
|
144
|
-
}
|
|
145
|
-
|
|
146
|
-
|
|
147
|
+
})
|
|
148
|
+
}
|
|
149
|
+
zIndex={2}
|
|
150
|
+
/>
|
|
151
|
+
</Layers>
|
|
152
|
+
<Controls attribution={true} zoom={false} />
|
|
153
|
+
<Interactions
|
|
154
|
+
doubleClickZoom={true}
|
|
155
|
+
dragAndDrop={false}
|
|
156
|
+
dragPan={true}
|
|
157
|
+
keyboardPan={true}
|
|
158
|
+
keyboardZoom={true}
|
|
159
|
+
mouseWheelZoom={true}
|
|
160
|
+
pointer={false}
|
|
161
|
+
select={false}
|
|
147
162
|
/>
|
|
148
|
-
</
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
163
|
+
</Map>
|
|
164
|
+
</div>
|
|
165
|
+
<Container>
|
|
166
|
+
<Message className="map-info-notice" style={{ color: '#005248' }}>
|
|
167
|
+
<p>
|
|
168
|
+
The designations employed and the presentation of material on this
|
|
169
|
+
map do not imply the expression of any opinion whatsoever on the
|
|
170
|
+
part of the European Union concerning the legal status of any
|
|
171
|
+
country, territory, city or area or of its authorities, or
|
|
172
|
+
concerning the delimitation of its frontiers or boundaries.
|
|
173
|
+
</p>
|
|
174
|
+
<p>
|
|
175
|
+
<strong>Note:</strong> When you perform a search we will highlight
|
|
176
|
+
only the results available on the active page of the results
|
|
177
|
+
table.
|
|
178
|
+
</p>
|
|
179
|
+
</Message>
|
|
180
|
+
</Container>
|
|
161
181
|
</div>
|
|
162
|
-
|
|
163
|
-
<Message className="map-info-notice" style={{ color: '#005248' }}>
|
|
164
|
-
<p>
|
|
165
|
-
The designations employed and the presentation of material on this
|
|
166
|
-
map do not imply the expression of any opinion whatsoever on the
|
|
167
|
-
part of the European Union concerning the legal status of any
|
|
168
|
-
country, territory, city or area or of its authorities, or
|
|
169
|
-
concerning the delimitation of its frontiers or boundaries.
|
|
170
|
-
</p>
|
|
171
|
-
<p>
|
|
172
|
-
<strong>Note:</strong> When you perform a search we will highlight
|
|
173
|
-
only the results available on the active page of the results table.
|
|
174
|
-
</p>
|
|
175
|
-
</Message>
|
|
176
|
-
</Container>
|
|
177
|
-
</div>
|
|
182
|
+
)
|
|
178
183
|
);
|
|
179
184
|
};
|
|
180
185
|
|
|
@@ -11,6 +11,7 @@ import arrowLeft from '@eeacms/volto-n2k/icons/arrow-left.svg';
|
|
|
11
11
|
import arrowRight from '@eeacms/volto-n2k/icons/arrow-right.svg';
|
|
12
12
|
|
|
13
13
|
import './style.less';
|
|
14
|
+
import 'swiper/css';
|
|
14
15
|
|
|
15
16
|
const SwiperLoader = loadable.lib(() => import('swiper'));
|
|
16
17
|
const SwiperReactLoader = loadable.lib(() => import('swiper/react'));
|
|
@@ -114,7 +115,9 @@ const _View = (props) => {
|
|
|
114
115
|
</>
|
|
115
116
|
)}
|
|
116
117
|
{!!attribution_copyright[activeSlide] && (
|
|
117
|
-
<p
|
|
118
|
+
<p title={attribution_copyright[activeSlide]}>
|
|
119
|
+
{attribution_copyright[activeSlide]}
|
|
120
|
+
</p>
|
|
118
121
|
)}
|
|
119
122
|
</div>
|
|
120
123
|
{__CLIENT__ && (
|
|
@@ -12,6 +12,7 @@ import arrowLeft from '@eeacms/volto-n2k/icons/arrow-left.svg';
|
|
|
12
12
|
import arrowRight from '@eeacms/volto-n2k/icons/arrow-right.svg';
|
|
13
13
|
|
|
14
14
|
import './style.less';
|
|
15
|
+
import 'swiper/css';
|
|
15
16
|
|
|
16
17
|
const SwiperLoader = loadable.lib(() => import('swiper'));
|
|
17
18
|
const SwiperReactLoader = loadable.lib(() => import('swiper/react'));
|