@mercurjs/admin 2.2.0-canary.29 → 2.2.0-canary.30

package/dist/{chunk-JRLDKKCM.js → chunk-DBZV75X3.js}

@@ -3,20 +3,20 @@ import {
   useSalesChannelTableEmptyState,
   useSalesChannelTableFilters,
   useSalesChannelTableQuery
-} from "./chunk-LEHS6RED.js";
-import {
-  SingleColumnPage
-} from "./chunk-H6MYB7GB.js";
+} from "./chunk-RWAEZQCV.js";
 import {
   DataTable
 } from "./chunk-C4XKPQ6T.js";
+import {
+  SingleColumnPage
+} from "./chunk-H6MYB7GB.js";
 import {
   useStore
 } from "./chunk-FXWKGNRV.js";
 import {
   useDeleteSalesChannelLazy,
   useSalesChannels
-} from "./chunk-OKWGPKVK.js";
+} from "./chunk-XKRR5ALR.js";
 
 // src/pages/sales-channels/sales-channel-list/sales-channel-list.tsx
 import { Children as Children3 } from "react";

package/dist/{chunk-ORWIYNP2.js → chunk-DCD5KNOW.js}

@@ -20,12 +20,12 @@ import {
 import {
   countries
 } from "./chunk-JRTZWK77.js";
-import {
-  NoRecords
-} from "./chunk-PAYQJPGK.js";
 import {
   TwoColumnPage
 } from "./chunk-E74OUNA3.js";
+import {
+  NoRecords
+} from "./chunk-PAYQJPGK.js";
 import {
   useDeleteFulfillmentServiceZone,
   useDeleteFulfillmentSet
@@ -44,7 +44,7 @@ import {
 } from "./chunk-BDGZ4EQO.js";
 import {
   useSalesChannels
-} from "./chunk-OKWGPKVK.js";
+} from "./chunk-XKRR5ALR.js";
 import {
   TwoColumnPageSkeleton
 } from "./chunk-INNFZYX2.js";

package/dist/{chunk-PJVUDTJF.js → chunk-DWAAPLKD.js}

@@ -33,7 +33,7 @@ import {
 import {
   useCancelOrderEdit,
   useConfirmOrderEdit
-} from "./chunk-UUTACMA5.js";
+} from "./chunk-ERQBTOAZ.js";
 import {
   getPaymentsFromOrder,
   getReservationsLimitCount
@@ -69,16 +69,16 @@ import {
   TextCell,
   TextHeader
 } from "./chunk-JHIMVLB2.js";
-import {
-  _DataTable,
-  useDataTable
-} from "./chunk-JGCGVEFZ.js";
 import {
   TwoColumnPage
 } from "./chunk-E74OUNA3.js";
 import {
   Thumbnail
 } from "./chunk-WIYFXWRI.js";
+import {
+  _DataTable,
+  useDataTable
+} from "./chunk-JGCGVEFZ.js";
 import {
   useDate
 } from "./chunk-UZWFZMOX.js";
@@ -91,7 +91,7 @@ import {
 } from "./chunk-EPHVGD5Z.js";
 import {
   useReservationItems
-} from "./chunk-XGUUM3S6.js";
+} from "./chunk-QJ4J5F6T.js";
 import {
   useCancelOrder,
   useCancelOrderTransfer,

package/dist/{chunk-LC3QY7KZ.js → chunk-EAJMQKL5.js}

@@ -7,7 +7,7 @@ import {
 } from "./chunk-2FGRDEAD.js";
 import {
   useReturnReasonTableQuery
-} from "./chunk-2L4W75VS.js";
+} from "./chunk-WKTRJNOK.js";
 import {
   _DataTable,
   useDataTable

package/dist/{chunk-CGG4U2MZ.js → chunk-ELYCSQWC.js}

@@ -1,6 +1,6 @@
 import {
   PriceListCustomerGroupRuleForm
-} from "./chunk-3YVZLXH7.js";
+} from "./chunk-IOXHJONC.js";
 import {
   PriceListCreateProductsSchema,
   PriceListRulesSchema,
@@ -13,17 +13,13 @@ import {
 } from "./chunk-U5MJIHLY.js";
 import {
   useProductTableColumns
-} from "./chunk-FWWPSH6V.js";
+} from "./chunk-SU444Q24.js";
 import {
   useProductTableFilters
-} from "./chunk-3JN4WUVU.js";
+} from "./chunk-GK6V5XL3.js";
 import {
   useProductTableQuery
-} from "./chunk-LYZDVZWA.js";
-import {
-  _DataTable,
-  useDataTable
-} from "./chunk-JGCGVEFZ.js";
+} from "./chunk-XH5GIQOS.js";
 import {
   TabbedForm,
   defineTabMeta,
@@ -41,15 +37,19 @@ import {
 import {
   Form
 } from "./chunk-3QSRE5LS.js";
+import {
+  _DataTable,
+  useDataTable
+} from "./chunk-JGCGVEFZ.js";
 import {
   useCreatePriceList
-} from "./chunk-RDTFLHYO.js";
+} from "./chunk-GV2Z3IHA.js";
 import {
   useDocumentDirection
 } from "./chunk-Y7QKP6QU.js";
 import {
   useProducts
-} from "./chunk-M2E3PKA4.js";
+} from "./chunk-AM5XDEIN.js";
 
 // src/pages/price-lists/price-list-create/components/price-list-create-form/schema.ts
 import { z } from "zod";

