@mercurjs/admin 2.2.1 → 2.3.0-canary.1

package/dist/{chunk-RES4NBTO.js → chunk-HV32AEGS.js}

@@ -1,21 +1,20 @@
 import {
-  PriceListCreateProductsSchema,
+  PriceListCreateOffersSchema,
+  buildOfferGridData,
   usePriceListCurrencyData,
   usePriceListGridColumns
-} from "./chunk-YDDD3MK5.js";
+} from "./chunk-ELLSTZ5X.js";
 import {
-  exctractPricesFromProducts,
-  isProductRow
-} from "./chunk-BNOKKKUU.js";
+  useOfferTableColumns,
+  useOfferTableFilters,
+  useOfferTableQuery
+} from "./chunk-EPUODBUW.js";
 import {
-  useProductTableColumns
-} from "./chunk-GBSL5JTZ.js";
+  extractPricesFromOffers
+} from "./chunk-KVAD5JGS.js";
 import {
-  useProductTableFilters
-} from "./chunk-6ZVLQ4IK.js";
-import {
-  useProductTableQuery
-} from "./chunk-S4IDR46L.js";
+  useOffers
+} from "./chunk-GNNOFJAK.js";
 import {
   TabbedForm,
   defineTabMeta,
@@ -31,20 +30,21 @@ import {
 import {
   _DataTable,
   useDataTable
-} from "./chunk-NEURB6JB.js";
+} from "./chunk-BSXBRI23.js";
 import {
   useBatchPriceListPrices,
   usePriceList
-} from "./chunk-HRPM4HIB.js";
+} from "./chunk-56XMCNDS.js";
 import {
   useProducts
-} from "./chunk-QE57IFSR.js";
+} from "./chunk-Z476HUMI.js";
 
 // src/pages/price-lists/price-list-prices-add/components/price-list-prices-add-form/schema.ts
 import { z } from "zod";
 var PriceListPricesAddSchema = z.object({
   product_ids: z.array(z.object({ id: z.string() })).min(1),
-  products: PriceListCreateProductsSchema
+  offer_ids: z.array(z.string()).default([]),
+  offers: PriceListCreateOffersSchema.default({})
 });
 var PriceListPricesAddProductIdsSchema = PriceListPricesAddSchema.pick(
   {
@@ -55,7 +55,7 @@ var PriceListPricesAddProductsIdsFields = Object.keys(
   PriceListPricesAddProductIdsSchema.shape
 );
 var PriceListPricesAddProductsSchema = PriceListPricesAddSchema.pick({
-  products: true
+  offers: true
 });
 var PriceListPricesAddProductsFields = Object.keys(
   PriceListPricesAddProductsSchema.shape
@@ -68,12 +68,12 @@ import { useParams } from "react-router-dom";
 // src/pages/price-lists/price-list-prices-add/components/price-list-prices-add-form/price-list-prices-add-form.tsx
 import { zodResolver } from "@hookform/resolvers/zod";
 import { toast } from "@medusajs/ui";
-import { Children, useMemo as useMemo2 } from "react";
+import { Children, useMemo as useMemo3 } from "react";
 import { useForm } from "react-hook-form";
 import { useTranslation as useTranslation2 } from "react-i18next";
 
 // src/pages/price-lists/price-list-prices-add/components/price-list-prices-add-form/price-list-prices-add-prices-form.tsx
-import { useEffect } from "react";
+import { useEffect, useMemo } from "react";
 import { useWatch } from "react-hook-form";
 import { jsx } from "react/jsx-runtime";
 var Root = ({
@@ -82,58 +82,57 @@ var Root = ({
   pricePreferences
 }) => {
   const form = useTabbedForm();
-  const ids = useWatch({
-    control: form.control,
-    name: "product_ids"
-  });
-  const existingProducts = useWatch({
-    control: form.control,
-    name: "products"
-  });
-  const { products, isLoading, isError, error } = useProducts({
-    id: ids.map((id) => id.id),
-    limit: ids.length,
-    fields: "title,thumbnail,*variants"
-  });
   const { setValue } = form;
   const { setCloseOnEscape } = useRouteModal();
+  const offerIds = useWatch({ control: form.control, name: "offer_ids" });
+  const existingOffers = useWatch({ control: form.control, name: "offers" });
+  const { offers: selectedOffers } = useOffers(
+    {
+      id: offerIds,
+      limit: offerIds?.length || 1,
+      fields: "id,variant_id,product_id,seller_id,sku,seller.name,product.title,product.thumbnail"
+    },
+    { enabled: (offerIds?.length ?? 0) > 0 }
+  );
+  const productIds = useMemo(
+    () => Array.from(
+      new Set((selectedOffers ?? []).map((o) => o.product_id))
+    ),
+    [selectedOffers]
+  );
+  const { products, isLoading } = useProducts(
+    { id: productIds, limit: productIds.length || 1, fields: "id,*variants" },
+    { enabled: productIds.length > 0 }
+  );
+  const { gridData, variantIdByOffer } = useMemo(
+    () => buildOfferGridData(
+      selectedOffers ?? [],
+      products ?? []
+    ),
+    [selectedOffers, products]
+  );
   useEffect(() => {
-    if (!isLoading && products) {
-      products.forEach((product) => {
-        if (existingProducts[product.id] || !product.variants) {
-          return;
-        }
-        setValue(`products.${product.id}.variants`, {
-          ...product.variants.reduce((variants, variant) => {
-            variants[variant.id] = {
-              currency_prices: {},
-              region_prices: {}
-            };
-            return variants;
-          }, {})
+    for (const [offerId, variantId] of Object.entries(variantIdByOffer)) {
+      if (!existingOffers?.[offerId]) {
+        setValue(`offers.${offerId}`, {
+          variant_id: variantId,
+          currency_prices: {},
+          region_prices: {}
         });
-      });
+      }
     }
-  }, [products, existingProducts, isLoading, setValue]);
+  }, [variantIdByOffer, existingOffers, setValue]);
   const columns = usePriceListGridColumns({
     currencies,
     regions,
     pricePreferences
   });
-  if (isError) {
-    throw error;
-  }
   return /* @__PURE__ */ jsx("div", { className: "flex size-full flex-col divide-y overflow-hidden", children: /* @__PURE__ */ jsx(
     DataGrid,
     {
       isLoading,
       columns,
-      data: products,
-      getSubRows: (row) => {
-        if (isProductRow(row) && row.variants) {
-          return row.variants;
-        }
-      },
+      data: gridData,
       state: form,
       onEditingChange: (editing) => setCloseOnEscape(!editing)
     }
@@ -142,7 +141,7 @@ var Root = ({
 Root._tabMeta = defineTabMeta({
   id: "price",
   labelKey: "priceLists.create.tabs.prices",
-  validationFields: ["products"]
+  validationFields: ["offers"]
 });
 var PriceListPricesAddPricesForm = Root;
 
@@ -152,92 +151,81 @@ import { keepPreviousData } from "@tanstack/react-query";
 import {
   createColumnHelper
 } from "@tanstack/react-table";
-import { useMemo, useState } from "react";
-import { useWatch as useWatch2 } from "react-hook-form";
+import { useMemo as useMemo2, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { jsx as jsx2 } from "react/jsx-runtime";
 var PAGE_SIZE = 50;
 var PREFIX = "p";
-function getInitialSelection(products) {
-  return products.reduce((acc, curr) => {
-    acc[curr.id] = true;
-    return acc;
-  }, {});
-}
-var Root2 = ({
-  priceList
-}) => {
+var Root2 = ({ priceList }) => {
   const { t } = useTranslation();
   const form = useTabbedForm();
-  const { control, setValue } = form;
-  const variantIdMap = useMemo(() => {
-    return (priceList.prices ?? []).reduce(
-      (acc, curr) => {
-        acc[curr.variant_id] = true;
-        return acc;
-      },
-      {}
-    );
-  }, [priceList.prices]);
-  const selectedIds = useWatch2({
-    control,
-    name: "product_ids"
-  });
-  const productRecords = useWatch2({
-    control,
-    name: "products"
+  const { setValue } = form;
+  const { price_list: pricedList } = usePriceList(priceList.id, {
+    fields: "id,+prices.price_rules.attribute,+prices.price_rules.value"
   });
-  const [rowSelection, setRowSelection] = useState(
-    getInitialSelection(selectedIds)
-  );
-  const { searchParams, raw } = useProductTableQuery({
+  const existingOfferIds = useMemo2(() => {
+    const set = /* @__PURE__ */ new Set();
+    for (const price of pricedList?.prices ?? []) {
+      const offerId = price.rules?.offer_id;
+      if (offerId) {
+        set.add(offerId);
+      }
+    }
+    return set;
+  }, [pricedList]);
+  const isAlreadyAdded = (row) => (row.offer_ids ?? [row.id]).some((id) => existingOfferIds.has(id));
+  const [rowSelection, setRowSelection] = useState({});
+  const { searchParams, raw } = useOfferTableQuery({
     pageSize: PAGE_SIZE,
     prefix: PREFIX
   });
-  const { products, count, isLoading, isError, error } = useProducts(
-    searchParams,
-    {
-      placeholderData: keepPreviousData
-    }
-  );
+  const { offers, count, isLoading, isError, error } = useOffers(searchParams, {
+    placeholderData: keepPreviousData
+  });
+  const offerMeta = useRef({});
+  for (const offer of offers ?? []) {
+    offerMeta.current[offer.id] = {
+      product_id: offer.product_id,
+      offer_ids: offer.offer_ids ?? [offer.id]
+    };
+  }
   const updater = (fn) => {
     const state = typeof fn === "function" ? fn(rowSelection) : fn;
-    const ids = Object.keys(state);
-    const productRecordKeys = Object.keys(productRecords);
-    const updatedRecords = productRecordKeys.reduce((acc, key) => {
-      if (ids.includes(key)) {
-        acc[key] = productRecords[key];
-      }
-      return acc;
-    }, {});
-    const update = ids.map((id) => ({ id }));
-    setValue("product_ids", update, { shouldDirty: true, shouldTouch: true });
-    setValue("products", updatedRecords, {
+    const selectedRowIds = Object.keys(state).filter(
+      (rowId) => offerMeta.current[rowId]
+    );
+    const productIds = Array.from(
+      new Set(selectedRowIds.map((id) => offerMeta.current[id].product_id))
+    );
+    const offerIds = Array.from(
+      new Set(selectedRowIds.flatMap((id) => offerMeta.current[id].offer_ids))
+    );
+    setValue(
+      "product_ids",
+      productIds.map((id) => ({ id })),
+      { shouldDirty: true, shouldTouch: true }
+    );
+    setValue("offer_ids", offerIds, {
       shouldDirty: true,
       shouldTouch: true
     });
     setRowSelection(state);
   };
-  const columns = useColumns();
-  const filters = useProductTableFilters();
+  const columns = useColumns(t);
+  const filters = useOfferTableFilters();
   const { table } = useDataTable({
-    data: products || [],
+    data: offers ?? [],
     columns,
     count,
     enablePagination: true,
-    enableRowSelection: (row) => {
-      return !!row.original.variants?.length && !row.original.variants?.some((v) => variantIdMap[v.id]);
-    },
+    enableRowSelection: (row) => !isAlreadyAdded(row.original),
     getRowId: (row) => row.id,
     rowSelection: {
       state: rowSelection,
       updater
     },
     pageSize: PAGE_SIZE,
-    prefix: PREFIX,
-    meta: {
-      variantIdMap
-    }
+    prefix: PREFIX
   });
   if (isError) {
     throw error;
@@ -254,11 +242,10 @@ var Root2 = ({
       isLoading,
       layout: "fill",
       orderBy: [
-        { key: "title", label: t("fields.title") },
-        { key: "status", label: t("fields.status") },
         { key: "created_at", label: t("fields.createdAt") },
         { key: "updated_at", label: t("fields.updatedAt") }
       ],
+      defaultOrder: "-created_at",
       pagination: true,
       search: true,
       queryObject: raw
@@ -266,53 +253,39 @@ var Root2 = ({
   ) });
 };
 var columnHelper = createColumnHelper();
-var useColumns = () => {
-  const { t } = useTranslation();
-  const base = useProductTableColumns();
-  return useMemo(
-    () => [
-      columnHelper.display({
-        id: "select",
-        header: ({ table }) => {
-          return /* @__PURE__ */ jsx2(
-            Checkbox,
-            {
-              checked: table.getIsSomePageRowsSelected() ? "indeterminate" : table.getIsAllPageRowsSelected(),
-              onCheckedChange: (value) => table.toggleAllPageRowsSelected(!!value)
-            }
-          );
-        },
-        cell: ({ row, table }) => {
-          const { variantIdMap } = table.options.meta;
-          const isPreselected = row.original.variants?.some(
-            (v) => variantIdMap[v.id]
-          );
-          const isDisabled = !row.getCanSelect() || isPreselected;
-          const isChecked = row.getIsSelected() || isPreselected;
-          const Component = /* @__PURE__ */ jsx2(
-            Checkbox,
-            {
-              checked: isChecked,
-              disabled: isDisabled,
-              onCheckedChange: (value) => row.toggleSelected(!!value),
-              onClick: (e) => {
-                e.stopPropagation();
-              }
-            }
-          );
-          if (isPreselected) {
-            return /* @__PURE__ */ jsx2(Tooltip, { content: t("priceLists.products.add.alreadyInPriceList"), children: Component });
-          }
-          if (isDisabled) {
-            return /* @__PURE__ */ jsx2(Tooltip, { content: t("priceLists.products.add.noVariants"), children: Component });
+var useColumns = (t) => {
+  const base = useOfferTableColumns();
+  return useMemo2(() => {
+    const selectColumn = columnHelper.display({
+      id: "select",
+      header: ({ table }) => /* @__PURE__ */ jsx2(
+        Checkbox,
+        {
+          checked: table.getIsSomePageRowsSelected() ? "indeterminate" : table.getIsAllPageRowsSelected(),
+          onCheckedChange: (value) => table.toggleAllPageRowsSelected(!!value)
+        }
+      ),
+      cell: ({ row }) => {
+        const checkbox = /* @__PURE__ */ jsx2(
+          Checkbox,
+          {
+            checked: row.getIsSelected(),
+            disabled: !row.getCanSelect(),
+            onCheckedChange: (value) => row.toggleSelected(!!value),
+            onClick: (e) => e.stopPropagation()
           }
-          return Component;
+        );
+        if (!row.getCanSelect()) {
+          return /* @__PURE__ */ jsx2(Tooltip, { content: t("priceLists.products.add.alreadyInPriceList"), children: checkbox });
         }
-      }),
-      ...base
-    ],
-    [base, t]
-  );
+        return checkbox;
+      }
+    });
+    return [
+      selectColumn,
+      ...base.slice(1, -1)
+    ];
+  }, [base, t]);
 };
 Root2._tabMeta = defineTabMeta({
   id: "product",
@@ -336,16 +309,17 @@ var PriceListPricesAddForm = ({
   const { handleSuccess } = useRouteModal();
   const form = useForm({
     defaultValues: {
-      products: {},
+      offers: {},
       product_ids: [],
+      offer_ids: [],
       ...extraDefaults
     },
     resolver: zodResolver(schema ?? PriceListPricesAddSchema)
   });
   const { mutateAsync, isPending } = useBatchPriceListPrices(priceList.id);
   const handleSubmit = form.handleSubmit(async (values) => {
-    const { products } = values;
-    const prices = exctractPricesFromProducts(products, regions);
+    const { offers } = values;
+    const prices = extractPricesFromOffers(offers, regions);
     await mutateAsync(
       {
         create: prices
@@ -359,7 +333,7 @@ var PriceListPricesAddForm = ({
       }
     );
   });
-  const defaultTabs = useMemo2(
+  const defaultTabs = useMemo3(
     () => [
       /* @__PURE__ */ jsx3(PriceListPricesAddProductIdsForm, { priceList }, "product"),
       /* @__PURE__ */ jsx3(
@@ -398,7 +372,7 @@ var Root3 = ({ children }) => {
   if (isError) {
     throw error;
   }
-  return /* @__PURE__ */ jsx4(RouteFocusModal, { prev: "../..", children: ready && (Children2.count(children) > 0 ? children : /* @__PURE__ */ jsx4(
+  return /* @__PURE__ */ jsx4(RouteFocusModal, { prev: `/price-lists/${id}`, children: ready && (Children2.count(children) > 0 ? children : /* @__PURE__ */ jsx4(
     PriceListPricesAddForm,
     {
       priceList: price_list,