@mercurjs/admin 2.2.0-canary.21 → 2.2.0-canary.22

package/dist/{commission-rule-create-O7Z25SC7.js → commission-rule-create-X3AYVCQG.js}

@@ -1,13 +1,13 @@
 import {
   CommissionValueFields,
   useStoreCurrencies
-} from "./chunk-KZB7LCF2.js";
+} from "./chunk-3EQOAHVG.js";
 import "./chunk-QR3GYYX6.js";
 import {
   SCOPE_TYPE_DIMENSIONS,
   buildRulesFromScope,
   buildValuesPayload
-} from "./chunk-PN5C4AND.js";
+} from "./chunk-STPSVH3T.js";
 import "./chunk-MAEP2UCK.js";
 import {
   useComboboxData
@@ -60,7 +60,7 @@ import { useForm } from "react-hook-form";
 import { useTranslation as useTranslation3 } from "react-i18next";
 
 // src/pages/commissions/commission-rule-create/components/create-commission-rule-form/create-commission-rule-commission.tsx
-import { Heading, Select } from "@medusajs/ui";
+import { Heading, RadioGroup } from "@medusajs/ui";
 import { useTranslation } from "react-i18next";
 import { jsx, jsxs } from "react/jsx-runtime";
 var CreateCommissionRuleCommission = () => {
@@ -77,15 +77,47 @@ var CreateCommissionRuleCommission = () => {
         {
           control: form.control,
           name: "commissionType",
-          render: ({ field: { onChange, ref, ...field } }) => /* @__PURE__ */ jsxs(Form.Item, { children: [
+          render: ({ field: { onChange, ...rest } }) => /* @__PURE__ */ jsxs(Form.Item, { children: [
             /* @__PURE__ */ jsx(Form.Label, { children: t("commissions.fields.type.label", "Type") }),
-            /* @__PURE__ */ jsx(Form.Control, { children: /* @__PURE__ */ jsxs(Select, { ...field, onValueChange: onChange, dir: direction, children: [
-              /* @__PURE__ */ jsx(Select.Trigger, { ref, children: /* @__PURE__ */ jsx(Select.Value, {}) }),
-              /* @__PURE__ */ jsxs(Select.Content, { children: [
-                /* @__PURE__ */ jsx(Select.Item, { value: "percentage", children: t("commissions.fields.type.percentage", "Percentage") }),
-                /* @__PURE__ */ jsx(Select.Item, { value: "fixed", children: t("commissions.fields.type.fixed", "Fixed") })
-              ] })
-            ] }) }),
+            /* @__PURE__ */ jsx(Form.Control, { children: /* @__PURE__ */ jsxs(
+              RadioGroup,
+              {
+                dir: direction,
+                onValueChange: onChange,
+                ...rest,
+                className: "grid grid-cols-1 gap-4 md:grid-cols-2",
+                "data-testid": "commission-rule-commission-type-radio-group",
+                children: [
+                  /* @__PURE__ */ jsx(
+                    RadioGroup.ChoiceBox,
+                    {
+                      value: "percentage",
+                      label: t(
+                        "commissions.fields.type.percentage",
+                        "Percentage"
+                      ),
+                      description: t(
+                        "commissions.fields.type.percentageHint",
+                        "Charge a percentage of the order total."
+                      ),
+                      "data-testid": "commission-rule-commission-type-option-percentage"
+                    }
+                  ),
+                  /* @__PURE__ */ jsx(
+                    RadioGroup.ChoiceBox,
+                    {
+                      value: "fixed",
+                      label: t("commissions.fields.type.fixed", "Fixed"),
+                      description: t(
+                        "commissions.fields.type.fixedHint",
+                        "Charge a fixed amount per order."
+                      ),
+                      "data-testid": "commission-rule-commission-type-option-fixed"
+                    }
+                  )
+                ]
+              }
+            ) }),
             /* @__PURE__ */ jsx(Form.ErrorMessage, {})
           ] })
         }
@@ -133,11 +165,11 @@ var CreateCommissionRuleCommission = () => {
 CreateCommissionRuleCommission._tabMeta = defineTabMeta({
   id: "commission",
   labelKey: "commissions.create.commission",
-  validationFields: ["commissionType"]
+  validationFields: ["commissionType", "value"]
 });
 
 // src/pages/commissions/commission-rule-create/components/create-commission-rule-form/create-commission-rule-details.tsx
-import { Heading as Heading2, Input, Select as Select2 } from "@medusajs/ui";
+import { Heading as Heading2, Input, RadioGroup as RadioGroup2 } from "@medusajs/ui";
 import { useTranslation as useTranslation2 } from "react-i18next";
 import { jsx as jsx2, jsxs as jsxs2 } from "react/jsx-runtime";
 var CreateCommissionRuleDetails = () => {
@@ -173,58 +205,109 @@ var CreateCommissionRuleDetails = () => {
   return /* @__PURE__ */ jsx2("div", { className: "flex flex-col items-center p-16", children: /* @__PURE__ */ jsxs2("div", { className: "flex w-full max-w-[720px] flex-col gap-y-8", children: [
     /* @__PURE__ */ jsx2(Heading2, { children: t("commissions.create.details", "Details") }),
     /* @__PURE__ */ jsxs2("div", { className: "flex flex-col gap-y-4", children: [
-      /* @__PURE__ */ jsxs2("div", { className: "grid grid-cols-1 gap-4 md:grid-cols-2", children: [
-        /* @__PURE__ */ jsx2(
-          Form.Field,
-          {
-            control: form.control,
-            name: "title",
-            render: ({ field }) => /* @__PURE__ */ jsxs2(Form.Item, { children: [
-              /* @__PURE__ */ jsx2(Form.Label, { children: t("fields.title") }),
-              /* @__PURE__ */ jsx2(Form.Control, { children: /* @__PURE__ */ jsx2(Input, { autoComplete: "off", ...field }) }),
-              /* @__PURE__ */ jsx2(Form.ErrorMessage, {})
-            ] })
-          }
-        ),
-        /* @__PURE__ */ jsx2(
-          Form.Field,
-          {
-            control: form.control,
-            name: "code",
-            render: ({ field }) => /* @__PURE__ */ jsxs2(Form.Item, { children: [
-              /* @__PURE__ */ jsx2(Form.Label, { children: t("commissions.fields.code", "Code") }),
-              /* @__PURE__ */ jsx2(Form.Control, { children: /* @__PURE__ */ jsx2(Input, { autoComplete: "off", ...field }) }),
-              /* @__PURE__ */ jsx2(Form.ErrorMessage, {})
-            ] })
-          }
-        )
-      ] }),
+      /* @__PURE__ */ jsx2(
+        Form.Field,
+        {
+          control: form.control,
+          name: "title",
+          render: ({ field }) => /* @__PURE__ */ jsxs2(Form.Item, { children: [
+            /* @__PURE__ */ jsx2(Form.Label, { children: t("fields.title") }),
+            /* @__PURE__ */ jsx2(Form.Control, { children: /* @__PURE__ */ jsx2(Input, { autoComplete: "off", ...field }) }),
+            /* @__PURE__ */ jsx2(Form.ErrorMessage, {})
+          ] })
+        }
+      ),
       /* @__PURE__ */ jsx2(
         Form.Field,
         {
           control: form.control,
           name: "scopeType",
-          render: ({ field: { onChange, ref, ...field } }) => /* @__PURE__ */ jsxs2(Form.Item, { children: [
+          render: ({ field: { onChange, ...rest } }) => /* @__PURE__ */ jsxs2(Form.Item, { children: [
             /* @__PURE__ */ jsx2(Form.Label, { children: t("commissions.fields.scopeType.label", "Type") }),
-            /* @__PURE__ */ jsx2(Form.Control, { children: /* @__PURE__ */ jsxs2(Select2, { ...field, onValueChange: onChange, dir: direction, children: [
-              /* @__PURE__ */ jsx2(Select2.Trigger, { ref, children: /* @__PURE__ */ jsx2(Select2.Value, {}) }),
-              /* @__PURE__ */ jsxs2(Select2.Content, { children: [
-                /* @__PURE__ */ jsx2(Select2.Item, { value: "store", children: t("commissions.fields.scopeType.store", "Store") }),
-                /* @__PURE__ */ jsx2(Select2.Item, { value: "product_type", children: t(
-                  "commissions.fields.scopeType.productType",
-                  "Product Type"
-                ) }),
-                /* @__PURE__ */ jsx2(Select2.Item, { value: "category", children: t("commissions.fields.scopeType.category", "Category") }),
-                /* @__PURE__ */ jsx2(Select2.Item, { value: "store_product_type", children: t(
-                  "commissions.fields.scopeType.storeProductType",
-                  "Store + Product Type"
-                ) }),
-                /* @__PURE__ */ jsx2(Select2.Item, { value: "store_category", children: t(
-                  "commissions.fields.scopeType.storeCategory",
-                  "Store + Category"
-                ) })
-              ] })
-            ] }) }),
+            /* @__PURE__ */ jsx2(Form.Control, { children: /* @__PURE__ */ jsxs2(
+              RadioGroup2,
+              {
+                dir: direction,
+                onValueChange: onChange,
+                ...rest,
+                className: "grid grid-cols-1 gap-4 md:grid-cols-2",
+                "data-testid": "commission-rule-scope-type-radio-group",
+                children: [
+                  /* @__PURE__ */ jsx2(
+                    RadioGroup2.ChoiceBox,
+                    {
+                      value: "store",
+                      label: t("commissions.fields.scopeType.store", "Store"),
+                      description: t(
+                        "commissions.fields.scopeType.storeHint",
+                        "Apply to specific stores."
+                      ),
+                      "data-testid": "commission-rule-scope-type-option-store"
+                    }
+                  ),
+                  /* @__PURE__ */ jsx2(
+                    RadioGroup2.ChoiceBox,
+                    {
+                      value: "product_type",
+                      label: t(
+                        "commissions.fields.scopeType.productType",
+                        "Product Type"
+                      ),
+                      description: t(
+                        "commissions.fields.scopeType.productTypeHint",
+                        "Apply to specific product types."
+                      ),
+                      "data-testid": "commission-rule-scope-type-option-product-type"
+                    }
+                  ),
+                  /* @__PURE__ */ jsx2(
+                    RadioGroup2.ChoiceBox,
+                    {
+                      value: "category",
+                      label: t(
+                        "commissions.fields.scopeType.category",
+                        "Category"
+                      ),
+                      description: t(
+                        "commissions.fields.scopeType.categoryHint",
+                        "Apply to specific categories."
+                      ),
+                      "data-testid": "commission-rule-scope-type-option-category"
+                    }
+                  ),
+                  /* @__PURE__ */ jsx2(
+                    RadioGroup2.ChoiceBox,
+                    {
+                      value: "store_product_type",
+                      label: t(
+                        "commissions.fields.scopeType.storeProductType",
+                        "Store + Product Type"
+                      ),
+                      description: t(
+                        "commissions.fields.scopeType.storeProductTypeHint",
+                        "Apply to product types within specific stores."
+                      ),
+                      "data-testid": "commission-rule-scope-type-option-store-product-type"
+                    }
+                  ),
+                  /* @__PURE__ */ jsx2(
+                    RadioGroup2.ChoiceBox,
+                    {
+                      value: "store_category",
+                      label: t(
+                        "commissions.fields.scopeType.storeCategory",
+                        "Store + Category"
+                      ),
+                      description: t(
+                        "commissions.fields.scopeType.storeCategoryHint",
+                        "Apply to categories within specific stores."
+                      ),
+                      "data-testid": "commission-rule-scope-type-option-store-category"
+                    }
+                  )
+                ]
+              }
+            ) }),
             /* @__PURE__ */ jsx2(Form.ErrorMessage, {})
           ] })
         }
@@ -299,15 +382,20 @@ CreateCommissionRuleDetails._tabMeta = defineTabMeta(
   {
     id: "details",
     labelKey: "commissions.create.details",
-    validationFields: ["title", "code", "scopeType"]
+    validationFields: [
+      "title",
+      "scopeType",
+      "stores",
+      "productTypes",
+      "categories"
+    ]
   }
 );
 
 // src/pages/commissions/commission-rule-create/components/create-commission-rule-form/schema.ts
 import * as zod from "zod";
 var CreateCommissionRuleSchema = zod.object({
-  title: zod.string().min(1),
-  code: zod.string().min(1),
+  title: zod.string().min(1, "Please enter a title"),
   scopeType: zod.enum([
     "store",
     "product_type",
@@ -319,10 +407,40 @@ var CreateCommissionRuleSchema = zod.object({
   productTypes: zod.array(zod.string()),
   categories: zod.array(zod.string()),
   commissionType: zod.enum(["percentage", "fixed"]),
-  value: zod.coerce.number().min(0),
+  value: zod.coerce.number().optional(),
   fixed_values: zod.record(zod.string(), zod.coerce.number()).optional(),
   include_tax: zod.boolean(),
   include_shipping: zod.boolean()
+}).superRefine((data, ctx) => {
+  const dimensions = SCOPE_TYPE_DIMENSIONS[data.scopeType];
+  if (dimensions.includes("seller") && data.stores.length === 0) {
+    ctx.addIssue({
+      code: zod.ZodIssueCode.custom,
+      path: ["stores"],
+      message: "Please select at least one store"
+    });
+  }
+  if (dimensions.includes("product_type") && data.productTypes.length === 0) {
+    ctx.addIssue({
+      code: zod.ZodIssueCode.custom,
+      path: ["productTypes"],
+      message: "Please select at least one product type"
+    });
+  }
+  if (dimensions.includes("product_category") && data.categories.length === 0) {
+    ctx.addIssue({
+      code: zod.ZodIssueCode.custom,
+      path: ["categories"],
+      message: "Please select at least one category"
+    });
+  }
+  if (data.commissionType === "percentage" && (data.value === void 0 || Number.isNaN(data.value))) {
+    ctx.addIssue({
+      code: zod.ZodIssueCode.custom,
+      path: ["value"],
+      message: "Please enter a value."
+    });
+  }
 });
 
 // src/pages/commissions/commission-rule-create/components/create-commission-rule-form/create-commission-rule-form.tsx
@@ -334,13 +452,12 @@ var CreateCommissionRuleForm = () => {
   const form = useForm({
     defaultValues: {
       title: "",
-      code: "",
       scopeType: "store",
       stores: [],
       productTypes: [],
       categories: [],
       commissionType: "percentage",
-      value: 0,
+      value: void 0,
       fixed_values: {},
       include_tax: false,
       include_shipping: false
@@ -358,7 +475,6 @@ var CreateCommissionRuleForm = () => {
     await mutateAsync(
       {
         name: values.title,
-        code: values.code,
         type: values.commissionType,
         value: isFixed ? 0 : values.value,
         ...isFixed ? { values: buildValuesPayload(currencies, values.fixed_values) } : {},
@@ -371,7 +487,7 @@ var CreateCommissionRuleForm = () => {
         onSuccess: ({ commission_rate }) => {
           toast.success(
             t("commissions.create.successToast", {
-              defaultValue: "Commission rule created"
+              defaultValue: "Commission rule was successfully created."
             })
           );
           handleSuccess(`/settings/commissions/${commission_rate.id}`);

package/dist/{commission-rule-detail-I7LVSNAM.js → commission-rule-detail-EITJYZG5.js}

@@ -1,8 +1,8 @@
 import {
   CommissionRuleDetail
-} from "./chunk-JEJQKTZO.js";
-import "./chunk-RXRDZ47F.js";
-import "./chunk-PN5C4AND.js";
+} from "./chunk-ASNNJIW7.js";
+import "./chunk-BHJFT3ST.js";
+import "./chunk-STPSVH3T.js";
 import "./chunk-FI474ADU.js";
 import "./chunk-3XPXUIK3.js";
 import "./chunk-E74OUNA3.js";

package/dist/{commission-rule-edit-YSHDTYZY.js → commission-rule-edit-FZLHYL4A.js}

@@ -4,7 +4,7 @@ import {
   deriveScopeType,
   diffScopeRules,
   referenceIds
-} from "./chunk-PN5C4AND.js";
+} from "./chunk-STPSVH3T.js";
 import {
   useComboboxData
 } from "./chunk-5KGMGL4N.js";
@@ -126,7 +126,7 @@ var EditCommissionRuleForm = ({ rule }) => {
       }
       toast.success(
         t("commissions.edit.successToast", {
-          defaultValue: "Commission rule updated"
+          defaultValue: "Commission rule was successfully updated."
         })
       );
       handleSuccess();

package/dist/{commissions-list-OUGVPED6.js → commissions-list-TT2ITT75.js}

@@ -1,9 +1,10 @@
 import {
   CommissionsPage
-} from "./chunk-EG45GIE3.js";
-import "./chunk-RXRDZ47F.js";
-import "./chunk-PN5C4AND.js";
+} from "./chunk-PAGH4K4C.js";
+import "./chunk-BHJFT3ST.js";
+import "./chunk-STPSVH3T.js";
 import "./chunk-JHIMVLB2.js";
+import "./chunk-DB6ANJBO.js";
 import "./chunk-PHOCVOZ5.js";
 import "./chunk-FQERBIVS.js";
 import "./chunk-NQEXDLYH.js";

package/dist/{global-commission-edit-LCD6JJUX.js → global-commission-edit-3CEVUAAP.js}

@@ -1,11 +1,11 @@
 import {
   CommissionValueFields,
   useStoreCurrencies
-} from "./chunk-KZB7LCF2.js";
+} from "./chunk-3EQOAHVG.js";
 import {
   buildValuesPayload,
   fixedValuesFromRate
-} from "./chunk-PN5C4AND.js";
+} from "./chunk-STPSVH3T.js";
 import "./chunk-MAEP2UCK.js";
 import {
   SwitchBox
@@ -38,18 +38,25 @@ import "./chunk-NBMM2TZK.js";
 
 // src/pages/commissions/global-commission-edit/global-commission-edit.tsx
 import { zodResolver } from "@hookform/resolvers/zod";
-import { Button, Heading, Input, Select, toast } from "@medusajs/ui";
+import { Button, Heading, RadioGroup, toast } from "@medusajs/ui";
 import { useForm } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 import * as zod from "zod";
 import { jsx, jsxs } from "react/jsx-runtime";
 var EditGlobalCommissionSchema = zod.object({
-  code: zod.string().min(1),
   type: zod.enum(["percentage", "fixed"]),
-  value: zod.coerce.number().min(0),
+  value: zod.coerce.number().optional(),
   fixed_values: zod.record(zod.string(), zod.coerce.number()).optional(),
   include_tax: zod.boolean(),
   include_shipping: zod.boolean()
+}).superRefine((data, ctx) => {
+  if (data.type === "percentage" && (data.value === void 0 || Number.isNaN(data.value))) {
+    ctx.addIssue({
+      code: zod.ZodIssueCode.custom,
+      path: ["value"],
+      message: "Please enter a value."
+    });
+  }
 });
 var EditGlobalCommissionForm = ({ rate }) => {
   const { t } = useTranslation();
@@ -58,7 +65,6 @@ var EditGlobalCommissionForm = ({ rate }) => {
   const { currencies } = useStoreCurrencies();
   const form = useForm({
     defaultValues: {
-      code: rate.code,
       type: rate.type,
       value: rate.value,
       fixed_values: fixedValuesFromRate(rate),
@@ -71,7 +77,6 @@ var EditGlobalCommissionForm = ({ rate }) => {
   const handleSubmit = form.handleSubmit(async (values) => {
     const isFixed = values.type === "fixed";
     const payload = {
-      code: values.code,
       type: values.type,
       value: isFixed ? 0 : values.value,
       ...isFixed ? { values: buildValuesPayload(currencies, values.fixed_values) } : {},
@@ -82,7 +87,7 @@ var EditGlobalCommissionForm = ({ rate }) => {
       onSuccess: () => {
         toast.success(
           t("commissions.global.edit.successToast", {
-            defaultValue: "Global commission updated"
+            defaultValue: "Global commission was successfully updated."
           })
         );
         handleSuccess();
@@ -93,37 +98,49 @@ var EditGlobalCommissionForm = ({ rate }) => {
   const watchType = form.watch("type");
   return /* @__PURE__ */ jsx(RouteDrawer.Form, { form, children: /* @__PURE__ */ jsxs(KeyboundForm, { onSubmit: handleSubmit, className: "flex flex-1 flex-col", children: [
     /* @__PURE__ */ jsx(RouteDrawer.Body, { children: /* @__PURE__ */ jsxs("div", { className: "flex flex-col gap-y-4", children: [
-      /* @__PURE__ */ jsx(
-        Form.Field,
-        {
-          control: form.control,
-          name: "code",
-          render: ({ field }) => /* @__PURE__ */ jsxs(Form.Item, { children: [
-            /* @__PURE__ */ jsx(Form.Label, { children: t("commissions.fields.code", "Code") }),
-            /* @__PURE__ */ jsx(Form.Control, { children: /* @__PURE__ */ jsx(Input, { autoComplete: "off", ...field }) }),
-            /* @__PURE__ */ jsx(Form.ErrorMessage, {})
-          ] })
-        }
-      ),
       /* @__PURE__ */ jsx(
         Form.Field,
         {
           control: form.control,
           name: "type",
-          render: ({ field: { onChange, ref, ...field } }) => /* @__PURE__ */ jsxs(Form.Item, { children: [
+          render: ({ field: { onChange, ...rest } }) => /* @__PURE__ */ jsxs(Form.Item, { children: [
             /* @__PURE__ */ jsx(Form.Label, { children: t("commissions.fields.type.label", "Type") }),
             /* @__PURE__ */ jsx(Form.Control, { children: /* @__PURE__ */ jsxs(
-              Select,
+              RadioGroup,
               {
-                ...field,
-                onValueChange: onChange,
                 dir: direction,
+                onValueChange: onChange,
+                ...rest,
+                className: "grid grid-cols-1 gap-4 md:grid-cols-2",
+                "data-testid": "global-commission-type-radio-group",
                 children: [
-                  /* @__PURE__ */ jsx(Select.Trigger, { ref, children: /* @__PURE__ */ jsx(Select.Value, {}) }),
-                  /* @__PURE__ */ jsxs(Select.Content, { children: [
-                    /* @__PURE__ */ jsx(Select.Item, { value: "percentage", children: t("commissions.fields.type.percentage", "Percentage") }),
-                    /* @__PURE__ */ jsx(Select.Item, { value: "fixed", children: t("commissions.fields.type.fixed", "Fixed") })
-                  ] })
+                  /* @__PURE__ */ jsx(
+                    RadioGroup.ChoiceBox,
+                    {
+                      value: "percentage",
+                      label: t(
+                        "commissions.fields.type.percentage",
+                        "Percentage"
+                      ),
+                      description: t(
+                        "commissions.fields.type.percentageHint",
+                        "Charge a percentage of the order total."
+                      ),
+                      "data-testid": "global-commission-type-option-percentage"
+                    }
+                  ),
+                  /* @__PURE__ */ jsx(
+                    RadioGroup.ChoiceBox,
+                    {
+                      value: "fixed",
+                      label: t("commissions.fields.type.fixed", "Fixed"),
+                      description: t(
+                        "commissions.fields.type.fixedHint",
+                        "Charge a fixed amount per order."
+                      ),
+                      "data-testid": "global-commission-type-option-fixed"
+                    }
+                  )
                 ]
               }
             ) }),