package/dist/{chunk-533GMKEG.js → chunk-ER7GGJ5A.js}

@@ -17,10 +17,26 @@ var PRODUCT_ATTRIBUTES_QUERY_KEY = "product_attributes";
 var productAttributesQueryKeys = queryKeysFactory(
   PRODUCT_ATTRIBUTES_QUERY_KEY
 );
+var sortAttributeValuesByRank = (attributes) => {
+  attributes?.forEach((attribute) => {
+    if (Array.isArray(attribute.values)) {
+      attribute.values.sort((a, b) => (a.rank ?? 0) - (b.rank ?? 0));
+    }
+  });
+};
 var useProductAttribute = (id, query, options) => {
   const { data, ...rest } = useQuery({
     queryKey: productAttributesQueryKeys.detail(id, query),
-    queryFn: async () => sdk.admin.productAttributes.$id.query({ $id: id, ...query }),
+    queryFn: async () => {
+      const res = await sdk.admin.productAttributes.$id.query({
+        $id: id,
+        ...query
+      });
+      sortAttributeValuesByRank(
+        res?.product_attribute ? [res.product_attribute] : void 0
+      );
+      return res;
+    },
     ...options
   });
   return { ...data, ...rest };
@@ -28,7 +44,11 @@ var useProductAttribute = (id, query, options) => {
 var useProductAttributes = (query, options) => {
   const { data, ...rest } = useQuery({
     queryKey: productAttributesQueryKeys.list(query),
-    queryFn: async () => sdk.admin.productAttributes.query({ ...query }),
+    queryFn: async () => {
+      const res = await sdk.admin.productAttributes.query({ ...query });
+      sortAttributeValuesByRank(res?.product_attributes);
+      return res;
+    },
     ...options
   });
   return { ...data, ...rest };

package/dist/{chunk-UUTACMA5.js → chunk-ERQBTOAZ.js}

@@ -1,12 +1,12 @@
 import {
   reservationItemsQueryKeys
-} from "./chunk-XGUUM3S6.js";
+} from "./chunk-QJ4J5F6T.js";
 import {
   ordersQueryKeys
 } from "./chunk-RMAQKNBA.js";
 import {
   inventoryItemsQueryKeys
-} from "./chunk-M2E3PKA4.js";
+} from "./chunk-AM5XDEIN.js";
 import {
   queryClient
 } from "./chunk-RHKRREUU.js";

package/dist/{chunk-GY7LZODD.js → chunk-EXPDYI26.js}

@@ -15,7 +15,7 @@ import {
 } from "./chunk-HC25LNX7.js";
 import {
   useShippingOptionTableQuery
-} from "./chunk-2L4W75VS.js";
+} from "./chunk-WKTRJNOK.js";
 import {
   useProductTypeTableQuery
 } from "./chunk-VOHEQ7B5.js";
@@ -27,21 +27,21 @@ import {
 } from "./chunk-JHIMVLB2.js";
 import {
   useProductTableColumns
-} from "./chunk-FWWPSH6V.js";
+} from "./chunk-SU444Q24.js";
 import {
   useProductTableFilters
-} from "./chunk-3JN4WUVU.js";
+} from "./chunk-GK6V5XL3.js";
 import {
   useProductTableQuery
-} from "./chunk-LYZDVZWA.js";
-import {
-  _DataTable,
-  useDataTable
-} from "./chunk-JGCGVEFZ.js";
+} from "./chunk-XH5GIQOS.js";
 import {
   StackedDrawer,
   StackedFocusModal
 } from "./chunk-FWJLS7XD.js";
+import {
+  _DataTable,
+  useDataTable
+} from "./chunk-JGCGVEFZ.js";
 import {
   useProductTypes
 } from "./chunk-46M463BR.js";
@@ -54,7 +54,7 @@ import {
 import {
   useProduct,
   useProducts
-} from "./chunk-M2E3PKA4.js";
+} from "./chunk-AM5XDEIN.js";
 
 // src/pages/tax-regions/common/components/target-form/target-form.tsx
 import { Button, Checkbox } from "@medusajs/ui";

package/dist/{chunk-PT3DTHQK.js → chunk-FDXE4XDD.js}

@@ -1,6 +1,6 @@
 import {
   useDeletePriceList
-} from "./chunk-RDTFLHYO.js";
+} from "./chunk-GV2Z3IHA.js";
 
 // src/pages/price-lists/common/hooks/use-delete-price-list-action.tsx
 import { toast, usePrompt } from "@medusajs/ui";

