@mercurjs/admin 2.2.0-canary.3 → 2.2.0-canary.31

package/dist/{chunk-R2MI5GL4.js → chunk-GK6V5XL3.js}

@@ -1,18 +1,18 @@
 import {
   require_dist
-} from "./chunk-FMRP2CNF.js";
+} from "./chunk-YZBEJ3CY.js";
 import {
   useProductTags
-} from "./chunk-AXTQMIIK.js";
+} from "./chunk-PJR6W35H.js";
 import {
   useProductTypes
 } from "./chunk-46M463BR.js";
 import {
   useCollections
-} from "./chunk-XZZTC7E5.js";
+} from "./chunk-Q5HXKDZG.js";
 import {
   useProductCategories
-} from "./chunk-H5PYBIOZ.js";
+} from "./chunk-5I6YZOBU.js";
 import {
   __toESM
 } from "./chunk-NBMM2TZK.js";
@@ -117,10 +117,6 @@ var useProductTableFilters = (exclude) => {
         label: t("products.productStatus.published"),
         value: import_types.ProductStatus.PUBLISHED
       },
-      {
-        label: t("products.productStatus.requires_action"),
-        value: import_types.ProductStatus.REQUIRES_ACTION
-      },
       {
         label: t("products.productStatus.rejected"),
         value: import_types.ProductStatus.REJECTED

package/dist/{chunk-YL3SCKWU.js → chunk-GKWXWN6R.js}

@@ -1,30 +1,30 @@
 import {
   useProductTableColumns
-} from "./chunk-DQGGJSOO.js";
+} from "./chunk-SU444Q24.js";
 import {
   useProductTableFilters
-} from "./chunk-R2MI5GL4.js";
+} from "./chunk-GK6V5XL3.js";
 import {
   useProductTableQuery
-} from "./chunk-LYZDVZWA.js";
+} from "./chunk-XH5GIQOS.js";
+import {
+  PRODUCT_IDS_KEY
+} from "./chunk-LO2ZWQGL.js";
 import {
   _DataTable,
   useDataTable
-} from "./chunk-NQEXDLYH.js";
+} from "./chunk-JGCGVEFZ.js";
 import {
   SingleColumnPage
 } from "./chunk-H6MYB7GB.js";
 import {
   ActionMenu
 } from "./chunk-BDGZ4EQO.js";
-import {
-  PRODUCT_IDS_KEY
-} from "./chunk-YGAX72XV.js";
 import {
   useBatchProducts,
   useDeleteProduct,
   useProducts
-} from "./chunk-2YYXP6XI.js";
+} from "./chunk-AM5XDEIN.js";
 
 // src/pages/products/product-list/product-list.tsx
 import { Children as Children2 } from "react";

package/dist/{chunk-EREXPX6I.js → chunk-GME72WUF.js}

@@ -1,19 +1,36 @@
 import {
-  optionalFloat,
   optionalInt
-} from "./chunk-UXD3VNBO.js";
+} from "./chunk-AJLGY3LQ.js";
 import {
   i18n
-} from "./chunk-637OFDFC.js";
+} from "./chunk-GFMTZ5O3.js";
+import {
+  require_dist
+} from "./chunk-YZBEJ3CY.js";
+import {
+  __toESM
+} from "./chunk-NBMM2TZK.js";
 
 // src/pages/products/product-create/constants.ts
 import { z } from "zod";
 
 // src/pages/products/product-create/utils.ts
