@mercurjs/admin 2.1.2 → 2.2.0-canary.2

package/dist/chunk-TIMU6K63.js

@@ -0,0 +1,207 @@
+import {
+  useDeleteProductBrandAction
+} from "./chunk-V5XHY5LP.js";
+import {
+  useProductTableColumns
+} from "./chunk-Q2QFNTNX.js";
+import {
+  useProductTableFilters
+} from "./chunk-5POK3PM3.js";
+import {
+  useProductTableQuery
+} from "./chunk-LYZDVZWA.js";
+import {
+  _DataTable,
+  useDataTable
+} from "./chunk-NQEXDLYH.js";
+import {
+  SingleColumnPage
+} from "./chunk-H6MYB7GB.js";
+import {
+  useProductBrand
+} from "./chunk-ZZ3XFIEM.js";
+import {
+  ActionMenu
+} from "./chunk-BDGZ4EQO.js";
+import {
+  SingleColumnPageSkeleton
+} from "./chunk-INNFZYX2.js";
+import {
+  useProducts
+} from "./chunk-2YYXP6XI.js";
+
+// src/pages/product-brands/product-brand-detail/product-brand-detail.tsx
+import { Children } from "react";
+import { useLoaderData, useParams } from "react-router-dom";
+
+// src/pages/product-brands/product-brand-detail/components/product-brand-general-section/product-brand-general-section.tsx
+import { PencilSquare, Trash } from "@medusajs/icons";
+import { Container, Heading, Text } from "@medusajs/ui";
+import { useTranslation } from "react-i18next";
+import { jsx, jsxs } from "react/jsx-runtime";
+var ProductBrandGeneralSection = ({
+  productBrand
+}) => {
+  const { t } = useTranslation();
+  const handleDelete = useDeleteProductBrandAction(
+    productBrand.id,
+    productBrand.name
+  );
+  return /* @__PURE__ */ jsxs(
+    Container,
+    {
+      className: "flex items-center justify-between",
+      "data-testid": "product-brand-general-section-container",
+      children: [
+        /* @__PURE__ */ jsxs("div", { children: [
+          /* @__PURE__ */ jsx(Heading, { "data-testid": "product-brand-general-section-heading", children: productBrand.name }),
+          /* @__PURE__ */ jsxs(
+            Text,
+            {
+              size: "small",
+              className: "text-ui-fg-subtle",
+              "data-testid": "product-brand-general-section-handle",
+              children: [
+                "/",
+                productBrand.handle
+              ]
+            }
+          )
+        ] }),
+        /* @__PURE__ */ jsx(
+          ActionMenu,
+          {
+            groups: [
+              {
+                actions: [
+                  {
+                    label: t("actions.edit"),
+                    icon: /* @__PURE__ */ jsx(PencilSquare, {}),
+                    to: "edit"
+                  }
+                ]
+              },
+              {
+                actions: [
+                  {
+                    label: t("actions.delete"),
+                    icon: /* @__PURE__ */ jsx(Trash, {}),
+                    onClick: handleDelete
+                  }
+                ]
+              }
+            ],
+            "data-testid": "product-brand-general-section-action-menu"
+          }
+        )
+      ]
+    }
+  );
+};
+
+// src/pages/product-brands/product-brand-detail/components/product-brand-product-section/product-brand-product-section.tsx
+import { Container as Container2, Heading as Heading2 } from "@medusajs/ui";
+import { useTranslation as useTranslation2 } from "react-i18next";
+import { jsx as jsx2, jsxs as jsxs2 } from "react/jsx-runtime";
+var PAGE_SIZE = 10;
+var ProductBrandProductSection = ({
+  productBrand
+}) => {
+  const { t } = useTranslation2();
+  const { searchParams, raw } = useProductTableQuery({
+    pageSize: PAGE_SIZE
+  });
+  const { products, count, isPending, isError, error } = useProducts({
+    ...searchParams,
+    brand_id: [productBrand.id]
+  });
+  const filters = useProductTableFilters();
+  const columns = useProductTableColumns();
+  const { table } = useDataTable({
+    columns,
+    data: products,
+    count: products?.length || 0,
+    getRowId: (row) => row.id,
+    pageSize: PAGE_SIZE
+  });
+  if (isError) {
+    throw error;
+  }
+  return /* @__PURE__ */ jsxs2(
+    Container2,
+    {
+      className: "divide-y p-0",
+      "data-testid": "product-brand-product-section-container",
+      children: [
+        /* @__PURE__ */ jsx2(
+          "div",
+          {
+            className: "px-6 py-4",
+            "data-testid": "product-brand-product-section-header",
+            children: /* @__PURE__ */ jsx2(
+              Heading2,
+              {
+                level: "h2",
+                "data-testid": "product-brand-product-section-heading",
+                children: t("products.domain")
+              }
+            )
+          }
+        ),
+        /* @__PURE__ */ jsx2(
+          _DataTable,
+          {
+            table,
+            filters,
+            isLoading: isPending,
+            columns,
+            count,
+            pageSize: PAGE_SIZE,
+            navigateTo: ({ original }) => `/products/${original.id}`,
+            orderBy: [
+              { key: "title", label: t("fields.title") },
+              { key: "created_at", label: t("fields.createdAt") },
+              { key: "updated_at", label: t("fields.updatedAt") }
+            ],
+            queryObject: raw,
+            search: true,
+            pagination: true,
+            "data-testid": "product-brand-product-section-table"
+          }
+        )
+      ]
+    }
+  );
+};
+
+// src/pages/product-brands/product-brand-detail/product-brand-detail.tsx
+import { jsx as jsx3, jsxs as jsxs3 } from "react/jsx-runtime";
+var Root = ({ children }) => {
+  const { id } = useParams();
+  const initialData = useLoaderData();
+  const { product_brand, isPending, isError, error } = useProductBrand(
+    id,
+    void 0,
+    {
+      initialData
+    }
+  );
+  if (isPending || !product_brand) {
+    return /* @__PURE__ */ jsx3(SingleColumnPageSkeleton, { sections: 2, showJSON: true, showMetadata: true });
+  }
+  if (isError) {
+    throw error;
+  }
+  return Children.count(children) > 0 ? /* @__PURE__ */ jsx3(SingleColumnPage, { showJSON: true, showMetadata: true, data: product_brand, children }) : /* @__PURE__ */ jsxs3(SingleColumnPage, { showJSON: true, showMetadata: true, data: product_brand, children: [
+    /* @__PURE__ */ jsx3(ProductBrandGeneralSection, { productBrand: product_brand }),
+    /* @__PURE__ */ jsx3(ProductBrandProductSection, { productBrand: product_brand })
+  ] });
+};
+var ProductBrandDetailPage = Object.assign(Root, {
+  GeneralSection: ProductBrandGeneralSection,
+  ProductSection: ProductBrandProductSection
+});
+
+export {
+  ProductBrandDetailPage
+};

