Merge pull request #356 from inowas/dev

Merge dev into master

.eslintignore

@@ -2,3 +2,4 @@ build
 imports/
 node_modules/
 src/semantic
+src/test

.eslintrc.json

@@ -32,10 +32,11 @@
     "curly": "warn",
     "@typescript-eslint/explicit-module-boundary-types": "off",
     "@typescript-eslint/no-explicit-any": "off",
-    "no-prototype-builtins": "warn",
+    "no-prototype-builtins": "off",
     "no-case-declarations": "warn",
-    "no-mixed-operators": "warn",
-    "sort-imports-es6-autofix/sort-imports-es6": "warn"
+    "no-mixed-operators": "off",
+    "sort-imports-es6-autofix/sort-imports-es6": "warn",
+    "react/prop-types": "off"
   },
   "settings": {
     "react": {

package.json

@@ -24,7 +24,7 @@
     "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": "16.14.0",
     "react-app-rewired": "^2.1.6",
     "react-beautiful-dnd": "^13.0.0",
     "react-color": "^2.18.1",
@@ -37,16 +37,16 @@
     "react-pivottable": "^0.11.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-scripts": "^3.4.4",
+    "react-semantic-ui-datepickers": "^2.12.0",
     "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",
+    "semantic-ui-react": "^2.0.1",
     "uuid": "^3.4.0"
   },
   "devDependencies": {
@@ -80,11 +80,12 @@
     "@types/uuid": "^3.4.9",
     "@typescript-eslint/eslint-plugin": "^4.4.1",
     "@typescript-eslint/parser": "^4.4.1",
+    "babel-jest": "^24.9.0",
     "better-console": "^1.0.1",
-    "eslint": "^6.6.0",
+    "eslint": "^6.8.0",
+    "eslint-plugin-react": "^6.10.3",
+    "eslint-plugin-react-hooks": "^4.2.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",
@@ -115,12 +116,6 @@
     "test": "react-app-rewired test",
     "test:wc": "CI=true react-app-rewired test --coverage --coverageReporters=lcov"
   },
-  "eslintConfig": {
-    "extends": "react-app",
-    "rules": {
-      "@typescript-eslint/no-unused-vars": "off"
-    }
-  },
   "browserslist": {
     "production": [
       ">0.2%",

src/App.test.tsx

@@ -1,6 +1,6 @@
+import App from './App';
 import React from 'react';
 import ReactDOM from 'react-dom';
-import App from './App';
 
 it('renders without crashing', () => {
   const div = document.createElement('div');

src/App.tsx

@@ -1,5 +1,5 @@
-import React from 'react';
 import {BrowserRouter} from 'react-router-dom';
+import React from 'react';
 import routes from './routes';
 
 import {Provider} from 'react-redux';

src/core/model/collection/AbstractCollection.js

@@ -24,7 +24,7 @@ class AbstractCollection {
 
     get length() {
         return this._items.length;
-    };
+    }
 
     add(item) {
         this._items.push(this.validateInput(item));

src/core/model/collection/Collection.ts

@@ -40,7 +40,7 @@ export abstract class Collection<T extends IItem> {
         return this._items.filter((item) => (item[property].toLowerCase()).indexOf(value.toLowerCase()) > -1);
     }
 
-    public findBy(property: string, value: any, equal: boolean = true): T[] {
+    public findBy(property: string, value: any, equal = true): T[] {
         const items = this.all.filter((item) => {
             if (equal) {
                 return item[property] === value;
@@ -50,7 +50,7 @@ export abstract class Collection<T extends IItem> {
         return items || [];
     }
 
-    public findFirstBy(property: string, value: any, equal: boolean = true) {
+    public findFirstBy(property: string, value: any, equal = true) {
         const items = this.findBy(property, value, equal);
         return items.length > 0 ? items[0] : null;
     }
@@ -84,7 +84,7 @@ export abstract class Collection<T extends IItem> {
         }, 0);
     }
 
-    public update(updatedItem: T, createIfNotExisting: boolean = true) {
+    public update(updatedItem: T, createIfNotExisting = true) {
         let isNew = true;
 
         this._items = this._items.map((item) => {

src/core/model/flopy/helpers.ts

@@ -1,7 +1,4 @@
-import {sortedUniq, uniq} from 'lodash';
-import {Moment} from 'moment';
 import {Array2D} from '../geometry/Array2D.type';
-import {ICell} from '../geometry/Cells.type';
 import {Cells} from '../modflow';
 import {
     EvapotranspirationBoundary,
@@ -10,10 +7,13 @@ import {
     PointBoundary,
     RechargeBoundary
 } from '../modflow/boundaries';
+import {ICell} from '../geometry/Cells.type';
+import {IObsData} from './packages/mf/FlopyModflowMfhob';
+import {IPropertyValueObject} from '../types';
+import {Moment} from 'moment';
+import {sortedUniq, uniq} from 'lodash';
 import FlowAndHeadBoundary from '../modflow/boundaries/FlowAndHeadBoundary';
 import Stressperiods from '../modflow/Stressperiods';
-import {IPropertyValueObject} from '../types';
-import {IObsData} from './packages/mf/FlopyModflowMfhob';
 
 export const min = (a: Array2D<number> | number) => {
 

src/core/model/flopy/packages/FlopyPackages.ts

@@ -1,14 +1,14 @@
-import md5 from 'md5';
-import {validate as jsonSchemaValidate} from '../../../../services/jsonSchemaValidator';
+import {IFlopyCalculation, IFlopyPackages} from './FlopyPackages.type';
+import {IPropertyValueObject} from '../../types';
 import {ModflowModel, Transport, VariableDensity} from '../../modflow';
+import {validate as jsonSchemaValidate} from '../../../../services/jsonSchemaValidator';
 import BoundaryCollection from '../../modflow/boundaries/BoundaryCollection';
-import Soilmodel from '../../modflow/soilmodel/Soilmodel';
-import {IPropertyValueObject} from '../../types';
-import {IFlopyCalculation, IFlopyPackages} from './FlopyPackages.type';
 import FlopyModflow from './mf/FlopyModflow';
 import FlopyModpath from './mp/FlopyModpath';
 import FlopyMt3d from './mt/FlopyMt3d';
 import FlopySeawat from './swt/FlopySeawat';
+import Soilmodel from '../../modflow/soilmodel/Soilmodel';
+import md5 from 'md5';
 
 import {JSON_SCHEMA_URL} from '../../../../services/api';
 

src/core/model/flopy/packages/index.ts

@@ -0,0 +1,5 @@
+import {FlopySeawat} from './swt';
+
+export {
+    FlopySeawat
+}