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

Merge branch 'fix-bug-sonaqube' into 'dev'

Browse source 
Fix bug sonarqube

See merge request sa4-2020/the-sanmarinoes/frontend!149
This commit is contained in:
Andrea Brites Marto 2020-05-12 16:37:22 +02:00
commit 364f58fa24
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -557,7 +557,6 @@ export const RemoteService = {
*/ */
saveAutomation: (data) => { saveAutomation: (data) => {
const { automation, triggerList, order } = data; const { automation, triggerList, order } = data;
console.log('automation: ', automation, triggerList, order);
automation.triggers = []; automation.triggers = [];
automation.scenes = []; automation.scenes = [];
return (dispatch) => { return (dispatch) => {
@ -566,15 +565,16 @@ export const RemoteService = {
const urlRangeTrigger = '/rangeTrigger'; const urlRangeTrigger = '/rangeTrigger';
const urlScenePriority = '/scenePriority'; const urlScenePriority = '/scenePriority';
const rangeTriggerList = triggerList.filter((trigger) => trigger.hasOwnProperty('operand')); const rangeTriggerList = triggerList.filter((trigger) => 'operand' in trigger);
const booleanTriggerList = triggerList.filter( const booleanTriggerList = triggerList.filter(
(trigger) => !trigger.hasOwnProperty('operand'), (trigger) => !('operand' in trigger),
); );
return Endpoint.post(urlAutomation, {}, automation).then( return Endpoint.post(urlAutomation, {}, automation).then(
async (automationRes) => { async (automationRes) => {
const { id } = automationRes.data; const { id } = automationRes.data;
// Introduce the range triggers in the automation // Introduce the range triggers in the automation
const resRangeTriggers = [];
for (const t of rangeTriggerList) { for (const t of rangeTriggerList) {
const trigger = { const trigger = {
automationId: id, automationId: id,
@ -582,38 +582,39 @@ export const RemoteService = {
operator: t.operand, operator: t.operand,
range: t.value, range: t.value,
}; };
const resRange = await Endpoint.post(urlRangeTrigger, {}, trigger); resRangeTriggers.push(Endpoint.post(urlRangeTrigger, {}, trigger));
automation.triggers.push(resRange.data);
} }
automation.triggers = (await Promise.all(resRangeTriggers)).map((v) => v.data);
const resBoolTriggers = [];
for (const t of booleanTriggerList) { for (const t of booleanTriggerList) {
const trigger = { const trigger = {
automationId: id, automationId: id,
deviceId: t.device, deviceId: t.device,
on: t.value, on: t.value,
}; };
const resBoolean = await Endpoint.post( resBoolTriggers.push(Endpoint.post(
urlBooleanTrigger, urlBooleanTrigger,
{}, {},
trigger, trigger,
); ));
automation.triggers.push(resBoolean.data);
console.log('TRIGGERS: ', automation);
} }
automation.triggers.push(...((await Promise.all(resBoolTriggers)).map((v) => v.data)));
const resScenePriorities = [];
for (const [priority, sceneId] of order.entries()) { for (const [priority, sceneId] of order.entries()) {
const scenePriority = { const scenePriority = {
automationId: id, automationId: id,
priority, priority,
sceneId, sceneId,
}; };
const resScenes = await Endpoint.post( resScenePriorities.push(Endpoint.post(
urlScenePriority, urlScenePriority,
{}, {},
scenePriority, scenePriority,
); ));
automation.scenes.push(resScenes.data);
} }
automation.scenes = (await Promise.all(resScenePriorities)).map((v) => v.data);
automation.id = id; automation.id = id;
dispatch(actions.automationSave(automation)); dispatch(actions.automationSave(automation));
}, },