@mercurjs/admin 2.2.0-canary.36 → 2.2.0-canary.38

package/dist/{collection-list-EK2TBM3J.js → collection-list-4UX2LLQV.js}

@@ -1,15 +1,15 @@
 import {
   CollectionListPage
-} from "./chunk-YAOYZQDK.js";
-import "./chunk-P4GIBTTG.js";
+} from "./chunk-CYACZXMQ.js";
+import "./chunk-5BSSIDW6.js";
 import "./chunk-KOURHC2N.js";
 import "./chunk-2ZFELO2L.js";
 import "./chunk-26OOAKQ6.js";
 import "./chunk-ZQZHFMD7.js";
-import "./chunk-C4N5EJAD.js";
+import "./chunk-4BCUGMOR.js";
 import "./chunk-OI4DJXUL.js";
 import "./chunk-HGTPUAHD.js";
-import "./chunk-T2WVIET2.js";
+import "./chunk-VM56ZITS.js";
 import "./chunk-S2WEYEQR.js";
 import "./chunk-WKTRJNOK.js";
 import "./chunk-MG4GKUJW.js";
@@ -32,7 +32,7 @@ import "./chunk-VSLHL2AZ.js";
 import "./chunk-E74OUNA3.js";
 import "./chunk-WIYFXWRI.js";
 import "./chunk-FQERBIVS.js";
-import "./chunk-SJHBNENS.js";
+import "./chunk-HSL5IICN.js";
 import "./chunk-YN3FGNJM.js";
 import "./chunk-ZAOEFQ6K.js";
 import "./chunk-PAYQJPGK.js";

package/dist/{collection-media-3Z2RJDVG.js → collection-media-YIV5BV3Y.js}

@@ -2,7 +2,7 @@ import {
   COLLECTION_IMAGE_FORMATS,
   getCollectionGallery,
   uploadCollectionImages
-} from "./chunk-T2WVIET2.js";
+} from "./chunk-VM56ZITS.js";
 import {
   FileUpload
 } from "./chunk-VSLHL2AZ.js";

package/dist/{commission-rule-commission-edit-6675TZCZ.js → commission-rule-commission-edit-EXLLNUKM.js}

