@medusajs/dashboard 3.0.0-snapshot-20251216145629 → 3.0.0-snapshot-20260102134455

package/src/i18n/translations/en.json

@@ -59,7 +59,9 @@
     "unsavedChangesDescription": "You have unsaved changes that will be lost if you exit this form.",
     "includesTaxTooltip": "Prices in this column are tax inclusive.",
     "excludesTaxTooltip": "Prices in this column are tax exclusive.",
-    "noMoreData": "No more data"
+    "noMoreData": "No more data",
+    "exclusive": "Product-specific",
+    "global": "Global"
   },
   "json": {
     "header": "JSON",
@@ -145,7 +147,9 @@
     "hide": "Hide",
     "export": "Export",
     "import": "Import",
-    "cannotUndo": "This action cannot be undone"
+    "cannotUndo": "This action cannot be undone",
+    "manage": "Manage",
+    "goToProductOption": "Go to product option"
   },
   "operators": {
     "in": "In"
@@ -452,7 +456,8 @@
         "productOptions": {
           "label": "Product options",
           "hint": "Define the options for the product, e.g. color, size, etc."
-        }
+        },
+        "selectValuesHint": "Select which values to use for each option"
       },
       "successToast": "Product {{title}} was successfully created."
     },
@@ -709,6 +714,13 @@
         "header": "Create Option",
         "successToast": "Option {{title}} was successfully created."
       },
+      "manage": {
+        "header": "Manage Product Options",
+        "description": "Associate or disassociate product options from this product.",
+        "label": "Product Options",
+        "hint": "Select which options should be associated to this product.",
+        "placeholder": "Select options"
+      },
       "deleteWarning": "You are about to delete the product option: {{title}}. This action cannot be undone."
     },
     "organization": {
@@ -845,6 +857,49 @@
       }
     }
   },
+  "productOptions": {
+    "domain": "Options",
+    "subtitle": "Manage product options and their associated values.",
+    "values": {
+      "header": "Values"
+    },
+    "products": {
+      "list": {
+        "noRecords": "There are no products with this option."
+      }
+    },
+    "create": {
+      "header": "Create Product Option",
+      "hint": "Create a new product option and manage its values.",
+      "successToast": "Product option \"{{title}}\" was successfully created.",
+      "tabs": {
+        "details": "Details",
+        "organize": "Organize rankings"
+      }
+    },
+    "manage": {
+      "exclusiveOption": "Product exclusive option"
+    },
+    "edit": {
+      "header": "Edit Product Option",
+      "description": "Edit the product option to update its details and associated values.",
+      "successToast": "Product option \"{{title}}\" was successfully updated."
+    },
+    "delete": {
+      "confirmation": "You are about to delete the product option \"{{title}}\". This action cannot be undone.",
+      "successToast": "Product option was successfully deleted."
+    },
+    "fields": {
+      "title": {
+        "label": "Title",
+        "placeholder": "Size"
+      },
+      "values": {
+        "label": "Values",
+        "placeholder": "S, M, L"
+      }
+    }
+  },
   "inventory": {
     "domain": "Inventory",
     "subtitle": "Manage your inventory items",
@@ -1569,6 +1624,14 @@
       "sendNotificationLabel": "Send notification",
       "sendNotificationHint": "Send a notification to the customer when the draft order is created."
     },
+    "list": {
+      "noRecordsMessage": "No draft orders found",
+      "description": "Create a new draft order to get started.",
+      "filtered": {
+        "heading": "No results found",
+        "description": "No draft orders match your filter criteria."
+      }
+    },
     "validation": {
       "requiredEmailOrCustomer": "Email or customer is required.",
       "requiredItems": "At least one item is required.",
@@ -2514,7 +2577,6 @@
       "manage": "Manage translations",
       "manageLocales": "Manage locales"
     },
-    "title": "Translation domains",
     "subtitle": "Manage translations of your data in Medusa",
     "list": {
       "metrics": "{{translated}} of {{total}} fields translated"
@@ -2538,7 +2600,7 @@
     "completion": {
       "heading": "Translated fields",
       "translated": "Translated",
-      "toTranslate": "To be translated",
+      "toTranslate": "Missing",
       "footer": "Languages"
     }
   },
@@ -3282,5 +3344,11 @@
         "cancelText": "Cancel"
       }
     }
+  },
+  "auth": {
+    "login": {
+      "authenticationFailed": "Authentication failed",
+      "cloud": "Log in with Medusa Cloud"
+    }
   }
 }

package/src/i18n/translations/es.json

