[Fixes #62] Print Button not showing up anymore with latest updates

GeoNode · Jul 14, 2020 · d1e6cf7 · d1e6cf7
1 parent 5e3ce36
commit d1e6cf7
Show file tree

Hide file tree

Showing 26 changed files with 21 additions and 11 deletions.
diff --git a/geonode_mapstore_client/client/MapStore2 b/geonode_mapstore_client/client/MapStore2
diff --git a/geonode_mapstore_client/client/build.sh b/geonode_mapstore_client/client/build.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 set -e
 
-npx rimraf package-lock.json npm-shrinkwrap.json node_modules
+# npx rimraf package-lock.json npm-shrinkwrap.json node_modules
 npm update
 npm install
 npm run compile
-npm run lint
+npm run lint
diff --git a/geonode_mapstore_client/static/geonode/js/ms2/utils/ms2_base_plugins.js b/geonode_mapstore_client/static/geonode/js/ms2/utils/ms2_base_plugins.js
@@ -95,6 +95,7 @@ var MS2_BASE_PLUGINS = {
 		{
 			"name": "Print",
 			"cfg": {
+				"disablePluginIf": "{state('mapType') === 'cesium'}",
 				"useFixedScales": true,
 				"mapWidth": 256
 			}

diff --git a/geonode_mapstore_client/static/geonode/js/ms2/utils/ms2_viewer_plugins.js b/geonode_mapstore_client/static/geonode/js/ms2/utils/ms2_viewer_plugins.js
@@ -102,6 +102,7 @@ var MS2_PLUGINS = {
 		{
 			"name": "Print",
 			"cfg": {
+				"disablePluginIf": "{state('mapType') === 'cesium'}",
 				"useFixedScales": true,
 				"mapPreviewOptions": {
 					"enableScalebox": true,

diff --git a/...tore/dist/0.d870ae29c52d4be9eb18.chunk.js → ...tore/dist/0.9eecf8c1b0db3604a3a0.chunk.js b/...tore/dist/0.d870ae29c52d4be9eb18.chunk.js → ...tore/dist/0.9eecf8c1b0db3604a3a0.chunk.js
diff --git a/...tore/dist/1.d870ae29c52d4be9eb18.chunk.js → ...tore/dist/1.9eecf8c1b0db3604a3a0.chunk.js b/...tore/dist/1.d870ae29c52d4be9eb18.chunk.js → ...tore/dist/1.9eecf8c1b0db3604a3a0.chunk.js
diff --git a/...ore/dist/10.d870ae29c52d4be9eb18.chunk.js → ...ore/dist/10.9eecf8c1b0db3604a3a0.chunk.js b/...ore/dist/10.d870ae29c52d4be9eb18.chunk.js → ...ore/dist/10.9eecf8c1b0db3604a3a0.chunk.js
diff --git a/...ore/dist/11.d870ae29c52d4be9eb18.chunk.js → ...ore/dist/11.9eecf8c1b0db3604a3a0.chunk.js b/...ore/dist/11.d870ae29c52d4be9eb18.chunk.js → ...ore/dist/11.9eecf8c1b0db3604a3a0.chunk.js
diff --git a/...ore/dist/12.d870ae29c52d4be9eb18.chunk.js → ...ore/dist/12.9eecf8c1b0db3604a3a0.chunk.js b/...ore/dist/12.d870ae29c52d4be9eb18.chunk.js → ...ore/dist/12.9eecf8c1b0db3604a3a0.chunk.js
diff --git a/...ore/dist/13.d870ae29c52d4be9eb18.chunk.js → ...ore/dist/13.9eecf8c1b0db3604a3a0.chunk.js b/...ore/dist/13.d870ae29c52d4be9eb18.chunk.js → ...ore/dist/13.9eecf8c1b0db3604a3a0.chunk.js
diff --git a/...ore/dist/14.d870ae29c52d4be9eb18.chunk.js → ...ore/dist/14.9eecf8c1b0db3604a3a0.chunk.js b/...ore/dist/14.d870ae29c52d4be9eb18.chunk.js → ...ore/dist/14.9eecf8c1b0db3604a3a0.chunk.js
diff --git a/...ore/dist/15.d870ae29c52d4be9eb18.chunk.js → ...ore/dist/15.9eecf8c1b0db3604a3a0.chunk.js b/...ore/dist/15.d870ae29c52d4be9eb18.chunk.js → ...ore/dist/15.9eecf8c1b0db3604a3a0.chunk.js
diff --git a/...ore/dist/16.d870ae29c52d4be9eb18.chunk.js → ...ore/dist/16.9eecf8c1b0db3604a3a0.chunk.js b/...ore/dist/16.d870ae29c52d4be9eb18.chunk.js → ...ore/dist/16.9eecf8c1b0db3604a3a0.chunk.js
diff --git a/...tore/dist/2.d870ae29c52d4be9eb18.chunk.js → ...tore/dist/2.9eecf8c1b0db3604a3a0.chunk.js b/...tore/dist/2.d870ae29c52d4be9eb18.chunk.js → ...tore/dist/2.9eecf8c1b0db3604a3a0.chunk.js
diff --git a/geonode_mapstore_client/static/mapstore/dist/3.9eecf8c1b0db3604a3a0.chunk.js b/geonode_mapstore_client/static/mapstore/dist/3.9eecf8c1b0db3604a3a0.chunk.js
diff --git a/geonode_mapstore_client/static/mapstore/dist/3.d870ae29c52d4be9eb18.chunk.js b/geonode_mapstore_client/static/mapstore/dist/3.d870ae29c52d4be9eb18.chunk.js
diff --git a/...tore/dist/4.d870ae29c52d4be9eb18.chunk.js → ...tore/dist/4.9eecf8c1b0db3604a3a0.chunk.js b/...tore/dist/4.d870ae29c52d4be9eb18.chunk.js → ...tore/dist/4.9eecf8c1b0db3604a3a0.chunk.js
diff --git a/...tore/dist/5.d870ae29c52d4be9eb18.chunk.js → ...tore/dist/5.9eecf8c1b0db3604a3a0.chunk.js b/...tore/dist/5.d870ae29c52d4be9eb18.chunk.js → ...tore/dist/5.9eecf8c1b0db3604a3a0.chunk.js
diff --git a/...tore/dist/6.d870ae29c52d4be9eb18.chunk.js → ...tore/dist/6.9eecf8c1b0db3604a3a0.chunk.js b/...tore/dist/6.d870ae29c52d4be9eb18.chunk.js → ...tore/dist/6.9eecf8c1b0db3604a3a0.chunk.js
diff --git a/geonode_mapstore_client/static/mapstore/dist/7.9eecf8c1b0db3604a3a0.chunk.js b/geonode_mapstore_client/static/mapstore/dist/7.9eecf8c1b0db3604a3a0.chunk.js
diff --git a/geonode_mapstore_client/static/mapstore/dist/7.d870ae29c52d4be9eb18.chunk.js b/geonode_mapstore_client/static/mapstore/dist/7.d870ae29c52d4be9eb18.chunk.js
diff --git a/...tore/dist/8.d870ae29c52d4be9eb18.chunk.js → ...tore/dist/8.9eecf8c1b0db3604a3a0.chunk.js b/...tore/dist/8.d870ae29c52d4be9eb18.chunk.js → ...tore/dist/8.9eecf8c1b0db3604a3a0.chunk.js
diff --git a/...tore/dist/9.d870ae29c52d4be9eb18.chunk.js → ...tore/dist/9.9eecf8c1b0db3604a3a0.chunk.js b/...tore/dist/9.d870ae29c52d4be9eb18.chunk.js → ...tore/dist/9.9eecf8c1b0db3604a3a0.chunk.js
diff --git a/geonode_mapstore_client/static/mapstore/dist/ms2-geonode-api.js b/geonode_mapstore_client/static/mapstore/dist/ms2-geonode-api.js
diff --git a/...pdfjsWorker.d870ae29c52d4be9eb18.chunk.js → ...pdfjsWorker.9eecf8c1b0db3604a3a0.chunk.js b/...pdfjsWorker.d870ae29c52d4be9eb18.chunk.js → ...pdfjsWorker.9eecf8c1b0db3604a3a0.chunk.js
diff --git a/geonode_mapstore_client/templates/geonode-mapstore-client/_config.html b/geonode_mapstore_client/templates/geonode-mapstore-client/_config.html
@@ -16,6 +16,14 @@
       translations: '',
       useAuthenticationRules: true,
       loadAfterTheme: true,
+      monitorState: [
+          {"name": "router", "path": "router.location.pathname"},
+          {"name": "browser", "path": "browser"},
+          {"name": "geostorymode", "path": "geostory.mode"},
+          {"name": "featuregridmode", "path": "featuregrid.mode"},
+          {"name": "userrole", "path": "security.user.role"},
+          {"name": "printEnabled", "path": "print.capabilities"}
+      ],
       projectionDefs: [{
           "code": "EPSG:3003",
           "def": "+proj=tmerc +lat_0=0 +lon_0=9 +k=0.9996 +x_0=1500000 +y_0=0 +ellps=intl+towgs84=-104.1,-49.1,-9.9,0.971,-2.917,0.714,-11.68 +units=m +no_defs",
+7 −15		web/client/components/TOC/fragments/settings/General.jsx
+1 −1		web/client/components/map/openlayers/DrawSupport.jsx
+66 −0		web/client/components/map/openlayers/__tests__/DrawSupport-test.jsx
+74 −0		web/client/selectors/__tests__/styleeditor-test.js
+3 −3		web/client/selectors/styleeditor.js
+1 −1		web/client/utils/LayersUtils.js
+16 −1		web/client/utils/TOCUtils.js
+32 −1		web/client/utils/__tests__/TOCUtils-test.js