change ingore_inherit to inherit_fields

2021-12-30 12:54:39 -06:00
parent 3fafd43e58
commit 79b4bc387e
18 changed files with 190 additions and 248 deletions
--- a/vue/src/apps/ShoppingListView/ShoppingListView.vue
+++ b/vue/src/apps/ShoppingListView/ShoppingListView.vue
@ -1012,8 +1012,8 @@ export default {
            let api = new ApiApiFactory()
            let ignore_category
            if (field) {
-                ignore_category = food.ignore_inherit
-                    .map((x) => food.ignore_inherit.fields)
+                ignore_category = food.inherit_fields
+                    .map((x) => food.inherit_fields.fields)
                    .flat()
                    .includes(field)
            } else {
@ -1023,7 +1023,7 @@ export default {
            return api
                .partialUpdateFood(food.id, food)
                .then((result) => {
-                    if (food.inherit && food.supermarket_category && !ignore_category && food.parent) {
+                    if (food.supermarket_category && !ignore_category && food.parent) {
                        makeToast(this.$t("Warning"), this.$t("InheritWarning", { food: food.name }), "warning")
                    } else {
                        StandardToasts.makeStandardToast(StandardToasts.SUCCESS_UPDATE)
--- a/vue/src/components/Badges/Shopping.vue
+++ b/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 ""
            }
        },
    },
--- a/vue/src/components/Modals/GenericModalForm.vue
+++ b/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>
--- a/vue/src/components/Modals/TextInput.vue
+++ b/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>
--- a/vue/src/locales/en.json
+++ b/vue/src/locales/en.json
@ -222,7 +222,7 @@
    "Next_Day": "Next Day",
    "Previous_Day": "Previous Day",
    "Inherit": "Inherit",
-    "IgnoreInherit": "Do Not Inherit Fields",
+    "InheritFields": "Inherit Fields Values",
    "FoodInherit": "Food Inheritable Fields",
    "ShowUncategorizedFood": "Show Undefined",
    "GroupBy": "Group By",
--- a/vue/src/utils/models.js
+++ b/vue/src/utils/models.js
@ -76,7 +76,7 @@ export class Models {
        // REQUIRED: unordered array of fields that can be set during create
        create: {
            // if not defined partialUpdate will use the same parameters, prepending 'id'
-            params: [["name", "description", "recipe", "food_onhand", "supermarket_category", "inherit", "ignore_inherit"]],
+            params: [["name", "description", "recipe", "food_onhand", "supermarket_category", "inherit", "inherit_fields"]],

            form: {
                name: {
@ -114,19 +114,14 @@ export class Models {
                    label: i18n.t("Shopping_Category"),
                    allow_create: true,
                },
-                inherit: {
-                    form_field: true,
-                    type: "checkbox",
-                    field: "inherit",
-                    label: i18n.t("Inherit"),
-                },
-                ignore_inherit: {
+                inherit_fields: {
                    form_field: true,
                    type: "lookup",
                    multiple: true,
-                    field: "ignore_inherit",
+                    field: "inherit_fields",
                    list: "FOOD_INHERIT_FIELDS",
-                    label: i18n.t("IgnoreInherit"),
+                    label: i18n.t("InheritFields"),
+                    condition: { field: "parent", value: true, condition: "exists" },
                },
                full_name: {
                    form_field: true,
--- a/vue/src/utils/openapi/api.ts
+++ b/vue/src/utils/openapi/api.ts
@ -214,7 +214,7 @@ export interface Food {
     * @type {boolean}
     * @memberof Food
     */
-    ignore_shopping?: boolean;
+    food_onhand?: boolean;
    /**
     * 
     * @type {FoodSupermarketCategory}
@ -235,47 +235,16 @@ export interface Food {
    numchild?: number;
    /**
     * 
-     * @type {boolean}
+     * @type {Array<FoodInheritFields>}
     * @memberof Food
     */
-    on_hand?: boolean;
-    /**
-     * 
-     * @type {boolean}
-     * @memberof Food
-     */
-    inherit?: boolean;
-    /**
-     * 
-     * @type {Array<FoodIgnoreInherit>}
-     * @memberof Food
-     */
-    ignore_inherit?: Array<FoodIgnoreInherit> | null;
-}
-/**
- * 
- * @export
- * @interface FoodIgnoreInherit
- */
-export interface FoodIgnoreInherit {
-    /**
-     * 
-     * @type {number}
-     * @memberof FoodIgnoreInherit
-     */
-    id?: number;
+    inherit_fields?: Array<FoodInheritFields> | null;
    /**
     * 
     * @type {string}
-     * @memberof FoodIgnoreInherit
+     * @memberof Food
     */
-    name?: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof FoodIgnoreInherit
-     */
-    field?: string;
+    full_name?: string;
 }
 /**
 * 
@ -294,13 +263,38 @@ export interface FoodInheritField {
     * @type {string}
     * @memberof FoodInheritField
     */
-    name?: string;
+    name?: string | null;
    /**
     * 
     * @type {string}
     * @memberof FoodInheritField
     */
-    field?: string;
+    field?: string | null;
+}
+/**
+ * 
+ * @export
+ * @interface FoodInheritFields
+ */
+export interface FoodInheritFields {
+    /**
+     * 
+     * @type {number}
+     * @memberof FoodInheritFields
+     */
+    id?: number;
+    /**
+     * 
+     * @type {string}
+     * @memberof FoodInheritFields
+     */
+    name?: string | null;
+    /**
+     * 
+     * @type {string}
+     * @memberof FoodInheritFields
+     */
+    field?: string | null;
 }
 /**
 * 
@ -513,6 +507,12 @@ export interface ImportLogKeyword {
     * @memberof ImportLogKeyword
     */
    updated_at?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof ImportLogKeyword
+     */
+    full_name?: string;
 }
 /**
 * 
@ -610,7 +610,7 @@ export interface IngredientFood {
     * @type {boolean}
     * @memberof IngredientFood
     */
-    ignore_shopping?: boolean;
+    food_onhand?: boolean;
    /**
     * 
     * @type {FoodSupermarketCategory}
@ -631,22 +631,16 @@ export interface IngredientFood {
    numchild?: number;
    /**
     * 
-     * @type {boolean}
+     * @type {Array<FoodInheritFields>}
     * @memberof IngredientFood
     */
-    on_hand?: boolean;
+    inherit_fields?: Array<FoodInheritFields> | null;
    /**
     * 
-     * @type {boolean}
+     * @type {string}
     * @memberof IngredientFood
     */
-    inherit?: boolean;
-    /**
-     * 
-     * @type {Array<FoodIgnoreInherit>}
-     * @memberof IngredientFood
-     */
-    ignore_inherit?: Array<FoodIgnoreInherit> | null;
+    full_name?: string;
 }
 /**
 * 
@ -1018,6 +1012,12 @@ export interface Keyword {
     * @memberof Keyword
     */
    updated_at?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof Keyword
+     */
+    full_name?: string;
 }
 /**
 * 
@ -1691,6 +1691,12 @@ export interface RecipeKeywords {
     * @memberof RecipeKeywords
     */
    updated_at?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof RecipeKeywords
+     */
+    full_name?: string;
 }
 /**
 * 
@ -2996,10 +3002,10 @@ export interface UserPreference {
    mealplan_autoadd_shopping?: boolean;
    /**
     * 
-     * @type {string}
+     * @type {Array<FoodInheritFields>}
     * @memberof UserPreference
     */
-    food_ignore_default?: string;
+    food_inherit_default?: Array<FoodInheritFields> | null;
    /**
     * 
     * @type {string}
@ -3042,6 +3048,12 @@ export interface UserPreference {
     * @memberof UserPreference
     */
    csv_prefix?: string;
+    /**
+     * 
+     * @type {boolean}
+     * @memberof UserPreference
+     */
+    filter_to_supermarket?: boolean;
 }

 /**
--- a/vue/src/utils/utils.js
+++ b/vue/src/utils/utils.js
@ -220,11 +220,6 @@ export const ApiMixin = {
        return {
            Models: Models,
            Actions: Actions,
-            FoodCreateDefault: function (form) {
-                form.inherit_ignore = getUserPreference("food_ignore_default")
-                form.inherit = form.supermarket_category.length > 0
-                return form
-            },
        }
    },
    methods: {
@ -369,6 +364,7 @@ export function getForm(model, action, item1, item2) {
    if (f === "partialUpdate" && Object.keys(config).length == 0) {
        config = { ...Actions.CREATE?.form, ...model.model_type?.["create"]?.form, ...model?.["create"]?.form }
        config["title"] = { ...action?.form_title, ...model.model_type?.[f]?.form_title, ...model?.[f]?.form_title }
+        // form functions should not be inherited
        if (config?.["form_function"]?.includes("Create")) {
            delete config["form_function"]
        }
@ -542,8 +538,7 @@ const specialCases = {

 export const formFunctions = {
    FoodCreateDefault: function (form) {
-        form.fields.filter((x) => x.field === "ignore_inherit")[0].value = getUserPreference("food_ignore_default")
-        form.fields.filter((x) => x.field === "inherit")[0].value = getUserPreference("food_ignore_default").length > 0
+        form.fields.filter((x) => x.field === "inherit_fields")[0].value = getUserPreference("food_inherit_default")
        return form
    },
 }