Clean up product typings (#7663)

There are a lot of issues in the admin after applying the correct typings, but fixing those should be done gradually, it's better to keep it out of this PR

packages/admin-next/dashboard/src/hooks/api/product-types.tsx

@@ -1,7 +1,7 @@
 import { QueryKey, UseQueryOptions, useQuery } from "@tanstack/react-query"
 import { client } from "../../lib/client"
 import { queryKeysFactory } from "../../lib/query-key-factory"
-import { ProductTypeListRes, ProductTypeRes } from "../../types/api-responses"
+import { HttpTypes } from "@medusajs/types"
 
 const PRODUCT_TYPES_QUERY_KEY = "product_types" as const
 const productTypesQueryKeys = queryKeysFactory(PRODUCT_TYPES_QUERY_KEY)
@@ -10,7 +10,12 @@ export const useProductType = (
   id: string,
   query?: Record<string, any>,
   options?: Omit<
-    UseQueryOptions<ProductTypeRes, Error, ProductTypeRes, QueryKey>,
+    UseQueryOptions<
+      { product_type: HttpTypes.AdminProductType },
+      Error,
+      { product_type: HttpTypes.AdminProductType },
+      QueryKey
+    >,
     "queryKey" | "queryFn"
   >
 ) => {
@@ -26,7 +31,12 @@ export const useProductType = (
 export const useProductTypes = (
   query?: Record<string, any>,
   options?: Omit<
-    UseQueryOptions<ProductTypeListRes, Error, ProductTypeListRes, QueryKey>,
+    UseQueryOptions<
+      { product_types: HttpTypes.AdminProductType[] },
+      Error,
+      { product_types: HttpTypes.AdminProductType[] },
+      QueryKey
+    >,
     "queryKey" | "queryFn"
   >
 ) => {

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

@@ -5,14 +5,9 @@ import {
   useQuery,
   UseQueryOptions,
 } from "@tanstack/react-query"
-import { client, sdk } from "../../lib/client"
+import { sdk } from "../../lib/client"
 import { queryClient } from "../../lib/query-client"
 import { queryKeysFactory } from "../../lib/query-key-factory"
-import {
-  ProductDeleteRes,
-  ProductListRes,
-  ProductRes,
-} from "../../types/api-responses"
 import { HttpTypes } from "@medusajs/types"
 
 const PRODUCTS_QUERY_KEY = "products" as const
@@ -29,8 +24,8 @@ export const useCreateProductOption = (
   options?: UseMutationOptions<any, Error, any>
 ) => {
   return useMutation({
-    mutationFn: (payload: any) =>
-      client.products.createOption(productId, payload),
+    mutationFn: (payload: HttpTypes.AdminCreateProductOption) =>
+      sdk.admin.product.createOption(productId, payload),
     onSuccess: (data: any, variables: any, context: any) => {
       queryClient.invalidateQueries({ queryKey: optionsQueryKeys.lists() })
       queryClient.invalidateQueries({
@@ -48,8 +43,8 @@ export const useUpdateProductOption = (
   options?: UseMutationOptions<any, Error, any>
 ) => {
   return useMutation({
-    mutationFn: (payload: any) =>
-      client.products.updateOption(productId, optionId, payload),
+    mutationFn: (payload: HttpTypes.AdminUpdateProductOption) =>
+      sdk.admin.product.updateOption(productId, optionId, payload),
     onSuccess: (data: any, variables: any, context: any) => {
       queryClient.invalidateQueries({ queryKey: optionsQueryKeys.lists() })
       queryClient.invalidateQueries({
@@ -71,7 +66,7 @@ export const useDeleteProductOption = (
   options?: UseMutationOptions<any, Error, void>
 ) => {
   return useMutation({
-    mutationFn: () => client.products.deleteOption(productId, optionId),
+    mutationFn: () => sdk.admin.product.deleteOption(productId, optionId),
     onSuccess: (data: any, variables: any, context: any) => {
       queryClient.invalidateQueries({ queryKey: optionsQueryKeys.lists() })
       queryClient.invalidateQueries({
@@ -97,7 +92,8 @@ export const useProductVariant = (
   >
 ) => {
   const { data, ...rest } = useQuery({
-    queryFn: () => client.products.retrieveVariant(productId, variantId, query),
+    queryFn: () =>
+      sdk.admin.product.retrieveVariant(productId, variantId, query),
     queryKey: variantsQueryKeys.detail(variantId),
     ...options,
   })
@@ -114,7 +110,7 @@ export const useProductVariants = (
   >
 ) => {
   const { data, ...rest } = useQuery({
-    queryFn: () => client.products.listVariants(productId, query),
+    queryFn: () => sdk.admin.product.listVariants(productId, query),
     queryKey: variantsQueryKeys.list({ productId, ...query }),
     ...options,
   })
@@ -127,8 +123,8 @@ export const useCreateProductVariant = (
   options?: UseMutationOptions<any, Error, any>
 ) => {
   return useMutation({
-    mutationFn: (payload: any) =>
-      client.products.createVariant(productId, payload),
+    mutationFn: (payload: HttpTypes.AdminCreateProductVariant) =>
+      sdk.admin.product.createVariant(productId, payload),
     onSuccess: (data: any, variables: any, context: any) => {
       queryClient.invalidateQueries({ queryKey: variantsQueryKeys.lists() })
       queryClient.invalidateQueries({
@@ -146,8 +142,8 @@ export const useUpdateProductVariant = (
   options?: UseMutationOptions<any, Error, any>
 ) => {
   return useMutation({
-    mutationFn: (payload: any) =>
-      client.products.updateVariant(productId, variantId, payload),
+    mutationFn: (payload: HttpTypes.AdminUpdateProductVariant) =>
+      sdk.admin.product.updateVariant(productId, variantId, payload),
     onSuccess: (data: any, variables: any, context: any) => {
       queryClient.invalidateQueries({ queryKey: variantsQueryKeys.lists() })
       queryClient.invalidateQueries({
@@ -168,8 +164,9 @@ export const useUpdateProductVariantsBatch = (
   options?: UseMutationOptions<any, Error, any>
 ) => {
   return useMutation({
-    mutationFn: (payload: any) =>
-      client.products.updateVariantsBatch(productId, payload),
+    mutationFn: (
+      payload: HttpTypes.AdminBatchProductVariantRequest["update"]
+    ) => sdk.admin.product.batchVariants(productId, { update: payload }),
     onSuccess: (data: any, variables: any, context: any) => {
       queryClient.invalidateQueries({ queryKey: variantsQueryKeys.lists() })
       queryClient.invalidateQueries({
@@ -188,7 +185,7 @@ export const useDeleteVariant = (
   options?: UseMutationOptions<any, Error, void>
 ) => {
   return useMutation({
-    mutationFn: () => client.products.deleteVariant(productId, variantId),
+    mutationFn: () => sdk.admin.product.deleteVariant(productId, variantId),
     onSuccess: (data: any, variables: any, context: any) => {
       queryClient.invalidateQueries({ queryKey: variantsQueryKeys.lists() })
       queryClient.invalidateQueries({
@@ -213,7 +210,7 @@ export const useProduct = (
   >
 ) => {
   const { data, ...rest } = useQuery({
-    queryFn: () => client.products.retrieve(id, query),
+    queryFn: () => sdk.admin.product.retrieve(id, query),
     queryKey: productsQueryKeys.detail(id),
     ...options,
   })
@@ -224,12 +221,17 @@ export const useProduct = (
 export const useProducts = (
   query?: Record<string, any>,
   options?: Omit<
-    UseQueryOptions<ProductListRes, Error, ProductListRes, QueryKey>,
+    UseQueryOptions<
+      HttpTypes.AdminProductListResponse,
+      Error,
+      HttpTypes.AdminProductListResponse,
+      QueryKey
+    >,
     "queryFn" | "queryKey"
   >
 ) => {
   const { data, ...rest } = useQuery({
-    queryFn: () => client.products.list(query),
+    queryFn: () => sdk.admin.product.list(query),
     queryKey: productsQueryKeys.list(query),
     ...options,
   })
@@ -245,7 +247,8 @@ export const useCreateProduct = (
   >
 ) => {
   return useMutation({
-    mutationFn: (payload: any) => sdk.admin.product.create(payload),
+    mutationFn: (payload: HttpTypes.AdminCreateProduct) =>
+      sdk.admin.product.create(payload),
     onSuccess: (data: any, variables: any, context: any) => {
       queryClient.invalidateQueries({ queryKey: productsQueryKeys.lists() })
       options?.onSuccess?.(data, variables, context)
@@ -256,10 +259,11 @@ export const useCreateProduct = (
 
 export const useUpdateProduct = (
   id: string,
-  options?: UseMutationOptions<ProductRes, Error, any>
+  options?: UseMutationOptions<HttpTypes.AdminProductResponse, Error, any>
 ) => {
   return useMutation({
-    mutationFn: (payload: any) => client.products.update(id, payload),
+    mutationFn: (payload: HttpTypes.AdminUpdateProduct) =>
+      sdk.admin.product.update(id, payload),
     onSuccess: (data: any, variables: any, context: any) => {
       queryClient.invalidateQueries({ queryKey: productsQueryKeys.lists() })
       queryClient.invalidateQueries({ queryKey: productsQueryKeys.detail(id) })
@@ -272,10 +276,14 @@ export const useUpdateProduct = (
 
 export const useDeleteProduct = (
   id: string,
-  options?: UseMutationOptions<ProductDeleteRes, Error, void>
+  options?: UseMutationOptions<
+    HttpTypes.AdminProductDeleteResponse,
+    Error,
+    void
+  >
 ) => {
   return useMutation({
-    mutationFn: () => client.products.delete(id),
+    mutationFn: () => sdk.admin.product.delete(id),
     onSuccess: (data: any, variables: any, context: any) => {
       queryClient.invalidateQueries({ queryKey: productsQueryKeys.lists() })
       queryClient.invalidateQueries({ queryKey: productsQueryKeys.detail(id) })

packages/admin-next/dashboard/src/hooks/table/columns/use-product-table-columns.tsx

@@ -21,9 +21,9 @@ import {
   VariantCell,
   VariantHeader,
 } from "../../../components/table/table-cells/product/variant-cell"
-import { ExtendedProductDTO } from "../../../types/api-responses"
+import { HttpTypes } from "@medusajs/types"
 
-const columnHelper = createColumnHelper<ExtendedProductDTO>()
+const columnHelper = createColumnHelper<HttpTypes.AdminProduct>()
 
 export const useProductTableColumns = () => {
   return useMemo(

packages/admin-next/dashboard/src/hooks/table/query/use-product-table-query.tsx

@@ -1,6 +1,4 @@
-import { AdminGetProductsParams } from "@medusajs/medusa"
-import { ProductStatus } from "@medusajs/types"
-
+import { HttpTypes } from "@medusajs/types"
 import { useQueryParams } from "../../use-query-params"
 
 type UseProductTableQueryProps = {
@@ -46,7 +44,7 @@ export const useProductTableQuery = ({
     q,
   } = queryObject
 
-  const searchParams: AdminGetProductsParams = {
+  const searchParams: HttpTypes.AdminProductParams = {
     limit: pageSize,
     offset: offset ? Number(offset) : 0,
     sales_channel_id: sales_channel_id?.split(","),
@@ -56,9 +54,9 @@ export const useProductTableQuery = ({
     collection_id: collection_id?.split(","),
     is_giftcard: is_giftcard ? is_giftcard === "true" : undefined,
     order: order,
-    tags: tags?.split(","),
+    tags: tags ? { value: tags.split(",") } : undefined,
     type_id: type_id?.split(","),
-    status: status?.split(",") as ProductStatus[],
+    status: status?.split(",") as HttpTypes.AdminProductStatus[],
     q,
   }