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

package/dist/{chunk-3O6YY3R5.js → chunk-GX7OEF7F.js}

@@ -1,13 +1,12 @@
+import {
+  ProductMediaSection
+} from "./chunk-27PAP64U.js";
 import {
   SectionRow
 } from "./chunk-3XPXUIK3.js";
-import {
-  useDataTableDateColumns,
-  useDataTableDateFilters
-} from "./chunk-54RTJBYO.js";
 import {
   PRODUCT_DETAIL_QUERY
-} from "./chunk-RQ4NMLSS.js";
+} from "./chunk-46MOMKPW.js";
 import {
   TwoColumnPage
 } from "./chunk-E74OUNA3.js";
@@ -15,35 +14,21 @@ import {
   Thumbnail
 } from "./chunk-WIYFXWRI.js";
 import {
-  DataTable
-} from "./chunk-LYZT5REU.js";
-import {
-  require_dist
-} from "./chunk-FMRP2CNF.js";
+  _DataTable,
+  useDataTable
+} from "./chunk-JGCGVEFZ.js";
 import {
   useQueryParams
 } from "./chunk-THHRRYRS.js";
 import {
-  useProductTag
-} from "./chunk-AXTQMIIK.js";
-import {
-  useProductType
-} from "./chunk-46M463BR.js";
-import {
-  useCollection
-} from "./chunk-XZZTC7E5.js";
+  require_dist
+} from "./chunk-YZBEJ3CY.js";
 import {
   useSeller
 } from "./chunk-LEG67A2R.js";
 import {
   ActionMenu
 } from "./chunk-BDGZ4EQO.js";
-import {
-  useProductCategory
-} from "./chunk-H5PYBIOZ.js";
-import {
-  PRODUCT_VARIANT_IDS_KEY
-} from "./chunk-YGAX72XV.js";
 import {
   TwoColumnPageSkeleton
 } from "./chunk-INNFZYX2.js";
@@ -58,9 +43,8 @@ import {
   useProductVariants,
   useRejectProduct,
   useRemoveAttributeFromProduct,
-  useRequestProductChanges,
-  useUpdateProduct
-} from "./chunk-2YYXP6XI.js";
+  useRequestProductChanges
+} from "./chunk-AM5XDEIN.js";
 import {
   sdk
 } from "./chunk-ZBWL72TB.js";
@@ -74,19 +58,11 @@ import { useLoaderData, useParams } from "react-router-dom";
 
 // src/pages/products/product-detail/components/product-active-edit-section/product-active-edit-section.tsx
 var import_types = __toESM(require_dist(), 1);
-import { Fragment, useMemo, useState as useState2 } from "react";
-import { ExclamationCircleSolid } from "@medusajs/icons";
-import { Button, Container, Heading, Text, toast } from "@medusajs/ui";
+import { useState as useState2 } from "react";
+import { Button, Text, toast } from "@medusajs/ui";
 import {
-  describeProductChangeAction,
-  extractReferenceIds,
-  formatFieldValue,
-  humanizeFieldName,
-  isImageList,
-  isReferenceField,
-  partitionProductChangeActions
+  ProductChangePanel
 } from "@mercurjs/dashboard-shared";
-import { useQuery } from "@tanstack/react-query";
 import { useTranslation as useTranslation2 } from "react-i18next";
 
 // src/components/common/confirm-prompt/confirm-prompt.tsx
