Merge pull request #15894 from thingsboard/master-rc-merge

Merge rc into master

ui-ngx/src/app/modules/home/components/calculated-fields/calculated-field.component.ts

@@ -132,7 +132,7 @@ export class CalculatedFieldComponent extends EntityComponent<CalculatedFieldsTa
   onTestScript(expression?: string): Observable<string> {
     return this.cfFormService.testScript(
       this.entity?.id?.id,
-      this.entityValue,
+      this.entityFormValue(),
       this.entitiesTableConfig.getTestScriptDialog.bind(this.entitiesTableConfig),
       this.destroyRef,
       expression

ui-ngx/src/app/modules/home/components/widget/config/basic/gauge/digital-simple-gauge-basic-config.component.ts

@@ -30,7 +30,7 @@ import {
   getTimewindowConfig,
   setTimewindowConfig
 } from '@home/components/widget/config/timewindow-config-panel.component';
-import { formatValue, isDefined, isUndefined } from '@core/utils';
+import { formatValue, isDefined, isDefinedAndNotNull, isNumeric, isUndefined } from '@core/utils';
 import { Component } from '@angular/core';
 import {
   convertLevelColorsSettingsToColorProcessor,
@@ -189,11 +189,10 @@ export class DigitalSimpleGaugeBasicConfigComponent extends BasicWidgetConfigCom
 
   private maxValueValidation(): ValidatorFn {
     return (control: AbstractControl): ValidationErrors | null => {
-      const value: string = control.value;
+      const value: number = control.value;
-      if (value) {
+      const minValue = control.parent?.get('minValue').value;
-        if (value < control.parent?.get('minValue').value) {
+      if (isNumeric(value) && isDefinedAndNotNull(minValue) && value < minValue) {
-          return {maxValue: true};
+        return {maxValue: true};
-        }
       }
       return null;
     };

ui-ngx/src/app/modules/home/components/widget/lib/cards/label-value-card-widget.component.html

@@ -34,7 +34,7 @@
           }
         </div>
       }
-      <div class="tb-label-value-card-value" [style]="valueStyle" [style.color]="valueColor.color">{{ valueText }}</div>
+      <div class="tb-label-value-card-value" [style]="valueStyle" [style.color]="valueColor.color">{{ valueText | customTranslate }}</div>
     </div>
   </div>
 </div>

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

@@ -1093,15 +1093,29 @@ export class TbTimeSeriesChart {
     }
   }
 
+  private maxTickLabelHalfHeight(): number {
+    const axes = this.yAxisList.filter(a => a.settings.show && a.settings.showTickLabels);
+    if (!axes.length) {
+      return 0;
+    }
+
+    const defaultSize = defaultTimeSeriesChartYAxisSettings.tickLabelFont.size;
+    const maxFontSize = Math.max(...axes.map(a => a.settings.tickLabelFont?.size || defaultSize));
+    return Math.ceil(maxFontSize / 2);
+  }
+
   private minTopOffset(): number {
-    const showTickLabels =
+    if (this.topPointLabels) {
-      !!this.yAxisList.find(yAxis => yAxis.settings.show && yAxis.settings.showTickLabels);
+      return 25;
-    return (this.topPointLabels) ? 25 :
+    }
-      (showTickLabels ? 10 : 5);
+    const half = this.maxTickLabelHalfHeight();
+    return half ? Math.max(10, half) : 5;
   }
 
   private minBottomOffset(): number {
-    return this.settings.dataZoom ? 45 : 5;
+    const half = this.maxTickLabelHalfHeight();
+    const minOffset = half ? Math.max(5, half) : 5;
+    return this.settings.dataZoom ? Math.max(45, minOffset) : minOffset;
   }
 
   private _onParentScroll() {
@@ -1130,6 +1144,7 @@ export class TbTimeSeriesChart {
             this.updateBarsAnimation(barItems, false);
           }
           this.timeSeriesChart.resize();
+          this.updateAxes();
           if (this.animationEnabled()) {
             this.updateBarsAnimation(barItems, true);
           }

ui-ngx/src/app/modules/home/components/widget/lib/settings/gauge/digital-gauge-widget-settings.component.ts

@@ -37,7 +37,7 @@ import {
   digitalGaugeLayoutTranslations,
   DigitalGaugeType
 } from '@home/components/widget/lib/digital-gauge.models';
-import { formatValue, isDefined } from '@core/utils';
+import { formatValue, isDefined, isDefinedAndNotNull, isNumeric } from '@core/utils';
 import {
   ColorSettings,
   ColorType,
@@ -218,11 +218,10 @@ export class DigitalGaugeWidgetSettingsComponent extends WidgetSettingsComponent
 
   private maxValueValidation(): ValidatorFn {
     return (control: AbstractControl): ValidationErrors | null => {
-      const value: string = control.value;
+      const value: number = control.value;
-      if (value) {
+      const minValue = control.parent?.get('minValue').value;
-        if (value < control.parent?.get('minValue').value) {
+      if (isNumeric(value) && isDefinedAndNotNull(minValue) && value < minValue) {
-          return {maxValue: true};
+        return {maxValue: true};
-        }
       }
       return null;
     };