Jelajahi Sumber

Remove mistaken category from product, use mutateAsync for orders, fix packages

Rares Capilnar 2 tahun lalu
induk
melakukan
d38be21659

+ 2 - 4
package.json

@@ -25,15 +25,13 @@
     "build": "cross-env npm run clean && npm run build:server && npm run build:admin"
   },
   "dependencies": {
-    "@babel/preset-typescript": "7.21.4",
     "@medusajs/admin": "6.0.1-snapshot-20230613191901",
     "@medusajs/cache-inmemory": "^1.8.7",
     "@medusajs/cache-redis": "^1.8.7",
     "@medusajs/event-bus-local": "^1.9.4",
     "@medusajs/event-bus-redis": "^1.8.7",
     "@medusajs/file-local": "^1.0.1",
-    "@medusajs/medusa": "1.12.1-snapshot-20230609171755",
-    "@medusajs/medusa-cli": "1.3.16-snapshot-20230607120036",
+    "@medusajs/medusa": "1.12.1-snapshot-20230613191901",
     "@tanstack/react-query": "4.22.0",
     "babel-preset-medusa-package": "^1.1.13",
     "body-parser": "^1.19.0",
@@ -50,7 +48,7 @@
     "@babel/cli": "^7.14.3",
     "@babel/core": "^7.14.3",
     "@babel/preset-typescript": "^7.21.4",
-    "@medusajs/medusa-cli": "^1.3.14",
+    "@medusajs/medusa-cli": "1.3.16-snapshot-20230607120036",
     "@types/express": "^4.17.13",
     "@types/jest": "^27.4.0",
     "@types/node": "^17.0.8",

+ 13 - 17
src/admin/components/onboarding-flow/orders/orders-list.tsx

@@ -9,19 +9,17 @@ import { StepContentProps } from "../../../widgets/onboarding-flow/onboarding-fl
 
 const OrdersList = ({ onNext, isComplete, data }: StepContentProps) => {
   const { product } = useAdminProduct(data.product_id);
-  const { mutate: createDraftOrder, isLoading } = useAdminCreateDraftOrder();
+  const { mutateAsync: createDraftOrder, isLoading } =
+    useAdminCreateDraftOrder();
   const { client } = useMedusa();
 
   const { regions } = useAdminRegions();
   const { shipping_options } = useAdminShippingOptions();
 
-  const createOrder = () => {
-    // TODO: Maybe use a specific product instead of taking first one?
-    // Issues could arise if first one doesn't have variant etc
+  const createOrder = async () => {
     const variant = product.variants[0] ?? null;
-
-    createDraftOrder(
-      {
+    try {
+      const { draft_order } = await createDraftOrder({
         email: "customer@medusajs.com",
         items: [
           variant
@@ -41,16 +39,14 @@ const OrdersList = ({ onNext, isComplete, data }: StepContentProps) => {
           },
         ],
         region_id: regions[0].id,
-      },
-      {
-        onSuccess: async ({ draft_order }) => {
-          const { order } = await client.admin.draftOrders.markPaid(
-            draft_order.id
-          );
-          onNext(order);
-        },
-      }
-    );
+      });
+
+      const { order } = await client.admin.draftOrders.markPaid(draft_order.id);
+
+      onNext(order);
+    } catch (e) {
+      console.error(e);
+    }
   };
   return (
     <>

+ 0 - 5
src/admin/components/onboarding-flow/products/products-list.tsx

@@ -26,11 +26,6 @@ const ProductsList = ({ onNext, isComplete }: StepContentProps) => {
           "https://medusa-public-images.s3.eu-west-1.amazonaws.com/tee-black-front.png",
           "https://medusa-public-images.s3.eu-west-1.amazonaws.com/tee-black-back.png",
         ],
-        categories: [
-          {
-            id: "pcat_shirts",
-          },
-        ],
         variants: [
           {
             title: "Small",

+ 46 - 42
yarn.lock

@@ -243,7 +243,7 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz#9544ef6a33999343c8740fa51350f30eeaaaf193"
   integrity sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==
 
-"@babel/helper-validator-option@^7.21.0", "@babel/helper-validator-option@^7.22.5":
+"@babel/helper-validator-option@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz#de52000a15a177413c8234fa3a8af4ee8102d0ac"
   integrity sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==
@@ -415,7 +415,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-jsx@^7.21.4", "@babel/plugin-syntax-jsx@^7.22.5":
+"@babel/plugin-syntax-jsx@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.22.5.tgz#a6b68e84fb76e759fc3b93e901876ffabbe1d918"
   integrity sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==
@@ -680,7 +680,7 @@
     "@babel/helper-module-transforms" "^7.22.5"
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-modules-commonjs@^7.21.2", "@babel/plugin-transform-modules-commonjs@^7.22.5":
+"@babel/plugin-transform-modules-commonjs@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.5.tgz#7d9875908d19b8c0536085af7b053fd5bd651bfa"
   integrity sha512-B4pzOXj+ONRmuaQTg05b3y/4DuFz3WcCNAXPLb2Q0GT0TrGKGxNKV4jwsXts+StaM0LQczZbOpj8o1DLPDJIiA==
@@ -909,7 +909,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-typescript@^7.21.3", "@babel/plugin-transform-typescript@^7.22.5":
+"@babel/plugin-transform-typescript@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.22.5.tgz#5c0f7adfc1b5f38c4dbc8f79b1f0f8074134bd7d"
   integrity sha512-SMubA9S7Cb5sGSFFUlqxyClTA9zWJ8qGQrppNUm05LtFuN1ELRFNndkix4zUJrC9F+YivWwa1dHMSyo0e0N9dA==
@@ -1059,18 +1059,7 @@
     "@babel/plugin-transform-react-jsx-development" "^7.22.5"
     "@babel/plugin-transform-react-pure-annotations" "^7.22.5"
 
-"@babel/preset-typescript@7.21.4":
-  version "7.21.4"
-  resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.21.4.tgz#b913ac8e6aa8932e47c21b01b4368d8aa239a529"
-  integrity sha512-sMLNWY37TCdRH/bJ6ZeeOH1nPuanED7Ai9Y/vH31IPqalioJ6ZNFUWONsakhv4r4n+I6gm5lmoE0olkgib/j/A==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-validator-option" "^7.21.0"
-    "@babel/plugin-syntax-jsx" "^7.21.4"
-    "@babel/plugin-transform-modules-commonjs" "^7.21.2"
-    "@babel/plugin-transform-typescript" "^7.21.3"
-
-"@babel/preset-typescript@^7.16.0", "@babel/preset-typescript@^7.21.0":
+"@babel/preset-typescript@^7.16.0", "@babel/preset-typescript@^7.21.0", "@babel/preset-typescript@^7.21.4":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.22.5.tgz#16367d8b01d640e9a507577ed4ee54e0101e51c8"
   integrity sha512-YbPaal9LxztSGhmndR46FmAbkJ/1fAsw293tSU+I5E5h+cnJ3d4GTwyUgGYmOXJYdGA+uNePle4qbaRzj2NISQ==
@@ -2043,20 +2032,20 @@
     winston "^3.8.2"
     yargs "^15.3.1"
 
-"@medusajs/medusa-cli@1.3.16-snapshot-20230609171755":
-  version "1.3.16-snapshot-20230609171755"
-  resolved "https://registry.yarnpkg.com/@medusajs/medusa-cli/-/medusa-cli-1.3.16-snapshot-20230609171755.tgz#8417d160ea8fe72f8729879972580bf0a3fe0606"
-  integrity sha512-CjjPFIyj6Ha4HbVxWXJJjfYm3otG4biFfUkgJHJZgmMqhXHh/WstxdWkRl+kZ1hHHnsPo+00hTVGb5gcQxwNsA==
+"@medusajs/medusa-cli@1.3.16-snapshot-20230613191901":
+  version "1.3.16-snapshot-20230613191901"
+  resolved "https://registry.yarnpkg.com/@medusajs/medusa-cli/-/medusa-cli-1.3.16-snapshot-20230613191901.tgz#affacca9ead5ebbf326403a00fad553a2f60af81"
+  integrity sha512-W5Tld41gobj7MHUhPIlbkKvR8AmR04Muk5hzaz3m3sdPxNljlmWJMgt0pp69FAE6yT+KMTcFxnxrU9QRa4ZCXg==
   dependencies:
-    "@medusajs/utils" "1.9.0"
+    "@medusajs/utils" "1.9.1-snapshot-20230613191901"
     axios "^0.21.4"
     chalk "^4.0.0"
     configstore "5.0.1"
     core-js "^3.6.5"
-    dotenv "^8.2.0"
+    dotenv "16.0.3"
     execa "^5.1.1"
     fs-exists-cached "^1.0.0"
-    fs-extra "^10.0.0"
+    fs-extra "11.1.1"
     hosted-git-info "^4.0.2"
     inquirer "^8.0.0"
     is-valid-path "^0.1.1"
@@ -2086,14 +2075,14 @@
     retry-axios "^2.6.0"
     uuid "^9.0.0"
 
-"@medusajs/medusa@1.12.1-snapshot-20230609171755":
-  version "1.12.1-snapshot-20230609171755"
-  resolved "https://registry.yarnpkg.com/@medusajs/medusa/-/medusa-1.12.1-snapshot-20230609171755.tgz#5b0c2aa5c5be44474f3be45f17cc7f1e72207e06"
-  integrity sha512-xi1kWhqUo21WG66jG/dbJRvdHnNJY/WhUSTyRCOUVoZh06ANCD76NhR7k2JxiSynQne5h88XLnp/aJkfugZXeg==
+"@medusajs/medusa@1.12.1-snapshot-20230613191901":
+  version "1.12.1-snapshot-20230613191901"
+  resolved "https://registry.yarnpkg.com/@medusajs/medusa/-/medusa-1.12.1-snapshot-20230613191901.tgz#c19bcbf51d90eee370509c2726d940e2bf565679"
+  integrity sha512-fWEvlUfU45nlMkonXd44FKx7SojZqm1YLh8zqx2VgSKkj+M9Ik1HnpNxSVify8FDRkXN30mr4N6hYudTLvvzyA==
   dependencies:
-    "@medusajs/medusa-cli" "1.3.16-snapshot-20230609171755"
-    "@medusajs/modules-sdk" "1.8.8-snapshot-20230609171755"
-    "@medusajs/utils" "1.9.0"
+    "@medusajs/medusa-cli" "1.3.16-snapshot-20230613191901"
+    "@medusajs/modules-sdk" "1.8.8-snapshot-20230613191901"
+    "@medusajs/utils" "1.9.1-snapshot-20230613191901"
     "@types/ioredis" "^4.28.10"
     "@types/lodash" "^4.14.191"
     awilix "^8.0.0"
@@ -2152,16 +2141,14 @@
     medusa-telemetry "^0.0.16"
     resolve-cwd "^3.0.0"
 
-"@medusajs/modules-sdk@1.8.8-snapshot-20230609171755":
-  version "1.8.8-snapshot-20230609171755"
-  resolved "https://registry.yarnpkg.com/@medusajs/modules-sdk/-/modules-sdk-1.8.8-snapshot-20230609171755.tgz#3724be47c603242ca852b3e372a2c7823ec1cbf3"
-  integrity sha512-OQ6WiTDXoxjSmruanqrIlEeqCCTCiYNOIsvRHWYSqkjzk4RaIwSQRgAzOM3pGTyRFeApfGBP/lFPnQ0DN0ozJQ==
+"@medusajs/modules-sdk@1.8.8-snapshot-20230613191901":
+  version "1.8.8-snapshot-20230613191901"
+  resolved "https://registry.yarnpkg.com/@medusajs/modules-sdk/-/modules-sdk-1.8.8-snapshot-20230613191901.tgz#03c5b30d9db03c2bd2acbaf19214464857253dc3"
+  integrity sha512-8A4bTeciWpbSy9qcwGp4mkcGUGkBCR8/UjpV794irwZlxXnK2Y6bH0C1/6dCGl4hzz4hC2LGsKJgUxy5HYVTmQ==
   dependencies:
-    "@medusajs/types" "1.8.8-snapshot-20230609171755"
-    "@medusajs/utils" "1.9.0"
+    "@medusajs/types" "1.8.8-snapshot-20230613191901"
+    "@medusajs/utils" "1.9.1-snapshot-20230613191901"
     awilix "^8.0.0"
-    glob "7.1.6"
-    medusa-telemetry "^0.0.16"
     resolve-cwd "^3.0.0"
 
 "@medusajs/types@1.8.7":
@@ -2169,10 +2156,10 @@
   resolved "https://registry.yarnpkg.com/@medusajs/types/-/types-1.8.7.tgz#139a1de015507ea0c4ebe9d106186873237e1c14"
   integrity sha512-4JsiEJH87slp2iAL8Xk1pPVZDXyBsWyN4NZqtQl0MPOZcmM07AvY5whuBNsC2AHRG689gztH7PTFq5zXngMC0Q==
 
-"@medusajs/types@1.8.8-snapshot-20230609171755":
-  version "1.8.8-snapshot-20230609171755"
-  resolved "https://registry.yarnpkg.com/@medusajs/types/-/types-1.8.8-snapshot-20230609171755.tgz#aa1b9f80aa630365b4aef122d84e371fa82e8c38"
-  integrity sha512-mV9tZ3g0jLFDagX5Pok77AX57P4e2C/GoJbmHLZGiDNT+zLbdDV/zSmstHqgcYsdnw/y38WbsqxzP/4nSq+prw==
+"@medusajs/types@1.8.8-snapshot-20230613191901":
+  version "1.8.8-snapshot-20230613191901"
+  resolved "https://registry.yarnpkg.com/@medusajs/types/-/types-1.8.8-snapshot-20230613191901.tgz#ab6c8654632a8383e842222635e2eb2940d74bb2"
+  integrity sha512-BcAWQt8F8HDw7LBcSU3jzoz7HSMh7X0SPB/idvL2TfJk9H2n1baRsiTllKnX1sLBkvdzG2UZ2LQgLSc7ihopWw==
 
 "@medusajs/utils@1.9.0":
   version "1.9.0"
@@ -2182,6 +2169,14 @@
     awilix "^8.0.0"
     ulid "^2.3.0"
 
+"@medusajs/utils@1.9.1-snapshot-20230613191901":
+  version "1.9.1-snapshot-20230613191901"
+  resolved "https://registry.yarnpkg.com/@medusajs/utils/-/utils-1.9.1-snapshot-20230613191901.tgz#2031a90ee7ce7290d75914ff9fb49976189134f9"
+  integrity sha512-Rba7VZXPFrtrUrK1eMibfHoM75VSMzduc1eXwY85K28Dj4fbfbZu+bjFIrhK4vvf7kbHUopqinRS0EX/krVCAw==
+  dependencies:
+    awilix "^8.0.0"
+    ulid "^2.3.0"
+
 "@msgpackr-extract/msgpackr-extract-darwin-arm64@3.0.2":
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-3.0.2.tgz#44d752c1a2dc113f15f781b7cc4f53a307e3fa38"
@@ -6766,6 +6761,15 @@ fs-extra@11.1.0:
     jsonfile "^6.0.1"
     universalify "^2.0.0"
 
+fs-extra@11.1.1:
+  version "11.1.1"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.1.1.tgz#da69f7c39f3b002378b0954bb6ae7efdc0876e2d"
+  integrity sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==
+  dependencies:
+    graceful-fs "^4.2.0"
+    jsonfile "^6.0.1"
+    universalify "^2.0.0"
+
 fs-extra@^10.0.0:
   version "10.1.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf"