@medusajs/draft-order 2.11.1-preview-20251025060207 → 2.11.1-preview-20251025120209

package/.medusa/server/src/admin/index.js

@@ -9571,6 +9571,27 @@ const ID = () => {
     /* @__PURE__ */ jsxRuntime.jsx(reactRouterDom.Outlet, {})
   ] });
 };
+const CustomItems = () => {
+  return /* @__PURE__ */ jsxRuntime.jsxs(RouteDrawer, { children: [
+    /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Header, { children: /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Title, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { children: "Edit Custom Items" }) }) }),
+    /* @__PURE__ */ jsxRuntime.jsx(CustomItemsForm, {})
+  ] });
+};
+const CustomItemsForm = () => {
+  const form = reactHookForm.useForm({
+    resolver: zod.zodResolver(schema$5)
+  });
+  return /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Form, { form, children: /* @__PURE__ */ jsxRuntime.jsxs(KeyboundForm, { className: "flex flex-1 flex-col", children: [
+    /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Body, {}),
+    /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Footer, { children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex justify-end gap-2", children: [
+      /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Close, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.Button, { size: "small", variant: "secondary", children: "Cancel" }) }),
+      /* @__PURE__ */ jsxRuntime.jsx(ui.Button, { size: "small", type: "submit", children: "Save" })
+    ] }) })
+  ] }) });
+};
+const schema$5 = objectType({
+  email: stringType().email()
+});
 const BillingAddress = () => {
   const { id } = reactRouterDom.useParams();
   const { order, isPending, isError, error } = useOrder(id, {
@@ -9603,7 +9624,7 @@ const BillingAddressForm = ({ order }) => {
       postal_code: ((_i = order.billing_address) == null ? void 0 : _i.postal_code) ?? "",
       phone: ((_j = order.billing_address) == null ? void 0 : _j.phone) ?? ""
     },
-    resolver: zod.zodResolver(schema$5)
+    resolver: zod.zodResolver(schema$4)
   });
   const { mutateAsync, isPending } = useUpdateDraftOrder(order.id);
   const { handleSuccess } = useRouteModal();
@@ -9760,28 +9781,7 @@ const BillingAddressForm = ({ order }) => {
     }
   ) });
 };
-const schema$5 = addressSchema;
-const CustomItems = () => {
-  return /* @__PURE__ */ jsxRuntime.jsxs(RouteDrawer, { children: [
-    /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Header, { children: /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Title, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { children: "Edit Custom Items" }) }) }),
-    /* @__PURE__ */ jsxRuntime.jsx(CustomItemsForm, {})
-  ] });
-};
-const CustomItemsForm = () => {
-  const form = reactHookForm.useForm({
-    resolver: zod.zodResolver(schema$4)
-  });
-  return /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Form, { form, children: /* @__PURE__ */ jsxRuntime.jsxs(KeyboundForm, { className: "flex flex-1 flex-col", children: [
-    /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Body, {}),
-    /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Footer, { children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex justify-end gap-2", children: [
-      /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Close, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.Button, { size: "small", variant: "secondary", children: "Cancel" }) }),
-      /* @__PURE__ */ jsxRuntime.jsx(ui.Button, { size: "small", type: "submit", children: "Save" })
-    ] }) })
-  ] }) });
-};
-const schema$4 = objectType({
-  email: stringType().email()
-});
+const schema$4 = addressSchema;
 const Email = () => {
   const { id } = reactRouterDom.useParams();
   const { order, isPending, isError, error } = useOrder(id, {
@@ -10824,143 +10824,493 @@ const customItemSchema = objectType({
   quantity: numberType(),
   unit_price: unionType([numberType(), stringType()])
 });
-const PROMOTION_QUERY_KEY = "promotions";
-const promotionsQueryKeys = {
-  list: (query2) => [
-    PROMOTION_QUERY_KEY,
-    query2 ? query2 : void 0
-  ],
-  detail: (id, query2) => [
-    PROMOTION_QUERY_KEY,
-    id,
-    query2 ? query2 : void 0
-  ]
-};
-const usePromotions = (query2, options) => {
-  const { data, ...rest } = reactQuery.useQuery({
-    queryKey: promotionsQueryKeys.list(query2),
-    queryFn: async () => sdk.admin.promotion.list(query2),
-    ...options
-  });
-  return { ...data, ...rest };
-};
-const Promotions = () => {
+const InlineTip = React.forwardRef(
+  ({ variant = "tip", label, className, children, ...props }, ref) => {
+    const labelValue = label || (variant === "warning" ? "Warning" : "Tip");
+    return /* @__PURE__ */ jsxRuntime.jsxs(
+      "div",
+      {
+        ref,
+        className: ui.clx(
+          "bg-ui-bg-component txt-small text-ui-fg-subtle grid grid-cols-[4px_1fr] items-start gap-3 rounded-lg border p-3",
+          className
+        ),
+        ...props,
+        children: [
+          /* @__PURE__ */ jsxRuntime.jsx(
+            "div",
+            {
+              role: "presentation",
+              className: ui.clx("w-4px bg-ui-tag-neutral-icon h-full rounded-full", {
+                "bg-ui-tag-orange-icon": variant === "warning"
+              })
+            }
+          ),
+          /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "text-pretty", children: [
+            /* @__PURE__ */ jsxRuntime.jsxs("strong", { className: "txt-small-plus text-ui-fg-base", children: [
+              labelValue,
+              ":"
+            ] }),
+            " ",
+            children
+          ] })
+        ]
+      }
+    );
+  }
+);
+InlineTip.displayName = "InlineTip";
+const MetadataFieldSchema = objectType({
+  key: stringType(),
+  disabled: booleanType().optional(),
+  value: anyType()
+});
+const MetadataSchema = objectType({
+  metadata: arrayType(MetadataFieldSchema)
+});
+const Metadata = () => {
   const { id } = reactRouterDom.useParams();
-  const {
-    order: preview,
-    isError: isPreviewError,
-    error: previewError
-  } = useOrderPreview(id, void 0);
-  useInitiateOrderEdit({ preview });
-  const { onCancel } = useCancelOrderEdit({ preview });
-  if (isPreviewError) {
-    throw previewError;
+  const { order, isPending, isError, error } = useOrder(id, {
+    fields: "metadata"
+  });
+  if (isError) {
+    throw error;
   }
-  const isReady = !!preview;
-  return /* @__PURE__ */ jsxRuntime.jsxs(RouteDrawer, { onClose: onCancel, children: [
-    /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Header, { children: /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Title, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { children: "Edit Promotions" }) }) }),
-    isReady && /* @__PURE__ */ jsxRuntime.jsx(PromotionForm, { preview })
+  const isReady = !isPending && !!order;
+  return /* @__PURE__ */ jsxRuntime.jsxs(RouteDrawer, { children: [
+    /* @__PURE__ */ jsxRuntime.jsxs(RouteDrawer.Header, { children: [
+      /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Title, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { children: "Metadata" }) }),
+      /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Description, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx("span", { className: "sr-only", children: "Add metadata to the draft order." }) })
+    ] }),
+    !isReady ? /* @__PURE__ */ jsxRuntime.jsx(PlaceholderInner, {}) : /* @__PURE__ */ jsxRuntime.jsx(MetadataForm, { orderId: id, metadata: order == null ? void 0 : order.metadata })
   ] });
 };
-const PromotionForm = ({ preview }) => {
-  const { items, shipping_methods } = preview;
-  const [isSubmitting, setIsSubmitting] = React.useState(false);
-  const [comboboxValue, setComboboxValue] = React.useState("");
+const METADATA_KEY_LABEL_ID = "metadata-form-key-label";
+const METADATA_VALUE_LABEL_ID = "metadata-form-value-label";
+const MetadataForm = ({ orderId, metadata }) => {
   const { handleSuccess } = useRouteModal();
-  const { mutateAsync: addPromotions, isPending: isAddingPromotions } = useDraftOrderAddPromotions(preview.id);
-  const promoIds = getPromotionIds(items, shipping_methods);
-  const { promotions, isPending, isError, error } = usePromotions(
-    {
-      id: promoIds
-    },
-    {
-      enabled: !!promoIds.length
-    }
-  );
-  const comboboxData = useComboboxData({
-    queryKey: ["promotions", "combobox", promoIds],
-    queryFn: async (params) => {
-      return await sdk.admin.promotion.list({
-        ...params,
-        id: {
-          $nin: promoIds
-        }
-      });
+  const hasUneditableRows = getHasUneditableRows(metadata);
+  const { mutateAsync, isPending } = useUpdateDraftOrder(orderId);
+  const form = reactHookForm.useForm({
+    defaultValues: {
+      metadata: getDefaultValues(metadata)
     },
-    getOptions: (data) => {
-      return data.promotions.map((promotion) => ({
-        label: promotion.code,
-        value: promotion.code
-      }));
-    }
+    resolver: zod.zodResolver(MetadataSchema)
   });
-  const add = async (value) => {
-    if (!value) {
-      return;
-    }
-    addPromotions(
+  const handleSubmit = form.handleSubmit(async (data) => {
+    const parsedData = parseValues(data);
+    await mutateAsync(
       {
-        promo_codes: [value]
+        metadata: parsedData
       },
       {
-        onError: (e) => {
-          ui.toast.error(e.message);
-          comboboxData.onSearchValueChange("");
-          setComboboxValue("");
-        },
         onSuccess: () => {
-          comboboxData.onSearchValueChange("");
-          setComboboxValue("");
+          ui.toast.success("Metadata updated");
+          handleSuccess();
+        },
+        onError: (error) => {
+          ui.toast.error(error.message);
         }
       }
     );
-  };
-  const { mutateAsync: confirmOrderEdit } = useDraftOrderConfirmEdit(preview.id);
-  const { mutateAsync: requestOrderEdit } = useOrderEditRequest(preview.id);
-  const onSubmit = async () => {
-    setIsSubmitting(true);
-    let requestSucceeded = false;
-    await requestOrderEdit(void 0, {
-      onError: (e) => {
-        ui.toast.error(e.message);
-      },
-      onSuccess: () => {
-        requestSucceeded = true;
-      }
-    });
-    if (!requestSucceeded) {
-      setIsSubmitting(false);
-      return;
+  });
+  const { fields, insert, remove } = reactHookForm.useFieldArray({
+    control: form.control,
+    name: "metadata"
+  });
+  function deleteRow(index) {
+    remove(index);
+    if (fields.length === 1) {
+      insert(0, {
+        key: "",
+        value: "",
+        disabled: false
+      });
     }
-    await confirmOrderEdit(void 0, {
-      onError: (e) => {
-        ui.toast.error(e.message);
-      },
-      onSuccess: () => {
-        handleSuccess();
-      },
-      onSettled: () => {
-        setIsSubmitting(false);
-      }
+  }
+  function insertRow(index, position) {
+    insert(index + (position === "above" ? 0 : 1), {
+      key: "",
+      value: "",
+      disabled: false
     });
-  };
-  if (isError) {
-    throw error;
   }
-  return /* @__PURE__ */ jsxRuntime.jsxs(KeyboundForm, { className: "flex flex-1 flex-col", onSubmit, children: [
-    /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Body, { children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col gap-4", children: [
-      /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col gap-3", children: [
-        /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col", children: [
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Label, { size: "small", weight: "plus", htmlFor: "promotion-combobox", children: "Apply promotions" }),
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Hint, { id: "promotion-combobox-hint", children: "Manage promotions that should be applied to the order." })
-        ] }),
-        /* @__PURE__ */ jsxRuntime.jsx(
-          Combobox,
-          {
-            id: "promotion-combobox",
-            "aria-describedby": "promotion-combobox-hint",
-            isFetchingNextPage: comboboxData.isFetchingNextPage,
-            fetchNextPage: comboboxData.fetchNextPage,
+  return /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Form, { form, children: /* @__PURE__ */ jsxRuntime.jsxs(
+    KeyboundForm,
+    {
+      onSubmit: handleSubmit,
+      className: "flex flex-1 flex-col overflow-hidden",
+      children: [
+        /* @__PURE__ */ jsxRuntime.jsxs(RouteDrawer.Body, { className: "flex flex-1 flex-col gap-y-8 overflow-y-auto", children: [
+          /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "bg-ui-bg-base shadow-elevation-card-rest grid grid-cols-1 divide-y rounded-lg", children: [
+            /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "bg-ui-bg-subtle grid grid-cols-2 divide-x rounded-t-lg", children: [
+              /* @__PURE__ */ jsxRuntime.jsx("div", { className: "txt-compact-small-plus text-ui-fg-subtle px-2 py-1.5", children: /* @__PURE__ */ jsxRuntime.jsx("label", { id: METADATA_KEY_LABEL_ID, children: "Key" }) }),
+              /* @__PURE__ */ jsxRuntime.jsx("div", { className: "txt-compact-small-plus text-ui-fg-subtle px-2 py-1.5", children: /* @__PURE__ */ jsxRuntime.jsx("label", { id: METADATA_VALUE_LABEL_ID, children: "Value" }) })
+            ] }),
+            fields.map((field, index) => {
+              const isDisabled = field.disabled || false;
+              let placeholder = "-";
+              if (typeof field.value === "object") {
+                placeholder = "{ ... }";
+              }
+              if (Array.isArray(field.value)) {
+                placeholder = "[ ... ]";
+              }
+              return /* @__PURE__ */ jsxRuntime.jsx(
+                ConditionalTooltip,
+                {
+                  showTooltip: isDisabled,
+                  content: "This row is disabled because it contains non-primitive data.",
+                  children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "group/table relative", children: [
+                    /* @__PURE__ */ jsxRuntime.jsxs(
+                      "div",
+                      {
+                        className: ui.clx("grid grid-cols-2 divide-x", {
+                          "overflow-hidden rounded-b-lg": index === fields.length - 1
+                        }),
+                        children: [
+                          /* @__PURE__ */ jsxRuntime.jsx(
+                            Form$2.Field,
+                            {
+                              control: form.control,
+                              name: `metadata.${index}.key`,
+                              render: ({ field: field2 }) => {
+                                return /* @__PURE__ */ jsxRuntime.jsx(Form$2.Item, { children: /* @__PURE__ */ jsxRuntime.jsx(Form$2.Control, { children: /* @__PURE__ */ jsxRuntime.jsx(
+                                  GridInput,
+                                  {
+                                    "aria-labelledby": METADATA_KEY_LABEL_ID,
+                                    ...field2,
+                                    disabled: isDisabled,
+                                    placeholder: "Key"
+                                  }
+                                ) }) });
+                              }
+                            }
+                          ),
+                          /* @__PURE__ */ jsxRuntime.jsx(
+                            Form$2.Field,
+                            {
+                              control: form.control,
+                              name: `metadata.${index}.value`,
+                              render: ({ field: { value, ...field2 } }) => {
+                                return /* @__PURE__ */ jsxRuntime.jsx(Form$2.Item, { children: /* @__PURE__ */ jsxRuntime.jsx(Form$2.Control, { children: /* @__PURE__ */ jsxRuntime.jsx(
+                                  GridInput,
+                                  {
+                                    "aria-labelledby": METADATA_VALUE_LABEL_ID,
+                                    ...field2,
+                                    value: isDisabled ? placeholder : value,
+                                    disabled: isDisabled,
+                                    placeholder: "Value"
+                                  }
+                                ) }) });
+                              }
+                            }
+                          )
+                        ]
+                      }
+                    ),
+                    /* @__PURE__ */ jsxRuntime.jsxs(ui.DropdownMenu, { children: [
+                      /* @__PURE__ */ jsxRuntime.jsx(
+                        ui.DropdownMenu.Trigger,
+                        {
+                          className: ui.clx(
+                            "invisible absolute inset-y-0 -right-2.5 my-auto group-hover/table:visible data-[state='open']:visible",
+                            {
+                              hidden: isDisabled
+                            }
+                          ),
+                          disabled: isDisabled,
+                          asChild: true,
+                          children: /* @__PURE__ */ jsxRuntime.jsx(ui.IconButton, { size: "2xsmall", children: /* @__PURE__ */ jsxRuntime.jsx(icons.EllipsisVertical, {}) })
+                        }
+                      ),
+                      /* @__PURE__ */ jsxRuntime.jsxs(ui.DropdownMenu.Content, { children: [
+                        /* @__PURE__ */ jsxRuntime.jsxs(
+                          ui.DropdownMenu.Item,
+                          {
+                            className: "gap-x-2",
+                            onClick: () => insertRow(index, "above"),
+                            children: [
+                              /* @__PURE__ */ jsxRuntime.jsx(icons.ArrowUpMini, { className: "text-ui-fg-subtle" }),
+                              "Insert row above"
+                            ]
+                          }
+                        ),
+                        /* @__PURE__ */ jsxRuntime.jsxs(
+                          ui.DropdownMenu.Item,
+                          {
+                            className: "gap-x-2",
+                            onClick: () => insertRow(index, "below"),
+                            children: [
+                              /* @__PURE__ */ jsxRuntime.jsx(icons.ArrowDownMini, { className: "text-ui-fg-subtle" }),
+                              "Insert row below"
+                            ]
+                          }
+                        ),
+                        /* @__PURE__ */ jsxRuntime.jsx(ui.DropdownMenu.Separator, {}),
+                        /* @__PURE__ */ jsxRuntime.jsxs(
+                          ui.DropdownMenu.Item,
+                          {
+                            className: "gap-x-2",
+                            onClick: () => deleteRow(index),
+                            children: [
+                              /* @__PURE__ */ jsxRuntime.jsx(icons.Trash, { className: "text-ui-fg-subtle" }),
+                              "Delete row"
+                            ]
+                          }
+                        )
+                      ] })
+                    ] })
+                  ] })
+                },
+                field.id
+              );
+            })
+          ] }),
+          hasUneditableRows && /* @__PURE__ */ jsxRuntime.jsx(InlineTip, { variant: "warning", label: "Some rows are disabled", children: "This object contains non-primitive metadata, such as arrays or objects, that can't be edited here. To edit the disabled rows, use the API directly." })
+        ] }),
+        /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Footer, { children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center justify-end gap-x-2", children: [
+          /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Close, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.Button, { size: "small", variant: "secondary", type: "button", children: "Cancel" }) }),
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Button, { size: "small", type: "submit", isLoading: isPending, children: "Save" })
+        ] }) })
+      ]
+    }
+  ) });
+};
+const GridInput = React.forwardRef(({ className, ...props }, ref) => {
+  return /* @__PURE__ */ jsxRuntime.jsx(
+    "input",
+    {
+      ref,
+      ...props,
+      autoComplete: "off",
+      className: ui.clx(
+        "txt-compact-small text-ui-fg-base placeholder:text-ui-fg-muted disabled:text-ui-fg-disabled disabled:bg-ui-bg-base bg-transparent px-2 py-1.5 outline-none",
+        className
+      )
+    }
+  );
+});
+GridInput.displayName = "MetadataForm.GridInput";
+const PlaceholderInner = () => {
+  return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-1 flex-col overflow-hidden", children: [
+    /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Body, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Skeleton, { className: "h-[148ox] w-full rounded-lg" }) }),
+    /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Footer, { children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center justify-end gap-x-2", children: [
+      /* @__PURE__ */ jsxRuntime.jsx(ui.Skeleton, { className: "h-7 w-12 rounded-md" }),
+      /* @__PURE__ */ jsxRuntime.jsx(ui.Skeleton, { className: "h-7 w-12 rounded-md" })
+    ] }) })
+  ] });
+};
+const EDITABLE_TYPES = ["string", "number", "boolean"];
+function getDefaultValues(metadata) {
+  if (!metadata || !Object.keys(metadata).length) {
+    return [
+      {
+        key: "",
+        value: "",
+        disabled: false
+      }
+    ];
+  }
+  return Object.entries(metadata).map(([key, value]) => {
+    if (!EDITABLE_TYPES.includes(typeof value)) {
+      return {
+        key,
+        value,
+        disabled: true
+      };
+    }
+    let stringValue = value;
+    if (typeof value !== "string") {
+      stringValue = JSON.stringify(value);
+    }
+    return {
+      key,
+      value: stringValue,
+      original_key: key
+    };
+  });
+}
+function parseValues(values) {
+  const metadata = values.metadata;
+  const isEmpty = !metadata.length || metadata.length === 1 && !metadata[0].key && !metadata[0].value;
+  if (isEmpty) {
+    return null;
+  }
+  const update = {};
+  metadata.forEach((field) => {
+    let key = field.key;
+    let value = field.value;
+    const disabled = field.disabled;
+    if (!key || !value) {
+      return;
+    }
+    if (disabled) {
+      update[key] = value;
+      return;
+    }
+    key = key.trim();
+    value = value.trim();
+    if (value === "true") {
+      update[key] = true;
+    } else if (value === "false") {
+      update[key] = false;
+    } else {
+      const parsedNumber = parseFloat(value);
+      if (!isNaN(parsedNumber)) {
+        update[key] = parsedNumber;
+      } else {
+        update[key] = value;
+      }
+    }
+  });
+  return update;
+}
+function getHasUneditableRows(metadata) {
+  if (!metadata) {
+    return false;
+  }
+  return Object.values(metadata).some(
+    (value) => !EDITABLE_TYPES.includes(typeof value)
+  );
+}
+const PROMOTION_QUERY_KEY = "promotions";
+const promotionsQueryKeys = {
+  list: (query2) => [
+    PROMOTION_QUERY_KEY,
+    query2 ? query2 : void 0
+  ],
+  detail: (id, query2) => [
+    PROMOTION_QUERY_KEY,
+    id,
+    query2 ? query2 : void 0
+  ]
+};
+const usePromotions = (query2, options) => {
+  const { data, ...rest } = reactQuery.useQuery({
+    queryKey: promotionsQueryKeys.list(query2),
+    queryFn: async () => sdk.admin.promotion.list(query2),
+    ...options
+  });
+  return { ...data, ...rest };
+};
+const Promotions = () => {
+  const { id } = reactRouterDom.useParams();
+  const {
+    order: preview,
+    isError: isPreviewError,
+    error: previewError
+  } = useOrderPreview(id, void 0);
+  useInitiateOrderEdit({ preview });
+  const { onCancel } = useCancelOrderEdit({ preview });
+  if (isPreviewError) {
+    throw previewError;
+  }
+  const isReady = !!preview;
+  return /* @__PURE__ */ jsxRuntime.jsxs(RouteDrawer, { onClose: onCancel, children: [
+    /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Header, { children: /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Title, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { children: "Edit Promotions" }) }) }),
+    isReady && /* @__PURE__ */ jsxRuntime.jsx(PromotionForm, { preview })
+  ] });
+};
+const PromotionForm = ({ preview }) => {
+  const { items, shipping_methods } = preview;
+  const [isSubmitting, setIsSubmitting] = React.useState(false);
+  const [comboboxValue, setComboboxValue] = React.useState("");
+  const { handleSuccess } = useRouteModal();
+  const { mutateAsync: addPromotions, isPending: isAddingPromotions } = useDraftOrderAddPromotions(preview.id);
+  const promoIds = getPromotionIds(items, shipping_methods);
+  const { promotions, isPending, isError, error } = usePromotions(
+    {
+      id: promoIds
+    },
+    {
+      enabled: !!promoIds.length
+    }
+  );
+  const comboboxData = useComboboxData({
+    queryKey: ["promotions", "combobox", promoIds],
+    queryFn: async (params) => {
+      return await sdk.admin.promotion.list({
+        ...params,
+        id: {
+          $nin: promoIds
+        }
+      });
+    },
+    getOptions: (data) => {
+      return data.promotions.map((promotion) => ({
+        label: promotion.code,
+        value: promotion.code
+      }));
+    }
+  });
+  const add = async (value) => {
+    if (!value) {
+      return;
+    }
+    addPromotions(
+      {
+        promo_codes: [value]
+      },
+      {
+        onError: (e) => {
+          ui.toast.error(e.message);
+          comboboxData.onSearchValueChange("");
+          setComboboxValue("");
+        },
+        onSuccess: () => {
+          comboboxData.onSearchValueChange("");
+          setComboboxValue("");
+        }
+      }
+    );
+  };
+  const { mutateAsync: confirmOrderEdit } = useDraftOrderConfirmEdit(preview.id);
+  const { mutateAsync: requestOrderEdit } = useOrderEditRequest(preview.id);
+  const onSubmit = async () => {
+    setIsSubmitting(true);
+    let requestSucceeded = false;
+    await requestOrderEdit(void 0, {
+      onError: (e) => {
+        ui.toast.error(e.message);
+      },
+      onSuccess: () => {
+        requestSucceeded = true;
+      }
+    });
+    if (!requestSucceeded) {
+      setIsSubmitting(false);
+      return;
+    }
+    await confirmOrderEdit(void 0, {
+      onError: (e) => {
+        ui.toast.error(e.message);
+      },
+      onSuccess: () => {
+        handleSuccess();
+      },
+      onSettled: () => {
+        setIsSubmitting(false);
+      }
+    });
+  };
+  if (isError) {
+    throw error;
+  }
+  return /* @__PURE__ */ jsxRuntime.jsxs(KeyboundForm, { className: "flex flex-1 flex-col", onSubmit, children: [
+    /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Body, { children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col gap-4", children: [
+      /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col gap-3", children: [
+        /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col", children: [
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Label, { size: "small", weight: "plus", htmlFor: "promotion-combobox", children: "Apply promotions" }),
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Hint, { id: "promotion-combobox-hint", children: "Manage promotions that should be applied to the order." })
+        ] }),
+        /* @__PURE__ */ jsxRuntime.jsx(
+          Combobox,
+          {
+            id: "promotion-combobox",
+            "aria-describedby": "promotion-combobox-hint",
+            isFetchingNextPage: comboboxData.isFetchingNextPage,
+            fetchNextPage: comboboxData.fetchNextPage,
             options: comboboxData.options,
             onSearchValueChange: comboboxData.onSearchValueChange,
             searchValue: comboboxData.searchValue,
@@ -12007,216 +12357,13 @@ const CustomAmountField = ({
               onValueChange: (value) => onChange(value),
               symbol: getNativeSymbol(currencyCode),
               code: currencyCode
-            }
-          ) })
-        ] });
-      }
-    }
-  );
-};
-const ShippingAddress = () => {
-  const { id } = reactRouterDom.useParams();
-  const { order, isPending, isError, error } = useOrder(id, {
-    fields: "+shipping_address"
-  });
-  if (isError) {
-    throw error;
-  }
-  const isReady = !isPending && !!order;
-  return /* @__PURE__ */ jsxRuntime.jsxs(RouteDrawer, { children: [
-    /* @__PURE__ */ jsxRuntime.jsxs(RouteDrawer.Header, { children: [
-      /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Title, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { children: "Edit Shipping Address" }) }),
-      /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Description, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx("span", { className: "sr-only", children: "Edit the shipping address for the draft order" }) })
-    ] }),
-    isReady && /* @__PURE__ */ jsxRuntime.jsx(ShippingAddressForm, { order })
-  ] });
-};
-const ShippingAddressForm = ({ order }) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
-  const form = reactHookForm.useForm({
-    defaultValues: {
-      first_name: ((_a = order.shipping_address) == null ? void 0 : _a.first_name) ?? "",
-      last_name: ((_b = order.shipping_address) == null ? void 0 : _b.last_name) ?? "",
-      company: ((_c = order.shipping_address) == null ? void 0 : _c.company) ?? "",
-      address_1: ((_d = order.shipping_address) == null ? void 0 : _d.address_1) ?? "",
-      address_2: ((_e = order.shipping_address) == null ? void 0 : _e.address_2) ?? "",
-      city: ((_f = order.shipping_address) == null ? void 0 : _f.city) ?? "",
-      province: ((_g = order.shipping_address) == null ? void 0 : _g.province) ?? "",
-      country_code: ((_h = order.shipping_address) == null ? void 0 : _h.country_code) ?? "",
-      postal_code: ((_i = order.shipping_address) == null ? void 0 : _i.postal_code) ?? "",
-      phone: ((_j = order.shipping_address) == null ? void 0 : _j.phone) ?? ""
-    },
-    resolver: zod.zodResolver(schema$1)
-  });
-  const { mutateAsync, isPending } = useUpdateDraftOrder(order.id);
-  const { handleSuccess } = useRouteModal();
-  const onSubmit = form.handleSubmit(async (data) => {
-    await mutateAsync(
-      {
-        shipping_address: {
-          first_name: data.first_name,
-          last_name: data.last_name,
-          company: data.company,
-          address_1: data.address_1,
-          address_2: data.address_2,
-          city: data.city,
-          province: data.province,
-          country_code: data.country_code,
-          postal_code: data.postal_code,
-          phone: data.phone
-        }
-      },
-      {
-        onSuccess: () => {
-          handleSuccess();
-        },
-        onError: (error) => {
-          ui.toast.error(error.message);
-        }
-      }
-    );
-  });
-  return /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Form, { form, children: /* @__PURE__ */ jsxRuntime.jsxs(
-    KeyboundForm,
-    {
-      className: "flex flex-1 flex-col overflow-hidden",
-      onSubmit,
-      children: [
-        /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Body, { className: "flex flex-col gap-y-6 overflow-y-auto", children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col gap-y-4", children: [
-          /* @__PURE__ */ jsxRuntime.jsx(
-            Form$2.Field,
-            {
-              control: form.control,
-              name: "country_code",
-              render: ({ field }) => /* @__PURE__ */ jsxRuntime.jsxs(Form$2.Item, { children: [
-                /* @__PURE__ */ jsxRuntime.jsx(Form$2.Label, { children: "Country" }),
-                /* @__PURE__ */ jsxRuntime.jsx(Form$2.Control, { children: /* @__PURE__ */ jsxRuntime.jsx(CountrySelect, { ...field }) }),
-                /* @__PURE__ */ jsxRuntime.jsx(Form$2.ErrorMessage, {})
-              ] })
-            }
-          ),
-          /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "grid grid-cols-2 gap-4", children: [
-            /* @__PURE__ */ jsxRuntime.jsx(
-              Form$2.Field,
-              {
-                control: form.control,
-                name: "first_name",
-                render: ({ field }) => /* @__PURE__ */ jsxRuntime.jsxs(Form$2.Item, { children: [
-                  /* @__PURE__ */ jsxRuntime.jsx(Form$2.Label, { children: "First name" }),
-                  /* @__PURE__ */ jsxRuntime.jsx(Form$2.Control, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Input, { ...field }) }),
-                  /* @__PURE__ */ jsxRuntime.jsx(Form$2.ErrorMessage, {})
-                ] })
-              }
-            ),
-            /* @__PURE__ */ jsxRuntime.jsx(
-              Form$2.Field,
-              {
-                control: form.control,
-                name: "last_name",
-                render: ({ field }) => /* @__PURE__ */ jsxRuntime.jsxs(Form$2.Item, { children: [
-                  /* @__PURE__ */ jsxRuntime.jsx(Form$2.Label, { children: "Last name" }),
-                  /* @__PURE__ */ jsxRuntime.jsx(Form$2.Control, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Input, { ...field }) }),
-                  /* @__PURE__ */ jsxRuntime.jsx(Form$2.ErrorMessage, {})
-                ] })
-              }
-            )
-          ] }),
-          /* @__PURE__ */ jsxRuntime.jsx(
-            Form$2.Field,
-            {
-              control: form.control,
-              name: "company",
-              render: ({ field }) => /* @__PURE__ */ jsxRuntime.jsxs(Form$2.Item, { children: [
-                /* @__PURE__ */ jsxRuntime.jsx(Form$2.Label, { optional: true, children: "Company" }),
-                /* @__PURE__ */ jsxRuntime.jsx(Form$2.Control, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Input, { ...field }) }),
-                /* @__PURE__ */ jsxRuntime.jsx(Form$2.ErrorMessage, {})
-              ] })
-            }
-          ),
-          /* @__PURE__ */ jsxRuntime.jsx(
-            Form$2.Field,
-            {
-              control: form.control,
-              name: "address_1",
-              render: ({ field }) => /* @__PURE__ */ jsxRuntime.jsxs(Form$2.Item, { children: [
-                /* @__PURE__ */ jsxRuntime.jsx(Form$2.Label, { children: "Address" }),
-                /* @__PURE__ */ jsxRuntime.jsx(Form$2.Control, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Input, { ...field }) }),
-                /* @__PURE__ */ jsxRuntime.jsx(Form$2.ErrorMessage, {})
-              ] })
-            }
-          ),
-          /* @__PURE__ */ jsxRuntime.jsx(
-            Form$2.Field,
-            {
-              control: form.control,
-              name: "address_2",
-              render: ({ field }) => /* @__PURE__ */ jsxRuntime.jsxs(Form$2.Item, { children: [
-                /* @__PURE__ */ jsxRuntime.jsx(Form$2.Label, { optional: true, children: "Apartment, suite, etc." }),
-                /* @__PURE__ */ jsxRuntime.jsx(Form$2.Control, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Input, { ...field }) }),
-                /* @__PURE__ */ jsxRuntime.jsx(Form$2.ErrorMessage, {})
-              ] })
-            }
-          ),
-          /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "grid grid-cols-2 gap-4", children: [
-            /* @__PURE__ */ jsxRuntime.jsx(
-              Form$2.Field,
-              {
-                control: form.control,
-                name: "postal_code",
-                render: ({ field }) => /* @__PURE__ */ jsxRuntime.jsxs(Form$2.Item, { children: [
-                  /* @__PURE__ */ jsxRuntime.jsx(Form$2.Label, { children: "Postal code" }),
-                  /* @__PURE__ */ jsxRuntime.jsx(Form$2.Control, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Input, { ...field }) }),
-                  /* @__PURE__ */ jsxRuntime.jsx(Form$2.ErrorMessage, {})
-                ] })
-              }
-            ),
-            /* @__PURE__ */ jsxRuntime.jsx(
-              Form$2.Field,
-              {
-                control: form.control,
-                name: "city",
-                render: ({ field }) => /* @__PURE__ */ jsxRuntime.jsxs(Form$2.Item, { children: [
-                  /* @__PURE__ */ jsxRuntime.jsx(Form$2.Label, { children: "City" }),
-                  /* @__PURE__ */ jsxRuntime.jsx(Form$2.Control, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Input, { ...field }) }),
-                  /* @__PURE__ */ jsxRuntime.jsx(Form$2.ErrorMessage, {})
-                ] })
-              }
-            )
-          ] }),
-          /* @__PURE__ */ jsxRuntime.jsx(
-            Form$2.Field,
-            {
-              control: form.control,
-              name: "province",
-              render: ({ field }) => /* @__PURE__ */ jsxRuntime.jsxs(Form$2.Item, { children: [
-                /* @__PURE__ */ jsxRuntime.jsx(Form$2.Label, { optional: true, children: "Province / State" }),
-                /* @__PURE__ */ jsxRuntime.jsx(Form$2.Control, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Input, { ...field }) }),
-                /* @__PURE__ */ jsxRuntime.jsx(Form$2.ErrorMessage, {})
-              ] })
-            }
-          ),
-          /* @__PURE__ */ jsxRuntime.jsx(
-            Form$2.Field,
-            {
-              control: form.control,
-              name: "phone",
-              render: ({ field }) => /* @__PURE__ */ jsxRuntime.jsxs(Form$2.Item, { children: [
-                /* @__PURE__ */ jsxRuntime.jsx(Form$2.Label, { optional: true, children: "Phone" }),
-                /* @__PURE__ */ jsxRuntime.jsx(Form$2.Control, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Input, { ...field }) }),
-                /* @__PURE__ */ jsxRuntime.jsx(Form$2.ErrorMessage, {})
-              ] })
-            }
-          )
-        ] }) }),
-        /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Footer, { children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex justify-end gap-2", children: [
-          /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Close, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.Button, { size: "small", variant: "secondary", children: "Cancel" }) }),
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Button, { size: "small", type: "submit", isLoading: isPending, children: "Save" })
-        ] }) })
-      ]
+            }
+          ) })
+        ] });
+      }
     }
