Merge branch 'develop' into chore/fix-release-scripts

medusajs · Aug 11, 2023 · 0dfa5f6 · 0dfa5f6
2 parents 0011ffb + 9469063
commit 0dfa5f6
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 14 deletions.
diff --git a/.changeset/calm-lobsters-do.md b/.changeset/calm-lobsters-do.md
@@ -0,0 +1,6 @@
+---
+"@medusajs/medusa-js": patch
+"medusa-react": patch
+---
+
+fix(medusa-js): return type of collection hook + export
diff --git a/docs/content/modules/carts-and-checkout/storefront/implement-checkout-flow.mdx b/docs/content/modules/carts-and-checkout/storefront/implement-checkout-flow.mdx
@@ -560,8 +560,8 @@ const Cart = () => {
   const { completeCheckout } = useCart()
   // ...
 
-  const handleStartCheckout = () => {
-    startCheckout.mutate()
+  const handleCompleteCheckout = () => {
+    completeCheckout.mutate()
   }
 
   // ...

diff --git a/packages/medusa-js/src/resources/admin/collections.ts b/packages/medusa-js/src/resources/admin/collections.ts
@@ -1,12 +1,13 @@
 import {
-  AdminPostCollectionsReq,
-  AdminCollectionsRes,
-  AdminPostCollectionsCollectionReq,
   AdminCollectionsDeleteRes,
   AdminCollectionsListRes,
+  AdminCollectionsRes,
+  AdminDeleteProductsFromCollectionReq,
+  AdminDeleteProductsFromCollectionRes,
   AdminGetCollectionsParams,
+  AdminPostCollectionsCollectionReq,
+  AdminPostCollectionsReq,
   AdminPostProductsToCollectionReq,
-  AdminDeleteProductsFromCollectionReq,
 } from "@medusajs/medusa"
 import qs from "qs"
 import { ResponsePromise } from "../../typings"
@@ -116,7 +117,7 @@ class AdminCollectionsResource extends BaseResource {
     id: string,
     payload: AdminDeleteProductsFromCollectionReq,
     customHeaders: Record<string, any> = {}
-  ): ResponsePromise<AdminCollectionsDeleteRes> {
+  ): ResponsePromise<AdminDeleteProductsFromCollectionRes> {
     const path = `/admin/collections/${id}/products/batch`
     return this.client.request("DELETE", path, payload, {}, customHeaders)
   }

diff --git a/packages/medusa-js/src/resources/index.ts b/packages/medusa-js/src/resources/index.ts
@@ -13,6 +13,7 @@ import PaymentMethodsResource from "./payment-methods"
 import ProductCategoriesResource from "./product-categories"
 import ProductTagsResource from "./product-tags"
 import ProductTypesResource from "./product-types"
+import ProductVariantsResource from "./product-variants"
 import ProductsResource from "./products"
 import RegionsResource from "./regions"
 import ReturnReasonsResource from "./return-reasons"
@@ -36,11 +37,11 @@ export {
   PaymentMethodsResource,
   ProductCategoriesResource,
   ProductTagsResource,
-  ProductTypesResource,
-  ProductsResource,
+  ProductTypesResource, ProductVariantsResource, ProductsResource,
   RegionsResource,
   ReturnReasonsResource,
   ReturnsResource,
   ShippingOptionsResource,
-  SwapsResource,
+  SwapsResource
 }
+
diff --git a/packages/medusa-payment-stripe/package.json b/packages/medusa-payment-stripe/package.json
@@ -1,7 +1,7 @@
 {
   "name": "medusa-payment-stripe",
   "version": "6.0.2",
-  "description": "Stripe Payment provider for Meduas Commerce",
+  "description": "Stripe Payment provider for Medusa Commerce",
   "main": "dist/index.js",
   "repository": {
     "type": "git",

diff --git a/packages/medusa-react/src/hooks/admin/collections/mutations.ts b/packages/medusa-react/src/hooks/admin/collections/mutations.ts
@@ -2,14 +2,15 @@ import {
   AdminCollectionsDeleteRes,
   AdminCollectionsRes,
   AdminDeleteProductsFromCollectionReq,
+  AdminDeleteProductsFromCollectionRes,
   AdminPostCollectionsCollectionReq,
   AdminPostCollectionsReq,
   AdminPostProductsToCollectionReq,
 } from "@medusajs/medusa"
 import { Response } from "@medusajs/medusa-js"
 import {
-  useMutation,
   UseMutationOptions,
+  useMutation,
   useQueryClient,
 } from "@tanstack/react-query"
 import { useMedusa } from "../../../contexts/medusa"
@@ -106,7 +107,7 @@ export const useAdminAddProductsToCollection = (
 export const useAdminRemoveProductsFromCollection = (
   id: string,
   options?: UseMutationOptions<
-    Response<AdminCollectionsDeleteRes>,
+    Response<AdminDeleteProductsFromCollectionRes>,
     Error,
     AdminDeleteProductsFromCollectionReq
   >

diff --git a/packages/medusa-react/src/hooks/store/customers/mutations.ts b/packages/medusa-react/src/hooks/store/customers/mutations.ts
@@ -3,7 +3,7 @@ import {
   StorePostCustomersCustomerReq,
   StorePostCustomersReq,
 } from "@medusajs/medusa"
-import { useMutation, UseMutationOptions } from "@tanstack/react-query"
+import { UseMutationOptions, useMutation } from "@tanstack/react-query"
 import { useMedusa } from "../../../contexts/medusa"
 
 export const useCreateCustomer = (