diff --git a/frontend/composables/store/use-cookbook-store.ts b/frontend/composables/store/use-cookbook-store.ts index cbcfb6d36..34e7522a3 100644 --- a/frontend/composables/store/use-cookbook-store.ts +++ b/frontend/composables/store/use-cookbook-store.ts @@ -1,6 +1,6 @@ -import { useReadOnlyStore } from "../partials/use-store-factory"; -import { usePublicExploreApi, useUserApi } from "~/composables/api"; +import { useReadOnlyStore, useStore } from "../partials/use-store-factory"; import type { RecipeCookBook } from "~/lib/api/types/cookbook"; +import { usePublicExploreApi, useUserApi } from "~/composables/api"; const store: Ref = ref([]); const loading = ref(false); @@ -8,7 +8,7 @@ const publicLoading = ref(false); export const useCookbookStore = function () { const api = useUserApi(); - return useReadOnlyStore(store, loading, api.cookbooks); + return useStore(store, loading, api.cookbooks); }; export const usePublicCookbookStore = function (groupSlug: string) { diff --git a/frontend/composables/use-group-cookbooks.ts b/frontend/composables/use-group-cookbooks.ts index 681797c4a..0cdeee82a 100644 --- a/frontend/composables/use-group-cookbooks.ts +++ b/frontend/composables/use-group-cookbooks.ts @@ -1,13 +1,6 @@ -// TODO: this should be a part of use-cookbook-store, which does mostly the same thing but only for reads - import { useAsyncKey } from "./use-utils"; import { usePublicExploreApi } from "./api/api-client"; -import { useHouseholdSelf } from "./use-households"; import { useUserApi } from "~/composables/api"; -import { useCookbookStore } from "~/composables/store/use-cookbook-store"; -import type { ReadCookBook, UpdateCookBook } from "~/lib/api/types/cookbook"; - -let cookbookStore: Ref | null = null; export const useCookbook = function (publicGroupSlug: string | null = null) { function getOne(id: string | number) { @@ -25,153 +18,3 @@ export const useCookbook = function (publicGroupSlug: string | null = null) { return { getOne }; }; - -export const usePublicCookbooks = function (groupSlug: string) { - const api = usePublicExploreApi(groupSlug).explore; - const loading = ref(false); - - const actions = { - getAll() { - loading.value = true; - const { data: units } = useAsyncData(useAsyncKey(), async () => { - const { data } = await api.cookbooks.getAll(1, -1, { orderBy: "position", orderDirection: "asc" }); - - if (data) { - return data.items; - } - else { - return null; - } - }); - - loading.value = false; - return units; - }, - async refreshAll() { - loading.value = true; - const { data } = await api.cookbooks.getAll(1, -1, { orderBy: "position", orderDirection: "asc" }); - - if (data && data.items && cookbookStore) { - cookbookStore.value = data.items; - } - - loading.value = false; - }, - flushStore() { - cookbookStore = null; - }, - }; - - if (!cookbookStore) { - cookbookStore = actions.getAll(); - } - - return { cookbooks: cookbookStore, actions }; -}; - -export const useCookbooks = function () { - const api = useUserApi(); - const { household } = useHouseholdSelf(); - const loading = ref(false); - const cookbookStoreSidebar = useCookbookStore(); - - const i18n = useI18n(); - - const actions = { - getAll() { - loading.value = true; - const { data: units } = useAsyncData(useAsyncKey(), async () => { - const { data } = await api.cookbooks.getAll(1, -1, { orderBy: "position", orderDirection: "asc" }); - - if (data) { - return data.items; - } - else { - return null; - } - }); - - loading.value = false; - return units; - }, - async refreshAll() { - loading.value = true; - const { data } = await api.cookbooks.getAll(1, -1, { orderBy: "position", orderDirection: "asc" }); - - if (data && data.items && cookbookStore) { - cookbookStore.value = data.items; - - // The sidebar uses a different store, so we need to refresh it too - cookbookStoreSidebar.store.value = data.items; - } - - loading.value = false; - }, - async createOne(name: string | null = null) { - loading.value = true; - const { data } = await api.cookbooks.createOne({ - name: name || i18n.t("cookbook.household-cookbook-name", [household.value?.name || "", String((cookbookStore?.value?.length ?? 0) + 1)]) as string, - position: (cookbookStore?.value?.length ?? 0) + 1, - queryFilterString: "", - }); - if (data && cookbookStore?.value) { - cookbookStore.value.push(data); - } - else { - this.refreshAll(); - } - - loading.value = false; - return data; - }, - async updateOne(updateData: UpdateCookBook) { - if (!updateData.id) { - return; - } - - loading.value = true; - const { data } = await api.cookbooks.updateOne(updateData.id, updateData); - if (data && cookbookStore?.value) { - this.refreshAll(); - } - loading.value = false; - return data; - }, - - async updateOrder(cookbooks: ReadCookBook[]) { - if (!cookbooks?.length) { - return; - } - - loading.value = true; - - cookbooks.forEach((element, index) => { - element.position = index + 1; - }); - - const { data } = await api.cookbooks.updateAll(cookbooks); - - if (data && cookbookStore?.value) { - this.refreshAll(); - } - - loading.value = true; - }, - async deleteOne(id: string | number) { - loading.value = true; - const { data } = await api.cookbooks.deleteOne(id); - if (data && cookbookStore?.value) { - this.refreshAll(); - } - }, - flushStore() { - cookbookStore = null; - }, - }; - - if (!cookbookStore) { - cookbookStore = actions.getAll(); - } - - return { cookbooks: cookbookStore, actions }; -};