Merge branch 'dev'

inowas · Oct 7, 2020 · 414badb · 414badb
2 parents 384e119 + 204e8e6
commit 414badb
Show file tree

Hide file tree

Showing 694 changed files with 72,960 additions and 29,271 deletions.
diff --git a/.env.development b/.env.development
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -17,7 +17,7 @@ build:dev:
 
   script:
     - yarn install
-    - REACT_APP_API_URL=https://api.dev.inowas.com yarn build
+    - REACT_APP_VERSION=$(git describe --tags --always --dirty=+) REACT_APP_API_URL=https://api.dev.inowas.com yarn build
     - VERSION=$(git describe --tags --always --dirty=+) && DATE=$(date +%Y-%m-%dT%H:%M:%S) && sed -i "s/@@__VERSION__@@/${VERSION}/g;s/@@__BUILT__@@/${DATE}/g" ./build/index.html
 
   artifacts:
@@ -54,24 +54,22 @@ deploy:dev:
 build:smart-control:
   image: node:10
   stage: build
-
   script:
     - yarn install
-    - REACT_APP_API_URL=https://api.dss.smart-control.inowas.com REACT_APP_USERS_CAN_REGISTER=false REACT_APP_PUBLIC_PROJECTS_ACCESS=false yarn build
+    - REACT_APP_VERSION=$(git describe --tags --always --dirty=+) REACT_APP_API_URL=https://api.dss.smart-control.inowas.com REACT_APP_USERS_CAN_REGISTER=false REACT_APP_PUBLIC_PROJECTS_ACCESS=false yarn build
     - VERSION=$(git describe --tags --always --dirty=+) && DATE=$(date +%Y-%m-%dT%H:%M:%S) && sed -i "s/@@__VERSION__@@/${VERSION}/g;s/@@__BUILT__@@/${DATE}/g" ./build/index.html
-
   artifacts:
     paths:
       - build/
-
   only:
-    - dev
+    - tags
+  except:
+    - master
 
 deploy:smart-control:
   stage: deploy
   dependencies:
     - build:smart-control
-
   before_script:
     - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'
     - mkdir -p ~/.ssh
@@ -89,30 +87,29 @@ deploy:smart-control:
     name: smart-control
     url: https://dss.smart-control.inowas.com
   only:
-    - dev
-
+    - tags
+  except:
+    - master
 
 build:training:
   image: node:10
   stage: build
-
   script:
     - yarn install
-    - REACT_APP_API_URL=https://api.training.inowas.com yarn build
+    - REACT_APP_VERSION=$(git describe --tags --always --dirty=+) REACT_APP_API_URL=https://api.training.inowas.com REACT_APP_DISABLE_TOOL=T10 yarn build
     - VERSION=$(git describe --tags --always --dirty=+) && DATE=$(date +%Y-%m-%dT%H:%M:%S) && sed -i "s/@@__VERSION__@@/${VERSION}/g;s/@@__BUILT__@@/${DATE}/g" ./build/index.html
-
   artifacts:
     paths:
       - build/
-
   only:
+    - tags
+  except:
     - master
 
 deploy:training:
   stage: deploy
   dependencies:
     - build:training
-
   before_script:
     - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'
     - mkdir -p ~/.ssh
@@ -130,29 +127,29 @@ deploy:training:
     name: training
     url: https://training.inowas.com
   only:
+    - tags
+  except:
     - master
 
 build:prod:
   image: node:10
   stage: build
-
   script:
     - yarn install
-    - REACT_APP_API_URL=https://api.dss.inowas.com yarn build
+    - REACT_APP_VERSION=$(git describe --tags --always --dirty=+) REACT_APP_API_URL=https://api.dss.inowas.com REACT_APP_DISABLE_TOOL=T10 yarn build
     - VERSION=$(git describe --tags --always --dirty=+) && DATE=$(date +%Y-%m-%dT%H:%M:%S) && sed -i "s/@@__VERSION__@@/${VERSION}/g;s/@@__BUILT__@@/${DATE}/g" ./build/index.html
-
   artifacts:
     paths:
       - build/
-
   only:
+    - tags
+  except:
     - master
 
 deploy:prod:staging:
   stage: deploy
   dependencies:
     - build:prod
-
   before_script:
     - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'
     - mkdir -p ~/.ssh
@@ -170,13 +167,14 @@ deploy:prod:staging:
     name: staging
     url: https://staging.inowas.com
   only:
