Merge branch 'develop' into feat/oas-cli-devx

.changeset/pre.json

@@ -0,0 +1,145 @@
+{
+ "mode": "pre",
+ "tag": "rc",
+ "initialVersions": {
+ "integration-tests-api": "1.0.0",
+ "integration-tests-plugins": "1.0.0",
+ "integration-tests-repositories": "1.0.0",
+ "@medusajs/admin": "0.0.1",
+ "@medusajs/admin-ui": "0.0.0",
+ "babel-preset-medusa-package": "1.1.19",
+ "@medusajs/cache-inmemory": "1.7.0",
+ "@medusajs/cache-redis": "1.7.0",
+ "create-medusa-app": "0.0.9",
+ "@medusajs/event-bus-local": "1.7.0",
+ "@medusajs/event-bus-redis": "1.7.0",
+ "gatsby-source-medusa": "0.1.3",
+ "@medusajs/client-types": "0.1.0",
+ "@medusajs/inventory": "1.7.0",
+ "@medusajs/medusa": "1.7.13",
+ "@medusajs/medusa-cli": "1.3.8",
+ "medusa-core-utils": "1.1.39",
+ "medusa-dev-cli": "0.0.30",
+ "medusa-file-minio": "1.1.5",
+ "medusa-file-s3": "1.1.11",
+ "medusa-file-spaces": "1.3.5",
+ "medusa-fulfillment-manual": "1.1.36",
+ "medusa-fulfillment-webshipper": "1.3.7",
+ "medusa-interfaces": "1.3.6",
+ "@medusajs/medusa-js": "1.3.10",
+ "medusa-payment-adyen": "1.1.43",
+ "medusa-payment-klarna": "1.3.8",
+ "medusa-payment-manual": "1.0.22",
+ "medusa-payment-paypal": "1.2.10",
+ "medusa-payment-stripe": "1.1.53",
+ "medusa-plugin-algolia": "0.2.9",
+ "medusa-plugin-brightpearl": "1.3.6",
+ "medusa-plugin-contentful": "1.2.7",
+ "medusa-plugin-discount-generator": "1.1.24",
+ "medusa-plugin-economic": "1.1.42",
+ "medusa-plugin-ip-lookup": "1.2.5",
+ "medusa-plugin-mailchimp": "1.1.46",
+ "medusa-plugin-meilisearch": "1.0.4",
+ "medusa-plugin-restock-notification": "2.0.4",
+ "medusa-plugin-segment": "1.3.4",
+ "medusa-plugin-sendgrid": "1.3.7",
+ "medusa-plugin-slack-notification": "1.3.8",
+ "medusa-plugin-twilio-sms": "1.2.7",
+ "medusa-plugin-wishlist": "1.1.41",
+ "medusa-react": "4.0.4",
+ "medusa-source-shopify": "1.2.7",
+ "medusa-telemetry": "0.0.16",
+ "medusa-test-utils": "1.1.39",
+ "@medusajs/modules-sdk": "0.0.1",
+ "@medusajs/medusa-oas-cli": "0.1.0",
+ "@medusajs/oas-github-ci": "1.0.0",
+ "@medusajs/openapi-typescript-codegen": "0.1.0",
+ "@medusajs/stock-location": "1.7.0",
+ "@medusajs/types": "0.0.1",
+ "@medusajs/utils": "0.0.1"
+ },
+ "changesets": [
+ "angry-boxes-press",
+ "angry-trains-march",
+ "beige-ties-hunt",
+ "brave-goats-pay",
+ "brave-guests-mate",
+ "brown-wombats-jam",
+ "clean-carrots-sell",
+ "clean-cobras-listen",
+ "cuddly-keys-hear",
+ "cuddly-seahorses-thank",
+ "dirty-lions-add",
+ "dry-cups-occur",
+ "dull-forks-juggle",
+ "early-ducks-press",
+ "eight-wasps-buy",
+ "eight-wasps-juggle",
+ "eleven-cycles-mate",
+ "fair-hats-hammer",
+ "fair-melons-run",
+ "fast-buckets-marry",
+ "funny-cars-crash",
+ "gold-fireants-look",
+ "grumpy-buses-pump",
+ "hip-otters-thank",
+ "kind-dogs-argue",
+ "kind-seas-roll",
+ "late-rocks-design",
+ "loud-pillows-report",
+ "lucky-bikes-end",
+ "lucky-boats-invent",
+ "many-papayas-judge",
+ "mean-ligers-fry",
+ "mighty-ads-fold",
+ "neat-days-brush",
+ "neat-lamps-repeat",
+ "new-cherries-knock",
+ "nice-dryers-search",
+ "odd-bikes-dance",
+ "old-planes-cross",
+ "olive-penguins-sin",
+ "olive-seas-repair",
+ "purple-sloths-confess",
+ "quiet-deers-shake",
+ "quiet-horses-listen",
+ "quiet-spiders-join",
+ "red-singers-swim",
+ "rich-flowers-decide",
+ "rude-guests-try",
+ "seven-keys-beg",
+ "shaggy-ghosts-crash",
+ "short-plants-work",
+ "shy-years-attack",
+ "sixty-jeans-fold",
+ "slimy-brooms-flash",
+ "smart-spies-bake",
+ "soft-pets-breathe",
+ "spotty-rules-hide",
+ "stale-adults-tease",
+ "stale-geckos-bow",
+ "stale-mangos-retire",
+ "strange-mails-pump",
+ "stupid-chefs-ring",
+ "swift-deers-peel",
+ "tame-forks-marry",
+ "tame-geese-applaud",
+ "ten-actors-complain",
+ "ten-steaks-tan",
+ "three-pans-knock",
+ "tricky-apes-behave",
+ "tricky-peas-clean",
+ "tricky-terms-wash",
+ "two-cherries-enjoy",
+ "two-cups-crash",
+ "violet-lobsters-retire",
+ "violet-pans-greet",
+ "weak-hats-develop",
+ "wicked-toes-fold",
+ "wild-goats-sing",
+ "wild-rabbits-travel",
+ "wise-tomatoes-fold",
+ "witty-ads-matter",
+ "witty-pigs-rescue"
+ ]
+}

