@mercurjs/admin 2.2.0-canary.35 → 2.2.0-canary.36

package/dist/{add-campaign-promotions-FBS4ELIA.js → add-campaign-promotions-OTLO4M5C.js}

@@ -1,16 +1,16 @@
 import {
   usePromotionTableColumns,
   usePromotionTableQuery
-} from "./chunk-PH24SLKA.js";
+} from "./chunk-PQAQM6SB.js";
 import {
   usePromotionTableFilters
 } from "./chunk-S2WEYEQR.js";
-import "./chunk-DPFGN6S6.js";
+import "./chunk-OB5RWOGA.js";
 import "./chunk-JHIMVLB2.js";
 import "./chunk-FMFVTERD.js";
 import "./chunk-DB6ANJBO.js";
 import "./chunk-PHOCVOZ5.js";
-import "./chunk-HOUYHVRG.js";
+import "./chunk-IHERG3JP.js";
 import "./chunk-TKGWSUEI.js";
 import {
   KeyboundForm

package/dist/{campaign-detail-HMU2FMJL.js → campaign-detail-GZV2HK2G.js}

@@ -1,16 +1,16 @@
 import {
   CAMPAIGN_DETAIL_FIELDS,
   CampaignDetailPage
-} from "./chunk-23R7IMRV.js";
-import "./chunk-PH24SLKA.js";
+} from "./chunk-MTOPGOKU.js";
+import "./chunk-PQAQM6SB.js";
 import "./chunk-S2WEYEQR.js";
 import "./chunk-RK5N3XIX.js";
-import "./chunk-DPFGN6S6.js";
+import "./chunk-OB5RWOGA.js";
 import "./chunk-JHIMVLB2.js";
 import "./chunk-FMFVTERD.js";
 import "./chunk-DB6ANJBO.js";
 import "./chunk-PHOCVOZ5.js";
-import "./chunk-HOUYHVRG.js";
+import "./chunk-IHERG3JP.js";
 import "./chunk-IQPN4PZJ.js";
 import "./chunk-E74OUNA3.js";
 import "./chunk-FQERBIVS.js";

package/dist/{category-detail-PMNXMTV3.js → category-detail-AYVW7LRB.js}

@@ -1,11 +1,11 @@
 import {
   CategoryDetailPage
-} from "./chunk-NDIVJLA3.js";
+} from "./chunk-DP3OBKUP.js";
 import "./chunk-7AV5EJJ5.js";
 import "./chunk-CW3HYGS5.js";
 import "./chunk-Y456KVIN.js";
 import "./chunk-LECZPR6R.js";
-import "./chunk-SU444Q24.js";
+import "./chunk-O53E5U52.js";
 import "./chunk-WBSUHLO7.js";
 import "./chunk-P4LTLPTK.js";
 import "./chunk-FWPGOIFA.js";

package/dist/{category-products-YMPKVXV4.js → category-products-IF33PO5Y.js}

