From 951dcd83aec21e1e4841bcda2efcc1dbfb0dc31a Mon Sep 17 00:00:00 2001
From: rijkvanzanten <rijkvanzanten@me.com>
Date: Mon, 13 Sep 2021 14:53:47 -0400
Subject: [PATCH] Fix metric panel

---
 app/src/panels/metric/metric.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/panels/metric/metric.vue b/app/src/panels/metric/metric.vue
index dfed7579f4..c1f26c2515 100644
--- a/app/src/panels/metric/metric.vue
+++ b/app/src/panels/metric/metric.vue
@@ -1,7 +1,7 @@
 <template>
 	<div class="metric type-title selectable" :class="{ 'has-header': show_header }">
-		<v-progress-circular indeterminate v-if="loading" />
-		<div :style="{ color }" v-else>
+		<v-progress-circular v-if="loading" indeterminate />
+		<div v-else :style="{ color }">
 			<span class="prefix">{{ options.prefix }}</span>
 			<span class="value">{{ displayValue }}</span>
 			<span class="suffix">{{ options.suffix }}</span>
@@ -13,7 +13,7 @@
 import { defineComponent, ref, watch, PropType, computed } from 'vue';
 import api from '@/api';
 import { isEqual } from 'lodash';
-import { Filter } from '@/types';
+import { Filter } from '@directus/shared/types';
 import { useI18n } from 'vue-i18n';
 import { abbreviateNumber } from '@/utils/abbreviate-number';
 import { isNil } from 'lodash';
@@ -152,7 +152,7 @@ export default defineComponent({
 					if (props.options.function === 'first' || props.options.function === 'last') {
 						metric.value = Number(res.data.data[0][props.options.field]);
 					} else {
-						metric.value = Number(res.data.data[0][`${props.options.field}_${props.options.function}`]);
+						metric.value = Number(res.data.data[0][props.options.function][props.options.field]);
 					}
 				} else {
 					metric.value = Number(res.data.data[0][props.options.function]);