From bb9e81db1e37a765872fd5f3b1c54cb3be260c0b Mon Sep 17 00:00:00 2001
From: mpetrov <mpetrov@thingsboard.io>
Date: Wed, 12 Jun 2024 15:07:50 +0300
Subject: [PATCH] [PROD-3407] [FIX] fixed gateway dashboard sorting by status

---
 .../gateway/gateway-connectors.component.ts   | 24 ++++++++++++++-----
 .../src/app/shared/models/page/sort-order.ts  |  3 +++
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.ts
index 4f1b6b72a9..0ee3a75ca6 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.ts
@@ -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;
diff --git a/ui-ngx/src/app/shared/models/page/sort-order.ts b/ui-ngx/src/app/shared/models/page/sort-order.ts
index 9174b0c970..cece5e73e9 100644
--- a/ui-ngx/src/app/shared/models/page/sort-order.ts
+++ b/ui-ngx/src/app/shared/models/page/sort-order.ts
@@ -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;