diff --git a/src/hooks/useExpressionsProcessor.ts b/src/hooks/useExpressionsProcessor.ts index 667c2e2e..d3ee7ee7 100644 --- a/src/hooks/useExpressionsProcessor.ts +++ b/src/hooks/useExpressionsProcessor.ts @@ -51,7 +51,7 @@ export async function useExpressionsQueryProcessor(config: Indexable) { const entity = { serviceName: dashboardStore.entity === "All" ? undefined : selectorStore.currentService.value, normal: dashboardStore.entity === "All" ? undefined : selectorStore.currentService.normal, - serviceInstanceName: ["ServiceInstance", "ServiceInstanceRelation", "ProcessRelation"].includes( + serviceInstanceName: ["ServiceInstance", "ServiceInstanceRelation", "ProcessRelation", "Process"].includes( dashboardStore.entity, ) ? selectorStore.currentPod && selectorStore.currentPod.value diff --git a/src/views/dashboard/controls/Widget.vue b/src/views/dashboard/controls/Widget.vue index 423b9c51..4128287c 100644 --- a/src/views/dashboard/controls/Widget.vue +++ b/src/views/dashboard/controls/Widget.vue @@ -121,6 +121,7 @@ limitations under the License. --> async function queryMetrics() { const isExpression = props.data.metricMode === MetricModes.Expression; + if (isExpression) { loading.value = true; const e = { @@ -206,7 +207,7 @@ limitations under the License. --> if (isList.value) { return; } - if (dashboardStore.entity === EntityType[0].value || dashboardStore.entity === EntityType[4].value) { + if ([EntityType[0].value, EntityType[4].value].includes(dashboardStore.entity)) { queryMetrics(); } }, @@ -214,7 +215,7 @@ limitations under the License. --> watch( () => [selectorStore.currentPod, selectorStore.currentDestPod], () => { - if (dashboardStore.entity === EntityType[0].value || dashboardStore.entity === EntityType[7].value) { + if ([EntityType[0].value, EntityType[7].value, EntityType[8].value].includes(dashboardStore.entity)) { return; } if (isList.value) { @@ -226,10 +227,10 @@ limitations under the License. --> watch( () => [selectorStore.currentProcess, selectorStore.currentDestProcess], () => { - if (!(selectorStore.currentDestProcess && selectorStore.currentProcess)) { + if (isList.value) { return; } - if (dashboardStore.entity === EntityType[7].value) { + if ([EntityType[7].value, EntityType[8].value].includes(dashboardStore.entity)) { queryMetrics(); } },