clean up

ui-ngx/src/app/modules/home/components/widget/config/basic/chart/bar-chart-basic-config.component.ts

@@ -41,7 +41,7 @@ export class BarChartBasicConfigComponent extends LatestChartBasicConfigComponen
   barChartConfigTemplate: TemplateRef<any>;
 
   predefinedValues = widgetTitleAutocompleteValues;
-
+  
   constructor(protected store: Store<AppState>,
               protected widgetConfigComponent: WidgetConfigComponent,
               protected fb: UntypedFormBuilder) {

ui-ngx/src/app/modules/home/components/widget/config/basic/chart/latest-chart-basic-config.component.html

@@ -21,27 +21,27 @@
                               formControlName="timewindowConfig">
   </tb-timewindow-config-panel>
   <tb-datasources
-    [configMode]="basicMode"
+      [configMode]="basicMode"
-    hideDatasourceLabel
+      hideDatasourceLabel
-    hideDataKeys
+      hideDataKeys
-    forceSingleDatasource
+      forceSingleDatasource
-    formControlName="datasources">
+      formControlName="datasources">
   </tb-datasources>
   <tb-data-keys-panel
-    panelTitle="{{ 'widgets.chart.series' | translate }}"
+      panelTitle="{{ 'widgets.chart.series' | translate }}"
-    addKeyTitle="{{ 'widgets.chart.add-series' | translate }}"
+      addKeyTitle="{{ 'widgets.chart.add-series' | translate }}"
-    keySettingsTitle="{{ 'widgets.chart.series-settings' | translate }}"
+      keySettingsTitle="{{ 'widgets.chart.series-settings' | translate }}"
-    removeKeyTitle="{{ 'widgets.chart.remove-series' | translate }}"
+      removeKeyTitle="{{ 'widgets.chart.remove-series' | translate }}"
-    noKeysText="{{ 'widgets.chart.no-series' | translate }}"
+      noKeysText="{{ 'widgets.chart.no-series' | translate }}"
-    requiredKeysText="{{ 'widgets.chart.no-series-error' | translate }}"
+      requiredKeysText="{{ 'widgets.chart.no-series-error' | translate }}"
-    hideUnits
+      hideUnits
-    hideDecimals
+      hideDecimals
-    hideDataKeyUnits
+      hideDataKeyUnits
-    hideDataKeyDecimals
+      hideDataKeyDecimals
-    [datasourceType]="datasource?.type"
+      [datasourceType]="datasource?.type"
-    [deviceId]="datasource?.deviceId"
+      [deviceId]="datasource?.deviceId"
-    [entityAliasId]="datasource?.entityAliasId"
+      [entityAliasId]="datasource?.entityAliasId"
-    formControlName="series">
+      formControlName="series">
   </tb-data-keys-panel>
   <div class="tb-form-panel">
     <div class="tb-form-panel-title" translate>widget-config.appearance</div>
@@ -210,7 +210,7 @@
     </mat-expansion-panel>
   </div>
   <tb-chart-animation-settings
-    formControlName="animation">
+      formControlName="animation">
   </tb-chart-animation-settings>
   <div class="tb-form-panel">
     <div class="tb-form-panel-title" translate>widget-config.card-appearance</div>
@@ -239,7 +239,7 @@
     </div>
   </div>
   <tb-widget-actions-panel
-    formControlName="actions">
+      formControlName="actions">
   </tb-widget-actions-panel>
 </ng-container>
 
@@ -346,8 +346,8 @@
     <div class="tb-form-panel">
       <div class="tb-form-panel-title" translate>widgets.bar-chart.bar-appearance</div>
       <tb-chart-bar-settings
-        formControlName="barSettings"
+          formControlName="barSettings"
-        [series]="false">
+          [series]="false">
       </tb-chart-bar-settings>
     </div>
     <div class="tb-form-panel">
@@ -385,9 +385,9 @@
     <div class="tb-form-panel">
       <div class="tb-form-panel-title" translate>widgets.bar-chart.bar-appearance</div>
       <tb-chart-bar-settings
-        formControlName="barSettings"
+          formControlName="barSettings"
-        pieLabelPosition
+          pieLabelPosition
-        [series]="false">
+          [series]="false">
       </tb-chart-bar-settings>
     </div>
     <div class="tb-form-panel">
@@ -508,7 +508,7 @@
         </div>
       </div>
       <tb-chart-fill-settings
-        formControlName="fillAreaSettings">
+          formControlName="fillAreaSettings">
       </tb-chart-fill-settings>
     </div>
     <div class="tb-form-panel">

ui-ngx/src/app/modules/home/components/widget/config/basic/chart/polar-area-chart-basic-config.component.ts

@@ -41,7 +41,7 @@ export class PolarAreaChartBasicConfigComponent extends LatestChartBasicConfigCo
   polarAreaChartConfigTemplate: TemplateRef<any>;
 
   predefinedValues = widgetTitleAutocompleteValues;
-
+  
   constructor(protected store: Store<AppState>,
               protected widgetConfigComponent: WidgetConfigComponent,
               protected fb: UntypedFormBuilder) {

ui-ngx/src/app/modules/home/components/widget/lib/chart/latest-chart.ts

@@ -142,7 +142,6 @@ export abstract class TbLatestChart<S extends LatestChartSettings> {
 
   public update(): void {
     for (const dsData of this.ctx.data) {
-      console.log("this.ctx.data",this.ctx.data)
       let value = 0;
       const tsValue = dsData.data[0];
       const dataItem = this.dataItems.find(item => item.dataKey === dsData.dataKey);

ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart.models.ts

@@ -381,8 +381,8 @@ export interface TimeSeriesChartYAxisSettings extends TimeSeriesChartAxisSetting
   decimals?: number;
   interval?: number;
   splitNumber?: number;
-  min?: string | ValueSourceConfig;
+  min?: number | string | ValueSourceConfig;
-  max?: string | ValueSourceConfig;
+  max?: number | string | ValueSourceConfig;
   ticksGenerator?: TimeSeriesChartTicksGenerator | string;
   ticksFormatter?: TimeSeriesChartTicksFormatter | string;
 }

ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/latest-chart-widget-settings.component.html

@@ -120,7 +120,7 @@
     </mat-expansion-panel>
   </div>
   <tb-chart-animation-settings
-    formControlName="animation">
+      formControlName="animation">
   </tb-chart-animation-settings>
   <div class="tb-form-panel">
     <div class="tb-form-panel-title" translate>widget-config.card-appearance</div>
@@ -256,8 +256,8 @@
       <div class="tb-form-panel">
         <div class="tb-form-panel-title" translate>widgets.bar-chart.bar-appearance</div>
         <tb-chart-bar-settings
-          formControlName="barSettings"
+            formControlName="barSettings"
-          [series]="false">
+            [series]="false">
         </tb-chart-bar-settings>
       </div>
       <div class="tb-form-panel">
@@ -303,9 +303,9 @@
       <div class="tb-form-panel">
         <div class="tb-form-panel-title" translate>widgets.bar-chart.bar-appearance</div>
         <tb-chart-bar-settings
-          formControlName="barSettings"
+            formControlName="barSettings"
-          pieLabelPosition
+            pieLabelPosition
-          [series]="false">
+            [series]="false">
         </tb-chart-bar-settings>
       </div>
       <div class="tb-form-panel">
@@ -434,7 +434,7 @@
           </div>
         </div>
         <tb-chart-fill-settings
-          formControlName="fillAreaSettings">
+            formControlName="fillAreaSettings">
         </tb-chart-fill-settings>
       </div>
       <div class="tb-form-panel">

ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/polar-area-chart-widget-settings.component.ts

@@ -26,7 +26,6 @@ import {
 import {
   LatestChartWidgetSettingsComponent
 } from '@home/components/widget/lib/settings/chart/latest-chart-widget-settings.component';
-import { ValueSourceConfig, ValueSourceType } from '@shared/models/widget-settings.models';
 
 @Component({
   selector: 'tb-polar-area-chart-widget-settings',
@@ -53,32 +52,10 @@ export class PolarAreaChartWidgetSettingsComponent extends LatestChartWidgetSett
 
   protected setupLatestChartControls(latestChartWidgetSettingsForm: UntypedFormGroup, settings: WidgetSettings) {
     latestChartWidgetSettingsForm.addControl('barSettings', this.fb.control(settings.barSettings, []));
-    latestChartWidgetSettingsForm.addControl('axisMin', this.fb.control(settings.axisMin));
+    latestChartWidgetSettingsForm.addControl('axisMin', this.fb.control(settings.axisMin, []));
-    latestChartWidgetSettingsForm.addControl('axisMax', this.fb.control(settings.axisMax));
+    latestChartWidgetSettingsForm.addControl('axisMax', this.fb.control(settings.axisMax, []));
     latestChartWidgetSettingsForm.addControl('axisTickLabelFont', this.fb.control(settings.axisTickLabelFont, []));
     latestChartWidgetSettingsForm.addControl('axisTickLabelColor', this.fb.control(settings.axisTickLabelColor, [Validators.min(0)]));
     latestChartWidgetSettingsForm.addControl('angleAxisStartAngle', this.fb.control(settings.angleAxisStartAngle, []));
   }
-  protected prepareInputSettings(settings: WidgetSettings): WidgetSettings {
-    settings.axisMin = this.normalizeAxisLimit(settings.axisMin);
-    settings.axisMax = this.normalizeAxisLimit(settings.axisMax);
-    return super.prepareInputSettings(settings);
-  }
-
-  private normalizeAxisLimit(limit: any): ValueSourceConfig {
-    if (!limit) {
-      return {
-        type: ValueSourceType.constant,
-        value: null,
-        entityAlias: null
-      };
-    } else if (typeof limit === 'number') {
-      return {
-        type: ValueSourceType.constant,
-        value: limit,
-        entityAlias: null
-      };
-    }
-    return limit;
-  }
 }