@eeacms/volto-n2k 1.0.0 → 1.0.1

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.
Files changed (16) hide show
  1. package/CHANGELOG.md +11 -3
  2. package/package.json +2 -2
  3. package/src/components/manage/Blocks/CddaShape/View.jsx +14 -1
  4. package/src/components/manage/Blocks/ExploreHabitats/View.jsx +17 -5
  5. package/src/components/manage/Blocks/ExploreSites/View.jsx +6 -2
  6. package/src/components/manage/Blocks/ExploreSpecies/View.jsx +15 -5
  7. package/src/components/manage/Blocks/HabitatDistribution/View.jsx +14 -1
  8. package/src/components/manage/Blocks/HabitatProtectedSites/View.jsx +14 -1
  9. package/src/components/manage/Blocks/Landing/DefalutView.jsx +0 -16
  10. package/src/components/manage/Blocks/Landing/Edit.jsx +0 -16
  11. package/src/components/manage/Blocks/SiteShape/View.jsx +14 -1
  12. package/src/components/manage/Blocks/SpeciesDistribution/View.jsx +14 -1
  13. package/src/components/manage/Blocks/SpeciesProtectedSites/View.jsx +14 -1
  14. package/src/components/theme/Header/Header.jsx +9 -7
  15. package/src/components/theme/LanguageSelector/LanguageSelector.jsx +2 -42
  16. package/src/components/theme/Navigation/Navigation.jsx +3 -2