@@ -1,6 +1,6 @@
 import {
   useProductTableColumns
-} from "./chunk-SU444Q24.js";
+} from "./chunk-O53E5U52.js";
 import "./chunk-WBSUHLO7.js";
 import {
   useProductTableFilters
@@ -215,7 +215,7 @@ var EditCategoryProductsForm = ({
 var columnHelper = createColumnHelper();
 var useColumns = () => {
   const { t } = useTranslation();
-  const base = useProductTableColumns().filter((c) => c.id !== "select");
+  const base = useProductTableColumns();
   return useMemo(
     () => [
       columnHelper.display({

package/dist/{chunk-VTHMDGGJ.js → chunk-4X4MNAXL.js}

@@ -27,7 +27,7 @@ import {
 } from "./chunk-JHIMVLB2.js";
 import {
   useProductTableColumns
-} from "./chunk-SU444Q24.js";
+} from "./chunk-O53E5U52.js";
 import {
   useProductTableFilters
 } from "./chunk-P4LTLPTK.js";

package/dist/{chunk-TJ5IONZX.js → chunk-5YWQDIVG.js}

@@ -6,7 +6,7 @@ import {
 } from "./chunk-HGTPUAHD.js";
 import {
   useCustomerTableQuery
-} from "./chunk-PVZBDWLK.js";
+} from "./chunk-GRH7C3QN.js";
 import {
   _DataTable,
   useDataTable
@@ -98,6 +98,7 @@ var CustomerListDataTable = () => {
         { key: "created_at", label: t("fields.createdAt") },
         { key: "updated_at", label: t("fields.updatedAt") }
       ],
+      defaultOrder: "-created_at",
       isLoading,
       navigateTo: (row) => row.original.id,
       search: true,

package/dist/{chunk-IUOZZMSQ.js → chunk-BW5MMF6W.js}

@@ -9,7 +9,7 @@ import {
 } from "./chunk-U5MJIHLY.js";
 import {
   useProductTableColumns
-} from "./chunk-SU444Q24.js";
+} from "./chunk-O53E5U52.js";
 import {
   useProductTableFilters
 } from "./chunk-P4LTLPTK.js";

package/dist/{chunk-JHL6ZNJW.js → chunk-CA4K6JDJ.js}

@@ -3,7 +3,7 @@ import {
 } from "./chunk-RK5N3XIX.js";
 import {
   getPromotionStatus
-} from "./chunk-DPFGN6S6.js";
+} from "./chunk-OB5RWOGA.js";
 import {
   formatPercentage
 } from "./chunk-QDPLZDMX.js";

package/dist/{chunk-NDIVJLA3.js → chunk-DP3OBKUP.js}

@@ -16,7 +16,7 @@ import {
 } from "./chunk-LECZPR6R.js";
 import {
   useProductTableColumns
-} from "./chunk-SU444Q24.js";
+} from "./chunk-O53E5U52.js";
 import {
   useProductTableFilters
 } from "./chunk-P4LTLPTK.js";
@@ -381,6 +381,7 @@ var ChildrenDisplay = ({
 // src/pages/categories/category-detail/components/category-product-section/category-product-section.tsx
 import { ExclamationCircle, PlusMini } from "@medusajs/icons";
 import {
+  Checkbox,
   CommandBar,
   Container as Container5,
   Heading as Heading5,
@@ -389,7 +390,8 @@ import {
   usePrompt
 } from "@medusajs/ui";
 import { keepPreviousData } from "@tanstack/react-query";
-import { useState as useState2 } from "react";
+import { createColumnHelper } from "@tanstack/react-table";
+import { useMemo as useMemo2, useState as useState2 } from "react";
 import { useTranslation as useTranslation5 } from "react-i18next";
 import { jsx as jsx5, jsxs as jsxs5 } from "react/jsx-runtime";
 var PAGE_SIZE = 10;
@@ -409,7 +411,7 @@ var CategoryProductSection = ({
       placeholderData: keepPreviousData
     }
   );
-  const columns = useProductTableColumns();
+  const columns = useColumns();
   const filters = useProductTableFilters(["categories"]);
   const { table } = useDataTable({
     data: products || [],
@@ -520,6 +522,36 @@ var CategoryProductSection = ({
     ] }) })
   ] });
 };
+var columnHelper = createColumnHelper();
+var useColumns = () => {
+  const base = useProductTableColumns();
+  return useMemo2(
+    () => [
+      columnHelper.display({
+        id: "select",
+        header: ({ table }) => /* @__PURE__ */ jsx5(
+          Checkbox,
+          {
+            checked: table.getIsSomePageRowsSelected() ? "indeterminate" : table.getIsAllPageRowsSelected(),
+            onCheckedChange: (value) => table.toggleAllPageRowsSelected(!!value),
+            "data-testid": "products-table-header-select-checkbox"
+          }
+        ),
+        cell: ({ row }) => /* @__PURE__ */ jsx5(
+          Checkbox,
+          {
+            checked: row.getIsSelected(),
+            onCheckedChange: (value) => row.toggleSelected(!!value),
+            onClick: (e) => e.stopPropagation(),
+            "data-testid": `products-table-cell-${row.id}-select-checkbox`
+          }
+        )
+      }),
+      ...base
+    ],
+    [base]
+  );
+};
 
 // src/pages/categories/category-detail/category-detail.tsx
 import { jsx as jsx6, jsxs as jsxs6 } from "react/jsx-runtime";

package/dist/{chunk-LNOZHSZV.js → chunk-EMW5WXXR.js}

@@ -6,7 +6,7 @@ import {
 } from "./chunk-HGTPUAHD.js";
 import {
   useCustomerTableQuery
-} from "./chunk-PVZBDWLK.js";
+} from "./chunk-GRH7C3QN.js";
 import {
   _DataTable,
   useDataTable

package/dist/chunk-FU3QYH6H.js

@@ -0,0 +1,111 @@
+import {
+  useSellers
+} from "./chunk-NS3GQ2J6.js";
+import {
+  useCustomers
+} from "./chunk-RGS5ZOY7.js";
+import {
+  useSalesChannels
+} from "./chunk-MW47LDBT.js";
+
+// src/pages/orders/order-list/components/order-list-table/use-order-table-filters.tsx
+import { useMemo } from "react";
+import { useTranslation } from "react-i18next";
+var useOrderGroupTableFilters = () => {
+  const { t } = useTranslation();
+  const { customers } = useCustomers({
+    limit: 1e3,
+    fields: "id,first_name,last_name,email"
+  });
+  const { sellers } = useSellers({
+    limit: 1e3,
+    fields: "id,name"
+  });
+  const { sales_channels } = useSalesChannels({
+    limit: 1e3,
+    fields: "id,name"
+  });
+  return useMemo(() => {
+    const filters = [];
+    if (customers?.length) {
+      filters.push({
+        key: "customer_id",
+        label: t("fields.customer"),
+        type: "select",
+        multiple: true,
+        searchable: true,
+        options: customers.map((c) => ({
+          label: [c.first_name, c.last_name].filter(Boolean).join(" ") || c.email,
+          value: c.id
+        }))
+      });
+    }
+    if (sellers?.length) {
+      filters.push({
+        key: "seller_id",
+        label: "Store",
+        type: "select",
+        multiple: true,
+        searchable: true,
+        options: sellers.map((s) => ({
+          label: s.name,
+          value: s.id
+        }))
+      });
+    }
+    if (sales_channels?.length) {
+      filters.push({
+        key: "sales_channel_id",
+        label: t("fields.salesChannel"),
+        type: "select",
+        multiple: true,
+        searchable: true,
+        options: sales_channels.map((s) => ({
+          label: s.name,
+          value: s.id
+        }))
+      });
+    }
+    filters.push({
+      key: "status",
+      label: t("fields.status"),
+      type: "select",
+      multiple: true,
+      options: [
+        { label: "Pending", value: "pending" },
+        { label: "Completed", value: "completed" },
+        { label: "Canceled", value: "canceled" },
+        { label: "Requires action", value: "requires_action" }
+      ]
+    });
+    filters.push({
+      key: "request",
+      label: t("orders.filters.request.label"),
+      type: "select",
+      multiple: true,
+      options: [
+        { label: t("orders.filters.request.edit"), value: "edit" },
+        { label: t("orders.filters.request.return"), value: "return" },
+        { label: t("orders.filters.request.exchange"), value: "exchange" },
+        { label: t("orders.filters.request.claim"), value: "claim" }
+      ]
+    });
+    filters.push(
+      {
+        key: "created_at",
+        label: t("fields.createdAt"),
+        type: "date"
+      },
+      {
+        key: "updated_at",
+        label: t("fields.updatedAt"),
+        type: "date"
+      }
+    );
+    return filters;
+  }, [customers, sellers, sales_channels, t]);
+};
+
+export {
+  useOrderGroupTableFilters
+};

package/dist/{chunk-CBKKZYGU.js → chunk-GJB4UQZI.js}

@@ -1,7 +1,7 @@
 import {
   usePromotionTableColumns,
   usePromotionTableQuery
-} from "./chunk-PH24SLKA.js";
+} from "./chunk-PQAQM6SB.js";
 import {
   usePromotionTableFilters
 } from "./chunk-S2WEYEQR.js";

package/dist/{chunk-TUPWRX62.js → chunk-GML7DINQ.js}

@@ -1,6 +1,6 @@
 import {
   useProductTableColumns
-} from "./chunk-SU444Q24.js";
+} from "./chunk-O53E5U52.js";
 import {
   useProductTableFilters
 } from "./chunk-P4LTLPTK.js";

