Merge dev into master, Release 1.1 (#305)

* Feature/1912 - Implement heat transport (#275) * Feature/1912 - Implement heat transport * Feature/1944 - Add improvements to frontend (#289) * Convert data to daily data, right after selecting sensor * Use same x-axis for both result charts * Implement second time-slider * Add csv export * Update react-scripts to 3.0.0 * Feature/1946 - Add points to results charts (#290) * Add min, max and turning-points * Fix saving meta data * Support/1935 bump packages (#292) * Feature/1946 - Add points to results charts * Add min, max and turning-points * Fix saving meta data * Feature/1912 - Implement heat transport frontend * Implement t19 * Suppress tslint errors for now (WIP) * Feature/1912 - Implement heat transport frontend * Implement instance creation for t19 * Update react-scripts to 3.4.3, typescript to 3.9.7 * Fix/Omit all warnings generated starting the app Co-authored-by: Robert Schlick <[email protected]> * Support/1935 bump packages (#293) * Feature/1946 - Add points to results charts * Add min, max and turning-points * Fix saving meta data * Feature/1912 - Implement heat transport frontend * Implement t19 * Suppress tslint errors for now (WIP) * Feature/1912 - Implement heat transport frontend * Implement instance creation for t19 * Update react-scripts to 3.4.3, typescript to 3.9.7 * Fix/Omit all warnings generated starting the app * Fix preflight-warning Co-authored-by: Robert Schlick <[email protected]> * Support/1935 bump packages (#294) * Feature/1946 - Add points to results charts * Add min, max and turning-points * Fix saving meta data * Feature/1912 - Implement heat transport frontend * Implement t19 * Suppress tslint errors for now (WIP) * Feature/1912 - Implement heat transport frontend * Implement instance creation for t19 * Update react-scripts to 3.4.3, typescript to 3.9.7 * Fix/Omit all warnings generated starting the app * Fix preflight-warning * Fix preflight-warning * Upgrade to node 12 Co-authored-by: Robert Schlick <[email protected]> * Refactoring router T10 (#295) * Support/1949 upgrade semantic ui (#296) * Update Semantic-Ui-React and other packages/types * Fix version of json-ref-parser * Upgrade papaparse to v5.3 and adapt type-handling * Support/1950 upgrade T02 to functional component (#297) * Upgrade T02 to functional component * Feature/1912 implement heat transport frontend (#298) * Feature/1946 - Add points to results charts * Add min, max and turning-points * Fix saving meta data * Feature/1912 - Implement heat transport frontend * Implement t19 * Suppress tslint errors for now (WIP) * Feature/1912 - Implement heat transport frontend * Implement instance creation for t19 * Feature/1912 - Implement heat transport frontend * Move heat transport to new tool * Feature/1912 - Implement heat transport frontend * Finish implementation of new tool Co-authored-by: Ralf Junghanns <[email protected]> * Fix imports * Fix import bug * Fix bug loading RTM-instances This fix changes request that only own RTM-Projects will be fetched. * Support/1951 improvements kwb heattransport frontend (#299) * Improvements Frontend Heat Transport * Save-input-data works more smoothly * no reloading of the whole component * Support/1951 improvements kwb heattransport frontend (#300) * Improvements Frontend Heat Transport * Save-input-data works more smoothly * no reloading of the whole component * Eslint fixes only * Remove TimeSlider For changing the period of time, RTM can be used ATM * T10: Autoselect first sensor parameter (#301) * Update datepicker-component (#302) * Fix various bug reported in T19 (#303) Reported in #1961 * Update README.md (#304) Co-authored-by: Robert <[email protected]>
inowas · Oct 21, 2020 · 864c8f3 · 864c8f3
1 parent 414badb
commit 864c8f3
Show file tree

Hide file tree

Showing 271 changed files with 9,613 additions and 29,547 deletions.
diff --git a/.env.test b/.env.test
@@ -1,2 +1 @@
 REACT_APP_API_URL=https://inowas.test
-NODE_PATH=src
diff --git a/.eslintignore b/.eslintignore
@@ -0,0 +1,4 @@
+build
+imports/
+node_modules/
+src/semantic
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -0,0 +1,45 @@
+{
+  "env": {
+    "browser": true,
+    "commonjs": true,
+    "node": true,
+    "es6": true
+  },
+  "extends": [
+    "eslint:recommended",
+    "plugin:react/recommended",
+    "plugin:react-hooks/recommended",
+    "plugin:@typescript-eslint/recommended"
+  ],
+  "plugins": [
+    "sort-imports-es6-autofix"
+  ],
+  "parserOptions": {
+    "ecmaVersion": 2018
+  },
+  "rules": {
+    "quotes": [
+      "warn",
+      "single",
+      "avoid-escape"
+    ],
+    "no-console": "off",
+    "strict": [
+      "error",
+      "global"
+    ],
+    "array-callback-return": "warn",
+    "curly": "warn",
+    "@typescript-eslint/explicit-module-boundary-types": "off",
+    "@typescript-eslint/no-explicit-any": "off",
+    "no-prototype-builtins": "warn",
+    "no-case-declarations": "warn",
+    "no-mixed-operators": "warn",
+    "sort-imports-es6-autofix/sort-imports-es6": "warn"
+  },
+  "settings": {
+    "react": {
+      "version": "detect"
+    }
+  }
+}
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+* text=auto eol=lf
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -4,15 +4,15 @@ stages:
   - deploy
 
 test:
-  image: node:10
+  image: node:12
   stage: test
 
   script:
     - yarn install
     - CI=true yarn test --all --colors
 
 build:dev:
-  image: node:10
+  image: node:12
   stage: build
 
   script:

diff --git a/README.md b/README.md
@@ -1,23 +1,29 @@
-This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
+# INOWAS DSS Frontend Application
+
+This application is developed by the INOWAS team and provides different tools for managed aquifer recharge.
+
+It's based and bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
+
+
 
 ## Available Scripts
 
 In the project directory, you can run:
 
-### `npm start`
+### `yarn start`
 
 Runs the app in the development mode.<br>
 Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
 
 The page will reload if you make edits.<br>
 You will also see any lint errors in the console.
 
-### `npm test`
+### `yarn test`
 
 Launches the test runner in the interactive watch mode.<br>
 See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
 
-### `npm run build`
+### `yarn build`
 
 Builds the app for production to the `build` folder.<br>
 It correctly bundles React in production mode and optimizes the build for the best performance.
@@ -27,15 +33,7 @@ Your app is ready to be deployed!
 
 See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
 
-### `npm run eject`
-
-**Note: this is a one-way operation. Once you `eject`, you can’t go back!**
-
-If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
-
-Instead, it will copy all the configuration files and the transitive dependencies (Webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.
-
-You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.
+### `yarn eject`
 
 ## Learn More
 

diff --git a/config-overrides.js b/config-overrides.js
@@ -7,5 +7,6 @@ module.exports = function override(config, env) {
             {loader: 'babel-loader'}
         ]
     });
+
     return config;
 };
