Merge branch 'develop' into feat/create-user-account

.changeset/polite-houses-nail.md

@@ -0,0 +1,5 @@
+---
+"@medusajs/medusa": patch
+---
+
+feat(medusa): migrate medusa unit tests to run with swc jest

.changeset/thirty-moons-doubt.md

@@ -0,0 +1,11 @@
+---
+"@medusajs/ui-preset": patch
+"@medusajs/ui": patch
+"@medusajs/medusa": patch
+"@medusajs/client-types": patch
+---
+
+feat(ui-preset): Pull latest styles from Figma.
+fix(ui): Fix invalid state styling of Select, so it correctly shows when aria-invalid is true.
+fix(medusa): Align query params between `/admin/products/:id/variants` and `/admin/variants`.
+chore(client-types): Update `medusa` client types to reflect changes to the API.

integration-tests/api/jest.config.js

@@ -15,7 +15,7 @@ module.exports = {
     `__testfixtures__`,
     `.cache`,
   ],
-  transformIgnorePatterns: [`/dist`],
+  transformIgnorePatterns: ["/dist", "/node_modules/"],
   transform: { "^.+\\.[jt]s$": ["@swc/jest"] },
   setupFiles: ["../setup-env.js"],
   setupFilesAfterEnv: ["../setup.js"],

integration-tests/api/package.json