+    - tags
+  except:
     - master
 
 deploy:prod:production:
   stage: deploy
   dependencies:
     - build:prod
-
   before_script:
     - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'
     - mkdir -p ~/.ssh
@@ -195,4 +193,6 @@ deploy:prod:production:
     url: https://dss.inowas.com
   when: manual
   only:
-    - master    
+    - tags
+  except:
+    - master
diff --git a/config-overrides.js b/config-overrides.js
@@ -0,0 +1,11 @@
+module.exports = function override(config, env) {
+    config.output.globalObject = 'this';
+    config.module.rules.push({
+        test: /\.worker\.js$/,
+        use: [
+            {loader: 'worker-loader'},
+            {loader: 'babel-loader'}
+        ]
+    });
+    return config;
+};
diff --git a/package.json b/package.json
@@ -3,19 +3,22 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@turf/helpers": "6.1.4",
-    "@turf/nearest-point": "6.0.1",
-    "@turf/turf": "5.1.6",
-    "@types/react-color": "^3.0.1",
+    "@types/d3": "^5.7.2",
+    "@types/d3-contour": "^1.3.0",
+    "@types/d3-geo": "^1.11.1",
     "ajv": "6.10.2",
     "axios": "0.19.0",
+    "d3": "^5.16.0",
+    "d3-contour": "^1.3.2",
+    "d3-geo": "^1.12.1",
     "downsample": "^1.0.3",
     "epsg": "0.5.0",
+    "gaussian": "^1.1.0",
     "gulp": "3.9.1",
     "gwflowjs": "https://github.com/inowas/gwflowjs.git#master",
     "history": "4.7.2",
     "json-schema-ref-parser": "6.0.3",
-    "leaflet": "1.3.4",
+    "leaflet": "1.6.0",
     "leaflet-draw": "1.0.4",
     "lodash": "4.17.15",
     "mathjs": "5.10.3",
@@ -26,47 +29,55 @@
     "rainbowvis.js": "https://github.com/inowas/RainbowVis-JS.git#master",
     "rc-slider": "8.6.3",
     "react": "16.8.6",
+    "react-app-rewired": "^2.1.5",
     "react-beautiful-dnd": "10.1.1",
     "react-color": "2.17.3",
     "react-dom": "16.8.6",
     "react-iframe": "1.8.0",
-    "react-leaflet": "2.1.1",
-    "react-leaflet-control": "2.0.0",
+    "react-leaflet": "2.7.0",
+    "react-leaflet-control": "2.1.2",
     "react-leaflet-draw": "0.19.0",
-    "react-leaflet-fullscreen": "0.0.6",
+    "react-leaflet-fullscreen": "1.0.1",
     "react-pivottable": "0.9.0",
-    "react-redux": "5.1.1",
-    "react-router-dom": "4.3.1",
-    "react-scripts": "2.1.0",
+    "react-redux": "7.1.1",
+    "react-router-dom": "5.1.2",
+    "react-scripts": "2.1.8",
     "react-xml-parser": "1.0.8",
-    "recharts": "1.6.2",
+    "recharts": "1.8.5",
     "recompose": "0.30.0",
     "redux": "4.0.4",
     "redux-logger": "3.0.6",
     "redux-thunk": "2.3.0",
     "reproject": "1.2.4",
