Merge pull request #56 from GeoNode/2.0.4

- Bump to version 2.0.4
GeoNode · Apr 20, 2020 · 4c9f463 · 4c9f463
2 parents c71cc9f + 01b8dab
commit 4c9f463
Show file tree

Hide file tree

Showing 77 changed files with 36,175 additions and 9,717 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,28 @@
 # Change Log
 
+## 2.0.3 [2020-04-20]
+
+### Main features
+
+- Install `pip install django-mapstore-adapter>=2.0.2` instructions [Here](https://pypi.org/project/django-mapstore-adapter/)
+- Install `pip install django-geonode-mapstore-client==2.0.4` instructions [Here](https://pypi.org/project/django-geonode-mapstore-client/2.0.4/)
+- Based on [GeoNode MapStore Adapter v2.0.3](https://github.com/GeoNode/django-mapstore-adapter/releases/tag/2.0.3)
+- Based on [MapStore2 - v2020.02.00](https://github.com/geosolutions-it/MapStore2/releases/tag/v2020.02.00)
+
+[GeoNode MapStore Client](https://github.com/GeoNode/geonode-mapstore-client/issues?q=is%3Aissue+is%3Aclosed+milestone%3A2.0.4) the list of issues solved.
+
+[MapStore2](https://github.com/geosolutions-it/MapStore2/milestone/23?closed=1) the list of MapStore2 issues solved.
+
+[Full Changelog](https://github.com/GeoNode/geonode-mapstore-client/compare/2.0.3...2.0.4)
+
+<li> 2020-04-17: Lorenzo Natali <a href="http://github.com/GeoNode/geonode-mapstore-client/commit/84674d5f533268f8ff99e866df12a1e54a1301d1" target="blank"> fixed style of dialogs</a></li> 
+<li> 2020-04-17: Lorenzo Natali <a href="http://github.com/GeoNode/geonode-mapstore-client/commit/f579244ee8b849074a73caec08aa78375c66cc3d" target="blank"> updated to latest master</a></li> 
+<li> 2020-04-17: Lorenzo Natali <a href="http://github.com/GeoNode/geonode-mapstore-client/commit/9bd2608df6428f0ec9228a761cb71edfa66ac8ef" target="blank"> Updated Configurations for new plugins</a></li> 
+<li> 2020-04-17: Lorenzo Natali <a href="http://github.com/GeoNode/geonode-mapstore-client/commit/78b2370ecd67b0f86136787dece3b9c975d3a838" target="blank"> Updated plugins</a></li> 
+<li> 2020-04-17: afabiani <a href="http://github.com/GeoNode/geonode-mapstore-client/commit/53586daaf93ccddc93054bd147e4c4aaa0865fa6" target="blank"> Update MapStore2 to v. 2020.01.02</a></li> 
+<li> 2020-04-02: afabiani <a href="http://github.com/GeoNode/geonode-mapstore-client/commit/c71cc9fe0790af2d20a0291eed47252b7a9af8bf" target="blank">  - Bump to version 2.0.3</a></li> 
+<li> 2020-04-02: afabiani <a href="http://github.com/GeoNode/geonode-mapstore-client/commit/ee05425320590750ab15c3dde55cebdf2afbf139" target="blank">  - Bump to version 2.0.3</a></li> 
+
 ## 2.0.3 [2020-04-02]
 
 ### Main features

diff --git a/README.md b/README.md
@@ -52,8 +52,6 @@ if 'geonode_mapstore_client' not in INSTALLED_APPS:
 GEONODE_CLIENT_LAYER_PREVIEW_LIBRARY = 'mapstore'  # DEPRECATED use HOOKSET instead
 GEONODE_CLIENT_HOOKSET = "geonode_mapstore_client.hooksets.MapStoreHookSet"
 
-MAPSTORE_DEBUG = False
-
 def get_geonode_catalogue_service():
     if PYCSW:
         pycsw_config = PYCSW["CONFIGURATION"]

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.0.3
+2.0.4
diff --git a/geonode_mapstore_client/client/.eslintrc b/geonode_mapstore_client/client/.eslintrc
@@ -172,6 +172,7 @@
 /**
  * JSX style
  */
+    "react/jsx-no-duplicate-props": 2, // https://github.com/yannickcr/eslint-plugin-react/blob/master/docs/rules/jsx-no-duplicate-props.md
     "react/display-name": 0,         // https://github.com/yannickcr/eslint-plugin-react/blob/master/docs/rules/display-name.md
     "react/jsx-boolean-value": 2,    // https://github.com/yannickcr/eslint-plugin-react/blob/master/docs/rules/jsx-boolean-value.md
     "react/jsx-quotes": [2, "double"], // https://github.com/yannickcr/eslint-plugin-react/blob/master/docs/rules/jsx-quotes.md

diff --git a/geonode_mapstore_client/client/MapStore2 b/geonode_mapstore_client/client/MapStore2
diff --git a/geonode_mapstore_client/client/index.html b/geonode_mapstore_client/client/index.html
@@ -216,7 +216,7 @@
     "widgetsConfig": {}
 }
 ,
-        proxy: "http://localhost:8081/proxy/?url=",
+        proxy: "{{ PROXY_URL }}",
         printingEnabled: true,
         localConfig: {
             translations: '',

diff --git a/geonode_mapstore_client/client/js/plugins.js b/geonode_mapstore_client/client/js/plugins.js
@@ -10,6 +10,7 @@ const epics = require("./epics");
 
 module.exports = {
     plugins: {
+        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'),
@@ -30,12 +31,13 @@ module.exports = {
         MapFooterPlugin: require('../MapStore2/web/client/plugins/MapFooter'),
         PrintPlugin: require('../MapStore2/web/client/plugins/Print'),
         MeasurePlugin: require('../MapStore2/web/client/plugins/Measure'),
-        TOCItemsSettingsPlugin: require('../MapStore2/web/client/plugins/TOCItemsSettings'),
-        WidgetsPlugin: require('../MapStore2/web/client/plugins/Widgets'),
-        WidgetsBuilderPlugin: require('../MapStore2/web/client/plugins/WidgetsBuilder'),
-        WidgetsTrayPlugin: require('../MapStore2/web/client/plugins/WidgetsTray'),
+        FilterLayerPlugin: require('../MapStore2/web/client/plugins/FilterLayer').default,
+        TOCItemsSettingsPlugin: require('../MapStore2/web/client/plugins/TOCItemsSettings').default,
+        WidgetsPlugin: require('../MapStore2/web/client/plugins/Widgets').default,
+        WidgetsBuilderPlugin: require('../MapStore2/web/client/plugins/WidgetsBuilder').default,
+        WidgetsTrayPlugin: require('../MapStore2/web/client/plugins/WidgetsTray').default,
         NotificationsPlugin: require('../MapStore2/web/client/plugins/Notifications'),
-        FeatureEditorPlugin: require('../MapStore2/web/client/plugins/FeatureEditor'),
+        FeatureEditorPlugin: require('../MapStore2/web/client/plugins/FeatureEditor').default,
         QueryPanelPlugin: require('../MapStore2/web/client/plugins/QueryPanel'),
         SavePlugin: require('../MapStore2/web/client/plugins/Save').default,
         SaveAsPlugin: require('../MapStore2/web/client/plugins/SaveAs').default,

diff --git a/geonode_mapstore_client/client/package.json b/geonode_mapstore_client/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ms2-geonode-api",
-  "version": "2.0.2",
+  "version": "2.0.4",
   "description": "MapStore 2 Api bundle specific to geonode framework",
   "main": "api.js",
   "scripts": {
@@ -16,11 +16,11 @@
   "author": "GeoSolutions",
   "license": "BSD-2-Clause",
   "devDependencies": {
-    "@babel/core": "7.5.5",
-    "@babel/plugin-proposal-class-properties": "7.5.5",
-    "@babel/plugin-syntax-dynamic-import": "7.2.0",
-    "@babel/preset-env": "7.5.5",
-    "@babel/preset-react": "7.0.0",
+    "@babel/core": "7.8.7",
+    "@babel/plugin-proposal-class-properties": "7.8.3",
+    "@babel/plugin-syntax-dynamic-import": "7.8.3",
+    "@babel/preset-env": "7.8.7",
+    "@babel/preset-react": "7.8.3",
     "@geosolutions/acorn-jsx": "4.0.2",
     "@geosolutions/jsdoc": "3.4.4",
     "@geosolutions/mocha": "6.2.1-3",
@@ -84,13 +84,11 @@
     "style-loader": "0.12.4",
     "url-loader": "0.5.7",
     "vusion-webfonts-generator": "0.4.1",
-    "webpack": "4.36.0",
+    "webpack": "4.41.5",
     "webpack-bundle-size-analyzer": "2.0.2",
     "webpack-cli": "3.3.6",
-    "webpack-dev-server": "3.7.2",
-    "webpack-parallel-uglify-plugin": "1.1.2"
+    "webpack-dev-server": "^3.10.3"
   },
-  "//": "replace react-sortable-items with official on npm when it will support React 15",
   "dependencies": {
     "@boundlessgeo/jsonix": "2.4.3",
     "@carnesen/redux-add-action-listener-enhancer": "0.0.1",
@@ -149,6 +147,7 @@
     "istanbul-instrumenter-loader": "3.0.1",
     "json-2-csv": "2.1.2",
     "json-loader": "0.5.7",
+    "jsonlint-mod": "1.7.5",
     "jszip": "3.1.5",
     "keymirror": "0.1.1",
     "leaflet": "1.3.1",
@@ -171,11 +170,12 @@
     "pdfviewer": "0.3.2",
     "prop-types": "15.7.2",
     "qrcode.react": "0.9.3",
+    "query-string": "6.9.0",
     "react": "16.10.1",
     "react-addons-css-transition-group": "15.6.2",
     "react-addons-shallow-compare": "15.6.2",
     "react-bootstrap": "0.31.0",
-    "react-checkbox-tree": "1.5.1",
+    "react-checkbox-tree": "^1.5.1",
     "react-codemirror2": "4.0.0",
     "react-color": "2.17.0",
     "react-confirm-button": "0.0.2",
@@ -210,12 +210,13 @@
     "react-router": "4.1.1",
     "react-router-dom": "4.2.2",
     "react-scroll-up": "1.3.0",
-    "react-select": "1.0.0-rc.4",
+    "react-select": "1.3.0",
     "react-selectize": "3.0.1",
     "react-share": "1.15.1",
     "react-side-effect": "1.1.0",
     "react-sidebar": "2.3.2",
     "react-spinkit": "2.1.2",
+    "react-swipeable": "5.5.1",
     "react-swipeable-views": "0.12.2",
     "react-textfit": "1.1.0",
     "react-twitter-widgets": "1.3.0",

diff --git a/geonode_mapstore_client/client/themes/default/less/geonode.less b/geonode_mapstore_client/client/themes/default/less/geonode.less
@@ -9,7 +9,7 @@
     z-index: 100000 !important;
 }
 .gfi-t {
-    float: left; 
+    float: left;
     padding: 1px
 }
 .fill:not(:-webkit-full-screen){
@@ -71,3 +71,5 @@
         width: 98%;
     }
 }
+
+
diff --git a/geonode_mapstore_client/client/webpack.config.js b/geonode_mapstore_client/client/webpack.config.js
@@ -10,6 +10,7 @@ const extractThemesPlugin = require('./MapStore2/build/themes.js').extractThemes
 const envJson = require('./env.json');
 
 const DEV_SERVER_HOST = envJson.DEV_SERVER_HOST || 'ERROR:INSERT_DEV_SERVER_HOST_IN_ENV_JSON_CONFIG! eg: my-geonode-host.org';
+const protocol = envJson.DEV_SERVER_HOST_PROTOCOL || 'http';
 
 module.exports = assign({}, require('./MapStore2/build/buildConfig')(
     {
@@ -24,24 +25,24 @@ module.exports = assign({}, require('./MapStore2/build/buildConfig')(
     },
     extractThemesPlugin,
     false,
-    '/static/mapstore/dist/',
+    `/static/mapstore/dist/`,
     '.msgapi'
 ), {
     devServer: {
-        https: true,
+        https: protocol === 'https' ? true : false,
         headers: {
             'Access-Control-Allow-Origin': '*'
         },
         contentBase: [
             path.join(__dirname),
             path.join(__dirname, '..', 'static')
         ],
-        before: function(app) {
+        before: function (app) {
             const hashRegex = /\.[a-zA-Z0-9]{1,}\.js/;
-            app.use(function(req, res, next) {
+            app.use(function (req, res, next) {
                 // remove hash from requests to use the local js
                 if (req.url.indexOf('/static/geonode/js/ms2/utils/') !== -1
-                || req.url.indexOf('/ms2-geonode-api') !== -1) {
+                    || req.url.indexOf('/ms2-geonode-api') !== -1) {
                     req.url = req.url.replace(hashRegex, '.js');
                     req.path = req.path.replace(hashRegex, '.js');
                     req.originalUrl = req.originalUrl.replace(hashRegex, '.js');
@@ -59,25 +60,25 @@ module.exports = assign({}, require('./MapStore2/build/buildConfig')(
                     '!**/MapStore2/**',
                     '!**/node_modules/**'
                 ],
-                target: `https://${DEV_SERVER_HOST}`,
+                target: `${protocol}://${DEV_SERVER_HOST}`,
                 headers: {
                     Host: DEV_SERVER_HOST,
-                    Referer: `https://${DEV_SERVER_HOST}/`
+                    Referer: `${protocol}://${DEV_SERVER_HOST}/`
                 }
             },
             {
                 context: [
-                    '/static/mapstore/MapStore2/web/client/translations/**',
+                    '/static/mapstore/MapStore2/web/client/**',
                     '/static/geonode/js/ms2/utils/**'
                 ],
-                target: 'https://localhost:8081',
+                target: `${protocol}://localhost:8081`,
                 secure: false,
                 changeOrigin: true,
                 pathRewrite: {
-                    '/static/mapstore/MapStore2/web/client/translations/': '/MapStore2/web/client/translations/',
+                    '/static/mapstore/MapStore2/web/client/': '/MapStore2/web/client/translations/',
                     '/static/geonode/js/ms2/utils/': '/geonode/js/ms2/utils/'
                 }
             }
         ]
     }
-});
+});