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

connectors formating logs

Browse Source
This commit is contained in:
Maksym Dudnik 2023-07-28 10:20:49 +03:00
parent 880e1b32da
commit 12ab38d7d1
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,7 +58,7 @@
</ng-container> </ng-container>
<ng-container matColumnDef="syncStatus"> <ng-container matColumnDef="syncStatus">
<mat-header-cell *matHeaderCellDef mat-sort-header style="width: 30%"> <mat-header-cell *matHeaderCellDef mat-sort-header style="width: 30%">
{{ 'gateway.connectors-table-status' | translate }} {{ 'gateway.configuration' | translate }}
</mat-header-cell> </mat-header-cell>
<mat-cell *matCellDef="let attribute" style="text-transform: uppercase"> <mat-cell *matCellDef="let attribute" style="text-transform: uppercase">
<div <div
@ -166,7 +166,7 @@
fxFlex fxFlex
fxLayout="column" fxLayout="column"
required required
label="{{ 'gateway.connector-json' | translate }}" label="{{ 'gateway.configuration' | translate }}"
formControlName="configurationJson"> formControlName="configurationJson">
</tb-json-object-edit> </tb-json-object-edit>
<div fxLayoutAlign="start center"> <div fxLayoutAlign="start center">

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

@ -165,6 +165,7 @@ export class GatewayConnectorComponent extends PageComponent implements AfterVie
} else if (sortHeaderId === 'enabled') { } else if (sortHeaderId === 'enabled') {
return this.activeConnectors.includes(data.key) ? 1 : 0; return this.activeConnectors.includes(data.key) ? 1 : 0;
} }
console.log(data, sortHeaderId, data[sortHeaderId] || data.value[sortHeaderId]);
return data[sortHeaderId] || data.value[sortHeaderId]; return data[sortHeaderId] || data.value[sortHeaderId];
}; };