Added calculation errors to attributes and toggles

app/imports/api/creature/computation/EffectAggregator.js

@@ -2,13 +2,12 @@ import evaluateCalculation from '/imports/api/creature/computation/evaluateCalcu
 
 export default class EffectAggregator{
   constructor(stat, memo){
+    delete this.baseValueErrors;
     if (stat.baseValueCalculation){
       let {value, errors} = evaluateCalculation(stat.baseValueCalculation, memo);
       this.statBaseValue = value;
       if (errors.length){
         this.baseValueErrors = errors;
-      } else {
-        delete this.baseValueErrors;
       }
       this.base = this.statBaseValue;
     } else {

app/imports/api/creature/computation/combineStat.js

@@ -31,6 +31,7 @@ function getAggregatorResult(stat, aggregator){
 function combineAttribute(stat, aggregator){
   stat.value = getAggregatorResult(stat, aggregator);
   stat.baseValue = aggregator.statBaseValue;
+  stat.baseValueErrors = aggregator.baseValueErrors;
   if (stat.attributeType === 'ability') {
     stat.modifier = Math.floor((stat.value - 10) / 2);
   }

app/imports/api/creature/computation/computeToggle.js

@@ -16,6 +16,7 @@ export default function computeToggle(toggle, memo){
   toggle.computationDetails.busyComputing = true;
 
   // Do work
+  delete toggle.errors;
   if (toggle.enabled){
     toggle.toggleResult = true;
   } else if (toggle.disabled){
@@ -29,8 +30,6 @@ export default function computeToggle(toggle, memo){
     toggle.toggleResult = value;
     if (errors.length){
       toggle.errors = errors;
-    } else {
-      delete toggle.errors;
     }
   }
   toggle.computationDetails.computed = true;

app/imports/api/properties/Attributes.js

@@ -1,4 +1,5 @@
 import SimpleSchema from 'simpl-schema';
+import ErrorSchema from '/imports/api/properties/subSchemas/ErrorSchema.js';
 import VARIABLE_NAME_REGEX from '/imports/constants/VARIABLE_NAME_REGEX.js';
 
 /*
@@ -73,6 +74,13 @@ let ComputedOnlyAttributeSchema = new SimpleSchema({
   baseValue: {
     type: SimpleSchema.oneOf(Number, String, Boolean),
     optional: true,
+  },
+  baseValueErrors: {
+    type: Array,
+    optional: true,
+  },
+  'baseValueErrors.$': {
+    type: ErrorSchema,
   },
 	// The computed value of the attribute
   value: {

app/imports/api/properties/Toggles.js

@@ -1,4 +1,5 @@
 import SimpleSchema from 'simpl-schema';
+import ErrorSchema from '/imports/api/properties/subSchemas/ErrorSchema.js';
 
 const ToggleSchema = new SimpleSchema({
   name: {
@@ -32,8 +33,8 @@ const ComputedOnlyToggleSchema = new SimpleSchema({
     type: Array,
     optional: true,
   },
-  'errors.$':{
+  'errors.$': {
-    type: String,
+    type: ErrorSchema,
   },
 });
 

app/imports/ui/properties/forms/AttributeForm.vue

@@ -11,6 +11,7 @@
         @change="change('baseValueCalculation', ...arguments)"
       />
     </div>
+    <calculation-error-list :errors="model.baseValueErrors" />
     <div class="layout row wrap">
       <text-field
         label="Name"
@@ -100,10 +101,12 @@
 <script>
 	import FormSection from '/imports/ui/properties/forms/shared/FormSection.vue';
   import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
+  import CalculationErrorList from '/imports/ui/properties/forms/shared/CalculationErrorList.vue';
 
 	export default {
 		components: {
 			FormSection,
+      CalculationErrorList,
 		},
     mixins: [propertyFormMixin],
 		data(){

app/imports/ui/properties/forms/EffectForm.vue

@@ -56,26 +56,7 @@
       :hint="!isFinite(model.calculation) && model.result ? model.result + '' : '' "
       @change="change('calculation', ...arguments)"
     />
-    <div
+    <calculation-error-list :errors="model.errors" />
-      v-if="model.errors && model.errors.length"
-      two-line
-    >
-      <v-slide-x-transition
-        group
-        leave-absolute
-      >
-        <v-alert
-          v-for="error in model.errors"
-          :key="error.message"
-          :value="true"
-          :icon="errorIcon(error.type)"
-          :color="errorColor(error.type)"
-          outline
-        >
-          {{ error.message }}
-        </v-alert>
-      </v-slide-x-transition>
-    </div>
   </div>
 </template>
 
@@ -83,9 +64,13 @@
 	import getEffectIcon from '/imports/ui/utility/getEffectIcon.js';
   import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
   import attributeListMixin from '/imports/ui/properties/forms/shared/lists/attributeListMixin.js';
+  import CalculationErrorList from '/imports/ui/properties/forms/shared/CalculationErrorList.vue';
 
 	const ICON_SPIN_DURATION = 300;
 	export default {
+    components: {
+      CalculationErrorList,
+    },
     mixins: [propertyFormMixin, attributeListMixin],
 		data(){ return {
 			displayedIcon: 'add',
@@ -145,24 +130,6 @@
 			},
 		},
 		methods: {
-      errorIcon(type){
-        if (type === 'subsitution'){
-          return 'info';
-        } else if (type === 'evaluation'){
-          return 'warning';
-        } else {
-          return 'error'
-        }
-      },
-      errorColor(type){
-        if (type === 'subsitution'){
-          return 'info';
-        } else if (type === 'evaluation'){
-          return 'warning';
-        } else {
-          return 'error'
-        }
-      },
 			getEffectIcon,
 		}
 	};

app/imports/ui/properties/forms/ToggleForm.vue

@@ -37,13 +37,18 @@
         @change="change('condition', ...arguments)"
       />
     </v-fade-transition>
+    <calculation-error-list :errors="model.errors" />
   </div>
 </template>
 
 <script>
   import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
+  import CalculationErrorList from '/imports/ui/properties/forms/shared/CalculationErrorList.vue';
 
 	export default {
+    components: {
+      CalculationErrorList,
+    },
     mixins: [propertyFormMixin],
     computed: {
       radioSelection(){

app/imports/ui/properties/forms/shared/CalculationErrorList.vue

@@ -0,0 +1,56 @@
+<template lang="html">
+  <div
+    v-if="errors && errors.length"
+    class="error-list"
+  >
+    <v-slide-x-transition
+      group
+      hide-on-leave
+    >
+      <v-alert
+        v-for="error in errors"
+        :key="error.message"
+        :value="true"
+        :icon="errorIcon(error.type)"
+        :color="errorColor(error.type)"
+        outline
+      >
+        {{ error.message }}
+      </v-alert>
+    </v-slide-x-transition>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    errors: {
+      type: Array,
+      default: undefined,
+    },
+  },
+  methods: {
+    errorIcon(type){
+      if (type === 'subsitution'){
+        return 'info';
+      } else if (type === 'evaluation'){
+        return 'warning';
+      } else {
+        return 'error'
+      }
+    },
+    errorColor(type){
+      if (type === 'subsitution'){
+        return 'info';
+      } else if (type === 'evaluation'){
+        return 'warning';
+      } else {
+        return 'error'
+      }
+    },
+  }
+}
+</script>
+
+<style lang="css" scoped>
+</style>