package/CHANGELOG.md CHANGED
@@ -4,11 +4,18 @@ 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.0.0](https://github.com/eea/volto-n2k/compare/0.1.15...1.0.0) - 1 November 2022
7
+ ### [1.0.1](https://github.com/eea/volto-n2k/compare/1.0.0...1.0.1) - 2 November 2022
8
8
 
9
- #### :nail_care: Enhancements
9
+ #### :hammer_and_wrench: Others
10
10
 
11
- - refactor: use latest volto [Miu Razvan - [`92c4e10`](https://github.com/eea/volto-n2k/commit/92c4e1076c75f2d59042c4075804531b3899fc6b)]
11
+ - Update [Miu Razvan - [`923d3f5`](https://github.com/eea/volto-n2k/commit/923d3f5213dfa930ba7aa6fcd85fd75b7ed709a4)]
12
+ - Fix language selector [Miu Razvan - [`a47cffa`](https://github.com/eea/volto-n2k/commit/a47cffa07bb74b5337e36611dc0c8f037c887430)]
13
+ - Use eea basemap [Miu Razvan - [`1531a7c`](https://github.com/eea/volto-n2k/commit/1531a7ca624bb7c1ad584983b19ecc86fa182340)]
14
+ - bugfix for maps - macos [Claudia Ifrim - [`881d066`](https://github.com/eea/volto-n2k/commit/881d06614e517d1d31da712ae3b7562e375f8664)]
15
+ - change basemap for explore species [Claudia Ifrim - [`cd0f217`](https://github.com/eea/volto-n2k/commit/cd0f217f89743892f2a682f0210a29b6daf93698)]
16
+ - change basemap for explore habitats [Claudia Ifrim - [`43535a8`](https://github.com/eea/volto-n2k/commit/43535a82952c460bb712bdc6c995bf24c404b023)]
17
+ - change basemap for explore sites [Claudia Ifrim - [`dd854c7`](https://github.com/eea/volto-n2k/commit/dd854c75b17854a067ffa863863d0b984db99b1b)]
18
+ ## [1.0.0](https://github.com/eea/volto-n2k/compare/0.1.15...1.0.0) - 1 November 2022
12
19
 
13
20
  #### :hammer_and_wrench: Others
14
21
 
@@ -101,6 +108,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
101
108
  - Update [razvanMiu - [`42ab50e`](https://github.com/eea/volto-n2k/commit/42ab50e6681a47251d15ac06b836c6f8c27157fa)]
102
109
  - Added bubble chart [razvanMiu - [`89fba5e`](https://github.com/eea/volto-n2k/commit/89fba5e5db41aa955ba2d0ed58c9f0042c461504)]
103
110
  - Group species by id_eunis in species list [razvanMiu - [`543c957`](https://github.com/eea/volto-n2k/commit/543c9573b53acd8eecc9afbb6ae7beeddba53966)]
111
+ - Add Sonarqube tag using frontend addons list [EEA Jenkins - [`2ca3e4c`](https://github.com/eea/volto-n2k/commit/2ca3e4c092211f92339791d71db81f5b4ca2d562)]
104
112
  - update maps - species and habitats distribution maps [Claudia Ifrim - [`ad12eb1`](https://github.com/eea/volto-n2k/commit/ad12eb141907d6f28444f1eafc3f687735d2a68d)]
105
113
  - update format for common name and author [Claudia Ifrim - [`26b7a2f`](https://github.com/eea/volto-n2k/commit/26b7a2f3d20c7701b57fb24f39fc7dfeceec3ce8)]
106
114
  - 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.0.0",
3
+ "version": "1.0.1",
4
4
  "description": "volto-n2k: Volto add-on",
5
5
  "main": "src/index.js",
6
6
  "author": "European Environment Agency: IDM2 A-Team",
@@ -29,7 +29,7 @@
29
29
  "@eeacms/volto-resize-helper": "*",
30
30
  "@eeacms/volto-openlayers-map": "*",
31
31
  "@eeacms/volto-tabs-block": "*",
32
- "@eeacms/volto-bise": "github:eea/volto-bise#develop",
32
+ "@eeacms/volto-bise": "*",
33
33
  "volto-slate": "*",
34
34
  "d3": "^7.6.1",
35
35
  "d3-shape": "^3.1.0",
package/src/components/manage/Blocks/CddaShape/View.jsx CHANGED
@@ -11,6 +11,7 @@ import './style.less';
11
11
  const View = (props) => {
12
12
  const [options, setOptions] = React.useState({});
13
13
  const [vectorSource, setVectorSource] = useState(null);
14
+ const [tileWMSSources, setTileWMSSources] = useState([]);
14
15
  const { extent, format, proj, style, source } = openlayers;
15
16
  const provider_data = props.provider_data || {};
16
17
  const { site_code = [] } = provider_data;
@@ -18,6 +19,17 @@ const View = (props) => {
18
19
  useEffect(() => {
19
20
  if (__SERVER__) return;
20
21
  setVectorSource(new source.Vector());
22
+ setTileWMSSources([
23
+ new source.TileWMS({
24
+ url: 'https://gisco-services.ec.europa.eu/maps/service',
25
+ params: {
26
+ LAYERS: 'OSMPositronComposite',
27
+ TILED: true,
28
+ },
29
+ serverType: 'geoserver',
30
+ transition: 0,
31
+ }),
32
+ ]);
21
33
  /* eslint-disable-next-line */
22
34
  }, []);
23
35
 
@@ -57,10 +69,11 @@ const View = (props) => {
57
69
  minZoom: 10,
58
70
  zoom: 10,
59
71
  }}
72
+ pixelRatio={1}
60
73
  {...options}
61
74
  >
62
75
  <Layers>
63
- <Layer.Tile zIndex={0} />
76
+ <Layer.Tile source={tileWMSSources[0]} zIndex={0} />
64
77
  <Layer.Vector
65
78
  source={vectorSource}
66
79
  style={
package/src/components/manage/Blocks/ExploreHabitats/View.jsx CHANGED
@@ -12,7 +12,7 @@ import './style.less';
12
12
  const View = (props) => {
13
13
  const [options, setOptions] = React.useState({});
14
14
  const [vectorSource, setVectorSource] = useState(null);
15
- const [tileWMSSource, setTileWMSSource] = useState(null);
15
+ const [tileWMSSources, setTileWMSSources] = useState([]);
16
16
  const { extent, format, proj, style, source } = openlayers;
17
17
 
18
18
  const { results = [], payload = {} } = props.search || {};
@@ -27,7 +27,18 @@ const View = (props) => {
27
27
  useEffect(() => {
28
28
  if (__SERVER__) return;
29
29
  setVectorSource(new source.Vector());
30
- setTileWMSSource(
30
+ setTileWMSSources([
31
+ new source.TileWMS({
32
+ url: 'https://gisco-services.ec.europa.eu/maps/service',
33
+ params: {
34
+ LAYERS: 'OSMPositronComposite',
35
+ TILED: true,
36
+ with: 256,
37
+ height: 256,
38
+ },
39
+ serverType: 'geoserver',
40
+ transition: 0,
41
+ }),
31
42
  new source.TileWMS({
32
43
  extent: [
33
44
  -3959514.742799999,
@@ -42,7 +53,7 @@ const View = (props) => {
42
53
  // Countries have transparency, so do not fade tiles:
43
54
  transition: 0,
44
55
  }),
45
- );
56
+ ]);
46
57
  /* eslint-disable-next-line */
47
58
  }, []);
48
59
 
@@ -108,11 +119,12 @@ const View = (props) => {
108
119
  showFullExtent: true,
109
120
  zoom: 5,
110
121
  }}
122
+ pixelRatio={1}
111
123
  {...options}
112
124
  >
113
125
  <Layers>
114
- <Layer.Tile zIndex={0} />
115
- <Layer.Tile source={tileWMSSource} zIndex={1} />
126
+ <Layer.Tile source={tileWMSSources[0]} zIndex={0} />
127
+ <Layer.Tile source={tileWMSSources[1]} zIndex={1} />
116
128
  <Layer.Vector
117
129
  source={vectorSource}
118
130
  title="highlightLayer"
package/src/components/manage/Blocks/ExploreSites/View.jsx CHANGED
@@ -30,7 +30,10 @@ const View = (props) => {
30
30
  setTileWMSSources([
31
31
  new source.TileWMS({
32
32
  url: 'https://gisco-services.ec.europa.eu/maps/service',
33
- params: { LAYERS: 'OSMPositronComposite', TILED: true },
33
+ params: {
34
+ LAYERS: 'OSMPositronComposite',
35
+ TILED: true,
36
+ },
34
37
  serverType: 'geoserver',
35
38
  transition: 0,
36
39
  }),
@@ -111,10 +114,11 @@ const View = (props) => {
111
114
  showFullExtent: true,
112
115
  zoom: 5,
113
116
  }}
117
+ pixelRatio={1}
114
118
  {...options}
115
119
  >
116
120
  <Layers>
117
- <Layer.Tile zIndex={0} />
121
+ <Layer.Tile source={tileWMSSources[0]} zIndex={0} />
118
122
  <Layer.Tile source={tileWMSSources[1]} zIndex={1} />
119
123
  <Layer.Vector
120
124
  source={vectorSource}
package/src/components/manage/Blocks/ExploreSpecies/View.jsx CHANGED
@@ -12,7 +12,7 @@ import './style.less';
12
12
  const View = (props) => {
13
13
  const [options, setOptions] = React.useState({});
14
14
  const [vectorSource, setVectorSource] = useState(null);
15
- const [tileWMSSource, setTileWMSSource] = useState(null);
15
+ const [tileWMSSources, setTileWMSSources] = useState([]);
16
16
  const { extent, format, proj, style, source } = openlayers;
17
17
 
18
18
  const { results = [], payload = {} } = props.search || {};
@@ -27,7 +27,16 @@ const View = (props) => {
27
27
  useEffect(() => {
28
28
  if (__SERVER__) return;
29
29
  setVectorSource(new source.Vector());
30
- setTileWMSSource(
30
+ setTileWMSSources([
31
+ new source.TileWMS({
32
+ url: 'https://gisco-services.ec.europa.eu/maps/service',
33
+ params: {
34
+ LAYERS: 'OSMPositronComposite',
35
+ TILED: true,
36
+ },
37
+ serverType: 'geoserver',
38
+ transition: 0,
39
+ }),
31
40
  new source.TileWMS({
32
41
  extent: [
33
42
  -3690067.3068000004,
@@ -42,7 +51,7 @@ const View = (props) => {
42
51
  // Countries have transparency, so do not fade tiles:
43
52
  transition: 0,
44
53
  }),
45
- );
54
+ ]);
46
55
  /* eslint-disable-next-line */
47
56
  }, []);
48
57
 
@@ -108,11 +117,12 @@ const View = (props) => {
108
117
  showFullExtent: true,
109
118
  zoom: 5,
110
119
  }}
120
+ pixelRatio={1}
111
121
  {...options}
112
122
  >
113
123
  <Layers>
114
- <Layer.Tile zIndex={0} />
115
- <Layer.Tile source={tileWMSSource} zIndex={1} />
124
+ <Layer.Tile source={tileWMSSources[0]} zIndex={0} />
125
+ <Layer.Tile source={tileWMSSources[1]} zIndex={1} />
116
126
  <Layer.Vector
117
127
  source={vectorSource}
118
128
  title="highlightLayer"
package/src/components/manage/Blocks/HabitatDistribution/View.jsx CHANGED
@@ -11,6 +11,7 @@ import './style.less';
11
11
  const View = (props) => {
12
12
  const [options, setOptions] = React.useState({});
13
13
  const [vectorSource, setVectorSource] = useState(null);
14
+ const [tileWMSSources, setTileWMSSources] = useState([]);
14
15
  const { extent, format, proj, style, source } = openlayers;
15
16
  const provider_data = props.provider_data || {};
16
17
  const { code_2000 = [] } = provider_data;
@@ -18,6 +19,17 @@ const View = (props) => {
18
19
  useEffect(() => {
19
20
  if (__SERVER__) return;
20
21
  setVectorSource(new source.Vector());
22
+ setTileWMSSources([
23
+ new source.TileWMS({
24
+ url: 'https://gisco-services.ec.europa.eu/maps/service',
25
+ params: {
26
+ LAYERS: 'OSMPositronComposite',
27
+ TILED: true,
28
+ },
29
+ serverType: 'geoserver',
30
+ transition: 0,
31
+ }),
32
+ ]);
21
33
  /* eslint-disable-next-line */
22
34
  }, []);
23
35
 
@@ -55,10 +67,11 @@ const View = (props) => {
55
67
  showFullExtent: true,
56
68
  zoom: 5,
57
69
  }}
70
+ pixelRatio={1}
58
71
  {...options}
59
72
  >
60
73
  <Layers>
61
- <Layer.Tile zIndex={0} />
74
+ <Layer.Tile source={tileWMSSources[0]} zIndex={0} />
62
75
  <Layer.Vector
63
76
  source={vectorSource}
64
77
  style={
package/src/components/manage/Blocks/HabitatProtectedSites/View.jsx CHANGED
@@ -11,6 +11,7 @@ import './style.less';
11
11
  const View = (props) => {
12
12
  const [options, setOptions] = React.useState({});
13
13
  const [vectorSource, setVectorSource] = useState(null);
14
+ const [tileWMSSources, setTileWMSSources] = useState([]);
14
15
  const { extent, format, proj, style, source } = openlayers;
15
16
  const provider_data = props.provider_data || {};
16
17
  const { code_2000 = [] } = provider_data;
@@ -18,6 +19,17 @@ const View = (props) => {
18
19
  useEffect(() => {
19
20
  if (__SERVER__) return;
20
21
  setVectorSource(new source.Vector());
22
+ setTileWMSSources([
23
+ new source.TileWMS({
24
+ url: 'https://gisco-services.ec.europa.eu/maps/service',
25
+ params: {
26
+ LAYERS: 'OSMPositronComposite',
27
+ TILED: true,
28
+ },
29
+ serverType: 'geoserver',
30
+ transition: 0,
31
+ }),
32
+ ]);
21
33
  /* eslint-disable-next-line */
22
34
  }, []);
23
35
 
@@ -55,10 +67,11 @@ const View = (props) => {
55
67
  showFullExtent: true,
56
68
  zoom: 5,
57
69
  }}
70
+ pixelRatio={1}
58
71
  {...options}
59
72
  >
60
73
  <Layers>
61
- <Layer.Tile zIndex={0} />
74
+ <Layer.Tile source={tileWMSSources[0]} zIndex={0} />
62
75
  <Layer.VectorImage
63
76
  source={vectorSource}
64
77
  style={
package/src/components/manage/Blocks/Landing/DefalutView.jsx CHANGED
@@ -4,7 +4,6 @@ import { generatePath } from 'react-router';
4
4
  import { Grid } from 'semantic-ui-react';
5
5
  import { UniversalLink } from '@plone/volto/components';
6
6
  import { withLocalStorage } from '@eeacms/volto-n2k/hocs';
7
- import LanguageSelector from '@eeacms/volto-n2k/components/theme/LanguageSelector/LanguageSelector';
8
7
  import hiker from './images/hiker.webp';
9
8
  import { tiles, tileProps, getStyle } from './index';
10
9
 
@@ -19,21 +18,6 @@ const DefaultView = (props) => {
19
18
  >
20
19
  <Grid className="landing-page" container columns="12">
21
20
  <Grid.Row>
22
- <Grid.Column
23
- {...{
24
- mobile: 12,
25
- tablet: 12,
26
- computer: 12,
27
- largeScreen: 12,
28
- widescreen: 12,
29
- }}
30
- style={{ zIndex: 1, marginBottom: '1rem' }}
31
- >
32
- <LanguageSelector
33
- navigation={props.navigation}
34
- className="landingpage-variation"
35
- />
36
- </Grid.Column>
37
21
  <Grid.Column
38
22
  className="landing-page-description"
39
23
  widescreen="6"
package/src/components/manage/Blocks/Landing/Edit.jsx CHANGED
@@ -9,7 +9,6 @@ import { SidebarPortal, UniversalLink } from '@plone/volto/components';
9
9
  import InlineForm from '@plone/volto/components/manage/Form/InlineForm';
10
10
  import config from '@plone/volto/registry';
11
11
  import settingsSVG from '@plone/volto/icons/settings.svg';
12
- import LanguageSelector from '@eeacms/volto-n2k/components/theme/LanguageSelector/LanguageSelector';
13
12
  import DefaultView from './DefalutView';
14
13
  import getSchema from './schema';
15
14
  import hiker from './images/hiker.webp';
@@ -100,21 +99,6 @@ const Edit = (props) => {
100
99
  >
101
100
  <Grid className="landing-page" container columns="12">
102
101
  <Grid.Row>
103
- <Grid.Column
104
- {...{
105
- mobile: 12,
106
- tablet: 12,
107
- computer: 12,
108
- largeScreen: 12,
109
- widescreen: 12,
110
- }}
111
- style={{ zIndex: 1, marginBottom: '1rem' }}
112
- >
113
- <LanguageSelector
114
- navigation={props.navigation}
115
- className="landingpage-variation"
116
- />
117
- </Grid.Column>
118
102
  <Grid.Column
119
103
  className="landing-page-description"
120
104
  widescreen="6"
package/src/components/manage/Blocks/SiteShape/View.jsx CHANGED
@@ -11,6 +11,7 @@ import './style.less';
11
11
  const View = (props) => {
12
12
  const [options, setOptions] = React.useState({});
13
13
  const [vectorSource, setVectorSource] = useState(null);
14
+ const [tileWMSSources, setTileWMSSources] = useState([]);
14
15
  const { extent, format, proj, style, source } = openlayers;
15
16
  const provider_data = props.provider_data || {};
16
17
  const { site_code = [] } = provider_data;
@@ -18,6 +19,17 @@ const View = (props) => {
18
19
  useEffect(() => {
19
20
  if (__SERVER__) return;
20
21
  setVectorSource(new source.Vector());
22
+ setTileWMSSources([
23
+ new source.TileWMS({
24
+ url: 'https://gisco-services.ec.europa.eu/maps/service',
25
+ params: {
26
+ LAYERS: 'OSMPositronComposite',
27
+ TILED: true,
28
+ },
29
+ serverType: 'geoserver',
30
+ transition: 0,
31
+ }),
32
+ ]);
21
33
  /* eslint-disable-next-line */
22
34
  }, []);
23
35
 
@@ -55,10 +67,11 @@ const View = (props) => {
55
67
  showFullExtent: true,
56
68
  zoom: 5,
57
69
  }}
70
+ pixelRatio={1}
58
71
  {...options}
59
72
  >
60
73
  <Layers>
61
- <Layer.Tile zIndex={0} />
74
+ <Layer.Tile source={tileWMSSources[0]} zIndex={0} />
62
75
  <Layer.Vector
63
76
  source={vectorSource}
64
77
  style={
package/src/components/manage/Blocks/SpeciesDistribution/View.jsx CHANGED
@@ -11,6 +11,7 @@ import './style.less';
11
11
  const View = (props) => {
12
12
  const [options, setOptions] = React.useState({});
13
13
  const [vectorSource, setVectorSource] = useState(null);
14
+ const [tileWMSSources, setTileWMSSources] = useState([]);
14
15
  const { extent, format, proj, style, source } = openlayers;
15
16
  const provider_data = props.provider_data || {};
16
17
  const { code_2000 = [] } = provider_data;
@@ -18,6 +19,17 @@ const View = (props) => {
18
19
  useEffect(() => {
19
20
  if (__SERVER__) return;
20
21
  setVectorSource(new source.Vector());
22
+ setTileWMSSources([
23
+ new source.TileWMS({
24
+ url: 'https://gisco-services.ec.europa.eu/maps/service',
25
+ params: {
26
+ LAYERS: 'OSMPositronComposite',
27
+ TILED: true,
28
+ },
29
+ serverType: 'geoserver',
30
+ transition: 0,
31
+ }),
32
+ ]);
21
33
  /* eslint-disable-next-line */
22
34
  }, []);
23
35
 
@@ -55,10 +67,11 @@ const View = (props) => {
55
67
  showFullExtent: true,
56
68
  zoom: 5,
57
69
  }}
70
+ pixelRatio={1}
58
71
  {...options}
59
72
  >
60
73
  <Layers>
61
- <Layer.Tile zIndex={0} />
74
+ <Layer.Tile source={tileWMSSources[0]} zIndex={0} />
62
75
  <Layer.Vector
63
76
  source={vectorSource}
64
77
  style={
package/src/components/manage/Blocks/SpeciesProtectedSites/View.jsx CHANGED
@@ -11,6 +11,7 @@ import './style.less';
11
11
  const View = (props) => {
12
12
  const [options, setOptions] = React.useState({});
13
13
  const [vectorSource, setVectorSource] = useState(null);
14
+ const [tileWMSSources, setTileWMSSources] = useState([]);
14
15
  const { extent, format, proj, style, source } = openlayers;
15
16
  const provider_data = props.provider_data || {};
16
17
  const { code_2000 = [] } = provider_data;
@@ -18,6 +19,17 @@ const View = (props) => {
18
19
  useEffect(() => {
19
20
  if (__SERVER__) return;
20
21
  setVectorSource(new source.Vector());
22
+ setTileWMSSources([
23
+ new source.TileWMS({
24
+ url: 'https://gisco-services.ec.europa.eu/maps/service',
25
+ params: {
26
+ LAYERS: 'OSMPositronComposite',
27
+ TILED: true,
28
+ },
29
+ serverType: 'geoserver',
30
+ transition: 0,
31
+ }),
32
+ ]);
21
33
  /* eslint-disable-next-line */
22
34
  }, []);
23
35
 
@@ -55,10 +67,11 @@ const View = (props) => {
55
67
  showFullExtent: true,
56
68
  zoom: 5,
57
69
  }}
70
+ pixelRatio={1}
58
71
  {...options}
59
72
  >
60
73
  <Layers>
61
- <Layer.Tile zIndex={0} />
74
+ <Layer.Tile source={tileWMSSources[0]} zIndex={0} />
62
75
  <Layer.VectorImage
63
76
  source={vectorSource}
64
77
  style={
package/src/components/theme/Header/Header.jsx CHANGED
@@ -82,13 +82,15 @@ const Header = (props) => {
82
82
  }, []);
83
83
 
84
84
  return isRoot || isExplorer ? (
85
- <div className="ui basic segment sticky-header-wrapper" role="banner">
86
- <Navbar
87
- {...props}
88
- isSticky={false}
89
- isRoot={isRoot}
90
- isExplorer={isExplorer}
91
- />
85
+ <div className="ui basic segment sticky-header-wrapper">
86
+ <div className="ui sticky">
87
+ <Navbar
88
+ {...props}
89
+ isSticky={false}
90
+ isRoot={isRoot}
91
+ isExplorer={isExplorer}
92
+ />
93
+ </div>
92
94
  </div>
93
95
  ) : (
94
96
  <Sticky
package/src/components/theme/LanguageSelector/LanguageSelector.jsx CHANGED
@@ -60,47 +60,6 @@ const LanguageSelector = (props) => {
60
60
 
61
61
  return (
62
62
  <div className={cx('language-selector', props.className)}>
63
- {/* <Header.TopDropdownMenu
64
- id="language-switcher"
65
- className="item"
66
- text={`${language.toUpperCase()}`}
67
- mobileText={`${language.toUpperCase()}`}
68
- icon={
69
- <Image src={globeIcon} alt="language dropdown globe icon"></Image>
70
- }
71
- viewportWidth={width}
72
- >
73
- <ul
74
- className="wrapper language-list"
75
- role="listbox"
76
- aria-label="language switcher"
77
- >
78
- {eea.languages.map((item, index) => (
79
- <Dropdown.Item
80
- as="li"
81
- key={index}
82
- text={
83
- <span>
84
- {item.name}
85
- <span className="country-code">
86
- {item.code.toUpperCase()}
87
- </span>
88
- </span>
89
- }
90
- onClick={() => {
91
- const translation = find(translations, {
92
- language: item.code,
93
- });
94
- const to = translation
95
- ? flattenToAppURL(translation['@id'])
96
- : `/${item.code}`;
97
- setLanguage(item.code);
98
- history.push(to);
99
- }}
100
- ></Dropdown.Item>
101
- ))}
102
- </ul>
103
- </Header.TopDropdownMenu> */}
104
63
  <Dropdown
105
64
  aria-label="Language selector"
106
65
  disabled={content.get.loading}
@@ -111,7 +70,8 @@ const LanguageSelector = (props) => {
111
70
  <Image src={globeIcon} alt="language dropdown globe icon"></Image>
112
71
  }
113
72
  options={supportedLanguagesOptions}
114
- onChange={(e, data) => {
73
+ value={currentLang}
74
+ onChange={(_, data) => {
115
75
  const lang = data.value;
116
76
  const translation = translations.filter(
117
77
  (item) => item.lang === lang,
package/src/components/theme/Navigation/Navigation.jsx CHANGED
@@ -110,7 +110,6 @@ class Navigation extends Component {
110
110
  this.state = {
111
111
  isMobileMenuOpen: false,
112
112
  isSdf: false,
113
- language: this.props.localStorage.get('N2K_LANGUAGE'),
114
113
  };
115
114
  this.container = React.createRef();
116
115
  }
@@ -241,6 +240,8 @@ class Navigation extends Component {
241
240
  ...(this.props.route_parameters || {}),
242
241
  ...qs.parse(this.props.location.search.replace('?', '')),
243
242
  };
243
+ const currentLang = this.props.localStorage.get('N2K_LANGUAGE');
244
+
244
245
  return (
245
246
  <nav
246
247
  className={cx('navigation', this.props.className || '')}
@@ -275,7 +276,7 @@ class Navigation extends Component {
275
276
  />
276
277
  </div>
277
278
  <Menu.Item className="home-button logo">
278
- <Link title="Natura 2000" to={`/natura2000/${this.state.language}`}>
279
+ <Link title="Natura 2000" to={`/natura2000/${currentLang}`}>
279
280
  <Icon name={n2kLogo} size={44} />
280
281
  </Link>
281
282
  </Menu.Item>