From 7a08224b0c146f4d660441810508c422d8ee90b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frane=20Poli=C4=87?=
 <16856471+fPolic@users.noreply.github.com>
Date: Tue, 1 Oct 2024 09:09:51 +0200
Subject: [PATCH] fix(dashboard): categories add products (#9380)

**What**
- fix listing/adding products in the add category products flow

---

FIXES CC-523
---
 .../admin/dashboard/src/hooks/api/categories.tsx     |  2 +-
 .../category-products/category-products.tsx          | 12 +++++-------
 .../edit-category-products-form.tsx                  |  7 +++----
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/packages/admin/dashboard/src/hooks/api/categories.tsx b/packages/admin/dashboard/src/hooks/api/categories.tsx
index 6fb726909c..9c0991aaa4 100644
--- a/packages/admin/dashboard/src/hooks/api/categories.tsx
+++ b/packages/admin/dashboard/src/hooks/api/categories.tsx
@@ -134,7 +134,7 @@ export const useUpdateProductCategoryProducts = (
     onSuccess: (data, variables, context) => {
       queryClient.invalidateQueries({ queryKey: categoriesQueryKeys.lists() })
       queryClient.invalidateQueries({
-        queryKey: categoriesQueryKeys.detail(id),
+        queryKey: categoriesQueryKeys.details(),
       })
       /**
        * Invalidate products list query to ensure that the products collections are updated.
diff --git a/packages/admin/dashboard/src/routes/categories/category-products/category-products.tsx b/packages/admin/dashboard/src/routes/categories/category-products/category-products.tsx
index eb0d0bc056..08aab943cc 100644
--- a/packages/admin/dashboard/src/routes/categories/category-products/category-products.tsx
+++ b/packages/admin/dashboard/src/routes/categories/category-products/category-products.tsx
@@ -6,14 +6,12 @@ import { EditCategoryProductsForm } from "./components/edit-category-products-fo
 export const CategoryProducts = () => {
   const { id } = useParams()
 
-  const { product_category, isPending, isError, error } = useProductCategory(
-    id!,
-    {
-      fields: "*products",
-    }
-  )
+  const { product_category, isPending, isFetching, isError, error } =
+    useProductCategory(id!, {
+      fields: "products.id",
+    })
 
-  const ready = !isPending && !!product_category
+  const ready = !isPending && !isFetching && !!product_category
 
   if (isError) {
     throw error
diff --git a/packages/admin/dashboard/src/routes/categories/category-products/components/edit-category-products-form/edit-category-products-form.tsx b/packages/admin/dashboard/src/routes/categories/category-products/components/edit-category-products-form/edit-category-products-form.tsx
index 7b09dea82a..3387b255dd 100644
--- a/packages/admin/dashboard/src/routes/categories/category-products/components/edit-category-products-form/edit-category-products-form.tsx
+++ b/packages/admin/dashboard/src/routes/categories/category-products/components/edit-category-products-form/edit-category-products-form.tsx
@@ -25,7 +25,7 @@ import { useDataTable } from "../../../../../hooks/use-data-table"
 
 type EditCategoryProductsFormProps = {
   categoryId: string
-  products?: HttpTypes.AdminProduct[]
+  products?: Pick<HttpTypes.AdminProduct, "id">[]
 }
 
 const EditCategoryProductsSchema = z.object({
@@ -83,7 +83,6 @@ export const EditCategoryProductsForm = ({
     error,
   } = useProducts({
     ...searchParams,
-    category_id: [categoryId],
   })
 
   const columns = useColumns()
@@ -117,8 +116,8 @@ export const EditCategoryProductsForm = ({
       {
         onSuccess: () => {
           toast.success(
-            t("categories.products.add.disabledTooltip", {
-              count: data.product_ids.length,
+            t("categories.products.add.successToast", {
+              count: data.product_ids.length - products.length,
             })
           )