From 7d1946d3ec1614c6e445f7660f3d37f6907f52be Mon Sep 17 00:00:00 2001
From: rijkvanzanten <rijkvanzanten@me.com>
Date: Fri, 18 Jun 2021 12:23:40 -0400
Subject: [PATCH] Add auto-format option

---
 app/src/lang/translations/en-US.yaml |  2 ++
 app/src/panels/metric/index.ts       |  9 ++++++
 app/src/panels/metric/metric.vue     | 42 +++++++++++++++++++++-------
 3 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/app/src/lang/translations/en-US.yaml b/app/src/lang/translations/en-US.yaml
index fcfb6744bf..26876bdcd4 100644
--- a/app/src/lang/translations/en-US.yaml
+++ b/app/src/lang/translations/en-US.yaml
@@ -552,6 +552,8 @@ read: Read
 update: Update
 select_fields: Select Fields
 format_text: Format Text
+format_value: Format Value
+abbreviate_value: Abbreviate Value
 bold: Bold
 toggle: Toggle
 icon_on: Icon On
diff --git a/app/src/panels/metric/index.ts b/app/src/panels/metric/index.ts
index 6c8f19d94b..eedc514688 100644
--- a/app/src/panels/metric/index.ts
+++ b/app/src/panels/metric/index.ts
@@ -162,6 +162,15 @@ export default definePanel({
 				},
 			},
 		},
+		{
+			field: 'abbreviate',
+			type: 'boolean',
+			name: '$t:abbreviate_value',
+			meta: {
+				interface: 'boolean',
+				width: 'half',
+			},
+		},
 	],
 	minWidth: 16,
 	minHeight: 6,
diff --git a/app/src/panels/metric/metric.vue b/app/src/panels/metric/metric.vue
index 2786cda233..4a2b55b4da 100644
--- a/app/src/panels/metric/metric.vue
+++ b/app/src/panels/metric/metric.vue
@@ -3,21 +3,35 @@
 		<v-progress-circular indeterminate v-if="loading" />
 		<template v-else>
 			<span class="prefix">{{ options.prefix }}</span>
-			<span class="value">{{ metric }}</span>
+			<span class="value">{{ displayValue }}</span>
 			<span class="suffix">{{ options.suffix }}</span>
 		</template>
 	</div>
 </template>
 
 <script lang="ts">
-import { defineComponent, ref, watch } from 'vue';
+import { defineComponent, ref, watch, PropType, computed } from 'vue';
 import api from '@/api';
 import { isEqual } from 'lodash';
+import { Filter } from '@/types';
+import { useI18n } from 'vue-i18n';
+import { abbreviateNumber } from '@/utils/abbreviate-number';
+
+type MetricOptions = {
+	abbreviate: boolean;
+	sortField: string;
+	sortDirection: string;
+	collection: string;
+	field: string;
+	function: 'avg' | 'avg_distinct' | 'sum' | 'sum_distinct' | 'count' | 'count_distinct' | 'min' | 'max';
+	filter: Filter;
+	decimals: number;
+};
 
 export default defineComponent({
 	props: {
 		options: {
-			type: Object,
+			type: Object as PropType<MetricOptions>,
 			default: null,
 		},
 		show_header: {
@@ -26,6 +40,8 @@ export default defineComponent({
 		},
 	},
 	setup(props) {
+		const { n } = useI18n();
+
 		const metric = ref();
 		const loading = ref(false);
 
@@ -40,7 +56,17 @@ export default defineComponent({
 			{ deep: true }
 		);
 
-		return { metric, loading };
+		const displayValue = computed(() => {
+			if (!metric.value) return null;
+
+			if (props.options.abbreviate) {
+				return abbreviateNumber(metric.value);
+			}
+
+			return n(Number(metric.value));
+		});
+
+		return { metric, loading, displayValue };
 
 		async function fetchData() {
 			if (!props.options) return;
@@ -50,6 +76,7 @@ export default defineComponent({
 			try {
 				const sort =
 					props.options.sortField && `${props.options.sortDirection === 'desc' ? '-' : ''}${props.options.sortField}`;
+
 				const res = await api.get(`/items/${props.options.collection}`, {
 					params: {
 						aggregate: {
@@ -60,12 +87,7 @@ export default defineComponent({
 					},
 				});
 
-				metric.value = Number(res.data.data[0][`${props.options.field}_${props.options.function}`]).toLocaleString(
-					undefined,
-					{
-						minimumFractionDigits: props.options.decimals ?? 2,
-					}
-				);
+				metric.value = res.data.data[0][`${props.options.field}_${props.options.function}`];
 			} catch (err) {
 				// oh no
 			} finally {