@@ -6,7 +6,7 @@
   "private": true,
   "scripts": {
     "test:integration": "jest --silent=false --maxWorkers=50% --bail --detectOpenHandles --forceExit --logHeapUsage",
-    "test:integration:chunk": "jest --silent --bail --maxWorkers=50% --forceExit --testPathPattern=$(echo $CHUNKS | jq -r \".[${CHUNK}] | .[]\")",
+    "test:integration:chunk": "jest --silent --bail --maxWorkers=50% --forceExit --detectOpenHandles --testPathPattern=$(echo $CHUNKS | jq -r \".[${CHUNK}] | .[]\")",
     "build": "babel src -d dist --extensions \".ts,.js\""
   },
   "dependencies": {

integration-tests/modules/jest.config.js

@@ -14,7 +14,7 @@ module.exports = {
     `__testfixtures__`,
     `.cache`,
   ],
-  transformIgnorePatterns: [`/dist`],
+  transformIgnorePatterns: ["/dist", "/node_modules/"],
   transform: {
     "^.+\\.[jt]s$": ["@swc/jest"],
   },

integration-tests/modules/package.json

@@ -5,7 +5,7 @@
   "license": "MIT",
   "private": true,
   "scripts": {
-    "test:integration": "jest --silent=false --maxWorkers=50% --bail --detectOpenHandles --forceExit --logHeapUsage",
+    "test:integration": "jest --silent --maxWorkers=50% --bail --detectOpenHandles --forceExit --logHeapUsage",
     "test:integration:chunk": "jest --silent --bail --maxWorkers=50% --forceExit --testPathPattern=$(echo $CHUNKS | jq -r \".[${CHUNK}] | .[]\")",
     "build": "babel src -d dist --extensions \".ts,.js\""
   },

integration-tests/plugins/__tests__/inventory/order/order.js

@@ -178,7 +178,7 @@ describe("/store/carts", () => {
         })
 
         const customer = await simpleCustomerFactory(dbConnection, {}, 100)
-
+        const items = []
         const cart = await simpleCartFactory(dbConnection, {
           email: "[email protected]",
           region: regionId,
@@ -194,7 +194,6 @@ describe("/store/carts", () => {
           ],
         })
 
-        const items = []
         for (let i = 0; i < 13; i++) {
           const product = await simpleProductFactory(dbConnection, {})
           await prodVarInventoryService.attachInventoryItem(

integration-tests/plugins/jest.config.js

@@ -14,8 +14,8 @@ module.exports = {
     `__testfixtures__`,
     `.cache`,
   ],
-  transformIgnorePatterns: [`/dist`],
-  transform: { "^.+\\.[jt]s$": `../../jest-transformer.js` },
+  transformIgnorePatterns: ["/dist", "/node_modules/"],
+  transform: { "^.+\\.[jt]s$": `@swc/jest` },
   setupFiles: ["../setup-env.js"],
   setupFilesAfterEnv: ["../setup.js"],
   globalSetup: "../globalSetup.js",

integration-tests/plugins/package.json

@@ -5,7 +5,7 @@
   "license": "MIT",
   "private": true,
   "scripts": {
-    "test:integration": "node --expose-gc ./../../node_modules/.bin/jest --silent=false --runInBand --bail --detectOpenHandles --logHeapUsage --clearMocks --forceExit",
+    "test:integration": "jest --silent=false  --maxWorkers=50% --bail --detectOpenHandles --clearMocks --forceExit",
     "build": "babel src -d dist --extensions \".ts,.js\""
   },
   "dependencies": {
@@ -40,6 +40,8 @@
     "@babel/core": "^7.12.10",
     "@babel/node": "^7.12.10",
     "@medusajs/types": "workspace:^",
+    "@swc/core": "^1.4.8",
+    "@swc/jest": "^0.2.36",
     "babel-preset-medusa-package": "*",
     "jest": "^26.6.3",
     "jest-environment-node": "26.6.2"

integration-tests/repositories/jest.config.js

@@ -12,7 +12,7 @@ module.exports = {
     `__testfixtures__`,
     `.cache`,
   ],
-  transformIgnorePatterns: [`/dist`],
+  transformIgnorePatterns: ["/dist", "/node_modules/"],
   transform: { "^.+\\.[jt]s$": `../../jest-transformer.js` },
   setupFiles: ["../setup-env.js"],
   setupFilesAfterEnv: ["../setup.js"],

packages/admin-next/dashboard/public/locales/en-US/translation.json

@@ -62,7 +62,8 @@
     "edit": "Edit",
     "download": "Download",
     "clearAll": "Clear all",
-    "apply": "Apply"
+    "apply": "Apply",
+    "add": "Add"
   },
   "filters": {
     "date": {
@@ -391,6 +392,34 @@
     "status": {
       "open": "Open",
       "completed": "Completed"
+    },
+    "create": {
+      "createDraftOrder": "Create Draft Order",
+      "createDraftOrderHint": "Create a new draft order to manage the details of an order before it is placed.",
+      "chooseRegionHint": "Choose region",
+      "existingItemsLabel": "Existing items",
+      "existingItemsHint": "Add existing products to the draft order.",
+      "customItemsLabel": "Custom items",
+      "customItemsHint": "Add custom items to the draft order.",
+      "addExistingItemsAction": "Add existing items",
+      "addCustomItemAction": "Add custom item",
+      "noCustomItemsAddedLabel": "No custom items added yet",
+      "noExistingItemsAddedLabel": "No existing items added yet",
+      "chooseRegionTooltip": "Choose a region first",
+      "useExistingCustomerLabel": "Use existing customer",
+      "addShippingMethodsAction": "Add shipping methods",
+      "unitPriceOverrideLabel": "Unit price override",
+      "shippingOptionLabel": "Shipping option",
+      "shippingOptionHint": "Choose the shipping option for the draft order.",
+      "shippingPriceOverrideLabel": "Shipping price override",
+      "shippingPriceOverrideHint": "Override the shipping price for the draft order.",
+      "sendNotificationLabel": "Send notification",
+      "sendNotificationHint": "Send a notification to the customer when the draft order is created."
+    },
+    "validation": {
+      "requiredEmailOrCustomer": "Email or customer is required.",
+      "requiredItems": "At least one item is required.",
+      "invalidEmail": "Email must be a valid email address."
     }
   },
   "discounts": {
@@ -846,6 +875,7 @@
     "orders": "Orders",
     "account": "Account",
     "total": "Total",
+    "totalExclTax": "Total excl. tax",
     "subtotal": "Subtotal",
     "shipping": "Shipping",
     "tax": "Tax",
@@ -887,6 +917,7 @@
     "thumbnail": "Thumbnail",
     "sku": "SKU",
     "managedInventory": "Managed inventory",
+    "allowBackorder": "Allow backorder",
     "inStock": "In stock",
     "location": "Location",
     "quantity": "Quantity",
@@ -896,9 +927,11 @@
     "maxSubtotal": "Max. Subtotal",
     "shippingProfile": "Shipping Profile",
     "summary": "Summary",
+    "details": "Details",
     "label": "Label",
     "rate": "Rate",
     "requiresShipping": "Requires shipping",
+    "unitPrice": "Unit price",
     "startDate": "Start date",
     "endDate": "End date",
     "draft": "Draft"

packages/admin-next/dashboard/src/components/common/combobox/combobox.tsx

@@ -180,7 +180,7 @@ const ComboboxImpl = <T extends Value = string>(
   const results = isSearchControlled ? options : matches
 
   return (
-    <Popover.Root open={open} onOpenChange={setOpen}>
+    <Popover.Root modal open={open} onOpenChange={setOpen}>
       <PrimitiveComboboxProvider
         open={open}
         setOpen={setOpen}
@@ -199,7 +199,7 @@ const ComboboxImpl = <T extends Value = string>(
               "bg-ui-bg-field transition-fg shadow-borders-base",
               "hover:bg-ui-bg-field-hover",
               "has-[input:focus]:shadow-borders-interactive-with-active",
-              "has-[:invalid]:shadow-borders-error",
+              "has-[:invalid]:shadow-borders-error has-[[aria-invalid=true]]:shadow-borders-error",
               "has-[:disabled]:bg-ui-bg-disabled has-[:disabled]:text-ui-fg-disabled has-[:disabled]:cursor-not-allowed",
               {
                 "pl-0.5": hasValue && isArrayValue,

packages/admin-next/dashboard/src/components/common/conditional-tooltip/conditional-tooltip.tsx

@@ -0,0 +1,19 @@
+import { Tooltip } from "@medusajs/ui"
+import { PropsWithChildren, ReactNode } from "react"
+
+type ConditionalTooltipProps = PropsWithChildren<{
+  content: ReactNode
+  showTooltip?: boolean
+}>
+
+export const ConditionalTooltip = ({
+  children,
+  content,
+  showTooltip = false,
+}: ConditionalTooltipProps) => {
+  if (showTooltip) {
+    return <Tooltip content={content}>{children}</Tooltip>
+  }
+
+  return children
+}

packages/admin-next/dashboard/src/components/common/conditional-tooltip/index.ts

@@ -0,0 +1 @@
+export * from "./conditional-tooltip"

packages/admin-next/dashboard/src/components/common/customer-info/customer-info.tsx

@@ -2,6 +2,7 @@ import { Address, Cart, Order } from "@medusajs/medusa"
 import { Avatar, Copy, Text } from "@medusajs/ui"
 import { useTranslation } from "react-i18next"
 import { Link } from "react-router-dom"
+import { getFormattedAddress, isSameAddress } from "../../../lib/addresses"
 
 const ID = ({ data }: { data: Cart | Order }) => {
   const { t } = useTranslation()
@@ -182,74 +183,6 @@ export const CustomerInfo = Object.assign(
   }
 )
 
-const isSameAddress = (a: Address | null, b: Address | null) => {
-  if (!a || !b) {
-    return false
-  }
-
-  return (
-    a.first_name === b.first_name &&
-    a.last_name === b.last_name &&
-    a.address_1 === b.address_1 &&
-    a.address_2 === b.address_2 &&
-    a.city === b.city &&
-    a.postal_code === b.postal_code &&
-    a.province === b.province &&
-    a.country_code === b.country_code
-  )
-}
-
-const getFormattedAddress = ({ address }: { address: Address }) => {
-  const {
-    first_name,
-    last_name,
-    company,
-    address_1,
-    address_2,
-    city,
-    postal_code,
-    province,
-    country,
-    country_code,
-  } = address
-
-  const name = [first_name, last_name].filter(Boolean).join(" ")
-
-  const formattedAddress = []
-
-  if (name) {
-    formattedAddress.push(name)
-  }
-
-  if (company) {
-    formattedAddress.push(company)
-  }
-
-  if (address_1) {
-    formattedAddress.push(address_1)
-  }
-
-  if (address_2) {
-    formattedAddress.push(address_2)
-  }
-
-  const cityProvincePostal = [city, province, postal_code]
-    .filter(Boolean)
-    .join(" ")
-
-  if (cityProvincePostal) {
-    formattedAddress.push(cityProvincePostal)
-  }
-
-  if (country) {
-    formattedAddress.push(country.display_name)
-  } else if (country_code) {
-    formattedAddress.push(country_code.toUpperCase())
-  }
-
-  return formattedAddress
-}
-
 const getCartOrOrderCustomer = (obj: Cart | Order) => {
   const { first_name: sFirstName, last_name: sLastName } =
     obj.shipping_address || {}

packages/admin-next/dashboard/src/components/common/divider/divider.tsx

@@ -0,0 +1,31 @@
+import { clx } from "@medusajs/ui"
+import { ComponentPropsWithoutRef } from "react"
+
+interface DividerProps
+  extends Omit<ComponentPropsWithoutRef<"div">, "children"> {
+  orientation?: "horizontal" | "vertical"
+  variant?: "dashed" | "solid"
+}
+
+export const Divider = ({
+  orientation = "horizontal",
+  variant = "solid",
+  className,
+  ...props
+}: DividerProps) => {
+  return (
+    <div
+      aria-orientation={orientation}
+      role="separator"
+      className={clx(
+        {
+          "w-full border-t": orientation === "horizontal",
+          "h-full border-l": orientation === "vertical",
+          "border-dashed": variant === "dashed",
+        },
+        className
+      )}
+      {...props}
+    />
+  )
+}

packages/admin-next/dashboard/src/components/common/divider/index.ts

@@ -0,0 +1 @@
+export * from "./divider"

packages/admin-next/dashboard/src/components/common/thumbnail/thumbnail.tsx

@@ -1,9 +1,9 @@
-import { Photo } from "@medusajs/icons";
+import { Photo } from "@medusajs/icons"
 
 type ThumbnailProps = {
-  src?: string | null;
-  alt?: string;
-};
+  src?: string | null
+  alt?: string
+}
 
 export const Thumbnail = ({ src, alt }: ThumbnailProps) => {
   return (
@@ -15,8 +15,8 @@ export const Thumbnail = ({ src, alt }: ThumbnailProps) => {
           className="h-full w-full object-cover object-center"
         />
       ) : (
-        <Photo />
+        <Photo className="text-ui-fg-subtle" />
       )}
     </div>
-  );
-};
+  )
+}