refactor: Move DeploymentsQueryBuilder to Queries.ts

Author: tiithansen

src/pages/Workloads/tabs/Deployments/Deployments.tsx

@@ -1,24 +1,21 @@
 import { 
     EmbeddedScene,
     SceneFlexLayout, 
-    SceneFlexItem, 
-    SceneQueryRunner,
+    SceneFlexItem,
     TextBoxVariable,
     VariableValueSelectors,
     SceneVariableSet,
-    SceneVariables,
 } from '@grafana/scenes';
-import { createRowQueries } from './Queries';
 import { ReplicasCell } from 'pages/Workloads/components/ReplicasCell';
 import { getSeriesValue } from 'common/seriesHelpers';
 import { buildExpandedRowScene } from './DeploymentExpandedRow';
 import { createNamespaceVariable } from 'common/variableHelpers';
-import { Metrics } from 'metrics/metrics';
 import { TableRow } from './types';
-import { AsyncTable, Column, ColumnSortingConfig, QueryBuilder } from 'components/AsyncTable';
+import { AsyncTable, Column } from 'components/AsyncTable';
 import { SortingState } from 'common/sortingHelpers';
 import { prefixRoute } from 'utils/utils.routing';
 import { ROUTES } from '../../../../constants';
+import { DeploymentQueryBuilder } from './Queries';
 
 const namespaceVariable = createNamespaceVariable();
 
@@ -83,39 +80,6 @@ function asyncRowMapper(row: TableRow, asyncRowData: any) {
     }
 }
 
-class DeploymentQueryBuilder implements QueryBuilder<TableRow> {
-    rootQueryBuilder(variables: SceneVariableSet | SceneVariables, sorting: SortingState, sortingConfig?: ColumnSortingConfig<TableRow>) {
-        return new SceneQueryRunner({
-            datasource: {
-                uid: '$datasource',
-                type: 'prometheus',
-            },
-            queries: [
-                {
-                    refId: 'deployments',
-                    expr: `
-                        group(
-                            ${Metrics.kubeReplicasetOwner.name}{
-                                cluster="$cluster",
-                                ${Metrics.kubeReplicasetOwner.labels.namespace}=~"$namespace",
-                                ${Metrics.kubeReplicasetOwner.labels.ownerName}=~".*$search.*",
-                                ${Metrics.kubeReplicasetOwner.labels.ownerKind}="Deployment"
-                            }
-                        ) by (
-                            ${Metrics.kubeReplicasetOwner.labels.ownerName},
-                            ${Metrics.kubeReplicasetOwner.labels.namespace}
-                        )`,
-                    instant: true,
-                    format: 'table'
-                },
-            ], 
-        })
-    }
-    rowQueryBuilder(rows: TableRow[], variables: SceneVariableSet | SceneVariables) {
-        return createRowQueries(rows, variables)
-    }
-}
-
 function createRowId(row: TableRow) {
     return `${row.namespace}/${row.deployment}`
 }

src/pages/Workloads/tabs/Deployments/Queries.ts

@@ -1,14 +1,19 @@
-import { SceneVariables } from "@grafana/scenes";
+import { SceneQueryRunner, SceneVariableSet, SceneVariables } from "@grafana/scenes";
 import { resolveVariable } from "common/variableHelpers";
 import { Metrics } from "metrics/metrics";
 import { TableRow } from "./types";
+import { QueryBuilder, ColumnSortingConfig } from "components/AsyncTable";
+import { SortingState } from "common/sortingHelpers";
 
-export function createRowQueries(rows: TableRow[], sceneVariables: SceneVariables) {
+function createRowQueries(rows: TableRow[], sceneVariables: SceneVariables) {
 
     const deployments = rows.map(row => row.deployment).join('|');
     const cluster = resolveVariable(sceneVariables, 'cluster');
 
     return [
+        {
+
+        },
         {
             refId: 'replicas',
             expr: `
@@ -41,3 +46,37 @@ export function createRowQueries(rows: TableRow[], sceneVariables: SceneVariable
         },
     ];
 }
+
+export class DeploymentQueryBuilder implements QueryBuilder<TableRow> {
+    rootQueryBuilder(variables: SceneVariableSet | SceneVariables, sorting: SortingState, sortingConfig?: ColumnSortingConfig<TableRow>) {
+        return new SceneQueryRunner({
+            datasource: {
+                uid: '$datasource',
+                type: 'prometheus',
+            },
+            queries: [
+                {
+                    refId: 'deployments',
+                    expr: `
+                        group(
+                            ${Metrics.kubeReplicasetOwner.name}{
+                                cluster="$cluster",
+                                ${Metrics.kubeReplicasetOwner.labels.namespace}=~"$namespace",
+                                ${Metrics.kubeReplicasetOwner.labels.ownerName}=~".*$search.*",
+                                ${Metrics.kubeReplicasetOwner.labels.ownerKind}="Deployment"
+                            }
+                        ) by (
+                            ${Metrics.kubeReplicasetOwner.labels.ownerName},
+                            ${Metrics.kubeReplicasetOwner.labels.namespace}
+                        )`,
+                    instant: true,
+                    format: 'table'
+                },
+            ], 
+        })
+    }
+
+    rowQueryBuilder(rows: TableRow[], variables: SceneVariableSet | SceneVariables) {
+        return createRowQueries(rows, variables)
+    }
+}