Merge branch 'mealie-next' into fix/admin-users-couldnt-delete-other-household-recipes

frontend/components/Domain/Cookbook/CookbookEditor.vue

@@ -44,36 +44,20 @@
   </div>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
-import type { ReadCookBook } from "~/lib/api/types/cookbook";
 import { Organizer } from "~/lib/api/types/non-generated";
 import QueryFilterBuilder from "~/components/Domain/QueryFilterBuilder.vue";
 import type { FieldDefinition } from "~/composables/use-query-filter-builder";
+import type { ReadCookBook } from "~/lib/api/types/cookbook";
 
-export default defineNuxtComponent({
+const modelValue = defineModel<ReadCookBook>({ required: true });
-  components: { QueryFilterBuilder },
+const i18n = useI18n();
-  props: {
+const cookbook = toRef(modelValue);
-    modelValue: {
+function handleInput(value: string | undefined) {
-      type: Object as () => ReadCookBook,
-      required: true,
-    },
-    actions: {
-      type: Object as () => any,
-      required: true,
-    },
-  },
-  emits: ["update:modelValue"],
-  setup(props, { emit }) {
-    const i18n = useI18n();
-
-    const cookbook = toRef(() => props.modelValue);
-
-    function handleInput(value: string | undefined) {
   cookbook.value.queryFilterString = value || "";
-      emit("update:modelValue", cookbook.value);
+}
-    }
 
-    const fieldDefs: FieldDefinition[] = [
+const fieldDefs: FieldDefinition[] = [
   {
     name: "recipe_category.id",
     label: i18n.t("category.categories"),
@@ -109,13 +93,5 @@ export default defineNuxtComponent({
     label: i18n.t("general.date-updated"),
     type: "date",
   },
-    ];
+];
-
-    return {
-      cookbook,
-      handleInput,
-      fieldDefs,
-    };
-  },
-});
 </script>

frontend/components/Domain/Cookbook/CookbookPage.vue

@@ -17,7 +17,6 @@
       <v-card-text>
         <CookbookEditor
           v-model="editTarget"
-          :actions="actions"
         />
       </v-card-text>
     </BaseDialog>
@@ -65,7 +64,7 @@
   </div>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
 import { useLazyRecipes } from "~/composables/recipes";
 import RecipeCardSection from "@/components/Domain/Recipe/RecipeCardSection.vue";
 import { useCookbookStore } from "~/composables/store/use-cookbook-store";
@@ -74,44 +73,40 @@ import { useLoggedInState } from "~/composables/use-logged-in-state";
 import type { RecipeCookBook } from "~/lib/api/types/cookbook";
 import CookbookEditor from "~/components/Domain/Cookbook/CookbookEditor.vue";
 
-export default defineNuxtComponent({
+const $auth = useMealieAuth();
-  components: { RecipeCardSection, CookbookEditor },
+const { isOwnGroup } = useLoggedInState();
-  setup() {
-    const $auth = useMealieAuth();
-    const { isOwnGroup } = useLoggedInState();
 
-    const route = useRoute();
+const route = useRoute();
-    const groupSlug = computed(() => route.params.groupSlug as string || $auth.user.value?.groupSlug || "");
+const groupSlug = computed(() => route.params.groupSlug as string || $auth.user.value?.groupSlug || "");
 
-    const { recipes, appendRecipes, assignSorted, removeRecipe, replaceRecipes } = useLazyRecipes(isOwnGroup.value ? null : groupSlug.value);
+const { recipes, appendRecipes, assignSorted, removeRecipe, replaceRecipes } = useLazyRecipes(isOwnGroup.value ? null : groupSlug.value);
-    const slug = route.params.slug as string;
+const slug = route.params.slug as string;
-    const { getOne } = useCookbook(isOwnGroup.value ? null : groupSlug.value);
+const { getOne } = useCookbook(isOwnGroup.value ? null : groupSlug.value);
-    const { actions } = useCookbookStore();
+const { actions } = useCookbookStore();
-    const router = useRouter();
+const router = useRouter();
 
-    const tab = ref(null);
+const book = getOne(slug);
-    const book = getOne(slug);
 
-    const isOwnHousehold = computed(() => {
+const isOwnHousehold = computed(() => {
   if (!($auth.user.value && book.value?.householdId)) {
     return false;
   }
 
   return $auth.user.value.householdId === book.value.householdId;
-    });
+});
-    const canEdit = computed(() => isOwnGroup.value && isOwnHousehold.value);
+const canEdit = computed(() => isOwnGroup.value && isOwnHousehold.value);
 
-    const dialogStates = reactive({
+const dialogStates = reactive({
   edit: false,
-    });
+});
 
-    const editTarget = ref<RecipeCookBook | null>(null);
+const editTarget = ref<RecipeCookBook | null>(null);
-    function handleEditCookbook() {
+function handleEditCookbook() {
   dialogStates.edit = true;
   editTarget.value = book.value;
-    }
+}
 
-    async function editCookbook() {
+async function editCookbook() {
   if (!editTarget.value) {
     return;
   }
@@ -127,28 +122,9 @@ export default defineNuxtComponent({
   }
   dialogStates.edit = false;
   editTarget.value = null;
-    }
+}
 
-    useSeoMeta({
+useSeoMeta({
   title: book?.value?.name || "Cookbook",
-    });
-
-    return {
-      book,
-      slug,
-      tab,
-      appendRecipes,
-      assignSorted,
-      recipes,
-      removeRecipe,
-      replaceRecipes,
-      canEdit,
-      dialogStates,
-      editTarget,
-      handleEditCookbook,
-      editCookbook,
-      actions,
-    };
-  },
 });
 </script>

frontend/components/Domain/QueryFilterBuilder.vue

@@ -163,14 +163,14 @@
                 max-width="290px"
                 min-width="auto"
               >
-                <template #activator="{ props }">
+                <template #activator="{ props: activatorProps }">
                   <v-text-field
                     v-model="field.value"
                     persistent-hint
                     :prepend-icon="$globals.icons.calendar"
                     variant="underlined"
                     color="primary"
-                    v-bind="props"
+                    v-bind="activatorProps"
                     readonly
                   />
                 </template>
@@ -184,53 +184,48 @@
               </v-menu>
               <RecipeOrganizerSelector
                 v-else-if="field.type === Organizer.Category"
-                :model-value="field.organizers"
+                v-model="field.organizers"
                 :selector-type="Organizer.Category"
                 :show-add="false"
                 :show-label="false"
                 :show-icon="false"
                 variant="underlined"
-                @update:model-value="setOrganizerValues(field, index, $event)"
               />
               <RecipeOrganizerSelector
                 v-else-if="field.type === Organizer.Tag"
-                :model-value="field.organizers"
+                v-model="field.organizers"
                 :selector-type="Organizer.Tag"
                 :show-add="false"
                 :show-label="false"
                 :show-icon="false"
                 variant="underlined"
-                @update:model-value="setOrganizerValues(field, index, $event)"
               />
               <RecipeOrganizerSelector
                 v-else-if="field.type === Organizer.Tool"
-                :model-value="field.organizers"
+                v-model="field.organizers"
                 :selector-type="Organizer.Tool"
                 :show-add="false"
                 :show-label="false"
                 :show-icon="false"
                 variant="underlined"
-                @update:model-value="setOrganizerValues(field, index, $event)"
               />
               <RecipeOrganizerSelector
                 v-else-if="field.type === Organizer.Food"
-                :model-value="field.organizers"
+                v-model="field.organizers"
                 :selector-type="Organizer.Food"
                 :show-add="false"
                 :show-label="false"
                 :show-icon="false"
                 variant="underlined"
-                @update:model-value="setOrganizerValues(field, index, $event)"
               />
               <RecipeOrganizerSelector
                 v-else-if="field.type === Organizer.Household"
-                :model-value="field.organizers"
+                v-model="field.organizers"
                 :selector-type="Organizer.Household"
                 :show-add="false"
                 :show-label="false"
                 :show-icon="false"
                 variant="underlined"
-                @update:model-value="setOrganizerValues(field, index, $event)"
               />
             </v-col>
             <!-- right parenthesis -->
@@ -297,7 +292,7 @@
   </v-card>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
 import { VueDraggable } from "vue-draggable-plus";
 import { useDebounceFn } from "@vueuse/core";
 import { useHouseholdSelf } from "~/composables/use-households";
@@ -307,12 +302,7 @@ import type { LogicalOperator, QueryFilterJSON, QueryFilterJSONPart, RelationalK
 import { useCategoryStore, useFoodStore, useHouseholdStore, useTagStore, useToolStore } from "~/composables/store";
 import { type Field, type FieldDefinition, type FieldValue, type OrganizerBase, useQueryFilterBuilder } from "~/composables/use-query-filter-builder";
 
-export default defineNuxtComponent({
+const props = defineProps({
-  components: {
-    VueDraggable,
-    RecipeOrganizerSelector,
-  },
-  props: {
   fieldDefs: {
     type: Array as () => FieldDefinition[],
     required: true,
@@ -321,57 +311,62 @@ export default defineNuxtComponent({
     type: Object as () => QueryFilterJSON | null,
     default: null,
   },
-  },
+});
-  emits: ["input", "inputJSON"],
-  setup(props, context) {
-    const { household } = useHouseholdSelf();
-    const { logOps, relOps, buildQueryFilterString, getFieldFromFieldDef, isOrganizerType } = useQueryFilterBuilder();
 
-    const firstDayOfWeek = computed(() => {
+const emit = defineEmits<{
+  (event: "input", value: string | undefined): void;
+  (event: "inputJSON", value: QueryFilterJSON | undefined): void;
+}>();
+
+const { household } = useHouseholdSelf();
+const { logOps, relOps, buildQueryFilterString, getFieldFromFieldDef, isOrganizerType } = useQueryFilterBuilder();
+
+const firstDayOfWeek = computed(() => {
   return household.value?.preferences?.firstDayOfWeek || 0;
-    });
+});
 
-    const state = reactive({
+const state = reactive({
   showAdvanced: false,
   qfValid: false,
   datePickers: [] as boolean[],
   drag: false,
-    });
+});
+const { showAdvanced, datePickers, drag } = toRefs(state);
 
-    const storeMap = {
+const storeMap = {
   [Organizer.Category]: useCategoryStore(),
   [Organizer.Tag]: useTagStore(),
   [Organizer.Tool]: useToolStore(),
   [Organizer.Food]: useFoodStore(),
   [Organizer.Household]: useHouseholdStore(),
-    };
+};
 
-    function onDragEnd(event: any) {
+function onDragEnd(event: any) {
   state.drag = false;
 
   const oldIndex: number = event.oldIndex;
   const newIndex: number = event.newIndex;
   state.datePickers[oldIndex] = false;
   state.datePickers[newIndex] = false;
-    }
+}
 
-		// add id to fields to prevent reactivity issues
+// add id to fields to prevent reactivity issues
-		type FieldWithId = Field & { id: number };
+type FieldWithId = Field & { id: number };
-		const fields = ref<FieldWithId[]>([]);
+const fields = ref<FieldWithId[]>([]);
 
-		const uid = ref(1); // init uid to pass to fields
+const uid = ref(1); // init uid to pass to fields
-		function useUid() {
+function useUid() {
   return uid.value++;
-		}
+}
-		function addField(field: FieldDefinition) {
+function addField(field: FieldDefinition) {
   fields.value.push({
     ...getFieldFromFieldDef(field),
     id: useUid(),
   });
   state.datePickers.push(false);
-		};
+}
 
-		function setField(index: number, fieldLabel: string) {
+function setField(index: number, fieldLabel: string) {
   state.datePickers[index] = false;
   const fieldDef = props.fieldDefs.find(fieldDef => fieldDef.label === fieldLabel);
   if (!fieldDef) {
@@ -388,48 +383,43 @@ export default defineNuxtComponent({
     ...getFieldFromFieldDef(updatedField, resetValue),
     id: fields.value[index].id, // keep the id
   };
-		}
+}
 
-		function setLeftParenthesisValue(field: FieldWithId, index: number, value: string) {
+function setLeftParenthesisValue(field: FieldWithId, index: number, value: string) {
   fields.value[index].leftParenthesis = value;
-		}
+}
 
-		function setRightParenthesisValue(field: FieldWithId, index: number, value: string) {
+function setRightParenthesisValue(field: FieldWithId, index: number, value: string) {
   fields.value[index].rightParenthesis = value;
-		}
+}
 
-		function setLogicalOperatorValue(field: FieldWithId, index: number, value: LogicalOperator | undefined) {
+function setLogicalOperatorValue(field: FieldWithId, index: number, value: LogicalOperator | undefined) {
   if (!value) {
     value = logOps.value.AND.value;
   }
 
   fields.value[index].logicalOperator = value ? logOps.value[value] : undefined;
-		}
+}
 
-		function setRelationalOperatorValue(field: FieldWithId, index: number, value: RelationalKeyword | RelationalOperator) {
+function setRelationalOperatorValue(field: FieldWithId, index: number, value: RelationalKeyword | RelationalOperator) {
   fields.value[index].relationalOperatorValue = relOps.value[value];
-		}
+}
 
-		function setFieldValue(field: FieldWithId, index: number, value: FieldValue) {
+function setFieldValue(field: FieldWithId, index: number, value: FieldValue) {
   state.datePickers[index] = false;
   fields.value[index].value = value;
-		}
+}
 
-		function setFieldValues(field: FieldWithId, index: number, values: FieldValue[]) {
+function setFieldValues(field: FieldWithId, index: number, values: FieldValue[]) {
   fields.value[index].values = values;
-		}
+}
 
-		function setOrganizerValues(field: FieldWithId, index: number, values: OrganizerBase[]) {
+function removeField(index: number) {
-		  setFieldValues(field, index, values.map(value => value.id.toString()));
-		  fields.value[index].organizers = values;
-		}
-
-		function removeField(index: number) {
   fields.value.splice(index, 1);
   state.datePickers.splice(index, 1);
-		};
+}
 
-		const fieldsUpdater = useDebounceFn((/* newFields: typeof fields.value */) => {
+const fieldsUpdater = useDebounceFn((/* newFields: typeof fields.value */) => {
   /* newFields.forEach((field, index) => {
 		const updatedField = getFieldFromFieldDef(field);
 		fields.value[index] = updatedField; // recursive!!!
@@ -441,19 +431,17 @@ export default defineNuxtComponent({
   }
   state.qfValid = !!qf;
 
-		  context.emit("input", qf || undefined);
+  emit("input", qf || undefined);
-		  context.emit("inputJSON", qf ? buildQueryFilterJSON() : undefined);
+  emit("inputJSON", qf ? buildQueryFilterJSON() : undefined);
-		}, 500);
+}, 500);
 
-		watch(fields, fieldsUpdater, { deep: true });
+watch(fields, fieldsUpdater, { deep: true });
 
-		async function hydrateOrganizers(field: FieldWithId, index: number) {
+async function hydrateOrganizers(field: FieldWithId, _index: number) {
   if (!field.values?.length || !isOrganizerType(field.type)) {
     return;
   }
 
-		  field.organizers = [];
-
   const { store, actions } = storeMap[field.type];
   if (!store.value.length) {
     await actions.refresh();
@@ -467,11 +455,12 @@ export default defineNuxtComponent({
     }
     return organizer;
   });
-		  field.organizers = organizers.filter(organizer => organizer !== undefined) as OrganizerBase[];
-		  setOrganizerValues(field, index, field.organizers);
-		}
 
-		function initFieldsError(error = "") {
+  field.organizers = organizers.filter(organizer => organizer !== undefined) as OrganizerBase[];
+  return field;
+}
+
+function initFieldsError(error = "") {
   if (error) {
     console.error(error);
   }
@@ -480,16 +469,17 @@ export default defineNuxtComponent({
   if (props.fieldDefs.length) {
     addField(props.fieldDefs[0]);
   }
-		}
+}
 
-		function initializeFields() {
+async function initializeFields() {
   if (!props.initialQueryFilter?.parts?.length) {
     return initFieldsError();
-		  };
+  }
 
   const initFields: FieldWithId[] = [];
   let error = false;
-		  props.initialQueryFilter.parts.forEach((part: QueryFilterJSONPart, index: number) => {
+
+  for (const [index, part] of props.initialQueryFilter.parts.entries()) {
     const fieldDef = props.fieldDefs.find(fieldDef => fieldDef.name === part.attributeName);
     if (!fieldDef) {
       error = true;
@@ -522,7 +512,7 @@ export default defineNuxtComponent({
       }
 
       if (isOrganizerType(field.type)) {
-		        hydrateOrganizers(field, index);
+        await hydrateOrganizers(field, index);
       }
     }
     else if (field.type === "boolean") {
@@ -553,7 +543,7 @@ export default defineNuxtComponent({
     }
 
     initFields.push(field);
-		  });
+  }
 
   if (initFields.length && !error) {
     fields.value = initFields;
@@ -561,16 +551,18 @@ export default defineNuxtComponent({
   else {
     initFieldsError();
   }
-		};
+}
 
+onMounted(async () => {
   try {
-		  initializeFields();
+    await initializeFields();
   }
   catch (error) {
     initFieldsError(`Error initializing fields: ${(error || "").toString()}`);
   }
+});
 
-		function buildQueryFilterJSON(): QueryFilterJSON {
+function buildQueryFilterJSON(): QueryFilterJSON {
   const parts = fields.value.map((field) => {
     const part: QueryFilterJSONPart = {
       attributeName: field.name,
@@ -596,9 +588,9 @@ export default defineNuxtComponent({
   const qfJSON = { parts } as QueryFilterJSON;
   console.debug(`Built query filter JSON: ${JSON.stringify(qfJSON)}`);
   return qfJSON;
-		}
+}
 
-		const config = computed(() => {
+const config = computed(() => {
   const baseColMaxWidth = 55;
   return {
     col: {
@@ -642,30 +634,6 @@ export default defineNuxtComponent({
       },
     },
   };
-		});
-
-		return {
-		  Organizer,
-		  ...toRefs(state),
-		  logOps,
-		  relOps,
-		  config,
-		  firstDayOfWeek,
-		  onDragEnd,
-		  // Fields
-		  fields,
-		  addField,
-		  setField,
-		  setLeftParenthesisValue,
-		  setRightParenthesisValue,
-		  setLogicalOperatorValue,
-		  setRelationalOperatorValue,
-		  setFieldValue,
-		  setFieldValues,
-		  setOrganizerValues,
-		  removeField,
-		};
-  },
 });
 </script>
 

frontend/components/Domain/Recipe/RecipeActionMenu.vue

@@ -17,7 +17,7 @@
       <RecipeFavoriteBadge v-if="loggedIn" color="info" button-style :recipe-id="recipe.id!" show-always />
       <RecipeTimelineBadge v-if="loggedIn" class="ml-1" color="info" button-style :slug="recipe.slug" :recipe-name="recipe.name!" />
       <div v-if="loggedIn">
-        <v-tooltip v-if="canEdit" bottom color="info">
+        <v-tooltip v-if="canEdit" location="bottom" color="info">
           <template #activator="{ props }">
             <v-btn
               icon

frontend/components/Domain/Recipe/RecipeAssets.vue

@@ -15,7 +15,7 @@
         >
           <template #prepend>
             <div class="ma-auto">
-              <v-tooltip bottom>
+              <v-tooltip location="bottom">
                 <template #activator="{ props: tooltipProps }">
                   <v-icon v-bind="tooltipProps">
                     {{ getIconDefinition(item.icon).icon }}

frontend/components/Domain/Recipe/RecipeIngredientEditor.vue

@@ -63,6 +63,22 @@
           clearable
           @keyup.enter="handleUnitEnter"
         >
+          <template #prepend>
+            <v-tooltip v-if="unitError" location="bottom">
+              <template #activator="{ props: unitTooltipProps }">
+                <v-icon
+                  v-bind="unitTooltipProps"
+                  class="ml-2 mr-n3 opacity-100"
+                  color="primary"
+                >
+                  {{ $globals.icons.alert }}
+                </v-icon>
+              </template>
+              <span v-if="unitErrorTooltip">
+                {{ unitErrorTooltip }}
+              </span>
+            </v-tooltip>
+          </template>
           <template #no-data>
             <div class="caption text-center pb-2">
               {{ $t("recipe.press-enter-to-create") }}
@@ -104,6 +120,22 @@
           clearable
           @keyup.enter="handleFoodEnter"
         >
+          <template #prepend>
+            <v-tooltip v-if="foodError" location="bottom">
+              <template #activator="{ props: foodTooltipProps }">
+                <v-icon
+                  v-bind="foodTooltipProps"
+                  class="ml-2 mr-n3 opacity-100"
+                  color="primary"
+                >
+                  {{ $globals.icons.alert }}
+                </v-icon>
+              </template>
+              <span v-if="foodErrorTooltip">
+                {{ foodErrorTooltip }}
+              </span>
+            </v-tooltip>
+          </template>
           <template #no-data>
             <div class="caption text-center pb-2">
               {{ $t("recipe.press-enter-to-create") }}
@@ -153,7 +185,6 @@
             @toggle-original="toggleOriginalText"
             @insert-above="$emit('insert-above')"
             @insert-below="$emit('insert-below')"
-            @insert-ingredient="$emit('insert-ingredient')"
             @delete="$emit('delete')"
           />
         </div>
@@ -184,22 +215,33 @@ import type { RecipeIngredient } from "~/lib/api/types/recipe";
 // defineModel replaces modelValue prop
 const model = defineModel<RecipeIngredient>({ required: true });
 
-const props = defineProps({
+defineProps({
   disableAmount: {
     type: Boolean,
     default: false,
   },
-  allowInsertIngredient: {
+  unitError: {
     type: Boolean,
     default: false,
   },
+  unitErrorTooltip: {
+    type: String,
+    default: "",
+  },
+  foodError: {
+    type: Boolean,
+    default: false,
+  },
+  foodErrorTooltip: {
+    type: String,
+    default: "",
+  },
 });
 
 defineEmits([
   "clickIngredientField",
   "insert-above",
   "insert-below",
-  "insert-ingredient",
   "delete",
 ]);
 
@@ -228,13 +270,6 @@ const contextMenuOptions = computed(() => {
     },
   ];
 
-  if (props.allowInsertIngredient) {
-    options.push({
-      text: i18n.t("recipe.insert-ingredient"),
-      event: "insert-ingredient",
-    });
-  }
-
   if (model.value.originalText) {
     options.push({
       text: i18n.t("recipe.see-original-text"),

frontend/components/Domain/Recipe/RecipeLastMade.vue

@@ -86,7 +86,7 @@
     <div>
       <div v-if="lastMadeReady" class="d-flex justify-center flex-wrap">
         <v-row no-gutters class="d-flex flex-wrap align-center" style="font-size: larger">
-          <v-tooltip bottom>
+          <v-tooltip location="bottom">
             <template #activator="{ props }">
               <v-btn
                 rounded

frontend/components/Domain/Recipe/RecipeOrganizerSelector.vue

@@ -3,7 +3,7 @@
     v-model="selected"
     v-bind="inputAttrs"
     v-model:search="searchInput"
-    :items="storeItem"
+    :items="items"
     :label="label"
     chips
     closable-chips
@@ -46,78 +46,51 @@
   </v-autocomplete>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
 import type { IngredientFood, RecipeCategory, RecipeTag } from "~/lib/api/types/recipe";
 import type { RecipeTool } from "~/lib/api/types/admin";
 import { Organizer, type RecipeOrganizer } from "~/lib/api/types/non-generated";
 import type { HouseholdSummary } from "~/lib/api/types/household";
 import { useCategoryStore, useFoodStore, useHouseholdStore, useTagStore, useToolStore } from "~/composables/store";
 
-export default defineNuxtComponent({
+interface Props {
-  props: {
+  selectorType: RecipeOrganizer;
-    modelValue: {
+  inputAttrs?: Record<string, any>;
-      type: Array as () => (
+  returnObject?: boolean;
+  showAdd?: boolean;
+  showLabel?: boolean;
+  showIcon?: boolean;
+  variant?: "filled" | "underlined" | "outlined" | "plain" | "solo" | "solo-inverted" | "solo-filled";
+}
+
+const props = withDefaults(defineProps<Props>(), {
+  inputAttrs: () => ({}),
+  returnObject: true,
+  showAdd: true,
+  showLabel: true,
+  showIcon: true,
+  variant: "outlined",
+});
+
+const selected = defineModel<(
   | HouseholdSummary
   | RecipeTag
   | RecipeCategory
   | RecipeTool
   | IngredientFood
   | string
-      )[] | undefined,
+)[] | undefined>({ required: true });
-      required: true,
-    },
-    /**
-     * The type of organizer to use.
-     */
-    selectorType: {
-      type: String as () => RecipeOrganizer,
-      required: true,
-    },
-    inputAttrs: {
-      type: Object as () => Record<string, any>,
-      default: () => ({}),
-    },
-    returnObject: {
-      type: Boolean,
-      default: true,
-    },
-    showAdd: {
-      type: Boolean,
-      default: true,
-    },
-    showLabel: {
-      type: Boolean,
-      default: true,
-    },
-    showIcon: {
-      type: Boolean,
-      default: true,
-    },
-    variant: {
-      type: String as () => "filled" | "underlined" | "outlined" | "plain" | "solo" | "solo-inverted" | "solo-filled",
-      default: "outlined",
-    },
-  },
-  emits: ["update:modelValue"],
 
-  setup(props, context) {
+onMounted(() => {
-    const selected = computed({
-      get: () => props.modelValue,
-      set: (val) => {
-        context.emit("update:modelValue", val);
-      },
-    });
-
-    onMounted(() => {
   if (selected.value === undefined) {
     selected.value = [];
   }
-    });
+});
 
-    const i18n = useI18n();
+const i18n = useI18n();
-    const { $globals } = useNuxtApp();
+const { $globals } = useNuxtApp();
 
-    const label = computed(() => {
+const label = computed(() => {
   if (!props.showLabel) {
     return "";
   }
@@ -136,9 +109,9 @@ export default defineNuxtComponent({
     default:
       return i18n.t("general.organizer");
   }
-    });
+});
 
-    const icon = computed(() => {
+const icon = computed(() => {
   if (!props.showIcon) {
     return "";
   }
@@ -157,69 +130,54 @@ export default defineNuxtComponent({
     default:
       return $globals.icons.tags;
   }
-    });
+});
 
-    // ===========================================================================
+// ===========================================================================
-    // Store & Items Setup
+// Store & Items Setup
 
-    const storeMap = {
+const storeMap = {
   [Organizer.Category]: useCategoryStore(),
   [Organizer.Tag]: useTagStore(),
   [Organizer.Tool]: useToolStore(),
   [Organizer.Food]: useFoodStore(),
   [Organizer.Household]: useHouseholdStore(),
-    };
+};
 
-    const store = computed(() => {
+const store = computed(() => {
   const { store } = storeMap[props.selectorType];
   return store.value;
-    });
+});
 
-    const items = computed(() => {
+const items = computed(() => {
   if (!props.returnObject) {
     return store.value.map(item => item.name);
   }
   return store.value;
-    });
+});
 
-    function removeByIndex(index: number) {
+function removeByIndex(index: number) {
   if (selected.value === undefined) {
     return;
   }
   const newSelected = selected.value.filter((_, i) => i !== index);
   selected.value = [...newSelected];
-    }
+}
 
-    function appendCreated(item: any) {
+function appendCreated(item: any) {
   if (selected.value === undefined) {
     return;
   }
 
   selected.value = [...selected.value, item];
-    }
+}
 
-    const dialog = ref(false);
+const dialog = ref(false);
 
-    const searchInput = ref("");
+const searchInput = ref("");
 
-    function resetSearchInput() {
+function resetSearchInput() {
   searchInput.value = "";
-    }
+}
-
-    return {
-      Organizer,
-      appendCreated,
-      dialog,
-      storeItem: items,
-      label,
-      icon,
-      selected,
-      removeByIndex,
-      searchInput,
-      resetSearchInput,
-    };
-  },
-});
 </script>
 
 <style scoped>

frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageInfoCard.vue

@@ -35,7 +35,7 @@
                 >
                   <RecipeYield
                     :yield-quantity="recipe.recipeYieldQuantity"
-                    :yield="recipe.recipeYield"
+                    :yield-text="recipe.recipeYield"
                     :scale="recipeScale"
                     class="mb-4"
                   />

frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageIngredientEditor.vue

@@ -42,7 +42,7 @@
     />
     <div class="d-flex flex-wrap justify-center justify-sm-end mt-3">
       <v-tooltip
-        top
+        location="top"
         color="accent"
       >
         <template #activator="{ props }">

frontend/components/Domain/Recipe/RecipePrintView.vue

@@ -222,7 +222,7 @@ export default defineNuxtComponent({
 
     const servingsDisplay = computed(() => {
       const { scaledAmountDisplay } = useScaledAmount(props.recipe.recipeYieldQuantity, props.scale);
-      return scaledAmountDisplay
+      return scaledAmountDisplay || props.recipe.recipeYield
         ? i18n.t("recipe.yields-amount-with-text", {
           amount: scaledAmountDisplay,
           text: props.recipe.recipeYield,

frontend/components/Domain/Recipe/RecipeScaleEditButton.vue

@@ -14,7 +14,7 @@
             <v-tooltip
               v-if="canEditScale"
               size="small"
-              top
+              location="top"
               color="secondary-darken-1"
             >
               <template #activator="{ props: tooltipProps }">
@@ -74,7 +74,7 @@
                   @update:model-value="recalculateScale(parseFloat($event) || 0)"
                 />
                 <v-tooltip
-                  end
+                  location="end"
                   color="secondary-darken-1"
                 >
                   <template #activator="{ props }">

frontend/components/Domain/Recipe/RecipeTimelineBadge.vue

@@ -1,6 +1,6 @@
 <template>
   <v-tooltip
-    bottom
+    location="bottom"
     nudge-right="50"
     :color="buttonStyle ? 'info' : 'secondary'"
   >

frontend/components/Domain/Recipe/RecipeYield.vue

@@ -1,6 +1,6 @@
 <template>
   <div
-    v-if="scaledAmount"
+    v-if="yieldDisplay"
     class="d-flex align-center"
   >
     <v-row
@@ -18,7 +18,7 @@
       <p class="my-0 opacity-80">
         <span class="font-weight-bold">{{ $t("recipe.yield") }}</span><br>
         <!-- eslint-disable-next-line vue/no-v-html -->
-        <span v-html="scaledAmount" /> {{ text }}
+        <span v-html="yieldDisplay" />
       </p>
     </v-row>
   </div>
@@ -34,7 +34,7 @@ export default defineNuxtComponent({
       type: Number,
       default: 0,
     },
-    yield: {
+    yieldText: {
       type: String,
       default: "",
     },
@@ -55,15 +55,24 @@ export default defineNuxtComponent({
       });
     }
 
-    const scaledAmount = computed(() => {
+    const yieldDisplay = computed<string>(() => {
+      const components: string[] = [];
+
       const { scaledAmountDisplay } = useScaledAmount(props.yieldQuantity, props.scale);
-      return scaledAmountDisplay;
+      if (scaledAmountDisplay) {
+        components.push(scaledAmountDisplay);
+      }
+
+      const text = props.yieldText;
+      if (text) {
+        components.push(text);
+      }
+
+      return sanitizeHTML(components.join(" "));
     });
-    const text = sanitizeHTML(props.yield);
 
     return {
-      scaledAmount,
+      yieldDisplay,
-      text,
     };
   },
 });

frontend/components/Domain/ShoppingList/ShoppingListItem.vue

@@ -59,7 +59,7 @@
                 open-delay="200"
                 transition="slide-x-reverse-transition"
                 density="compact"
-                right
+                location="end"
                 content-class="text-caption"
               >
                 <template #activator="{ props: tooltipProps }">

frontend/components/Domain/User/UserAvatar.vue

@@ -2,7 +2,7 @@
   <v-tooltip
     v-if="userId"
     :disabled="!user || !tooltip"
-    right
+    location="end"
   >
     <template #activator="{ props }">
       <v-avatar

frontend/components/global/AppButtonCopy.vue

@@ -2,7 +2,7 @@
   <v-tooltip
     ref="copyToolTip"
     v-model="show"
-    top
+    location="top"
     :open-on-hover="false"
     :open-on-click="true"
     close-delay="500"

frontend/components/global/BaseButtonGroup.vue

@@ -48,7 +48,7 @@
         open-delay="200"
         transition="slide-y-reverse-transition"
         density="compact"
-        bottom
+        location="bottom"
         content-class="text-caption"
       >
         <template #activator="{ props }">

frontend/lang/messages/en-US.json

@@ -663,6 +663,8 @@
       "no-unit": "No unit",
       "missing-unit": "Create missing unit: {unit}",
       "missing-food": "Create missing food: {food}",
+      "this-unit-could-not-be-parsed-automatically": "This unit could not be parsed automatically",
+      "this-food-could-not-be-parsed-automatically": "This food could not be parsed automatically",
       "no-food": "No Food"
     },
     "reset-servings-count": "Reset Servings Count",

frontend/pages/admin/manage/groups/index.vue

@@ -60,7 +60,7 @@
         </template>
         <template #[`item.actions`]="{ item }">
           <v-tooltip
-            bottom
+            location="bottom"
             :disabled="!(item && (item.households!.length > 0 || item.users!.length > 0))"
           >
             <template #activator="{ props }">

frontend/pages/admin/manage/households/index.vue

@@ -82,7 +82,7 @@
         </template>
         <template #[`item.actions`]="{ item }">
           <v-tooltip
-            bottom
+            location="bottom"
             :disabled="!(item && item.users!.length > 0)"
           >
             <template #activator="{ props }">

frontend/pages/g/[groupSlug]/cookbooks/index.vue

@@ -16,7 +16,7 @@
       @cancel="deleteCreateTarget()"
     >
       <v-card-text>
-        <CookbookEditor :key="createTargetKey" v-model="createTarget" :actions="actions" />
+        <CookbookEditor :key="createTargetKey" v-model="createTarget" />
       </v-card-text>
     </BaseDialog>
 
@@ -105,9 +105,7 @@
             <v-expansion-panel-text>
               <CookbookEditor
                 v-model="myCookbooks[index]"
-                :actions="actions"
                 :collapsable="false"
-                @delete="deleteEventHandler"
               />
               <v-card-actions>
                 <v-spacer />

frontend/pages/g/[groupSlug]/r/[slug]/ingredient-parser.vue

@@ -103,7 +103,12 @@
                 <RecipeIngredientEditor
                   v-model="parsedIng[index].ingredient"
                   allow-insert-ingredient
-                  @insert-ingredient="insertIngredient(index)"
+                  :unit-error="errors[index].unitError && errors[index].unitErrorMessage !== ''"
+                  :unit-error-tooltip="$t('recipe.parser.this-unit-could-not-be-parsed-automatically')"
+                  :food-error="errors[index].foodError && errors[index].foodErrorMessage !== ''"
+                  :food-error-tooltip="$t('recipe.parser.this-food-could-not-be-parsed-automatically')"
+                  @insert-above="insertIngredient(index)"
+                  @insert-below="insertIngredient(index + 1)"
                   @delete="deleteIngredient(index)"
                 />
                 {{ ing.input }}
@@ -113,7 +118,7 @@
                     v-if="errors[index].unitError && errors[index].unitErrorMessage !== ''"
                     color="warning"
                     size="small"
-                    @click="createUnit(ing.ingredient.unit!, index)"
+                    @click="createUnit(errors[index].unitName, index)"
                   >
                     {{ errors[index].unitErrorMessage }}
                   </BaseButton>
@@ -121,7 +126,7 @@
                     v-if="errors[index].foodError && errors[index].foodErrorMessage !== ''"
                     color="warning"
                     size="small"
-                    @click="createFood(ing.ingredient.food!, index)"
+                    @click="createFood(errors[index].foodName, index)"
                   >
                     {{ errors[index].foodErrorMessage }}
                   </BaseButton>
@@ -157,8 +162,10 @@ import type { Parser } from "~/lib/api/user/recipes/recipe";
 
 interface Error {
   ingredientIndex: number;
+  unitName: string;
   unitError: boolean;
   unitErrorMessage: string;
+  foodName: string;
   foodError: boolean;
   foodErrorMessage: string;
 }
@@ -224,30 +231,33 @@ export default defineNuxtComponent({
       const unitError = !checkForUnit(ing.ingredient.unit!);
       const foodError = !checkForFood(ing.ingredient.food!);
 
+      const unit = ing.ingredient.unit?.name || i18n.t("recipe.parser.no-unit");
+      const food = ing.ingredient.food?.name || i18n.t("recipe.parser.no-food");
+
       let unitErrorMessage = "";
       let foodErrorMessage = "";
 
-      if (unitError || foodError) {
       if (unitError) {
         if (ing?.ingredient?.unit?.name) {
-            const unit = ing.ingredient.unit.name || i18n.t("recipe.parser.no-unit");
+          ing.ingredient.unit = undefined;
           unitErrorMessage = i18n.t("recipe.parser.missing-unit", { unit }).toString();
         }
       }
 
       if (foodError) {
         if (ing?.ingredient?.food?.name) {
-            const food = ing.ingredient.food.name || i18n.t("recipe.parser.no-food");
+          ing.ingredient.food = undefined;
           foodErrorMessage = i18n.t("recipe.parser.missing-food", { food }).toString();
         }
       }
-      }
       panels.value.push(index);
 
       return {
         ingredientIndex: index,
+        unitName: unit,
         unitError,
         unitErrorMessage,
+        foodName: food,
         foodError,
         foodErrorMessage,
       } as Error;
@@ -320,24 +330,24 @@ export default defineNuxtComponent({
       return !!food?.id;
     }
 
-    async function createFood(food: CreateIngredientFood | undefined, index: number) {
+    async function createFood(foodName: string, index: number) {
-      if (!food) {
+      if (!foodName) {
         return;
       }
 
-      foodData.data.name = food.name;
+      foodData.data.name = foodName;
       parsedIng.value[index].ingredient.food = await foodStore.actions.createOne(foodData.data) || undefined;
       errors.value[index].foodError = false;
 
       foodData.reset();
     }
 
-    async function createUnit(unit: CreateIngredientUnit | undefined, index: number) {
+    async function createUnit(unitName: string | undefined, index: number) {
-      if (!unit) {
+      if (!unitName) {
         return;
       }
 
-      unitData.data.name = unit.name;
+      unitData.data.name = unitName;
       parsedIng.value[index].ingredient.unit = await unitStore.actions.createOne(unitData.data) || undefined;
       errors.value[index].unitError = false;
 

poetry.lock

@@ -3269,30 +3269,29 @@ jupyter = ["ipywidgets (>=7.5.1,<9)"]
 
 [[package]]
 name = "ruff"
-version = "0.12.5"
+version = "0.12.6"
 description = "An extremely fast Python linter and code formatter, written in Rust."
 optional = false
 python-versions = ">=3.7"
 groups = ["dev"]
 files = [
-    {file = "ruff-0.12.5-py3-none-linux_armv6l.whl", hash = "sha256:1de2c887e9dec6cb31fcb9948299de5b2db38144e66403b9660c9548a67abd92"},
+    {file = "ruff-0.12.6-py3-none-linux_armv6l.whl", hash = "sha256:59b48d8581989e0527b64c3297e672357c03b78d58cf1b228037a49915316277"},
-    {file = "ruff-0.12.5-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:d1ab65e7d8152f519e7dea4de892317c9da7a108da1c56b6a3c1d5e7cf4c5e9a"},
+    {file = "ruff-0.12.6-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:412518260394e8a6647a0c610062cac48ff230d39b9df57faae93aa77123e90c"},
-    {file = "ruff-0.12.5-py3-none-macosx_11_0_arm64.whl", hash = "sha256:962775ed5b27c7aa3fdc0d8f4d4433deae7659ef99ea20f783d666e77338b8cf"},
+    {file = "ruff-0.12.6-py3-none-macosx_11_0_arm64.whl", hash = "sha256:b56a3f51a27d0db8141d5b4b095c2849b24f639539a05d201f72f8d83f829a78"},
-    {file = "ruff-0.12.5-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:73b4cae449597e7195a49eb1cdca89fd9fbb16140c7579899e87f4c85bf82f73"},
+    {file = "ruff-0.12.6-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1ef9e292957bd6a868ce4e5f57931d0583814a363add2adedae3a1c9854b7ad9"},
-    {file = "ruff-0.12.5-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:8b13489c3dc50de5e2d40110c0cce371e00186b880842e245186ca862bf9a1ac"},
+    {file = "ruff-0.12.6-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:0c3fd9955d3009c33e60bb596ea7bc66832de34d621883061114bb3b6114d358"},
-    {file = "ruff-0.12.5-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f1504fea81461cf4841778b3ef0a078757602a3b3ea4b008feb1308cb3f23e08"},
+    {file = "ruff-0.12.6-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4e7456efef8dd6957843de60a245152e34a842210d8b13381d5f3e7540d17935"},
-    {file = "ruff-0.12.5-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:c7da4129016ae26c32dfcbd5b671fe652b5ab7fc40095d80dcff78175e7eddd4"},
+    {file = "ruff-0.12.6-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:c99e62bae20c7e1a8d4de84f96754e9732d0831614ed165415ed2c4f4aa83864"},
-    {file = "ruff-0.12.5-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ca972c80f7ebcfd8af75a0f18b17c42d9f1ef203d163669150453f50ca98ab7b"},
+    {file = "ruff-0.12.6-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d47ff2b300da87df8437e1b35291349faaceb666d8349edef733b6562d29264f"},
-    {file = "ruff-0.12.5-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:8dbbf9f25dfb501f4237ae7501d6364b76a01341c6f1b2cd6764fe449124bb2a"},
+    {file = "ruff-0.12.6-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:8883ab5e9506574a6a2abacb5da34d416fdd8434151b35421ba3f79ca9a14a11"},
-    {file = "ruff-0.12.5-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2c47dea6ae39421851685141ba9734767f960113d51e83fd7bb9958d5be8763a"},
+    {file = "ruff-0.12.6-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b3cfbd192c312669fb22cd4bf8c700e8b4b1dced7ce034e581459c0e375486fa"},
-    {file = "ruff-0.12.5-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:c5076aa0e61e30f848846f0265c873c249d4b558105b221be1828f9f79903dc5"},
+    {file = "ruff-0.12.6-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:c1d87f2b1abf330281b3972d6bf34d366ee84b3077df66a89169e2d81b291891"},
-    {file = "ruff-0.12.5-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:a5a4c7830dadd3d8c39b1cc85386e2c1e62344f20766be6f173c22fb5f72f293"},
+    {file = "ruff-0.12.6-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:3f32aaa9b5ed69de80693abeecf9961cd97851cadf7850081461261d0e6551b6"},
-    {file = "ruff-0.12.5-py3-none-musllinux_1_2_i686.whl", hash = "sha256:46699f73c2b5b137b9dc0fc1a190b43e35b008b398c6066ea1350cce6326adcb"},
+    {file = "ruff-0.12.6-py3-none-musllinux_1_2_i686.whl", hash = "sha256:de5185f19289a800c16d6ec8a9ba0b8b911b4640a4927b487f48fb51634ce315"},
-    {file = "ruff-0.12.5-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:5a655a0a0d396f0f072faafc18ebd59adde8ca85fb848dc1b0d9f024b9c4d3bb"},
+    {file = "ruff-0.12.6-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:80f9d56205f6f6c4a1039c79d9acc0a9c104915f4fc0fc0385170decc72f6e4c"},
-    {file = "ruff-0.12.5-py3-none-win32.whl", hash = "sha256:dfeb2627c459b0b78ca2bbdc38dd11cc9a0a88bf91db982058b26ce41714ffa9"},
+    {file = "ruff-0.12.6-py3-none-win32.whl", hash = "sha256:b553271d6ed5611fcbe5f6752852eef695f2a77c0405b3a16fd507e5a057f5b0"},
-    {file = "ruff-0.12.5-py3-none-win_amd64.whl", hash = "sha256:ae0d90cf5f49466c954991b9d8b953bd093c32c27608e409ae3564c63c5306a5"},
+    {file = "ruff-0.12.6-py3-none-win_amd64.whl", hash = "sha256:48b73d4acef6768bfe9912e8f623ec87677bcfb6dc748ac406ebff06a84a6d70"},
-    {file = "ruff-0.12.5-py3-none-win_arm64.whl", hash = "sha256:48cdbfc633de2c5c37d9f090ba3b352d1576b0015bfc3bc98eaf230275b7e805"},
+    {file = "ruff-0.12.6-py3-none-win_arm64.whl", hash = "sha256:cd2c9c898a11f1441778d1cf9e358244cf5f4f2f11e93ff03c1a6c6759f4b15d"},
-    {file = "ruff-0.12.5.tar.gz", hash = "sha256:b209db6102b66f13625940b7f8c7d0f18e20039bb7f6101fbdac935c9612057e"},
 ]
 
 [[package]]