@@ -1,7 +1,9 @@
 import {
   CommissionValueFields,
+  addCommissionValueIssues,
+  optionalAmount,
   useStoreCurrencies
-} from "./chunk-R3YD5UOZ.js";
+} from "./chunk-CU4UVEHX.js";
 import {
   buildValuesPayload,
   fixedValuesFromRate
@@ -39,6 +41,7 @@ import "./chunk-NBMM2TZK.js";
 // src/pages/commissions/commission-rule-commission-edit/commission-rule-commission-edit.tsx
 import { zodResolver } from "@hookform/resolvers/zod";
 import { Button, Heading, toast } from "@medusajs/ui";
+import { useMemo } from "react";
 import { useForm } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 import { useParams } from "react-router-dom";
@@ -46,11 +49,19 @@ import * as zod from "zod";
 import { jsx, jsxs } from "react/jsx-runtime";
 var EditCommissionSchema = zod.object({
   type: zod.enum(["percentage", "fixed"]),
-  value: zod.coerce.number().min(0),
-  fixed_values: zod.record(zod.string(), zod.coerce.number()).optional(),
+  value: optionalAmount,
+  fixed_values: zod.record(zod.string(), optionalAmount).optional(),
   include_tax: zod.boolean(),
   include_shipping: zod.boolean()
 });
+var createEditCommissionSchema = (currencies) => EditCommissionSchema.superRefine((data, ctx) => {
+  addCommissionValueIssues(ctx, {
+    type: data.type,
+    value: data.value,
+    fixedValues: data.fixed_values,
+    currencies
+  });
+});
 var EditCommissionForm = ({ rule }) => {
   const { t } = useTranslation();
   const { handleSuccess } = useRouteModal();
@@ -59,6 +70,10 @@ var EditCommissionForm = ({ rule }) => {
     { value: "percentage", label: t("commissions.fields.type.percentage") },
     { value: "fixed", label: t("commissions.fields.type.fixed") }
   ];
+  const resolver = useMemo(
+    () => zodResolver(createEditCommissionSchema(currencies)),
+    [currencies]
+  );
   const form = useForm({
     defaultValues: {
       type: rule.type,
@@ -67,7 +82,7 @@ var EditCommissionForm = ({ rule }) => {
       include_tax: rule.include_tax,
       include_shipping: rule.include_shipping
     },
-    resolver: zodResolver(EditCommissionSchema)
+    resolver
   });
   const { mutateAsync, isPending } = useUpdateCommissionRule(rule.id);
   const handleSubmit = form.handleSubmit(async (values) => {

package/dist/{commission-rule-create-PEYCFGCW.js → commission-rule-create-3MCNOSWN.js}

@@ -1,7 +1,9 @@
 import {
   CommissionValueFields,
+  addCommissionValueIssues,
+  optionalAmount,
   useStoreCurrencies
-} from "./chunk-R3YD5UOZ.js";
+} from "./chunk-CU4UVEHX.js";
 import "./chunk-QR3GYYX6.js";
 import {
   SCOPE_TYPE_DIMENSIONS,
@@ -323,13 +325,6 @@ CreateCommissionRuleDetails._tabMeta = defineTabMeta(
 // src/pages/commissions/commission-rule-create/components/create-commission-rule-form/schema.ts
 import i18n from "i18next";
 import * as zod from "zod";
-var optionalAmount = zod.preprocess((val) => {
-  if (val === "" || val === null || val === void 0) {
-    return void 0;
-  }
-  const parsed = typeof val === "number" ? val : Number(val);
-  return Number.isNaN(parsed) ? void 0 : parsed;
-}, zod.number().optional());
 var baseCommissionRuleSchema = zod.object({
   title: zod.string().min(1, { message: i18n.t("commissions.validation.titleRequired") }),
   code: zod.string().min(1, { message: i18n.t("commissions.validation.codeRequired") }),
@@ -372,26 +367,12 @@ var createCommissionRuleSchema = (currencies = []) => baseCommissionRuleSchema.s
       message: i18n.t("commissions.validation.categoriesRequired")
     });
   }
-  if (data.commissionType === "percentage") {
-    if (data.value === void 0 || Number.isNaN(data.value)) {
-      ctx.addIssue({
-        code: zod.ZodIssueCode.custom,
-        path: ["value"],
-        message: i18n.t("commissions.validation.value")
-      });
-    }
-  } else {
-    currencies.forEach((code) => {
-      const amount = data.fixed_values?.[code];
-      if (amount === void 0 || Number.isNaN(amount)) {
-        ctx.addIssue({
-          code: zod.ZodIssueCode.custom,
-          path: ["fixed_values", code],
-          message: i18n.t("commissions.validation.value")
-        });
-      }
-    });
-  }
+  addCommissionValueIssues(ctx, {
+    type: data.commissionType,
+    value: data.value,
+    fixedValues: data.fixed_values,
+    currencies
+  });
 });
 
 // src/pages/commissions/commission-rule-create/components/create-commission-rule-form/create-commission-rule-form.tsx

package/dist/{commission-rule-edit-GCI67KZU.js → commission-rule-edit-X45EQ6BK.js}

@@ -49,7 +49,7 @@ import * as zod from "zod";
 import { jsx, jsxs } from "react/jsx-runtime";
 var EditCommissionRuleSchema = zod.object({
   status: zod.enum(["active", "inactive"]),
-  name: zod.string().min(1),
+  name: zod.string().min(1, { message: i18n.t("commissions.validation.titleRequired") }),
   code: zod.string().min(1, { message: i18n.t("commissions.validation.codeRequired") }),
   scopeType: zod.enum([
     "store",
@@ -61,6 +61,29 @@ var EditCommissionRuleSchema = zod.object({
   stores: zod.array(zod.string()),
   productTypes: zod.array(zod.string()),
   categories: zod.array(zod.string())
+}).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: i18n.t("commissions.validation.storesRequired")
+    });
+  }
+  if (dimensions.includes("product_type") && data.productTypes.length === 0) {
+    ctx.addIssue({
+      code: zod.ZodIssueCode.custom,
+      path: ["productTypes"],
+      message: i18n.t("commissions.validation.productTypesRequired")
+    });
+  }
+  if (dimensions.includes("product_category") && data.categories.length === 0) {
+    ctx.addIssue({
+      code: zod.ZodIssueCode.custom,
+      path: ["categories"],
+      message: i18n.t("commissions.validation.categoriesRequired")
+    });
+  }
 });
 var EditCommissionRuleForm = ({ rule }) => {
   const { t } = useTranslation();

package/dist/{commissions-list-KQ2TUJAW.js → commissions-list-MZY7KOP5.js}

@@ -1,6 +1,6 @@
 import {
   CommissionsPage
-} from "./chunk-N5H2J6HE.js";
+} from "./chunk-FBDAKD4B.js";
 import "./chunk-7DHSWPU2.js";
 import "./chunk-CGIVQ7D2.js";
 import "./chunk-JHIMVLB2.js";
@@ -10,7 +10,7 @@ import "./chunk-FI474ADU.js";
 import "./chunk-3XPXUIK3.js";
 import "./chunk-E74OUNA3.js";
 import "./chunk-FQERBIVS.js";
-import "./chunk-SJHBNENS.js";
+import "./chunk-HSL5IICN.js";
 import "./chunk-YN3FGNJM.js";
 import "./chunk-ZAOEFQ6K.js";
 import "./chunk-PAYQJPGK.js";

package/dist/{customer-detail-ZYJDB47Y.js → customer-detail-FRGVVWTZ.js}

@@ -1,9 +1,9 @@
 import {
   CustomerDetailPage
-} from "./chunk-HMKXCYCJ.js";
+} from "./chunk-IRX6RBTE.js";
 import "./chunk-54EPH67T.js";
 import "./chunk-OI4DJXUL.js";
-import "./chunk-FU3QYH6H.js";
+import "./chunk-CB7DBYH4.js";
 import "./chunk-QUHSHIAC.js";
 import "./chunk-3XOE4NV5.js";
 import "./chunk-TZSOL34K.js";
@@ -15,7 +15,7 @@ import "./chunk-PHOCVOZ5.js";
 import "./chunk-IQPN4PZJ.js";
 import "./chunk-E74OUNA3.js";
 import "./chunk-FQERBIVS.js";
-import "./chunk-SJHBNENS.js";
+import "./chunk-HSL5IICN.js";
 import "./chunk-YN3FGNJM.js";
 import "./chunk-ZAOEFQ6K.js";
 import "./chunk-PAYQJPGK.js";

package/dist/{customer-group-add-customers-GSEUGBTJ.js → customer-group-add-customers-QBRVKXGO.js}

@@ -23,7 +23,7 @@ import "./chunk-FQERBIVS.js";
 import {
   _DataTable,
   useDataTable
-} from "./chunk-SJHBNENS.js";
+} from "./chunk-HSL5IICN.js";
 import "./chunk-YN3FGNJM.js";
 import "./chunk-ZAOEFQ6K.js";
 import "./chunk-PAYQJPGK.js";