package/dist/{chunk-WIQ2HBJG.js → chunk-TITPJHIL.js}

@@ -1,35 +1,35 @@
 import {
   usePromotionTableColumns,
   usePromotionTableQuery
-} from "./chunk-XBHUWCBD.js";
+} from "./chunk-P25PIADJ.js";
+import {
+  usePromotionTableFilters
+} from "./chunk-S2WEYEQR.js";
 import {
   DateRangeDisplay
 } from "./chunk-RK5N3XIX.js";
-import {
-  TwoColumnPage
-} from "./chunk-E74OUNA3.js";
 import {
   _DataTable,
   useDataTable
-} from "./chunk-KYPPQGGE.js";
+} from "./chunk-NQEXDLYH.js";
 import {
   currencies
 } from "./chunk-IQPN4PZJ.js";
 import {
-  TwoColumnPageSkeleton
-} from "./chunk-INNFZYX2.js";
-import {
-  ActionMenu
-} from "./chunk-BDGZ4EQO.js";
-import {
-  usePromotionTableFilters
-} from "./chunk-S2WEYEQR.js";
+  TwoColumnPage
+} from "./chunk-E74OUNA3.js";
 import {
   useAddOrRemoveCampaignPromotions,
   useCampaign,
   useDeleteCampaign,
   usePromotions
 } from "./chunk-ZN7LWXVC.js";
+import {
+  ActionMenu
+} from "./chunk-BDGZ4EQO.js";
+import {
+  TwoColumnPageSkeleton
+} from "./chunk-INNFZYX2.js";
 
 // src/pages/campaigns/campaign-detail/campaign-detail.tsx
 import { Children } from "react";

package/dist/{chunk-SOJ4TLWP.js → chunk-TP7L6M7V.js}

