@eeacms/volto-eea-map 6.0.0 → 6.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.
- package/.eslintrc.js +6 -6
- package/CHANGELOG.md +28 -1
- package/package.json +1 -1
- package/src/Arcgis/Editor/Editor.jsx +2 -2
- package/src/Arcgis/Editor/Fold/Fold.jsx +1 -1
- package/src/Arcgis/Editor/Panels/SettingsGeneralPanel.jsx +3 -3
- package/src/Arcgis/Editor/Panels/SettingsLayersPanel.jsx +4 -3
- package/src/Arcgis/Editor/Panels/StructureBaseLayerPanel.jsx +2 -2
- package/src/Arcgis/Editor/Panels/StructureLayersPanel.jsx +5 -3
- package/src/Arcgis/Editor/Panels/StructureWidgetsPanel.jsx +5 -4
- package/src/Arcgis/Editor/SidebarGroup.jsx +1 -1
- package/src/Arcgis/Layer/Layer.jsx +3 -1
- package/src/Arcgis/Map/Map.jsx +2 -1
- package/src/Arcgis/Map/MapBuilder.jsx +7 -3
- package/src/Arcgis/Widget/Widget.jsx +1 -1
- package/src/Arcgis/helpers.js +1 -1
- package/src/Blocks/EmbedEEAMap/Edit.jsx +2 -2
- package/src/Blocks/EmbedEEAMap/View.jsx +2 -2
- package/src/Toolbar/FigureNote.jsx +1 -1
- package/src/Toolbar/MoreInfoLink.jsx +1 -1
- package/src/Toolbar/Sources.jsx +1 -1
- package/src/Views/VisualizationView.jsx +2 -2
- package/src/Widgets/ArcgisColorPickerWidget.jsx +2 -1
- package/src/Widgets/ArcgisRendererWidget/ArcgisRendererWidget.jsx +2 -1
- package/src/Widgets/ArcgisRendererWidget/RendererEditor/Simple.jsx +3 -4
- package/src/Widgets/ArcgisRendererWidget/RendererEditor/_EditorModal.jsx +1 -1
- package/src/Widgets/ArcgisSliderWidget.jsx +1 -1
- package/src/Widgets/ArcgisViewpointWidget.jsx +3 -2
- package/src/Widgets/VisualizationViewWidget.jsx +1 -1
- package/src/Widgets/VisualizationWidget.jsx +5 -3
- package/src/constants.js +1 -1
- package/src/hooks/useChangedProps.jsx +2 -1
- package/src/index.js +1 -1
- package/src/{jsoneditor.js → jsoneditor.jsx} +2 -2
package/.eslintrc.js
CHANGED
|
@@ -16,16 +16,16 @@ if (configFile) {
|
|
|
16
16
|
voltoPath = `./${jsConfig.baseUrl}/${pathsConfig['@plone/volto'][0]}`;
|
|
17
17
|
}
|
|
18
18
|
|
|
19
|
-
const
|
|
20
|
-
const
|
|
19
|
+
const { AddonRegistry } = require('@plone/registry/addon-registry');
|
|
20
|
+
const { registry } = AddonRegistry.init(projectRootPath);
|
|
21
21
|
|
|
22
22
|
// Extends ESlint configuration for adding the aliases to `src` directories in Volto addons
|
|
23
|
-
const addonAliases = Object.keys(
|
|
23
|
+
const addonAliases = Object.keys(registry.packages).map((o) => [
|
|
24
24
|
o,
|
|
25
|
-
|
|
25
|
+
registry.packages[o].modulePath,
|
|
26
26
|
]);
|
|
27
27
|
|
|
28
|
-
const addonExtenders =
|
|
28
|
+
const addonExtenders = registry.getEslintExtenders().map((m) => require(m));
|
|
29
29
|
|
|
30
30
|
const defaultConfig = {
|
|
31
31
|
extends: `${voltoPath}/.eslintrc`,
|
|
@@ -34,7 +34,7 @@ const defaultConfig = {
|
|
|
34
34
|
alias: {
|
|
35
35
|
map: [
|
|
36
36
|
['@plone/volto', '@plone/volto/src'],
|
|
37
|
-
['@plone/volto-slate', '@plone/volto
|
|
37
|
+
['@plone/volto-slate', '@plone/volto-slate/src'],
|
|
38
38
|
...addonAliases,
|
|
39
39
|
['@package', `${__dirname}/src`],
|
|
40
40
|
['@root', `${__dirname}/src`],
|
package/CHANGELOG.md
CHANGED
|
@@ -4,7 +4,13 @@ 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
|
-
### [6.0.
|
|
7
|
+
### [6.0.1](https://github.com/eea/volto-eea-map/compare/6.0.0...6.0.1) - 8 April 2026
|
|
8
|
+
|
|
9
|
+
#### :bug: Bug Fixes
|
|
10
|
+
|
|
11
|
+
- fix: make test [Alin V. (Claudiu) - [`cdd10aa`](https://github.com/eea/volto-eea-map/commit/cdd10aa38e58f4c38643ed99b7a603685d3b2074)]
|
|
12
|
+
|
|
13
|
+
## [6.0.0](https://github.com/eea/volto-eea-map/compare/5.0.8...6.0.0) - 25 March 2026
|
|
8
14
|
|
|
9
15
|
#### :rocket: New Features
|
|
10
16
|
|
|
@@ -12,6 +18,8 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
|
12
18
|
|
|
13
19
|
#### :house: Internal changes
|
|
14
20
|
|
|
21
|
+
- chore: [JENKINSFILE] add package version in sonarqube [valentinab25 - [`488ddb3`](https://github.com/eea/volto-eea-map/commit/488ddb3bf14ba7564a7619fdebd086f4d3f6b70f)]
|
|
22
|
+
- chore: [JENKINSFILE] use sonarqube branches [EEA Jenkins - [`0d503ea`](https://github.com/eea/volto-eea-map/commit/0d503ea78bbb5ed77c0d7cfa0e0247a77953e822)]
|
|
15
23
|
|
|
16
24
|
#### :hammer_and_wrench: Others
|
|
17
25
|
|
|
@@ -93,6 +101,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
|
93
101
|
- fix zoom to layer extent [Miu Razvan - [`28bc084`](https://github.com/eea/volto-eea-map/commit/28bc08456fbaa66938e8d0bf5f25ceaff753fae3)]
|
|
94
102
|
- finalize eea-map refactoring [Miu Razvan - [`3c6abf9`](https://github.com/eea/volto-eea-map/commit/3c6abf998e3fdca55b1e81a0553749ee90bfbcd6)]
|
|
95
103
|
- update [Miu Razvan - [`65205bc`](https://github.com/eea/volto-eea-map/commit/65205bc494f1d3c1b381ed6f9af01ed022e87c75)]
|
|
104
|
+
- Add Sonarqube tag using insitu-frontend addons list [EEA Jenkins - [`3530cbe`](https://github.com/eea/volto-eea-map/commit/3530cbef76a7ccb3eb372ea725cd4f5d08981e7b)]
|
|
96
105
|
- Update [Miu Razvan - [`13468a3`](https://github.com/eea/volto-eea-map/commit/13468a3c6738e612115535813e64b0a6af4c97d7)]
|
|
97
106
|
- wip [Miu Razvan - [`901fcc3`](https://github.com/eea/volto-eea-map/commit/901fcc318c618c0307a64081002ab4a048be70a7)]
|
|
98
107
|
- Update [Miu Razvan - [`d70dcf2`](https://github.com/eea/volto-eea-map/commit/d70dcf293b1395741ccbc524fa19145c829f72a9)]
|
|
@@ -104,6 +113,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
|
104
113
|
#### :hammer_and_wrench: Others
|
|
105
114
|
|
|
106
115
|
- Update package.json [ichim-david - [`52e141a`](https://github.com/eea/volto-eea-map/commit/52e141a3fab57904c4acb5e7e412c079f78fb0e0)]
|
|
116
|
+
- Add Sonarqube tag using marine-frontend addons list [EEA Jenkins - [`2a83a1e`](https://github.com/eea/volto-eea-map/commit/2a83a1eb9baa3a05a2a36f4cac2de75c148facca)]
|
|
107
117
|
- bump cypress version to 13.1.0 which is what is used by volto 17 [David Ichim - [`01abef9`](https://github.com/eea/volto-eea-map/commit/01abef9089385ee0b672e09aa37c1bf89d9f21b6)]
|
|
108
118
|
## [4.0.0](https://github.com/eea/volto-eea-map/compare/3.3.1...4.0.0) - 22 April 2024
|
|
109
119
|
|
|
@@ -114,6 +124,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
|
114
124
|
|
|
115
125
|
#### :hammer_and_wrench: Others
|
|
116
126
|
|
|
127
|
+
- Add Sonarqube tag using freshwater-frontend addons list [EEA Jenkins - [`17d6cf3`](https://github.com/eea/volto-eea-map/commit/17d6cf35992b8785d12c1b54270dec2e46a0f93f)]
|
|
117
128
|
### [3.3.1](https://github.com/eea/volto-eea-map/compare/3.3.0...3.3.1) - 31 January 2024
|
|
118
129
|
|
|
119
130
|
### [3.3.0](https://github.com/eea/volto-eea-map/compare/3.2.1...3.3.0) - 17 January 2024
|
|
@@ -124,6 +135,9 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
|
124
135
|
|
|
125
136
|
#### :house: Internal changes
|
|
126
137
|
|
|
138
|
+
- chore: [JENKINS] add debug [valentinab25 - [`a84b567`](https://github.com/eea/volto-eea-map/commit/a84b5670d8c3c02e8c6371404925f0d18ac1118a)]
|
|
139
|
+
- chore: [JENKINS] add debug [valentinab25 - [`25a5656`](https://github.com/eea/volto-eea-map/commit/25a5656a0e596864f6f2a07d23ca33ec595d2cd2)]
|
|
140
|
+
- chore: [JENKINS] add debug [valentinab25 - [`839b32f`](https://github.com/eea/volto-eea-map/commit/839b32f99ca4e45c0398db2fd58bd575c413b5a7)]
|
|
127
141
|
|
|
128
142
|
#### :hammer_and_wrench: Others
|
|
129
143
|
|
|
@@ -178,6 +192,8 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
|
178
192
|
- fix prettier [Dobricean Ioan Dorian - [`78fc2ba`](https://github.com/eea/volto-eea-map/commit/78fc2baa2f5264ca1bba61b70bc0bdc5b2788e67)]
|
|
179
193
|
- Fix Sonorqube [dobri1408 - [`e04011a`](https://github.com/eea/volto-eea-map/commit/e04011aa811422f865d0bbb1e66af558a4310e77)]
|
|
180
194
|
- adapt embedeeamap to use serialized data [Dobricean Ioan Dorian - [`005965c`](https://github.com/eea/volto-eea-map/commit/005965c6793a9a9977fef52c08ba9a3173eec348)]
|
|
195
|
+
- test: [JENKINS] Use java17 for sonarqube scanner [valentinab25 - [`de2f4f6`](https://github.com/eea/volto-eea-map/commit/de2f4f6f516c2c9f7c2b4ea84373f4b1a21cd0af)]
|
|
196
|
+
- test: [JENKINS] Run cypress in started frontend container [valentinab25 - [`4722984`](https://github.com/eea/volto-eea-map/commit/47229842132b406101c340ab200c193925b784ad)]
|
|
181
197
|
### [2.0.7](https://github.com/eea/volto-eea-map/compare/2.0.6...2.0.7) - 10 November 2023
|
|
182
198
|
|
|
183
199
|
#### :rocket: New Features
|
|
@@ -194,6 +210,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
|
194
210
|
|
|
195
211
|
#### :house: Internal changes
|
|
196
212
|
|
|
213
|
+
- chore: [JENKINS] Refactor automated testing [valentinab25 - [`7afd81a`](https://github.com/eea/volto-eea-map/commit/7afd81a76bf407b07a94228daf3ab0415fbe4621)]
|
|
197
214
|
- chore: husky, lint-staged use fixed versions [valentinab25 - [`0ee38a7`](https://github.com/eea/volto-eea-map/commit/0ee38a7bee84694a5e0230e2d17083fbc071f0c8)]
|
|
198
215
|
- chore:volto 16 in tests, update docs, fix stylelint overrides [valentinab25 - [`8efeb44`](https://github.com/eea/volto-eea-map/commit/8efeb4423da70e421a88cabdeb559eb3613fb96e)]
|
|
199
216
|
- chore: display legend for content type item, fix case when no note is set [dana-cfc4 - [`ae630a8`](https://github.com/eea/volto-eea-map/commit/ae630a88cffa2a8ef60e0bbfead392508b015497)]
|
|
@@ -203,7 +220,10 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
|
203
220
|
|
|
204
221
|
#### :hammer_and_wrench: Others
|
|
205
222
|
|
|
223
|
+
- test: [JENKINS] Add cpu limit on cypress docker [valentinab25 - [`335133d`](https://github.com/eea/volto-eea-map/commit/335133dc5186a53c1077bbead36100101bd9af45)]
|
|
206
224
|
- Refs #260203: make background_image required [laszlocseh - [`baa5c4f`](https://github.com/eea/volto-eea-map/commit/baa5c4fa2fe618af51df12d48b4512ecafc357a8)]
|
|
225
|
+
- test: [JENKINS] Increase shm-size to cypress docker [valentinab25 - [`4874649`](https://github.com/eea/volto-eea-map/commit/48746492a2b32a82d33d1c6415eab8a6f6b9f5be)]
|
|
226
|
+
- test: [JENKINS] Improve cypress time [valentinab25 - [`7fa0b83`](https://github.com/eea/volto-eea-map/commit/7fa0b837b24f41a01285fd1b17daeefde99a9c76)]
|
|
207
227
|
- use toolbar from volto-embed [Miu Razvan - [`29b73fb`](https://github.com/eea/volto-eea-map/commit/29b73fb8378ca56b3634bf1f7d57ce69a242b18e)]
|
|
208
228
|
### [2.0.6](https://github.com/eea/volto-eea-map/compare/2.0.5...2.0.6) - 29 September 2023
|
|
209
229
|
|
|
@@ -220,6 +240,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
|
220
240
|
|
|
221
241
|
- test: EN locales, pre-commit fix, feature PRs checks Refs #257193 [valentinab25 - [`4c6d141`](https://github.com/eea/volto-eea-map/commit/4c6d1413b67ffc3fe27a7d09dcc99ef98867cec9)]
|
|
222
242
|
- test: Fix package.json scripts to use makefile [Alin Voinea - [`1cd6751`](https://github.com/eea/volto-eea-map/commit/1cd675118165d8631c41d35c00a8c902c7edd803)]
|
|
243
|
+
- test: Fix eslint and yarn i18n [Alin Voinea - [`0184641`](https://github.com/eea/volto-eea-map/commit/018464116ba5b86b2c1e0a4ebc9b2fd95b772b66)]
|
|
223
244
|
- i18n: Add en [Alin Voinea - [`1d29304`](https://github.com/eea/volto-eea-map/commit/1d293049a21e138fa933cd5ed9a04cceac1a5cff)]
|
|
224
245
|
### [2.0.5](https://github.com/eea/volto-eea-map/compare/2.0.4...2.0.5) - 23 August 2023
|
|
225
246
|
|
|
@@ -276,11 +297,14 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
|
276
297
|
#### :hammer_and_wrench: Others
|
|
277
298
|
|
|
278
299
|
- Release 2.0.0 [Alin Voinea - [`7be280d`](https://github.com/eea/volto-eea-map/commit/7be280d4809186e663f422687aca3c33dd732904)]
|
|
300
|
+
- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`ba6ed22`](https://github.com/eea/volto-eea-map/commit/ba6ed22118406db979457384d4739cced2096137)]
|
|
279
301
|
### [1.0.2](https://github.com/eea/volto-eea-map/compare/1.0.1...1.0.2) - 21 July 2023
|
|
280
302
|
|
|
281
303
|
#### :hammer_and_wrench: Others
|
|
282
304
|
|
|
283
305
|
- Allow blocks in content type [Tiberiu Ichim - [`2ac09a6`](https://github.com/eea/volto-eea-map/commit/2ac09a613aba07f6cbaf42c386660f2d7d09bd13)]
|
|
306
|
+
- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`403b4c0`](https://github.com/eea/volto-eea-map/commit/403b4c009e5aaded58203bc292ba3baa4631488b)]
|
|
307
|
+
- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`aedb654`](https://github.com/eea/volto-eea-map/commit/aedb6544fd45b147a3385425aba46ffba108f5ca)]
|
|
284
308
|
### [1.0.1](https://github.com/eea/volto-eea-map/compare/1.0.0...1.0.1) - 22 June 2023
|
|
285
309
|
|
|
286
310
|
#### :rocket: New Features
|
|
@@ -341,6 +365,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
|
341
365
|
|
|
342
366
|
- chore: clear unused #254131 [andreiggr - [`ccec2ea`](https://github.com/eea/volto-eea-map/commit/ccec2eaab173c905cd4ea0190a9c6cfd630250f9)]
|
|
343
367
|
- chore: clear block style #254131 [andreiggr - [`af500bc`](https://github.com/eea/volto-eea-map/commit/af500bc10a5f280eff0335f45bae1596d66a7e6b)]
|
|
368
|
+
- chore: [JENKINS] Remove alpha testing version [valentinab25 - [`76b29e5`](https://github.com/eea/volto-eea-map/commit/76b29e510f5156590723831a524bc39dfba6deba)]
|
|
344
369
|
|
|
345
370
|
#### :hammer_and_wrench: Others
|
|
346
371
|
|
|
@@ -350,6 +375,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
|
350
375
|
- * versions [andreiggr - [`6d9ff2b`](https://github.com/eea/volto-eea-map/commit/6d9ff2b26a236b6445678e3d84698d1c3c0826f4)]
|
|
351
376
|
- add razzle-plugin-scss dep [andreiggr - [`d74cee5`](https://github.com/eea/volto-eea-map/commit/d74cee51d30c866afe55730e5b25e0bf11d2caea)]
|
|
352
377
|
- volto-object-widget [andreiggr - [`18d0ed7`](https://github.com/eea/volto-eea-map/commit/18d0ed72c1ba7b0f7159a0eefc09ccea9acee5cb)]
|
|
378
|
+
- Add Sonarqube tag using bise-frontend addons list [EEA Jenkins - [`5911d01`](https://github.com/eea/volto-eea-map/commit/5911d01f7f3bc79a2c834fab75a9a4ac05d2d042)]
|
|
353
379
|
### [0.1.32](https://github.com/eea/volto-eea-map/compare/0.1.31...0.1.32) - 20 February 2023
|
|
354
380
|
|
|
355
381
|
#### :hammer_and_wrench: Others
|
|
@@ -357,6 +383,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
|
357
383
|
- remove console.log [tedw87 - [`3aeb3e8`](https://github.com/eea/volto-eea-map/commit/3aeb3e8ec5474387f3cd22eb9b387c6681e17120)]
|
|
358
384
|
- refactor code [tedw87 - [`6d7830e`](https://github.com/eea/volto-eea-map/commit/6d7830eb934f56c255eea5642bdefba30d892946)]
|
|
359
385
|
- add Blossom basemap layer [tedw87 - [`5226ee2`](https://github.com/eea/volto-eea-map/commit/5226ee218df3401cf467afbc7a4d720dc30719e1)]
|
|
386
|
+
- Add Sonarqube tag using cca-frontend addons list [EEA Jenkins - [`1dad5c6`](https://github.com/eea/volto-eea-map/commit/1dad5c6617096ff85223165a6dd2b1d5d7deea6a)]
|
|
360
387
|
### [0.1.31](https://github.com/eea/volto-eea-map/compare/0.1.30...0.1.31) - 11 November 2022
|
|
361
388
|
|
|
362
389
|
#### :hammer_and_wrench: Others
|
package/package.json
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { memo, useRef, useState, useMemo } from 'react';
|
|
2
|
-
import
|
|
2
|
+
import isNil from 'lodash/isNil';
|
|
3
3
|
|
|
4
4
|
import SidebarGroup from './SidebarGroup';
|
|
5
5
|
|
|
6
|
-
import _MapBuilder from '
|
|
6
|
+
import _MapBuilder from '@eeacms/volto-eea-map/Arcgis/Map/MapBuilder';
|
|
7
7
|
|
|
8
8
|
import {
|
|
9
9
|
StructureBaseLayerPanel,
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { useState } from 'react';
|
|
2
2
|
import cx from 'classnames';
|
|
3
3
|
|
|
4
|
-
import
|
|
4
|
+
import Icon from '@plone/volto/components/theme/Icon/Icon';
|
|
5
5
|
|
|
6
6
|
import clearSVG from '@plone/volto/icons/clear.svg';
|
|
7
7
|
import upKeySVG from '@plone/volto/icons/up-key.svg';
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import
|
|
2
|
-
import
|
|
1
|
+
import InlineForm from '@plone/volto/components/manage/Form/InlineForm';
|
|
2
|
+
import toNumber from 'lodash/toNumber';
|
|
3
3
|
import Panel from './Panel';
|
|
4
|
-
import Fold from '
|
|
4
|
+
import Fold from '@eeacms/volto-eea-map/Arcgis/Editor/Fold/Fold';
|
|
5
5
|
import { getDefaultWidgets } from '@eeacms/volto-eea-map/constants';
|
|
6
6
|
|
|
7
7
|
const mapSchema = {
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { useState, useEffect, useContext, useMemo } from 'react';
|
|
2
2
|
import { Segment, Dimmer, Loader } from 'semantic-ui-react';
|
|
3
|
-
import
|
|
3
|
+
import isNil from 'lodash/isNil';
|
|
4
|
+
import toNumber from 'lodash/toNumber';
|
|
4
5
|
import { v4 as uuid } from 'uuid';
|
|
5
|
-
import
|
|
6
|
+
import InlineForm from '@plone/volto/components/manage/Form/InlineForm';
|
|
6
7
|
import {
|
|
7
8
|
debounce,
|
|
8
9
|
getLayers,
|
|
@@ -11,7 +12,7 @@ import {
|
|
|
11
12
|
import { blendModes } from '@eeacms/volto-eea-map/constants';
|
|
12
13
|
import EditorContext from '@eeacms/volto-eea-map/Arcgis/Editor/EditorContext';
|
|
13
14
|
import Panel from './Panel';
|
|
14
|
-
import Fold from '
|
|
15
|
+
import Fold from '@eeacms/volto-eea-map/Arcgis/Editor/Fold/Fold';
|
|
15
16
|
|
|
16
17
|
function Layer({ $map, layer, layers, index, value, onChangeValue }) {
|
|
17
18
|
const uid = useState(uuid());
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { useMemo } from 'react';
|
|
2
|
-
import
|
|
2
|
+
import InlineForm from '@plone/volto/components/manage/Form/InlineForm';
|
|
3
3
|
import { basemaps } from '@eeacms/volto-eea-map/constants';
|
|
4
4
|
import { getBasemap } from '@eeacms/volto-eea-map/Arcgis/helpers';
|
|
5
|
-
import Fold from '
|
|
5
|
+
import Fold from '@eeacms/volto-eea-map/Arcgis/Editor/Fold/Fold';
|
|
6
6
|
|
|
7
7
|
import Panel from './Panel';
|
|
8
8
|
|
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
import { memo, useState, useEffect, useContext, useMemo } from 'react';
|
|
2
2
|
import { compose } from 'redux';
|
|
3
|
-
import
|
|
3
|
+
import isNil from 'lodash/isNil';
|
|
4
|
+
import toNumber from 'lodash/toNumber';
|
|
4
5
|
import { v4 as uuid } from 'uuid';
|
|
5
6
|
import { QueryBuilder, Rule as QBRule, useRule } from 'react-querybuilder';
|
|
6
7
|
import { Dimmer, Loader } from 'semantic-ui-react';
|
|
7
|
-
import
|
|
8
|
+
import Icon from '@plone/volto/components/theme/Icon/Icon';
|
|
9
|
+
import InlineForm from '@plone/volto/components/manage/Form/InlineForm';
|
|
8
10
|
import { injectLazyLibs } from '@plone/volto/helpers/Loadable/Loadable';
|
|
9
11
|
import addSVG from '@plone/volto/icons/add.svg';
|
|
10
12
|
import {
|
|
@@ -14,7 +16,7 @@ import {
|
|
|
14
16
|
} from '@eeacms/volto-eea-map/Arcgis/helpers';
|
|
15
17
|
import EditorContext from '@eeacms/volto-eea-map/Arcgis/Editor/EditorContext';
|
|
16
18
|
import Panel from './Panel';
|
|
17
|
-
import Fold from '
|
|
19
|
+
import Fold from '@eeacms/volto-eea-map/Arcgis/Editor/Fold/Fold';
|
|
18
20
|
|
|
19
21
|
function getLayersChoices(layers = []) {
|
|
20
22
|
return layers.map((layer) => [
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { useState } from 'react';
|
|
2
|
-
import
|
|
3
|
-
import
|
|
2
|
+
import Icon from '@plone/volto/components/theme/Icon/Icon';
|
|
3
|
+
import InlineForm from '@plone/volto/components/manage/Form/InlineForm';
|
|
4
|
+
import { withVariationSchemaEnhancer } from '@plone/volto/helpers//Extensions';
|
|
4
5
|
import addSVG from '@plone/volto/icons/add.svg';
|
|
5
6
|
import Panel from './Panel';
|
|
6
|
-
import Fold from '
|
|
7
|
-
import { debounce, getWidgets } from '
|
|
7
|
+
import Fold from '@eeacms/volto-eea-map/Arcgis/Editor/Fold/Fold';
|
|
8
|
+
import { debounce, getWidgets } from '@eeacms/volto-eea-map/Arcgis/helpers';
|
|
8
9
|
import {
|
|
9
10
|
expandKeys,
|
|
10
11
|
positions,
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { useContext, useEffect, useMemo, memo } from 'react';
|
|
2
2
|
import { EventEmitter } from 'events';
|
|
3
|
-
import
|
|
3
|
+
import uniq from 'lodash/uniq';
|
|
4
|
+
import isObject from 'lodash/isObject';
|
|
5
|
+
import isNaN from 'lodash/isNaN';
|
|
4
6
|
|
|
5
7
|
import useClass from '@eeacms/volto-eea-map/hooks/useClass';
|
|
6
8
|
import useChangedProps from '@eeacms/volto-eea-map/hooks/useChangedProps';
|
package/src/Arcgis/Map/Map.jsx
CHANGED
|
@@ -7,7 +7,8 @@ import {
|
|
|
7
7
|
useMemo,
|
|
8
8
|
} from 'react';
|
|
9
9
|
import { EventEmitter } from 'events';
|
|
10
|
-
import
|
|
10
|
+
import isNaN from 'lodash/isNaN';
|
|
11
|
+
import isObject from 'lodash/isObject';
|
|
11
12
|
|
|
12
13
|
import useClass from '@eeacms/volto-eea-map/hooks/useClass';
|
|
13
14
|
import useChangedProps from '@eeacms/volto-eea-map/hooks/useChangedProps';
|
|
@@ -8,10 +8,14 @@ import React, {
|
|
|
8
8
|
useRef,
|
|
9
9
|
} from 'react';
|
|
10
10
|
import Map from './Map';
|
|
11
|
-
import Layer from '
|
|
12
|
-
import Widget from '
|
|
11
|
+
import Layer from '@eeacms/volto-eea-map/Arcgis/Layer/Layer';
|
|
12
|
+
import Widget from '@eeacms/volto-eea-map/Arcgis/Widget/Widget';
|
|
13
13
|
|
|
14
|
-
import {
|
|
14
|
+
import {
|
|
15
|
+
getBasemap,
|
|
16
|
+
getLayers,
|
|
17
|
+
getWidgets,
|
|
18
|
+
} from '@eeacms/volto-eea-map/Arcgis/helpers';
|
|
15
19
|
|
|
16
20
|
const MapBuilder = forwardRef((props, ref) => {
|
|
17
21
|
const { data, properties } = props || {};
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { useContext, useEffect, useMemo, memo } from 'react';
|
|
2
2
|
import { EventEmitter } from 'events';
|
|
3
3
|
|
|
4
|
-
import MapContext from '
|
|
4
|
+
import MapContext from '@eeacms/volto-eea-map/Arcgis/Map/MapContext';
|
|
5
5
|
|
|
6
6
|
import useClass from '@eeacms/volto-eea-map/hooks/useClass';
|
|
7
7
|
|
package/src/Arcgis/helpers.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import React, { useMemo } from 'react';
|
|
2
2
|
import { Message } from 'semantic-ui-react';
|
|
3
3
|
|
|
4
|
-
import
|
|
5
|
-
import { flattenToAppURL } from '@plone/volto/helpers';
|
|
4
|
+
import SidebarPortal from '@plone/volto/components/manage/Sidebar/SidebarPortal';
|
|
5
|
+
import { flattenToAppURL } from '@plone/volto/helpers/Url/Url';
|
|
6
6
|
import BlockDataForm from '@plone/volto/components/manage/Form/BlockDataForm';
|
|
7
7
|
|
|
8
8
|
import { schema } from './schema';
|
|
@@ -2,8 +2,8 @@ import React, { useMemo, useEffect } from 'react';
|
|
|
2
2
|
import { v4 as uuid } from 'uuid';
|
|
3
3
|
import { connect } from 'react-redux';
|
|
4
4
|
import { compose } from 'redux';
|
|
5
|
-
import { flattenToAppURL } from '@plone/volto/helpers';
|
|
6
|
-
import { getContent } from '@plone/volto/actions';
|
|
5
|
+
import { flattenToAppURL } from '@plone/volto/helpers/Url/Url';
|
|
6
|
+
import { getContent } from '@plone/volto/actions/content/content';
|
|
7
7
|
import { PrivacyProtection } from '@eeacms/volto-embed';
|
|
8
8
|
import { getLayers } from '@eeacms/volto-eea-map/Arcgis/helpers';
|
|
9
9
|
import MapBuilder from '@eeacms/volto-eea-map/Arcgis/Map/MapBuilder';
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import cx from 'classnames';
|
|
3
|
-
import
|
|
3
|
+
import UniversalLink from '@plone/volto/components/manage/UniversalLink/UniversalLink';
|
|
4
4
|
|
|
5
5
|
const Link = ({ children, ...props }) => {
|
|
6
6
|
if (props.href) {
|
package/src/Toolbar/Sources.jsx
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import cx from 'classnames';
|
|
3
3
|
import { Popup } from 'semantic-ui-react';
|
|
4
|
-
import
|
|
4
|
+
import UniversalLink from '@plone/volto/components/manage/UniversalLink/UniversalLink';
|
|
5
5
|
|
|
6
6
|
const Link = ({ children, ...props }) => {
|
|
7
7
|
if (props.href) {
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
-
import { hasBlocksData } from '@plone/volto/helpers';
|
|
2
|
+
import { hasBlocksData } from '@plone/volto/helpers/Blocks/Blocks';
|
|
3
3
|
import RenderBlocks from '@plone/volto/components/theme/View/RenderBlocks';
|
|
4
4
|
import { pickMetadata } from '@eeacms/volto-embed/helpers';
|
|
5
5
|
import MapBuilder from '@eeacms/volto-eea-map/Arcgis/Map/MapBuilder';
|
|
6
|
-
import Toolbar from '
|
|
6
|
+
import Toolbar from '@eeacms/volto-eea-map/Toolbar/Toolbar';
|
|
7
7
|
|
|
8
8
|
const VisualizationView = (props) => {
|
|
9
9
|
const content = props && props.content ? props.content : {};
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { useEffect, useState, useRef } from 'react';
|
|
2
|
-
import
|
|
2
|
+
import Icon from '@plone/volto/components/theme/Icon/Icon';
|
|
3
|
+
import FormFieldWrapper from '@plone/volto/components/manage/Widgets/FormFieldWrapper';
|
|
3
4
|
import { Button } from 'semantic-ui-react';
|
|
4
5
|
import loadable from '@loadable/component';
|
|
5
6
|
import clearSVG from '@plone/volto/icons/clear.svg';
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { useState } from 'react';
|
|
2
2
|
import { compose } from 'redux';
|
|
3
3
|
import { injectIntl } from 'react-intl';
|
|
4
|
-
import
|
|
4
|
+
import Icon from '@plone/volto/components/theme/Icon/Icon';
|
|
5
|
+
import FormFieldWrapper from '@plone/volto/components/manage/Widgets/FormFieldWrapper';
|
|
5
6
|
import { injectLazyLibs } from '@plone/volto/helpers/Loadable/Loadable';
|
|
6
7
|
import {
|
|
7
8
|
customSelectStyles,
|
|
@@ -1,10 +1,9 @@
|
|
|
1
|
-
import
|
|
2
|
-
|
|
3
|
-
import { InlineForm } from '@plone/volto/components';
|
|
1
|
+
import InlineForm from '@plone/volto/components/manage/Form/InlineForm';
|
|
2
|
+
import toNumber from 'lodash/toNumber';
|
|
4
3
|
|
|
5
4
|
import { simpleSymbols as simpleSymbolsOptions } from '@eeacms/volto-eea-map/constants';
|
|
6
5
|
|
|
7
|
-
import { simpleSymbols } from '
|
|
6
|
+
import { simpleSymbols } from '@eeacms/volto-eea-map/Widgets/ArcgisRendererWidget/RendererEditor/_defaults';
|
|
8
7
|
|
|
9
8
|
export default function Simple(props) {
|
|
10
9
|
const { $map, value, id, onChange } = props;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { useEffect, useRef } from 'react';
|
|
2
2
|
import { Modal, Button } from 'semantic-ui-react';
|
|
3
3
|
import { toast } from 'react-toastify';
|
|
4
|
-
import
|
|
4
|
+
import Toast from '@plone/volto/components/manage/Toast/Toast';
|
|
5
5
|
import {
|
|
6
6
|
initEditor,
|
|
7
7
|
destroyEditor,
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { useEffect, useState } from 'react';
|
|
2
|
-
import
|
|
3
|
-
import
|
|
2
|
+
import toNumber from 'lodash/toNumber';
|
|
3
|
+
import FormFieldWrapper from '@plone/volto/components/manage/Widgets/FormFieldWrapper';
|
|
4
|
+
import InlineForm from '@plone/volto/components/manage/Form/InlineForm';
|
|
4
5
|
|
|
5
6
|
export default function ArcgisViewpointWidget(props) {
|
|
6
7
|
const [watchViewpoint, setWatchViewpoint] = useState(false);
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { connect } from 'react-redux';
|
|
2
2
|
import { pickMetadata } from '@eeacms/volto-embed/helpers';
|
|
3
3
|
import MapBuilder from '@eeacms/volto-eea-map/Arcgis/Map/MapBuilder';
|
|
4
|
-
import Toolbar from '
|
|
4
|
+
import Toolbar from '@eeacms/volto-eea-map/Toolbar/Toolbar';
|
|
5
5
|
|
|
6
6
|
function VisualizationViewWidget(props) {
|
|
7
7
|
const { value, content } = props;
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
import React, { useState, useRef, useEffect } from 'react';
|
|
2
2
|
import { Modal, Button, Grid } from 'semantic-ui-react';
|
|
3
3
|
import { toast } from 'react-toastify';
|
|
4
|
-
import
|
|
4
|
+
import Icon from '@plone/volto/components/theme/Icon/Icon';
|
|
5
|
+
import Toast from '@plone/volto/components/manage/Toast/Toast';
|
|
6
|
+
import FormFieldWrapper from '@plone/volto/components/manage/Widgets/FormFieldWrapper';
|
|
5
7
|
import MapBuilder from '@eeacms/volto-eea-map/Arcgis/Map/MapBuilder';
|
|
6
8
|
import {
|
|
7
9
|
initEditor,
|
|
@@ -11,8 +13,8 @@ import {
|
|
|
11
13
|
} from '@eeacms/volto-eea-map/jsoneditor';
|
|
12
14
|
import editSVG from '@plone/volto/icons/editing.svg';
|
|
13
15
|
import '@eeacms/volto-eea-map/styles/editor.less';
|
|
14
|
-
import MapEditor from '
|
|
15
|
-
import { debounce } from '
|
|
16
|
+
import MapEditor from '@eeacms/volto-eea-map/Arcgis/Editor/Editor';
|
|
17
|
+
import { debounce } from '@eeacms/volto-eea-map/Arcgis/helpers';
|
|
16
18
|
|
|
17
19
|
function JsonEditorModal(props) {
|
|
18
20
|
const { value, onClose, onChange } = props;
|
package/src/constants.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { useEffect, useRef } from 'react';
|
|
2
|
-
import
|
|
2
|
+
import isFunction from 'lodash/isFunction';
|
|
3
|
+
import isEqual from 'lodash/isEqual';
|
|
3
4
|
|
|
4
5
|
export default function useChangedEffect(callback, props) {
|
|
5
6
|
const prevPropsRef = useRef(props);
|
package/src/index.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import
|
|
1
|
+
import isString from 'lodash/isString';
|
|
2
2
|
import { toast } from 'react-toastify';
|
|
3
|
-
import
|
|
3
|
+
import Toast from '@plone/volto/components/manage/Toast/Toast';
|
|
4
4
|
|
|
5
5
|
import loadable from '@loadable/component';
|
|
6
6
|
|