From 87f79737e889e639b0206fd56bbeb65da7cebaa8 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Sun, 25 Sep 2022 12:39:49 +0200
Subject: [PATCH] Fixed empty calculated inline fields showing calc

---
 .../components/features/FeatureCard.vue       | 40 ++++++++++++-------
 .../viewers/shared/PropertyDescription.vue    | 18 +++++++--
 2 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/app/imports/ui/properties/components/features/FeatureCard.vue b/app/imports/ui/properties/components/features/FeatureCard.vue
index 0f706b3e..860e11de 100644
--- a/app/imports/ui/properties/components/features/FeatureCard.vue
+++ b/app/imports/ui/properties/components/features/FeatureCard.vue
@@ -10,7 +10,7 @@
       </v-toolbar-title>
       <v-spacer />
     </template>
-    <v-card-text v-if="model.summary">
+    <v-card-text v-if="summaryText">
       <property-description
         text
         :model="model.summary"
@@ -20,21 +20,31 @@
 </template>
 
 <script lang="js">
-	import ToolbarCard from '/imports/ui/components/ToolbarCard.vue';
-  import PropertyDescription from '/imports/ui/properties/viewers/shared/PropertyDescription.vue'
+import ToolbarCard from '/imports/ui/components/ToolbarCard.vue';
+import PropertyDescription from '/imports/ui/properties/viewers/shared/PropertyDescription.vue'
 
-	export default {
-		components: {
-			ToolbarCard,
-      PropertyDescription,
-		},
-		props: {
-			model: {
-        type: Object,
-        required: true,
-      },
-		},
-	};
+export default {
+  components: {
+    ToolbarCard,
+    PropertyDescription,
+  },
+  props: {
+    model: {
+      type: Object,
+      required: true,
+    },
+  },
+  computed: {
+    summaryText() {
+      if (!this.model || !this.model.summary) return;
+      if (typeof this.model.summary.value === 'string') {
+        return this.model.summary.value;
+      } else {
+        return this.model.summary.text
+      }
+    },
+  }
+};
 </script>
 
 <style lang="css" scoped>
diff --git a/app/imports/ui/properties/viewers/shared/PropertyDescription.vue b/app/imports/ui/properties/viewers/shared/PropertyDescription.vue
index 5763d24d..67c7a47e 100644
--- a/app/imports/ui/properties/viewers/shared/PropertyDescription.vue
+++ b/app/imports/ui/properties/viewers/shared/PropertyDescription.vue
@@ -1,15 +1,15 @@
 <template lang="html">
   <markdown-text
     v-if="text && model"
-    :markdown="model.value || model.text"
+    :markdown="textValue"
   />
   <property-field
-    v-else-if="model && (model.value || model.text)"
+    v-else-if="model && textValue"
     :name="name"
     :cols="{cols: 12}"
   >
     <markdown-text
-      :markdown="model.value || model.text"
+      :markdown="textValue"
     />
   </property-field>
 </template>
@@ -33,7 +33,17 @@ export default {
       default: undefined,
     },
     text: Boolean,
-	},
+  },
+  computed: {
+    textValue() {
+      if (!this.model) return;
+      if (typeof this.model.value === 'string') {
+        return this.model.value;
+      } else {
+        return this.model.text
+      }
+    },
+  },
 }
 </script>