Browse Source

Merge pull request #14298 from mtsymbarov-del/fix/control-widget-parser-fn

Fixed parse function calling for control widgets
pull/14320/head
Vladyslav Prykhodko 11 months ago
committed by GitHub
parent
commit
fbfff76e32
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 13
      ui-ngx/src/app/modules/home/components/widget/lib/rpc/led-indicator.component.ts
  2. 13
      ui-ngx/src/app/modules/home/components/widget/lib/rpc/round-switch.component.ts
  3. 13
      ui-ngx/src/app/modules/home/components/widget/lib/rpc/switch.component.ts

13
ui-ngx/src/app/modules/home/components/widget/lib/rpc/led-indicator.component.ts

@ -332,11 +332,16 @@ export class LedIndicatorComponent extends PageComponent implements OnInit, OnDe
if (keyData && keyData.data && keyData.data[0]) { if (keyData && keyData.data && keyData.data[0]) {
const attrValue = keyData.data[0][1]; const attrValue = keyData.data[0][1];
if (isDefined(attrValue)) { if (isDefined(attrValue)) {
let parsed = null; let valueToParse = attrValue;
try { try {
parsed = this.parseValueFunction(JSON.parse(attrValue)); valueToParse = JSON.parse(attrValue);
} catch (e){/**/} } catch (e) {/**/}
value = !!parsed;
try {
value = !!this.parseValueFunction(valueToParse);
} catch (e) {
value = false;
}
} }
} }
} }

13
ui-ngx/src/app/modules/home/components/widget/lib/rpc/round-switch.component.ts

@ -330,11 +330,16 @@ export class RoundSwitchComponent extends PageComponent implements OnInit, OnDes
if (keyData && keyData.data && keyData.data[0]) { if (keyData && keyData.data && keyData.data[0]) {
const attrValue = keyData.data[0][1]; const attrValue = keyData.data[0][1];
if (isDefined(attrValue)) { if (isDefined(attrValue)) {
let parsed = null; let valueToParse = attrValue;
try { try {
parsed = this.parseValueFunction(JSON.parse(attrValue)); valueToParse = JSON.parse(attrValue);
} catch (e){/**/} } catch (e) {/**/}
value = !!parsed;
try {
value = !!this.parseValueFunction(valueToParse);
} catch (e) {
value = false;
}
} }
} }
} }

13
ui-ngx/src/app/modules/home/components/widget/lib/rpc/switch.component.ts

@ -373,11 +373,16 @@ export class SwitchComponent extends PageComponent implements AfterViewInit, OnD
if (keyData && keyData.data && keyData.data[0]) { if (keyData && keyData.data && keyData.data[0]) {
const attrValue = keyData.data[0][1]; const attrValue = keyData.data[0][1];
if (isDefined(attrValue)) { if (isDefined(attrValue)) {
let parsed = null; let valueToParse = attrValue;
try { try {
parsed = this.parseValueFunction(JSON.parse(attrValue)); valueToParse = JSON.parse(attrValue);
} catch (e){/**/} } catch (e) {/**/}
value = !!parsed;
try {
value = !!this.parseValueFunction(valueToParse);
} catch (e) {
value = false;
}
} }
} }
} }

Loading…
Cancel
Save