update mapstore submodule

GeoNode · Nov 3, 2020 · 0eee341 · 0eee341
1 parent 5e931f5
commit 0eee341
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 21 deletions.
diff --git a/geonode_mapstore_client/client/MapStore2 b/geonode_mapstore_client/client/MapStore2
diff --git a/geonode_mapstore_client/client/js/epics/gnsave.js b/geonode_mapstore_client/client/js/epics/gnsave.js
@@ -12,7 +12,7 @@ import { layersSelector, groupsSelector } from '@mapstore/framework/selectors/la
 import { backgroundListSelector } from '@mapstore/framework/selectors/backgroundselector';
 import { mapOptionsToSaveSelector } from '@mapstore/framework/selectors/mapsave';
 import {
-    // bookmarkSearchConfigSelector,
+    bookmarkSearchConfigSelector,
     textSearchConfigSelector
 } from '@mapstore/framework/selectors/searchconfig';
 import { saveMapConfiguration } from '@mapstore/framework/utils/MapUtils';
@@ -46,15 +46,15 @@ const SaveAPI = {
         const groups = groupsSelector(state);
         const backgrounds = backgroundListSelector(state);
         const textSearchConfig = textSearchConfigSelector(state);
-        // const bookmarkSearchConfig = bookmarkSearchConfigSelector(state);
+        const bookmarkSearchConfig = bookmarkSearchConfigSelector(state);
         const additionalOptions = mapOptionsToSaveSelector(state);
         const data = saveMapConfiguration(
             map,
             layers,
             groups,
             backgrounds,
             textSearchConfig,
-            // bookmarkSearchConfig,
+            bookmarkSearchConfig,
             additionalOptions
         );
         const name = metadata.name;

diff --git a/geonode_mapstore_client/client/js/plugins.js b/geonode_mapstore_client/client/js/plugins.js
@@ -13,13 +13,13 @@ module.exports = {
         AddGroupPlugin: require('../MapStore2/web/client/plugins/AddGroup').default,
         IdentifyPlugin: require('../MapStore2/web/client/plugins/Identify'),
         TOCPlugin: require('../MapStore2/web/client/plugins/TOC'),
-        MapPlugin: require('../MapStore2/web/client/plugins/Map'),
+        MapPlugin: require('../MapStore2/web/client/plugins/Map').default,
         ToolbarPlugin: require('../MapStore2/web/client/plugins/Toolbar'),
         DrawerMenuPlugin: require('../MapStore2/web/client/plugins/DrawerMenu'),
         ZoomAllPlugin: require('../MapStore2/web/client/plugins/ZoomAll'),
         MapLoadingPlugin: require('../MapStore2/web/client/plugins/MapLoading'),
         OmniBarPlugin: require('../MapStore2/web/client/plugins/OmniBar'),
-        BackgroundSelectorPlugin: require('../MapStore2/web/client/plugins/BackgroundSelector'),
+        BackgroundSelectorPlugin: require('../MapStore2/web/client/plugins/BackgroundSelector').default,
         FullScreenPlugin: require('../MapStore2/web/client/plugins/FullScreen'),
         ZoomInPlugin: require('../MapStore2/web/client/plugins/ZoomIn'),
         ZoomOutPlugin: require('../MapStore2/web/client/plugins/ZoomOut'),
@@ -51,10 +51,9 @@ module.exports = {
         SearchServicesConfigPlugin: require('../MapStore2/web/client/plugins/SearchServicesConfig'),
         AddReducersAndEpics: {
             reducers: {
-                security: require('../MapStore2/web/client/reducers/security'),
-                maps: require('../MapStore2/web/client/reducers/maps'),
-                currentMap: require('../MapStore2/web/client/reducers/currentMap'),
-                maplayout: require('../MapStore2/web/client/reducers/maplayout')
+                security: require('../MapStore2/web/client/reducers/security').default,
+                maps: require('../MapStore2/web/client/reducers/maps').default,
+                maplayout: require('../MapStore2/web/client/reducers/maplayout').default
             },
             epics
         }

diff --git a/geonode_mapstore_client/client/js/previewPlugins.js b/geonode_mapstore_client/client/js/previewPlugins.js
@@ -9,13 +9,13 @@ const Rx = require("rxjs");
 const {_setThumbnail, updateMapLayoutEpic} = require("./epics");
 module.exports = {
     plugins: {
-        MapPlugin: require('../MapStore2/web/client/plugins/Map'),
+        MapPlugin: require('../MapStore2/web/client/plugins/Map').default,
         IdentifyPlugin: require('../MapStore2/web/client/plugins/Identify'),
         ToolbarPlugin: require('../MapStore2/web/client/plugins/Toolbar'),
         ZoomAllPlugin: require('../MapStore2/web/client/plugins/ZoomAll'),
         MapLoadingPlugin: require('../MapStore2/web/client/plugins/MapLoading'),
         OmniBarPlugin: require('../MapStore2/web/client/plugins/OmniBar'),
-        BackgroundSelectorPlugin: require('../MapStore2/web/client/plugins/BackgroundSelector'),
+        BackgroundSelectorPlugin: require('../MapStore2/web/client/plugins/BackgroundSelector').default,
         FullScreenPlugin: require('../MapStore2/web/client/plugins/FullScreen'),
         ZoomInPlugin: require('../MapStore2/web/client/plugins/ZoomIn'),
         ZoomOutPlugin: require('../MapStore2/web/client/plugins/ZoomOut'),
@@ -28,10 +28,9 @@ module.exports = {
         PlaybackPlugin: require('../MapStore2/web/client/plugins/Playback'),
         AddReducersAndEpics: {
             reducers: {
-                security: require('../MapStore2/web/client/reducers/security'),
-                maps: require('../MapStore2/web/client/reducers/maps'),
-                currentMap: require('../MapStore2/web/client/reducers/currentMap'),
-                maplayout: require('../MapStore2/web/client/reducers/maplayout')
+                security: require('../MapStore2/web/client/reducers/security').default,
+                maps: require('../MapStore2/web/client/reducers/maps').default,
+                maplayout: require('../MapStore2/web/client/reducers/maplayout').default
             },
             epics: {
                 _setThumbnail,

diff --git a/geonode_mapstore_client/client/package.json b/geonode_mapstore_client/client/package.json
@@ -26,6 +26,7 @@
     "@geosolutions/acorn-jsx": "4.0.2",
     "@geosolutions/jsdoc": "3.4.4",
     "@geosolutions/mocha": "6.2.1-3",
+    "@mapstore/eslint-config-mapstore": "1.0.1",
     "axios-mock-adapter": "1.16.0",
     "babel-eslint": "10.0.3",
     "babel-istanbul-loader": "0.1.0",
@@ -41,7 +42,7 @@
     "download-cli": "1.0.1",
     "dynamic-public-path-webpack-plugin": "1.0.4",
     "escope": "3.2.0",
-    "eslint": "6.3.0",
+    "eslint": "7.8.1",
     "eslint-plugin-import": "2.20.2",
     "eslint-plugin-no-only-tests": "2.3.1",
     "eslint-plugin-react": "3.3.2",
@@ -140,11 +141,12 @@
     "eventlistener": "0.0.1",
     "file-saver": "1.3.3",
     "fs-extra": "3.0.1",
+    "geostyler-geocss-parser": "https://github.com/allyoucanmap/geostyler-geocss-parser/tarball/build",
     "geostyler-openlayers-parser": "1.1.4",
-    "geostyler-sld-parser": "1.3.1",
+    "geostyler-sld-parser": "2.0.1",
     "history": "4.6.1",
+    "html-to-draftjs": "npm:@geosolutions/[email protected]",
     "html2canvas": "0.5.0-beta4",
-    "html-to-draftjs": "1.5.0",
     "immutable": "4.0.0-rc.12",
     "intersection-observer": "0.7.0",
     "intl": "1.2.2",
@@ -165,7 +167,7 @@
     "leaflet.gridlayer.googlemutant": "0.6.4",
     "leaflet.locatecontrol": "0.62.0",
     "leaflet.nontiledlayer": "1.0.7",
-    "lodash": "4.17.15",
+    "lodash": "4.17.19",
     "lrucache": "1.0.3",
     "moment": "2.21.0",
     "node-geo-distance": "1.2.0",
@@ -195,7 +197,7 @@
     "react-dnd-test-backend": "2.6.0",
     "react-dock": "0.2.4",
     "react-dom": "16.10.1",
-    "react-draft-wysiwyg": "1.13.2",
+    "react-draft-wysiwyg": "npm:@geosolutions/[email protected]",
     "react-draggable": "2.2.6",
     "react-dropzone": "3.13.1",
     "react-error-boundary": "1.2.5",
@@ -206,6 +208,7 @@
     "react-intl": "2.3.0",
     "react-notification-system": "0.2.14",
     "react-nouislider": "2.0.1",
+    "react-numeric-input": "2.2.3",
     "react-overlays": "1.2.0",
     "react-pdf": "4.0.5",
     "react-player": "1.15.3",
@@ -251,6 +254,7 @@
     "uuid": "3.0.1",
     "vis": "4.21.0",
     "w3c-schemas": "1.3.1",
+    "webfontloader": "1.6.28",
     "wellknown": "0.5.0",
     "xml2js": "0.4.17",
     "xmldom": "0.3.0",