Merge pull request #151 from Ouranosinc/drawn-features-to-binary-format

Drawn features to binary format

.eslintrc

@@ -20,6 +20,8 @@
     "__PAVICS_GEOSERVER_API_PATH__" : false,
     "__PAVICS_GEOSERVER_WORKSPACES_SERVICE_NAME__" : false,
     "__PAVICS_PROJECT_API_PATH__" : false,
+    "__PAVICS_GEOSERVER_CUSTOM_WORKSPACE__": false,
+    "__PAVICS_GEOSERVER_CUSTOM_DATASTORE__": false,
     "__MAGPIE_HOST__" : false
   },
   "rules": {

Dockerfile

@@ -1,9 +1,9 @@
 # PAVICS-Platform
 #
-# VERSION 1.1.7
+# VERSION 1.1.8
 FROM node:8.2.1
 MAINTAINER Renaud Hébert-Legault <renaud.hebert-legault@crim.ca>
-LABEL Description="PAVICS Platform - Based on Node.js, React, Redux, Webpack, OpenLayers, Koa and MaterialUI" Vendor="CRIM" Version="1.1.7"
+LABEL Description="PAVICS Platform - Based on Node.js, React, Redux, Webpack, OpenLayers, Koa and MaterialUI" Vendor="CRIM" Version="1.1.8"
 WORKDIR /frontend
 
 ENV NODE_ENV=development

config/index.js

@@ -15,12 +15,6 @@ const birdhouseHost = process.env.BIRDHOUSE_HOST || 'pluvier.crim.ca';
 const ncwmsHost = process.env.NCWMS_HOST || `https://${birdhouseHost}/twitcher/ows/proxy/ncWMS2/wms`;
 const catalogHost = process.env.CATALOG_HOST || `https://${birdhouseHost}/twitcher/ows/proxy/catalog/pywps`;
 const malleefowlHost = process.env.MALLEEFOWL_HOST || `https://${birdhouseHost}/twitcher/ows/proxy/malleefowl/wps`;
-const PAVICS_WORKFLOW_PROVIDER = process.env.PAVICS_WORKFLOW_PROVIDER || 'malleefowl';
-const PAVICS_RUN_WORKFLOW_IDENTIFIER = process.env.PAVICS_RUN_WORKFLOW_IDENTIFIER || 'custom_workflow';
-const PAVICS_VISUALIZE_IDENTIFIER = process.env.PAVICS_VISUALIZE_IDENTIFIER || 'TODO';
-const PAVICS_PERSIST_IDENTIFIER = process.env.PAVICS_PERSIST_IDENTIFIER || 'TODO';
-const PAVICS_PUBLISH_IDENTIFIER = process.env.PAVICS_PUBLISH_IDENTIFIER || 'TODO';
-const PAVICS_DEFAULT_WORKSPACE_FOLDER = process.env.PAVICS_DEFAULT_WORKSPACE_FOLDER || 'workspaces';
 const serverPort = process.env.PORT || 3000;
 const serverExternalPort = process.env.PAVICS_FRONTEND_PORT || serverPort;
 const URL_BASE = `${serverProto}://${birdhouseHost}`;
@@ -38,7 +32,7 @@ const config = {
   // ----------------------------------
   pavics_malleefowl_path: malleefowlHost,
   pavics_phoenix_path: `${URL_BASE}:8443`,
-  pavics_geoserver_path: `${URL_BASE}/geoserver`,
+  pavics_geoserver_path: process.env.PAVICS_GEOSERVER_URL || `${URL_BASE}/geoserver`,
   pavics_geoserver_api_path: process.env.PAVICS_GEOSERVER_API || `${URL_BASE}/twitcher/ows/proxy/geoserver-api`,
   pavics_geoserver_workspaces_service_name: process.env.PAVICS_GEOSERVER_WORKSPACES_SERVICE_NAME || 'geoserver-api',
   pavics_ncwms_path: ncwmsHost,
@@ -47,12 +41,14 @@ const config = {
   // pavics_project_api_internal_url is needed in dev mode since centos vm etc/hosts hasn't its value modified but windows host has (pluvier -­> dev IP)
   pavics_project_api_internal_url: process.env.PAVICS_PROJECT_API_INTERNAL_URL || `${URL_BASE}/project-api/api`, // DEV
   pavics_magpie_host: `${URL_BASE}/magpie`,
-  PAVICS_WORKFLOW_PROVIDER: PAVICS_WORKFLOW_PROVIDER,
-  PAVICS_RUN_WORKFLOW_IDENTIFIER: PAVICS_RUN_WORKFLOW_IDENTIFIER,
-  PAVICS_VISUALIZE_IDENTIFIER: PAVICS_VISUALIZE_IDENTIFIER,
-  PAVICS_PERSIST_IDENTIFIER: PAVICS_PERSIST_IDENTIFIER,
-  PAVICS_PUBLISH_IDENTIFIER: PAVICS_PUBLISH_IDENTIFIER,
-  PAVICS_DEFAULT_WORKSPACE_FOLDER: PAVICS_DEFAULT_WORKSPACE_FOLDER,
+  PAVICS_WORKFLOW_PROVIDER: process.env.PAVICS_WORKFLOW_PROVIDER || 'malleefowl',
+  PAVICS_RUN_WORKFLOW_IDENTIFIER: process.env.PAVICS_RUN_WORKFLOW_IDENTIFIER || 'custom_workflow',
+  PAVICS_VISUALIZE_IDENTIFIER: process.env.PAVICS_VISUALIZE_IDENTIFIER || 'TODO',
+  PAVICS_PERSIST_IDENTIFIER: process.env.PAVICS_PERSIST_IDENTIFIER || 'TODO',
+  PAVICS_PUBLISH_IDENTIFIER: process.env.PAVICS_PUBLISH_IDENTIFIER || 'TODO',
+  PAVICS_DEFAULT_WORKSPACE_FOLDER: process.env.PAVICS_DEFAULT_WORKSPACE_FOLDER || 'workspaces',
+  PAVICS_GEOSERVER_CUSTOM_WORKSPACE: process.env.PAVICS_GEOSERVER_CUSTOM_WORKSPACE || 'User_Custom_Regions',
+  PAVICS_GEOSERVER_CUSTOM_DATASTORE: process.env.PAVICS_GEOSERVER_CUSTOM_DATASTORE || 'User_Custom_Regions',
   // ----------------------------------
   // Project Structure
   // ----------------------------------
@@ -128,7 +124,9 @@ config.globals = {
   '__PAVICS_VISUALIZE_IDENTIFIER__': JSON.stringify(config.PAVICS_VISUALIZE_IDENTIFIER),
   '__PAVICS_PERSIST_IDENTIFIER__': JSON.stringify(config.PAVICS_PERSIST_IDENTIFIER),
   '__PAVICS_PUBLISH_IDENTIFIER__': JSON.stringify(config.PAVICS_PUBLISH_IDENTIFIER),
-  '__PAVICS_DEFAULT_WORKSPACE_FOLDER__': JSON.stringify(config.PAVICS_DEFAULT_WORKSPACE_FOLDER)
+  '__PAVICS_DEFAULT_WORKSPACE_FOLDER__': JSON.stringify(config.PAVICS_DEFAULT_WORKSPACE_FOLDER),
+  '__PAVICS_GEOSERVER_CUSTOM_WORKSPACE__': JSON.stringify(config.PAVICS_GEOSERVER_CUSTOM_WORKSPACE),
+  '__PAVICS_GEOSERVER_CUSTOM_DATASTORE__': JSON.stringify(config.PAVICS_GEOSERVER_CUSTOM_DATASTORE),
 };
 // ------------------------------------
 // Validate Vendor Dependencies

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pavics-frontend",
-  "version": "1.1.7",
+  "version": "1.1.8",
   "description": "PAVICS",
   "main": "index.js",
   "engines": {
@@ -79,7 +79,7 @@
   "private": true,
   "dependencies": {
     "@material-ui/core": "^1.2.1",
-    "@material-ui/icons": "^1.1.0",
+    "@material-ui/icons": "^1.1.1",
     "@material-ui/lab": "^1.0.0-alpha.5",
     "ajv": "^5.2.0",
     "babel-cli": "^6.5.1",
@@ -108,6 +108,7 @@
     "ip": "^1.1.2",
     "jquery": "^3.0.0",
     "json-loader": "^0.5.4",
+    "jszip": "^2.5.0",
     "koa": "^2.0.0-alpha.3",
     "koa-connect-history-api-fallback": "^0.3.0",
     "koa-convert": "^1.2.0",
@@ -134,10 +135,12 @@
     "react-router": "^3.2.1",
     "react-router-redux": "^4.0.0",
     "redux": "^3.0.0",
+    "redux-devtools-extension": "^2.13.5",
     "redux-persist": "^4.4.2",
     "redux-thunk": "^2.0.0",
     "rimraf": "^2.5.1",
     "sass-loader": "^3.0.0",
+    "shp-write": "^0.3.2",
     "style-loader": "^0.13.0",
     "url": "^0.11.0",
     "url-loader": "^0.5.6",

src/components/CustomIconMenu/CustomIconMenu.js

@@ -17,7 +17,7 @@ const styles = theme => ({
  Should be used in most one-level lists containing IconButton actions menu
  Do not use in nested list since calling current methods(mostly onMenuClosed()) from parent with onRef strategy will be a nightmare to manage
  See ProjectSearchCriterias component for a taste
- FIXME: Ideally onMenuClosed() should be called after any children MenuItem.onClick event
+ TODO: Ideally onMenuClosed() should be called after any children MenuItem.onClick event
  */
 export class CustomIconMenu extends React.Component {
   static propTypes = {

src/components/ProcessMonitoring/ProcessMonitoring.js

@@ -206,7 +206,7 @@ class ProcessMonitoring extends React.Component {
                         let newOutputs = [];
                         parralelTask.outputs.forEach(output => {
                           newOutputs = [];
-                          // FIXME: No idea ATM why output.data is sometimes parsed sometimes not
+                          // TODO: No idea ATM why output.data is sometimes parsed sometimes not
                           if(output.mimeType === 'application/json' && typeof output.data === 'string') {
                             output.data = JSON.parse(output.data);
                           }

src/components/SpeedDialMenu/SpeedDialMenu.js

@@ -12,7 +12,7 @@ import ChartIcon from '@material-ui/icons/Timeline';
 import LayersIcon from '@material-ui/icons/Layers';
 import MapControlsIcon from '@material-ui/icons/MyLocation';
 import InfoIcon from '@material-ui/icons/Description';
-import DrawIcon from '@material-ui/icons/Edit'
+import DrawIcon from '@material-ui/icons/FormatShapes'
 
 const styles = theme => {
   // console.log(theme)

src/components/Visualize/Visualize.js

@@ -9,7 +9,7 @@ import LayersIcon from '@material-ui/icons/Layers';
 import MapControlsIcon from '@material-ui/icons/MyLocation';
 import InfoIcon from '@material-ui/icons/Description';
 import ChartIcon from '@material-ui/icons/Timeline';
-import DrawIcon from '@material-ui/icons/Edit';
+import DrawIcon from '@material-ui/icons/FormatShapes';
 import VisualizeWidget from './../VisualizeWidget';
 import BigColorPaletteContainer from './../../containers/BigColorPalette';
 import WidgetDrawFeaturesContainer from './../../containers/WidgetDrawFeatures';
@@ -59,7 +59,7 @@ const styles = {
     bottom: 0,
     textAlign: 'left',
     opacity: OPACITY,
-    height: '436px'
+    height: '400px'
   },
   chart: {
     opacity: OPACITY,
@@ -74,8 +74,8 @@ const styles = {
     opacity: OPACITY
   },
   customRegions: {
-    height: '420px',
-    overflow: 'auto',
+    height: '400px',
+    // overflow: 'auto',
     width: '400px',
     opacity: OPACITY
   }