Merge branch 'redux-fix' into 'dev'

Fix to socket state reducer and state updated in devices that use circularinput

See merge request sa4-2020/the-sanmarinoes/frontend!84

smart-hut/src/components/dashboard/devices/Light.js

@@ -44,6 +44,12 @@ class Light extends Component {
     this.setIntensity = this.setIntensity.bind(this);
   }
 
+  componentDidUpdate(prevProps, prevState) {
+    if (this.props.device.intensity !== prevProps.device.intensity) {
+      this.setState({ intensity: this.props.device.intensity, timeout: null });
+    }
+  }
+
   get turnedOn() {
     return this.props.device.on;
   }

smart-hut/src/components/dashboard/devices/Sensor.js

@@ -62,6 +62,20 @@ class Sensor extends Component {
     return this.props.device.name;
   };
 
+  componentDidUpdate(prevProps) {
+    if (
+      this.props.device.kind === "sensor" &&
+      this.props.device.value !== prevProps.device.value
+    ) {
+      this.setState({ value: this.props.device.value });
+    } else if (
+      this.props.device.kind === "motionSensor" &&
+      this.props.device.detected !== prevProps.device.detected
+    ) {
+      this.setState({ motion: true, detected: this.props.device.detected });
+    }
+  }
+
   componentDidMount() {
     if (this.props.device.kind === "sensor") {
       switch (this.props.device.sensor) {

smart-hut/src/store.js

@@ -89,12 +89,16 @@ function reducer(previousState, action) {
         };
 
         for (const device of action.devices) {
-          const roomId = previousState.devices[device.id].roomId;
+          if (!previousState.devices[device.id]) continue;
-          change.rooms[roomId] = change.rooms[roomId] || {
-            devices: { $remove: [] },
-          };
-          change.rooms[roomId].devices.$remove.push(device.id);
           change.devices.$unset.push(device.id);
+          const roomId = previousState.devices[device.id].roomId;
+
+          if (roomId in previousState.rooms) {
+            change.rooms[roomId] = change.rooms[roomId] || {
+              devices: { $remove: [] },
+            };
+            change.rooms[roomId].devices.$remove.push(device.id);
+          }
         }
       } else {
         // otherwise, just delete all devices and all joins