Browse Source
Merge pull request #14317 from ArtemDzhereleiko/AD/bug-fix/api-usage-widget
Fixed API Usage widget max limit init value and make alias required
pull/14326/head
Vladyslav Prykhodko
9 months ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with
3 additions and
3 deletions
-
ui-ngx/src/app/modules/home/components/widget/lib/cards/api-usage-widget.component.ts
-
ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/api-usage-widget-settings.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(); |
|
|
|
|
|
|
|
@ -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, []], |
|
|
|
|