package/dist/{customer-group-detail-5VSUJTR3.js → customer-group-detail-KIC2TWZ3.js}

@@ -1,7 +1,7 @@
 import {
   CUSTOMER_GROUP_DETAIL_FIELDS,
   CustomerGroupDetailPage
-} from "./chunk-EMW5WXXR.js";
+} from "./chunk-IQDZZ5EQ.js";
 import "./chunk-QG6PLWNH.js";
 import "./chunk-HGTPUAHD.js";
 import "./chunk-GRH7C3QN.js";
@@ -10,7 +10,7 @@ import "./chunk-DB6ANJBO.js";
 import "./chunk-PHOCVOZ5.js";
 import "./chunk-E74OUNA3.js";
 import "./chunk-FQERBIVS.js";
-import "./chunk-SJHBNENS.js";
+import "./chunk-HSL5IICN.js";
 import "./chunk-YN3FGNJM.js";
 import "./chunk-ZAOEFQ6K.js";
 import "./chunk-PAYQJPGK.js";

package/dist/{customer-group-list-BRQRKORR.js → customer-group-list-BRH6SWRD.js}

@@ -1,11 +1,11 @@
 import {
   CustomerGroupListPage
-} from "./chunk-V7YJ53P5.js";
+} from "./chunk-EJYLSQVT.js";
 import "./chunk-OI4DJXUL.js";
 import "./chunk-3XOE4NV5.js";
 import "./chunk-E74OUNA3.js";
 import "./chunk-FQERBIVS.js";
