Merge branch 'develop' into fix/2152

packages/admin-next/dashboard/src/hooks/api/products.tsx

@@ -110,7 +110,7 @@ export const useProductVariants = (
 ) => {
   const { data, ...rest } = useQuery({
     queryFn: () => client.products.listVariants(productId, query),
-    queryKey: variantsQueryKeys.list(query),
+    queryKey: variantsQueryKeys.list({ productId, ...query }),
     ...options,
   })
 

packages/admin-next/dashboard/src/v2-routes/products/product-create-option/components/create-product-option-form/create-product-option-form.tsx

@@ -40,10 +40,10 @@ export const CreateProductOptionForm = ({
 
   const handleSubmit = form.handleSubmit(async (values) => {
     mutateAsync(values, {
-      onSuccess: ({ option }) => {
+      onSuccess: () => {
         toast.success(t("general.success"), {
           description: t("products.options.create.successToast", {
-            title: option.title,
+            title: values.title,
           }),
           dismissLabel: t("general.close"),
         })

packages/admin-next/dashboard/src/v2-routes/products/product-detail/components/product-variant-section/product-variant-section.tsx

@@ -1,7 +1,8 @@
 import { PencilSquare, Plus } from "@medusajs/icons"
-import { Product } from "@medusajs/medusa"
 import { Container, Heading } from "@medusajs/ui"
 import { useTranslation } from "react-i18next"
+import { ProductDTO } from "@medusajs/types"
+import { keepPreviousData } from "@tanstack/react-query"
 
 import { ActionMenu } from "../../../../../components/common/action-menu"
 import { DataTable } from "../../../../../components/table/data-table"
@@ -12,7 +13,7 @@ import { useProductVariantTableQuery } from "./use-variant-table-query"
 import { useProductVariants } from "../../../../../hooks/api/products"
 
 type ProductVariantSectionProps = {
-  product: Product
+  product: ProductDTO
 }
 
 const PAGE_SIZE = 10
@@ -31,7 +32,7 @@ export const ProductVariantSection = ({
       ...searchParams,
     },
     {
-      keepPreviousData: true,
+      placeholderData: keepPreviousData,
     }
   )