.changeset/tricky-grapes-flow.md

@@ -0,0 +1,5 @@
+---
+"@medusajs/medusa": patch
+---
+
+feat(admin-ui): add errors and block receiving returns dependent on existing inventory item levels

.changeset/weak-parrots-search.md

@@ -0,0 +1,5 @@
+---
+"@medusajs/event-bus-local": patch
+---
+
+fix(event-bus-local): Error handling

integration-tests/api/package.json

@@ -9,11 +9,11 @@
  "build": "babel src -d dist --extensions \".ts,.js\""
  },
  "dependencies": {
- "@medusajs/cache-inmemory": "*",
- "@medusajs/event-bus-local": "*",
- "@medusajs/medusa": "*",
+ "@medusajs/cache-inmemory": "1.8.0-rc.0",
+ "@medusajs/event-bus-local": "1.8.0-rc.0",
+ "@medusajs/medusa": "1.8.0-rc.0",
  "faker": "^5.5.3",
- "medusa-interfaces": "*",
+ "medusa-interfaces": "1.3.7-rc.0",
  "typeorm": "^0.3.11"
  },
  "devDependencies": {

integration-tests/plugins/package.json

@@ -9,13 +9,13 @@
  "build": "babel src -d dist --extensions \".ts,.js\""
  },
  "dependencies": {
- "@medusajs/cache-inmemory": "*",
- "@medusajs/event-bus-local": "*",
- "@medusajs/medusa": "*",
+ "@medusajs/cache-inmemory": "1.8.0-rc.0",
+ "@medusajs/event-bus-local": "1.8.0-rc.0",
+ "@medusajs/medusa": "1.8.0-rc.0",
  "faker": "^5.5.3",
- "medusa-fulfillment-webshipper": "*",
- "medusa-interfaces": "*",
- "medusa-plugin-sendgrid": "*",
+ "medusa-fulfillment-webshipper": "1.3.8-rc.0",
+ "medusa-interfaces": "1.3.7-rc.0",
+ "medusa-plugin-sendgrid": "1.3.8-rc.0",
  "typeorm": "^0.3.11"
  },
  "devDependencies": {

integration-tests/repositories/package.json

@@ -8,8 +8,8 @@
  "test": "jest --silent=false --runInBand --bail --detectOpenHandles --forceExit"
  },
  "dependencies": {
- "@medusajs/medusa": "*",
- "medusa-interfaces": "*",
+ "@medusajs/medusa": "1.8.0-rc.0",
+ "medusa-interfaces": "1.3.7-rc.0",
  "typeorm": "^0.3.11"
  },
  "devDependencies": {

packages/admin-ui/CHANGELOG.md

@@ -0,0 +1,78 @@
+# @medusajs/admin-ui
+
+## 0.0.1-rc.0
+
+### Patch Changes
+
+- [#3403](https:/medusajs/medusa/pull/3403) [`57d7728dd`](https:/medusajs/medusa/commit/57d7728dd9d00df712e1a872899b8397955dfe46) Thanks [@StephixOne](https:/StephixOne)! - add location support in fulfillment modal
+
+- [#3461](https:/medusajs/medusa/pull/3461) [`478903b55`](https:/medusajs/medusa/commit/478903b55a6f7c276fa2285ee35bf8a2b51a72fb) Thanks [@StephixOne](https:/StephixOne)! - fix(admin-ui): Admin UI fixes / enhancements
+
+ - Inventory and order UI fixes and tweaks
+ - focus-border clipping
+ - Fix use of `expand` parameter on order page
+ - Fix location address editing form state
+ - ensure that the allocation indicator is correctly displayed
+ - Fix inventory table pagination on location filter change
+ - Try and ensure allocation table checkmarks align better
+ - Add gap in table actions
+ - remove allocate button if no more allcoations can be made
+ - update edit-allocation sidebar
+ - create/update/delete inventory items according to inventory items on the variant
+ - Fix minor bugs related to the edit-allocation modal
+ - move tailwind to direct dependency
+ - display error messages for batch jobs
+ - draft order shipping details
+ - Implements redesigned public facing pages of admin UI.
+ - Add location names to fulfilment rows and timeline events
+ - Encode location id in URL on location table
+
+- [#3512](https:/medusajs/medusa/pull/3512) [`a8423b8ac`](https:/medusajs/medusa/commit/a8423b8acc8723dd3f5475d23bd9cb8be9c630c0) Thanks [@StephixOne](https:/StephixOne)! - fix(medusa, admin-ui): Fix edit order variant stock
+
+- [#3438](https:/medusajs/medusa/pull/3438) [`f027bc26f`](https:/medusajs/medusa/commit/f027bc26fca94931df61c1cc0c7450de08020975) Thanks [@StephixOne](https:/StephixOne)! - fix(admin): Show correct reserved/available values when editing stock on variant
+
+- [#3418](https:/medusajs/medusa/pull/3418) [`8a7421db5`](https:/medusajs/medusa/commit/8a7421db5bd235dd3cf88bf73d2438af8769f7ba) Thanks [@kasperkristensen](https:/kasperkristensen)! - feat(admin,admin-ui): Updates the default behaviour of the plugin, and makes building for external deployment easier
+
+- [#3532](https:/medusajs/medusa/pull/3532) [`bfef22b33`](https:/medusajs/medusa/commit/bfef22b33e0aa4aa542d3f22fb32ee261f5a19ea) Thanks [@kasperkristensen](https:/kasperkristensen)! - fix(admin-ui): Revamps gift card manage page
+
+- [#3395](https:/medusajs/medusa/pull/3395) [`15f47baf5`](https:/medusajs/medusa/commit/15f47baf56e6722b7821cfaa2fb468e582dfa2c1) Thanks [@pKorsholm](https:/pKorsholm)! - fix(admin-ui, medusa): Minor ui fixes relating to stock locations
+
+- [#3522](https:/medusajs/medusa/pull/3522) [`55c5fba0d`](https:/medusajs/medusa/commit/55c5fba0d3dbd015c3ffd74d645a8057892d0f52) Thanks [@pKorsholm](https:/pKorsholm)! - feat(medusa,admin): location_ids in swap and claim creation
+
+- [#3334](https:/medusajs/medusa/pull/3334) [`40de54b01`](https:/medusajs/medusa/commit/40de54b0101bdfd37f577d18c10ec9f1ab1ce8fe) Thanks [@kasperkristensen](https:/kasperkristensen)! - feat(medusa,admin,admin-ui): Add new plugin to serve the admin dashboard from the server. Adds a new plugin injection step `setup`, code placed in the `setup` folder of a plugin will be run before any code from a plugin is injected into the Medusa server.
+
+- [#3416](https:/medusajs/medusa/pull/3416) [`478d1af8d`](https:/medusajs/medusa/commit/478d1af8d0df0af16baf4f130e19b0be34f5f295) Thanks [@riqwan](https:/riqwan)! - feat(medusa, admin-ui, medusa-react): Improvements to product categories
+
+ - Adds name as required in category create form
+ - Adds name and handle as required in category edit form
+ - Updates message on create/update forms
+ - Adds category indicators for is_internal and is_active fields in the tree list
+ - Fixes bug where tree is not reset when update fails
+ - allow appending all category descendants with a param in list endpoint
+ - fix rank order changing on category update
+ - invalidate products query on category delete
+ - adds category ui for tree/list, edit, create, delete
+ - add product category queries and mutations
+ - category list API can return all descendant
+ - added breadcrumbs for categories on create/edit modal
+ - add empty state for product categories
+ - increase tree depth + scope categories on store + allow categories relation in products API
+ - categories can be ranked based on position
+ - seed command can create product categories
+ - hide categories in products behind feature flag
+ - fixes bug for mpath incorrectly updated for nested categories
+
+- [#3434](https:/medusajs/medusa/pull/3434) [`f43f03bad`](https:/medusajs/medusa/commit/f43f03badbfd1d3598f3c6bc6c81e6fa2e9c2a09) Thanks [@StephixOne](https:/StephixOne)! - fix(admin): Fix fulfilment creation
+
+- [#3531](https:/medusajs/medusa/pull/3531) [`4e9d257d3`](https:/medusajs/medusa/commit/4e9d257d3bf76703ef5be8ca054cc9f0f7339def) Thanks [@carlos-r-l-rodrigues](https:/carlos-r-l-rodrigues)! - Remove dependency on @medusajs/medusa from Inventory and Stock-Location Modules
+
+- [#3448](https:/medusajs/medusa/pull/3448) [`d4af87311`](https:/medusajs/medusa/commit/d4af873113e4e3bb75ff1f5646870eb77b7a2b40) Thanks [@StephixOne](https:/StephixOne)! - fix(admin): Show all locations in allocation creation modal
+
+- [#3403](https:/medusajs/medusa/pull/3403) [`57d7728dd`](https:/medusajs/medusa/commit/57d7728dd9d00df712e1a872899b8397955dfe46) Thanks [@StephixOne](https:/StephixOne)! - Add order allocation to admin ui
+
+- [#3451](https:/medusajs/medusa/pull/3451) [`55a1f232a`](https:/medusajs/medusa/commit/55a1f232a3746a22adb1fcd1844b2659077a59f9) Thanks [@pKorsholm](https:/pKorsholm)! - feat(medusa,admin-ui): support location_id in
+
+- [#3401](https:/medusajs/medusa/pull/3401) [`47d344076`](https:/medusajs/medusa/commit/47d3440766efa26aba6638a05edec520a4e62828) Thanks [@riqwan](https:/riqwan)! - feat(admin-ui, medusa-react): allow products to be categorized in product create/edit page
+
+- Updated dependencies [[`fe9eea4c1`](https:/medusajs/medusa/commit/fe9eea4c18b7e04ba91660716c92b11a49840a3c), [`9ba09ba4d`](https:/medusajs/medusa/commit/9ba09ba4d753f132537f0447097fe9f54922c074), [`12d304307`](https:/medusajs/medusa/commit/12d304307af87ea9287a41869eb33ef09f273d85), [`80b95a230`](https:/medusajs/medusa/commit/80b95a230056d9ed15f7302f248094f879516faf), [`54dcc1871`](https:/medusajs/medusa/commit/54dcc1871c8f28bea962dbb9df6e79b038d56449), [`478d1af8d`](https:/medusajs/medusa/commit/478d1af8d0df0af16baf4f130e19b0be34f5f295), [`6748877c6`](https:/medusajs/medusa/commit/6748877c694c1433f666c6987f20af76b201b495), [`ef5ef9f5a`](https:/medusajs/medusa/commit/ef5ef9f5a26febf0b64d9981606c1e59999ca76e), [`2d2727f75`](https:/medusajs/medusa/commit/2d2727f753dd9386160d7e677b927c4915e1fce7), [`47d344076`](https:/medusajs/medusa/commit/47d3440766efa26aba6638a05edec520a4e62828)]:
+ - [email protected]

packages/admin-ui/package.json

@@ -2,7 +2,7 @@
  "name": "@medusajs/admin-ui",
  "author": "Kasper Kristensen <[email protected]>",
  "license": "MIT",
- "version": "0.0.0",
+ "version": "0.0.1-rc.0",
  "repository": {
  "type": "git",
  "url": "https:/medusajs/medusa.git",
@@ -49,7 +49,7 @@
  "copy-to-clipboard": "^3.3.1",
  "emoji-picker-react": "^4.4.3",
  "framer-motion": "^9.1.6",
- "medusa-react": "*",
+ "medusa-react": "5.0.0-rc.0",
  "moment": "^2.29.4",
  "pluralize": "^8.0.0",
  "postcss": "^8.4.21",
@@ -79,8 +79,8 @@
  "vite": "^4.1.4"
  },
  "devDependencies": {
- "@medusajs/medusa": "*",
- "@medusajs/types": "^0.0.1",
+ "@medusajs/medusa": "1.8.0-rc.0",
+ "@medusajs/types": "^0.0.2-rc.0",
  "@testing-library/jest-dom": "^5.16.5",
  "@testing-library/react": "^14.0.0",
  "@testing-library/user-event": "^14.4.3",

packages/admin-ui/ui/src/components/forms/product/variant-form/variant-stock-form/index.tsx

@@ -1,23 +1,25 @@
-import { InventoryLevelDTO, StockLocationDTO } from "@medusajs/medusa"
 import { Controller, useFieldArray } from "react-hook-form"
+import { InventoryLevelDTO, StockLocationDTO } from "@medusajs/types"
 
-import clsx from "clsx"
-import { sum } from "lodash"
-import { useAdminStockLocations } from "medusa-react"
-import React from "react"
-import { useFeatureFlag } from "../../../../../providers/feature-flag-provider"
-import { NestedForm } from "../../../../../utils/nested-form"
-import Switch from "../../../../atoms/switch"
+import BuildingsIcon from "../../../../fundamentals/icons/buildings-icon"
 import Button from "../../../../fundamentals/button"
 import FeatureToggle from "../../../../fundamentals/feature-toggle"
 import IconBadge from "../../../../fundamentals/icon-badge"
-import BuildingsIcon from "../../../../fundamentals/icons/buildings-icon"
 import InputField from "../../../../molecules/input"
 import { LayeredModalContext } from "../../../../molecules/modal/layered-modal"
 import { ManageLocationsScreen } from "../../variant-inventory-form/variant-stock-form"
+import { NestedForm } from "../../../../../utils/nested-form"
+import React from "react"
+import Switch from "../../../../atoms/switch"
+import clsx from "clsx"
+import { sum } from "lodash"
+import { useAdminStockLocations } from "medusa-react"
+import { useFeatureFlag } from "../../../../../providers/feature-flag-provider"
+// import { InventoryLevelDTO, StockLocationDTO } from "@medusajs/medusa"
+
 
 export type VariantStockFormType = {
- manage_inventory: boolean
+ manage_inventory?: boolean
  allow_backorder: boolean
  inventory_quantity: number | null
  sku: string | null