package/dist/{chunk-6IZ5YBWE.js → chunk-GFMTZ5O3.js}

@@ -9260,7 +9260,8 @@ var en_default = {
         variants: "Please select at least one variant.",
         options: "Please create at least one option.",
         uniqueSku: "SKU must be unique.",
-        requiredAttribute: "This attribute is required."
+        requiredAttribute: "This attribute is required.",
+        requiredStore: "Please select at least one store."
       },
       inventory: {
         heading: "Inventory kits",
@@ -9284,6 +9285,8 @@ var en_default = {
         useForVariantsDescription: "If checked, you will be able to create variants using this attribute. If not, the attribute will be used for informational purposes only.",
         tip: "Tip",
         variantAxisTip: "This attribute will create variants. You can define them in the next step.",
+        warning: "Warning",
+        editWarning: "Changes to this attribute may affect existing product variants or details. Review your variants and product details after saving.",
         errors: {
           titleRequired: "Please enter a title",
           valuesRequired: "Please enter at least one value"
@@ -9523,6 +9526,10 @@ var en_default = {
       stores: {
         label: "Stores"
       },
+      globally_available: {
+        label: "Globally available",
+        hint: "When unchecked, only the selected stores will be able to offer this product"
+      },
       categories: {
         label: "Categories"
       },
@@ -11980,7 +11987,7 @@ var en_default = {
       required: "Required",
       global: "Global",
       category: "Category",
-      categories: "Product Categories",
+      categories: "Categories",
       productAttribute: "Product Attribute",
       values: "Values",
       possibleValues: "Possible values",

package/dist/{chunk-3JN4WUVU.js → chunk-GK6V5XL3.js}

@@ -1,6 +1,6 @@
 import {
   require_dist
-} from "./chunk-6FLSBL4Q.js";
+} from "./chunk-YZBEJ3CY.js";
 import {
   useProductTags
 } from "./chunk-PJR6W35H.js";
@@ -9,10 +9,10 @@ import {
 } from "./chunk-46M463BR.js";
 import {
   useCollections
-} from "./chunk-QKJGSZI2.js";
+} from "./chunk-Q5HXKDZG.js";
 import {
   useProductCategories
-} from "./chunk-KYFWVLWO.js";
+} from "./chunk-5I6YZOBU.js";
 import {
   __toESM
 } from "./chunk-NBMM2TZK.js";

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

@@ -1,19 +1,19 @@
 import {
   useProductTableColumns
-} from "./chunk-FWWPSH6V.js";
+} from "./chunk-SU444Q24.js";
 import {
   useProductTableFilters
-} from "./chunk-3JN4WUVU.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-JGCGVEFZ.js";
-import {
-  PRODUCT_IDS_KEY
-} from "./chunk-LO2ZWQGL.js";
 import {
   SingleColumnPage
 } from "./chunk-H6MYB7GB.js";
@@ -24,7 +24,7 @@ import {
   useBatchProducts,
   useDeleteProduct,
   useProducts
-} from "./chunk-M2E3PKA4.js";
+} from "./chunk-AM5XDEIN.js";
 
 // src/pages/products/product-list/product-list.tsx
 import { Children as Children2 } from "react";

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

@@ -3,16 +3,34 @@ import {
 } from "./chunk-AJLGY3LQ.js";
 import {
   i18n
-} from "./chunk-6IZ5YBWE.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,
@@ -21,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,
@@ -36,93 +54,73 @@ 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 opts = variant.options;
     const hasOpts = opts && Object.keys(opts).length > 0;
     return {
       title: variant.title || (hasOpts ? Object.values(opts).join(" / ") : "Default variant"),
-      options: hasOpts ? opts : void 0,
+      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);
+        const valueIds = vals.map((name) => nameToId.get(name)).filter(Boolean);
         if (!valueIds.length) continue;
-        variantAttributes.push({
-          attribute_id: attr.attribute_id,
-          value_ids: valueIds
+        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) {
-        const vals = Array.isArray(attr.values) ? attr.values : attr.values ? [attr.values] : [];
-        if (!vals.length) continue;
-        variantAttributes.push({
-          name: attr.title,
-          type: attr.type ?? "multi_select",
+      }
+    } 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) => ({
@@ -227,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),
@@ -256,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;
@@ -293,6 +299,7 @@ var EditProductMediaSchema = z.object({
 });
 var PRODUCT_CREATE_FORM_DEFAULTS = {
   discountable: true,
+  globally_available: true,
   seller_ids: [],
   tags: [],
   variants: decorateVariantsWithDefaultValues([

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

@@ -3,7 +3,7 @@ import {
 } from "./chunk-QYDWMBEX.js";
 import {
   productsQueryKeys
-} from "./chunk-M2E3PKA4.js";
+} from "./chunk-AM5XDEIN.js";
 import {
   queryClient
 } from "./chunk-RHKRREUU.js";