+var import_types = __toESM(require_dist(), 1);
 var normalizeProductFormValues = (values) => {
   const thumbnail = values.media?.find((media) => media.isThumbnail)?.url;
   const images = values.media?.filter((media) => !media.isThumbnail).map((media) => ({ url: media.url }));
-  const { variantAttributes, productAttributes, attributeValues } = normalizeFormAttributes(values.attributes ?? []);
+  const hasAxis = (values.attributes ?? []).some(
+    (a) => a.use_for_variants && toValueArray(a.values).length > 0
+  );
+  const attributes = normalizeFormAttributes(values.attributes ?? []);
+  if (!hasAxis) {
+    attributes.push({
+      title: "Default Option",
+      type: import_types.AttributeType.MULTI_SELECT,
+      values: ["Default"],
+      is_variant_axis: true
+    });
+  }
   return {
     is_giftcard: false,
     status: values.status,
@@ -22,7 +39,7 @@ var normalizeProductFormValues = (values) => {
     collection_id: values.collection_id || void 0,
     categories: values.category_id ? [{ id: values.category_id }] : void 0,
     type_id: values.type_id || void 0,
-    seller_ids: values.seller_ids?.length ? values.seller_ids : void 0,
+    seller_ids: !values.globally_available && values.seller_ids?.length ? values.seller_ids : void 0,
     handle: values.handle?.trim(),
     origin_country: values.origin_country || void 0,
     material: values.material || void 0,
@@ -37,99 +54,79 @@ var normalizeProductFormValues = (values) => {
     length: values.length ? parseFloat(values.length) : void 0,
     height: values.height ? parseFloat(values.height) : void 0,
     weight: values.weight ? parseFloat(values.weight) : void 0,
-    variant_attributes: variantAttributes.length ? variantAttributes : void 0,
-    product_attributes: productAttributes.length ? productAttributes : void 0,
-    attribute_values: Object.keys(attributeValues).length ? attributeValues : void 0,
+    attributes: attributes.length ? attributes : void 0,
     variants: normalizeVariants(
       values.variants.filter((variant) => variant.should_create),
+      hasAxis,
       values.regionsCurrencyMap
     )
   };
 };
-var normalizeVariants = (variants, _regionsCurrencyMap) => {
+var normalizeVariants = (variants, hasAxis, _regionsCurrencyMap) => {
   return variants.map((variant) => {
-    const attrVals = variant.attribute_values;
-    const hasAttrVals = attrVals && Object.keys(attrVals).length > 0;
+    const opts = variant.options;
+    const hasOpts = opts && Object.keys(opts).length > 0;
     return {
-      title: variant.title || (hasAttrVals ? Object.values(attrVals).join(" / ") : "Default variant"),
-      attribute_values: hasAttrVals ? attrVals : void 0,
+      title: variant.title || (hasOpts ? Object.values(opts).join(" / ") : "Default variant"),
+      options: hasOpts ? opts : hasAxis ? void 0 : { "Default Option": "Default" },
       sku: variant.sku || void 0,
       variant_rank: variant.variant_rank
     };
   });
 };
+var toValueArray = (values) => Array.isArray(values) ? values.filter(Boolean) : values ? [values] : [];
 var normalizeFormAttributes = (attributes) => {
-  const variantAttributes = [];
-  const productAttributes = [];
-  const attributeValues = {};
+  const result = [];
   for (const attr of attributes) {
-    if (attr.use_for_variants) {
-      if (attr.attribute_id) {
-        const valueNames = Array.isArray(attr.values) ? attr.values : attr.values ? [attr.values] : [];
+    const vals = toValueArray(attr.values);
+    const type = attr.type;
+    const isSelect = type === "single_select" || type === "multi_select";
+    if (attr.attribute_id) {
+      if (isSelect || attr.use_for_variants) {
         const nameToId = new Map(
           (attr.available_values ?? []).map((v) => [v.name, v.id])
         );
-        const valueIds = valueNames.map((name) => nameToId.get(name)).filter(Boolean);
-        variantAttributes.push({
-          attribute_id: attr.attribute_id,
-          value_ids: valueIds.length ? valueIds : void 0
+        const valueIds = vals.map((name) => nameToId.get(name)).filter(Boolean);
+        if (!valueIds.length) continue;
+        result.push({ id: attr.attribute_id, value_ids: valueIds });
+      } else {
+        if (!vals.length || !vals[0]) continue;
+        result.push({
+          id: attr.attribute_id,
+          value: type === "toggle" ? vals[0] === "true" : vals[0]
         });
-      } else if (attr.is_custom && attr.title) {
-        variantAttributes.push({
-          name: attr.title,
-          type: attr.type ?? "multi_select",
-          values: Array.isArray(attr.values) ? attr.values : attr.values ? [attr.values] : [],
+      }
+    } else if (attr.is_custom && attr.title) {
+      if (!vals.length) continue;
+      if (attr.use_for_variants) {
+        result.push({
+          title: attr.title,
+          type: type ?? import_types.AttributeType.MULTI_SELECT,
+          values: vals,
           is_variant_axis: true
         });
-      }
-    } else {
-      const key = attr.title;
-      if (!key) continue;
-      if (attr.is_custom) {
-        const vals = Array.isArray(attr.values) ? attr.values : attr.values ? [attr.values] : [];
-        if (vals.length) {
-          productAttributes.push({
-            name: attr.title,
-            type: attr.type ?? "text",
-            values: vals,
-            is_variant_axis: false
-          });
-        }
-      } else if (attr.attribute_id) {
-        const vals = Array.isArray(attr.values) ? attr.values : attr.values ? [attr.values] : [];
-        if (!vals.length || vals.every((v) => !v)) continue;
-        const type = attr.type;
-        const hasPresetValues = type === "single_select" || type === "multi_select";
-        if (hasPresetValues) {
-          const nameToId = new Map(
-            (attr.available_values ?? []).map((v) => [v.name, v.id])
-          );
-          const valueIds = vals.map((name) => nameToId.get(name)).filter(Boolean);
-          if (valueIds.length) {
-            productAttributes.push({
-              attribute_id: attr.attribute_id,
-              value_ids: valueIds
-            });
-          }
-        } else {
-          productAttributes.push({
-            attribute_id: attr.attribute_id,
-            values: vals
-          });
-        }
+      } else if (isSelect) {
+        result.push({
+          title: attr.title,
+          type,
+          values: vals
+        });
+      } else {
+        result.push({
+          title: attr.title,
+          type: type ?? import_types.AttributeType.TEXT,
+          value: type === "toggle" ? vals[0] === "true" : vals[0]
+        });
       }
     }
   }
-  return { variantAttributes, productAttributes, attributeValues };
+  return result;
 };
 var decorateVariantsWithDefaultValues = (variants) => {
   return variants.map((variant) => ({
     ...variant,
     title: variant.title || "",
-    sku: variant.sku || "",
-    manage_inventory: variant.manage_inventory || false,
-    allow_backorder: variant.allow_backorder || false,
-    inventory_kit: variant.inventory_kit || false
+    sku: variant.sku || ""
   }));
 };
 var getPermutations = (data) => {
@@ -157,40 +154,38 @@ var generateVariantsFromAttributes = (attributes, currentVariants) => {
         title: "Default variant",
         should_create: true,
         variant_rank: 0,
-        attribute_values: {},
-        inventory: [{ inventory_item_id: "", required_quantity: "" }],
+        options: {},
         is_default: true
       }
     ]);
   }
   const permutations = getPermutations(variantAxes);
   const newVariants = currentVariants.reduce((acc, variant) => {
-    const attrVals = variant.attribute_values;
-    if (!attrVals || Object.keys(attrVals).length === 0) return acc;
+    const opts = variant.options;
+    if (!opts || Object.keys(opts).length === 0) return acc;
     const match = permutations.find(
-      (perm) => Object.keys(attrVals).every((key) => attrVals[key] === perm[key])
+      (perm) => Object.keys(opts).every((key) => opts[key] === perm[key])
     );
     if (match) {
       acc.push({
         ...variant,
         title: Object.values(match).join(" / "),
-        attribute_values: match,
+        options: match,
         is_default: false
       });
     }
     return acc;
   }, []);
   const usedSet = new Set(
-    newVariants.map((v) => JSON.stringify(v.attribute_values))
+    newVariants.map((v) => JSON.stringify(v.options))
   );
   for (const perm of permutations) {
     if (!usedSet.has(JSON.stringify(perm))) {
       newVariants.push({
         title: Object.values(perm).join(" / "),
-        attribute_values: perm,
+        options: perm,
         should_create: true,
-        variant_rank: newVariants.length,
-        inventory: [{ inventory_item_id: "", required_quantity: "" }]
+        variant_rank: newVariants.length
       });
     }
   }
@@ -221,18 +216,8 @@ var ProductCreateVariantSchema = z.object({
   material: z.string().optional(),
   origin_country: z.string().optional(),
   sku: z.string().optional(),
-  manage_inventory: z.boolean().optional(),
-  allow_backorder: z.boolean().optional(),
-  inventory_kit: z.boolean().optional(),
-  attribute_values: z.record(z.string(), z.string()).optional(),
-  variant_rank: z.number(),
-  prices: z.record(z.string(), optionalFloat).optional(),
-  inventory: z.array(
-    z.object({
-      inventory_item_id: z.string(),
-      required_quantity: optionalInt
-    })
-  ).optional()
+  options: z.record(z.string(), z.string()).optional(),
+  variant_rank: z.number()
 });
 var ProductCreateSchema = z.object({
   title: z.string().min(1),
@@ -240,6 +225,7 @@ var ProductCreateSchema = z.object({
   handle: z.string().optional(),
   description: z.string().optional(),
   discountable: z.boolean(),
+  globally_available: z.boolean(),
   type_id: z.string().optional(),
   collection_id: z.string().optional(),
   category_id: z.string().min(1),
@@ -269,6 +255,13 @@ var ProductCreateSchema = z.object({
   variants: z.array(ProductCreateVariantSchema).min(1),
   media: z.array(MediaSchema).optional()
 }).superRefine((data, ctx) => {
+  if (!data.globally_available && !data.seller_ids?.length) {
+    ctx.addIssue({
+      code: z.ZodIssueCode.custom,
+      path: ["seller_ids"],
+      message: i18n.t("products.create.errors.requiredStore")
+    });
+  }
   data.attributes?.forEach((attr, index) => {
     if (!attr.is_required) return;
     const isEmpty = attr.values === void 0 || attr.values === "" || Array.isArray(attr.values) && attr.values.length === 0;
@@ -306,6 +299,7 @@ var EditProductMediaSchema = z.object({
 });
 var PRODUCT_CREATE_FORM_DEFAULTS = {
   discountable: true,
+  globally_available: true,
   seller_ids: [],
   tags: [],
   variants: decorateVariantsWithDefaultValues([
@@ -313,8 +307,7 @@ var PRODUCT_CREATE_FORM_DEFAULTS = {
       title: "Default variant",
       should_create: true,
       variant_rank: 0,
-      attribute_values: {},
-      inventory: [{ inventory_item_id: "", required_quantity: "" }],
+      options: {},
       is_default: true
     }
   ]),

package/dist/{chunk-ZSFJVRRS.js → chunk-GQUGCSJV.js}

@@ -15,13 +15,13 @@ import {
   useCombinedRefs,
   useDataGridCell,
   useDataGridCellError
-} from "./chunk-V6OGMYAI.js";
+} from "./chunk-HHW4PPNH.js";
 import {
   currencies
 } from "./chunk-IQPN4PZJ.js";
 import {
   KeyboundForm
-} from "./chunk-U2ZFCAPX.js";
+} from "./chunk-SITRHMZZ.js";
 import {
   StackedFocusModal
 } from "./chunk-FWJLS7XD.js";

package/dist/{chunk-OSEIN4Y2.js → chunk-GV2Z3IHA.js}

@@ -1,9 +1,9 @@
 import {
   customerGroupsQueryKeys
-} from "./chunk-PRBE5CM3.js";
+} from "./chunk-QYDWMBEX.js";
 import {
   productsQueryKeys
-} from "./chunk-2YYXP6XI.js";
+} from "./chunk-AM5XDEIN.js";
 import {
   queryClient
 } from "./chunk-RHKRREUU.js";