@@ -16,13 +16,10 @@ import {
 import {
   _DataTable,
   useDataTable
-} from "./chunk-KYPPQGGE.js";
+} from "./chunk-NQEXDLYH.js";
 import {
   SingleColumnPage
 } from "./chunk-H6MYB7GB.js";
-import {
-  ActionMenu
-} from "./chunk-BDGZ4EQO.js";
 import {
   useQueryParams
 } from "./chunk-THHRRYRS.js";
@@ -30,7 +27,10 @@ import {
   useApiKeys,
   useDeleteApiKey,
   useRevokeApiKey
-} from "./chunk-YKDEE7ZL.js";
+} from "./chunk-FTAR3BDS.js";
+import {
+  ActionMenu
+} from "./chunk-BDGZ4EQO.js";
 
 // src/pages/api-key-management/api-key-management-list/api-key-management-list.tsx
 import { Children as Children3 } from "react";

package/dist/{chunk-7XXM72CF.js → chunk-TTERSO37.js}

@@ -1,28 +1,25 @@
 import {
-  PRODUCT_DETAIL_QUERY
-} from "./chunk-35NDMIYZ.js";
+  AttributeValueInput
+} from "./chunk-N7KTSXS5.js";
 import {
-  DataGrid,
-  createDataGridHelper,
-  createDataGridPriceColumns
-} from "./chunk-MWX5JCOM.js";
+  optionalInt
+} from "./chunk-UXD3VNBO.js";
 import {
   useComboboxData
-} from "./chunk-AEFDAU3Y.js";
+} from "./chunk-5KGMGL4N.js";
 import {
   Combobox
 } from "./chunk-AW77UWCZ.js";
-import {
-  optionalInt
-} from "./chunk-UXD3VNBO.js";
-import {
-  castNumber
-} from "./chunk-SMQT3ZNO.js";
 import {
   TabbedForm,
   defineTabMeta,
   useTabbedForm
 } from "./chunk-4LXBQTFN.js";