-import "./chunk-SJHBNENS.js";
+import "./chunk-HSL5IICN.js";
 import "./chunk-YN3FGNJM.js";
 import "./chunk-ZAOEFQ6K.js";
 import "./chunk-PAYQJPGK.js";

package/dist/{customer-list-6PRFTWMO.js → customer-list-276YPXTE.js}

@@ -1,6 +1,6 @@
 import {
   CustomerListPage
-} from "./chunk-5YWQDIVG.js";
+} from "./chunk-I3ARNGRC.js";
 import "./chunk-QG6PLWNH.js";
 import "./chunk-HGTPUAHD.js";
 import "./chunk-GRH7C3QN.js";
@@ -9,7 +9,7 @@ import "./chunk-DB6ANJBO.js";
 import "./chunk-PHOCVOZ5.js";
 import "./chunk-E74OUNA3.js";
 import "./chunk-FQERBIVS.js";
-import "./chunk-SJHBNENS.js";
+import "./chunk-HSL5IICN.js";
 import "./chunk-YN3FGNJM.js";
 import "./chunk-ZAOEFQ6K.js";
 import "./chunk-PAYQJPGK.js";

package/dist/{customers-add-customer-group-56GS7TR7.js → customers-add-customer-group-C4Y6P45C.js}

@@ -22,7 +22,7 @@ import "./chunk-FQERBIVS.js";
 import {
   _DataTable,
   useDataTable
-} from "./chunk-SJHBNENS.js";
+} from "./chunk-HSL5IICN.js";
 import "./chunk-YN3FGNJM.js";
 import "./chunk-ZAOEFQ6K.js";
 import "./chunk-PAYQJPGK.js";

package/dist/{global-commission-edit-AOZ6XLH7.js → global-commission-edit-7ZMMIV7B.js}

@@ -1,7 +1,9 @@
 import {
   CommissionValueFields,
+  addCommissionValueIssues,
+  optionalAmount,
   useStoreCurrencies
-} from "./chunk-R3YD5UOZ.js";
+} from "./chunk-CU4UVEHX.js";
 import {
   buildValuesPayload,
   fixedValuesFromRate
@@ -40,6 +42,7 @@ import "./chunk-NBMM2TZK.js";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { Button, Heading, Input, toast } from "@medusajs/ui";
 import i18n from "i18next";
+import { useMemo } from "react";
 import { useForm } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 import * as zod from "zod";
@@ -47,18 +50,18 @@ import { jsx, jsxs } from "react/jsx-runtime";
 var EditGlobalCommissionSchema = zod.object({
   code: zod.string().min(1, { message: i18n.t("commissions.validation.codeRequired") }),
   type: zod.enum(["percentage", "fixed"]),
-  value: zod.coerce.number().optional(),
-  fixed_values: zod.record(zod.string(), zod.coerce.number()).optional(),
+  value: optionalAmount,
+  fixed_values: zod.record(zod.string(), optionalAmount).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: i18n.t("commissions.validation.valueRequired")
-    });
-  }
+});
+var createEditGlobalCommissionSchema = (currencies) => EditGlobalCommissionSchema.superRefine((data, ctx) => {
+  addCommissionValueIssues(ctx, {
+    type: data.type,
+    value: data.value,
+    fixedValues: data.fixed_values,
+    currencies
+  });
 });
 var EditGlobalCommissionForm = ({ rate }) => {
   const { t } = useTranslation();
@@ -68,6 +71,10 @@ var EditGlobalCommissionForm = ({ rate }) => {
     { value: "percentage", label: t("commissions.fields.type.percentage") },
     { value: "fixed", label: t("commissions.fields.type.fixed") }
   ];
+  const resolver = useMemo(
+    () => zodResolver(createEditGlobalCommissionSchema(currencies)),
+    [currencies]
+  );
   const form = useForm({
     defaultValues: {
       code: rate.code,
@@ -77,7 +84,7 @@ var EditGlobalCommissionForm = ({ rate }) => {
       include_tax: rate.include_tax,
       include_shipping: rate.include_shipping
     },
-    resolver: zodResolver(EditGlobalCommissionSchema)
+    resolver
   });
   const { mutateAsync, isPending } = useUpdateCommissionRule(rate.id);
   const handleSubmit = form.handleSubmit(async (values) => {