From e0b2a99b62fbd2e5a716aa34ca2fd685a1eccac5 Mon Sep 17 00:00:00 2001
From: rijkvanzanten <rijkvanzanten@me.com>
Date: Thu, 16 Dec 2021 18:35:26 -0500
Subject: [PATCH] Tiny tweaks in formatted value display

---
 .../formatted-value/formatted-value.vue       | 73 +++++++++++--------
 app/src/displays/formatted-value/index.ts     |  4 +-
 app/src/lang/translations/en-US.yaml          |  2 +-
 3 files changed, 44 insertions(+), 35 deletions(-)

diff --git a/app/src/displays/formatted-value/formatted-value.vue b/app/src/displays/formatted-value/formatted-value.vue
index 03312b56dd..454b6bd0fd 100644
--- a/app/src/displays/formatted-value/formatted-value.vue
+++ b/app/src/displays/formatted-value/formatted-value.vue
@@ -1,8 +1,17 @@
 <template>
 	<value-null v-if="displayValue === null || displayValue === undefined" />
 
-	<div v-else class="display-formatted" :class="[{ bold, italic }, font]" :style="computedStyle">
-		<v-icon v-if="computedFormat.icon" class="left" :name="computedFormat.icon" :color="computedFormat.color" small />
+	<div
+		v-else
+		class="display-formatted"
+		:class="[
+			{ bold, italic },
+			font,
+			{ 'has-background': computedFormat.background, 'has-border': computedStyle.borderWidth !== 0 },
+		]"
+		:style="computedStyle"
+	>
+		<v-icon v-if="computedFormat.icon" :name="computedFormat.icon" :color="computedFormat.color" left small />
 
 		<span class="value">
 			{{ displayValue }}
@@ -105,6 +114,7 @@ export default defineComponent({
 
 		const computedFormat = computed(() => {
 			const { color, background, icon } = props;
+
 			return matchedConditions.value.reduce(
 				({ color, background, icon, text }, format) => ({
 					color: format.color || color,
@@ -201,46 +211,45 @@ export default defineComponent({
 
 <style lang="scss" scoped>
 .display-formatted {
-	display: inline-flex;
-	align-items: center;
-	padding: 6px 12px;
-	border-radius: 24px;
+	display: inline-block;
 
-	& .value {
-		flex-shrink: 1;
-		overflow: hidden;
-		line-height: 1;
-		white-space: nowrap;
-		text-overflow: ellipsis;
+	&.has-background,
+	&.has-border {
+		height: 28px;
+		padding: 0 10px;
+		font-size: 14px;
+		line-height: 28px;
+		border-radius: 24px;
+	}
 
-		&.bold {
-			color: var(--foreground-normal-alt);
-			font-weight: 700;
-		}
+	&.has-border {
+		line-height: 26px;
+	}
 
-		&.italic {
-			font-style: italic;
-		}
+	&.bold {
+		color: var(--foreground-normal-alt);
+		font-weight: 700;
+	}
 
-		&.sans-serif {
-			font-family: var(--family-sans-serif);
-		}
+	&.italic {
+		font-style: italic;
+	}
 
-		&.serif {
-			font-family: var(--family-serif);
-		}
+	&.sans-serif {
+		font-family: var(--family-sans-serif);
+	}
 
-		&.monospace {
-			font-family: var(--family-monospace);
-		}
+	&.serif {
+		font-family: var(--family-serif);
+	}
+
+	&.monospace {
+		font-family: var(--family-monospace);
 	}
 
 	.v-icon {
 		flex-shrink: 0;
-
-		&.left {
-			margin-right: 2px;
-		}
+		vertical-align: -3px;
 	}
 }
 </style>
diff --git a/app/src/displays/formatted-value/index.ts b/app/src/displays/formatted-value/index.ts
index 4821bb5715..fc5ac5efa7 100644
--- a/app/src/displays/formatted-value/index.ts
+++ b/app/src/displays/formatted-value/index.ts
@@ -10,7 +10,7 @@ export default defineDisplay({
 	icon: 'text_format',
 	component: DisplayFormattedValue,
 	options: ({ field }) => {
-		const isString = ['string', 'text'].includes(field.type);
+		const isString = ['string', 'text'].includes(field.type ?? 'unknown');
 		const stringOperators = ['eq', 'neq', 'contains', 'starts_with', 'ends_with'];
 		const numberOperators = ['eq', 'neq', 'gt', 'gte', 'lt', 'lte'];
 
@@ -212,7 +212,7 @@ export default defineDisplay({
 									interface: 'input',
 									width: 'half',
 									options: {
-										label: '$t:displays.formatted-value.text_label',
+										placeholder: '$t:displays.formatted-value.text_placeholder',
 									},
 								},
 							},
diff --git a/app/src/lang/translations/en-US.yaml b/app/src/lang/translations/en-US.yaml
index ec2677395f..f11dbfcbae 100644
--- a/app/src/lang/translations/en-US.yaml
+++ b/app/src/lang/translations/en-US.yaml
@@ -1547,7 +1547,7 @@ displays:
     border: Border
     border_label: Show border
     text: Text
-    text_label: Text
+    text_placeholder: Optional value override...
   formatted-json-value:
     formatted-json-value: Formatted JSON value
     description: Display a formatted version of the object