-  ) });
+  );
 };
-const schema$1 = addressSchema;
 const TransferOwnership = () => {
   const { id } = reactRouterDom.useParams();
   const { draft_order, isPending, isError, error } = useDraftOrder(id, {
@@ -12240,7 +12387,7 @@ const TransferOwnershipForm = ({ order }) => {
     defaultValues: {
       customer_id: order.customer_id || ""
     },
-    resolver: zod.zodResolver(schema)
+    resolver: zod.zodResolver(schema$1)
   });
   const { mutateAsync, isPending } = useUpdateDraftOrder(order.id);
   const { handleSuccess } = useRouteModal();
@@ -12690,57 +12837,13 @@ const Illustration = () => {
     }
   );
 };
-const schema = objectType({
+const schema$1 = objectType({
   customer_id: stringType().min(1)
 });
-const InlineTip = React.forwardRef(
-  ({ variant = "tip", label, className, children, ...props }, ref) => {
-    const labelValue = label || (variant === "warning" ? "Warning" : "Tip");
-    return /* @__PURE__ */ jsxRuntime.jsxs(
-      "div",
-      {
-        ref,
-        className: ui.clx(
-          "bg-ui-bg-component txt-small text-ui-fg-subtle grid grid-cols-[4px_1fr] items-start gap-3 rounded-lg border p-3",
-          className
-        ),
-        ...props,
-        children: [
-          /* @__PURE__ */ jsxRuntime.jsx(
-            "div",
-            {
-              role: "presentation",
-              className: ui.clx("w-4px bg-ui-tag-neutral-icon h-full rounded-full", {
-                "bg-ui-tag-orange-icon": variant === "warning"
-              })
-            }
-          ),
-          /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "text-pretty", children: [
-            /* @__PURE__ */ jsxRuntime.jsxs("strong", { className: "txt-small-plus text-ui-fg-base", children: [
-              labelValue,
-              ":"
-            ] }),
-            " ",
-            children
-          ] })
-        ]
-      }
-    );
-  }
-);
-InlineTip.displayName = "InlineTip";
-const MetadataFieldSchema = objectType({
-  key: stringType(),
-  disabled: booleanType().optional(),
-  value: anyType()
-});
-const MetadataSchema = objectType({
-  metadata: arrayType(MetadataFieldSchema)
-});
-const Metadata = () => {
+const ShippingAddress = () => {
   const { id } = reactRouterDom.useParams();
   const { order, isPending, isError, error } = useOrder(id, {
-    fields: "metadata"
+    fields: "+shipping_address"
   });
   if (isError) {
     throw error;
@@ -12748,301 +12851,198 @@ const Metadata = () => {
   const isReady = !isPending && !!order;
   return /* @__PURE__ */ jsxRuntime.jsxs(RouteDrawer, { children: [
     /* @__PURE__ */ jsxRuntime.jsxs(RouteDrawer.Header, { children: [
-      /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Title, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { children: "Metadata" }) }),
-      /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Description, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx("span", { className: "sr-only", children: "Add metadata to the draft order." }) })
+      /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Title, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { children: "Edit Shipping Address" }) }),
+      /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Description, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx("span", { className: "sr-only", children: "Edit the shipping address for the draft order" }) })
     ] }),
