From 203218a3d58e55e46f046a3606bc7dad7e02333c Mon Sep 17 00:00:00 2001
From: "gpotter@gmail.com" <119442226+parumpum@users.noreply.github.com>
Date: Tue, 14 Jan 2025 09:18:16 -0800
Subject: [PATCH] fix: Refresh recipe section when clicking card tag chip
 (#4810)

Co-authored-by: Kuchenpirat <24235032+Kuchenpirat@users.noreply.github.com>
---
 .../components/Domain/Recipe/RecipeCard.vue   |  4 ++--
 .../Domain/Recipe/RecipeCardMobile.vue        |  2 +-
 .../Domain/Recipe/RecipeCardSection.vue       |  5 +++++
 .../components/Domain/Recipe/RecipeChips.vue  |  3 ++-
 .../Domain/Recipe/RecipeDataTable.vue         | 21 +++++++++++++------
 .../Domain/Recipe/RecipeExplorerPage.vue      | 16 ++++++++++++++
 .../Domain/Recipe/RecipePage/RecipePage.vue   | 18 +++++++++++++---
 .../RecipePageParts/RecipePageOrganizers.vue  |  8 ++++---
 8 files changed, 61 insertions(+), 16 deletions(-)

diff --git a/frontend/components/Domain/Recipe/RecipeCard.vue b/frontend/components/Domain/Recipe/RecipeCard.vue
index b6c627c60..b584c2ba3 100644
--- a/frontend/components/Domain/Recipe/RecipeCard.vue
+++ b/frontend/components/Domain/Recipe/RecipeCard.vue
@@ -7,7 +7,7 @@
         :elevation="hover ? 12 : 2"
         :to="recipeRoute"
         :min-height="imageHeight + 75"
-        @click="$emit('click')"
+        @click.self="$emit('click')"
       >
         <RecipeCardImage
           :icon-size="imageHeight"
@@ -39,7 +39,7 @@
 
             <RecipeRating class="pb-1" :value="rating" :recipe-id="recipeId" :slug="slug" :small="true" />
             <v-spacer></v-spacer>
-            <RecipeChips :truncate="true" :items="tags" :title="false" :limit="2" :small="true" url-prefix="tags" />
+            <RecipeChips :truncate="true" :items="tags" :title="false" :limit="2" :small="true" url-prefix="tags" v-on="$listeners" />
 
             <!-- If we're not logged-in, no items display, so we hide this menu -->
             <RecipeContextMenu
diff --git a/frontend/components/Domain/Recipe/RecipeCardMobile.vue b/frontend/components/Domain/Recipe/RecipeCardMobile.vue
index ebc8f3e9a..a0eb3ff9c 100644
--- a/frontend/components/Domain/Recipe/RecipeCardMobile.vue
+++ b/frontend/components/Domain/Recipe/RecipeCardMobile.vue
@@ -38,7 +38,7 @@
               <SafeMarkdown :source="description" />
             </v-list-item-subtitle>
             <div class="d-flex flex-wrap justify-start ma-0">
-              <RecipeChips :truncate="true" :items="tags" :title="false" :limit="2" :small="true" url-prefix="tags" />
+              <RecipeChips :truncate="true" :items="tags" :title="false" :limit="2" :small="true" url-prefix="tags" v-on="$listeners" />
             </div>
             <div class="d-flex flex-wrap justify-end align-center">
               <slot name="actions">
diff --git a/frontend/components/Domain/Recipe/RecipeCardSection.vue b/frontend/components/Domain/Recipe/RecipeCardSection.vue
index 6ca7e0a0a..98611b02c 100644
--- a/frontend/components/Domain/Recipe/RecipeCardSection.vue
+++ b/frontend/components/Domain/Recipe/RecipeCardSection.vue
@@ -82,6 +82,8 @@
                 :image="recipe.image"
                 :tags="recipe.tags"
                 :recipe-id="recipe.id"
+
+                 v-on="$listeners"
               />
             </v-lazy>
           </v-col>
@@ -105,6 +107,8 @@
                 :image="recipe.image"
                 :tags="recipe.tags"
                 :recipe-id="recipe.id"
+
+                v-on="$listeners"
               />
             </v-lazy>
           </v-col>
@@ -296,6 +300,7 @@ export default defineComponent({
       }, useAsyncKey());
     }, 500);
 
