Cutlery/mealie
1
0
Fork 0
mirror of https://github.com/mealie-recipes/mealie.git synced 2025-07-09 03:04:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

feat: Prevent Shopping Lists From Rendering If Redirecting (#3768)

Browse Source
This commit is contained in:
Michael Genson 2024-06-25 08:41:41 -05:00 committed by GitHub
parent 44915ace12
commit 5572e51933
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
frontend/pages/shopping-lists/index.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<v-container v-if="shoppingListChoices" class="narrow-container"> <v-container v-if="shoppingListChoices && ready" class="narrow-container">
<BaseDialog v-model="createDialog" :title="$tc('shopping-list.create-shopping-list')" @submit="createOne"> <BaseDialog v-model="createDialog" :title="$tc('shopping-list.create-shopping-list')" @submit="createOne">
<v-card-text> <v-card-text>
<v-text-field v-model="createName" autofocus :label="$t('shopping-list.new-list')"> </v-text-field> <v-text-field v-model="createName" autofocus :label="$t('shopping-list.new-list')"> </v-text-field>
@ -48,7 +48,7 @@
</template> </template>
<script lang="ts"> <script lang="ts">
import { computed, defineComponent, useAsync, useContext, reactive, toRefs, useRoute, useRouter } from "@nuxtjs/composition-api"; import { computed, defineComponent, useAsync, useContext, reactive, ref, toRefs, useRoute, useRouter, watch } from "@nuxtjs/composition-api";
import { useUserApi } from "~/composables/api"; import { useUserApi } from "~/composables/api";
import { useAsyncKey } from "~/composables/use-utils"; import { useAsyncKey } from "~/composables/use-utils";
import { useShoppingListPreferences } from "~/composables/use-users/preferences"; import { useShoppingListPreferences } from "~/composables/use-users/preferences";
@ -57,11 +57,13 @@ export default defineComponent({
middleware: "auth", middleware: "auth",
setup() { setup() {
const { $auth } = useContext(); const { $auth } = useContext();
const ready = ref(false);
const userApi = useUserApi(); const userApi = useUserApi();
const route = useRoute(); const route = useRoute();
const router = useRouter(); const router = useRouter();
const groupSlug = computed(() => route.value.params.groupSlug || $auth.user?.groupSlug || ""); const groupSlug = computed(() => route.value.params.groupSlug || $auth.user?.groupSlug || "");
const disableRedirect = computed(() => route.value.query.disableRedirect === "true"); const overrideDisableRedirect = ref(false);
const disableRedirect = computed(() => route.value.query.disableRedirect === "true" || overrideDisableRedirect.value);
const preferences = useShoppingListPreferences(); const preferences = useShoppingListPreferences();
const state = reactive({ const state = reactive({
@ -83,6 +85,28 @@ export default defineComponent({
return shoppingLists.value.filter((list) => preferences.value.viewAllLists || list.userId === $auth.user?.id); return shoppingLists.value.filter((list) => preferences.value.viewAllLists || list.userId === $auth.user?.id);
}); });
// This has to appear before the shoppingListChoices watcher, otherwise that runs first and the redirect is not disabled
watch(
() => preferences.value.viewAllLists,
() => {
overrideDisableRedirect.value = true;
},
);
watch(
() => shoppingListChoices,
() => {
if (!disableRedirect.value && shoppingListChoices.value.length === 1) {
router.push(`/shopping-lists/${shoppingListChoices.value[0].id}`);
} else {
ready.value = true;
}
},
{
deep: true,
},
);
async function fetchShoppingLists() { async function fetchShoppingLists() {
const { data } = await userApi.shopping.lists.getAll(1, -1, { orderBy: "name", orderDirection: "asc" }); const { data } = await userApi.shopping.lists.getAll(1, -1, { orderBy: "name", orderDirection: "asc" });
@ -118,17 +142,9 @@ export default defineComponent({
} }
} }
if (!disableRedirect.value) {
useAsync(async () => {
await refresh();
if (shoppingListChoices.value?.length === 1) {
router.push(`/shopping-lists/${shoppingListChoices.value[0].id}`);
}
}, useAsyncKey());
}
return { return {
...toRefs(state), ...toRefs(state),
ready,
groupSlug, groupSlug,
preferences, preferences,
shoppingListChoices, shoppingListChoices,