From a4c24e147b9e09c1675ee6a597b3c8e56f1602d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D1=80=D1=82=D1=91=D0=BC=20=D0=9C=D1=83=D1=84=D0=B0?=
 =?UTF-8?q?=D0=B7=D0=B0=D0=BB=D0=BE=D0=B2?=
 <67755036+artemmufazalov@users.noreply.github.com>
Date: Wed, 2 Oct 2024 14:01:39 +0300
Subject: [PATCH] feat(Nodes): add node name column (#1385)

---
 src/containers/Nodes/columns/columns.tsx  | 8 ++++++++
 src/containers/Nodes/columns/constants.ts | 4 ++++
 src/containers/Nodes/columns/i18n/en.json | 1 +
 src/store/reducers/nodes/types.ts         | 1 +
 src/types/api/nodes.ts                    | 1 +
 5 files changed, 15 insertions(+)

diff --git a/src/containers/Nodes/columns/columns.tsx b/src/containers/Nodes/columns/columns.tsx
index c6622634e..071d82417 100644
--- a/src/containers/Nodes/columns/columns.tsx
+++ b/src/containers/Nodes/columns/columns.tsx
@@ -36,6 +36,13 @@ const getHostColumn = (getNodeRef?: GetNodeRefFunc, database?: string): NodesCol
     align: DataTable.LEFT,
     sortable: false,
 });
+const nodeNameColumn: NodesColumn = {
+    name: NODES_COLUMNS_IDS.NodeName,
+    header: NODES_COLUMNS_TITLES.NodeName,
+    align: DataTable.LEFT,
+    render: ({row}) => row.NodeName || EMPTY_DATA_PLACEHOLDER,
+    width: 200,
+};
 
 const getHostColumnWithUndefinedWidth = (
     getNodeRef?: GetNodeRefFunc,
@@ -217,6 +224,7 @@ export function getNodesColumns({database, getNodeRef}: GetNodesColumnsProps): N
     const columns = [
         nodeIdColumn,
         getHostColumn(getNodeRef, database),
+        nodeNameColumn,
         dataCenterColumn,
         rackColumn,
         versionColumn,
diff --git a/src/containers/Nodes/columns/constants.ts b/src/containers/Nodes/columns/constants.ts
index 8fbcf9ab7..8553c210e 100644
--- a/src/containers/Nodes/columns/constants.ts
+++ b/src/containers/Nodes/columns/constants.ts
@@ -8,6 +8,7 @@ export const NODES_TABLE_SELECTED_COLUMNS_LS_KEY = 'nodesTableSelectedColumns';
 export const NODES_COLUMNS_IDS = {
     NodeId: 'NodeId',
     Host: 'Host',
+    NodeName: 'NodeName',
     DC: 'DC',
     Rack: 'Rack',
     Version: 'Version',
@@ -48,6 +49,9 @@ export const NODES_COLUMNS_TITLES = {
     get Host() {
         return i18n('host');
     },
+    get NodeName() {
+        return i18n('node-name');
+    },
     get DC() {
         return i18n('dc');
     },
diff --git a/src/containers/Nodes/columns/i18n/en.json b/src/containers/Nodes/columns/i18n/en.json
index 9f61d325a..2aa13bc36 100644
--- a/src/containers/Nodes/columns/i18n/en.json
+++ b/src/containers/Nodes/columns/i18n/en.json
@@ -1,6 +1,7 @@
 {
   "node-id": "Node Id",
   "host": "Host",
+  "node-name": "Node Name",
   "dc": "DC",
   "rack": "Rack",
   "version": "Version",
diff --git a/src/store/reducers/nodes/types.ts b/src/store/reducers/nodes/types.ts
index b06a13e29..924e488c3 100644
--- a/src/store/reducers/nodes/types.ts
+++ b/src/store/reducers/nodes/types.ts
@@ -11,6 +11,7 @@ import type {ProblemFilterValue} from '../settings/types';
 export interface NodesPreparedEntity {
     NodeId: number;
     Host?: string;
+    NodeName?: string;
     SystemState?: EFlag;
     DC?: string;
     Rack?: string;
diff --git a/src/types/api/nodes.ts b/src/types/api/nodes.ts
index 664afb97b..bc23893d4 100644
--- a/src/types/api/nodes.ts
+++ b/src/types/api/nodes.ts
@@ -86,6 +86,7 @@ export interface TSystemStateInfo {
 
     SharedCacheStats?: TNodeSharedCache;
     TotalSessions?: number;
+    NodeName?: string;
 }
 
 export type PoolName = 'System' | 'User' | 'Batch' | 'IO' | 'IC';