-    "semantic-ui-react": "0.83.0",
-    "uuid": "3.3.2",
-    "vis-react": "0.4.5"
+    "scheduler": "^0.18.0",
+    "semantic-ui-react": "0.88.1",
+    "uuid": "3.3.2"
   },
   "devDependencies": {
+    "@turf/helpers": "6.1.4",
+    "@turf/nearest-point": "6.0.1",
+    "@turf/turf": "5.1.6",
+    "@types/gaussian": "^1.1.1",
     "@types/geojson": "7946.0.7",
     "@types/jest": "24.0.12",
-    "@types/leaflet-draw": "^0.4.14",
+    "@types/leaflet-draw": "^1.0.2",
     "@types/lodash": "4.14.125",
     "@types/mathjs": "5.0.1",
     "@types/md5": "2.1.33",
     "@types/node": "12.0.0",
-    "@types/papaparse": "4.5.9",
+    "@types/papaparse": "4.5.11",
     "@types/rc-slider": "^8.6.4",
     "@types/react": "16.8.17",
     "@types/react-beautiful-dnd": "^11.0.3",
+    "@types/react-color": "^3.0.1",
     "@types/react-dom": "16.8.4",
-    "@types/react-leaflet": "2.2.1",
+    "@types/react-leaflet": "2.5.1",
     "@types/react-redux": "^7.1.0",
-    "@types/react-router-dom": "^4.3.4",
-    "@types/recharts": "^1.1.20",
+    "@types/react-router-dom": "5.1.3",
+    "@types/recharts": "1.8.5",
     "@types/recompose": "0.30.6",
+    "@types/regression": "^2.0.0",
+    "@types/scheduler": "^0.16.1",
     "@types/uuid": "3.4.4",
     "better-console": "1.0.1",
     "gulp": "3.9.1",
@@ -96,6 +107,7 @@
     "tslint": "5.18.0",
     "tslint-react": "4.0.0",
     "typescript": "3.4.5",
+    "worker-loader": "^2.0.0",
     "yamljs": "0.3.0"
   },
   "jest": {
@@ -112,11 +124,11 @@
     "**/event-stream": "4.0.1"
   },
   "scripts": {
-    "start": "react-scripts start",
-    "build": "react-scripts build",
+    "start": "react-app-rewired start",
+    "build": "react-app-rewired build",
     "lint": "tslint --project . --fix",
-    "test": "react-scripts test",
-    "test:wc": "CI=true react-scripts test --coverage --coverageReporters=lcov",
+    "test": "react-app-rewired test",
+    "test:wc": "CI=true react-app-rewired test --coverage --coverageReporters=lcov",
     "eject": "react-scripts eject"
   },
   "eslintConfig": {

diff --git a/src/App.test.js → src/App.test.tsx b/src/App.test.js → src/App.test.tsx
diff --git a/src/App.js → src/App.tsx b/src/App.js → src/App.tsx
@@ -1,18 +1,18 @@
 import React from 'react';
 import {BrowserRouter} from 'react-router-dom';
-import routes from './routes'
+import routes from './routes';
 
-import configureStore from './store';
 import {Provider} from 'react-redux';
+import configureStore from './store';
 
 const store = configureStore();
 
-const App = () => (
+const app = () => (
     <Provider store={store}>
         <BrowserRouter>
             {routes}
         </BrowserRouter>
     </Provider>
 );
 
-export default App;
+export default app;
diff --git a/src/config.default.js → src/config.default.ts b/src/config.default.js → src/config.default.ts
@@ -1,11 +1,14 @@
 const getConfig = () => ({
     BASE_URL: process.env.REACT_APP_API_URL + '/v3',
     DATADROPPER_URL: process.env.REACT_APP_DATADROPPER_URL || 'https://datadropper.inowas.com',
+    DISABLE_TOOL: process.env.REACT_APP_DISABLE_TOOL || '',
     GEOPROCESSING_URL: process.env.REACT_APP_GEOPROCESSING_URL || 'https://processing.inowas.com/rasters',
-    MODFLOW_CALCULATION_URL: process.env.REACT_APP_MODFLOW_CALCULATION_URL || 'https://modflow.inowas.com',
+    TIMEPROCESSING_URL: process.env.REACT_APP_GEOPROCESSING_URL || 'https://processing.inowas.com/timeseries/resample',
     JSON_SCHEMA_URL: process.env.REACT_APP_JSON_SCHEMA_URL || 'https://schema.inowas.com',
-    USERS_CAN_REGISTER: process.env.REACT_APP_USERS_CAN_REGISTER !== 'false',
+    MODFLOW_CALCULATION_URL: process.env.REACT_APP_MODFLOW_CALCULATION_URL || 'https://modflow.inowas.com',
     PUBLIC_PROJECTS_ACCESS: process.env.REACT_APP_PUBLIC_PROJECTS_ACCESS !== 'false',
+    USERS_CAN_REGISTER: process.env.REACT_APP_USERS_CAN_REGISTER !== 'false',
+    VERSION: process.env.REACT_APP_VERSION || 'dev'
 });
 
 export default getConfig;
diff --git a/src/core/model/collection/AbstractCollection.js b/src/core/model/collection/AbstractCollection.js
@@ -38,7 +38,7 @@ class AbstractCollection {
     findBy(property, value, options) {
         options = _.defaults({}, _.clone(options), {
             first: false,               // If set to true, findBy only returns the first found element or null
-            equal: true,                // If set to true, === is used for comparison, otherwise !== is used
+            equal: true,                // If set to true, === is used for comparator, otherwise !== is used
             returnCollection: false     // If set to true, findBy returns a new AbstractCollection, otherwise an array is returned
         });
         const items = this.all.filter(item => {