@mercurjs/admin 2.2.0-canary.2 → 2.2.0-canary.21

package/dist/{chunk-54RTJBYO.js → chunk-DGCPYCHU.js}

@@ -2,74 +2,20 @@ import {
   useDate
 } from "./chunk-UZWFZMOX.js";
 
-// src/components/data-table/helpers/general/use-data-table-date-columns.tsx
-import {
-  createDataTableColumnHelper,
-  Tooltip
-} from "@medusajs/ui";
-import { useMemo } from "react";
-import { useTranslation } from "react-i18next";
-import { jsx } from "react/jsx-runtime";
-var columnHelper = createDataTableColumnHelper();
-var useDataTableDateColumns = () => {
-  const { t } = useTranslation();
-  const { getFullDate } = useDate();
-  return useMemo(() => {
-    return [
-      columnHelper.accessor("created_at", {
-        header: t("fields.createdAt"),
-        cell: ({ row }) => {
-          return /* @__PURE__ */ jsx(
-            Tooltip,
-            {
-              content: getFullDate({
-                date: row.original.created_at,
-                includeTime: true
-              }),
-              children: /* @__PURE__ */ jsx("span", { children: getFullDate({ date: row.original.created_at }) })
-            }
-          );
-        },
-        enableSorting: true,
-        sortAscLabel: t("filters.sorting.dateAsc"),
-        sortDescLabel: t("filters.sorting.dateDesc")
-      }),
-      columnHelper.accessor("updated_at", {
-        header: t("fields.updatedAt"),
-        cell: ({ row }) => {
-          return /* @__PURE__ */ jsx(
-            Tooltip,
-            {
-              content: getFullDate({
-                date: row.original.updated_at,
-                includeTime: true
-              }),
-              children: /* @__PURE__ */ jsx("span", { children: getFullDate({ date: row.original.updated_at }) })
-            }
-          );
-        },
-        enableSorting: true,
-        sortAscLabel: t("filters.sorting.dateAsc"),
-        sortDescLabel: t("filters.sorting.dateDesc")
-      })
-    ];
-  }, [t, getFullDate]);
-};
-
 // src/components/data-table/helpers/general/use-data-table-date-filters.tsx
 import { createDataTableFilterHelper } from "@medusajs/ui";
 import { subDays, subMonths } from "date-fns";
