smarthut/frontend
2
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix to stateOrDevice

Browse source
This commit is contained in:
Jacob Salvi 2020-04-25 17:45:22 +02:00
parent fd5c28b1c9
commit b301c97212
6 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
smart-hut/src/components/dashboard/devices/Curtain.js
View file

@ -110,8 +110,7 @@ const mapStateToProps = (state, ownProps) => ({
if(state.active.activeTab==="Devices"){ if(state.active.activeTab==="Devices"){
return state.devices[ownProps.id]; return state.devices[ownProps.id];
}else{ }else{
const sceneState = state.sceneStates[ownProps.id]; return state.sceneStates[ownProps.id];
return state.devices[sceneState];
} }
}, },
//device: state.devices[ownProps.id], //device: state.devices[ownProps.id],

3
smart-hut/src/components/dashboard/devices/Dimmer.js
View file

@ -133,8 +133,7 @@ const mapStateToProps = (state, ownProps) => ({
if(state.active.activeTab==="Devices"){ if(state.active.activeTab==="Devices"){
return state.devices[ownProps.id]; return state.devices[ownProps.id];
}else{ }else{
const sceneState = state.sceneStates[ownProps.id]; return state.sceneStates[ownProps.id];
return state.devices[sceneState];
} }
}, },
}); });

3
smart-hut/src/components/dashboard/devices/Light.js
View file

@ -160,8 +160,7 @@ const mapStateToProps = (state, ownProps) => ({
if(state.active.activeTab==="Devices"){ if(state.active.activeTab==="Devices"){
return state.devices[ownProps.id]; return state.devices[ownProps.id];
}else{ }else{
const sceneState = state.sceneStates[ownProps.id]; return state.sceneStates[ownProps.id];
return state.devices[sceneState];
} }
}, },
//device: state.devices[ownProps.id], //device: state.devices[ownProps.id],

3
smart-hut/src/components/dashboard/devices/Sensor.js
View file

@ -196,8 +196,7 @@ const mapStateToProps = (state, ownProps) => ({
if(state.active.activeTab==="Devices"){ if(state.active.activeTab==="Devices"){
return state.devices[ownProps.id]; return state.devices[ownProps.id];
}else{ }else{
const sceneState = state.sceneStates[ownProps.id]; return state.sceneStates[ownProps.id];
return state.devices[sceneState];
} }
}, },
}); });

3
smart-hut/src/components/dashboard/devices/SmartPlug.js
View file

@ -72,8 +72,7 @@ const mapStateToProps = (state, ownProps) => ({
if(state.active.activeTab==="Devices"){ if(state.active.activeTab==="Devices"){
return state.devices[ownProps.id]; return state.devices[ownProps.id];
}else{ }else{
const sceneState = state.sceneStates[ownProps.id]; return state.sceneStates[ownProps.id];
return state.devices[sceneState];
} }
}, },
}); });

17
smart-hut/src/remote.js
View file

@ -396,6 +396,23 @@ export const RemoteService = {
}; };
}, },
deleteState: (id,type)=>{
return (dispatch) => {
let url;
if(type=="dimmableState"){
url="/dimmableState"
}else{
url="/switchableState"
}
return Endpoint.delete(url+`/${id}`)
.then((res) => dispatch(actions.statesUpdate([res.data])))
.catch((err) => {
console.warn(`reset error`, err);
throw new RemoteError(["Network error"]);
});
};
},
/** /**
* Creates/Updates a device with the given data. If * Creates/Updates a device with the given data. If
* data.id is truthy, then a update call is performed, * data.id is truthy, then a update call is performed,