dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[PROD-3407] [FIX] fixed gateway dashboard sorting by status

Browse Source
This commit is contained in:
mpetrov 2024-06-12 15:07:50 +03:00
parent ea00ab9acc
commit bb9e81db1e
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.ts
View File

@ -35,7 +35,7 @@ import { AttributeData, AttributeScope } from '@shared/models/telemetry/telemetr
import { PageComponent } from '@shared/components/page.component';
import { PageLink } from '@shared/models/page/page-link';
import { AttributeDatasource } from '@home/models/datasource/attribute-datasource';
import { Direction, SortOrder } from '@shared/models/page/sort-order';
import { Direction, SORT_ASC_PINNED_VALUE, SORT_DESC_PINNED_VALUE, SortOrder } from '@shared/models/page/sort-order';
import { MatSort } from '@angular/material/sort';
import { TelemetryWebsocketService } from '@core/ws/telemetry-websocket.service';
import { MatTableDataSource } from '@angular/material/table';
@ -238,14 +238,26 @@ export class GatewayConnectorComponent extends PageComponent implements AfterVie
this.dataSource.sort = this.sort;
this.dataSource.sortingDataAccessor = (data: AttributeData, sortHeaderId: string) => {
if (sortHeaderId === 'syncStatus') {
return this.isConnectorSynced(data) ? 1 : 0;
} else if (sortHeaderId === 'enabled') {
return this.activeConnectors.includes(data.key) ? 1 : 0;
switch (sortHeaderId) {
case 'syncStatus':
return this.isConnectorSynced(data) ? 1 : 0;
case 'enabled':
return this.activeConnectors.includes(data.key) ? 1 : 0;
case 'errors':
const errors = this.getErrorsCount(data);
if (typeof errors === 'string') {
return this.sort.direction.toUpperCase() === Direction.DESC ? SORT_DESC_PINNED_VALUE : SORT_ASC_PINNED_VALUE;
}
return errors;
default:
return data[sortHeaderId] || data.value[sortHeaderId];
}
return data[sortHeaderId] || data.value[sortHeaderId];
};
if (this.device) {
if (this.device.id === NULL_UUID) {
return;

3
ui-ngx/src/app/shared/models/page/sort-order.ts
View File

@ -25,6 +25,9 @@ export enum Direction {
DESC = 'DESC'
}
export const SORT_DESC_PINNED_VALUE = -1;
export const SORT_ASC_PINNED_VALUE = 9999;
export function sortOrderFromString(strSortOrder: string): SortOrder {
let property: string;
let direction = Direction.ASC;