diff --git a/smart-hut/src/components/dashboard/AutomationsPanel.js b/smart-hut/src/components/dashboard/AutomationsPanel.js index d3eae66..d4d828e 100644 --- a/smart-hut/src/components/dashboard/AutomationsPanel.js +++ b/smart-hut/src/components/dashboard/AutomationsPanel.js @@ -71,6 +71,7 @@ const Automation = ({ automation, devices, scenes, removeAutomation }) => { const sceneData = scenes.filter( (s) => s.id === sp.sceneId )[0]; + if (!sceneData) return ""; return ( {sceneData.name} diff --git a/smart-hut/src/components/dashboard/NewSceneDevice.js b/smart-hut/src/components/dashboard/NewSceneDevice.js index 41bf4fd..d096bd8 100644 --- a/smart-hut/src/components/dashboard/NewSceneDevice.js +++ b/smart-hut/src/components/dashboard/NewSceneDevice.js @@ -63,7 +63,6 @@ class NewSceneDevice extends Component { createState() { for (let i = 0; i < this.state.devicesAttached.length; i++) { - console.log("DIOPORCO", i, this.state.devicesAttached[i]); let device = this.props.devices.filter( (e) => this.state.devicesAttached[i] === e.id ); diff --git a/smart-hut/src/components/dashboard/ScenesPanel.js b/smart-hut/src/components/dashboard/ScenesPanel.js index 8401f1a..1950f6b 100644 --- a/smart-hut/src/components/dashboard/ScenesPanel.js +++ b/smart-hut/src/components/dashboard/ScenesPanel.js @@ -12,7 +12,6 @@ class ScenesPanel extends Component { } applyScene() { - console.log(this.props.activeScene); this.props .sceneApply(this.props.activeScene) .then(() => { diff --git a/smart-hut/src/store.js b/smart-hut/src/store.js index fce1897..350cc7b 100644 --- a/smart-hut/src/store.js +++ b/smart-hut/src/store.js @@ -301,7 +301,6 @@ function reducer(previousState, action) { break; case "AUTOMATION_SAVE": - console.log("ID: ", action.automation.id); change = { automations: { [action.automation.id]: { $set: action.automation } }, }; @@ -316,7 +315,6 @@ function reducer(previousState, action) { }; if (previousState.scenes[action.sceneState.sceneId]) { - console.log("PREVSTATE", change, previousState); change.scenes = { [action.sceneState.sceneId]: { sceneStates: { @@ -334,7 +332,6 @@ function reducer(previousState, action) { }; } newState = update(previousState, change); - console.log("NEWSTATE ", newState); break; case "ROOM_DELETE": if (!(action.roomId in previousState.rooms)) { @@ -365,13 +362,9 @@ function reducer(previousState, action) { automations: { $unset: [action.id] }, }; - console.log("CHANGE ", change); - console.log("Action id: ", action.id); newState = update(previousState, change); - console.log("NEW STATE ", newState); break; case "SCENE_DELETE": - console.log("SCENE", action.sceneId); if (!(action.sceneId in previousState.scenes)) { console.warn(`Scene to delete ${action.sceneId} does not exist`); break; @@ -417,15 +410,6 @@ function reducer(previousState, action) { newState = update(previousState, change); break; - case "SCENE_APPLY": - console.log(action); - //checking that the scene actually exists - /*if (!(action.sceneId in previousState.scenes)) { - console.warn(`Scene ${action.sceneId} does not exist`); - break; - }*/ - - break; case "DEVICE_DELETE": if (!(action.deviceId in previousState.devices)) { console.warn(`Device to delete ${action.deviceId} does not exist`); @@ -487,6 +471,7 @@ function reducer(previousState, action) { break; case "REDUX_WEBSOCKET::MESSAGE": const devices = JSON.parse(action.payload.message); + //console.log("socket", JSON.stringify(devices, null, 2)); newState = reducer(previousState, { type: "DEVICES_UPDATE", diff --git a/smart-hut/src/storeActions.js b/smart-hut/src/storeActions.js index 86ac83e..e8ee30a 100644 --- a/smart-hut/src/storeActions.js +++ b/smart-hut/src/storeActions.js @@ -62,10 +62,6 @@ const actions = { type: "STATE_DELETE", stateId, }), - sceneApply: (sceneId) => ({ - type: "SCENE_APPLY", - sceneId, - }), deviceOperationUpdate: (devices) => ({ type: "DEVICES_UPDATE", devices,