Browse Source

UI: Fixed progress filling and add label for entity aliase

pull/14427/head
ArtemDzhereleiko 9 months ago
parent
commit
2fe7d34331
  1. 10
      ui-ngx/src/app/modules/home/components/widget/lib/cards/api-usage-widget.component.ts
  2. 1
      ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/api-usage-widget-settings.component.html
  3. 1
      ui-ngx/src/app/modules/home/components/widget/lib/settings/common/alias/entity-alias-select.component.ts

10
ui-ngx/src/app/modules/home/components/widget/lib/cards/api-usage-widget.component.ts

@ -91,11 +91,11 @@ export class ApiUsageWidgetComponent implements OnInit, OnDestroy {
onDataUpdated: (subscription) => {
const data = formattedDataFormDatasourceData(subscription.data);
this.apiUsages.forEach(key => {
const progress = data[0][key.maxLimit.key] !== 0 ? Math.min(100, ((data[0][key.current.key] / data[0][key.maxLimit.key]) * 100)) : 0;
const progress = (this.isFiniteNumber(data[0][key.maxLimit.key]) && 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 && 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;
key.maxLimit.value = this.isFiniteNumber(data[0][key.maxLimit.key]) && data[0][key.maxLimit.key] !== 0 ? this.toShortNumber(data[0][key.maxLimit.key]) : '∞';
key.current.value = this.isFiniteNumber(data[0][key.current.key]) ? this.toShortNumber(data[0][key.current.key]) : 0;
});
this.cd.detectChanges();
}
@ -114,6 +114,10 @@ export class ApiUsageWidgetComponent implements OnInit, OnDestroy {
this.padding = this.settings.background.overlay.enabled ? undefined : this.settings.padding;
}
private isFiniteNumber(value: any): boolean {
return typeof value === 'number' && isFinite(value);
}
updateState($event: MouseEvent, stateName: string) {
$event?.preventDefault();
if (stateName?.length) {

1
ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/api-usage-widget-settings.component.html

@ -20,6 +20,7 @@
<div class="tb-form-panel-title" translate>widget-config.datasource</div>
<tb-entity-alias-select
class="tb-entity-alias-field"
showLabel
tbRequired
[appearance]="'outline'"
[aliasController]="context.aliasController"

1
ui-ngx/src/app/modules/home/components/widget/lib/settings/common/alias/entity-alias-select.component.ts

@ -64,6 +64,7 @@ export class EntityAliasSelectComponent implements ControlValueAccessor, OnInit,
callbacks: EntityAliasSelectCallbacks;
@Input()
@coerceBoolean()
showLabel: boolean;
@ViewChild('entityAliasAutocomplete') entityAliasAutocomplete: MatAutocomplete;

Loading…
Cancel
Save