-    !isReady ? /* @__PURE__ */ jsxRuntime.jsx(PlaceholderInner, {}) : /* @__PURE__ */ jsxRuntime.jsx(MetadataForm, { orderId: id, metadata: order == null ? void 0 : order.metadata })
+    isReady && /* @__PURE__ */ jsxRuntime.jsx(ShippingAddressForm, { order })
   ] });
 };
-const METADATA_KEY_LABEL_ID = "metadata-form-key-label";
-const METADATA_VALUE_LABEL_ID = "metadata-form-value-label";
-const MetadataForm = ({ orderId, metadata }) => {
-  const { handleSuccess } = useRouteModal();
-  const hasUneditableRows = getHasUneditableRows(metadata);
-  const { mutateAsync, isPending } = useUpdateDraftOrder(orderId);
+const ShippingAddressForm = ({ order }) => {
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
   const form = reactHookForm.useForm({
     defaultValues: {
-      metadata: getDefaultValues(metadata)
+      first_name: ((_a = order.shipping_address) == null ? void 0 : _a.first_name) ?? "",
+      last_name: ((_b = order.shipping_address) == null ? void 0 : _b.last_name) ?? "",
+      company: ((_c = order.shipping_address) == null ? void 0 : _c.company) ?? "",
+      address_1: ((_d = order.shipping_address) == null ? void 0 : _d.address_1) ?? "",
+      address_2: ((_e = order.shipping_address) == null ? void 0 : _e.address_2) ?? "",
+      city: ((_f = order.shipping_address) == null ? void 0 : _f.city) ?? "",
+      province: ((_g = order.shipping_address) == null ? void 0 : _g.province) ?? "",
+      country_code: ((_h = order.shipping_address) == null ? void 0 : _h.country_code) ?? "",
+      postal_code: ((_i = order.shipping_address) == null ? void 0 : _i.postal_code) ?? "",
+      phone: ((_j = order.shipping_address) == null ? void 0 : _j.phone) ?? ""
     },
-    resolver: zod.zodResolver(MetadataSchema)
+    resolver: zod.zodResolver(schema)
   });
-  const handleSubmit = form.handleSubmit(async (data) => {
-    const parsedData = parseValues(data);
+  const { mutateAsync, isPending } = useUpdateDraftOrder(order.id);
+  const { handleSuccess } = useRouteModal();
+  const onSubmit = form.handleSubmit(async (data) => {
     await mutateAsync(
       {
-        metadata: parsedData
+        shipping_address: {
+          first_name: data.first_name,
+          last_name: data.last_name,
+          company: data.company,
+          address_1: data.address_1,
+          address_2: data.address_2,
+          city: data.city,
+          province: data.province,
+          country_code: data.country_code,
+          postal_code: data.postal_code,
+          phone: data.phone
+        }
       },
       {
         onSuccess: () => {
-          ui.toast.success("Metadata updated");
           handleSuccess();
         },
         onError: (error) => {
           ui.toast.error(error.message);
         }
       }
-    );
-  });
-  const { fields, insert, remove } = reactHookForm.useFieldArray({
-    control: form.control,
-    name: "metadata"
-  });
-  function deleteRow(index) {
-    remove(index);
-    if (fields.length === 1) {
-      insert(0, {
-        key: "",
-        value: "",
-        disabled: false
-      });
-    }
-  }
-  function insertRow(index, position) {
-    insert(index + (position === "above" ? 0 : 1), {
-      key: "",
-      value: "",
-      disabled: false
-    });
-  }
-  return /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Form, { form, children: /* @__PURE__ */ jsxRuntime.jsxs(
-    KeyboundForm,
-    {
-      onSubmit: handleSubmit,
-      className: "flex flex-1 flex-col overflow-hidden",
-      children: [
-        /* @__PURE__ */ jsxRuntime.jsxs(RouteDrawer.Body, { className: "flex flex-1 flex-col gap-y-8 overflow-y-auto", children: [
-          /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "bg-ui-bg-base shadow-elevation-card-rest grid grid-cols-1 divide-y rounded-lg", children: [
-            /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "bg-ui-bg-subtle grid grid-cols-2 divide-x rounded-t-lg", children: [
-              /* @__PURE__ */ jsxRuntime.jsx("div", { className: "txt-compact-small-plus text-ui-fg-subtle px-2 py-1.5", children: /* @__PURE__ */ jsxRuntime.jsx("label", { id: METADATA_KEY_LABEL_ID, children: "Key" }) }),
-              /* @__PURE__ */ jsxRuntime.jsx("div", { className: "txt-compact-small-plus text-ui-fg-subtle px-2 py-1.5", children: /* @__PURE__ */ jsxRuntime.jsx("label", { id: METADATA_VALUE_LABEL_ID, children: "Value" }) })
-            ] }),
-            fields.map((field, index) => {
-              const isDisabled = field.disabled || false;
-              let placeholder = "-";
-              if (typeof field.value === "object") {
-                placeholder = "{ ... }";
-              }
-              if (Array.isArray(field.value)) {
-                placeholder = "[ ... ]";
-              }
-              return /* @__PURE__ */ jsxRuntime.jsx(
-                ConditionalTooltip,
-                {
-                  showTooltip: isDisabled,
-                  content: "This row is disabled because it contains non-primitive data.",
-                  children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "group/table relative", children: [
-                    /* @__PURE__ */ jsxRuntime.jsxs(
-                      "div",
-                      {
-                        className: ui.clx("grid grid-cols-2 divide-x", {
-                          "overflow-hidden rounded-b-lg": index === fields.length - 1
-                        }),
-                        children: [
-                          /* @__PURE__ */ jsxRuntime.jsx(
-                            Form$2.Field,
-                            {
-                              control: form.control,
-                              name: `metadata.${index}.key`,
-                              render: ({ field: field2 }) => {
-                                return /* @__PURE__ */ jsxRuntime.jsx(Form$2.Item, { children: /* @__PURE__ */ jsxRuntime.jsx(Form$2.Control, { children: /* @__PURE__ */ jsxRuntime.jsx(
-                                  GridInput,
-                                  {
-                                    "aria-labelledby": METADATA_KEY_LABEL_ID,
-                                    ...field2,
-                                    disabled: isDisabled,
-                                    placeholder: "Key"
-                                  }
-                                ) }) });
-                              }
-                            }
-                          ),
-                          /* @__PURE__ */ jsxRuntime.jsx(
-                            Form$2.Field,
-                            {
-                              control: form.control,
-                              name: `metadata.${index}.value`,
-                              render: ({ field: { value, ...field2 } }) => {
-                                return /* @__PURE__ */ jsxRuntime.jsx(Form$2.Item, { children: /* @__PURE__ */ jsxRuntime.jsx(Form$2.Control, { children: /* @__PURE__ */ jsxRuntime.jsx(
-                                  GridInput,
-                                  {
-                                    "aria-labelledby": METADATA_VALUE_LABEL_ID,
-                                    ...field2,
-                                    value: isDisabled ? placeholder : value,
-                                    disabled: isDisabled,
-                                    placeholder: "Value"
-                                  }
-                                ) }) });
-                              }
-                            }
-                          )
-                        ]
-                      }
-                    ),
-                    /* @__PURE__ */ jsxRuntime.jsxs(ui.DropdownMenu, { children: [
-                      /* @__PURE__ */ jsxRuntime.jsx(
-                        ui.DropdownMenu.Trigger,
-                        {
-                          className: ui.clx(
-                            "invisible absolute inset-y-0 -right-2.5 my-auto group-hover/table:visible data-[state='open']:visible",
-                            {
-                              hidden: isDisabled
-                            }
-                          ),
-                          disabled: isDisabled,
-                          asChild: true,
-                          children: /* @__PURE__ */ jsxRuntime.jsx(ui.IconButton, { size: "2xsmall", children: /* @__PURE__ */ jsxRuntime.jsx(icons.EllipsisVertical, {}) })
-                        }
-                      ),
-                      /* @__PURE__ */ jsxRuntime.jsxs(ui.DropdownMenu.Content, { children: [
-                        /* @__PURE__ */ jsxRuntime.jsxs(
-                          ui.DropdownMenu.Item,
-                          {
-                            className: "gap-x-2",
-                            onClick: () => insertRow(index, "above"),
-                            children: [
-                              /* @__PURE__ */ jsxRuntime.jsx(icons.ArrowUpMini, { className: "text-ui-fg-subtle" }),
-                              "Insert row above"
-                            ]
-                          }
-                        ),
-                        /* @__PURE__ */ jsxRuntime.jsxs(
-                          ui.DropdownMenu.Item,
-                          {
-                            className: "gap-x-2",
-                            onClick: () => insertRow(index, "below"),
-                            children: [
-                              /* @__PURE__ */ jsxRuntime.jsx(icons.ArrowDownMini, { className: "text-ui-fg-subtle" }),
-                              "Insert row below"
-                            ]
-                          }
-                        ),
-                        /* @__PURE__ */ jsxRuntime.jsx(ui.DropdownMenu.Separator, {}),
-                        /* @__PURE__ */ jsxRuntime.jsxs(
-                          ui.DropdownMenu.Item,
-                          {
-                            className: "gap-x-2",
-                            onClick: () => deleteRow(index),
-                            children: [
-                              /* @__PURE__ */ jsxRuntime.jsx(icons.Trash, { className: "text-ui-fg-subtle" }),
-                              "Delete row"
-                            ]
-                          }
-                        )
-                      ] })
-                    ] })
-                  ] })
-                },
-                field.id
-              );
-            })
+    );
+  });
+  return /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Form, { form, children: /* @__PURE__ */ jsxRuntime.jsxs(
+    KeyboundForm,
+    {
+      className: "flex flex-1 flex-col overflow-hidden",
+      onSubmit,
+      children: [
+        /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Body, { className: "flex flex-col gap-y-6 overflow-y-auto", children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col gap-y-4", children: [
+          /* @__PURE__ */ jsxRuntime.jsx(
+            Form$2.Field,
+            {
+              control: form.control,
+              name: "country_code",
+              render: ({ field }) => /* @__PURE__ */ jsxRuntime.jsxs(Form$2.Item, { children: [
+                /* @__PURE__ */ jsxRuntime.jsx(Form$2.Label, { children: "Country" }),
+                /* @__PURE__ */ jsxRuntime.jsx(Form$2.Control, { children: /* @__PURE__ */ jsxRuntime.jsx(CountrySelect, { ...field }) }),
+                /* @__PURE__ */ jsxRuntime.jsx(Form$2.ErrorMessage, {})
+              ] })
+            }
+          ),
+          /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "grid grid-cols-2 gap-4", children: [
+            /* @__PURE__ */ jsxRuntime.jsx(
+              Form$2.Field,
+              {
+                control: form.control,
+                name: "first_name",
+                render: ({ field }) => /* @__PURE__ */ jsxRuntime.jsxs(Form$2.Item, { children: [
+                  /* @__PURE__ */ jsxRuntime.jsx(Form$2.Label, { children: "First name" }),
+                  /* @__PURE__ */ jsxRuntime.jsx(Form$2.Control, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Input, { ...field }) }),
+                  /* @__PURE__ */ jsxRuntime.jsx(Form$2.ErrorMessage, {})
+                ] })
+              }
+            ),
+            /* @__PURE__ */ jsxRuntime.jsx(
+              Form$2.Field,
+              {
+                control: form.control,
+                name: "last_name",
+                render: ({ field }) => /* @__PURE__ */ jsxRuntime.jsxs(Form$2.Item, { children: [
+                  /* @__PURE__ */ jsxRuntime.jsx(Form$2.Label, { children: "Last name" }),
+                  /* @__PURE__ */ jsxRuntime.jsx(Form$2.Control, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Input, { ...field }) }),
+                  /* @__PURE__ */ jsxRuntime.jsx(Form$2.ErrorMessage, {})
+                ] })
+              }
+            )
           ] }),
-          hasUneditableRows && /* @__PURE__ */ jsxRuntime.jsx(InlineTip, { variant: "warning", label: "Some rows are disabled", children: "This object contains non-primitive metadata, such as arrays or objects, that can't be edited here. To edit the disabled rows, use the API directly." })
-        ] }),
-        /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Footer, { children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center justify-end gap-x-2", children: [
-          /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Close, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.Button, { size: "small", variant: "secondary", type: "button", children: "Cancel" }) }),
+          /* @__PURE__ */ jsxRuntime.jsx(
+            Form$2.Field,
+            {
+              control: form.control,
+              name: "company",
+              render: ({ field }) => /* @__PURE__ */ jsxRuntime.jsxs(Form$2.Item, { children: [
+                /* @__PURE__ */ jsxRuntime.jsx(Form$2.Label, { optional: true, children: "Company" }),
+                /* @__PURE__ */ jsxRuntime.jsx(Form$2.Control, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Input, { ...field }) }),
+                /* @__PURE__ */ jsxRuntime.jsx(Form$2.ErrorMessage, {})
+              ] })
+            }
+          ),
+          /* @__PURE__ */ jsxRuntime.jsx(
+            Form$2.Field,
+            {
+              control: form.control,
+              name: "address_1",
+              render: ({ field }) => /* @__PURE__ */ jsxRuntime.jsxs(Form$2.Item, { children: [
+                /* @__PURE__ */ jsxRuntime.jsx(Form$2.Label, { children: "Address" }),
+                /* @__PURE__ */ jsxRuntime.jsx(Form$2.Control, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Input, { ...field }) }),
+                /* @__PURE__ */ jsxRuntime.jsx(Form$2.ErrorMessage, {})
+              ] })
+            }
+          ),
+          /* @__PURE__ */ jsxRuntime.jsx(
+            Form$2.Field,
+            {
+              control: form.control,
+              name: "address_2",
+              render: ({ field }) => /* @__PURE__ */ jsxRuntime.jsxs(Form$2.Item, { children: [
+                /* @__PURE__ */ jsxRuntime.jsx(Form$2.Label, { optional: true, children: "Apartment, suite, etc." }),
+                /* @__PURE__ */ jsxRuntime.jsx(Form$2.Control, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Input, { ...field }) }),
+                /* @__PURE__ */ jsxRuntime.jsx(Form$2.ErrorMessage, {})
+              ] })
+            }
+          ),
+          /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "grid grid-cols-2 gap-4", children: [
+            /* @__PURE__ */ jsxRuntime.jsx(
+              Form$2.Field,
+              {
+                control: form.control,
+                name: "postal_code",
+                render: ({ field }) => /* @__PURE__ */ jsxRuntime.jsxs(Form$2.Item, { children: [
+                  /* @__PURE__ */ jsxRuntime.jsx(Form$2.Label, { children: "Postal code" }),
+                  /* @__PURE__ */ jsxRuntime.jsx(Form$2.Control, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Input, { ...field }) }),
+                  /* @__PURE__ */ jsxRuntime.jsx(Form$2.ErrorMessage, {})
+                ] })
+              }
+            ),
+            /* @__PURE__ */ jsxRuntime.jsx(
+              Form$2.Field,
+              {
+                control: form.control,
+                name: "city",
+                render: ({ field }) => /* @__PURE__ */ jsxRuntime.jsxs(Form$2.Item, { children: [
+                  /* @__PURE__ */ jsxRuntime.jsx(Form$2.Label, { children: "City" }),
+                  /* @__PURE__ */ jsxRuntime.jsx(Form$2.Control, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Input, { ...field }) }),
+                  /* @__PURE__ */ jsxRuntime.jsx(Form$2.ErrorMessage, {})
+                ] })
+              }
+            )
+          ] }),
+          /* @__PURE__ */ jsxRuntime.jsx(
+            Form$2.Field,
+            {
+              control: form.control,
+              name: "province",
+              render: ({ field }) => /* @__PURE__ */ jsxRuntime.jsxs(Form$2.Item, { children: [
+                /* @__PURE__ */ jsxRuntime.jsx(Form$2.Label, { optional: true, children: "Province / State" }),
+                /* @__PURE__ */ jsxRuntime.jsx(Form$2.Control, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Input, { ...field }) }),
+                /* @__PURE__ */ jsxRuntime.jsx(Form$2.ErrorMessage, {})
+              ] })
+            }
+          ),
+          /* @__PURE__ */ jsxRuntime.jsx(
+            Form$2.Field,
+            {
+              control: form.control,
+              name: "phone",
+              render: ({ field }) => /* @__PURE__ */ jsxRuntime.jsxs(Form$2.Item, { children: [
+                /* @__PURE__ */ jsxRuntime.jsx(Form$2.Label, { optional: true, children: "Phone" }),
+                /* @__PURE__ */ jsxRuntime.jsx(Form$2.Control, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Input, { ...field }) }),
+                /* @__PURE__ */ jsxRuntime.jsx(Form$2.ErrorMessage, {})
+              ] })
+            }
+          )
+        ] }) }),
+        /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Footer, { children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex justify-end gap-2", children: [
+          /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Close, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.Button, { size: "small", variant: "secondary", children: "Cancel" }) }),
           /* @__PURE__ */ jsxRuntime.jsx(ui.Button, { size: "small", type: "submit", isLoading: isPending, children: "Save" })
         ] }) })
       ]
     }
   ) });
 };
