Browse Source

UI: Add clear knob settings; Fixed translation

pull/13500/head
Vladyslav_Prykhodko 1 year ago
parent
commit
5ff3a76e06
  1. 5
      ui-ngx/src/app/shared/models/widget/rpc/knob.component.models.ts
  2. 4
      ui-ngx/src/assets/locale/locale.constant-en_US.json

5
ui-ngx/src/app/shared/models/widget/rpc/knob.component.models.ts

@ -96,25 +96,30 @@ export const knobWidgetDefaultSettings: KnobSettings = {
export const prepareKnobSettings = (settings: KnobSettings): KnobSettings => { export const prepareKnobSettings = (settings: KnobSettings): KnobSettings => {
if (isDefinedAndNotNull(settings.getValueMethod)) { if (isDefinedAndNotNull(settings.getValueMethod)) {
settings.initialState.executeRpc.method = settings.getValueMethod; settings.initialState.executeRpc.method = settings.getValueMethod;
delete settings.getValueMethod;
} }
if (isDefinedAndNotNull(settings.setValueMethod)) { if (isDefinedAndNotNull(settings.setValueMethod)) {
settings.valueChange.executeRpc.method = settings.setValueMethod; settings.valueChange.executeRpc.method = settings.setValueMethod;
delete settings.setValueMethod;
} }
if (isDefinedAndNotNull(settings.requestPersistent)) { if (isDefinedAndNotNull(settings.requestPersistent)) {
settings.initialState.executeRpc.requestPersistent = settings.requestPersistent; settings.initialState.executeRpc.requestPersistent = settings.requestPersistent;
settings.valueChange.executeRpc.requestPersistent = settings.requestPersistent; settings.valueChange.executeRpc.requestPersistent = settings.requestPersistent;
delete settings.requestPersistent;
} }
if (isDefinedAndNotNull(settings.persistentPollingInterval)) { if (isDefinedAndNotNull(settings.persistentPollingInterval)) {
settings.initialState.executeRpc.persistentPollingInterval = settings.persistentPollingInterval; settings.initialState.executeRpc.persistentPollingInterval = settings.persistentPollingInterval;
settings.valueChange.executeRpc.persistentPollingInterval = settings.persistentPollingInterval; settings.valueChange.executeRpc.persistentPollingInterval = settings.persistentPollingInterval;
delete settings.persistentPollingInterval;
} }
if (isDefinedAndNotNull(settings.requestTimeout)) { if (isDefinedAndNotNull(settings.requestTimeout)) {
settings.initialState.executeRpc.requestTimeout = settings.requestTimeout; settings.initialState.executeRpc.requestTimeout = settings.requestTimeout;
settings.valueChange.executeRpc.requestTimeout = settings.requestTimeout; settings.valueChange.executeRpc.requestTimeout = settings.requestTimeout;
delete settings.requestTimeout;
} }
return settings; return settings;
} }

4
ui-ngx/src/assets/locale/locale.constant-en_US.json

@ -7969,6 +7969,7 @@
"range": "Range", "range": "Range",
"min": "min", "min": "min",
"max": "max", "max": "max",
"value": "Value",
"fallback-initial-value": "Fallback initial value" "fallback-initial-value": "Fallback initial value"
}, },
"rpc": { "rpc": {
@ -8026,7 +8027,8 @@
"led-status-value-attribute": "Device attribute containing led status value", "led-status-value-attribute": "Device attribute containing led status value",
"led-status-value-timeseries": "Device time series containing led status value", "led-status-value-timeseries": "Device time series containing led status value",
"check-status-method": "RPC check device status method", "check-status-method": "RPC check device status method",
"parse-led-status-value-function": "Parse led status value function" "parse-led-status-value-function": "Parse led status value function",
"knob-title": "Knob title"
}, },
"maps": { "maps": {
"map-type": { "map-type": {

Loading…
Cancel
Save