Merge pull request #8539 from ArtemDzhereleiko/AD/bug-fix/control-widget-title

Fixed control widgets setting change

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

@@ -72,8 +72,8 @@ export class RoundSwitchWidgetSettingsComponent extends WidgetSettingsComponent
 
   protected prepareOutputSettings(settings: any): WidgetSettings {
     return {
-      title: settings.title,
-      ...settings.switchRpcSettings
+      ...settings.switchRpcSettings,
+      title: settings.title
     };
   }
 }

ui-ngx/src/app/modules/home/components/widget/lib/settings/control/slide-toggle-widget-settings.component.ts

@@ -78,10 +78,10 @@ export class SlideToggleWidgetSettingsComponent extends WidgetSettingsComponent
 
   protected prepareOutputSettings(settings: any): WidgetSettings {
     return {
+      ...settings.switchRpcSettings,
       title: settings.title,
       labelPosition: settings.labelPosition,
-      sliderColor: settings.sliderColor,
-      ...settings.switchRpcSettings
+      sliderColor: settings.sliderColor
     };
   }
 }

ui-ngx/src/app/modules/home/components/widget/lib/settings/control/switch-control-widget-settings.component.ts

@@ -75,9 +75,9 @@ export class SwitchControlWidgetSettingsComponent extends WidgetSettingsComponen
 
   protected prepareOutputSettings(settings: any): WidgetSettings {
     return {
+      ...settings.switchRpcSettings,
       title: settings.title,
-      showOnOffLabels: settings.showOnOffLabels,
-      ...settings.switchRpcSettings
+      showOnOffLabels: settings.showOnOffLabels
     };
   }
 }