Merge branch 'fixes' into 'master'

Upgrade and regression fixes

See merge request opendc/opendc-frontend!62

2 files changed, 18 insertions, 16 deletions

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
           ) : (