+import {
+  DataGrid,
+  createDataGridHelper,
+  createDataGridPriceColumns
+} from "./chunk-V6OGMYAI.js";
 import {
   RouteFocusModal,
   useRouteModal
@@ -30,6 +27,12 @@ import {
 import {
   Form
 } from "./chunk-3QSRE5LS.js";
+import {
+  PRODUCT_DETAIL_QUERY
+} from "./chunk-RQ4NMLSS.js";
+import {
+  require_dist
+} from "./chunk-DZIXC7OE.js";
 import {
   useRegions
 } from "./chunk-ESPLVOFC.js";
@@ -42,10 +45,13 @@ import {
 import {
   useCreateProductVariant,
   useProduct
-} from "./chunk-5CK6XEFV.js";
+} from "./chunk-2YYXP6XI.js";
 import {
   sdk
 } from "./chunk-ZBWL72TB.js";
+import {
+  __toESM
+} from "./chunk-NBMM2TZK.js";
 
 // src/pages/products/product-create-variant/components/create-product-variant-form/constants.ts
 import { z } from "zod";
@@ -56,7 +62,7 @@ var CreateProductVariantSchema = z.object({
   manage_inventory: z.boolean().optional(),
   allow_backorder: z.boolean().optional(),
   inventory_kit: z.boolean().optional(),
-  options: z.record(z.string()),
+  attribute_values: z.record(z.union([z.string(), z.array(z.string())])).optional(),
   prices: zod.record(zod.string(), zod.string().or(zod.number()).optional()).optional(),
   inventory: z.array(
     z.object({
@@ -71,7 +77,7 @@ var CreateVariantDetailsSchema = CreateProductVariantSchema.pick({
   manage_inventory: true,
   allow_backorder: true,
   inventory_kit: true,
-  options: true
+  attribute_values: true
 });
 var CreateVariantDetailsFields = Object.keys(
   CreateVariantDetailsSchema.shape
@@ -94,6 +100,7 @@ import { Children, useCallback, useEffect, useMemo as useMemo2 } from "react";
 import { useFieldArray as useFieldArray2, useForm, useWatch as useWatch3 } from "react-hook-form";
 
 // src/pages/products/product-create-variant/components/create-product-variant-form/details-tab.tsx
+var import_types = __toESM(require_dist(), 1);
 import { Heading, Input, Switch } from "@medusajs/ui";
 import { useWatch } from "react-hook-form";
 import { useTranslation } from "react-i18next";
@@ -105,6 +112,7 @@ function DetailsTab({ product }) {
     control: form.control,
     name: "manage_inventory"
   });
+  const variantAttributes = product.variant_attributes?.filter((a) => a.is_variant_axis) ?? [];
   return /* @__PURE__ */ jsx("div", { className: "flex flex-1 flex-col items-center overflow-y-auto", "data-testid": "product-variant-create-form-details-tab", children: /* @__PURE__ */ jsxs("div", { className: "flex w-full max-w-[720px] flex-col gap-y-8 px-8 py-16", children: [
     /* @__PURE__ */ jsx(Heading, { level: "h1", "data-testid": "product-variant-create-form-details-heading", children: t("products.variant.create.header") }),
     /* @__PURE__ */ jsxs("div", { className: "my-8 grid grid-cols-1 gap-4 md:grid-cols-2", children: [
@@ -136,35 +144,35 @@ function DetailsTab({ product }) {
           }
         }
       ),
-      product.options?.map((option) => /* @__PURE__ */ jsx(
-        Form.Field,
-        {
-          control: form.control,
-          name: `options.${option.title}`,
-          render: ({ field: { value, onChange, ...field } }) => {
-            return /* @__PURE__ */ jsxs(Form.Item, { "data-testid": `product-variant-create-form-option-${option.title}-item`, children: [
-              /* @__PURE__ */ jsx(Form.Label, { "data-testid": `product-variant-create-form-option-${option.title}-label`, children: option.title }),
-              /* @__PURE__ */ jsx(Form.Control, { "data-testid": `product-variant-create-form-option-${option.title}-control`, children: /* @__PURE__ */ jsx(
-                Combobox,
-                {
-                  value,
-                  onChange: (v) => {
-                    onChange(v);
-                  },
-                  ...field,
-                  options: option.values.map((v) => ({
-                    label: v.value,
-                    value: v.value
-                  })),
-                  "data-testid": `product-variant-create-form-option-${option.title}-combobox`
-                }
-              ) }),
-              /* @__PURE__ */ jsx(Form.ErrorMessage, { "data-testid": `product-variant-create-form-option-${option.title}-error` })
-            ] });
-          }
-        },
-        option.id
-      ))
+      variantAttributes.map((attribute) => {
+        const fieldKey = attribute.handle ?? attribute.id;
+        return /* @__PURE__ */ jsx(
+          Form.Field,
+          {
+            control: form.control,
+            name: `attribute_values.${fieldKey}`,
+            render: ({ field: { value, onChange } }) => {
+              return /* @__PURE__ */ jsxs(Form.Item, { "data-testid": `product-variant-create-form-attribute-${attribute.id}-item`, children: [
+                /* @__PURE__ */ jsx(Form.Label, { "data-testid": `product-variant-create-form-attribute-${attribute.id}-label`, children: attribute.name }),
+                /* @__PURE__ */ jsx(Form.Control, { "data-testid": `product-variant-create-form-attribute-${attribute.id}-control`, children: /* @__PURE__ */ jsx(
+                  AttributeValueInput,
+                  {
+                    type: import_types.AttributeType.SINGLE_SELECT,
+                    value: typeof value === "string" ? value : "",
+                    onChange,
+                    availableValues: (attribute.values ?? []).map((v) => ({
+                      id: v.id,
+                      name: v.name
+                    }))
+                  }
+                ) }),
+                /* @__PURE__ */ jsx(Form.ErrorMessage, { "data-testid": `product-variant-create-form-attribute-${attribute.id}-error` })
+              ] });
+            }
+          },
+          attribute.id
+        );
+      })
     ] }),
     /* @__PURE__ */ jsxs("div", { className: "flex flex-col gap-y-4", children: [
       /* @__PURE__ */ jsx(
@@ -263,7 +271,7 @@ function DetailsTab({ product }) {
 DetailsTab._tabMeta = defineTabMeta({
   id: "detail",
   labelKey: "priceLists.create.tabs.details",
-  validationFields: ["title", "sku", "manage_inventory", "allow_backorder", "inventory_kit", "options"]
+  validationFields: ["title", "sku", "manage_inventory", "allow_backorder", "inventory_kit", "attribute_values"]
 });
 var details_tab_default = DetailsTab;
 
@@ -522,7 +530,7 @@ var CREATE_VARIANT_DEFAULTS = {
   manage_inventory: false,
   allow_backorder: false,
   inventory_kit: false,
-  options: {}
+  attribute_values: {}
 };
 var CreateProductVariantForm = ({
   product,
@@ -539,19 +547,6 @@ var CreateProductVariantForm = ({
     resolver: zodResolver(schema ?? CreateProductVariantSchema)
   });
   const { mutateAsync, isPending } = useCreateProductVariant(product.id);
-  const { regions } = useRegions({ limit: 9999 });
-  const regionsCurrencyMap = useMemo2(() => {
-    if (!regions?.length) {
-      return {};
-    }
-    return regions.reduce(
-      (acc, reg) => {
-        acc[reg.id] = reg.currency_code;
-        return acc;
-      },
-      {}
-    );
-  }, [regions]);
   const isManageInventoryEnabled = useWatch3({
     control: form.control,
     name: "manage_inventory"
@@ -589,38 +584,16 @@ var CreateProductVariantForm = ({
     [inventoryTabEnabled]
   );
   const handleSubmit = form.handleSubmit(async (data) => {
-    const { allow_backorder, manage_inventory, sku, title } = data;
+    const { title, attribute_values } = data;
+    const cleanedAttributeValues = Object.fromEntries(
+      Object.entries(attribute_values ?? {}).filter(
+        ([, v]) => Array.isArray(v) ? v.length > 0 : !!v
+      )
+    );
     await mutateAsync(
       {
         title,
-        sku: sku || void 0,
-        allow_backorder,
-        manage_inventory,
-        options: data.options,
-        prices: Object.entries(data.prices ?? {}).map(([currencyOrRegion, value]) => {
-          if (value === "" || value === void 0) {
-            return void 0;
-          }
-          const ret = {};
-          const amount = castNumber(value);
-          if (currencyOrRegion.startsWith("reg_")) {
-            ret.rules = { region_id: currencyOrRegion };
-            ret.currency_code = regionsCurrencyMap[currencyOrRegion];
-          } else {
-            ret.currency_code = currencyOrRegion;
-          }
-          ret.amount = amount;
-          return ret;
-        }).filter((x) => Boolean(x)),
-        inventory_items: (data.inventory || []).map((i) => {
-          if (!i.required_quantity || !i.inventory_item_id) {
-            return false;
-          }
-          return {
-            ...i,
-            required_quantity: castNumber(i.required_quantity)
-          };
-        }).filter((x) => Boolean(x))
+        attribute_values: Object.keys(cleanedAttributeValues).length ? cleanedAttributeValues : void 0
       },
       {
         onSuccess: () => {

package/dist/{chunk-ARMGWHYU.js → chunk-U7AZOXPV.js}

@@ -1,6 +1,6 @@
 import {
   useDeleteProductCategoryAction
-} from "./chunk-YEUUI6JF.js";
+} from "./chunk-WDH5C2NS.js";
 import {
   getCategoryChildren,
   getCategoryPath,
@@ -12,34 +12,34 @@ import {
 } from "./chunk-7AV5EJJ5.js";
 import {
   useProductTableColumns
-} from "./chunk-Z5I2Z6L3.js";
+} from "./chunk-Q2QFNTNX.js";
 import {
-  TwoColumnPage
-} from "./chunk-E74OUNA3.js";
+  useProductTableFilters
+} from "./chunk-5POK3PM3.js";
+import {
+  useProductTableQuery
+} from "./chunk-LYZDVZWA.js";
 import {
   _DataTable,
   useDataTable
-} from "./chunk-KYPPQGGE.js";
+} from "./chunk-NQEXDLYH.js";
 import {
-  Skeleton,
-  TwoColumnPageSkeleton
-} from "./chunk-INNFZYX2.js";
+  TwoColumnPage
+} from "./chunk-E74OUNA3.js";
 import {
   ActionMenu
 } from "./chunk-BDGZ4EQO.js";
-import {
-  useProductTableFilters
-} from "./chunk-LNAXUDW2.js";
-import {
-  useProductTableQuery
-} from "./chunk-VVWB3GIK.js";
 import {
   useProductCategory,
   useUpdateProductCategoryProducts
-} from "./chunk-Z2QQZOG3.js";
+} from "./chunk-H5PYBIOZ.js";
+import {
+  Skeleton,
+  TwoColumnPageSkeleton
+} from "./chunk-INNFZYX2.js";
 import {
   useProducts
-} from "./chunk-5CK6XEFV.js";
+} from "./chunk-2YYXP6XI.js";
 
 // src/pages/categories/category-detail/category-detail.tsx
 import { Children } from "react";