From 9b1a5f7a74e676eef15c63c0d14bbdb6dc43cfac Mon Sep 17 00:00:00 2001
From: Fine0830 <fanxue0830@gmail.com>
Date: Fri, 9 Jun 2023 18:23:33 +0800
Subject: [PATCH 1/2] fix: expressions (#278)

---
 src/hooks/useExpressionsProcessor.ts        | 6 +++---
 src/views/dashboard/graphs/EndpointList.vue | 3 ++-
 src/views/dashboard/graphs/InstanceList.vue | 3 ++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/hooks/useExpressionsProcessor.ts b/src/hooks/useExpressionsProcessor.ts
index 94ca8378..667c2e2e 100644
--- a/src/hooks/useExpressionsProcessor.ts
+++ b/src/hooks/useExpressionsProcessor.ts
@@ -129,7 +129,7 @@ export async function useExpressionsQueryProcessor(config: Indexable) {
           }
         }
         if (type === ExpressionResultType.SINGLE_VALUE) {
-          source[c.label || name] = results[0].values[0].value;
+          source[c.label || name] = (results[0].values[0] || {}).value;
         }
         if (([ExpressionResultType.RECORD_LIST, ExpressionResultType.SORTED_LIST] as string[]).includes(type)) {
           source[name] = results[0].values;
@@ -259,7 +259,7 @@ export async function useExpressionsQueryPodsMetrics(
             if (subValues) {
               d[name]["values"] = subValues;
             }
-            d[name]["avg"] = results[i].values[0].value;
+            d[name]["avg"] = (results[i].values[0] || {}).value;
 
             const j = names.find((d: string) => d === name);
 
@@ -278,7 +278,7 @@ export async function useExpressionsQueryPodsMetrics(
           if (!d[name]) {
             d[name] = {};
           }
-          d[name]["avg"] = [results[0].values[0].value];
+          d[name]["avg"] = [(results[0].values[0] || {}).value];
           if (subResults[0]) {
             if (!d[subName]) {
               d[subName] = {};
diff --git a/src/views/dashboard/graphs/EndpointList.vue b/src/views/dashboard/graphs/EndpointList.vue
index 97f06a2a..7921abe0 100644
--- a/src/views/dashboard/graphs/EndpointList.vue
+++ b/src/views/dashboard/graphs/EndpointList.vue
@@ -179,9 +179,9 @@ limitations under the License. -->
       );
       endpoints.value = params.data;
       colMetrics.value = params.names;
+      colSubMetrics.value = params.subNames;
       metricTypes.value = params.metricTypesArr;
       metricConfig.value = params.metricConfigArr;
-      colSubMetrics.value = params.colSubMetrics;
       emit("expressionTips", { tips: params.expressionsTips, subTips: params.subExpressionsTips });
 
       return;
@@ -216,6 +216,7 @@ limitations under the License. -->
       ...(props.config.metrics || []),
       ...(props.config.metricConfig || []),
       ...(props.config.expressions || []),
+      ...(props.config.subExpressions || []),
       props.config.metricMode,
     ],
     (data, old) => {
diff --git a/src/views/dashboard/graphs/InstanceList.vue b/src/views/dashboard/graphs/InstanceList.vue
index 4bf74e3f..d04d47ff 100644
--- a/src/views/dashboard/graphs/InstanceList.vue
+++ b/src/views/dashboard/graphs/InstanceList.vue
@@ -215,7 +215,7 @@ limitations under the License. -->
       );
       instances.value = params.data;
       colMetrics.value = params.names;
-      colSubMetrics.value = params.colSubMetrics;
+      colSubMetrics.value = params.subNames;
       metricTypes.value = params.metricTypesArr;
       metricConfig.value = params.metricConfigArr;
       emit("expressionTips", { tips: params.expressionsTips, subTips: params.subExpressionsTips });
@@ -268,6 +268,7 @@ limitations under the License. -->
       ...(props.config.metrics || []),
       ...(props.config.metricConfig || []),
       ...(props.config.expressions || []),
+      ...(props.config.subExpressions || []),
       props.config.metricMode,
     ],
     (data, old) => {

From 7738695601af5a16542ad44f9e307f79bb13b01b Mon Sep 17 00:00:00 2001
From: Fine0830 <fanxue0830@gmail.com>
Date: Fri, 9 Jun 2023 21:03:51 +0800
Subject: [PATCH 2/2] fix: show error messages and update style for `no data`
 (#279)

---
 .../dashboard/configuration/widget/metric/Index.vue   | 11 +++++++----
 src/views/dashboard/graphs/Card.vue                   |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/views/dashboard/configuration/widget/metric/Index.vue b/src/views/dashboard/configuration/widget/metric/Index.vue
index b0c3b95a..9a6e486b 100644
--- a/src/views/dashboard/configuration/widget/metric/Index.vue
+++ b/src/views/dashboard/configuration/widget/metric/Index.vue
@@ -93,11 +93,14 @@ limitations under the License. -->
       />
       <Icon class="cp" iconName="remove_circle_outline" size="middle" @click="deleteMetric(index)" />
     </span>
-    <div v-if="(errors || states.tips)[index] && isExpression" class="ml-10 red sm">
-      {{ (errors || states.tips)[index] }}
+    <div v-if="(states.tips || [])[index] && isExpression" class="ml-10 red sm">
+      {{ states.tips[index] }}
     </div>
-    <div v-if="(subErrors || states.tips)[index] && isExpression" class="ml-10 red sm">
-      {{ (subErrors || states.tips)[index] }}
+    <div v-if="(errors || [])[index] && isExpression" class="ml-10 red sm">
+      {{ (errors || [])[index] }}
+    </div>
+    <div v-if="(subErrors || [])[index] && isExpression" class="ml-10 red sm">
+      {{ (subErrors || [])[index] }}
     </div>
   </div>
   <div>{{ t("visualization") }}</div>
diff --git a/src/views/dashboard/graphs/Card.vue b/src/views/dashboard/graphs/Card.vue
index 0cd212f0..b9670cd4 100644
--- a/src/views/dashboard/graphs/Card.vue
+++ b/src/views/dashboard/graphs/Card.vue
@@ -15,7 +15,7 @@ limitations under the License. -->
 
 <template>
   <div
-    v-if="!isNaN(singleVal)"
+    v-if="singleVal !== null && !isNaN(singleVal)"
     class="chart-card"
     :style="{
       fontSize: `${config.fontSize}px`,