fix: use the same pattern for columns

Author: astandrik

src/containers/Nodes/Nodes.tsx

@@ -1,11 +1,9 @@
 import React from 'react';
 
 import type {Column} from '../../components/PaginatedTable';
-import {getPileNameColumn} from '../../components/nodesColumns/columns';
 import {
     NODES_COLUMNS_IDS,
     isMonitoringUserNodesColumn,
-    isSortableNodesColumn,
     isViewerUserNodesColumn,
 } from '../../components/nodesColumns/constants';
 import type {NodesColumnId} from '../../components/nodesColumns/constants';
@@ -57,35 +55,9 @@ export function Nodes({
     const bridgeModeEnabled = useBridgeModeEnabled();
 
     const columnsWithPile = React.useMemo(() => {
-        if (!bridgeModeEnabled) {
-            // Ensure PileName is not present when bridge mode is off
-            return columns.filter((c) => c.name !== NODES_COLUMNS_IDS.PileName);
-        }
-
-        const hasPile = columns.some((c) => c.name === NODES_COLUMNS_IDS.PileName);
-        if (hasPile) {
-            return columns;
-        }
-
-        const pileColumn = getPileNameColumn<NodesPreparedEntity>();
-        // Add sortable flag consistently with other columns using nodesColumns constants
-        const enhancedPileColumn = {
-            ...pileColumn,
-            sortable: isSortableNodesColumn(NODES_COLUMNS_IDS.PileName),
-        } as (typeof columns)[number];
-
-        const rackIndex = columns.findIndex((c) => c.name === NODES_COLUMNS_IDS.Rack);
-        const dcIndex = columns.findIndex((c) => c.name === NODES_COLUMNS_IDS.DC);
-        let insertIndex = columns.length;
-        if (rackIndex !== -1) {
-            insertIndex = rackIndex;
-        } else if (dcIndex !== -1) {
-            insertIndex = dcIndex + 1;
-        }
-
-        const next = columns.slice();
-        next.splice(insertIndex, 0, enhancedPileColumn);
-        return next;
+        return bridgeModeEnabled
+            ? columns
+            : columns.filter((c) => c.name !== NODES_COLUMNS_IDS.PileName);
     }, [bridgeModeEnabled, columns]);
 
     const effectiveDefaultColumns = React.useMemo(() => {

src/containers/Nodes/columns/columns.tsx

@@ -6,6 +6,7 @@ import {
     getMemoryColumn,
     getNodeIdColumn,
     getNodeNameColumn,
+    getPileNameColumn,
     getPoolsColumn,
     getRAMColumn,
     getRackColumn,
@@ -24,7 +25,7 @@ export function getNodesColumns(params: GetNodesColumnsParams): Column<NodesPrep
         getHostColumn<NodesPreparedEntity>(params),
         getNodeNameColumn<NodesPreparedEntity>(),
         getDataCenterColumn<NodesPreparedEntity>(),
-        // PileName will be added conditionally by callers based on capability
+        getPileNameColumn<NodesPreparedEntity>(),
         getRackColumn<NodesPreparedEntity>(),
         getUptimeColumn<NodesPreparedEntity>(),
         getCpuColumn<NodesPreparedEntity>(),

src/containers/Versions/NodesTable/NodesTable.tsx

@@ -10,6 +10,7 @@ import {
     getRAMColumn,
     getUptimeColumn,
 } from '../../../components/nodesColumns/columns';
+import {NODES_COLUMNS_IDS} from '../../../components/nodesColumns/constants';
 import type {GetNodesColumnsParams} from '../../../components/nodesColumns/types';
 import {useBridgeModeEnabled} from '../../../store/reducers/capabilities/hooks';
 import type {NodesPreparedEntity} from '../../../store/reducers/nodes/types';
@@ -18,24 +19,16 @@ import {useAdditionalNodesProps} from '../../../utils/hooks/useAdditionalNodesPr
 
 const VERSIONS_COLUMNS_WIDTH_LS_KEY = 'versionsTableColumnsWidth';
 
-function getColumns(
-    params: GetNodesColumnsParams,
-    includePileName: boolean,
-): Column<NodesPreparedEntity>[] {
-    const cols: Column<NodesPreparedEntity>[] = [
+function getColumns(params: GetNodesColumnsParams): Column<NodesPreparedEntity>[] {
+    return [
         getNodeIdColumn<NodesPreparedEntity>(),
         getHostColumn<NodesPreparedEntity>(params),
-    ];
-    if (includePileName) {
-        cols.push(getPileNameColumn<NodesPreparedEntity>());
-    }
-    cols.push(
+        getPileNameColumn<NodesPreparedEntity>(),
         getUptimeColumn<NodesPreparedEntity>(),
         getRAMColumn<NodesPreparedEntity>(),
         getCpuColumn<NodesPreparedEntity>(),
         getLoadAverageColumn<NodesPreparedEntity>(),
-    );
-    return cols;
+    ];
 }
 
 interface NodesTableProps {
@@ -46,7 +39,10 @@ export const NodesTable = ({nodes}: NodesTableProps) => {
     const additionalNodesProps = useAdditionalNodesProps();
     const bridgeModeEnabled = useBridgeModeEnabled();
 
-    const columns = getColumns({getNodeRef: additionalNodesProps?.getNodeRef}, bridgeModeEnabled);
+    const allColumns = getColumns({getNodeRef: additionalNodesProps?.getNodeRef});
+    const columns = bridgeModeEnabled
+        ? allColumns
+        : allColumns.filter((c) => c.name !== NODES_COLUMNS_IDS.PileName);
 
     return (
         <ResizeableDataTable