widgets.progress-bar.min
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/set-value-action-settings-panel.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/set-value-action-settings-panel.component.html
index b1fccafac0..4cf5857612 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/set-value-action-settings-panel.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/set-value-action-settings-panel.component.html
@@ -97,7 +97,8 @@
{{ (setValueSettingsFormGroup.get('action').value === setValueAction.EXECUTE_RPC ?
'widgets.value-action.parameters' : 'widgets.value-action.value') | translate }}
- {{ 'widgets.value-action.converter-constant' | translate }}
+ {{ 'widgets.value-action.converter-value' | translate }}
+ {{ 'widgets.value-action.converter-constant' | translate }}
{{ 'widgets.value-action.converter-function' | translate }}
{{ 'widgets.value-action.converter-none' | translate }}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/set-value-action-settings-panel.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/set-value-action-settings-panel.component.ts
index d718168b11..819ed2a3fc 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/set-value-action-settings-panel.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/set-value-action-settings-panel.component.ts
@@ -32,6 +32,7 @@ import { TargetDevice, widgetType } from '@shared/models/widget.models';
import { AttributeScope, DataKeyType, telemetryTypeTranslationsShort } from '@shared/models/telemetry/telemetry.models';
import { IAliasController } from '@core/api/widget-api.models';
import { WidgetService } from '@core/http/widget.service';
+import { ValueType } from '@shared/models/constants';
@Component({
selector: 'tb-set-value-action-settings-panel',
@@ -45,6 +46,9 @@ export class SetValueActionSettingsPanelComponent extends PageComponent implemen
@Input()
panelTitle: string;
+ @Input()
+ valueType = ValueType.BOOLEAN;
+
@Input()
setValueSettings: SetValueSettings;
@@ -79,6 +83,8 @@ export class SetValueActionSettingsPanelComponent extends PageComponent implemen
functionScopeVariables = this.widgetService.getWidgetScopeVariables();
+ ValueType = ValueType;
+
setValueSettingsFormGroup: UntypedFormGroup;
constructor(private fb: UntypedFormBuilder,
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/set-value-action-settings.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/set-value-action-settings.component.ts
index fce1e23673..7b4c8e0428 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/set-value-action-settings.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/set-value-action-settings.component.ts
@@ -36,6 +36,7 @@ import { isDefinedAndNotNull } from '@core/utils';
import {
SetValueActionSettingsPanelComponent
} from '@home/components/widget/lib/settings/common/action/set-value-action-settings-panel.component';
+import { ValueType } from '@shared/models/constants';
@Component({
selector: 'tb-set-value-action-settings',
@@ -58,6 +59,9 @@ export class SetValueActionSettingsComponent implements OnInit, ControlValueAcce
@Input()
panelTitle: string;
+ @Input()
+ valueType = ValueType.BOOLEAN;
+
@Input()
aliasController: IAliasController;
@@ -114,6 +118,7 @@ export class SetValueActionSettingsComponent implements OnInit, ControlValueAcce
const ctx: any = {
setValueSettings: this.modelValue,
panelTitle: this.panelTitle,
+ valueType: this.valueType,
aliasController: this.aliasController,
targetDevice: this.targetDevice,
widgetType: this.widgetType
@@ -137,6 +142,9 @@ export class SetValueActionSettingsComponent implements OnInit, ControlValueAcce
private updateDisplayValue() {
let value: any;
switch (this.modelValue.valueToData.type) {
+ case ValueToDataType.VALUE:
+ value = 'value';
+ break;
case ValueToDataType.CONSTANT:
value = this.modelValue.valueToData.constantValue;
break;
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/button/widget-button-appearance.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/button/widget-button-appearance.component.html
index b4ce9c8ce2..bdecc9d36b 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/button/widget-button-appearance.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/button/widget-button-appearance.component.html
@@ -56,7 +56,7 @@