diff --git a/src/hooks/useExpressionsProcessor.ts b/src/hooks/useExpressionsProcessor.ts index db7590cb..8b722051 100644 --- a/src/hooks/useExpressionsProcessor.ts +++ b/src/hooks/useExpressionsProcessor.ts @@ -318,7 +318,7 @@ export async function useExpressionsQueryPodsMetrics( export function useQueryTopologyExpressionsProcessor(metrics: string[], instances: any[]) { const appStore = useAppStoreWithOut(); - function getNodeExpressionQuery() { + function getExpressionQuery() { const conditions: { [key: string]: unknown } = { duration: appStore.durationTime, }; @@ -364,5 +364,5 @@ export function useQueryTopologyExpressionsProcessor(metrics: string[], instance return obj; } - return { getNodeExpressionQuery, handleExpressionValues }; + return { getExpressionQuery, handleExpressionValues }; } diff --git a/src/store/modules/topology.ts b/src/store/modules/topology.ts index d2224ebc..74bc7e15 100644 --- a/src/store/modules/topology.ts +++ b/src/store/modules/topology.ts @@ -382,11 +382,8 @@ export const topologyStore = defineStore({ if (!calls.length) { return; } - const { getNodeExpressionQuery, handleExpressionValues } = useQueryTopologyExpressionsProcessor( - expressions, - calls, - ); - const param = getNodeExpressionQuery(); + const { getExpressionQuery, handleExpressionValues } = useQueryTopologyExpressionsProcessor(expressions, calls); + const param = getExpressionQuery(); const res = await this.getNodeExpressionValue(param); if (res.errors) { ElMessage.error(res.errors); @@ -424,11 +421,11 @@ export const topologyStore = defineStore({ this.setNodeMetricValue({}); return; } - const { getNodeExpressionQuery, handleExpressionValues } = useQueryTopologyExpressionsProcessor( + const { getExpressionQuery, handleExpressionValues } = useQueryTopologyExpressionsProcessor( expressions, this.nodes, ); - const param = getNodeExpressionQuery(); + const param = getExpressionQuery(); const res = await this.getNodeExpressionValue(param); if (res.errors) { ElMessage.error(res.errors); diff --git a/src/views/dashboard/related/topology/components/Graph.vue b/src/views/dashboard/related/topology/components/Graph.vue index ee5eccd7..ffd7c14e 100644 --- a/src/views/dashboard/related/topology/components/Graph.vue +++ b/src/views/dashboard/related/topology/components/Graph.vue @@ -369,8 +369,8 @@ limitations under the License. --> if (!topologyStore.nodes.length) { return; } - const { getNodeExpressionQuery } = useQueryTopologyExpressionsProcessor(names, topologyStore.nodes); - const param = getNodeExpressionQuery(); + const { getExpressionQuery } = useQueryTopologyExpressionsProcessor(names, topologyStore.nodes); + const param = getExpressionQuery(); const res = await topologyStore.getNodeExpressionValue(param); if (res.errors) { ElMessage.error(res.errors); diff --git a/src/views/dashboard/related/topology/components/Settings.vue b/src/views/dashboard/related/topology/components/Settings.vue index 168b3d2e..01d9426b 100644 --- a/src/views/dashboard/related/topology/components/Settings.vue +++ b/src/views/dashboard/related/topology/components/Settings.vue @@ -378,8 +378,8 @@ limitations under the License. --> return; } if (isExpression.value) { - const { getNodeExpressionQuery } = useQueryTopologyExpressionsProcessor(names, topologyStore.nodes); - const param = getNodeExpressionQuery(); + const { getExpressionQuery } = useQueryTopologyExpressionsProcessor(names, topologyStore.nodes); + const param = getExpressionQuery(); const res = await topologyStore.getNodeExpressionValue(param); if (res.errors) { ElMessage.error(res.errors);