Merge branch 'fixes' into 'master'

Upgrade and regression fixes

See merge request opendc/opendc-frontend!62

8 files changed, 71 insertions, 54 deletions

diff --git a/package.json b/package.json
index f48bffff..692ca8ad 100644
--- a/package.json
+++ b/package.json
@@ -18,33 +18,33 @@
   "private": true,
   "proxy": "http://localhost:8081",
   "dependencies": {
-    "approximate-number": "^2.0.0",
-    "classnames": "^2.2.5",
-    "husky": "^0.14.3",
-    "konva": "^1.7.2",
-    "lint-staged": "^6.0.0",
-    "node-sass-chokidar": "^0.0.3",
-    "npm-run-all": "^4.1.2",
-    "prettier": "^1.9.2",
-    "prop-types": "^15.6.0",
-    "react": "^16.1.0",
-    "react-document-title": "^2.0.3",
-    "react-dom": "^16.1.0",
-    "react-fontawesome": "^1.6.1",
-    "react-google-login": "^3.0.2",
-    "react-konva": "^1.6.4",
-    "react-redux": "^5.0.5",
-    "react-router-dom": "^4.2.2",
-    "react-scripts": "^1.0.14",
-    "react-shortcuts": "^2.0.0",
-    "redux": "^3.7.2",
-    "redux-localstorage": "^0.4.1",
-    "redux-logger": "^3.0.6",
-    "redux-saga": "^0.16.0",
-    "redux-thunk": "^2.2.0",
-    "socket.io-client": "^1.7.0",
-    "svgsaver": "^0.9.0",
-    "victory": "^0.24.1"
+    "approximate-number": "~2.0.0",
+    "classnames": "~2.2.5",
+    "husky": "~4.2.5",
+    "konva": "~6.0.0",
+    "lint-staged": "~10.2.2",
+    "node-sass-chokidar": "~1.4.0",
+    "npm-run-all": "~4.1.2",
+    "prettier": "~2.0.5",
+    "prop-types": "~15.7.2",
+    "react": "~16.13.1",
+    "react-document-title": "~2.0.3",
+    "react-dom": "~16.13.1",
+    "react-fontawesome": "~1.7.1",
+    "react-google-login": "~5.1.14",
+    "react-konva": "~16.13.0-2",
+    "react-redux": "~7.2.0",
+    "react-router-dom": "~5.1.2",
+    "react-scripts": "~3.4.1",
+    "react-shortcuts": "~2.1.0",
+    "redux": "~4.0.5",
+    "redux-localstorage": "~0.4.1",
+    "redux-logger": "~3.0.6",
+    "redux-saga": "~1.1.3",
+    "redux-thunk": "~2.3.0",
+    "socket.io-client": "~2.3.0",
+    "svgsaver": "~0.9.0",
+    "victory": "~34.2.1"
   },
   "lint-staged": {
     "src/**/*.{js,jsx,json}": [
@@ -61,5 +61,17 @@
     "build": "npm run build-css && react-scripts build",
     "test": "react-scripts test --env=jsdom",
     "eject": "react-scripts eject"
+  },
+  "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/public/manifest.json b/public/manifest.json
index 6233fae0..adb82218 100644
--- a/public/manifest.json
+++ b/public/manifest.json
@@ -4,7 +4,7 @@
   "icons": [
     {
       "src": "favicon.ico",
-      "sizes": "192x192",
+      "sizes": "16x16",
       "type": "image/png"
     }
   ],
diff --git a/src/components/app/map/MapStageComponent.js b/src/components/app/map/MapStageComponent.js
index ce6a60f6..4e4972f4 100644
--- a/src/components/app/map/MapStageComponent.js
+++ b/src/components/app/map/MapStageComponent.js
@@ -7,6 +7,8 @@ import RoomHoverLayer from "../../../containers/app/map/layers/RoomHoverLayer";
 import jQuery from "../../../util/jquery";
 import { NAVBAR_HEIGHT } from "../../navigation/Navbar";
 import { MAP_MOVE_PIXELS_PER_EVENT } from "./MapConstants";
+import {Provider} from "react-redux";
+import {store} from "../../../store/configure-store";
 
 class MapStageComponent extends React.Component {
   state = {
@@ -14,8 +16,8 @@ class MapStageComponent extends React.Component {
     mouseY: 0
   };
 
-  constructor() {
-    super();
+  constructor(props) {
+    super(props);
 
     this.updateDimensions = this.updateDimensions.bind(this);
     this.updateScale = this.updateScale.bind(this);
@@ -104,15 +106,17 @@ class MapStageComponent extends React.Component {
           height={this.props.mapDimensions.height}
           onMouseMove={this.updateMousePosition.bind(this)}
         >
-          <MapLayer />
-          <RoomHoverLayer
-            mouseX={this.state.mouseX}
-            mouseY={this.state.mouseY}
-          />
-          <ObjectHoverLayer
-            mouseX={this.state.mouseX}
-            mouseY={this.state.mouseY}
-          />
+          <Provider store={store}>
+            <MapLayer />
+            <RoomHoverLayer
+              mouseX={this.state.mouseX}
+              mouseY={this.state.mouseY}
+            />
+            <ObjectHoverLayer
+              mouseX={this.state.mouseX}
+              mouseY={this.state.mouseY}
+            />
+          </Provider>
         </Stage>
       </Shortcuts>
     );
diff --git a/src/components/app/sidebars/topology/machine/UnitComponent.js b/src/components/app/sidebars/topology/machine/UnitComponent.js
index 10a310e8..7c27043d 100644
--- a/src/components/app/sidebars/topology/machine/UnitComponent.js
+++ b/src/components/app/sidebars/topology/machine/UnitComponent.js
@@ -49,18 +49,16 @@ class UnitComponent extends React.Component {
             this.props.unit.generation}
         </span>
         <span>
-          <a
+          <span
             tabIndex="0"
-            className="unit-info-popover btn btn-outline-info mr-1"
+            className="unit-info-popover btn btn-outline-info mr-1 fa fa-info-circle"
             role="button"
             data-toggle="popover"
             data-trigger="focus"
             title="Unit information"
             data-content={unitInfo}
             data-html="true"
-          >
-            <span className="fa fa-info-circle" />
-          </a>
+          />
           {this.props.inSimulation ? (
             undefined
           ) : (
diff --git a/src/components/modals/Modal.js b/src/components/modals/Modal.js
index 367cf2da..19337db8 100644
--- a/src/components/modals/Modal.js
+++ b/src/components/modals/Modal.js
@@ -22,8 +22,8 @@ class Modal extends React.Component {
   // 'close' triggers)
   visible = false;
 
-  constructor() {
-    super();
+  constructor(props) {
+    super(props);
     this.id = "modal-" + Modal.idCounter++;
   }
 
diff --git a/src/containers/auth/Login.js b/src/containers/auth/Login.js
index 28e95963..4afb393c 100644
--- a/src/containers/auth/Login.js
+++ b/src/containers/auth/Login.js
@@ -31,11 +31,12 @@ class LoginContainer extends React.Component {
         clientId={process.env.REACT_APP_OAUTH_CLIENT_ID}
         onSuccess={this.onAuthResponse.bind(this)}
         onFailure={this.onAuthResponse.bind(this)}
-        className="login btn btn-primary"
+        render={renderProps => (
+          <span onClick={renderProps.onClick} className="login btn btn-primary">
+            <span className="fa fa-google" /> Login with Google
+          </span>
+        )}
       >
-        <span>
-          <span className="fa fa-google" /> Login with Google
-        </span>
       </GoogleLogin>
     );
   }
diff --git a/src/sagas/experiments.js b/src/sagas/experiments.js
index 9b8c1a8f..d9c410f7 100644
--- a/src/sagas/experiments.js
+++ b/src/sagas/experiments.js
@@ -1,5 +1,4 @@
-import { delay } from "redux-saga";
-import { call, put, select } from "redux-saga/effects";
+import { call, put, select, delay } from "redux-saga/effects";
 import { addPropToStoreObject, addToStore } from "../actions/objects";
 import { setLastSimulatedTick } from "../actions/simulation/tick";
 import { addBatchToStates } from "../actions/states";
diff --git a/src/store/configure-store.js b/src/store/configure-store.js
index 2c5f46fb..02faf073 100644
--- a/src/store/configure-store.js
+++ b/src/store/configure-store.js
@@ -24,12 +24,15 @@ const middlewares = [
   viewportAdjustmentMiddleware
 ];
 
+export let store = undefined;
+
 export default function configureStore() {
-  const store = createStore(
+  const configuredStore = createStore(
     rootReducer,
     compose(persistState("auth"), applyMiddleware(...middlewares))
   );
   sagaMiddleware.run(rootSaga);
+  store = configuredStore;
 
-  return store;
+  return configuredStore;
 }