refactor: Move FormattedCell and LinkCell to src/components/Cell as t…

…hey are common for most of the views
tiithansen · Jun 10, 2024 · 67b1444 · 67b1444
1 parent 418d6ea
commit 67b1444
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 10 deletions.
diff --git a/src/components/AsyncTable/index.tsx b/src/components/AsyncTable/index.tsx
@@ -10,14 +10,14 @@ import {
 import React, { useEffect, useMemo } from 'react';
 import { DataFrameView } from '@grafana/data';
 import { InteractiveTable } from '../InteractiveTable/InterativeTable';
-import { LinkCell } from 'pages/Workloads/components/LinkCell';
 import { asyncQueryRunner } from 'common/queryHelpers';
 import { resolveVariable } from 'common/variableHelpers';
 import { CellContext, ColumnDef, ColumnSort, Row } from '@tanstack/react-table';
-import { FormattedCell } from 'pages/Workloads/components/FormattedCell';
+import { FormattedCell } from 'components/Cell/FormattedCell';
 import { SortingState } from 'common/sortingHelpers';
 import { TextColor } from 'common/types';
 import { isFunction } from 'lodash';
+import { LinkCell } from 'components/Cell/LinkCell';
 
 export type CellType = 'link' | 'formatted' | 'custom'
 

diff --git a/...es/Workloads/components/FormattedCell.tsx → src/components/Cell/FormattedCell.tsx b/...es/Workloads/components/FormattedCell.tsx → src/components/Cell/FormattedCell.tsx
diff --git a/src/pages/Workloads/components/LinkCell.tsx → src/components/Cell/LinkCell.tsx b/src/pages/Workloads/components/LinkCell.tsx → src/components/Cell/LinkCell.tsx
diff --git a/src/pages/Clusters/tabs/Nodes/Nodes.tsx b/src/pages/Clusters/tabs/Nodes/Nodes.tsx
@@ -20,11 +20,12 @@ import { asyncQueryRunner } from 'common/queryHelpers';
 import { buildExpandedRowScene } from './NodeExpandedRowScene';
 import { getSeriesValue } from 'common/seriesHelpers';
 import { createClusterVariable, resolveVariable } from 'common/variableHelpers';
-import { LinkCell } from 'pages/Workloads/components/LinkCell';
+
 import { CellContext } from '@tanstack/react-table';
-import { FormattedCell } from 'pages/Workloads/components/FormattedCell';
+import { FormattedCell } from 'components/Cell/FormattedCell';
 import { Metrics } from 'metrics/metrics';
 import { TextColor } from 'common/types';
+import { LinkCell } from 'components/Cell/LinkCell';
 
 const clusterVariable = createClusterVariable();
 

diff --git a/src/pages/Workloads/components/ContainersTable/ContainersTable.tsx b/src/pages/Workloads/components/ContainersTable/ContainersTable.tsx
@@ -11,7 +11,7 @@ import {
 } from '@grafana/scenes';
 import React, { useEffect, useMemo } from 'react';
 import { DataFrameView } from '@grafana/data';
-import { FormattedCell } from '../FormattedCell';
+import { FormattedCell } from '../../../../components/Cell/FormattedCell';
 import { InteractiveTable } from '../../../../components/InteractiveTable/InterativeTable';
 import { RestartsCellBuilder } from '../../components/RestartsCell';
 import { createRowQueries } from './Queries';

diff --git a/src/pages/Workloads/tabs/CronJobs/CronJobs.tsx b/src/pages/Workloads/tabs/CronJobs/CronJobs.tsx
@@ -15,14 +15,14 @@ import {
 import React, { useEffect, useMemo } from 'react';
 import { DataFrameView } from '@grafana/data';
 import { InteractiveTable } from '../../../../components/InteractiveTable/InterativeTable';
-import { LinkCell } from 'pages/Workloads/components/LinkCell';
 import { asyncQueryRunner } from 'common/queryHelpers';
 import { getSeriesValue } from 'common/seriesHelpers';
 import { createNamespaceVariable, resolveVariable } from 'common/variableHelpers';
 import { createRowQueries } from './Queries';
 import { DurationCell } from 'pages/Workloads/components/DurationCell';
 import { CellContext } from '@tanstack/react-table';
 import { Metrics } from 'metrics/metrics';
+import { LinkCell } from 'components/Cell/LinkCell';
 
 const namespaceVariable = createNamespaceVariable();
 

diff --git a/src/pages/Workloads/tabs/DaemonSets/DaemonSets.tsx b/src/pages/Workloads/tabs/DaemonSets/DaemonSets.tsx
@@ -16,14 +16,14 @@ import React, { useEffect, useMemo } from 'react';
 import { DataFrameView } from '@grafana/data';
 import { InteractiveTable } from '../../../../components/InteractiveTable/InterativeTable';
 import { buildExpandedRowScene } from './ExpandedRow';
-import { LinkCell } from 'pages/Workloads/components/LinkCell';
 import { ReplicasCell } from 'pages/Workloads/components/ReplicasCell';
 import { asyncQueryRunner } from 'common/queryHelpers';
 import { getSeriesValue } from 'common/seriesHelpers';
 import { createNamespaceVariable, resolveVariable } from 'common/variableHelpers';
 import { createRowQueries } from './Queries';
 import { CellContext } from '@tanstack/react-table';
 import { Metrics } from 'metrics/metrics';
+import { LinkCell } from 'components/Cell/LinkCell';
 
 const namespaceVariable = createNamespaceVariable();
 

diff --git a/src/pages/Workloads/tabs/Deployments/Deployments.tsx b/src/pages/Workloads/tabs/Deployments/Deployments.tsx
@@ -20,10 +20,10 @@ import { ReplicasCell } from 'pages/Workloads/components/ReplicasCell';
 import { asyncQueryRunner } from 'common/queryHelpers';
 import { getSeriesValue } from 'common/seriesHelpers';
 import { buildExpandedRowScene } from './DeploymentExpandedRow';
-import { LinkCell } from 'pages/Workloads/components/LinkCell';
 import { createNamespaceVariable, resolveVariable } from 'common/variableHelpers';
 import { CellContext } from '@tanstack/react-table';
 import { Metrics } from 'metrics/metrics';
+import { LinkCell } from 'components/Cell/LinkCell';
 
 const namespaceVariable = createNamespaceVariable();
 

diff --git a/src/pages/Workloads/tabs/Jobs/Jobs.tsx b/src/pages/Workloads/tabs/Jobs/Jobs.tsx
@@ -19,9 +19,9 @@ import { asyncQueryRunner } from 'common/queryHelpers';
 import { getSeries } from 'common/seriesHelpers';
 import { createNamespaceVariable, resolveVariable } from 'common/variableHelpers';
 import { createRowQueries } from './Queries';
-import { LinkCell } from 'pages/Workloads/components/LinkCell';
 import { CellContext } from '@tanstack/react-table';
 import { Metrics } from 'metrics/metrics';
+import { LinkCell } from 'components/Cell/LinkCell';
 
 const namespaceVariable = createNamespaceVariable();
 

diff --git a/src/pages/Workloads/tabs/StatefulSets/StatefulSets.tsx b/src/pages/Workloads/tabs/StatefulSets/StatefulSets.tsx
@@ -16,14 +16,14 @@ import React, { useEffect, useMemo } from 'react';
 import { DataFrameView } from '@grafana/data';
 import { InteractiveTable } from '../../../../components/InteractiveTable/InterativeTable';
 import { buildExpandedRowScene } from './ExpandedRow';
-import { LinkCell } from 'pages/Workloads/components/LinkCell';
 import { ReplicasCell } from 'pages/Workloads/components/ReplicasCell';
 import { getSeriesValue } from 'common/seriesHelpers';
 import { createNamespaceVariable, resolveVariable } from 'common/variableHelpers';
 import { asyncQueryRunner } from 'common/queryHelpers';
 import { createRowQueries } from './Queries';
 import { CellContext } from '@tanstack/react-table';
 import { Metrics } from 'metrics/metrics';
+import { LinkCell } from 'components/Cell/LinkCell';
 
 const namespaceVariable = createNamespaceVariable();