@@ -169,157 +145,49 @@ var ConfirmPrompt = ({
 };
 
 // src/pages/products/product-detail/components/product-active-edit-section/product-active-edit-section.tsx
-import { Fragment as Fragment2, jsx as jsx2, jsxs as jsxs2 } from "react/jsx-runtime";
-var ImageStrip = ({
-  images,
-  faded
-}) => /* @__PURE__ */ jsx2(
-  "div",
-  {
-    className: faded ? "flex items-center gap-1.5 opacity-50" : "flex items-center gap-1.5",
-    children: images.map((image, idx) => /* @__PURE__ */ jsx2(Thumbnail, { src: image.url, size: "base" }, `${image.url}-${idx}`))
-  }
-);
-var BrandName = ({ id }) => {
-  const { data } = useQuery({
-    queryKey: ["product_brand", id],
-    queryFn: () => sdk.admin.productBrands.$id.query({ $id: id }),
-    enabled: !!id
-  });
-  return /* @__PURE__ */ jsx2(Fragment2, { children: data?.product_brand?.name ?? id });
-};
-var TypeName = ({ id }) => {
-  const { product_type } = useProductType(id);
-  return /* @__PURE__ */ jsx2(Fragment2, { children: product_type?.value ?? id });
-};
-var CollectionName = ({ id }) => {
-  const { collection } = useCollection(id);
-  return /* @__PURE__ */ jsx2(Fragment2, { children: collection?.title ?? id });
-};
-var CategoryName = ({ id }) => {
-  const { product_category } = useProductCategory(id);
-  return /* @__PURE__ */ jsx2(Fragment2, { children: product_category?.name ?? id });
-};
-var TagName = ({ id }) => {
-  const { product_tag } = useProductTag(id);
-  return /* @__PURE__ */ jsx2(Fragment2, { children: product_tag?.value ?? id });
-};
-var ReferenceName = ({
-  field,
-  id
-}) => {
-  switch (field) {
-    case "brand_id":
-      return /* @__PURE__ */ jsx2(BrandName, { id });
-    case "type_id":
-      return /* @__PURE__ */ jsx2(TypeName, { id });
-    case "collection_id":
-      return /* @__PURE__ */ jsx2(CollectionName, { id });
-    case "categories":
-      return /* @__PURE__ */ jsx2(CategoryName, { id });
-    case "tags":
-      return /* @__PURE__ */ jsx2(TagName, { id });
+import { Fragment, jsx as jsx2, jsxs as jsxs2 } from "react/jsx-runtime";
+var VARIANT_LOOKUP_FIELDS = "id,title,sku,*images";
+var resolversFor = (productId) => ({
+  getType: async (id) => {
+    const { product_type } = await sdk.admin.productTypes.$id.query({ $id: id });
+    return product_type?.value ?? null;
+  },
+  getCollection: async (id) => {
+    const { collection } = await sdk.admin.collections.$id.query({ $id: id });
+    return collection?.title ?? null;
+  },
+  getCategory: async (id) => {
+    const { product_category } = await sdk.admin.productCategories.$id.query({
+      $id: id
+    });
+    return product_category?.name ?? null;
+  },
+  getTag: async (id) => {
+    const { product_tag } = await sdk.admin.productTags.$id.query({ $id: id });
+    return product_tag?.value ?? null;
+  },
+  getAttribute: async (id) => {
+    const { product_attribute } = await sdk.admin.productAttributes.$id.query({
+      $id: id
+    });
+    if (!product_attribute) return null;
+    return {
+      name: product_attribute.name ?? id,
+      values: (product_attribute.values ?? []).map((v) => ({
+        id: v.id,
+        name: v.name ?? v.id
+      }))
+    };
+  },
+  getVariant: async (variantId) => {
+    const { variant } = await sdk.admin.products.$id.variants.$variantId.query({
+      $id: productId,
+      $variantId: variantId,
+      fields: VARIANT_LOOKUP_FIELDS
+    });
+    return variant ?? null;
   }
-};
-var ReferenceList = ({
-  field,
-  ids
-}) => {
-  if (!ids.length) return /* @__PURE__ */ jsx2(Fragment2, { children: "-" });
-  return /* @__PURE__ */ jsx2(Fragment2, { children: ids.map((id, idx) => /* @__PURE__ */ jsxs2(Fragment, { children: [
-    idx > 0 && ", ",
-    /* @__PURE__ */ jsx2(ReferenceName, { field, id })
-  ] }, `${field}-${id}`)) });
-};
-var FieldRow = ({ diff }) => {
-  const { t } = useTranslation2();
-  const hasPrevious = diff.previous !== void 0 && diff.previous !== null && diff.previous !== "" && !(Array.isArray(diff.previous) && diff.previous.length === 0);
-  const nextIsImages = isImageList(diff.next);
-  const previousIsImages = isImageList(diff.previous);
-  const renderAsImages = nextIsImages || previousIsImages;
-  const renderAsReference = isReferenceField(diff.field);
-  return /* @__PURE__ */ jsxs2("div", { className: "flex items-start gap-4", children: [
-    /* @__PURE__ */ jsx2(
-      Text,
-      {
-        size: "small",
-        weight: "plus",
-        leading: "compact",
-        className: "text-ui-fg-subtle w-[160px] shrink-0",
-        children: t(`fields.${diff.field}`, {
-          defaultValue: humanizeFieldName(diff.field)
-        })
-      }
-    ),
-    renderAsImages ? /* @__PURE__ */ jsxs2("div", { className: "flex flex-1 flex-wrap items-center gap-2", children: [
-      hasPrevious && previousIsImages && /* @__PURE__ */ jsx2(ImageStrip, { images: diff.previous, faded: true }),
-      hasPrevious && /* @__PURE__ */ jsx2(
-        Text,
-        {
-          size: "small",
-          leading: "compact",
-          className: "text-ui-fg-subtle",
-          children: "\u2192"
-        }
-      ),
-      nextIsImages ? /* @__PURE__ */ jsx2(ImageStrip, { images: diff.next }) : /* @__PURE__ */ jsx2(
-        Text,
-        {
-          size: "small",
-          leading: "compact",
-          className: "text-ui-fg-subtle",
-          children: formatFieldValue(diff.next, diff.field)
-        }
-      )
-    ] }) : renderAsReference ? /* @__PURE__ */ jsxs2(
-      Text,
-      {
-        size: "small",
-        leading: "compact",
-        className: "text-ui-fg-subtle flex-1 whitespace-pre-line text-pretty",
-        children: [
-          hasPrevious && /* @__PURE__ */ jsx2("span", { className: "line-through", children: /* @__PURE__ */ jsx2(
-            ReferenceList,
-            {
-              field: diff.field,
-              ids: extractReferenceIds(
-                diff.field,
-                diff.previous
-              )
-            }
-          ) }),
-          hasPrevious && " \u2192 ",
-          /* @__PURE__ */ jsx2(
-            ReferenceList,
-            {
-              field: diff.field,
-              ids: extractReferenceIds(diff.field, diff.next)
-            }
-          )
-        ]
-      }
-    ) : /* @__PURE__ */ jsxs2(
-      Text,
-      {
-        size: "small",
-        leading: "compact",
-        className: "text-ui-fg-subtle flex-1 whitespace-pre-line text-pretty",
-        children: [
-          hasPrevious && /* @__PURE__ */ jsx2("span", { className: "line-through", children: formatFieldValue(diff.previous, diff.field) }),
-          hasPrevious && " \u2192 ",
-          formatFieldValue(diff.next, diff.field)
-        ]
-      }
-    )
-  ] });
-};
-var ActionLine = ({ action }) => {
-  const { t } = useTranslation2();
-  const label = describeProductChangeAction(action, {
-    variant: t("fields.variant", { defaultValue: "Variant" })
-  });
-  return /* @__PURE__ */ jsx2(Text, { size: "small", leading: "compact", className: "text-ui-fg-subtle", children: label });
-};
+});
 var ProductActiveEditSection = ({
   product
 }) => {
@@ -335,17 +203,12 @@ var ProductActiveEditSection = ({
   });
   const { mutateAsync: confirmChange, isPending: isConfirming } = useConfirmProductChange(product_change?.id ?? "", product.id);
   const { mutateAsync: cancelChange, isPending: isRejecting } = useCancelProductChange(product_change?.id ?? "", product.id);
-  const { updated, added, removed, deleteRequested } = useMemo(
-    () => partitionProductChangeActions(product_change?.actions ?? []),
-    [product_change]
-  );
   if (isError || !product_change) {
     return null;
   }
   if (product_change.status !== import_types.ProductChangeStatus.PENDING) {
     return null;
   }
-  const hasContent = updated.length > 0 || added.length > 0 || removed.length > 0 || deleteRequested;
   const handleConfirm = async (note) => {
     try {
       await confirmChange({ internal_note: note });
@@ -364,149 +227,84 @@ var ProductActiveEditSection = ({
       toast.error(e.message);
     }
   };
-  return /* @__PURE__ */ jsxs2(
-    Container,
-    {
-      className: "divide-y p-0",
-      "data-testid": "product-active-edit-section",
-      children: [
-        /* @__PURE__ */ jsxs2("div", { className: "flex items-center gap-2 px-6 py-4", children: [
-          /* @__PURE__ */ jsx2(ExclamationCircleSolid, { className: "text-ui-fg-interactive" }),
-          /* @__PURE__ */ jsx2(Heading, { level: "h2", "data-testid": "product-active-edit-heading", children: t("products.edits.panel.title") })
-        ] }),
-        /* @__PURE__ */ jsx2("div", { className: "px-6 py-4", children: /* @__PURE__ */ jsx2(Text, { size: "small", leading: "compact", className: "text-ui-fg-subtle", children: t("products.edits.panel.description", {
+  const panelProduct = {
+    id: product.id,
+    title: product.title,
+    thumbnail: product.thumbnail,
+    variants: product.variants,
+    attributes: product.attributes
+  };
+  return /* @__PURE__ */ jsxs2(Fragment, { children: [
+    /* @__PURE__ */ jsx2(
+      ProductChangePanel,
+      {
+        product: panelProduct,
+        actions: product_change.actions ?? [],
+        resolvers: resolversFor(product.id),
+        headerDescription: /* @__PURE__ */ jsx2(Text, { size: "small", leading: "compact", className: "text-ui-fg-subtle", children: t("products.edits.panel.description", {
           store: requesterSeller?.name ?? t("products.request.fallbackStore")
-        }) }) }),
-        hasContent && /* @__PURE__ */ jsxs2(Fragment2, { children: [
-          updated.length > 0 && /* @__PURE__ */ jsxs2("div", { className: "flex items-start gap-4 px-6 py-4", children: [
-            /* @__PURE__ */ jsx2(
-              Text,
-              {
-                size: "small",
-                weight: "plus",
-                leading: "compact",
-                className: "text-ui-fg-subtle w-[160px] shrink-0",
-                children: t("labels.updated")
-              }
-            ),
-            /* @__PURE__ */ jsx2("div", { className: "flex flex-1 flex-col gap-y-4", children: updated.map((diff, idx) => /* @__PURE__ */ jsx2(FieldRow, { diff }, `${diff.field}-${idx}`)) })
-          ] }),
-          added.length > 0 && /* @__PURE__ */ jsxs2("div", { className: "flex items-start gap-4 px-6 py-4", children: [
-            /* @__PURE__ */ jsx2(
-              Text,
-              {
-                size: "small",
-                weight: "plus",
-                leading: "compact",
-                className: "text-ui-fg-subtle w-[160px] shrink-0",
-                children: t("labels.added")
-              }
-            ),
-            /* @__PURE__ */ jsx2("div", { className: "flex flex-1 flex-col gap-y-2", children: added.map((action) => /* @__PURE__ */ jsx2(ActionLine, { action }, action.id)) })
-          ] }),
-          removed.length > 0 && /* @__PURE__ */ jsxs2("div", { className: "flex items-start gap-4 px-6 py-4", children: [
-            /* @__PURE__ */ jsx2(
-              Text,
-              {
-                size: "small",
-                weight: "plus",
-                leading: "compact",
-                className: "text-ui-fg-subtle w-[160px] shrink-0",
-                children: t("labels.removed")
-              }
-            ),
-            /* @__PURE__ */ jsx2("div", { className: "flex flex-1 flex-col gap-y-2", children: removed.map((action) => /* @__PURE__ */ jsx2(ActionLine, { action }, action.id)) })
-          ] }),
-          deleteRequested && /* @__PURE__ */ jsxs2("div", { className: "flex items-start gap-4 px-6 py-4", children: [
-            /* @__PURE__ */ jsx2(
-              Text,
-              {
-                size: "small",
-                weight: "plus",
-                leading: "compact",
-                className: "text-ui-fg-subtle w-[160px] shrink-0",
-                children: t("labels.removed")
-              }
-            ),
-            /* @__PURE__ */ jsx2(
-              Text,
-              {
-                size: "small",
-                leading: "compact",
-                className: "text-ui-fg-subtle flex-1",
-                children: t("products.edits.panel.deleteRequested")
-              }
-            )
-          ] })
-        ] }),
-        /* @__PURE__ */ jsxs2(
-          "div",
-          {
-            className: "bg-ui-bg-subtle flex items-center justify-end gap-x-2 rounded-b-xl px-6 py-4",
-            "data-testid": "product-active-edit-actions",
-            children: [
-              /* @__PURE__ */ jsx2(
-                Button,
-                {
-                  size: "small",
-                  variant: "secondary",
-                  onClick: () => setConfirmOpen(true),
-                  "data-testid": "product-active-edit-confirm-button",
-                  children: t("actions.confirm")
-                }
-              ),
-              /* @__PURE__ */ jsx2(
-                Button,
-                {
-                  size: "small",
-                  variant: "secondary",
-                  onClick: () => setRejectOpen(true),
-                  "data-testid": "product-active-edit-reject-button",
-                  children: t("products.edits.actions.reject")
-                }
-              )
-            ]
-          }
-        ),
-        /* @__PURE__ */ jsx2(
-          ConfirmPrompt,
-          {
-            open: confirmOpen,
-            onOpenChange: setConfirmOpen,
-            title: t("products.edits.confirmPrompt.title"),
-            description: t("products.edits.confirmPrompt.description"),
-            noteLabel: t("products.edits.confirmPrompt.noteLabel"),
-            noteOptional: true,
-            notePlaceholder: t("products.edits.confirmPrompt.notePlaceholder"),
-            isLoading: isConfirming,
-            onConfirm: handleConfirm
-          }
-        ),
-        /* @__PURE__ */ jsx2(
-          ConfirmPrompt,
-          {
-            open: rejectOpen,
-            onOpenChange: setRejectOpen,
-            title: t("products.edits.rejectPrompt.title"),
-            description: t("products.edits.rejectPrompt.description"),
-            noteLabel: t("products.edits.rejectPrompt.noteLabel"),
-            noteOptional: true,
-            notePlaceholder: t("products.edits.rejectPrompt.notePlaceholder"),
-            confirmLabel: t("products.edits.rejectPrompt.confirm"),
-            isLoading: isRejecting,
-            onConfirm: handleReject
-          }
-        )
-      ]
-    }
-  );
+        }) }),
+        footer: /* @__PURE__ */ jsxs2(Fragment, { children: [
+          /* @__PURE__ */ jsx2(
+            Button,
+            {
+              size: "small",
+              variant: "secondary",
+              onClick: () => setConfirmOpen(true),
+              "data-testid": "product-active-edit-confirm-button",
+              children: t("actions.confirm")
+            }
+          ),
+          /* @__PURE__ */ jsx2(
+            Button,
+            {
+              size: "small",
+              variant: "secondary",
+              onClick: () => setRejectOpen(true),
+              "data-testid": "product-active-edit-reject-button",
+              children: t("products.edits.actions.reject")
+            }
+          )
+        ] })
+      }
+    ),
+    /* @__PURE__ */ jsx2(
+      ConfirmPrompt,
+      {
+        open: confirmOpen,
+        onOpenChange: setConfirmOpen,
+        title: t("products.edits.confirmPrompt.title"),
+        description: t("products.edits.confirmPrompt.description"),
+        noteLabel: t("products.edits.confirmPrompt.noteLabel"),
+        noteOptional: true,
+        notePlaceholder: t("products.edits.confirmPrompt.notePlaceholder"),
+        isLoading: isConfirming,
+        onConfirm: handleConfirm
+      }
+    ),
+    /* @__PURE__ */ jsx2(
+      ConfirmPrompt,
+      {
+        open: rejectOpen,
+        onOpenChange: setRejectOpen,
+        title: t("products.edits.rejectPrompt.title"),
+        description: t("products.edits.rejectPrompt.description"),
+        noteLabel: t("products.edits.rejectPrompt.noteLabel"),
+        noteOptional: true,
+        notePlaceholder: t("products.edits.rejectPrompt.notePlaceholder"),
+        confirmLabel: t("products.edits.rejectPrompt.confirm"),
+        isLoading: isRejecting,
+        onConfirm: handleReject
+      }
+    )
+  ] });
 };
 
 // src/pages/products/product-detail/components/product-active-request-section/product-active-request-section.tsx
 var import_types2 = __toESM(require_dist(), 1);
 import { useState as useState3 } from "react";
-import { Button as Button2, Container as Container2, Heading as Heading2, Text as Text2, toast as toast2 } from "@medusajs/ui";
-import { ExclamationCircleSolid as ExclamationCircleSolid2 } from "@medusajs/icons";
+import { Button as Button2, Container, Heading, Text as Text2, toast as toast2 } from "@medusajs/ui";
+import { ExclamationCircleSolid } from "@medusajs/icons";
 import { useTranslation as useTranslation3 } from "react-i18next";
 import { jsx as jsx3, jsxs as jsxs3 } from "react/jsx-runtime";
 var ProductActiveRequestSection = ({
@@ -550,7 +348,7 @@ var ProductActiveRequestSection = ({
     }
   };
   return /* @__PURE__ */ jsxs3(
-    Container2,
+    Container,
     {
       className: "divide-y p-0",
       "data-testid": "product-active-request-section",
@@ -561,8 +359,8 @@ var ProductActiveRequestSection = ({
             className: "flex items-center gap-2 px-6 py-4",
             "data-testid": "product-active-request-header",
             children: [
-              /* @__PURE__ */ jsx3(ExclamationCircleSolid2, { className: "text-ui-fg-interactive" }),
-              /* @__PURE__ */ jsx3(Heading2, { level: "h2", "data-testid": "product-active-request-heading", children: t("products.request.panel.title") })
+              /* @__PURE__ */ jsx3(ExclamationCircleSolid, { className: "text-ui-fg-interactive" }),
+              /* @__PURE__ */ jsx3(Heading, { level: "h2", "data-testid": "product-active-request-heading", children: t("products.request.panel.title") })
             ]
           }
         ),
@@ -666,12 +464,13 @@ import {
   Trash,
   Swatch,
   DropCap,
-  InformationCircleSolid
+  InformationCircleSolid,
+  PencilSquare
 } from "@medusajs/icons";
 import {
   Badge,
-  Container as Container3,
-  Heading as Heading3,
+  Container as Container2,
+  Heading as Heading2,
   Text as Text3,
   toast as toast3,
   Tooltip,
@@ -711,12 +510,23 @@ var AttributeActions = ({
         {
           actions: [
             {
-              label: t("actions.delete"),
-              onClick: handleDelete,
-              icon: /* @__PURE__ */ jsx4(Trash, {})
+              label: t("actions.edit"),
+              to: `attributes/${attribute.id}/edit`,
+              icon: /* @__PURE__ */ jsx4(PencilSquare, {})
             }
           ]
-        }
+        },
+        ...attribute.is_required ? [] : [
+          {
+            actions: [
+              {
+                label: t("actions.delete"),
+                onClick: handleDelete,
+                icon: /* @__PURE__ */ jsx4(Trash, {})
+              }
+            ]
+          }
+        ]
       ]
     }
   );
@@ -766,7 +576,9 @@ var AttributeGroup = ({
                 size: "small",
                 leading: "compact",
                 className: "text-ui-fg-subtle",
-                children: values.join(", ") || "-"
+                children: attr.type === "toggle" ? values.map(
+                  (val) => val === "true" ? t("general.yes") : t("general.no")
+                ).join(", ") || "-" : values.join(", ") || "-"
               }
             ) }),
             /* @__PURE__ */ jsx4(AttributeActions, { productId, attribute: attr })
@@ -785,13 +597,13 @@ var ProductAttributeSection = ({
   const variantAttributes = allAttributes.filter((a) => a.is_variant_axis);
   const infoAttributes = allAttributes.filter((a) => !a.is_variant_axis);
   const isEmpty = !variantAttributes.length && !infoAttributes.length;
-  return /* @__PURE__ */ jsxs4(Container3, { className: "p-0", children: [
+  return /* @__PURE__ */ jsxs4(Container2, { className: "p-0", children: [
     /* @__PURE__ */ jsxs4(
       "div",
       {
         className: `flex items-center justify-between px-6 py-4${isEmpty ? "" : " border-b border-ui-border-base"}`,
         children: [
-          /* @__PURE__ */ jsx4(Heading3, { level: "h2", children: t("products.attributes") }),
+          /* @__PURE__ */ jsx4(Heading2, { level: "h2", children: t("products.attributes") }),
           /* @__PURE__ */ jsx4(
             ActionMenu,
             {
@@ -841,8 +653,8 @@ var ProductAttributeSection = ({
 };
 
 // src/pages/products/product-detail/components/product-general-section/product-general-section.tsx
-import { PencilSquare, Trash as Trash2 } from "@medusajs/icons";
-import { Container as Container4, Heading as Heading4, StatusBadge, usePrompt as usePrompt2 } from "@medusajs/ui";
+import { PencilSquare as PencilSquare2, Trash as Trash2 } from "@medusajs/icons";
+import { Container as Container3, Heading as Heading3, StatusBadge, usePrompt as usePrompt2 } from "@medusajs/ui";
 import { useTranslation as useTranslation5 } from "react-i18next";
 import { useNavigate } from "react-router-dom";
 import { jsx as jsx5, jsxs as jsxs5 } from "react/jsx-runtime";
@@ -854,8 +666,6 @@ var productStatusColor = (status) => {
       return "orange";
     case "published":
       return "green";
-    case "requires_action":
-      return "blue";
     case "rejected":
       return "red";
     default:
@@ -887,14 +697,14 @@ var ProductGeneralSection = ({
       }
     });
   };
-  return /* @__PURE__ */ jsxs5(Container4, { className: "divide-y p-0", "data-testid": "product-general-section", children: [
+  return /* @__PURE__ */ jsxs5(Container3, { className: "divide-y p-0", "data-testid": "product-general-section", children: [
     /* @__PURE__ */ jsxs5(
       "div",
       {
         className: "flex items-center justify-between px-6 py-4",
         "data-testid": "product-general-header",
         children: [
-          /* @__PURE__ */ jsx5(Heading4, { "data-testid": "product-general-title", children: product.title }),
+          /* @__PURE__ */ jsx5(Heading3, { "data-testid": "product-general-title", children: product.title }),
           /* @__PURE__ */ jsxs5(
             "div",
             {
@@ -918,7 +728,7 @@ var ProductGeneralSection = ({
                           {
                             label: t("actions.edit"),
                             to: "edit",
-                            icon: /* @__PURE__ */ jsx5(PencilSquare, {})
+                            icon: /* @__PURE__ */ jsx5(PencilSquare2, {})
                           }
                         ]
                       },
@@ -976,210 +786,30 @@ var ProductGeneralSection = ({
   ] });
 };
 
-// src/pages/products/product-detail/components/product-media-section/product-media-section.tsx
-import { PencilSquare as PencilSquare2, ThumbnailBadge } from "@medusajs/icons";
-import {
-  Button as Button3,
-  Checkbox,
-  CommandBar,
-  Container as Container5,
-  Heading as Heading5,
-  Text as Text4,
-  Tooltip as Tooltip2,
-  clx,
-  usePrompt as usePrompt3
-} from "@medusajs/ui";
-import { useState as useState4 } from "react";
+// src/pages/products/product-detail/components/product-organization-section/product-organization-section.tsx
+import { PencilSquare as PencilSquare3 } from "@medusajs/icons";
+import { Badge as Badge2, Container as Container4, Heading as Heading4, Tooltip as Tooltip2 } from "@medusajs/ui";
 import { useTranslation as useTranslation6 } from "react-i18next";
 import { Link } from "react-router-dom";
 import { jsx as jsx6, jsxs as jsxs6 } from "react/jsx-runtime";
-var ProductMediaSection = ({
-  product
-}) => {
-  const { t } = useTranslation6();
-  const prompt = usePrompt3();
-  const [selection, setSelection] = useState4({});
-  const media = getMedia(product);
-  const handleCheckedChange = (id) => {
-    setSelection((prev) => {
-      if (prev[id]) {
-        const { [id]: _, ...rest } = prev;
-        return rest;
-      } else {
-        return { ...prev, [id]: true };
-      }
-    });
-  };
-  const { mutateAsync } = useUpdateProduct(product.id);
-  const handleDelete = async () => {
-    const ids = Object.keys(selection);
-    const includingThumbnail = ids.some(
-      (id) => media.find((m) => m.id === id)?.isThumbnail
-    );
-    const res = await prompt({
-      title: t("general.areYouSure"),
-      description: includingThumbnail ? t("products.media.deleteWarningWithThumbnail", {
-        count: ids.length
-      }) : t("products.media.deleteWarning", {
-        count: ids.length
-      }),
-      confirmText: t("actions.delete"),
-      cancelText: t("actions.cancel")
-    });
-    if (!res) {
-      return;
-    }
-    const mediaToKeep = product.images?.filter((i) => !ids.includes(i.id)).map((i) => ({ url: i.url }));
-    await mutateAsync(
-      {
-        images: mediaToKeep,
-        thumbnail: includingThumbnail ? "" : void 0
-      },
-      {
-        onSuccess: () => {
-          setSelection({});
-        }
-      }
-    );
-  };
-  return /* @__PURE__ */ jsxs6(Container5, { className: "divide-y p-0", "data-testid": "product-media-section", children: [
-    /* @__PURE__ */ jsxs6("div", { className: "flex items-center justify-between px-6 py-4", "data-testid": "product-media-header", children: [
-      /* @__PURE__ */ jsx6(Heading5, { level: "h2", "data-testid": "product-media-title", children: t("products.media.label") }),
-      /* @__PURE__ */ jsx6(
-        ActionMenu,
-        {
-          groups: [
-            {
-              actions: [
-                {
-                  label: t("actions.edit"),
-                  to: "media?view=edit",
-                  icon: /* @__PURE__ */ jsx6(PencilSquare2, {})
-                }
-              ]
-            }
-          ],
-          "data-testid": "product-media-action-menu"
-        }
-      )
-    ] }),
-    media.length > 0 ? /* @__PURE__ */ jsx6("div", { className: "grid grid-cols-[repeat(auto-fill,minmax(96px,1fr))] gap-4 px-6 py-4", "data-testid": "product-media-grid", children: media.map((i, index) => {
-      const isSelected = selection[i.id];
-      return /* @__PURE__ */ jsxs6(
-        "div",
-        {
-          className: "shadow-elevation-card-rest hover:shadow-elevation-card-hover transition-fg group relative aspect-square size-full cursor-pointer overflow-hidden rounded-[8px]",
-          "data-testid": `product-media-item-${i.id}`,
-          children: [
-            /* @__PURE__ */ jsx6(
-              "div",
-              {
-                className: clx(
-                  "transition-fg invisible absolute right-2 top-2 opacity-0 group-hover:visible group-hover:opacity-100",
-                  {
-                    "visible opacity-100": isSelected
-                  }
-                ),
-                "data-testid": `product-media-checkbox-container-${i.id}`,
-                children: /* @__PURE__ */ jsx6(
-                  Checkbox,
-                  {
-                    checked: selection[i.id] || false,
-                    onCheckedChange: () => handleCheckedChange(i.id),
-                    "data-testid": `product-media-checkbox-${i.id}`
-                  }
-                )
-              }
-            ),
-            i.isThumbnail && /* @__PURE__ */ jsx6("div", { className: "absolute left-2 top-2", "data-testid": `product-media-thumbnail-badge-${i.id}`, children: /* @__PURE__ */ jsx6(Tooltip2, { content: t("fields.thumbnail"), children: /* @__PURE__ */ jsx6(ThumbnailBadge, {}) }) }),
-            /* @__PURE__ */ jsx6(Link, { to: `media`, state: { curr: index }, "data-testid": `product-media-link-${i.id}`, children: /* @__PURE__ */ jsx6(
-              "img",
-              {
-                src: i.url,
-                alt: product.title,
-                className: "size-full object-cover",
-                "data-testid": `product-media-image-${i.id}`
-              }
-            ) })
-          ]
-        },
-        i.id
-      );
-    }) }) : /* @__PURE__ */ jsxs6("div", { className: "flex flex-col items-center gap-y-4 pb-8 pt-6", "data-testid": "product-media-empty-state", children: [
-      /* @__PURE__ */ jsxs6("div", { className: "flex flex-col items-center", children: [
-        /* @__PURE__ */ jsx6(
-          Text4,
-          {
-            size: "small",
-            leading: "compact",
-            weight: "plus",
-            className: "text-ui-fg-subtle",
-            "data-testid": "product-media-empty-state-header",
-            children: t("products.media.emptyState.header")
-          }
-        ),
-        /* @__PURE__ */ jsx6(Text4, { size: "small", className: "text-ui-fg-muted", "data-testid": "product-media-empty-state-description", children: t("products.media.emptyState.description") })
-      ] }),
-      /* @__PURE__ */ jsx6(Button3, { size: "small", variant: "secondary", asChild: true, "data-testid": "product-media-empty-state-button", children: /* @__PURE__ */ jsx6(Link, { to: "media?view=edit", "data-testid": "product-media-empty-state-link", children: t("products.media.emptyState.action") }) })
-    ] }),
-    /* @__PURE__ */ jsx6(CommandBar, { open: !!Object.keys(selection).length, "data-testid": "product-media-command-bar", children: /* @__PURE__ */ jsxs6(CommandBar.Bar, { "data-testid": "product-media-command-bar-bar", children: [
-      /* @__PURE__ */ jsx6(CommandBar.Value, { "data-testid": "product-media-command-bar-value", children: t("general.countSelected", {
-        count: Object.keys(selection).length
-      }) }),
-      /* @__PURE__ */ jsx6(CommandBar.Seperator, { "data-testid": "product-media-command-bar-separator" }),
-      /* @__PURE__ */ jsx6(
-        CommandBar.Command,
-        {
-          action: handleDelete,
-          label: t("actions.delete"),
-          shortcut: "d",
-          "data-testid": "product-media-command-bar-delete"
-        }
-      )
-    ] }) })
-  ] });
-};
-var getMedia = (product) => {
-  const { images = [], thumbnail } = product;
-  const media = images.map((image) => ({
-    id: image.id,
-    url: image.url,
-    isThumbnail: image.url === thumbnail
-  }));
-  if (thumbnail && !media.some((mediaItem) => mediaItem.url === thumbnail)) {
-    media.unshift({
-      id: "img_thumbnail",
-      url: thumbnail,
-      isThumbnail: true
-    });
-  }
-  return media;
-};
-
-// src/pages/products/product-detail/components/product-organization-section/product-organization-section.tsx
-import { PencilSquare as PencilSquare3 } from "@medusajs/icons";
-import { Badge as Badge2, Container as Container6, Heading as Heading6, Tooltip as Tooltip3 } from "@medusajs/ui";
-import { useTranslation as useTranslation7 } from "react-i18next";
-import { Link as Link2 } from "react-router-dom";
-import { jsx as jsx7, jsxs as jsxs7 } from "react/jsx-runtime";
 var ProductOrganizationSection = ({
   product
 }) => {
-  const { t } = useTranslation7();
-  return /* @__PURE__ */ jsxs7(
-    Container6,
+  const { t } = useTranslation6();
+  return /* @__PURE__ */ jsxs6(
+    Container4,
     {
       className: "divide-y p-0",
       "data-testid": "product-organization-section",
       children: [
-        /* @__PURE__ */ jsxs7(
+        /* @__PURE__ */ jsxs6(
           "div",
           {
             className: "flex items-center justify-between px-6 py-4",
             "data-testid": "product-organization-header",
             children: [
-              /* @__PURE__ */ jsx7(Heading6, { level: "h2", "data-testid": "product-organization-title", children: t("products.organization.header") }),
-              /* @__PURE__ */ jsx7(
+              /* @__PURE__ */ jsx6(Heading4, { level: "h2", "data-testid": "product-organization-title", children: t("products.organization.header") }),
+              /* @__PURE__ */ jsx6(
                 ActionMenu,
                 {
                   groups: [
@@ -1188,7 +818,7 @@ var ProductOrganizationSection = ({
                         {
                           label: t("actions.edit"),
                           to: "organization",
-                          icon: /* @__PURE__ */ jsx7(PencilSquare3, {})
+                          icon: /* @__PURE__ */ jsx6(PencilSquare3, {})
                         }
                       ]
                     }
@@ -1199,11 +829,11 @@ var ProductOrganizationSection = ({
             ]
           }
         ),
-        /* @__PURE__ */ jsx7(
+        /* @__PURE__ */ jsx6(
           SectionRow,
           {
             title: t("fields.tags"),
-            value: product.tags?.length ? product.tags.map((tag) => /* @__PURE__ */ jsx7(
+            value: product.tags?.length ? product.tags.map((tag) => /* @__PURE__ */ jsx6(
               OrganizationTag,
               {
                 label: tag.value,
@@ -1214,11 +844,11 @@ var ProductOrganizationSection = ({
             "data-testid": "product-tags-row"
           }
         ),
-        /* @__PURE__ */ jsx7(
+        /* @__PURE__ */ jsx6(
           SectionRow,
           {
             title: t("fields.type"),
-            value: product.type ? /* @__PURE__ */ jsx7(
+            value: product.type ? /* @__PURE__ */ jsx6(
               OrganizationTag,
               {
                 label: product.type.value,
@@ -1228,25 +858,11 @@ var ProductOrganizationSection = ({
             "data-testid": "product-type-row"
           }
         ),
-        /* @__PURE__ */ jsx7(
-          SectionRow,
-          {
-            title: t("fields.brand"),
-            value: product.brand ? /* @__PURE__ */ jsx7(
-              OrganizationTag,
-              {
-                label: product.brand.name,
-                to: `/settings/product-brands/${product.brand.id}`
-              }
-            ) : void 0,
-            "data-testid": "product-brand-row"
-          }
-        ),
-        /* @__PURE__ */ jsx7(
+        /* @__PURE__ */ jsx6(
           SectionRow,
           {
             title: t("fields.collection"),
-            value: product.collection ? /* @__PURE__ */ jsx7(
+            value: product.collection ? /* @__PURE__ */ jsx6(
               OrganizationTag,
               {
                 label: product.collection.title,
@@ -1256,11 +872,11 @@ var ProductOrganizationSection = ({
             "data-testid": "product-collection-row"
           }
         ),
-        /* @__PURE__ */ jsx7(
+        /* @__PURE__ */ jsx6(
           SectionRow,
           {
             title: t("fields.categories"),
-            value: product.categories?.length ? product.categories.map((pcat) => /* @__PURE__ */ jsx7(
+            value: product.categories?.length ? product.categories.map((pcat) => /* @__PURE__ */ jsx6(
               OrganizationTag,
               {
                 label: pcat.name,
@@ -1276,8 +892,8 @@ var ProductOrganizationSection = ({
   );
 };
 var OrganizationTag = ({ label, to }) => {
-  return /* @__PURE__ */ jsx7(Tooltip3, { content: label, children: /* @__PURE__ */ jsx7(Badge2, { size: "2xsmall", className: "block w-fit truncate", asChild: true, children: /* @__PURE__ */ jsx7(
-    Link2,
+  return /* @__PURE__ */ jsx6(Tooltip2, { content: label, children: /* @__PURE__ */ jsx6(Badge2, { size: "2xsmall", className: "block w-fit truncate", asChild: true, children: /* @__PURE__ */ jsx6(
+    Link,
     {
       to,
       "data-testid": `organization-tag-${label.toLowerCase().replace(/\s+/g, "-")}`,
@@ -1287,34 +903,33 @@ var OrganizationTag = ({ label, to }) => {
 };
 
 // src/pages/products/product-detail/components/product-variant-section/product-variant-section.tsx
-import { useCallback, useMemo as useMemo2 } from "react";
-import { Buildings, Component, PencilSquare as PencilSquare4, Trash as Trash3 } from "@medusajs/icons";
+import { useCallback, useMemo } from "react";
+import { PencilSquare as PencilSquare4, Trash as Trash3 } from "@medusajs/icons";
 import {
   Badge as Badge3,
-  Container as Container7,
-  createDataTableColumnHelper,
-  createDataTableCommandHelper,
-  Tooltip as Tooltip4,
-  usePrompt as usePrompt4
+  Button as Button3,
+  Container as Container5,
+  Heading as Heading5,
+  toast as toast4,
+  Tooltip as Tooltip3,
+  usePrompt as usePrompt3
 } from "@medusajs/ui";
 import { keepPreviousData } from "@tanstack/react-query";
-import { useTranslation as useTranslation8 } from "react-i18next";
-import { useNavigate as useNavigate2, useSearchParams } from "react-router-dom";
-import { jsx as jsx8 } from "react/jsx-runtime";
+import { createColumnHelper } from "@tanstack/react-table";
+import { useTranslation as useTranslation7 } from "react-i18next";
+import { Link as Link2, useNavigate as useNavigate2, useSearchParams } from "react-router-dom";
+import { jsx as jsx7, jsxs as jsxs7 } from "react/jsx-runtime";
 var PAGE_SIZE = 10;
 var PREFIX = "pv";
 var ProductVariantSection = ({
   product
 }) => {
-  const { t } = useTranslation8();
+  const { t } = useTranslation7();
   const { q, order, offset, created_at, updated_at } = useQueryParams(
     ["q", "order", "offset", "created_at", "updated_at"],
     PREFIX
   );
-  const columns = useColumns(product);
-  const filters = useFilters();
-  const commands = useCommands();
-  const { variants, count, isPending, isError, error } = useProductVariants(
+  const { variants, count, isLoading, isError, error } = useProductVariants(
     product.id,
     {
       q,
@@ -1323,73 +938,71 @@ var ProductVariantSection = ({
       limit: PAGE_SIZE,
       created_at: created_at ? JSON.parse(created_at) : void 0,
       updated_at: updated_at ? JSON.parse(updated_at) : void 0,
-      fields: "title,created_at,updated_at,*attribute_values,*attribute_values.attribute"
+      fields: "title,sku,created_at,updated_at,*options,*options.option"
     },
     {
       placeholderData: keepPreviousData
     }
   );
+  const columns = useColumns(product);
+  const filters = useFilters();
+  const orderBy = useOrderBy();
+  const { table } = useDataTable({
+    data: variants ?? [],
+    columns,
+    count,
+    pageSize: PAGE_SIZE,
+    getRowId: (row) => row.id,
+    prefix: PREFIX
+  });
   if (isError) {
     throw error;
   }
-  return /* @__PURE__ */ jsx8(Container7, { className: "divide-y p-0", "data-testid": "product-variant-section", children: /* @__PURE__ */ jsx8("div", { "data-testid": "product-variants-table-container", children: /* @__PURE__ */ jsx8(
-    DataTable,
-    {
-      data: variants,
-      columns,
-      filters,
-      rowCount: count,
-      getRowId: (row) => row.id,
-      rowHref: (row) => `/products/${product.id}/variants/${row.id}`,
-      pageSize: PAGE_SIZE,
-      isLoading: isPending,
-      heading: t("products.variants.header"),
-      emptyState: {
-        empty: {
-          heading: t("products.variants.empty.heading"),
-          description: t("products.variants.empty.description")
-        },
-        filtered: {
-          heading: t("products.variants.filtered.heading"),
-          description: t("products.variants.filtered.description")
+  return /* @__PURE__ */ jsxs7(Container5, { className: "divide-y p-0", "data-testid": "product-variant-section", children: [
+    /* @__PURE__ */ jsxs7("div", { className: "flex items-center justify-between px-6 py-4", children: [
+      /* @__PURE__ */ jsx7(Heading5, { level: "h2", children: t("products.variants.header") }),
+      /* @__PURE__ */ jsx7(
+        Button3,
+        {
+          size: "small",
+          variant: "secondary",
+          asChild: true,
+          "data-testid": "product-variants-create-button",
+          children: /* @__PURE__ */ jsx7(Link2, { to: "variants/create", children: t("actions.create") })
         }
-      },
-      action: {
-        label: t("actions.create"),
-        to: `variants/create`
-      },
-      actionMenu: {
-        groups: [
-          {
-            actions: [
-              {
-                label: t("products.editPrices"),
-                to: `prices`,
-                icon: /* @__PURE__ */ jsx8(PencilSquare4, {})
-              },
-              {
-                label: t("inventory.stock.action"),
-                to: `stock`,
-                icon: /* @__PURE__ */ jsx8(Buildings, {})
-              }
-            ]
-          }
-        ],
-        "data-testid": "product-variant-section-action-menu"
-      },
-      commands,
-      prefix: PREFIX
-    }
-  ) }) });
+      )
+    ] }),
+    /* @__PURE__ */ jsx7(
+      _DataTable,
+      {
+        table,
+        columns,
+        count,
+        pageSize: PAGE_SIZE,
+        filters,
+        search: true,
+        pagination: true,
+        isLoading,
+        orderBy,
+        prefix: PREFIX,
+        queryObject: { q, order, created_at, updated_at },
+        navigateTo: (row) => `variants/${row.original.id}`,
+        noRecords: {
+          title: t("products.variants.empty.heading"),
+          message: t("products.variants.empty.description")
+        }
+      }
+    )
+  ] });
 };
-var columnHelper = createDataTableColumnHelper();
+var columnHelper = createColumnHelper();
 var useColumns = (product) => {
-  const { t } = useTranslation8();
+  const { t } = useTranslation7();
   const navigate = useNavigate2();
   const { mutateAsync } = useDeleteVariantLazy(product.id);
-  const prompt = usePrompt4();
+  const prompt = usePrompt3();
   const [searchParams] = useSearchParams();
-  const tableSearchParams = useMemo2(() => {
+  const tableSearchParams = useMemo(() => {
     const filtered = new URLSearchParams();
     for (const [key, value] of searchParams.entries()) {
       if (key.startsWith(`${PREFIX}_`)) {
@@ -1398,7 +1011,6 @@ var useColumns = (product) => {
     }
     return filtered;
   }, [searchParams]);
-  const dateColumns = useDataTableDateColumns();
   const handleDelete = useCallback(
     async (id, title) => {
       const res = await prompt({
@@ -1412,48 +1024,19 @@ var useColumns = (product) => {
       if (!res) {
         return;
       }
-      await mutateAsync({ variantId: id });
+      await mutateAsync(
+        { variantId: id },
+        {
+          onError: (error) => {
+            toast4.error(error.message);
+          }
+        }
+      );
     },
     [mutateAsync, prompt, t]
   );
-  const optionColumns = useMemo2(() => {
-    if (!product?.options) {
-      return [];
-    }
-    return product.options.map((option) => {
-      return columnHelper.display({
-        id: option.id,
-        header: option.title,
-        cell: ({ row }) => {
-          const variantOpt = row.original.options?.find(
-            (opt) => opt.option_id === option.id
-          );
-          if (!variantOpt) {
-            return /* @__PURE__ */ jsx8("span", { className: "text-ui-fg-muted", children: "-" });
-          }
-          return /* @__PURE__ */ jsx8(
-            "div",
-            {
-              className: "flex items-center",
-              "data-testid": `product-variant-option-${option.id}-${row.original.id}`,
-              children: /* @__PURE__ */ jsx8(Tooltip4, { content: variantOpt.value, children: /* @__PURE__ */ jsx8(
-                Badge3,
-                {
-                  size: "2xsmall",
-                  title: variantOpt.value,
-                  className: "inline-flex min-w-[20px] max-w-[140px] items-center justify-center overflow-hidden truncate",
-                  "data-testid": `product-variant-option-badge-${option.id}-${row.original.id}-${variantOpt.value}`,
-                  children: variantOpt.value
-                }
-              ) })
-            }
-          );
-        }
-      });
-    });
-  }, [product]);
-  const attributeColumns = useMemo2(() => {
-    const variantAttributes = product?.variant_attributes?.filter((attr) => attr.is_variant_axis);
+  const attributeColumns = useMemo(() => {
+    const variantAttributes = product?.attributes?.filter((attr) => attr.is_variant_axis);
     if (!variantAttributes?.length) {
       return [];
     }
@@ -1462,140 +1045,117 @@ var useColumns = (product) => {
         id: `attribute-${attribute.id}`,
         header: attribute.name,
         cell: ({ row }) => {
-          const variant = row.original;
-          const matches = variant.attribute_values?.filter(
-            (v) => v.attribute?.id === attribute.id
-          ) ?? [];
-          if (!matches.length) {
-            return /* @__PURE__ */ jsx8("span", { className: "text-ui-fg-muted", children: "-" });
+          const variantOpt = row.original.options?.find(
+            (opt) => opt.option?.title === attribute.name
+          );
+          if (!variantOpt?.value) {
+            return /* @__PURE__ */ jsx7("span", { className: "text-ui-fg-muted", children: "-" });
           }
-          return /* @__PURE__ */ jsx8(
+          return /* @__PURE__ */ jsx7(
             "div",
             {
               className: "flex flex-wrap items-center gap-1",
               "data-testid": `product-variant-attribute-${attribute.id}-${row.original.id}`,
-              children: matches.map((value) => /* @__PURE__ */ jsx8(Tooltip4, { content: value.name, children: /* @__PURE__ */ jsx8(
+              children: /* @__PURE__ */ jsx7(Tooltip3, { content: variantOpt.value, children: /* @__PURE__ */ jsx7(
                 Badge3,
                 {
                   size: "2xsmall",
-                  title: value.name,
+                  title: variantOpt.value,
                   className: "inline-flex min-w-[20px] max-w-[140px] items-center justify-center overflow-hidden truncate",
-                  "data-testid": `product-variant-attribute-badge-${attribute.id}-${row.original.id}-${value.name}`,
-                  children: value.name
+                  "data-testid": `product-variant-attribute-badge-${attribute.id}-${row.original.id}-${variantOpt.value}`,
+                  children: variantOpt.value
                 }
-              ) }, value.id))
+              ) })
             }
           );
         }
       });
     });
   }, [product]);
-  const getActions = useCallback(
-    (ctx) => {
-      const variant = ctx.row.original;
-      const mainActions = [
-        {
-          icon: /* @__PURE__ */ jsx8(PencilSquare4, {}),
-          label: t("actions.edit"),
-          onClick: (row) => {
-            navigate(
-              `edit-variant?variant_id=${row.row.original.id}&${tableSearchParams.toString()}`,
-              {
-                state: {
-                  restore_params: tableSearchParams.toString()
-                }
-              }
-            );
-          }
-        }
-      ];
-      const secondaryActions = [
-        {
-          icon: /* @__PURE__ */ jsx8(Trash3, {}),
-          label: t("actions.delete"),
-          onClick: () => handleDelete(variant.id, variant.title)
-        }
-      ];
-      const inventoryItemsCount = variant.inventory_items?.length || 0;
-      switch (inventoryItemsCount) {
-        case 0:
-          break;
-        case 1: {
-          const inventoryItemLink = `/inventory/${variant.inventory_items[0].inventory.id}`;
-          mainActions.push({
-            label: t("products.variant.inventory.actions.inventoryItems"),
-            onClick: () => {
-              navigate(inventoryItemLink);
-            },
-            icon: /* @__PURE__ */ jsx8(Buildings, {})
-          });
-          break;
-        }
-        default: {
-          const ids = variant.inventory_items?.map((i) => i.inventory?.id);
-          if (!ids || ids.length === 0) {
-            break;
-          }
-          const inventoryKitLink = `/inventory?${new URLSearchParams({
-            id: ids.join(",")
-          }).toString()}`;
-          mainActions.push({
-            label: t("products.variant.inventory.actions.inventoryKit"),
-            onClick: () => {
-              navigate(inventoryKitLink);
-            },
-            icon: /* @__PURE__ */ jsx8(Component, {})
-          });
-        }
-      }
-      return [mainActions, secondaryActions];
-    },
-    [handleDelete, navigate, t, tableSearchParams]
-  );
-  return useMemo2(() => {
-    return [
+  return useMemo(
+    () => [
       columnHelper.accessor("title", {
+        id: "title",
         header: t("fields.title"),
-        enableSorting: true,
-        sortAscLabel: t("filters.sorting.alphabeticallyAsc"),
-        sortDescLabel: t("filters.sorting.alphabeticallyDesc")
+        cell: ({ getValue }) => {
+          const value = getValue();
+          return /* @__PURE__ */ jsxs7("div", { className: "flex h-full w-full max-w-[250px] items-center gap-x-3 overflow-hidden", children: [
+            /* @__PURE__ */ jsx7("div", { className: "w-fit flex-shrink-0", children: /* @__PURE__ */ jsx7(Thumbnail, { src: product.thumbnail }) }),
+            value ? /* @__PURE__ */ jsx7("span", { title: value, className: "truncate", children: value }) : /* @__PURE__ */ jsx7("span", { className: "text-ui-fg-muted", children: "-" })
+          ] });
+        }
+      }),
+      columnHelper.accessor("sku", {
+        id: "sku",
+        header: t("fields.sku"),
+        cell: ({ getValue }) => {
+          const value = getValue();
+          return value ? value : /* @__PURE__ */ jsx7("span", { className: "text-ui-fg-muted", children: "-" });
+        }
       }),
-      ...optionColumns,
       ...attributeColumns,
-      ...dateColumns,
-      columnHelper.action({
-        actions: getActions
+      columnHelper.display({
+        id: "actions",
+        cell: ({ row }) => /* @__PURE__ */ jsx7(
+          ActionMenu,
+          {
+            groups: [
+              {
+                actions: [
+                  {
+                    icon: /* @__PURE__ */ jsx7(PencilSquare4, {}),
+                    label: t("actions.edit"),
+                    onClick: () => navigate(
+                      `edit-variant?variant_id=${row.original.id}&${tableSearchParams.toString()}`,
+                      {
+                        state: {
+                          restore_params: tableSearchParams.toString()
+                        }
+                      }
+                    )
+                  }
+                ]
+              },
+              {
+                actions: [
+                  {
+                    icon: /* @__PURE__ */ jsx7(Trash3, {}),
+                    label: t("actions.delete"),
+                    onClick: () => handleDelete(row.original.id, row.original.title ?? "")
+                  }
+                ]
+              }
+            ]
+          }
+        )
       })
-    ];
-  }, [t, optionColumns, attributeColumns, dateColumns, getActions]);
+    ],
+    [t, attributeColumns, navigate, handleDelete, tableSearchParams, product]
+  );
 };
 var useFilters = () => {
-  const dateFilters = useDataTableDateFilters();
-  return useMemo2(() => {
-    return [
-      ...dateFilters
-    ];
-  }, [dateFilters]);
+  const { t } = useTranslation7();
+  return useMemo(
+    () => [
+      { key: "created_at", label: t("fields.createdAt"), type: "date" },
+      { key: "updated_at", label: t("fields.updatedAt"), type: "date" }
+    ],
+    [t]
+  );
 };
-var commandHelper = createDataTableCommandHelper();
-var useCommands = () => {
-  const { t } = useTranslation8();
-  const navigate = useNavigate2();
-  return [
-    commandHelper.command({
-      label: t("inventory.stock.action"),
-      shortcut: "i",
-      action: async (selection) => {
-        navigate(
-          `stock?${PRODUCT_VARIANT_IDS_KEY}=${Object.keys(selection).join(",")}`
-        );
-      }
-    })
-  ];
+var useOrderBy = () => {
+  const { t } = useTranslation7();
+  return useMemo(
+    () => [
+      { key: "title", label: t("fields.title") },
+      { key: "sku", label: t("fields.sku") }
+    ],
+    [t]
+  );
 };
 
 // src/pages/products/product-detail/product-detail.tsx
-import { jsx as jsx9, jsxs as jsxs8 } from "react/jsx-runtime";
+import { jsx as jsx8, jsxs as jsxs8 } from "react/jsx-runtime";
 var Root = ({ children }) => {
   const initialData = useLoaderData();
   const { id } = useParams();
@@ -1609,7 +1169,7 @@ var Root = ({ children }) => {
   });
   const product = rawProduct;
   if (isLoading || !product) {
-    return /* @__PURE__ */ jsx9(
+    return /* @__PURE__ */ jsx8(
       TwoColumnPageSkeleton,
       {
         mainSections: 4,
@@ -1622,7 +1182,7 @@ var Root = ({ children }) => {
   if (isError) {
     throw error;
   }
-  return Children.count(children) > 0 ? /* @__PURE__ */ jsx9(
+  return Children.count(children) > 0 ? /* @__PURE__ */ jsx8(
     TwoColumnPage,
     {
       data: product,
@@ -1640,15 +1200,15 @@ var Root = ({ children }) => {
       "data-testid": "product-detail-page",
       children: [
         /* @__PURE__ */ jsxs8(TwoColumnPage.Main, { "data-testid": "product-detail-main", children: [
-          /* @__PURE__ */ jsx9(ProductActiveRequestSection, { product }),
-          /* @__PURE__ */ jsx9(ProductActiveEditSection, { product }),
-          /* @__PURE__ */ jsx9(ProductGeneralSection, { product }),
-          /* @__PURE__ */ jsx9(ProductMediaSection, { product }),
-          /* @__PURE__ */ jsx9(ProductVariantSection, { product })
+          /* @__PURE__ */ jsx8(ProductActiveRequestSection, { product }),
+          /* @__PURE__ */ jsx8(ProductActiveEditSection, { product }),
+          /* @__PURE__ */ jsx8(ProductGeneralSection, { product }),
+          /* @__PURE__ */ jsx8(ProductMediaSection, { product }),
+          /* @__PURE__ */ jsx8(ProductVariantSection, { product })
         ] }),
         /* @__PURE__ */ jsxs8(TwoColumnPage.Sidebar, { "data-testid": "product-detail-sidebar", children: [
-          /* @__PURE__ */ jsx9(ProductOrganizationSection, { product }),
-          /* @__PURE__ */ jsx9(ProductAttributeSection, { product })
+          /* @__PURE__ */ jsx8(ProductOrganizationSection, { product }),
+          /* @__PURE__ */ jsx8(ProductAttributeSection, { product })
         ] })
       ]
     }