From a120d4debf25cad248d7f1cbfb8bf5ea04884111 Mon Sep 17 00:00:00 2001 From: Michael Genson <71845777+michael-genson@users.noreply.github.com> Date: Fri, 11 Jul 2025 19:10:00 +0000 Subject: [PATCH] remove additional flag references --- .../Domain/Household/HouseholdPreferencesEditor.vue | 5 ----- .../RecipePageParts/RecipePageIngredientEditor.vue | 10 ++-------- .../RecipePage/RecipePageParts/RecipePageScale.vue | 2 +- .../Domain/Recipe/RecipeSettingsSwitches.vue | 1 - .../g/[groupSlug]/r/[slug]/ingredient-parser.vue | 5 ----- frontend/pages/group/data/recipes.vue | 1 - frontend/pages/household/index.vue | 6 ------ frontend/pages/shopping-lists/[id].vue | 12 +++--------- 8 files changed, 6 insertions(+), 36 deletions(-) diff --git a/frontend/components/Domain/Household/HouseholdPreferencesEditor.vue b/frontend/components/Domain/Household/HouseholdPreferencesEditor.vue index ea1df3670..c4e34900b 100644 --- a/frontend/components/Domain/Household/HouseholdPreferencesEditor.vue +++ b/frontend/components/Domain/Household/HouseholdPreferencesEditor.vue @@ -87,11 +87,6 @@ export default defineNuxtComponent({ label: i18n.t("group.disable-users-from-commenting-on-recipes"), description: i18n.t("group.disable-users-from-commenting-on-recipes-description"), }, - { - key: "recipeDisableAmount", - label: i18n.t("group.disable-organizing-recipe-ingredients-by-units-and-food"), - description: i18n.t("group.disable-organizing-recipe-ingredients-by-units-and-food-description"), - }, ]; const allDays = [ diff --git a/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageIngredientEditor.vue b/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageIngredientEditor.vue index bacbe8063..7198cdb3d 100644 --- a/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageIngredientEditor.vue +++ b/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageIngredientEditor.vue @@ -48,7 +48,7 @@ { }); const parserToolTip = computed(() => { - if (recipe.value.settings.disableAmount) { - return i18n.t("recipe.enable-ingredient-amounts-to-use-this-feature"); - } - else if (hasFoodOrUnit.value) { + if (hasFoodOrUnit.value) { return i18n.t("recipe.recipes-with-units-or-foods-defined-cannot-be-parsed"); } return i18n.t("recipe.parse-ingredients"); @@ -126,7 +123,6 @@ function addIngredient(ingredients: Array | null = null) { note: x, unit: undefined, food: undefined, - disableAmount: true, quantity: 1, }; }); @@ -145,7 +141,6 @@ function addIngredient(ingredients: Array | null = null) { unit: undefined, // @ts-expect-error - prop can be null-type by NoUndefinedField type forces it to be set food: undefined, - disableAmount: true, quantity: 1, }); } @@ -160,7 +155,6 @@ function insertNewIngredient(dest: number) { unit: undefined, // @ts-expect-error - prop can be null-type by NoUndefinedField type forces it to be set food: undefined, - disableAmount: true, quantity: 1, }); } diff --git a/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageScale.vue b/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageScale.vue index 361f1e7d3..9fd57e52b 100644 --- a/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageScale.vue +++ b/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageScale.vue @@ -4,7 +4,7 @@ v-if="!isEditMode" v-model.number="scaleValue" :recipe-servings="recipeServings" - :edit-scale="!recipe.settings.disableAmount && !isEditMode" + :edit-scale="!isEditMode" /> diff --git a/frontend/components/Domain/Recipe/RecipeSettingsSwitches.vue b/frontend/components/Domain/Recipe/RecipeSettingsSwitches.vue index 8bfd49852..a2dc3f55a 100644 --- a/frontend/components/Domain/Recipe/RecipeSettingsSwitches.vue +++ b/frontend/components/Domain/Recipe/RecipeSettingsSwitches.vue @@ -31,7 +31,6 @@ const labels: Record = { showAssets: i18n.t("asset.show-assets"), landscapeView: i18n.t("recipe.landscape-view-coming-soon"), disableComments: i18n.t("recipe.disable-comments"), - disableAmount: i18n.t("recipe.disable-amount"), locked: i18n.t("recipe.locked"), }; diff --git a/frontend/pages/g/[groupSlug]/r/[slug]/ingredient-parser.vue b/frontend/pages/g/[groupSlug]/r/[slug]/ingredient-parser.vue index c1b9d113b..0a76c57c5 100644 --- a/frontend/pages/g/[groupSlug]/r/[slug]/ingredient-parser.vue +++ b/frontend/pages/g/[groupSlug]/r/[slug]/ingredient-parser.vue @@ -354,7 +354,6 @@ export default defineNuxtComponent({ confidence: {}, ingredient: { quantity: 1.0, - disableAmount: false, referenceId: uuid4(), }, } as ParsedIngredient; @@ -399,10 +398,6 @@ export default defineNuxtComponent({ } recipe.value.recipeIngredient = ingredients; - if (recipe.value.settings) { - recipe.value.settings.disableAmount = false; - } - const { response } = await api.recipes.updateOne(recipe.value.slug, recipe.value); if (response?.status === 200) { diff --git a/frontend/pages/group/data/recipes.vue b/frontend/pages/group/data/recipes.vue index cd4e6126e..c95c61bc1 100644 --- a/frontend/pages/group/data/recipes.vue +++ b/frontend/pages/group/data/recipes.vue @@ -415,7 +415,6 @@ export default defineNuxtComponent({ showAssets: false, landscapeView: false, disableComments: false, - disableAmount: false, locked: false, }); diff --git a/frontend/pages/household/index.vue b/frontend/pages/household/index.vue index 502909a1a..fca6d5d43 100644 --- a/frontend/pages/household/index.vue +++ b/frontend/pages/household/index.vue @@ -95,12 +95,6 @@ export default defineNuxtComponent({ label: i18n.t("group.disable-users-from-commenting-on-recipes"), description: i18n.t("group.disable-users-from-commenting-on-recipes-description"), } as Preference, - { - key: "recipeDisableAmount", - value: household.value.preferences.recipeDisableAmount || false, - label: i18n.t("group.disable-organizing-recipe-ingredients-by-units-and-food"), - description: i18n.t("group.disable-organizing-recipe-ingredients-by-units-and-food-description"), - } as Preference, ]; }); diff --git a/frontend/pages/shopping-lists/[id].vue b/frontend/pages/shopping-lists/[id].vue index 8188e7326..b95f1f702 100644 --- a/frontend/pages/shopping-lists/[id].vue +++ b/frontend/pages/shopping-lists/[id].vue @@ -758,12 +758,10 @@ export default defineNuxtComponent({ const contextActions = { delete: "delete", - setIngredient: "setIngredient", }; const contextMenu = [ { title: i18n.t("general.delete"), action: contextActions.delete }, - { title: i18n.t("recipe.ingredient"), action: contextActions.setIngredient }, ]; function contextMenuAction(action: string, item: ShoppingListItemOut, idx: number) { @@ -775,9 +773,6 @@ export default defineNuxtComponent({ case contextActions.delete: shoppingList.value.listItems = shoppingList.value?.listItems.filter(itm => itm.id !== item.id); break; - case contextActions.setIngredient: - shoppingList.value.listItems[idx].isFood = !shoppingList.value.listItems[idx].isFood; - break; default: break; } @@ -897,7 +892,7 @@ export default defineNuxtComponent({ shoppingList.value.listItems.forEach((item) => { const key = item.checked ? checkedItemKey - : item.isFood && item.food?.name + : item.food?.name ? item.food.name : item.note || ""; @@ -1083,13 +1078,12 @@ export default defineNuxtComponent({ const createEditorOpen = ref(false); const createListItemData = ref(listItemFactory()); - function listItemFactory(isFood = false): ShoppingListItemOut { + function listItemFactory(): ShoppingListItemOut { return { id: uuid4(), shoppingListId: id, checked: false, position: shoppingList.value?.listItems?.length || 1, - isFood, quantity: 0, note: "", labelId: undefined, @@ -1140,7 +1134,7 @@ export default defineNuxtComponent({ shoppingList.value.listItems.push(createListItemData.value); updateListItemOrder(); } - createListItemData.value = listItemFactory(createListItemData.value.isFood || false); + createListItemData.value = listItemFactory(); refresh(); }