From 187e83eeb55febf6ddafc20ba57436ec89c9688c Mon Sep 17 00:00:00 2001
From: Michael Genson <71845777+michael-genson@users.noreply.github.com>
Date: Fri, 26 Sep 2025 11:25:15 -0500
Subject: [PATCH] fix: Misc Issues with Ingredient Parser (#6250)

---
 .../Domain/Recipe/RecipeIngredientEditor.vue  |  6 +++
 .../RecipePageParts/RecipePageParseDialog.vue | 13 ++++-
 frontend/components/global/BaseDialog.vue     | 14 ++++--
 .../partials/use-actions-factory.ts           | 48 +++++++++++--------
 .../composables/partials/use-store-factory.ts |  4 +-
 5 files changed, 58 insertions(+), 27 deletions(-)

diff --git a/frontend/components/Domain/Recipe/RecipeIngredientEditor.vue b/frontend/components/Domain/Recipe/RecipeIngredientEditor.vue
index ebf11b577..4c779d81e 100644
--- a/frontend/components/Domain/Recipe/RecipeIngredientEditor.vue
+++ b/frontend/components/Domain/Recipe/RecipeIngredientEditor.vue
@@ -59,6 +59,7 @@
           class="mx-1"
           :placeholder="$t('recipe.choose-unit')"
           clearable
+          :menu-props="{ attach: props.menuAttachTarget, maxHeight: '250px' }"
           @keyup.enter="handleUnitEnter"
         >
           <template #prepend>
@@ -115,6 +116,7 @@
           class="mx-1 py-0"
           :placeholder="$t('recipe.choose-food')"
           clearable
+          :menu-props="{ attach: props.menuAttachTarget, maxHeight: '250px' }"
           @keyup.enter="handleFoodEnter"
         >
           <template #prepend>
@@ -198,6 +200,10 @@ import type { RecipeIngredient } from "~/lib/api/types/recipe";
 const model = defineModel<RecipeIngredient>({ required: true });
 
 const props = defineProps({
+  menuAttachTarget: {
+    type: String,
+    default: "body",
+  },
   unitError: {
     type: Boolean,
     default: false,
diff --git a/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageParseDialog.vue b/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageParseDialog.vue
index 389ad8a08..8eae43a1b 100644
--- a/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageParseDialog.vue
+++ b/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageParseDialog.vue
@@ -3,6 +3,7 @@
     :model-value="modelValue"
     :title="$t('recipe.parse-ingredients')"
     :icon="$globals.icons.fileSign"
+    disable-submit-on-enter
     @update:model-value="emit('update:modelValue', $event)"
   >
     <v-container class="pa-2 ma-0" style="background-color: rgb(var(--v-theme-background));">
@@ -76,7 +77,11 @@
                 {{ i18n.t("recipe.parser.missing-unit", { unit: currentMissingUnit }) }}
               </BaseButton>
               <BaseButton
-                v-if="currentMissingUnit && currentIng.ingredient.unit?.id"
+                v-if="
+                  currentMissingUnit
+                  && currentIng.ingredient.unit?.id
+                  && currentMissingUnit.toLowerCase() != currentIng.ingredient.unit?.name.toLowerCase()
+                "
                 color="warning"
                 size="small"
                 @click="addMissingUnitAsAlias"
@@ -92,7 +97,11 @@
                 {{ i18n.t("recipe.parser.missing-food", { food: currentMissingFood }) }}
               </BaseButton>
               <BaseButton
-                v-if="currentMissingFood && currentIng.ingredient.food?.id"
+                v-if="
+                  currentMissingFood
+                  && currentIng.ingredient.food?.id
+                  && currentMissingFood.toLowerCase() != currentIng.ingredient.food?.name.toLowerCase()
+                "
                 color="warning"
                 size="small"
                 @click="addMissingFoodAsAlias"
diff --git a/frontend/components/global/BaseDialog.vue b/frontend/components/global/BaseDialog.vue
index 8126f4b1e..9c7356a14 100644
--- a/frontend/components/global/BaseDialog.vue
+++ b/frontend/components/global/BaseDialog.vue
@@ -10,9 +10,7 @@
       :max-width="maxWidth ?? undefined"
       :content-class="top ? 'top-dialog' : undefined"
       :fullscreen="$vuetify.display.xs"
-      @keydown.enter="() => {
-        emit('submit'); dialog = false;
-      }"
+      @keydown.enter="submitOnEnter"
       @click:outside="emit('cancel')"
       @keydown.esc="emit('cancel')"
     >
@@ -127,6 +125,7 @@ interface DialogProps {
   canDelete?: boolean;
   canConfirm?: boolean;
   canSubmit?: boolean;
+  disableSubmitOnEnter?: boolean;
 }
 
 interface DialogEmits {
@@ -150,6 +149,7 @@ const props = withDefaults(defineProps<DialogProps>(), {
   canDelete: false,
   canConfirm: false,
   canSubmit: false,
+  disableSubmitOnEnter: false,
 });
 const emit = defineEmits<DialogEmits>();
 
@@ -181,6 +181,14 @@ function submitEvent() {
   submitted.value = true;
 }
 
+function submitOnEnter() {
+  if (props.disableSubmitOnEnter) {
+    return;
+  }
+
+  submitEvent();
+}
+
 function deleteEvent() {
   emit("delete");
   submitted.value = true;
diff --git a/frontend/composables/partials/use-actions-factory.ts b/frontend/composables/partials/use-actions-factory.ts
index 8a9cbaa38..a38dda937 100644
--- a/frontend/composables/partials/use-actions-factory.ts
+++ b/frontend/composables/partials/use-actions-factory.ts
@@ -29,20 +29,24 @@ export function useReadOnlyActions<T extends BoundT>(
     params.orderBy ??= "name";
     params.orderDirection ??= "asc";
 
-    loading.value = true;
     const allItems = useAsyncData(useAsyncKey(), async () => {
-      const { data } = await api.getAll(page, perPage, params);
-      loading.value = false;
+      loading.value = true;
+      try {
+        const { data } = await api.getAll(page, perPage, params);
 
-      if (data && allRef) {
-        allRef.value = data.items;
-      }
+        if (data && allRef) {
+          allRef.value = data.items;
+        }
 
-      if (data) {
-        return data.items ?? [];
+        if (data) {
+          return data.items ?? [];
+        }
+        else {
+          return [];
+        }
       }
-      else {
-        return [];
+      finally {
+        loading.value = false;
       }
     });
 
@@ -84,20 +88,24 @@ export function useStoreActions<T extends BoundT>(
     params.orderBy ??= "name";
     params.orderDirection ??= "asc";
 
-    loading.value = true;
     const allItems = useAsyncData(useAsyncKey(), async () => {
-      const { data } = await api.getAll(page, perPage, params);
-      loading.value = false;
+      loading.value = true;
+      try {
+        const { data } = await api.getAll(page, perPage, params);
 
-      if (data && allRef) {
-        allRef.value = data.items;
-      }
+        if (data && allRef) {
+          allRef.value = data.items;
+        }
 
-      if (data) {
-        return data.items ?? [];
+        if (data) {
+          return data.items ?? [];
+        }
+        else {
+          return [];
+        }
       }
-      else {
-        return [];
+      finally {
+        loading.value = false;
       }
     });
 
diff --git a/frontend/composables/partials/use-store-factory.ts b/frontend/composables/partials/use-store-factory.ts
index 0d6701bf1..6a23e916f 100644
--- a/frontend/composables/partials/use-store-factory.ts
+++ b/frontend/composables/partials/use-store-factory.ts
@@ -29,7 +29,7 @@ export const useReadOnlyStore = function <T extends BoundT>(
     },
   };
 
-  if (!loading.value && (!store.value || store.value.length === 0)) {
+  if (!loading.value && !store.value.length) {
     const result = actions.getAll(1, -1, params);
     store.value = result.value || [];
   }
@@ -54,7 +54,7 @@ export const useStore = function <T extends BoundT>(
     },
   };
 
-  if (!loading.value && (!store.value || store.value.length === 0)) {
+  if (!loading.value && !store.value.length) {
     const result = actions.getAll(1, -1, params);
     store.value = result.value || [];
   }