fix: expressions (#278)
diff --git a/src/hooks/useExpressionsProcessor.ts b/src/hooks/useExpressionsProcessor.ts
index 94ca837..667c2e2 100644
--- a/src/hooks/useExpressionsProcessor.ts
+++ b/src/hooks/useExpressionsProcessor.ts
@@ -129,7 +129,7 @@
}
}
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 @@
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 @@
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 97f06a2..7921abe 100644
--- a/src/views/dashboard/graphs/EndpointList.vue
+++ b/src/views/dashboard/graphs/EndpointList.vue
@@ -179,9 +179,9 @@
);
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 @@
...(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 4bf74e3..d04d47f 100644
--- a/src/views/dashboard/graphs/InstanceList.vue
+++ b/src/views/dashboard/graphs/InstanceList.vue
@@ -215,7 +215,7 @@
);
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 @@
...(props.config.metrics || []),
...(props.config.metricConfig || []),
...(props.config.expressions || []),
+ ...(props.config.subExpressions || []),
props.config.metricMode,
],
(data, old) => {