merged in hotfixes and kept staging protobuf
This commit is contained in:
commit
d7c9734c06
7 changed files with 47 additions and 43 deletions
|
|
@ -131,7 +131,7 @@ export default function DevicePage() {
|
|||
//flip operator and send negative comparitor to save
|
||||
interaction.settings.conditions.forEach(condition => {
|
||||
//coming back from the backend as a string for some reason
|
||||
if (condition.comparison.toString() === "RELATIONAL_OPERATOR_GREATER_THAN") {
|
||||
if (condition.comparison === quack.RelationalOperator.RELATIONAL_OPERATOR_GREATER_THAN) {
|
||||
condition.comparison = quack.RelationalOperator.RELATIONAL_OPERATOR_LESS_THAN;
|
||||
} else {
|
||||
condition.comparison = quack.RelationalOperator.RELATIONAL_OPERATOR_GREATER_THAN;
|
||||
|
|
|
|||
|
|
@ -56,8 +56,8 @@ export default function Site() {
|
|||
siteAPI
|
||||
.getSitePage(siteKey, as)
|
||||
.then(resp => {
|
||||
setSite(ISite.any(resp.data.site));
|
||||
setHeaters(resp.data.heaterData);
|
||||
if(resp.data.site) setSite(ISite.any(resp.data.site));
|
||||
if(resp.data.heaterData) setHeaters(resp.data.heaterData);
|
||||
setLoadingSite(false);
|
||||
})
|
||||
.catch(err => {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue