Browse Source

fixed renaming errors

pull/14159/head
Maksym Tsymbarov 11 months ago
parent
commit
3bc32b76c0
  1. 2
      ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/timeseries-table-widget-settings.component.html
  2. 4
      ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/timeseries-table-widget-settings.component.ts

2
ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/timeseries-table-widget-settings.component.html

@ -118,7 +118,7 @@
<div class="tb-form-row"> <div class="tb-form-row">
<div class="fixed-title-width" translate>widgets.table.sort-by</div> <div class="fixed-title-width" translate>widgets.table.sort-by</div>
<div class="flex flex-1 flex-row gap-2"> <div class="flex flex-1 flex-row gap-2">
<tb-toggle-select class="flex-1" appearance="fill" selectMediaBreakpoint="xs" formControlName="sortEntityAliasKey"> <tb-toggle-select class="flex-1" appearance="fill" selectMediaBreakpoint="xs" formControlName="tabSortKey">
<tb-toggle-option [value]="TabSortKey.TIMESTAMP">{{ 'widgets.table.sort-timestamp-option' | translate }}</tb-toggle-option> <tb-toggle-option [value]="TabSortKey.TIMESTAMP">{{ 'widgets.table.sort-timestamp-option' | translate }}</tb-toggle-option>
<tb-toggle-option [value]="TabSortKey.NAME_ASC">{{ 'widgets.table.sort-asc' | translate }}</tb-toggle-option> <tb-toggle-option [value]="TabSortKey.NAME_ASC">{{ 'widgets.table.sort-asc' | translate }}</tb-toggle-option>
<tb-toggle-option [value]="TabSortKey.NAME_DESC">{{ 'widgets.table.sort-desc' | translate }}</tb-toggle-option> <tb-toggle-option [value]="TabSortKey.NAME_DESC">{{ 'widgets.table.sort-desc' | translate }}</tb-toggle-option>

4
ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/timeseries-table-widget-settings.component.ts

@ -68,7 +68,7 @@ export class TimeseriesTableWidgetSettingsComponent extends WidgetSettingsCompon
protected prepareInputSettings(settings: WidgetSettings): WidgetSettings { protected prepareInputSettings(settings: WidgetSettings): WidgetSettings {
settings.pageStepIncrement = settings.pageStepIncrement ?? settings.defaultPageSize; settings.pageStepIncrement = settings.pageStepIncrement ?? settings.defaultPageSize;
settings.tabSortKey = settings.sortEntityAliasKey ?? TabSortKey.TIMESTAMP; settings.tabSortKey = settings.tabSortKey ?? TabSortKey.TIMESTAMP;
this.pageStepSizeValues = buildPageStepSizeValues(settings.pageStepCount, settings.pageStepIncrement); this.pageStepSizeValues = buildPageStepSizeValues(settings.pageStepCount, settings.pageStepIncrement);
return settings; return settings;
} }
@ -99,7 +99,7 @@ export class TimeseriesTableWidgetSettingsComponent extends WidgetSettingsCompon
disableStickyHeader: [settings.disableStickyHeader, []], disableStickyHeader: [settings.disableStickyHeader, []],
useRowStyleFunction: [settings.useRowStyleFunction, []], useRowStyleFunction: [settings.useRowStyleFunction, []],
rowStyleFunction: [settings.rowStyleFunction, [Validators.required]], rowStyleFunction: [settings.rowStyleFunction, [Validators.required]],
sortEntityAliasKey: [settings.sortEntityAliasKey, []], tabSortKey: [settings.tabSortKey, []],
}); });
} }

Loading…
Cancel
Save