@@ -1504,6 +1504,14 @@
   },
   "draftOrders": {
     "domain": "Pedidos Borradores",
+    "list": {
+      "description": "Crea un nuevo pedido borrador para empezar.",
+      "noRecordsMessage": "No se encontraron pedidos borradores",
+      "filtered": {
+        "heading": "No se encontraron resultados",
+        "description": "No hay pedidos borradores que coincidan con los criterios de filtro."
+      }
+    },
     "deleteWarning": "Estás a punto de eliminar el pedido borrador {{id}}. Esta acción no puede deshacerse.",
     "paymentLinkLabel": "Enlace de pago",
     "cartIdLabel": "ID del carrito",
@@ -2477,7 +2485,7 @@
     "completion": {
       "heading": "Textos traducidos",
       "translated": "Traducidos",
-      "toTranslate": "Por traducir",
+      "toTranslate": "Faltantes",
       "footer": "Idiomas"
     }
   },

package/src/routes/customers/customer-detail/components/customer-order-section/customer-order-section.tsx

@@ -19,7 +19,7 @@ type CustomerGeneralSectionProps = {
 
 const PREFIX = "cusord"
 const PAGE_SIZE = 10
-const DEFAULT_RELATIONS = "*customer,*items,*sales_channel"
+const DEFAULT_RELATIONS = "*customer,*items,*sales_channel,payment_collections.refunded_amount,+shipping_address.country_code"
 const DEFAULT_FIELDS =
   "id,status,display_id,created_at,email,fulfillment_status,payment_status,total,currency_code"
 

package/src/routes/login/components/cloud-auth-login.tsx

@@ -0,0 +1,114 @@
+import { Button, toast } from "@medusajs/ui"
+import { useMutation } from "@tanstack/react-query"
+import { useEffect, useRef } from "react"
+import { useTranslation } from "react-i18next"
+import { decodeToken } from "react-jwt"
+import { useNavigate, useSearchParams } from "react-router-dom"
+import { useCreateCloudAuthUser } from "../../../hooks/api/cloud"
+import { sdk } from "../../../lib/client"
+
+const CLOUD_AUTH_PROVIDER = "cloud"
+
+export const CloudAuthLogin = () => {
+  const { t } = useTranslation()
+  const [searchParams] = useSearchParams()
+
+  const { handleCallback, isCallbackPending } = useAuthCallback(searchParams)
+
+  // Check if we're returning from the OAuth callback
+  const hasCallbackParams =
+    searchParams.get("auth_provider") === CLOUD_AUTH_PROVIDER &&
+    searchParams.has("code") &&
+    searchParams.has("state")
+
+  const callbackInitiated = useRef(false) // ref to prevent duplicate calls in React strict mode and other unmounting+mounting scenarios
+  useEffect(() => {
+    if (hasCallbackParams && !callbackInitiated.current) {
+      callbackInitiated.current = true
+      handleCallback()
+    }
+  }, [hasCallbackParams, handleCallback])
+
+  const handleCloudLogin = async () => {
+    try {
+      const result = await sdk.auth.login("user", CLOUD_AUTH_PROVIDER, {
+        // in case the admin is on a different domain, or the backend URL is set to just "/" which won't work for the callback
+        callback_url: `${window.location.origin}${window.location.pathname}?auth_provider=${CLOUD_AUTH_PROVIDER}`,
+      })
+
+      if (typeof result === "object" && result.location) {
+        // Redirect to Medusa Cloud for authentication
+        window.location.href = result.location
+        return
+      }
+
+      throw new Error("Unexpected login response")
+    } catch {
+      toast.error(t("auth.login.authenticationFailed"))
+    }
+  }
+
+  return (
+    <>
+      <hr className="bg-ui-border-base my-4" />
+      <Button
+        variant="secondary"
+        onClick={handleCloudLogin}
+        className="w-full"
+        disabled={isCallbackPending}
+        isLoading={isCallbackPending}
+      >
+        {t("auth.login.cloud")}
+      </Button>
+    </>
+  )
+}
+
+const useAuthCallback = (searchParams: URLSearchParams) => {
+  const { t } = useTranslation()
+  const navigate = useNavigate()
+  const { mutateAsync: createCloudAuthUser } = useCreateCloudAuthUser()
+
+  const { mutateAsync: handleCallback, isPending: isCallbackPending } =
+    useMutation({
+      mutationFn: async () => {
+        let token: string
+        try {
+          const query = Object.fromEntries(searchParams)
+          delete query.auth_provider // BE doesn't need this
+
+          token = await sdk.auth.callback("user", CLOUD_AUTH_PROVIDER, query)
+        } catch (error) {
+          throw new Error("Authentication callback failed")
+        }
+
+        const decodedToken = decodeToken(token) as {
+          actor_id: string
+          user_metadata: Record<string, unknown>
+        }
+
+        // If user doesn't exist, create it
+        if (!decodedToken?.actor_id) {
+          await createCloudAuthUser()
+
+          // Refresh token to get the updated token with actor_id
+          const refreshedToken = await sdk.auth.refresh({
+            Authorization: `Bearer ${token}`, // passing it manually in case the auth type is session
+          })
+          if (!refreshedToken) {
+            throw new Error("Failed to refresh token after user creation")
+          }
+        }
+
+        return true
+      },
+      onSuccess: () => {
+        navigate("/")
+      },
+      onError: () => {
+        toast.error(t("auth.login.authenticationFailed"))
+      },
+    })
+
+  return { handleCallback, isCallbackPending }
+}

package/src/routes/login/login.tsx

@@ -8,8 +8,10 @@ import * as z from "zod"
 import { Form } from "../../components/common/form"
 import AvatarBox from "../../components/common/logo-box/avatar-box"
 import { useSignInWithEmailPass } from "../../hooks/api"
+import { useCloudAuthEnabled } from "../../hooks/api/cloud"
 import { isFetchError } from "../../lib/is-fetch-error"
 import { useExtension } from "../../providers/extension-provider"
+import { CloudAuthLogin } from "./components/cloud-auth-login"
 
 const LoginSchema = z.object({
   email: z.string().email(),
@@ -21,6 +23,7 @@ export const Login = () => {
   const location = useLocation()
   const navigate = useNavigate()
   const { getWidgets } = useExtension()
+  const { data: cloudAuth } = useCloudAuthEnabled()
 
   const from = location.state?.from?.pathname || "/orders"
 
@@ -70,6 +73,11 @@ export const Login = () => {
     form.formState.errors.email?.message ||
     form.formState.errors.password?.message
 
+  const loginAfterWidgets = [...getWidgets("login.after")] // cloning to avoid mutating the original array below
+  if (cloudAuth?.enabled) {
+    loginAfterWidgets.push(CloudAuthLogin)
+  }
+
   return (
     <div className="bg-ui-bg-subtle flex min-h-dvh w-dvw items-center justify-center">
       <div className="m-4 flex w-full max-w-[280px] flex-col items-center">
@@ -150,7 +158,7 @@ export const Login = () => {
               </Button>
             </form>
           </Form>
-          {getWidgets("login.after").map((Component, i) => {
+          {loginAfterWidgets.map((Component, i) => {
             return <Component key={i} />
           })}
         </div>

package/src/routes/orders/order-create-edit/components/order-edit-create-form/order-edit-item.tsx

@@ -180,6 +180,7 @@ function OrderEditItem({ item, currencyCode, orderId }: OrderEditItemProps) {
             <Input
               className="bg-ui-bg-base txt-small w-[67px] rounded-lg [appearance:textfield] [&::-webkit-inner-spin-button]:appearance-none [&::-webkit-outer-spin-button]:appearance-none"
               type="number"
+              step="any"
               disabled={item.detail.fulfilled_quantity === item.quantity}
               min={item.detail.fulfilled_quantity}
               defaultValue={item.quantity}

package/src/routes/orders/order-edit-billing-address/components/edit-order-billing-address-form/edit-order-billing-address-form.tsx

@@ -16,6 +16,8 @@ type EditOrderBillingAddressFormProps = {
 }
 
 const EditOrderBillingAddressSchema = zod.object({
+  first_name: zod.string().optional(),
+  last_name: zod.string().optional(),
   address_1: zod.string().min(1),
   address_2: zod.string().optional(),
   country_code: zod.string().min(2).max(2),
@@ -34,6 +36,8 @@ export function EditOrderBillingAddressForm({
 
   const form = useForm<zod.infer<typeof EditOrderBillingAddressSchema>>({
     defaultValues: {
+      first_name: order.billing_address?.first_name || "",
+      last_name: order.billing_address?.last_name || "",
       address_1: order.billing_address?.address_1 || "",
       address_2: order.billing_address?.address_2 || "",
       city: order.billing_address?.city || "",
@@ -158,6 +162,36 @@ export function EditOrderBillingAddressForm({
                 )
               }}
             />
+            <Form.Field
+              control={form.control}
+              name="first_name"
+              render={({ field }) => {
+                return (
+                  <Form.Item>
+                    <Form.Label>{t("fields.firstName")}</Form.Label>
+                    <Form.Control>
+                      <Input size="small" {...field} />
+                    </Form.Control>
+                    <Form.ErrorMessage />
+                  </Form.Item>
+                )
+              }}
+            />
+            <Form.Field
+              control={form.control}
+              name="last_name"
+              render={({ field }) => {
+                return (
+                  <Form.Item>
+                    <Form.Label>{t("fields.lastName")}</Form.Label>
+                    <Form.Control>
+                      <Input size="small" {...field} />
+                    </Form.Control>
+                    <Form.ErrorMessage />
+                  </Form.Item>
+                )
+              }}
+            />
             <Form.Field
               control={form.control}
               name="company"

package/src/routes/orders/order-edit-shipping-address/components/edit-order-shipping-address-form/edit-order-shipping-address-form.tsx

@@ -16,6 +16,8 @@ type EditOrderShippingAddressFormProps = {
 }
 
 const EditOrderShippingAddressSchema = zod.object({
+  first_name: zod.string().optional(),
+  last_name: zod.string().optional(),
   address_1: zod.string().min(1),
   address_2: zod.string().optional(),
   country_code: zod.string().min(2).max(2),
@@ -34,6 +36,8 @@ export function EditOrderShippingAddressForm({
 
   const form = useForm<zod.infer<typeof EditOrderShippingAddressSchema>>({
     defaultValues: {
+      first_name: order.shipping_address?.first_name || "",
+      last_name: order.shipping_address?.last_name || "",
       address_1: order.shipping_address?.address_1 || "",
       address_2: order.shipping_address?.address_2 || "",
       city: order.shipping_address?.city || "",
@@ -158,6 +162,34 @@ export function EditOrderShippingAddressForm({
                 )
               }}
             />
+            <Form.Field
+              control={form.control}
+              name="first_name"
+              render={({ field }) => {
+                return (
+                  <Form.Item>
+                    <Form.Label>{t("fields.firstName")}</Form.Label>
+                    <Form.Control>
+                      <Input size="small" {...field} />
+                    </Form.Control>
+                  </Form.Item>
+                )
+              }}
+            />
+            <Form.Field
+              control={form.control}
+              name="last_name"
+              render={({ field }) => {
+                return (
+                  <Form.Item>
+                    <Form.Label>{t("fields.lastName")}</Form.Label>
+                    <Form.Control>
+                      <Input size="small" {...field} />
+                    </Form.Control>
+                  </Form.Item>
+                )
+              }}
+            />
             <Form.Field
               control={form.control}
               name="company"

package/src/routes/product-options/common/hooks/use-delete-product-option-action.tsx

@@ -0,0 +1,41 @@
+import { useNavigate } from "react-router-dom"
+import { toast, usePrompt } from "@medusajs/ui"
+import { useTranslation } from "react-i18next"
+import { useDeleteProductOption } from "../../../../hooks/api"
+import { HttpTypes } from "@medusajs/types"
+
+export const useDeleteProductOptionAction = ({
+  id,
+  title,
+}: HttpTypes.AdminProductOption) => {
+  const { t } = useTranslation()
+  const prompt = usePrompt()
+  const navigate = useNavigate()
+
+  const { mutateAsync } = useDeleteProductOption(id)
+
+  return async () => {
+    const result = await prompt({
+      title: t("general.areYouSure"),
+      description: t("productOptions.delete.confirmation", { title }),
+      confirmText: t("actions.delete"),
+      cancelText: t("actions.cancel"),
+    })
+
+    if (!result) {
+      return
+    }
+
+    await mutateAsync(undefined, {
+      onSuccess: () => {
+        navigate("/product-options", {
+          replace: true,
+        })
+        toast.success(t("productOptions.delete.successToast", { title }))
+      },
+      onError: (e) => {
+        toast.error(e.message)
+      },
+    })
+  }
+}

package/src/routes/product-options/product-option-create/components/create-product-option-form/create-product-option-details.tsx

@@ -0,0 +1,71 @@
+import { Heading, Input, Text } from "@medusajs/ui"
+import { UseFormReturn } from "react-hook-form"
+import { useTranslation } from "react-i18next"
+
+import { Form } from "../../../../../components/common/form"
+import { ChipInput } from "../../../../../components/inputs/chip-input"
+import { CreateProductOptionSchema } from "./schema"
+
+type CreateProductOptionDetailsProps = {
+  form: UseFormReturn<CreateProductOptionSchema>
+}
+
+export const CreateProductOptionDetails = ({
+  form,
+}: CreateProductOptionDetailsProps) => {
+  const { t } = useTranslation()
+
+  return (
+    <div className="mt-16 flex flex-col items-center px-16">
+      <div className="flex w-full max-w-[720px] flex-col gap-y-8">
+        <div>
+          <Heading>{t("productOptions.create.header")}</Heading>
+          <Text size="small" className="text-ui-fg-subtle">
+            {t("productOptions.create.hint")}
+          </Text>
+        </div>
+        <Form.Field
+          control={form.control}
+          name="title"
+          render={({ field }) => {
+            return (
+              <Form.Item>
+                <Form.Label>
+                  {t("productOptions.fields.title.label")}
+                </Form.Label>
+                <Form.Control>
+                  <Input
+                    autoComplete="off"
+                    {...field}
+                    placeholder={t("productOptions.fields.title.placeholder")}
+                  />
+                </Form.Control>
+                <Form.ErrorMessage />
+              </Form.Item>
+            )
+          }}
+        />
+        <Form.Field
+          control={form.control}
+          name="values"
+          render={({ field }) => {
+            return (
+              <Form.Item>
+                <Form.Label>
+                  {t("productOptions.fields.values.label")}
+                </Form.Label>
+                <Form.Control>
+                  <ChipInput
+                    {...field}
+                    placeholder={t("productOptions.fields.values.placeholder")}
+                  />
+                </Form.Control>
+                <Form.ErrorMessage />
+              </Form.Item>
+            )
+          }}
+        />
+      </div>
+    </div>
+  )
+}

package/src/routes/product-options/product-option-create/components/create-product-option-form/create-product-option-form.tsx

@@ -0,0 +1,97 @@
+import { zodResolver } from "@hookform/resolvers/zod"
+import { Button, toast } from "@medusajs/ui"
+import { useForm } from "react-hook-form"
+import { useTranslation } from "react-i18next"
+
+import {
+  RouteFocusModal,
+  useRouteModal,
+} from "../../../../../components/modals"
+import { KeyboundForm } from "../../../../../components/utilities/keybound-form"
+import { useCreateProductOption } from "../../../../../hooks/api"
+import { CreateProductOptionDetails } from "./create-product-option-details"
+import { CreateProductOptionOrganize } from "./create-product-option-organize"
+import { CreateProductOptionSchema } from "./schema"
+
+export const CreateProductOptionForm = () => {
+  const { t } = useTranslation()
+  const { handleSuccess } = useRouteModal()
+
+  const form = useForm<CreateProductOptionSchema>({
+    defaultValues: {
+      title: "",
+      values: [],
+      value_ranks: {},
+    },
+    resolver: zodResolver(CreateProductOptionSchema),
+  })
+
+  const hasValues = (form.watch("values")?.length ?? 0) > 0
+
+  const { mutateAsync, isPending } = useCreateProductOption()
+
+  const handleSubmit = form.handleSubmit((data) => {
+    const { title, values, value_ranks } = data
+
+    const ranks = value_ranks ?? {}
+
+    // populate default ranks as what user saw by default (i.e. in order that values were entered)
+    if (!Object.keys(ranks).length) {
+      values.forEach((value, index) => (ranks[value] = index + 1))
+    }
+
+    mutateAsync(
+      {
+        title,
+        values,
+        ranks,
+      },
+      {
+        onSuccess: ({ product_option }) => {
+          toast.success(
+            t("productOptions.create.successToast", {
+              title: product_option.title,
+            })
+          )
+
+          handleSuccess(`/product-options/${product_option.id}`)
+        },
+        onError: (error) => {
+          toast.error(error.message)
+        },
+      }
+    )
+  })
+
+  return (
+    <RouteFocusModal.Form form={form}>
+      <KeyboundForm
+        onSubmit={handleSubmit}
+        className="flex size-full flex-col overflow-hidden"
+      >
+        <RouteFocusModal.Header />
+        <RouteFocusModal.Body className="flex size-full flex-col gap-y-16 overflow-auto">
+          <CreateProductOptionDetails form={form} />
+          {hasValues && <CreateProductOptionOrganize form={form} />}
+        </RouteFocusModal.Body>
+        <RouteFocusModal.Footer>
+          <div className="flex items-center justify-end gap-x-2">
+            <RouteFocusModal.Close asChild>
+              <Button size="small" variant="secondary">
+                {t("actions.cancel")}
+              </Button>
+            </RouteFocusModal.Close>
+            <Button
+              size="small"
+              variant="primary"
+              type="submit"
+              isLoading={isPending}
+            >
+              {t("actions.save")}
+            </Button>
+          </div>
+        </RouteFocusModal.Footer>
+      </KeyboundForm>
+    </RouteFocusModal.Form>
+  )
+}