-import { useMemo as useMemo2 } from "react";
-import { useTranslation as useTranslation2 } from "react-i18next";
+import { useMemo } from "react";
+import { useTranslation } from "react-i18next";
 var filterHelper = createDataTableFilterHelper();
 var useDateFilterOptions = () => {
-  const { t } = useTranslation2();
-  const today = useMemo2(() => {
+  const { t } = useTranslation();
+  const today = useMemo(() => {
     const date = /* @__PURE__ */ new Date();
     date.setHours(0, 0, 0, 0);
     return date;
   }, []);
-  return useMemo2(() => {
+  return useMemo(() => {
     return [
       {
         label: t("filters.date.today"),
@@ -109,10 +55,10 @@ var useDateFilterOptions = () => {
   }, [today, t]);
 };
 var useDataTableDateFilters = (disableRangeOption) => {
-  const { t } = useTranslation2();
+  const { t } = useTranslation();
   const { getFullDate } = useDate();
   const dateFilterOptions = useDateFilterOptions();
-  const rangeOptions = useMemo2(() => {
+  const rangeOptions = useMemo(() => {
     if (disableRangeOption) {
       return {
         disableRangeOption: true
@@ -125,7 +71,7 @@ var useDataTableDateFilters = (disableRangeOption) => {
       options: dateFilterOptions
     };
   }, [disableRangeOption, t, dateFilterOptions]);
-  return useMemo2(() => {
+  return useMemo(() => {
     return [
       filterHelper.accessor("created_at", {
         type: "date",
@@ -148,6 +94,5 @@ var useDataTableDateFilters = (disableRangeOption) => {
 };
 
 export {
-  useDataTableDateColumns,
   useDataTableDateFilters
 };

package/dist/{chunk-HLPCO2OQ.js → chunk-EAC3J2Z4.js}

@@ -1,12 +1,12 @@
 import {
   useDeleteProductTagAction
-} from "./chunk-PXTJJQKJ.js";
+} from "./chunk-FYKG35MR.js";
 import {
   useProductTableColumns
-} from "./chunk-Q2QFNTNX.js";
+} from "./chunk-FWWPSH6V.js";
 import {
   useProductTableFilters
-} from "./chunk-5POK3PM3.js";
+} from "./chunk-3JN4WUVU.js";
 import {
   useProductTableQuery
 } from "./chunk-LYZDVZWA.js";
@@ -19,7 +19,7 @@ import {
 } from "./chunk-H6MYB7GB.js";
 import {
   useProductTag
-} from "./chunk-AXTQMIIK.js";
+} from "./chunk-PJR6W35H.js";
 import {
   ActionMenu
 } from "./chunk-BDGZ4EQO.js";
@@ -28,7 +28,7 @@ import {
 } from "./chunk-INNFZYX2.js";
 import {
   useProducts
-} from "./chunk-2YYXP6XI.js";
+} from "./chunk-M2E3PKA4.js";
 
 // src/pages/product-tags/product-tag-detail/product-tag-detail.tsx
 import { Children } from "react";

package/dist/{chunk-JQV7CXEC.js → chunk-EDDKIVMF.js}

@@ -1,12 +1,18 @@
+import {
+  getCollectionGallery
+} from "./chunk-BN6OOLJA.js";
 import {
   TextCell
 } from "./chunk-JHIMVLB2.js";
+import {
+  Thumbnail
+} from "./chunk-WIYFXWRI.js";
 
 // src/hooks/table/columns/use-collection-table-columns.tsx
 import { createColumnHelper } from "@tanstack/react-table";
 import { useMemo } from "react";
 import { useTranslation } from "react-i18next";
-import { jsx } from "react/jsx-runtime";
+import { jsx, jsxs } from "react/jsx-runtime";
 var columnHelper = createColumnHelper();
 var useCollectionTableColumns = () => {
   const { t } = useTranslation();
@@ -14,7 +20,16 @@ var useCollectionTableColumns = () => {
     () => [
       columnHelper.accessor("title", {
         header: t("fields.title"),
-        cell: ({ getValue }) => /* @__PURE__ */ jsx(TextCell, { text: getValue() })
+        cell: ({ getValue, row }) => {
+          const gallery = getCollectionGallery(
+            row.original.images
+          );
+          const thumbnailSrc = gallery.find((image) => image.is_thumbnail)?.url ?? gallery[0]?.url ?? null;
+          return /* @__PURE__ */ jsxs("div", { className: "flex size-full items-center gap-x-3 overflow-hidden", children: [
+            /* @__PURE__ */ jsx(Thumbnail, { src: thumbnailSrc }),
+            /* @__PURE__ */ jsx("span", { className: "truncate", children: getValue() })
+          ] });
+        }
       }),
       columnHelper.accessor("handle", {
         header: t("fields.handle"),

package/dist/chunk-EG45GIE3.js

@@ -0,0 +1,368 @@
+import {
+  useDeleteCommissionRuleAction,
+  useScopeReferenceNames
+} from "./chunk-RXRDZ47F.js";
+import {
+  formatCommissionValue,
+  getIsActiveProps,
+  getScopeSummary,
+  getScopeTypeLabel
+} from "./chunk-PN5C4AND.js";
+import {
+  TextCell,
+  TextHeader
+} from "./chunk-JHIMVLB2.js";
+import {
+  _DataTable,
+  useDataTable
+} from "./chunk-NQEXDLYH.js";
+import {
+  SectionRow
+} from "./chunk-3XPXUIK3.js";
+import {
+  SingleColumnPage
+} from "./chunk-H6MYB7GB.js";
+import {
+  useQueryParams
+} from "./chunk-THHRRYRS.js";
+import {
+  useCommissionRules,
+  useDefaultCommission
+} from "./chunk-ZIFHQXP3.js";
+import {
+  ActionMenu
+} from "./chunk-BDGZ4EQO.js";
+import {
+  Skeleton
+} from "./chunk-INNFZYX2.js";
+
+// src/pages/commissions/commissions-list/commissions-page.tsx
+import { Children } from "react";
+
+// src/pages/commissions/commissions-list/components/global-commission-section/global-commission-section.tsx
+import { PencilSquare } from "@medusajs/icons";
+import { Container, Heading } from "@medusajs/ui";
+import { useTranslation } from "react-i18next";
+import { Fragment, jsx, jsxs } from "react/jsx-runtime";
+var GLOBAL_COMMISSION_ROWS = [
+  { key: "code", fallback: "Code" },
+  { key: "type", fallback: "Type" },
+  { key: "value", fallback: "Value" },
+  { key: "tax", fallback: "Tax" },
+  { key: "shipping", fallback: "Shipping" }
+];
+var GlobalCommissionSection = () => {
+  const { t } = useTranslation();
+  const { default_commission, isLoading, isError, error } = useDefaultCommission();
+  if (isError) {
+    throw error;
+  }
+  const rate = default_commission;
+  return /* @__PURE__ */ jsxs(Container, { className: "divide-y p-0", "data-testid": "global-commission-section", children: [
+    /* @__PURE__ */ jsxs("div", { className: "flex items-center justify-between px-6 py-4", children: [
+      /* @__PURE__ */ jsx(Heading, { children: t("commissions.global.title", "Global Commission") }),
+      /* @__PURE__ */ jsx(
+        ActionMenu,
+        {
+          groups: [
+            {
+              actions: [
+                {
+                  label: t("actions.edit"),
+                  icon: /* @__PURE__ */ jsx(PencilSquare, {}),
+                  to: "edit-global"
+                }
+              ]
+            }
+          ]
+        }
+      )
+    ] }),
+    isLoading || !rate ? GLOBAL_COMMISSION_ROWS.map(({ key, fallback }) => /* @__PURE__ */ jsx(
+      SectionRow,
+      {
+        title: t(`commissions.global.${key}`, fallback),
+        value: /* @__PURE__ */ jsx(Skeleton, { className: "h-5 w-24" })
+      },
+      key
+    )) : /* @__PURE__ */ jsxs(Fragment, { children: [
+      /* @__PURE__ */ jsx(
+        SectionRow,
+        {
+          title: t("commissions.global.code", "Code"),
+          value: rate.code
+        }
+      ),
+      /* @__PURE__ */ jsx(
+        SectionRow,
+        {
+          title: t("commissions.global.type", "Type"),
+          value: rate.type === "percentage" ? t("commissions.fields.type.percentage", "Percentage") : t("commissions.fields.type.fixed", "Fixed")
+        }
+      ),
+      /* @__PURE__ */ jsx(
+        SectionRow,
+        {
+          title: t("commissions.global.value", "Value"),
+          value: formatCommissionValue(rate)
+        }
+      ),
+      /* @__PURE__ */ jsx(
+        SectionRow,
+        {
+          title: t("commissions.global.tax", "Tax"),
+          value: rate.include_tax ? t("commissions.global.included", "Included in commission") : t("commissions.global.notIncluded", "Not included")
+        }
+      ),
+      /* @__PURE__ */ jsx(
+        SectionRow,
+        {
+          title: t("commissions.global.shipping", "Shipping"),
+          value: rate.include_shipping ? t("commissions.global.included", "Included in commission") : t("commissions.global.notIncluded", "Not included")
+        }
+      )
+    ] })
+  ] });
+};
+
+// src/pages/commissions/commissions-list/components/commission-rules-table/commission-rules-table.tsx
+import { Container as Container2 } from "@medusajs/ui";
+
+// src/pages/commissions/commissions-list/components/commission-rules-table/commission-rules-data-table.tsx
+import { PencilSquare as PencilSquare2, Trash } from "@medusajs/icons";
+import { StatusBadge } from "@medusajs/ui";
+import { keepPreviousData } from "@tanstack/react-query";
+import { createColumnHelper } from "@tanstack/react-table";
+import { useMemo as useMemo2 } from "react";
+import { useTranslation as useTranslation3 } from "react-i18next";
+
+// src/pages/commissions/commissions-list/components/commission-rules-table/use-commission-rules-filters.tsx
+import { useMemo } from "react";
+import { useTranslation as useTranslation2 } from "react-i18next";
+var useCommissionRulesFilters = () => {
+  const { t } = useTranslation2();
+  return useMemo(
+    () => [
+      {
+        key: "type",
+        label: t("commissions.fields.type.label", "Type"),
+        type: "select",
+        multiple: true,
+        options: [
+          {
+            label: t("commissions.fields.type.percentage", "Percentage"),
+            value: "percentage"
+          },
+          {
+            label: t("commissions.fields.type.fixed", "Fixed"),
+            value: "fixed"
+          }
+        ]
+      },
+      {
+        key: "is_enabled",
+        label: t("commissions.fields.status", "Status"),
+        type: "select",
+        options: [
+          { label: t("commissions.status.enabled", "Active"), value: "true" },
+          {
+            label: t("commissions.status.disabled", "Inactive"),
+            value: "false"
+          }
+        ]
+      }
+    ],
+    [t]
+  );
+};
+
+// src/pages/commissions/commissions-list/components/commission-rules-table/use-commission-rules-query.tsx
+var useCommissionRulesQuery = ({
+  prefix,
+  pageSize = 20
+} = {}) => {
+  const queryObject = useQueryParams(
+    ["offset", "q", "order", "is_enabled", "type"],
+    prefix
+  );
+  const { offset, q, order, is_enabled, type } = queryObject;
+  const searchParams = {
+    limit: pageSize,
+    offset: offset ? Number(offset) : 0,
+    order: order || void 0,
+    q: q || void 0,
+    is_enabled: is_enabled ? is_enabled === "true" : void 0,
+    type: type ? type.split(",") : void 0
+  };
+  return { searchParams, raw: queryObject };
+};
+
+// src/pages/commissions/commissions-list/components/commission-rules-table/commission-rules-data-table.tsx
+import { jsx as jsx2 } from "react/jsx-runtime";
+var PAGE_SIZE = 20;
+var CommissionRulesDataTable = () => {
+  const { t } = useTranslation3();
+  const { searchParams, raw } = useCommissionRulesQuery({ pageSize: PAGE_SIZE });
+  const filters = useCommissionRulesFilters();
+  const {
+    commission_rates,
+    count,
+    isPending: isLoading,
+    isError,
+    error
+  } = useCommissionRules(
+    {
+      ...searchParams,
+      is_default: false,
+      fields: "id,name,code,type,value,currency_code,is_enabled,*rules,*values"
+    },
+    {
+      placeholderData: keepPreviousData
+    }
+  );
+  const data = commission_rates ?? [];
+  const allRules = useMemo2(
+    () => data.flatMap((rate) => rate.rules ?? []),
+    [data]
+  );
+  const { names } = useScopeReferenceNames(allRules);
+  const columns = useColumns(names);
+  const { table } = useDataTable({
+    data,
+    columns,
+    count: count ?? 0,
+    enablePagination: true,
+    getRowId: (row) => row.id,
+    pageSize: PAGE_SIZE
+  });
+  if (isError) {
+    throw error;
+  }
+  return /* @__PURE__ */ jsx2(
+    _DataTable,
+    {
+      table,
+      columns,
+      count: count ?? 0,
+      pageSize: PAGE_SIZE,
+      isLoading,
+      queryObject: raw,
+      filters,
+      navigateTo: (row) => `${row.original.id}`,
+      pagination: true,
+      search: true,
+      orderBy: [
+        { key: "name", label: t("commissions.rules.columns.rule", "Rule") },
+        { key: "created_at", label: t("fields.createdAt") },
+        { key: "updated_at", label: t("fields.updatedAt") }
+      ]
+    }
+  );
+};
+var CommissionRuleRowActions = ({ rule }) => {
+  const { t } = useTranslation3();
+  const handleDelete = useDeleteCommissionRuleAction(rule);
+  return /* @__PURE__ */ jsx2(
+    ActionMenu,
+    {
+      groups: [
+        {
+          actions: [
+            {
+              label: t("actions.edit"),
+              to: `/settings/commissions/${rule.id}/edit`,
+              icon: /* @__PURE__ */ jsx2(PencilSquare2, {})
+            }
+          ]
+        },
+        {
+          actions: [
+            {
+              label: t("actions.delete"),
+              onClick: handleDelete,
+              icon: /* @__PURE__ */ jsx2(Trash, {})
+            }
+          ]
+        }
+      ]
+    }
+  );
+};
+var columnHelper = createColumnHelper();
+var useColumns = (names) => {
+  const { t } = useTranslation3();
+  return useMemo2(
+    () => [
+      columnHelper.accessor("name", {
+        header: () => /* @__PURE__ */ jsx2(TextHeader, { text: t("commissions.rules.columns.rule", "Rule") }),
+        cell: ({ getValue }) => /* @__PURE__ */ jsx2(TextCell, { text: getValue() })
+      }),
+      columnHelper.display({
+        id: "type",
+        header: () => /* @__PURE__ */ jsx2(TextHeader, { text: t("commissions.rules.columns.type", "Type") }),
+        cell: ({ row }) => /* @__PURE__ */ jsx2(TextCell, { text: getScopeTypeLabel(row.original.rules, t) })
+      }),
+      columnHelper.display({
+        id: "scope",
+        header: () => /* @__PURE__ */ jsx2(TextHeader, { text: t("commissions.rules.columns.scope", "Scope") }),
+        cell: ({ row }) => /* @__PURE__ */ jsx2(TextCell, { text: getScopeSummary(row.original.rules, names) })
+      }),
+      columnHelper.display({
+        id: "value",
+        header: () => /* @__PURE__ */ jsx2(TextHeader, { text: t("commissions.rules.columns.value", "Value") }),
+        cell: ({ row }) => /* @__PURE__ */ jsx2(TextCell, { text: formatCommissionValue(row.original) })
+      }),
+      columnHelper.accessor("is_enabled", {
+        header: () => /* @__PURE__ */ jsx2(TextHeader, { text: t("commissions.rules.columns.status", "Status") }),
+        cell: ({ getValue }) => {
+          const props = getIsActiveProps(getValue(), t);
+          return /* @__PURE__ */ jsx2(StatusBadge, { color: props.color, children: props.label });
+        }
+      }),
+      columnHelper.display({
+        id: "actions",
+        cell: ({ row }) => /* @__PURE__ */ jsx2(CommissionRuleRowActions, { rule: row.original })
+      })
+    ],
+    [t, names]
+  );
+};
+
+// src/pages/commissions/commissions-list/components/commission-rules-table/commission-rules-header.tsx
+import { Button, Heading as Heading2 } from "@medusajs/ui";
+import { useTranslation as useTranslation4 } from "react-i18next";
+import { Link } from "react-router-dom";
+import { jsx as jsx3, jsxs as jsxs2 } from "react/jsx-runtime";
+var CommissionRulesHeader = () => {
+  const { t } = useTranslation4();
+  return /* @__PURE__ */ jsxs2("div", { className: "flex items-center justify-between px-6 py-4", children: [
+    /* @__PURE__ */ jsx3(Heading2, { children: t("commissions.rules.title", "Commission Rules") }),
+    /* @__PURE__ */ jsx3(Button, { size: "small", variant: "secondary", asChild: true, children: /* @__PURE__ */ jsx3(Link, { to: "create", children: t("actions.create") }) })
+  ] });
+};
+
+// src/pages/commissions/commissions-list/components/commission-rules-table/commission-rules-table.tsx
+import { jsx as jsx4, jsxs as jsxs3 } from "react/jsx-runtime";
+var CommissionRulesTable = () => {
+  return /* @__PURE__ */ jsxs3(Container2, { className: "divide-y p-0", children: [
+    /* @__PURE__ */ jsx4(CommissionRulesHeader, {}),
+    /* @__PURE__ */ jsx4(CommissionRulesDataTable, {})
+  ] });
+};
+
+// src/pages/commissions/commissions-list/commissions-page.tsx
+import { Fragment as Fragment2, jsx as jsx5, jsxs as jsxs4 } from "react/jsx-runtime";
+var Root = ({ children }) => {
+  return /* @__PURE__ */ jsx5(SingleColumnPage, { hasOutlet: true, "data-testid": "commissions-page", children: Children.count(children) > 0 ? children : /* @__PURE__ */ jsxs4(Fragment2, { children: [
+    /* @__PURE__ */ jsx5(GlobalCommissionSection, {}),
+    /* @__PURE__ */ jsx5(CommissionRulesTable, {})
+  ] }) });
+};
+var CommissionsPage = Object.assign(Root, {
+  GlobalCommission: GlobalCommissionSection,
+  RulesTable: CommissionRulesTable
+});
+
+export {
+  CommissionsPage
+};

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

@@ -27,7 +27,7 @@ import {
   useApiKeys,
   useDeleteApiKey,
   useRevokeApiKey
-} from "./chunk-FTAR3BDS.js";
+} from "./chunk-FJHAAROU.js";
 import {
   ActionMenu
 } from "./chunk-BDGZ4EQO.js";

package/dist/{chunk-K4TGNN4P.js → chunk-FCLS6CKW.js}

@@ -1,6 +1,6 @@
 import {
   useDeleteShippingOptionTypeAction
-} from "./chunk-BE6JLTMI.js";
+} from "./chunk-L5Z4JGRD.js";
 import {
   useDateTableFilters
 } from "./chunk-26OOAKQ6.js";
@@ -22,7 +22,7 @@ import {
 } from "./chunk-THHRRYRS.js";
 import {
   useShippingOptionTypes
-} from "./chunk-AXTQMIIK.js";
+} from "./chunk-PJR6W35H.js";
 import {
   ActionMenu
 } from "./chunk-BDGZ4EQO.js";

package/dist/{chunk-FTAR3BDS.js → chunk-FJHAAROU.js}

@@ -1,6 +1,6 @@
 import {
   salesChannelsQueryKeys
-} from "./chunk-S5BJ5CMF.js";
+} from "./chunk-OKWGPKVK.js";
 import {
   queryClient
 } from "./chunk-RHKRREUU.js";