@eeacms/volto-eea-map 0.1.19 → 0.1.22

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 CHANGED
@@ -4,6 +4,19 @@ 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
+ ### [0.1.22](https://github.com/eea/volto-eea-map/compare/0.1.21...0.1.22) - 13 September 2022
8
+
9
+ #### :hammer_and_wrench: Others
10
+
11
+ - fine-tune useeffect [andreiggr - [`d7d9d7b`](https://github.com/eea/volto-eea-map/commit/d7d9d7b8dbf510dead8b1acc85bc29c64d0449d2)]
12
+ - update documentation [andreiggr - [`0af2227`](https://github.com/eea/volto-eea-map/commit/0af22279f89b73107df7804e81a3a30b8f13a730)]
13
+ ### [0.1.21](https://github.com/eea/volto-eea-map/compare/0.1.20...0.1.21) - 13 September 2022
14
+
15
+ ### [0.1.20](https://github.com/eea/volto-eea-map/compare/0.1.19...0.1.20) - 31 August 2022
16
+
17
+ #### :hammer_and_wrench: Others
18
+
19
+ - Api link end of row [andreiggr - [`7eb826f`](https://github.com/eea/volto-eea-map/commit/7eb826fcc902b94fe6961b6568597d38e2217b21)]
7
20
  ### [0.1.19](https://github.com/eea/volto-eea-map/compare/0.1.18...0.1.19) - 31 August 2022
8
21
 
9
22
  #### :hammer_and_wrench: Others
package/README.md CHANGED
@@ -1,103 +1,87 @@
1
1
  # volto-addon-template
2
2
 
3
- [![Releases](https://img.shields.io/github/v/release/eea/volto-addon-template)](https://github.com/eea/volto-addon-template/releases)
3
+ [![Releases](https://img.shields.io/github/v/release/eea/volto-eea-map)](https://github.com/eea/volto-eea-map/releases)
4
4
 
5
- [![Pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto-addons%2Fvolto-addon-template%2Fmaster&subject=master)](https://ci.eionet.europa.eu/view/Github/job/volto-addons/job/volto-addon-template/job/master/display/redirect)
6
- [![Lines of Code](https://sonarqube.eea.europa.eu/api/project_badges/measure?project=volto-addon-template-master&metric=ncloc)](https://sonarqube.eea.europa.eu/dashboard?id=volto-addon-template-master)
7
- [![Coverage](https://sonarqube.eea.europa.eu/api/project_badges/measure?project=volto-addon-template-master&metric=coverage)](https://sonarqube.eea.europa.eu/dashboard?id=volto-addon-template-master)
8
- [![Bugs](https://sonarqube.eea.europa.eu/api/project_badges/measure?project=volto-addon-template-master&metric=bugs)](https://sonarqube.eea.europa.eu/dashboard?id=volto-addon-template-master)
9
- [![Duplicated Lines (%)](https://sonarqube.eea.europa.eu/api/project_badges/measure?project=volto-addon-template-master&metric=duplicated_lines_density)](https://sonarqube.eea.europa.eu/dashboard?id=volto-addon-template-master)
5
+ [![Pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto-addons%2Fvolto-eea-map%2Fmaster&subject=master)](https://ci.eionet.europa.eu/view/Github/job/volto-addons/job/volto-eea-map/job/master/display/redirect)
6
+ [![Lines of Code](https://sonarqube.eea.europa.eu/api/project_badges/measure?project=volto-eea-map-master&metric=ncloc)](https://sonarqube.eea.europa.eu/dashboard?id=volto-eea-map-master)
7
+ [![Coverage](https://sonarqube.eea.europa.eu/api/project_badges/measure?project=volto-eea-map-master&metric=coverage)](https://sonarqube.eea.europa.eu/dashboard?id=volto-eea-map-master)
8
+ [![Bugs](https://sonarqube.eea.europa.eu/api/project_badges/measure?project=volto-eea-map-master&metric=bugs)](https://sonarqube.eea.europa.eu/dashboard?id=volto-eea-map-master)
9
+ [![Duplicated Lines (%)](https://sonarqube.eea.europa.eu/api/project_badges/measure?project=volto-eea-map-master&metric=duplicated_lines_density)](https://sonarqube.eea.europa.eu/dashboard?id=volto-eea-map-master)
10
10
 
11
- [![Pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto-addons%2Fvolto-addon-template%2Fdevelop&subject=develop)](https://ci.eionet.europa.eu/view/Github/job/volto-addons/job/volto-addon-template/job/develop/display/redirect)
12
- [![Lines of Code](https://sonarqube.eea.europa.eu/api/project_badges/measure?project=volto-addon-template-develop&metric=ncloc)](https://sonarqube.eea.europa.eu/dashboard?id=volto-addon-template-develop)
13
- [![Coverage](https://sonarqube.eea.europa.eu/api/project_badges/measure?project=volto-addon-template-develop&metric=coverage)](https://sonarqube.eea.europa.eu/dashboard?id=volto-addon-template-develop)
14
- [![Bugs](https://sonarqube.eea.europa.eu/api/project_badges/measure?project=volto-addon-template-develop&metric=bugs)](https://sonarqube.eea.europa.eu/dashboard?id=volto-addon-template-develop)
15
- [![Duplicated Lines (%)](https://sonarqube.eea.europa.eu/api/project_badges/measure?project=volto-addon-template-develop&metric=duplicated_lines_density)](https://sonarqube.eea.europa.eu/dashboard?id=volto-addon-template-develop)
11
+ [![Pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto-addons%2Fvolto-eea-map%2Fdevelop&subject=develop)](https://ci.eionet.europa.eu/view/Github/job/volto-addons/job/volto-eea-map/job/develop/display/redirect)
12
+ [![Lines of Code](https://sonarqube.eea.europa.eu/api/project_badges/measure?project=volto-eea-map-develop&metric=ncloc)](https://sonarqube.eea.europa.eu/dashboard?id=volto-eea-map-develop)
13
+ [![Coverage](https://sonarqube.eea.europa.eu/api/project_badges/measure?project=volto-eea-map-develop&metric=coverage)](https://sonarqube.eea.europa.eu/dashboard?id=volto-eea-map-develop)
14
+ [![Bugs](https://sonarqube.eea.europa.eu/api/project_badges/measure?project=volto-eea-map-develop&metric=bugs)](https://sonarqube.eea.europa.eu/dashboard?id=volto-eea-map-develop)
15
+ [![Duplicated Lines (%)](https://sonarqube.eea.europa.eu/api/project_badges/measure?project=volto-eea-map-develop&metric=duplicated_lines_density)](https://sonarqube.eea.europa.eu/dashboard?id=volto-eea-map-develop)
16
16
 
17
17
 
18
18
  [Volto](https://github.com/plone/volto) add-on
19
19
 
20
- ## Features
20
+ # volto-eea-map
21
21
 
22
- Demo GIF
22
+ Before starting make sure your development environment is properly set. See [Volto Developer Documentation](https://docs.voltocms.com/getting-started/install/)
23
23
 
24
- ## Getting started
24
+ 1. Make sure you have installed `yo`, `@plone/generator-volto` and `mrs-developer`
25
25
 
26
- ### Try volto-addon-template with Docker
26
+ npm install -g yo @plone/generator-volto mrs-developer
27
27
 
28
- 1. Get the latest Docker images
28
+ 1. Create new volto app
29
29
 
30
- ```
31
- docker pull plone
32
- docker pull plone/volto
33
- ```
30
+ yo @plone/volto my-volto-project --addon @eeacms/volto-eea-map --skip-install
31
+ cd my-volto-project
34
32
 
35
- 1. Start Plone backend
36
- ```
37
- docker run -d --name plone -p 8080:8080 -e SITE=Plone -e PROFILES="profile-plone.restapi:blocks" plone
38
- ```
33
+ 1. Add the following to `mrs.developer.json`:
39
34
 
40
- 1. Start Volto frontend
35
+ {
36
+ "volto-eea-map": {
37
+ "url": "https://github.com/eea/volto-eea-map.git",
38
+ "package": "@eeacms/volto-eea-map",
39
+ "branch": "develop",
40
+ "path": "src"
41
+ }
42
+ }
41
43
 
42
- ```
43
- docker run -it --rm -p 3000:3000 --link plone -e ADDONS="@eeacms/volto-addon-template" plone/volto
44
- ```
44
+ 1. Install
45
45
 
46
- 1. Go to http://localhost:3000
46
+ yarn develop
47
+ yarn
47
48
 
48
- ### Add volto-addon-template to your Volto project
49
+ 1. Start backend
49
50
 
50
- 1. Make sure you have a [Plone backend](https://plone.org/download) up-and-running at http://localhost:8080/Plone
51
+ docker pull plone
52
+ docker run -d --name plone -p 8080:8080 -e SITE=Plone -e PROFILES="profile-plone.restapi:blocks" plone
51
53
 
52
- 1. Start Volto frontend
54
+ ...wait for backend to setup and start - `Ready to handle requests`:
53
55
 
54
- * If you already have a volto project, just update `package.json`:
56
+ docker logs -f plone
55
57
 
56
- ```JSON
57
- "addons": [
58
- "@eeacms/volto-addon-template"
59
- ],
58
+ ...you can also check http://localhost:8080/Plone
60
59
 
61
- "dependencies": {
62
- "@eeacms/volto-addon-template": "^1.0.0"
63
- }
64
- ```
60
+ 1. Start frontend
65
61
 
66
- * If not, create one:
62
+ yarn start
67
63
 
68
- ```
69
- npm install -g yo @plone/generator-volto
70
- yo @plone/volto my-volto-project --addon @eeacms/volto-addon-template
71
- cd my-volto-project
72
- ```
64
+ 1. Go to http://localhost:3000
73
65
 
74
- 1. Install new add-ons and restart Volto:
66
+ 1. Happy hacking!
75
67
 
76
- ```
77
- yarn
78
- yarn start
79
- ```
68
+ cd src/addons/volto-eea-map/
80
69
 
81
- 1. Go to http://localhost:3000
70
+ # Configuration
82
71
 
83
- 1. Happy editing!
72
+ This addon contains the EEA Embed Map Block & EEA Map Block. It's configured to work with the map visualization content type and give more access to ArcGIS maps. See available maps here https://discomap.eea.europa.eu/
84
73
 
85
- ## Release
74
+ # Enable data queries auto-import
86
75
 
87
- See [RELEASE.md](https://github.com/eea/volto-addon-template/blob/master/RELEASE.md).
76
+ To enable automatic import of queries from the content-type, "Parameters for data connections" should be checked as behavior on the content-type that uses the map.
88
77
 
89
- ## How to contribute
78
+ controlpanel/dexterity-types/{content-type-id}
79
+ # Enable Sources
90
80
 
91
- See [DEVELOP.md](https://github.com/eea/volto-addon-template/blob/master/DEVELOP.md).
81
+ Sources (Data provenance) should be set on the visualization. To enable this, "EEA Core Metadata" should be checked as behavior on the visualization content-type.
92
82
 
93
- ## Copyright and license
83
+ controlpanel/dexterity-types/map_visualization
84
+
85
+ After this, sources can be added from the visualization edit interface. "Data Provenance" tab => "Add source"
94
86
 
95
- The Initial Owner of the Original Code is European Environment Agency (EEA).
96
- All Rights Reserved.
97
-
98
- See [LICENSE.md](https://github.com/eea/volto-addon-template/blob/master/LICENSE.md) for details.
99
-
100
- ## Funding
101
-
102
- [European Environment Agency (EU)](http://eea.europa.eu)
103
87
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@eeacms/volto-eea-map",
3
- "version": "0.1.19",
3
+ "version": "0.1.22",
4
4
  "description": "@eeacms/volto-eea-map: Volto add-on",
5
5
  "main": "src/index.js",
6
6
  "author": "European Environment Agency: IDM2 A-Team",
@@ -34,8 +34,7 @@ const Edit = (props) => {
34
34
  });
35
35
  }
36
36
  // eslint-disable-next-line react-hooks/exhaustive-deps
37
- }, [props.data_query, block, data]);
38
-
37
+ }, [props.block, props.data_query, data.data_query_params]);
39
38
  return (
40
39
  <div>
41
40
  <View data={data} id={id} isEdit={true} />
@@ -1,9 +1,48 @@
1
1
  import React from 'react';
2
- import { UniversalLink } from '@plone/volto/components';
2
+ import { UniversalLink, Icon } from '@plone/volto/components';
3
3
 
4
4
  import LegendWidget from './widgets/LegendWidget';
5
5
  import { serializeNodes } from 'volto-slate/editor/render';
6
6
 
7
+ import rightKeySVG from '@plone/volto/icons/right-key.svg';
8
+ import downKeySVG from '@plone/volto/icons/down-key.svg';
9
+
10
+ const SourcesWidget = ({ data }) => {
11
+ const [expand, setExpand] = React.useState(true);
12
+
13
+ return (
14
+ <div>
15
+ <button className="legend-action" onClick={() => setExpand(!expand)}>
16
+ <h3>
17
+ <Icon
18
+ name={expand ? downKeySVG : rightKeySVG}
19
+ title={expand ? 'Collapse' : 'Expand'}
20
+ size="17px"
21
+ />
22
+ Sources:
23
+ </h3>
24
+ </button>
25
+ {expand && (
26
+ <ul>
27
+ {data.map((param, i) => (
28
+ <li key={i}>
29
+ <div className="map_source_param_container">
30
+ <UniversalLink className="map_source_title" href={param.link}>
31
+ {param.title}
32
+ </UniversalLink>
33
+ ,
34
+ <span className="map_source_description">
35
+ {param.organisation}
36
+ </span>
37
+ </div>
38
+ </li>
39
+ ))}
40
+ </ul>
41
+ )}
42
+ </div>
43
+ );
44
+ };
45
+
7
46
  const ExtraViews = ({ data }) => {
8
47
  const {
9
48
  map_data = {},
@@ -23,27 +62,7 @@ const ExtraViews = ({ data }) => {
23
62
  {data_provenance &&
24
63
  data_provenance.data &&
25
64
  data_provenance.data.length > 0 ? (
26
- <div>
27
- <h3>Sources:</h3>
28
- <ul>
29
- {data_provenance.data.map((param, i) => (
30
- <li key={i}>
31
- <div className="map_source_param_container">
32
- <UniversalLink
33
- className="map_source_title"
34
- href={param.link}
35
- >
36
- {param.title}
37
- </UniversalLink>
38
- ,
39
- <span className="map_source_description">
40
- {param.organisation}
41
- </span>
42
- </div>
43
- </li>
44
- ))}
45
- </ul>
46
- </div>
65
+ <SourcesWidget data={data_provenance.data} />
47
66
  ) : (
48
67
  <p>Data provenance is not set for visualization used or page</p>
49
68
  )}
@@ -33,7 +33,13 @@ const LayerLegend = ({ data, show_viewer }) => {
33
33
 
34
34
  return (
35
35
  <Grid.Column>
36
- <div style={{ display: 'flex', alignItems: 'center' }}>
36
+ <div
37
+ style={{
38
+ display: 'flex',
39
+ alignItems: 'center',
40
+ justifyContent: 'space-between',
41
+ }}
42
+ >
37
43
  <h5
38
44
  style={{
39
45
  marginTop: '15px',