-const GridInput = React.forwardRef(({ className, ...props }, ref) => {
-  return /* @__PURE__ */ jsxRuntime.jsx(
-    "input",
-    {
-      ref,
-      ...props,
-      autoComplete: "off",
-      className: ui.clx(
-        "txt-compact-small text-ui-fg-base placeholder:text-ui-fg-muted disabled:text-ui-fg-disabled disabled:bg-ui-bg-base bg-transparent px-2 py-1.5 outline-none",
-        className
-      )
-    }
-  );
-});
-GridInput.displayName = "MetadataForm.GridInput";
-const PlaceholderInner = () => {
-  return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-1 flex-col overflow-hidden", children: [
-    /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Body, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Skeleton, { className: "h-[148ox] w-full rounded-lg" }) }),
-    /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Footer, { children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center justify-end gap-x-2", children: [
-      /* @__PURE__ */ jsxRuntime.jsx(ui.Skeleton, { className: "h-7 w-12 rounded-md" }),
-      /* @__PURE__ */ jsxRuntime.jsx(ui.Skeleton, { className: "h-7 w-12 rounded-md" })
-    ] }) })
-  ] });
-};
-const EDITABLE_TYPES = ["string", "number", "boolean"];
-function getDefaultValues(metadata) {
-  if (!metadata || !Object.keys(metadata).length) {
-    return [
-      {
-        key: "",
-        value: "",
-        disabled: false
-      }
-    ];
-  }
-  return Object.entries(metadata).map(([key, value]) => {
-    if (!EDITABLE_TYPES.includes(typeof value)) {
-      return {
-        key,
-        value,
-        disabled: true
-      };
-    }
-    let stringValue = value;
-    if (typeof value !== "string") {
-      stringValue = JSON.stringify(value);
-    }
-    return {
-      key,
-      value: stringValue,
-      original_key: key
-    };
-  });
-}
-function parseValues(values) {
-  const metadata = values.metadata;
-  const isEmpty = !metadata.length || metadata.length === 1 && !metadata[0].key && !metadata[0].value;
-  if (isEmpty) {
-    return null;
-  }
-  const update = {};
-  metadata.forEach((field) => {
-    let key = field.key;
-    let value = field.value;
-    const disabled = field.disabled;
-    if (!key || !value) {
-      return;
-    }
-    if (disabled) {
-      update[key] = value;
-      return;
-    }
-    key = key.trim();
-    value = value.trim();
-    if (value === "true") {
-      update[key] = true;
-    } else if (value === "false") {
-      update[key] = false;
-    } else {
-      const parsedNumber = parseFloat(value);
-      if (!isNaN(parsedNumber)) {
-        update[key] = parsedNumber;
-      } else {
-        update[key] = value;
-      }
-    }
-  });
-  return update;
-}
-function getHasUneditableRows(metadata) {
-  if (!metadata) {
-    return false;
-  }
-  return Object.values(metadata).some(
-    (value) => !EDITABLE_TYPES.includes(typeof value)
-  );
-}
+const schema = addressSchema;
 const widgetModule = { widgets: [] };
 const routeModule = {
   routes: [
@@ -13063,14 +13063,14 @@ const routeModule = {
       handle,
       loader,
       children: [
-        {
-          Component: BillingAddress,
-          path: "/draft-orders/:id/billing-address"
-        },
         {
           Component: CustomItems,
           path: "/draft-orders/:id/custom-items"
         },
+        {
+          Component: BillingAddress,
+          path: "/draft-orders/:id/billing-address"
+        },
         {
           Component: Email,
           path: "/draft-orders/:id/email"
@@ -13079,6 +13079,10 @@ const routeModule = {
           Component: Items,
           path: "/draft-orders/:id/items"
         },
+        {
+          Component: Metadata,
+          path: "/draft-orders/:id/metadata"
+        },
         {
           Component: Promotions,
           path: "/draft-orders/:id/promotions"
@@ -13091,17 +13095,13 @@ const routeModule = {
           Component: Shipping,
           path: "/draft-orders/:id/shipping"
         },
-        {
-          Component: ShippingAddress,
-          path: "/draft-orders/:id/shipping-address"
-        },
         {
           Component: TransferOwnership,
           path: "/draft-orders/:id/transfer-ownership"
         },
         {
-          Component: Metadata,
-          path: "/draft-orders/:id/metadata"
+          Component: ShippingAddress,
+          path: "/draft-orders/:id/shipping-address"
         }
       ]
     }