diff --git a/package.json b/package.json
@@ -1,114 +1,97 @@
 {
-  "name": "create-react-app",
-  "version": "0.1.0",
+  "name": "inowas-dss-frontend-app",
+  "version": "1.0.1",
   "private": true,
   "dependencies": {
-    "@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",
+    "ajv": "^6.12.6",
+    "axios": "^0.20.0",
+    "d3": "^6.2.0",
+    "d3-contour": "^2.0.0",
     "d3-geo": "^1.12.1",
-    "downsample": "^1.0.3",
-    "epsg": "0.5.0",
+    "downsample": "^1.3.0",
+    "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.6.0",
-    "leaflet-draw": "1.0.4",
-    "lodash": "4.17.15",
-    "mathjs": "5.10.3",
-    "md5": "2.2.1",
-    "moment": "2.22.2",
-    "papaparse": "4.6.3",
-    "prop-types": "15.7.2",
+    "history": "^5.0.0",
+    "json-schema-ref-parser": "^6.1.0",
+    "leaflet": "^1.7.1",
+    "leaflet-draw": "^1.0.4",
+    "lodash": "^4.17.20",
+    "mathjs": "^5.10.3",
+    "md5": "^2.3.0",
+    "moment": "^2.29.1",
+    "papaparse": "^5.3.0",
+    "prop-types": "^15.7.2",
     "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-app-rewired": "^2.1.6",
+    "react-beautiful-dnd": "^13.0.0",
+    "react-color": "^2.18.1",
     "react-dom": "16.8.6",
-    "react-iframe": "1.8.0",
-    "react-leaflet": "2.7.0",
-    "react-leaflet-control": "2.1.2",
-    "react-leaflet-draw": "0.19.0",
-    "react-leaflet-fullscreen": "1.0.1",
-    "react-pivottable": "0.9.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.8.5",
-    "recompose": "0.30.0",
-    "redux": "4.0.4",
-    "redux-logger": "3.0.6",
-    "redux-thunk": "2.3.0",
-    "reproject": "1.2.4",
-    "scheduler": "^0.18.0",
-    "semantic-ui-react": "0.88.1",
-    "uuid": "3.3.2"
+    "react-iframe": "^1.8.0",
+    "react-leaflet": "^2.7.0",
+    "react-leaflet-control": "^2.1.2",
+    "react-leaflet-draw": "^0.19.0",
+    "react-leaflet-fullscreen": "^1.0.1",
+    "react-pivottable": "^0.10.0",
+    "react-redux": "^7.2.1",
+    "react-router-dom": "^5.2.0",
+    "react-semantic-ui-datepickers": "^2.11.0",
+    "react-scripts": "^3.4.3",
+    "react-xml-parser": "^1.1.8",
+    "recharts": "^1.8.5",
+    "recompose": "^0.30.0",
+    "redux": "^4.0.5",
+    "redux-logger": "^3.0.6",
+    "redux-thunk": "^2.3.0",
+    "reproject": "^1.2.6",
+    "semantic-ui-react": "^2.0.0",
+    "uuid": "^3.4.0"
   },
   "devDependencies": {
-    "@turf/helpers": "6.1.4",
-    "@turf/nearest-point": "6.0.1",
-    "@turf/turf": "5.1.6",
+    "@turf/helpers": "^6.1.4",
+    "@turf/nearest-point": "^6.0.1",
+    "@turf/turf": "^5.1.6",
+    "@types/d3": "^5.16.3",
+    "@types/d3-contour": "^1.3.0",
+    "@types/d3-geo": "^1.11.1",
     "@types/gaussian": "^1.1.1",
-    "@types/geojson": "7946.0.7",
-    "@types/jest": "24.0.12",
+    "@types/geojson": "^7946.0.7",
+    "@types/jest": "^26.0.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.11",
+    "@types/lodash": "^4.14.162",
+    "@types/mathjs": "^5.0.1",
+    "@types/md5": "^2.2.0",
+    "@types/node": "^12.0.0",
+    "@types/papaparse": "^5.2.4",
     "@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.5.1",
-    "@types/react-redux": "^7.1.0",
-    "@types/react-router-dom": "5.1.3",
-    "@types/recharts": "1.8.5",
-    "@types/recompose": "0.30.6",
+    "@types/react": "^16.8.6",
+    "@types/react-beautiful-dnd": "^13.0.0",
+    "@types/react-color": "^3.0.4",
+    "@types/react-dom": "^16.8.4",
+    "@types/react-leaflet": "^2.5.2",
+    "@types/react-redux": "^7.1.9",
+    "@types/react-router-dom": "^5.1.6",
+    "@types/recharts": "^1.8.16",
+    "@types/recompose": "^0.30.7",
     "@types/regression": "^2.0.0",
     "@types/scheduler": "^0.16.1",
-    "@types/uuid": "3.4.4",
-    "better-console": "1.0.1",
-    "gulp": "3.9.1",
-    "gulp-autoprefixer": "6.0.0",
-    "gulp-chmod": "2.0.0",
-    "gulp-clean-css": "3.10.0",
-    "gulp-clone": "2.0.1",
-    "gulp-concat": "2.6.1",
-    "gulp-concat-css": "3.1.0",
-    "gulp-dedupe": "0.0.2",
-    "gulp-flatten": "0.4.0",
-    "gulp-header": "2.0.5",
-    "gulp-help": "1.6.1",
-    "gulp-if": "2.0.2",
-    "gulp-less": "4.0.1",
-    "gulp-plumber": "1.2.0",
-    "gulp-print": "5.0.0",
-    "gulp-rename": "1.4.0",
-    "gulp-replace": "1.0.0",
-    "gulp-rtlcss": "1.3.0",
-    "gulp-uglify": "3.0.1",
-    "gulp-watch": "5.0.1",
-    "redux-devtools-extension": "2.13.5",
-    "replace-ext": "1.0.0",
-    "require-dot-file": "0.4.0",
+    "@types/uuid": "^3.4.9",
+    "@typescript-eslint/eslint-plugin": "^4.4.1",
+    "@typescript-eslint/parser": "^4.4.1",
+    "better-console": "^1.0.1",
+    "eslint": "^6.6.0",
+    "eslint-plugin-sort-imports-es6-autofix": "^0.5.0",
+    "eslint-plugin-react": "^7.20.4",
+    "eslint-plugin-react-hooks": "^4.1.2",
+    "redux-devtools-extension": "2.13.8",
+    "replace-ext": "^2.0.0",
+    "require-dot-file": "^0.4.0",
     "run-sequence": "2.2.1",
-    "tslint": "5.18.0",
-    "tslint-react": "4.0.0",
-    "typescript": "3.4.5",
+    "typescript": "^3.9.7",
     "worker-loader": "^2.0.0",
-    "yamljs": "0.3.0"
+    "yamljs": "^0.3.0"
   },
   "jest": {
     "collectCoverageFrom": [
@@ -121,23 +104,33 @@
     ]
   },
   "resolutions": {
-    "**/event-stream": "4.0.1"
+    "**/event-stream": "4.0.1",
+    "**/@typescript-eslint/eslint-plugin": "^4.1.1",
+    "**/@typescript-eslint/parser": "^4.1.1"
   },
   "scripts": {
     "start": "react-app-rewired start",
     "build": "react-app-rewired build",
-    "lint": "tslint --project . --fix",
+    "lint": "eslint --ext .ts --ext .tsx .",
     "test": "react-app-rewired test",
-    "test:wc": "CI=true react-app-rewired test --coverage --coverageReporters=lcov",
-    "eject": "react-scripts eject"
+    "test:wc": "CI=true react-app-rewired test --coverage --coverageReporters=lcov"
   },
   "eslintConfig": {
-    "extends": "react-app"
+    "extends": "react-app",
+    "rules": {
+      "@typescript-eslint/no-unused-vars": "off"
+    }
   },
-  "browserslist": [
-    ">0.2%",
-    "not dead",
-    "not ie <= 11",
-    "not op_mini all"
-  ]
+  "browserslist": {
+    "production": [
+      ">0.2%",
+      "not dead",
+      "not op_mini all"
+    ],
+    "development": [
+      "last 1 chrome version",
+      "last 1 firefox version",
+      "last 1 safari version"
+    ]
+  }
 }
