Merge branch 'mealie-next' into bug/private-recipe-recipe-actions

frontend/composables/recipes/use-recipe-tools.ts

@@ -9,7 +9,6 @@ export const useTools = function (eager = true) {
     id: "",
     name: "",
     slug: "",
-    onHand: false,
   });
 
   const api = useUserApi();

frontend/composables/store/use-food-store.ts

@@ -13,7 +13,6 @@ export const useFoodData = function () {
     name: "",
     description: "",
     labelId: undefined,
-    onHand: false,
   });
 }
 

frontend/composables/store/use-tool-store.ts

@@ -3,16 +3,21 @@ import { useData, useReadOnlyStore, useStore } from "../partials/use-store-facto
 import { RecipeTool } from "~/lib/api/types/recipe";
 import { usePublicExploreApi, useUserApi } from "~/composables/api";
 
+interface RecipeToolWithOnHand extends RecipeTool {
+  onHand: boolean;
+}
+
 const store: Ref<RecipeTool[]> = ref([]);
 const loading = ref(false);
 const publicLoading = ref(false);
 
 export const useToolData = function () {
-  return useData<RecipeTool>({
+  return useData<RecipeToolWithOnHand>({
     id: "",
     name: "",
     slug: "",
     onHand: false,
+    householdsWithTool: [],
   });
 }
 

frontend/composables/use-users/preferences.ts

@@ -1,6 +1,7 @@
 import { Ref, useContext } from "@nuxtjs/composition-api";
 import { useLocalStorage, useSessionStorage } from "@vueuse/core";
 import { RegisteredParser, TimelineEventType } from "~/lib/api/types/recipe";
+import { QueryFilterJSON } from "~/lib/api/types/response";
 
 export interface UserPrintPreferences {
   imagePosition: string;
@@ -49,6 +50,17 @@ export interface UserCookbooksPreferences {
   hideOtherHouseholds: boolean;
 }
 
+export interface UserRecipeFinderPreferences {
+  foodIds: string[];
+  toolIds: string[];
+  queryFilter: string;
+  queryFilterJSON: QueryFilterJSON;
+  maxMissingFoods: number;
+  maxMissingTools: number;
+  includeFoodsOnHand: boolean;
+  includeToolsOnHand: boolean;
+}
+
 export function useUserMealPlanPreferences(): Ref<UserMealPlanPreferences> {
   const fromStorage = useLocalStorage(
     "meal-planner-preferences",
@@ -171,3 +183,24 @@ export function useCookbookPreferences(): Ref<UserCookbooksPreferences> {
 
   return fromStorage;
 }
+
+export function useRecipeFinderPreferences(): Ref<UserRecipeFinderPreferences> {
+  const fromStorage = useLocalStorage(
+    "recipe-finder-preferences",
+    {
+      foodIds: [],
+      toolIds: [],
+      queryFilter: "",
+      queryFilterJSON: { parts: [] } as QueryFilterJSON,
+      maxMissingFoods: 20,
+      maxMissingTools: 20,
+      includeFoodsOnHand: true,
+      includeToolsOnHand: true,
+    },
+    { mergeDefaults: true }
+    // we cast to a Ref because by default it will return an optional type ref
+    // but since we pass defaults we know all properties are set.
+  ) as unknown as Ref<UserRecipeFinderPreferences>;
+
+  return fromStorage;
+}