From dd7972721aa0db87ab03e2f902ec6d9e92e891c9 Mon Sep 17 00:00:00 2001
From: Maksym Tsymbarov <mtsymbarov@thingsboard.io>
Date: Tue, 9 Dec 2025 15:31:55 +0200
Subject: [PATCH] fixed errors

---
 .../widget/lib/chart/time-series-chart.ts     | 10 ++--
 ...eries-chart-widget-settings.component.html |  3 +
 .../common/axis-scale-row.component.html      |  2 +-
 ...ime-series-chart-y-axes-panel.component.ts |  2 +
 .../time-series-chart-y-axis-row.component.ts | 60 ++++++++++++++-----
 5 files changed, 58 insertions(+), 19 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart.ts
index 8568e4b13b..9989df42e8 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart.ts
@@ -307,10 +307,12 @@ export class TbTimeSeriesChart {
           const data = this.ctx.latestData.find(d => d.dataKey === yAxis.maxLatestDataKey);
           if (data?.data[0]) {
             const value = this.parseAxisLimitData(data.data[0][1], yAxis.unitConvertor);
-            if (yAxis.option.max !== value) {
-              yAxis.option.max = value;
-              update = true;
-            }
+            // if (yAxis.option.max !== value) {
+            //   yAxis.option.max = value;
+            //   update = true;
+            // }
+            update = true;
+            yAxis.option.max = 124;
           }
         }
       }
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-widget-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-widget-settings.component.html
index 9a80362c8d..afa3c774ec 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-widget-settings.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/time-series-chart-widget-settings.component.html
@@ -62,6 +62,9 @@
   </tb-time-series-chart-states-panel>
   <tb-time-series-chart-y-axes-panel
     formControlName="yAxes"
+    [aliasController]="aliasController"
+    [dataKeyCallbacks]="dataKeyCallbacks"
+    [datasource]="datasource"
     (axisRemoved)="yAxisRemoved($event)"
     [supportsUnitConversion]="widgetConfig.typeParameters.supportsUnitConversion"
     advanced>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/axis-scale-row.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/axis-scale-row.component.html
index 37c2838a21..0129bdc490 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/axis-scale-row.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/axis-scale-row.component.html
@@ -35,7 +35,7 @@
       formControlName="entityAlias">
     </tb-entity-alias-input>
   </div>
-  <div class="flex-grow flex-shrink" [class]="isPanelView ? 'basis-1/2' : 'basis-40%'">
+  <div class="flex-grow flex-shrink max-w-5/12" [class]="isPanelView ? 'basis-1/2' : 'basis-40%'">
     <mat-form-field *ngIf="limitForm.get('type').value === ValueSourceType.constant"
                     appearance="outline" class="tb-inline-field !w-full number" subscriptSizing="dynamic"
                     [class.tb-suffix-absolute]="!limitForm.get('value').value">
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-y-axes-panel.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-y-axes-panel.component.ts
index 4d710a6ff4..690ad6cc55 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-y-axes-panel.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-y-axes-panel.component.ts
@@ -250,6 +250,8 @@ export class TimeSeriesChartYAxesPanelComponent implements ControlValueAccessor,
       const foundYAxisKeys: DataKey[] = [];
 
       for(const yAxis of yAxes) {
+        console.log("yAxis",yAxis)
+
         const min = yAxis.min as ValueSourceConfig;
         const max = yAxis.max as ValueSourceConfig;
         if (min.type === ValueSourceType.latestKey) {
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-y-axis-row.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-y-axis-row.component.ts
index 6f4c618394..34f1b487a2 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-y-axis-row.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/chart/time-series-chart-y-axis-row.component.ts
@@ -135,17 +135,19 @@ export class TimeSeriesChartYAxisRowComponent implements ControlValueAccessor, O
 
   writeValue(value: TimeSeriesChartYAxisSettings): void {
     this.modelValue = value;
-    this.axisFormGroup.patchValue(
-      {
-        label: value.label,
-        position: value.position,
-        units: value.units,
-        decimals: value.decimals,
-        min: value.min,
-        max: value.max,
-        show: value.show,
-      }, {emitEvent: false}
-    );
+    const min = this.normalizeLimit(value.min);
+    const max = this.normalizeLimit(value.max);
+
+    this.axisFormGroup.patchValue({
+      label: value.label,
+      position: value.position,
+      units: value.units,
+      decimals: value.decimals,
+      min,
+      max,
+      show: value.show,
+    }, { emitEvent: false });
+
     this.updateValidators();
     this.cd.markForCheck();
   }
@@ -223,7 +225,8 @@ export class TimeSeriesChartYAxisRowComponent implements ControlValueAccessor, O
   }
 
   private updateModel() {
-    const value = this.axisFormGroup.value;
+    const value = this.axisFormGroup.getRawValue();
+    console.log("value", value);
     this.modelValue.label = value.label;
     this.modelValue.position = value.position;
     this.modelValue.units = value.units;
@@ -238,7 +241,36 @@ export class TimeSeriesChartYAxisRowComponent implements ControlValueAccessor, O
     return this.fb.group({
       type: [ValueSourceType.constant, []],
       value: [null, []],
-      entityAlias: [null, []]
-    })
+      latestKey: [null, []],
+      latestKeyType: [null, []],
+      entityAlias: [null, []],
+      entityKey: [null, []],
+      entityKeyType: [null, []]
+    });
+  }
+
+  private normalizeLimit(limit: any) {
+    const base = {
+      type: ValueSourceType.constant,
+      value: null,
+      latestKey: null,
+      latestKeyType: null,
+      entityAlias: null,
+      entityKey: null,
+      entityKeyType: null
+    };
+
+    if (limit == null) return base;
+
+    if (typeof limit === 'number' || typeof limit === 'string') {
+      return { ...base, type: ValueSourceType.constant, value: Number(limit) };
+    }
+
+    return {
+      ...base,
+      ...limit,
+    };
   }
+
+
 }