diff --git a/src/core/model/flopy/packages/mf/FlopyModflow.ts b/src/core/model/flopy/packages/mf/FlopyModflow.ts
@@ -300,6 +300,8 @@ export default class FlopyModflow extends GenericObject<IFlopyModflow> {
                     oc = FlopyModflowMfoc.fromObject(this._props.oc).update(model.stressperiods.stressperiods.length,
                         this._props.oc.stress_period_data) :
                     oc = FlopyModflowMfoc.create(model.stressperiods.stressperiods.length);
+                // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+                // @ts-ignore
                 oc ? this._props.oc = oc.toObject() : delete this._props.oc;
                 break;
 

diff --git a/src/core/model/flopy/packages/mf/FlopyModflowMfchd.ts b/src/core/model/flopy/packages/mf/FlopyModflowMfchd.ts
@@ -58,6 +58,7 @@ export default class FlopyModflowMfchd extends FlopyModflowLineBoundary<IFlopyMo
     public static fromObject(obj: IPropertyValueObject): FlopyModflowMfchd {
         const d: any = FlopyModflowPackage.cloneDeep(defaults);
         for (const key in d) {
+            // eslint-disable-next-line no-prototype-builtins
             if (d.hasOwnProperty(key) && obj.hasOwnProperty(key)) {
                 d[key] = obj[key];
             }
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		REACT_APP_API_URL=https://inowas.test
		NODE_PATH=src
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,5 +7,6 @@ module.exports = function override(config, env) { @@
                 {loader: 'babel-loader'}
             ]
         });
         return config;
     };