@mercurjs/admin 2.2.0-canary.50 → 2.2.0-canary.53

package/dist/{chunk-MVRIYUOU.js → chunk-PPRIEP4H.js}

@@ -19,16 +19,16 @@ import {
 import {
   Thumbnail
 } from "./chunk-WIYFXWRI.js";
-import {
-  _DataTable,
-  useDataTable
-} from "./chunk-6ZVV2XHU.js";
 import {
   SingleColumnPage
 } from "./chunk-H6MYB7GB.js";
 import {
   useQueryParams
 } from "./chunk-THHRRYRS.js";
+import {
+  _DataTable,
+  useDataTable
+} from "./chunk-GRFWCCUW.js";
 import {
   ActionMenu
 } from "./chunk-BDGZ4EQO.js";

package/dist/{chunk-3WOU2BB5.js → chunk-Q5DRFJPI.js}

@@ -10,16 +10,16 @@ import {
 import {
   TextCell
 } from "./chunk-JHIMVLB2.js";
-import {
-  _DataTable,
-  useDataTable
-} from "./chunk-6ZVV2XHU.js";
 import {
   SingleColumnPage
 } from "./chunk-H6MYB7GB.js";
 import {
   useQueryParams
 } from "./chunk-THHRRYRS.js";
+import {
+  _DataTable,
+  useDataTable
+} from "./chunk-GRFWCCUW.js";
 import {
   useShippingOptionTypes
 } from "./chunk-ABS7HMLY.js";

package/dist/{chunk-5WTNXDRM.js → chunk-QXJFQDMJ.js}

@@ -9,14 +9,14 @@ import {
 } from "./chunk-APMBU7ZV.js";
 import {
   useProductTableQuery
-} from "./chunk-5NSOIZFB.js";
-import {
-  _DataTable,
-  useDataTable
-} from "./chunk-6ZVV2XHU.js";
+} from "./chunk-S4IDR46L.js";
 import {
   SingleColumnPage
 } from "./chunk-H6MYB7GB.js";
+import {
+  _DataTable,
+  useDataTable
+} from "./chunk-GRFWCCUW.js";
 import {
   useProductTag
 } from "./chunk-ABS7HMLY.js";

package/dist/{chunk-Q2CJGCIA.js → chunk-R2LW5LGL.js}

@@ -8917,7 +8917,7 @@ var en_default = {
   },
   actions: {
     save: "Save",
-    saveAsDraft: "Save as draft",
+    saveAsDraft: "Save draft",
     copy: "Copy",
     copied: "Copied",
     duplicate: "Duplicate",

package/dist/{chunk-TVTI7RG5.js → chunk-RX4VERJZ.js}

@@ -9,14 +9,14 @@ import {
 } from "./chunk-APMBU7ZV.js";
 import {
   useProductTableQuery
-} from "./chunk-5NSOIZFB.js";
-import {
-  _DataTable,
-  useDataTable
-} from "./chunk-6ZVV2XHU.js";
+} from "./chunk-S4IDR46L.js";
 import {
   SingleColumnPage
 } from "./chunk-H6MYB7GB.js";
+import {
+  _DataTable,
+  useDataTable
+} from "./chunk-GRFWCCUW.js";
 import {
   useProductType
 } from "./chunk-EWFOFSF7.js";

package/dist/{chunk-SHFF3Y5U.js → chunk-RYISNVIR.js}

@@ -7,13 +7,13 @@ import {
 import {
   useCustomerTableQuery
 } from "./chunk-GRH7C3QN.js";
-import {
-  _DataTable,
-  useDataTable
-} from "./chunk-6ZVV2XHU.js";
 import {
   SingleColumnPage
 } from "./chunk-H6MYB7GB.js";
+import {
+  _DataTable,
+  useDataTable
+} from "./chunk-GRFWCCUW.js";
 import {
   useCustomers
 } from "./chunk-AFYILTAC.js";

package/dist/{chunk-5NSOIZFB.js → chunk-S4IDR46L.js}

@@ -3,13 +3,13 @@ import {
 } from "./chunk-THHRRYRS.js";
 
 // src/hooks/table/query/use-product-table-query.tsx
-import { useExtension, withLinkFields } from "@mercurjs/dashboard-shared";
+import { useLinkQuery } from "@mercurjs/dashboard-shared";
 var DEFAULT_FIELDS = "id,title,handle,status,*collection,*categories,variants.id,thumbnail";
 var useProductTableQuery = ({
   prefix,
   pageSize = 20
 }) => {
-  const links = useExtension().getLinks("product");
+  const linkQuery = useLinkQuery("product", DEFAULT_FIELDS);
   const queryObject = useQueryParams(
     [
       "offset",
@@ -50,7 +50,7 @@ var useProductTableQuery = ({
     type_id: type_id?.split(","),
     status: status?.split(","),
     q,
-    fields: withLinkFields(DEFAULT_FIELDS, links)
+    fields: linkQuery.fields
   };
   return {
     searchParams,

package/dist/{chunk-IOAB3VND.js → chunk-SLAWONP2.js}

@@ -20,16 +20,16 @@ import {
 import {
   Thumbnail
 } from "./chunk-WIYFXWRI.js";
+import {
+  useQueryParams
+} from "./chunk-THHRRYRS.js";
 import {
   _DataTable,
   useDataTable
-} from "./chunk-6ZVV2XHU.js";
+} from "./chunk-GRFWCCUW.js";
 import {
   useDate
 } from "./chunk-UZWFZMOX.js";
-import {
-  useQueryParams
-} from "./chunk-THHRRYRS.js";
 import {
   useStockLocations
 } from "./chunk-VXW3BCN2.js";

package/dist/{chunk-OAGTPKC5.js → chunk-TIG77LHS.js}

@@ -1,6 +1,6 @@
 import {
   getPromotionStatus
-} from "./chunk-N2CMOV3N.js";
+} from "./chunk-67KYEPSA.js";
 import {
   TextCell,
   TextHeader

package/dist/{chunk-YBVXGODN.js → chunk-UVH7PC5B.js}

@@ -1,13 +1,13 @@
-import {
-  _DataTable,
-  useDataTable
-} from "./chunk-6ZVV2XHU.js";
 import {
   SingleColumnPage
 } from "./chunk-H6MYB7GB.js";
 import {
   useQueryParams
 } from "./chunk-THHRRYRS.js";
+import {
+  _DataTable,
+  useDataTable
+} from "./chunk-GRFWCCUW.js";
 import {
   useDeleteShippingProfile,
   useShippingProfiles

package/dist/{chunk-KA3BALYJ.js → chunk-VB7LMHAF.js}

@@ -6,17 +6,17 @@ import {
 } from "./chunk-APMBU7ZV.js";
 import {
   useProductTableQuery
-} from "./chunk-5NSOIZFB.js";
+} from "./chunk-S4IDR46L.js";
 import {
   PRODUCT_IDS_KEY
 } from "./chunk-LO2ZWQGL.js";
-import {
-  _DataTable,
-  useDataTable
-} from "./chunk-6ZVV2XHU.js";
 import {
   SingleColumnPage
 } from "./chunk-H6MYB7GB.js";
+import {
+  _DataTable,
+  useDataTable
+} from "./chunk-GRFWCCUW.js";
 import {
   ActionMenu
 } from "./chunk-BDGZ4EQO.js";

package/dist/{chunk-GT5A4XN2.js → chunk-VX6OCQLN.js}

@@ -1,16 +1,16 @@
 import {
   DateCell
 } from "./chunk-25LYVP3C.js";
-import {
-  _DataTable,
-  useDataTable
-} from "./chunk-6ZVV2XHU.js";
 import {
   SingleColumnPage
 } from "./chunk-H6MYB7GB.js";
 import {
   useQueryParams
 } from "./chunk-THHRRYRS.js";
+import {
+  _DataTable,
+  useDataTable
+} from "./chunk-GRFWCCUW.js";
 import {
   useUsers
 } from "./chunk-A2F5MDPU.js";

package/dist/{chunk-THMINQBZ.js → chunk-WF2PHYTE.js}

@@ -7,13 +7,13 @@ import {
 import {
   useRegionTableQuery
 } from "./chunk-7SVLKK6Q.js";
-import {
-  _DataTable,
-  useDataTable
-} from "./chunk-6ZVV2XHU.js";
 import {
   SingleColumnPage
 } from "./chunk-H6MYB7GB.js";
+import {
+  _DataTable,
+  useDataTable
+} from "./chunk-GRFWCCUW.js";
 import {
   useDeleteRegion,
   useRegions

package/dist/{chunk-NASXWD7N.js → chunk-WTVSHPKP.js}

@@ -22,14 +22,14 @@ import {
 } from "./chunk-APMBU7ZV.js";
 import {
   useProductTableQuery
-} from "./chunk-5NSOIZFB.js";
+} from "./chunk-S4IDR46L.js";
 import {
   TwoColumnPage
 } from "./chunk-E74OUNA3.js";
 import {
   _DataTable,
   useDataTable
-} from "./chunk-6ZVV2XHU.js";
+} from "./chunk-GRFWCCUW.js";
 import {
   ActionMenu
 } from "./chunk-BDGZ4EQO.js";

package/dist/{chunk-MJTFEVGB.js → chunk-X4SSIHH7.js}

@@ -7,13 +7,13 @@ import {
 import {
   useCustomerTableQuery
 } from "./chunk-GRH7C3QN.js";
-import {
-  _DataTable,
-  useDataTable
-} from "./chunk-6ZVV2XHU.js";
 import {
   SingleColumnPage
 } from "./chunk-H6MYB7GB.js";
+import {
+  _DataTable,
+  useDataTable
+} from "./chunk-GRFWCCUW.js";
 import {
   useCustomerGroup,
   useCustomers,

package/dist/{chunk-NI4FAFNL.js → chunk-XDMCPTDG.js}

@@ -10,7 +10,7 @@ import {
   decorateVariantsWithDefaultValues,
   generateVariantsFromAttributes,
   normalizeProductFormValues
-} from "./chunk-OPE24DZA.js";
+} from "./chunk-3FKB6UTO.js";
 import {
   HandleInput
 } from "./chunk-HJ56YXBU.js";
@@ -20,9 +20,6 @@ import {
 import {
   useAttributeTableQuery
 } from "./chunk-4YWKKCTT.js";
-import {
-  DataTable
-} from "./chunk-C4XKPQ6T.js";
 import {
   SingleCategoryCombobox
 } from "./chunk-DP6YFZHP.js";
@@ -59,6 +56,10 @@ import {
 import {
   require_dist
 } from "./chunk-VYSB4CTB.js";
+import {
+  _DataTable,
+  useDataTable
+} from "./chunk-GRFWCCUW.js";
 import {
   useProductAttributes
 } from "./chunk-F5NW4XBU.js";
@@ -118,14 +119,13 @@ import {
 import { useTranslation as useTranslation2 } from "react-i18next";
 
 // src/pages/products/product-create/components/product-create-attributes-form/product-create-add-attributes-modal.tsx
+import { Badge, Button, Checkbox } from "@medusajs/ui";
+import { keepPreviousData } from "@tanstack/react-query";
 import {
-  Badge,
-  Button,
-  createDataTableColumnHelper
-} from "@medusajs/ui";
+  createColumnHelper
+} from "@tanstack/react-table";
 import { useEffect, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
-import { keepPreviousData } from "@tanstack/react-query";
 import { jsx, jsxs } from "react/jsx-runtime";
 var ADD_ATTRIBUTES_MODAL_ID = "add-attributes";
 var PAGE_SIZE = 20;
@@ -142,12 +142,10 @@ var ProductCreateAddAttributesModal = () => {
   const { t } = useTranslation();
   const { getValues, setValue } = form;
   const { setIsOpen, getIsOpen } = useStackedModal();
-  const [rowSelection, setRowSelection] = useState(
-    {}
-  );
-  const [state, setState] = useState([]);
+  const [rowSelection, setRowSelection] = useState({});
+  const [selected, setSelected] = useState([]);
   const categoryId = form.watch("category_id");
-  const { searchParams } = useAttributeTableQuery({
+  const { searchParams, raw } = useAttributeTableQuery({
     pageSize: PAGE_SIZE,
     prefix: ADD_ATTRIBUTES_MODAL_ID
   });
@@ -166,12 +164,14 @@ var ProductCreateAddAttributesModal = () => {
     const attributes = getValues("attributes") ?? [];
     const existing = attributes.filter((a) => a.attribute_id);
     const selection = {};
-    const stateEntries = [];
+    const entries = [];
     for (const a of existing) {
       if (a.attribute_id) {
         selection[a.attribute_id] = true;
-        const apiAttr = product_attributes?.find((pa) => pa.id === a.attribute_id);
-        stateEntries.push({
+        const apiAttr = product_attributes?.find(
+          (pa) => pa.id === a.attribute_id
+        );
+        entries.push({
           id: a.attribute_id,
           name: a.title,
           values: Array.isArray(a.values) ? a.values : a.values ? [a.values] : [],
@@ -185,7 +185,7 @@ var ProductCreateAddAttributesModal = () => {
       for (const attr of product_attributes) {
         if (attr.is_required && !selection[attr.id]) {
           selection[attr.id] = true;
-          stateEntries.push({
+          entries.push({
             id: attr.id,
             name: attr.name,
             values: [],
@@ -197,9 +197,10 @@ var ProductCreateAddAttributesModal = () => {
       }
     }
     setRowSelection(selection);
-    setState(stateEntries);
+    setSelected(entries);
   }, [open, getValues, product_attributes]);
-  const onRowSelectionChange = (next) => {
+  const updater = (fn) => {
+    const next = typeof fn === "function" ? fn(rowSelection) : fn;
     if (product_attributes) {
       for (const attr of product_attributes) {
         if (attr.is_required) {
@@ -207,24 +208,20 @@ var ProductCreateAddAttributesModal = () => {
         }
       }
     }
-    const ids = Object.keys(next);
-    const addedIdsSet = new Set(
-      ids.filter((id) => next[id] && !rowSelection[id])
+    const addedIds = new Set(
+      Object.keys(next).filter((id) => next[id] && !rowSelection[id])
     );
-    let addedAttributes = [];
-    if (addedIdsSet.size > 0) {
-      addedAttributes = product_attributes?.filter((attr) => addedIdsSet.has(attr.id)).map((attr) => ({
-        id: attr.id,
-        name: attr.name,
-        values: [],
-        is_variant_axis: attr.is_variant_axis,
-        type: attr.type,
-        available_values: attr.values?.map((v) => ({ id: v.id, name: v.name })) ?? []
-      })) ?? [];
-    }
-    setState((prev) => {
-      const filteredPrev = prev.filter((a) => next[a.id]);
-      return Array.from(/* @__PURE__ */ new Set([...filteredPrev, ...addedAttributes]));
+    const addedAttributes = addedIds.size > 0 ? product_attributes?.filter((attr) => addedIds.has(attr.id)).map((attr) => ({
+      id: attr.id,
+      name: attr.name,
+      values: [],
+      is_variant_axis: attr.is_variant_axis,
+      type: attr.type,
+      available_values: attr.values?.map((v) => ({ id: v.id, name: v.name })) ?? []
+    })) ?? [] : [];
+    setSelected((prev) => {
+      const kept = prev.filter((a) => next[a.id]);
+      return Array.from(/* @__PURE__ */ new Set([...kept, ...addedAttributes]));
     });
     setRowSelection(next);
   };
@@ -234,7 +231,7 @@ var ProductCreateAddAttributesModal = () => {
     const requiredIds = new Set(
       product_attributes?.filter((a) => a.is_required).map((a) => a.id) ?? []
     );
-    const selectedAttributes = state.map((a) => ({
+    const selectedAttributes = selected.map((a) => ({
       attribute_id: a.id,
       title: a.name,
       values: a.values,
@@ -252,28 +249,42 @@ var ProductCreateAddAttributesModal = () => {
   };
   const filters = useAttributeTableFilters();
   const columns = useColumns();
+  const { table } = useDataTable({
+    data: product_attributes ?? [],
+    columns,
+    count,
+    getRowId: (row) => row.id,
+    pageSize: PAGE_SIZE,
+    enablePagination: true,
+    enableRowSelection: (row) => !row.original.is_required,
+    rowSelection: { state: rowSelection, updater },
+    prefix: ADD_ATTRIBUTES_MODAL_ID
+  });
   if (isError) {
     throw error;
   }
   return /* @__PURE__ */ jsxs(StackedFocusModal.Content, { className: "flex flex-col overflow-hidden", children: [
     /* @__PURE__ */ jsx(StackedFocusModal.Header, {}),
-    /* @__PURE__ */ jsx(StackedFocusModal.Body, { className: "flex-1 overflow-hidden", children: /* @__PURE__ */ jsx(
-      DataTable,
+    /* @__PURE__ */ jsx(StackedFocusModal.Body, { className: "flex size-full flex-col overflow-hidden", children: /* @__PURE__ */ jsx(
+      _DataTable,
       {
-        data: product_attributes,
+        table,
         columns,
-        filters,
-        rowCount: count,
+        count,
         pageSize: PAGE_SIZE,
-        getRowId: (row) => row.id,
-        rowSelection: {
-          state: rowSelection,
-          onRowSelectionChange,
-          enableRowSelection: (row) => !row.original.is_required
-        },
         isLoading,
+        filters,
+        orderBy: [
+          { key: "name", label: t("attributes.fields.name") },
+          { key: "created_at", label: t("fields.createdAt") },
+          { key: "updated_at", label: t("fields.updatedAt") }
+        ],
+        queryObject: raw,
+        prefix: ADD_ATTRIBUTES_MODAL_ID,
         layout: "fill",
-        prefix: ADD_ATTRIBUTES_MODAL_ID
+        pagination: true,
+        search: true,
+        noRecords: { message: t("attributes.list.noRecordsMessage") }
       }
     ) }),
     /* @__PURE__ */ jsx(StackedFocusModal.Footer, { children: /* @__PURE__ */ jsxs("div", { className: "flex items-center justify-end gap-x-2", children: [
@@ -282,28 +293,43 @@ var ProductCreateAddAttributesModal = () => {
     ] }) })
   ] });
 };
-var columnHelper = createDataTableColumnHelper();
+var columnHelper = createColumnHelper();
 var useColumns = () => {
   const { t } = useTranslation();
   return useMemo(
     () => [
-      columnHelper.select(),
+      columnHelper.display({
+        id: "select",
+        header: ({ table }) => /* @__PURE__ */ jsx(
+          Checkbox,
+          {
+            checked: table.getIsSomePageRowsSelected() ? "indeterminate" : table.getIsAllPageRowsSelected(),
+            onCheckedChange: (value) => table.toggleAllPageRowsSelected(!!value)
+          }
+        ),
+        cell: ({ row }) => /* @__PURE__ */ jsx(
+          Checkbox,
+          {
+            checked: row.getIsSelected(),
+            disabled: !row.getCanSelect(),
+            onCheckedChange: (value) => row.toggleSelected(!!value),
+            onClick: (e) => e.stopPropagation()
+          }
+        )
+      }),
       columnHelper.accessor("name", {
-        header: t("attributes.fields.name"),
-        enableSorting: false
+        header: t("attributes.fields.productAttribute")
       }),
       columnHelper.accessor("handle", {
         header: t("attributes.fields.handle"),
         cell: (info) => {
           const handle = info.getValue();
           return handle ? `/${handle}` : "-";
-        },
-        enableSorting: false
+        }
       }),
       columnHelper.accessor("is_required", {
         header: t("attributes.fields.required"),
-        cell: (info) => info.getValue() ? t("filters.radio.yes") : t("filters.radio.no"),
-        enableSorting: false
+        cell: (info) => info.getValue() ? t("filters.radio.yes") : t("filters.radio.no")
       }),
       columnHelper.accessor("type", {
         header: t("attributes.fields.type"),
@@ -311,13 +337,11 @@ var useColumns = () => {
           const type = info.getValue();
           const labelKey = ATTRIBUTE_TYPE_LABELS[type];
           return labelKey ? t(labelKey) : type;
-        },
-        enableSorting: false
+        }
       }),
       columnHelper.accessor("is_variant_axis", {
         header: t("attributes.fields.variantAxis"),
-        cell: (info) => info.getValue() ? t("filters.radio.yes") : t("filters.radio.no"),
-        enableSorting: false
+        cell: (info) => info.getValue() ? t("filters.radio.yes") : t("filters.radio.no")
       }),
       columnHelper.display({
         id: "values",
@@ -1285,7 +1309,7 @@ function formatFileSize(bytes, decimalPlaces = 2) {
 // src/pages/products/product-create/components/product-create-details-form/components/product-create-details-variant-section/product-create-details-variant-section.tsx
 import {
   Alert,
-  Checkbox,
+  Checkbox as Checkbox2,
   clx,
   Heading as Heading2,
   Hint as Hint2,
@@ -1391,7 +1415,7 @@ var ProductCreateVariantsSection = () => {
                 },
                 children: [
                   /* @__PURE__ */ jsx5("div", { children: /* @__PURE__ */ jsx5(
-                    Checkbox,
+                    Checkbox2,
                     {
                       className: "relative",
                       checked: getCheckboxState(watchedVariants),
@@ -1432,7 +1456,7 @@ var ProductCreateVariantsSection = () => {
                                 render: ({
                                   field: { value, onChange, ...field }
                                 }) => /* @__PURE__ */ jsx5(Form.Item, { children: /* @__PURE__ */ jsx5(Form.Control, { children: /* @__PURE__ */ jsx5(
-                                  Checkbox,
+                                  Checkbox2,
                                   {
                                     className: "relative",
                                     ...field,
@@ -2030,6 +2054,7 @@ var ProductCreateForm = ({
               Button3,
               {
                 "data-name": SAVE_DRAFT_BUTTON,
+                variant: "secondary",
                 size: "small",
                 type: "submit",
                 isLoading,

package/dist/{chunk-OTGABFC4.js → chunk-XNUH2AOW.js}

@@ -18,16 +18,16 @@ import {
 import {
   SectionRow
 } from "./chunk-3XPXUIK3.js";
-import {
-  _DataTable,
-  useDataTable
-} from "./chunk-6ZVV2XHU.js";
 import {
   SingleColumnPage
 } from "./chunk-H6MYB7GB.js";
 import {
   useQueryParams
 } from "./chunk-THHRRYRS.js";
+import {
+  _DataTable,
+  useDataTable
+} from "./chunk-GRFWCCUW.js";
 import {
   useCommissionRules,
   useDefaultCommission

package/dist/{chunk-NPUD4G37.js → chunk-XXV6ZSWY.js}

@@ -2,7 +2,7 @@ import {
   TaxOverrideTable,
   TaxRateLine,
   useTaxOverrideTable
-} from "./chunk-M5BZBKA3.js";
+} from "./chunk-4QQ6BFWQ.js";
 import {
   TaxRegionCard
 } from "./chunk-KXWN75T2.js";

package/dist/{chunk-GWW6MPYK.js → chunk-YLQ63F5E.js}

@@ -10,13 +10,13 @@ import {
 import {
   useProductTypeTableQuery
 } from "./chunk-VOHEQ7B5.js";
-import {
-  _DataTable,
-  useDataTable
-} from "./chunk-6ZVV2XHU.js";
 import {
   SingleColumnPage
 } from "./chunk-H6MYB7GB.js";
+import {
+  _DataTable,
+  useDataTable
+} from "./chunk-GRFWCCUW.js";
 import {
   useProductTypes
 } from "./chunk-EWFOFSF7.js";

package/dist/{chunk-7MYE6VFQ.js → chunk-YNR25MNM.js}

@@ -11,16 +11,16 @@ import {
 import {
   StatusCell
 } from "./chunk-DB6ANJBO.js";
-import {
-  _DataTable,
-  useDataTable
-} from "./chunk-6ZVV2XHU.js";
 import {
   SingleColumnPage
 } from "./chunk-H6MYB7GB.js";
 import {
   useQueryParams
 } from "./chunk-THHRRYRS.js";
+import {
+  _DataTable,
+  useDataTable
+} from "./chunk-GRFWCCUW.js";
 import {
   usePriceLists
 } from "./chunk-G2LHEJLS.js";