+
     function sortRecipes(sortType: string) {
       if (state.sortLoading || loading.value) {
         return;
diff --git a/frontend/components/Domain/Recipe/RecipeChips.vue b/frontend/components/Domain/Recipe/RecipeChips.vue
index b06d32b61..44429c1b7 100644
--- a/frontend/components/Domain/Recipe/RecipeChips.vue
+++ b/frontend/components/Domain/Recipe/RecipeChips.vue
@@ -9,7 +9,8 @@
       color="accent"
       :small="small"
       dark
-      :to="`${baseRecipeRoute}?${urlPrefix}=${category.id}`"
+
+      @click.prevent="() => $emit('item-selected', category, urlPrefix)"
     >
       {{ truncateText(category.name) }}
     </v-chip>
diff --git a/frontend/components/Domain/Recipe/RecipeDataTable.vue b/frontend/components/Domain/Recipe/RecipeDataTable.vue
index fbac4c101..620cdffd0 100644
--- a/frontend/components/Domain/Recipe/RecipeDataTable.vue
+++ b/frontend/components/Domain/Recipe/RecipeDataTable.vue
@@ -23,13 +23,13 @@
       <a :href="`/g/${groupSlug}/r/${item.slug}`" style="color: inherit; text-decoration: inherit; " @click="$emit('click')">{{ item.name }}</a>
     </template>
     <template #item.tags="{ item }">
-      <RecipeChip small :items="item.tags" :is-category="false" url-prefix="tags" />
+      <RecipeChip small :items="item.tags" :is-category="false" url-prefix="tags" @item-selected="filterItems" />
     </template>
     <template #item.recipeCategory="{ item }">
-      <RecipeChip small :items="item.recipeCategory" />
+      <RecipeChip small :items="item.recipeCategory" @item-selected="filterItems" />
     </template>
     <template #item.tools="{ item }">
-      <RecipeChip small :items="item.tools" url-prefix="tools" />
+      <RecipeChip small :items="item.tools" url-prefix="tools" @item-selected="filterItems" />
     </template>
     <template #item.userId="{ item }">
       <v-list-item class="justify-start">
@@ -48,12 +48,13 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, onMounted, ref, useContext } from "@nuxtjs/composition-api";
+import { computed, defineComponent, onMounted, ref, useContext, useRouter } from "@nuxtjs/composition-api";
 import UserAvatar from "../User/UserAvatar.vue";
 import RecipeChip from "./RecipeChips.vue";
-import { Recipe } from "~/lib/api/types/recipe";
+import { Recipe, RecipeCategory, RecipeTool } from "~/lib/api/types/recipe";
 import { useUserApi } from "~/composables/api";
 import { UserSummary } from "~/lib/api/types/user";
+import { RecipeTag } from "~/lib/api/types/household";
 
 const INPUT_EVENT = "input";
 
@@ -106,7 +107,7 @@ export default defineComponent({
   setup(props, context) {
     const { $auth, i18n } = useContext();
     const groupSlug = $auth.user?.groupSlug;
-
+    const router = useRouter();
     function setValue(value: Recipe[]) {
       context.emit(INPUT_EVENT, value);
     }
@@ -167,6 +168,13 @@ export default defineComponent({
       }
     }
 
+    function filterItems(item: RecipeTag | RecipeCategory | RecipeTool, itemType: string) {
+      if (!groupSlug || !item.id) {
+        return;
+      }
+      router.push(`/g/${groupSlug}?${itemType}=${item.id}`);
+    }
+
     onMounted(() => {
       refreshMembers();
     });
@@ -186,6 +194,7 @@ export default defineComponent({
       formatDate,
       members,
       getMember,
+      filterItems,
     };
   },
 
diff --git a/frontend/components/Domain/Recipe/RecipeExplorerPage.vue b/frontend/components/Domain/Recipe/RecipeExplorerPage.vue
index a9c212dff..8498e37bc 100644
--- a/frontend/components/Domain/Recipe/RecipeExplorerPage.vue
+++ b/frontend/components/Domain/Recipe/RecipeExplorerPage.vue
@@ -138,6 +138,7 @@
         :title="$tc('general.recipes')"
         :recipes="recipes"
         :query="passedQueryWithSeed"
+        @item-selected="filterItems"
         @replaceRecipes="replaceRecipes"
         @appendRecipes="appendRecipes"
       />
@@ -387,6 +388,19 @@ export default defineComponent({
       }
     )
 
+    function filterItems(item: RecipeCategory | RecipeTag | RecipeTool, urlPrefix: string) {
+      if (urlPrefix === "categories") {
+        const result = categories.store.value.filter((category) => (category.id as string).includes(item.id as string));
+        selectedCategories.value = result as NoUndefinedField<RecipeTag>[];
+      } else if (urlPrefix === "tags") {
+        const result = tags.store.value.filter((tag) => (tag.id as string).includes(item.id as string));
+        selectedTags.value = result as NoUndefinedField<RecipeTag>[];
+      } else if (urlPrefix === "tools") {
+        const result = tools.store.value.filter((tool) => (tool.id ).includes(item.id || "" ));
+        selectedTags.value = result as NoUndefinedField<RecipeTag>[];
+      }
+    }
+
     async function hydrateSearch() {
       const query = router.currentRoute.query;
       if (query.auto?.length) {
@@ -592,6 +606,8 @@ export default defineComponent({
       removeRecipe,
       replaceRecipes,
       passedQueryWithSeed,
+
+      filterItems,
     };
   },
   head: {},
diff --git a/frontend/components/Domain/Recipe/RecipePage/RecipePage.vue b/frontend/components/Domain/Recipe/RecipePage/RecipePage.vue
index fc4d41c9a..781ffda7b 100644
--- a/frontend/components/Domain/Recipe/RecipePage/RecipePage.vue
+++ b/frontend/components/Domain/Recipe/RecipePage/RecipePage.vue
@@ -35,7 +35,7 @@
             -->
             <v-col v-if="!isCookMode || isEditForm" cols="12" sm="12" md="4" lg="4">
               <RecipePageIngredientToolsView v-if="!isEditForm" :recipe="recipe" :scale="scale" />
-              <RecipePageOrganizers v-if="$vuetify.breakpoint.mdAndUp" :recipe="recipe" />
+              <RecipePageOrganizers v-if="$vuetify.breakpoint.mdAndUp" :recipe="recipe" @item-selected="chipClicked" />
             </v-col>
             <v-divider v-if="$vuetify.breakpoint.mdAndUp && !isCookMode" class="my-divider" :vertical="true" />
 
@@ -166,7 +166,7 @@ import {
   usePageUser,
 } from "~/composables/recipe-page/shared-state";
 import { NoUndefinedField } from "~/lib/api/types/non-generated";
-import { Recipe } from "~/lib/api/types/recipe";
+import { Recipe, RecipeCategory, RecipeTag, RecipeTool } from "~/lib/api/types/recipe";
 import { useRouteQuery } from "~/composables/use-router";
 import { useUserApi } from "~/composables/api";
 import { uuid4, deepCopy } from "~/composables/use-utils";
@@ -329,6 +329,17 @@ export default defineComponent({
      */
     const { user } = usePageUser();
 
+    /** =============================================================
+     * RecipeChip Clicked
+     */
+
+    function chipClicked(item: RecipeTag | RecipeCategory | RecipeTool, itemType: string) {
+      if (!item.id) {
+        return;
+      }
+      router.push(`/g/${groupSlug.value}?${itemType}=${item.id}`);
+    }
+
     return {
       user,
       isOwnGroup,
@@ -350,7 +361,8 @@ export default defineComponent({
       deleteRecipe,
       addStep,
       hasLinkedIngredients,
-      notLinkedIngredients
+      notLinkedIngredients,
+      chipClicked,
     };
   },
   head: {},
diff --git a/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageOrganizers.vue b/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageOrganizers.vue
index 9fa71efb4..53d262ea6 100644
--- a/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageOrganizers.vue
+++ b/frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageOrganizers.vue
@@ -14,7 +14,7 @@
           :show-add="true"
           selector-type="categories"
         />
-        <RecipeChips v-else :items="recipe.recipeCategory" />
+        <RecipeChips v-else :items="recipe.recipeCategory" v-on="$listeners" />
       </v-card-text>
     </v-card>
 
@@ -32,7 +32,7 @@
           :show-add="true"
           selector-type="tags"
         />
-        <RecipeChips v-else :items="recipe.tags" url-prefix="tags" />
+        <RecipeChips v-else :items="recipe.tags" url-prefix="tags" v-on="$listeners" />
       </v-card-text>
     </v-card>
 
@@ -41,7 +41,7 @@
       <v-card-title class="py-2"> {{ $t('tool.required-tools') }} </v-card-title>
       <v-divider class="mx-2" />
       <v-card-text class="pt-0">
-        <RecipeOrganizerSelector v-model="recipe.tools" selector-type="tools" />
+        <RecipeOrganizerSelector v-model="recipe.tools" selector-type="tools" v-on="$listeners" />
       </v-card-text>
     </v-card>
 
@@ -82,6 +82,8 @@ export default defineComponent({
     const { user } = usePageUser();
     const { isEditForm } = usePageState(props.recipe.slug);
 
+
+
     return {
       isEditForm,
       user,