package/dist/{chunk-PVZBDWLK.js → chunk-GRH7C3QN.js}

@@ -25,7 +25,7 @@ var useCustomerTableQuery = ({
     offset: offset ? Number(offset) : 0,
     groups: groups?.split(","),
     has_account: has_account ? has_account === "true" : void 0,
-    order,
+    order: order ? order : "-created_at",
     created_at: created_at ? JSON.parse(created_at) : void 0,
     updated_at: updated_at ? JSON.parse(updated_at) : void 0,
     q

package/dist/{chunk-CASK2IOQ.js → chunk-HMKXCYCJ.js}

@@ -4,6 +4,9 @@ import {
 import {
   useCustomerGroupTableFilters
 } from "./chunk-OI4DJXUL.js";
+import {
+  useOrderGroupTableFilters
+} from "./chunk-FU3QYH6H.js";
 import {
   useOrderTableQuery
 } from "./chunk-QUHSHIAC.js";
@@ -131,8 +134,8 @@ var CustomerAddressSection = ({
           "flex h-full flex-col overflow-hidden border-t p-6": true
         }),
         icon: null,
-        title: t2("general.noRecordsTitle"),
-        message: t2("general.noRecordsMessage")
+        title: t2("customers.addresses.emptyTitle"),
+        message: t2("customers.addresses.emptyMessage")
       }
     ) }),
     addresses.map((address) => {
@@ -293,6 +296,7 @@ import { Link as Link2 } from "react-router-dom";
 import { jsx as jsx4, jsxs as jsxs4 } from "react/jsx-runtime";
 var PAGE_SIZE = 10;
 var PREFIX = "cusgr";
+var DEFAULT_ORDER = "-created_at";
 var CustomerGroupSection = ({
   customer
 }) => {
@@ -305,6 +309,7 @@ var CustomerGroupSection = ({
   const { customer_groups, count, isLoading, isError, error } = useCustomerGroups(
     {
       ...searchParams,
+      order: searchParams.order || DEFAULT_ORDER,
       fields: "+customers.id,+seller.id,+seller.name",
       customers: { id: customer.id }
     },
@@ -331,11 +336,12 @@ var CustomerGroupSection = ({
   });
   const handleRemove = async () => {
     const customerGroupIds = Object.keys(rowSelection);
+    const selectedGroups = customer_groups?.filter((g) => customerGroupIds.includes(g.id)) ?? [];
+    const names = selectedGroups.map((g) => g.name);
+    const isSingle = selectedGroups.length === 1;
     const res = await prompt({
-      title: t("general.areYouSure"),
-      description: t("customers.groups.removeMany", {
-        groups: customer_groups?.filter((g) => customerGroupIds.includes(g.id)).map((g) => g.name).join(",")
-      }),
+      title: t("customers.groups.removeTitle"),
+      description: isSingle ? t("customers.groups.remove", { name: names[0] }) : t("customers.groups.removeMany", { groups: names.join(", ") }),
       confirmText: t("actions.remove"),
       cancelText: t("actions.cancel")
     });
@@ -347,8 +353,8 @@ var CustomerGroupSection = ({
       {
         onSuccess: () => {
           toast3.success(
-            t("customers.groups.removed.success", {
-              groups: customer_groups.filter((cg) => customerGroupIds.includes(cg.id)).map((cg) => cg?.name)
+            isSingle ? t("customers.groups.removed.successOne", { groups: names[0] }) : t("customers.groups.removed.successMany", {
+              groups: names.join(", ")
             })
           );
         },
@@ -384,6 +390,7 @@ var CustomerGroupSection = ({
           { key: "created_at", label: t("fields.createdAt") },
           { key: "updated_at", label: t("fields.updatedAt") }
         ],
+        defaultOrder: DEFAULT_ORDER,
         commands: [
           {
             action: handleRemove,
@@ -393,7 +400,9 @@ var CustomerGroupSection = ({
         ],
         queryObject: raw,
         noRecords: {
-          message: t("customers.groups.list.noRecordsMessage")
+          title: t("customers.groups.list.emptyTitle"),
+          message: t("customers.groups.list.noRecordsMessage"),
+          icon: null
         }
       }
     )
@@ -408,7 +417,7 @@ var CustomerGroupRowActions = ({
   const { mutateAsync } = useRemoveCustomersFromGroup(group.id);
   const onRemove = async () => {
     const res = await prompt({
-      title: t2("general.areYouSure"),
+      title: t2("customers.groups.removeTitle"),
       description: t2("customers.groups.remove", {
         name: group.name
       }),
@@ -419,6 +428,11 @@ var CustomerGroupRowActions = ({
       return;
     }
     await mutateAsync([customerId], {
+      onSuccess: () => {
+        toast3.success(
+          t2("customers.groups.removed.successOne", { groups: group.name })
+        );
+      },
       onError: (error) => {
         toast3.error(error.message);
       }
@@ -585,6 +599,9 @@ var CustomerOrderSection = ({
     () => transformOrderGroups(order_groups ?? [], t2),
     [order_groups, t2]
   );
+  const filters = useOrderGroupTableFilters().filter(
+    (f) => f.key !== "customer_id"
+  );
   const columns = useColumns2();
   const { table } = useDataTable({
     data: rows,
@@ -612,11 +629,13 @@ var CustomerOrderSection = ({
         count,
         isLoading,
         pageSize: PAGE_SIZE2,
+        filters,
         orderBy: [
           { key: "display_id", label: t2("orders.fields.displayId") },
           { key: "created_at", label: t2("fields.createdAt") },
           { key: "updated_at", label: t2("fields.updatedAt") }
         ],
+        defaultOrder: "-display_id",
         search: true,
         queryObject: raw,
         prefix: PREFIX2

package/dist/{chunk-HOUYHVRG.js → chunk-IHERG3JP.js}

@@ -9973,20 +9973,24 @@ var en_default = {
     },
     groups: {
       label: "Customer groups",
-      remove: 'Are you sure you want to remove the customer from "{{name}}" customer group?',
-      removeMany: "Are you sure you want to remove customer from following customer groups: {{groups}}?",
+      removeTitle: "Remove customer",
+      remove: "You are about to remove customer from {{name}} group. This action cannot be undone.",
+      removeMany: "You are about to remove customer from {{groups}} groups. This action cannot be undone.",
       alreadyAddedTooltip: "The customer is already in this customer group.",
       list: {
+        emptyTitle: "No customer groups yet",
         noRecordsMessage: "This customer doesn't belong to any group."
       },
       add: {
-        success: "Customer added to: {{groups}}.",
+        successOne: "Customer was successfully added to {{groups}} group.",
+        successMany: "Customer was successfully added to {{groups}} groups.",
         list: {
           noRecordsMessage: "Please create a customer group first."
         }
       },
       removed: {
-        success: "Customer removed from: {{groups}}.",
+        successOne: "Customer was successfully removed from {{groups}} group.",
+        successMany: "Customer was successfully removed from {{groups}} groups.",
         list: {
           noRecordsMessage: "Please create a customer group first."
         }
@@ -10012,6 +10016,8 @@ var en_default = {
     hasAccount: "Has account",
     addresses: {
       title: "Addresses",
+      emptyTitle: "No addresses yet",
+      emptyMessage: "This customer doesn't have any addresses",
       fields: {
         addressName: "Address name",
         address1: "Address 1",

package/dist/{chunk-ISSZIRBL.js → chunk-LRKN7IQH.js}

@@ -3,7 +3,7 @@ import {
 } from "./chunk-QE4R2KT3.js";
 import {
   useProductTableColumns
-} from "./chunk-SU444Q24.js";
+} from "./chunk-O53E5U52.js";
 import {
   useProductTableFilters
 } from "./chunk-P4LTLPTK.js";

package/dist/{chunk-RHFFLVYG.js → chunk-MHCIHDGF.js}

@@ -3,7 +3,7 @@ import {
 } from "./chunk-K6RZE3F7.js";
 import {
   useProductTableColumns
-} from "./chunk-SU444Q24.js";
+} from "./chunk-O53E5U52.js";
 import {
   useProductTableFilters
 } from "./chunk-P4LTLPTK.js";

package/dist/{chunk-23R7IMRV.js → chunk-MTOPGOKU.js}

@@ -1,7 +1,7 @@
 import {
   usePromotionTableColumns,
   usePromotionTableQuery
-} from "./chunk-PH24SLKA.js";
+} from "./chunk-PQAQM6SB.js";
 import {
   usePromotionTableFilters
 } from "./chunk-S2WEYEQR.js";

package/dist/{chunk-SU444Q24.js → chunk-O53E5U52.js}

@@ -13,7 +13,6 @@ import {
 } from "./chunk-PHOCVOZ5.js";
 
 // src/hooks/table/columns/use-product-table-columns.tsx
-import { Checkbox } from "@medusajs/ui";
 import { createColumnHelper } from "@tanstack/react-table";
 import { useMemo } from "react";
 
@@ -52,26 +51,6 @@ var columnHelper = createColumnHelper();
 var useProductTableColumns = () => {
   return useMemo(
     () => [
-      columnHelper.display({
-        id: "select",
-        header: ({ table }) => /* @__PURE__ */ jsx3(
-          Checkbox,
-          {
-            checked: table.getIsSomePageRowsSelected() ? "indeterminate" : table.getIsAllPageRowsSelected(),
-            onCheckedChange: (value) => table.toggleAllPageRowsSelected(!!value),
-            "data-testid": "products-table-header-select-checkbox"
-          }
-        ),
-        cell: ({ row }) => /* @__PURE__ */ jsx3(
-          Checkbox,
-          {
-            checked: row.getIsSelected(),
-            onCheckedChange: (value) => row.toggleSelected(!!value),
-            onClick: (e) => e.stopPropagation(),
-            "data-testid": `products-table-cell-${row.id}-select-checkbox`
-          }
-        )
-      }),
       columnHelper.display({
         id: "product",
         header: () => /* @__PURE__ */ jsx3(ProductHeader, {}),

package/dist/{chunk-DPFGN6S6.js → chunk-OB5RWOGA.js}

@@ -1,6 +1,6 @@
 import {
   i18n
-} from "./chunk-HOUYHVRG.js";
+} from "./chunk-IHERG3JP.js";
 
 // src/lib/promotions.ts
 var getPromotionStatusMap = () => ({

package/dist/{chunk-4ZXFOBOB.js → chunk-OLAOEVZE.js}

@@ -13,7 +13,7 @@ import {
 } from "./chunk-U5MJIHLY.js";
 import {
   useProductTableColumns
-} from "./chunk-SU444Q24.js";
+} from "./chunk-O53E5U52.js";
 import {
   useProductTableFilters
 } from "./chunk-P4LTLPTK.js";