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

package/dist/{edit-rules-JG62MLUS.js → edit-rules-XYTK7DQ2.js}

@@ -15,22 +15,22 @@ import {
 import "./chunk-3QSRE5LS.js";
 import "./chunk-PJR6W35H.js";
 import "./chunk-OH4AABUT.js";
+import "./chunk-FJHAAROU.js";
 import "./chunk-AEMDNTW5.js";
 import "./chunk-LYD3C73Z.js";
-import "./chunk-FJHAAROU.js";
 import "./chunk-533GMKEG.js";
 import "./chunk-YFRC6GEN.js";
 import "./chunk-N6SI4IIT.js";
-import "./chunk-46M463BR.js";
-import "./chunk-ZIFHQXP3.js";
 import "./chunk-JPNPTILP.js";
 import "./chunk-DAXXLQKB.js";
-import "./chunk-GKGLVDDV.js";
+import "./chunk-46M463BR.js";
+import "./chunk-ZIFHQXP3.js";
 import "./chunk-ESPLVOFC.js";
+import "./chunk-GKGLVDDV.js";
 import "./chunk-WJJXUXSO.js";
 import "./chunk-LAPEZATU.js";
+import "./chunk-RDTFLHYO.js";
 import "./chunk-QKJGSZI2.js";
-import "./chunk-Z2UBJXTU.js";
 import "./chunk-FXWKGNRV.js";
 import "./chunk-VDKOJ5WD.js";
 import {
@@ -46,7 +46,7 @@ import "./chunk-XGUUM3S6.js";
 import "./chunk-RMAQKNBA.js";
 import "./chunk-VYMODH6P.js";
 import "./chunk-LEG67A2R.js";
-import "./chunk-PRBE5CM3.js";
+import "./chunk-QYDWMBEX.js";
 import "./chunk-OKWGPKVK.js";
 import "./chunk-KYFWVLWO.js";
 import "./chunk-Y7QKP6QU.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"
+                    }
+                  )
                 ]
               }
             ) }),