change ingore_inherit to inherit_fields

vue/src/components/Badges/Shopping.vue

@@ -8,13 +8,13 @@
                 :class="[shopping ? 'text-success fa-shopping-cart' : 'text-muted fa-cart-plus']"
             />
         </b-button>
-        <b-popover :target="`${ShowConfirmation}`" :ref="'shopping' + item.id" triggers="focus" placement="top">
+        <b-popover v-if="shopping" :target="`${ShowConfirmation}`" :ref="'shopping' + item.id" triggers="focus" placement="top">
             <template #title>{{ DeleteConfirmation }}</template>
             <b-row align-h="end">
-                <b-col cols="auto"
-                    ><b-button class="btn btn-sm btn-info shadow-none px-1 border-0" @click="cancelDelete()">{{ $t("Cancel") }}</b-button>
-                    <b-button class="btn btn-sm btn-danger shadow-none px-1" @click="confirmDelete()">{{ $t("Confirm") }}</b-button></b-col
-                >
+                <b-col cols="auto">
+                    <b-button class="btn btn-sm btn-info shadow-none px-1 border-0" @click="cancelDelete()">{{ $t("Cancel") }}</b-button>
+                    <b-button class="btn btn-sm btn-danger shadow-none px-1" @click="confirmDelete()">{{ $t("Confirm") }}</b-button>
+                </b-col>
             </b-row>
         </b-popover>
     </span>
@@ -46,7 +46,7 @@ export default {
             if (this.shopping) {
                 return "shopping" + this.item.id
             } else {
-                return "NoDialog"
+                return ""
             }
         },
     },

vue/src/components/Modals/GenericModalForm.vue

@@ -1,20 +1,18 @@
 <template>
     <div>
         <b-modal :id="'modal_' + id" @hidden="cancelAction">
-            <template v-slot:modal-title
-                ><h4>{{ form.title }}</h4></template
-            >
+            <template v-slot:modal-title>
+                <h4>{{ form.title }}</h4>
+            </template>
             <div v-for="(f, i) in form.fields" v-bind:key="i">
-                <p v-if="f.type == 'instruction'">{{ f.label }}</p>
-                <!-- this lookup is single selection -->
-                <lookup-input v-if="f.type == 'lookup'" :form="f" :model="listModel(f.list)" @change="storeValue" />
-                <!-- TODO: add multi-selection input list -->
-                <checkbox-input v-if="f.type == 'checkbox'" :label="f.label" :value="f.value" :field="f.field" />
-                <text-input v-if="f.type == 'text'" :label="f.label" :value="f.value" :field="f.field" :placeholder="f.placeholder" />
-                <choice-input v-if="f.type == 'choice'" :label="f.label" :value="f.value" :field="f.field" :options="f.options" :placeholder="f.placeholder" />
-                <emoji-input v-if="f.type == 'emoji'" :label="f.label" :value="f.value" :field="f.field" @change="storeValue" />
-                <file-input v-if="f.type == 'file'" :label="f.label" :value="f.value" :field="f.field" @change="storeValue" />
-                <small-text v-if="f.type == 'smalltext'" :value="f.value" />
+                <p v-if="visibleCondition(f, 'instruction')">{{ f.label }}</p>
+                <lookup-input v-if="visibleCondition(f, 'lookup')" :form="f" :model="listModel(f.list)" @change="storeValue" />
+                <checkbox-input class="mb-3" v-if="visibleCondition(f, 'checkbox')" :label="f.label" :value="f.value" :field="f.field" />
+                <text-input v-if="visibleCondition(f, 'text')" :label="f.label" :value="f.value" :field="f.field" :placeholder="f.placeholder" />
+                <choice-input v-if="visibleCondition(f, 'choice')" :label="f.label" :value="f.value" :field="f.field" :options="f.options" :placeholder="f.placeholder" />
+                <emoji-input v-if="visibleCondition(f, 'emoji')" :label="f.label" :value="f.value" :field="f.field" @change="storeValue" />
+                <file-input v-if="visibleCondition(f, 'file')" :label="f.label" :value="f.value" :field="f.field" @change="storeValue" />
+                <small-text v-if="visibleCondition(f, 'smalltext')" :value="f.value" />
             </div>
 
             <template v-slot:modal-footer>
@@ -48,7 +46,12 @@ export default {
     mixins: [ApiMixin, ToastMixin],
     props: {
         model: { required: true, type: Object },
-        action: { type: Object },
+        action: {
+            type: Object,
+            default() {
+                return {}
+            },
+        },
         item1: {
             type: Object,
             default() {
@@ -249,6 +252,21 @@ export default {
                 apiClient.createAutomation(automation)
             }
         },
+        visibleCondition(field, field_type) {
+            let type_match = field?.type == field_type
+            let checks = true
+            if (type_match && field?.condition) {
+                if (field.condition?.condition === "exists") {
+                    if ((this.item1[field.condition.field] != undefined) === field.condition.value) {
+                        checks = true
+                    } else {
+                        checks = false
+                    }
+                }
+            }
+
+            return type_match && checks
+        },
     },
 }
 </script>

vue/src/components/Modals/TextInput.vue

@@ -1,42 +1,34 @@
 <template>
     <div>
-        <b-form-group
-            v-bind:label="label"
-            class="mb-3">
-        <b-form-input
-            v-model="new_value"
-            type="string"
-            :placeholder="placeholder"
-        ></b-form-input>
+        <b-form-group v-bind:label="label" class="mb-3">
+            <b-form-input v-model="new_value" type="text" :placeholder="placeholder"></b-form-input>
         </b-form-group>
     </div>
 </template>
 
 <script>
-
 export default {
-  name: 'TextInput',
-  props: {
-    field: {type: String, default: 'You Forgot To Set Field Name'},
-    label: {type: String, default: 'Text Field'},
-    value: {type: String, default: ''},
-    placeholder: {type: String, default: 'You Should Add Placeholder Text'},
-    show_merge: {type: Boolean, default: false},
-  },
-  data() {
-    return {
-      new_value: undefined,
-    }
-  },
-  mounted() {
-    this.new_value = this.value
-  },
-  watch: {
-    'new_value': function () {
-      this.$root.$emit('change', this.field, this.new_value)
+    name: "TextInput",
+    props: {
+        field: { type: String, default: "You Forgot To Set Field Name" },
+        label: { type: String, default: "Text Field" },
+        value: { type: String, default: "" },
+        placeholder: { type: String, default: "You Should Add Placeholder Text" },
+        show_merge: { type: Boolean, default: false },
     },
-  },
-  methods: {
-  }
+    data() {
+        return {
+            new_value: undefined,
+        }
+    },
+    mounted() {
+        this.new_value = this.value
+    },
+    watch: {
+        new_value: function () {
+            this.$root.$emit("change", this.field, this.new_value)
+        },
+    },
+    methods: {},
 }
-</script>
+</script>