From a8f163ff33cd64769d15dc8fb2a7bf2fdb58729f Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Mon, 15 Aug 2022 12:29:58 +0200
Subject: [PATCH] Removed trigger.summary

---
 .../api/engine/actions/applyTriggers.js       |  8 +-
 app/imports/api/properties/Triggers.js        |  4 -
 .../ui/properties/forms/TriggerForm.vue       |  9 ---
 .../ui/properties/viewers/TriggerViewer.vue   | 73 +++++++++----------
 4 files changed, 40 insertions(+), 54 deletions(-)

diff --git a/app/imports/api/engine/actions/applyTriggers.js b/app/imports/api/engine/actions/applyTriggers.js
index f8346163..9343e1ac 100644
--- a/app/imports/api/engine/actions/applyTriggers.js
+++ b/app/imports/api/engine/actions/applyTriggers.js
@@ -58,12 +58,12 @@ export function applyTrigger(trigger, prop, actionContext) {
   // Fire the trigger
   const content = {
     name: trigger.name || 'Trigger',
-    value: trigger.summary,
+    value: trigger.description,
     inline: false,
   }
-  if (trigger.summary?.text){
-    recalculateInlineCalculations(trigger.summary, actionContext);
-    content.value = trigger.summary.value;
+  if (trigger.description?.text){
+    recalculateInlineCalculations(trigger.description, actionContext);
+    content.value = trigger.description.value;
   }
   actionContext.addLog(content);
 
diff --git a/app/imports/api/properties/Triggers.js b/app/imports/api/properties/Triggers.js
index ce886d3d..f8f6c4a3 100644
--- a/app/imports/api/properties/Triggers.js
+++ b/app/imports/api/properties/Triggers.js
@@ -44,10 +44,6 @@ let TriggerSchema = createPropertySchema({
     optional: true,
     max: STORAGE_LIMITS.name,
   },
-  summary: {
-    type: 'inlineCalculationFieldToCompute',
-    optional: true,
-  },
   description: {
     type: 'inlineCalculationFieldToCompute',
     optional: true,
diff --git a/app/imports/ui/properties/forms/TriggerForm.vue b/app/imports/ui/properties/forms/TriggerForm.vue
index c568019a..2a8e3d8a 100644
--- a/app/imports/ui/properties/forms/TriggerForm.vue
+++ b/app/imports/ui/properties/forms/TriggerForm.vue
@@ -111,15 +111,6 @@
         $emit('change', {path: ['condition', ...path], value, ack})"
     />
 
-    <inline-computation-field
-      label="Summary"
-      hint="This will appear in the feature card in the character sheet"
-      :model="model.summary"
-      :error-messages="errors.summary"
-      @change="({path, value, ack}) =>
-        $emit('change', {path: ['summary', ...path], value, ack})"
-    />
-
     <inline-computation-field
       label="Description"
       hint="The rest of the description that doesn't fit in the summary goes here"
diff --git a/app/imports/ui/properties/viewers/TriggerViewer.vue b/app/imports/ui/properties/viewers/TriggerViewer.vue
index dbecd9c3..ce7e1f44 100644
--- a/app/imports/ui/properties/viewers/TriggerViewer.vue
+++ b/app/imports/ui/properties/viewers/TriggerViewer.vue
@@ -1,10 +1,18 @@
 <template lang="html">
   <div class="trigger-viewer">
     <v-row dense>
+      <property-field
+        name="Timing"
+        :value="timingText"
+      />
       <property-field
         name="Event"
         :value="eventText"
       />
+      <property-field
+        name="Event Type"
+        :value="actionPropertyText"
+      />
       <property-field
         v-if="(model.targetTags && model.targetTags.length) || (model.extraTags && model.extraTags.length)"
         name="Tags Required"
@@ -23,10 +31,6 @@
           </div>
         </div>
       </property-field>
-      <property-description
-        name="Summary"
-        :model="model.summary"
-      />
       <property-description
         name="Description"
         :model="model.description"
@@ -36,39 +40,34 @@
 </template>
 
 <script lang="js">
-	import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js'
-  import { getPropertyName } from '/imports/constants/PROPERTIES.js';
-  import FillSlotButton from '/imports/ui/creature/buildTree/FillSlotButton.vue';
+import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js'
+import { getPropertyName } from '/imports/constants/PROPERTIES.js';
+import { timingOptions, eventOptions, actionPropertyTypeOptions } from '/imports/api/properties/Triggers.js';
 
-  const eventText = {
-    doActionProperty: 'Do action property',
-    receiveActionProperty: 'Receiving action property',
-    flipToggle: 'Toggle changed',
-    adjustProperty: 'Attribute adjusted',
-    anyRest: 'Short or long rest',
-    longRest: 'Long rest',
-    shortRest: 'Short rest',
+export default {
+  mixins: [propertyViewerMixin],
+  inject: {
+    context: {
+      default: {},
+    },
+  },
+  computed: {
+    slotTypeName(){
+      if (!this.model.slotType) return;
+      return getPropertyName(this.model.slotType);
+    },
+    timingText(){
+      if (!this.model.timing) return;
+      return timingOptions[this.model.timing];
+    },
+    actionPropertyText(){
+      if (!this.model.actionPropertyType) return;
+      return actionPropertyTypeOptions[this.model.actionPropertyType];
+    },
+    eventText(){
+      if (!this.model.event) return;
+      return eventOptions[this.model.event];
+    },
   }
-
-	export default {
-    components: {
-      FillSlotButton,
-    },
-		mixins: [propertyViewerMixin],
-    inject: {
-      context: {
-        default: {},
-      },
-    },
-    computed: {
-      slotTypeName(){
-        if (!this.model.slotType) return;
-        return getPropertyName(this.model.slotType);
-      },
-      eventText(){
-        if (!this.model.event) return;
-        return eventText[this.model.event]
-      },
-    }
-	}
+}
 </script>