From 171da3494688f53a909a2287dd2024fd75734f9f Mon Sep 17 00:00:00 2001
From: ArtemDzhereleiko <adzhereleiko@thingsboard.io>
Date: Wed, 12 Nov 2025 10:23:40 +0200
Subject: [PATCH] UI: Fixed max limit init value and make aliase required

---
 .../components/widget/lib/cards/api-usage-widget.component.ts | 2 +-
 .../lib/settings/cards/api-usage-widget-settings.component.ts | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/cards/api-usage-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/cards/api-usage-widget.component.ts
index 69f328a006..b7f48d41f6 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/cards/api-usage-widget.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/cards/api-usage-widget.component.ts
@@ -94,7 +94,7 @@ export class ApiUsageWidgetComponent implements OnInit, OnDestroy {
             const progress = data[0][key.maxLimit.key] !== 0 ? Math.min(100, ((data[0][key.current.key] / data[0][key.maxLimit.key]) * 100)) : 0;
             key.progress = isFinite(progress) ? progress : 0;
             key.status.value = data[0][key.status.key] ? data[0][key.status.key].toLowerCase() : 'enabled';
-            key.maxLimit.value = isFinite(data[0][key.maxLimit.key]) && data[0][key.maxLimit.key] !== 0  ? this.toShortNumber(data[0][key.maxLimit.key]) : '∞';
+            key.maxLimit.value = isFinite(data[0][key.maxLimit.key]) && data[0][key.maxLimit.key] !== 0 && data[0][key.maxLimit.key] !== '' ? this.toShortNumber(data[0][key.maxLimit.key]) : '∞';
             key.current.value = isFinite(data[0][key.current.key]) ? this.toShortNumber(data[0][key.current.key]) : 0;
           });
           this.cd.detectChanges();
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/api-usage-widget-settings.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/api-usage-widget-settings.component.ts
index 1d42b1503c..3e909b0901 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/api-usage-widget-settings.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/api-usage-widget-settings.component.ts
@@ -29,7 +29,7 @@ import {
   UntypedFormBuilder,
   UntypedFormGroup,
   ValidationErrors,
-  ValidatorFn
+  ValidatorFn, Validators
 } from '@angular/forms';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
@@ -140,7 +140,7 @@ export class ApiUsageWidgetSettingsComponent extends WidgetSettingsComponent {
 
   protected onSettingsSet(settings: WidgetSettings) {
     this.apiUsageWidgetSettingsForm = this.fb.group({
-      dsEntityAliasId: [settings?.dsEntityAliasId],
+      dsEntityAliasId: [settings?.dsEntityAliasId, Validators.required],
       apiUsageDataKeys: this.prepareDataKeysFormArray(settings?.apiUsageDataKeys),
       targetDashboardState: [settings?.targetDashboardState],
       background: [settings?.background, []],