@mercurjs/vendor 2.3.8-canary.2 → 2.3.8-canary.3

package/dist/{edit-price-2FAMT7BH.js → edit-price-QKTDC4OC.js}

@@ -59,8 +59,10 @@ import { useForm } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 import { useParams } from "react-router-dom";
 import { isForbidden, SectionNoAccess, useCan } from "@mercurjs/dashboard-shared";
-import { Fragment, jsx, jsxs } from "react/jsx-runtime";
-var numericOrZero = (v) => v === "" || v === null || v === void 0 ? 0 : castNumber(v) || 0;
+
+// src/pages/offers/[id]/edit-price/utils.ts
+var isEmpty = (v) => v === "" || v === null || v === void 0;
+var numericOrZero = (v) => castNumber(v) || 0;
 var buildRows = (product, currencies, regions) => (product.variants ?? []).flatMap(
   (variant) => (variant.offers ?? []).map((offer) => {
     const offerPrices = offer.prices ?? [];
@@ -85,6 +87,27 @@ var buildRows = (product, currencies, regions) => (product.variants ?? []).flatM
     };
   })
 );
+var buildPricePayload = (row, currencies, regions) => {
+  const prices = [];
+  for (const code of currencies) {
+    const value = row.prices?.[code];
+    if (isEmpty(value)) continue;
+    prices.push({ amount: numericOrZero(value), currency_code: code });
+  }
+  for (const region of regions) {
+    const value = row.region_prices?.[region.id];
+    if (isEmpty(value)) continue;
+    prices.push({
+      amount: numericOrZero(value),
+      currency_code: region.currency_code,
+      rules: { region_id: region.id }
+    });
+  }
+  return prices;
+};
+
+// src/pages/offers/[id]/edit-price/index.tsx
+import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 var columnHelper = createDataGridHelper();
 var useColumns = ({
   currencies,
@@ -127,11 +150,12 @@ var useColumns = ({
 };
 var EditPriceGrid = ({
   product,
-  productId
+  productId,
+  currencies,
+  regions
 }) => {
   const { t } = useTranslation();
   const { handleSuccess, setCloseOnEscape } = useRouteModal();
-  const { currencies, regions } = useSellerCurrencies();
   const canViewPricePreferences = useCan("price_preferences");
   const { price_preferences: pricePreferences } = usePricePreferences(
     {},
@@ -146,24 +170,12 @@ var EditPriceGrid = ({
   const handleSubmit = form.handleSubmit(async (values) => {
     try {
       await Promise.all(
-        values.rows.map((row) => {
-          const prices = [];
-          for (const code of currencies) {
-            const value = row.prices?.[code];
-            if (value === "" || value === null || value === void 0) continue;
-            prices.push({ amount: numericOrZero(value), currency_code: code });
-          }
-          for (const region of regions) {
-            const value = row.region_prices?.[region.id];
-            if (value === "" || value === null || value === void 0) continue;
-            prices.push({
-              amount: numericOrZero(value),
-              currency_code: region.currency_code,
-              rules: { region_id: region.id }
-            });
-          }
-          return sdk.vendor.offers.$id.mutate({ $id: row.offer_id, prices });
-        })
+        values.rows.map(
+          (row) => sdk.vendor.offers.$id.mutate({
+            $id: row.offer_id,
+            prices: buildPricePayload(row, currencies, regions)
+          })
+        )
       );
       await queryClient.invalidateQueries({ queryKey: offerQueryKeys.lists() });
       await queryClient.invalidateQueries({
@@ -214,15 +226,32 @@ var OfferEditPricePage = () => {
   const { product, isPending, isError, error } = useProduct(id, {
     fields: OFFER_PRODUCT_DETAIL_FIELDS
   });
+  const {
+    currencies,
+    regions,
+    isPending: isRegionsPending,
+    isError: isRegionsError,
+    error: regionsError
+  } = useSellerCurrencies();
   const forbidden = isError && isForbidden(error);
   if (isError && !forbidden) throw error;
+  if (isRegionsError) throw regionsError;
+  const ready = !isPending && !!product && !isRegionsPending;
   return /* @__PURE__ */ jsxs(RouteFocusModal, { children: [
     /* @__PURE__ */ jsx(RouteFocusModal.Title, { asChild: true, children: /* @__PURE__ */ jsx("span", { className: "sr-only", children: t("offers.pricing.header") }) }),
     /* @__PURE__ */ jsx(RouteFocusModal.Description, { asChild: true, children: /* @__PURE__ */ jsx("span", { className: "sr-only", children: t("offers.pricing.description") }) }),
     forbidden ? /* @__PURE__ */ jsxs(Fragment, { children: [
       /* @__PURE__ */ jsx(RouteFocusModal.Header, {}),
       /* @__PURE__ */ jsx(RouteFocusModal.Body, { children: /* @__PURE__ */ jsx(SectionNoAccess, {}) })
-    ] }) : !isPending && product && /* @__PURE__ */ jsx(EditPriceGrid, { product, productId: id })
+    ] }) : ready && /* @__PURE__ */ jsx(
+      EditPriceGrid,
+      {
+        product,
+        productId: id,
+        currencies,
+        regions
+      }
+    )
   ] });
 };
 var Component = OfferEditPricePage;

package/dist/extension-targets.d.ts

@@ -54,8 +54,11 @@ declare module "@mercurjs/dashboard-sdk" {
     "offer-variants.detail.main.before": true
     "offer-variants.detail.side.after": true
     "offer-variants.detail.side.before": true
+    "offers.detail": true
+    "offers.detail.main": true
     "offers.detail.main.after": true
     "offers.detail.main.before": true
+    "offers.detail.side": true
     "offers.detail.side.after": true
     "offers.detail.side.before": true
     "offers.list.after": true
@@ -134,6 +137,13 @@ declare module "@mercurjs/dashboard-sdk" {
     "topbar.before": true
   }
 
+  interface LayoutEntryRegistry {
+    "core:OfferAssociatedProductSection": true
+    "core:OfferDetailGeneralSection": true
+    "core:OfferVariantsSection": true
+    "core:ProductMediaSection": true
+  }
+
   interface NavItemRegistry {
     "campaigns": true
     "categories": true

package/dist/index.js

@@ -68,9 +68,11 @@ import { customRoutes } from "virtual:mercur/routes";
 import widgets from "virtual:mercur/widgets";
 import navigation from "virtual:mercur/navigation";
 import customFields from "virtual:mercur/custom-fields";
+import layouts from "virtual:mercur/layouts";
+import preferences from "virtual:mercur/preferences";
 import { HelmetProvider } from "react-helmet-async";
 import { QueryClientProvider } from "@tanstack/react-query";
-import { ExtensionProvider } from "@mercurjs/dashboard-shared";
+import { ExtensionProvider, resolveRouteOverrides } from "@mercurjs/dashboard-shared";
 import { I18nProvider, Toaster, TooltipProvider } from "@medusajs/ui";
 import { createBrowserRouter, RouterProvider } from "react-router-dom";
 
@@ -130,10 +132,15 @@ function mergeRoutes(baseRoutes, customRoutes2) {
     );
     if (existingIndex !== -1) {
       const { children: customChildren, ...customRest } = customRoute;
+      const baseHandle = result[existingIndex].handle;
+      const customHandle = customRest.handle;
       result[existingIndex] = {
         ...result[existingIndex],
         ...customRest,
         path: result[existingIndex].path,
+        // Merge rather than replace, so a custom route declaring only
+        // `permissions` doesn't drop the base route's `breadcrumb`.
+        handle: baseHandle || customHandle ? { ...baseHandle, ...customHandle } : void 0,
         children: customChildren ? mergeRoutes(result[existingIndex].children ?? [], customChildren) : result[existingIndex].children
       };
     } else {
@@ -703,14 +710,14 @@ function getRouteMap({
                           {
                             path: "",
                             lazy: async () => {
-                              const { OfferDetailPage } = await import("./offer-detail-page-ATLR3KNB.js");
+                              const { OfferDetailPage } = await import("./offer-detail-page-KDVITBTP.js");
                               return { Component: OfferDetailPage };
                             },
                             children: [
                               {
                                 path: "edit-price",
                                 handle: { permissions: ["offers:edit", "products:view"] },
-                                lazy: () => import("./edit-price-2FAMT7BH.js")
+                                lazy: () => import("./edit-price-QKTDC4OC.js")
                               },
                               {
                                 path: "edit-stock",
@@ -1621,10 +1628,11 @@ import { useMemo } from "react";
 import { jsx as jsx4, jsxs } from "react/jsx-runtime";
 function App() {
   const routes = useMemo(() => {
+    const resolved = resolveRouteOverrides(customRoutes);
     return {
-      settingsRoutes: createRouteMap(getRoutesByType(customRoutes, "settings")),
-      mainRoutes: createRouteMap(getRoutesByType(customRoutes, "main")),
-      publicRoutes: createRouteMap(getRoutesByType(customRoutes, "public"))
+      settingsRoutes: createRouteMap(getRoutesByType(resolved, "settings")),
+      mainRoutes: createRouteMap(getRoutesByType(resolved, "main")),
+      publicRoutes: createRouteMap(getRoutesByType(resolved, "public"))
     };
   }, []);
   return /* @__PURE__ */ jsx4(TooltipProvider, { children: /* @__PURE__ */ jsx4(HelmetProvider, { children: /* @__PURE__ */ jsx4(QueryClientProvider, { client: queryClient, children: /* @__PURE__ */ jsx4(ThemeProvider, { children: /* @__PURE__ */ jsxs(
@@ -1633,6 +1641,8 @@ function App() {
       widgets,
       navigation,
       customFields,
+      layouts,
+      preferences,
       children: [
         /* @__PURE__ */ jsx4(I18n, {}),
         /* @__PURE__ */ jsx4(I18nProvider, { children: /* @__PURE__ */ jsx4(

package/dist/{offer-detail-page-ATLR3KNB.js → offer-detail-page-KDVITBTP.js}

@@ -15,9 +15,6 @@ import {
   SidebarLink
 } from "./chunk-UST2RGWB.js";
 import "./chunk-U2EI2ZLM.js";
-import {
-  TwoColumnPage
-} from "./chunk-YV6MK4PZ.js";
 import "./chunk-FQERBIVS.js";
 import {
   _DataTable,
@@ -52,14 +49,21 @@ import "./chunk-UKLW4VDE.js";
 import "./chunk-NBMM2TZK.js";
 
 // src/pages/offers/[id]/offer-detail-page.tsx
-import { Children } from "react";
 import { useLoaderData, useParams } from "react-router-dom";
 import { Container as Container4 } from "@medusajs/ui";
+
+// ../dashboard-sdk/dist/index.js
+var CORE_LAYOUT_IDS = {
+  SINGLE_COLUMN: "core:single-column",
+  TWO_COLUMN: "core:two-column"
+};
+
+// src/pages/offers/[id]/offer-detail-page.tsx
 import {
   isForbidden,
+  LayoutComposer,
   SectionNoAccess,
-  useLinkQuery,
-  WidgetZone
+  useLinkQuery
 } from "@mercurjs/dashboard-shared";
 
 // src/pages/offers/[id]/_components/offer-detail-general-section.tsx
@@ -608,7 +612,7 @@ var OfferAssociatedProductSection = ({
 
 // src/pages/offers/[id]/offer-detail-page.tsx
 import { Fragment, jsx as jsx4, jsxs as jsxs4 } from "react/jsx-runtime";
-var Root = ({ children }) => {
+var OfferDetailPage = () => {
   const { id } = useParams();
   const initialData = useLoaderData();
   const query = useLinkQuery("offer", OFFER_PRODUCT_DETAIL_FIELDS);
@@ -625,30 +629,30 @@ var Root = ({ children }) => {
     return /* @__PURE__ */ jsx4(TwoColumnPageSkeleton, { mainSections: 3, sidebarSections: 1 });
   }
   const typed = product;
-  return /* @__PURE__ */ jsx4(Fragment, { children: Children.count(children) > 0 ? children : /* @__PURE__ */ jsxs4(TwoColumnPage, { data: typed, hasOutlet: true, children: [
-    /* @__PURE__ */ jsx4(TwoColumnPage.Main, { children: /* @__PURE__ */ jsxs4(WidgetZone, { id: "offers.detail.main", data: typed, children: [
-      /* @__PURE__ */ jsx4(OfferDetailGeneralSection, { product: typed }),
-      /* @__PURE__ */ jsx4(ProductMediaSection, { product: typed, readOnly: true }),
-      /* @__PURE__ */ jsx4(
-        OfferVariantsSection,
-        {
-          variants: typed.variants,
-          thumbnail: typed.thumbnail
-        }
-      )
-    ] }) }),
-    /* @__PURE__ */ jsx4(TwoColumnPage.Sidebar, { children: /* @__PURE__ */ jsx4(WidgetZone, { id: "offers.detail.side", data: typed, children: /* @__PURE__ */ jsx4(OfferAssociatedProductSection, { product: typed }) }) })
-  ] }) });
+  return /* @__PURE__ */ jsx4(
+    LayoutComposer,
+    {
+      widgetsZonePrefix: "offers.detail",
+      preferredLayoutId: CORE_LAYOUT_IDS.TWO_COLUMN,
+      data: typed,
+      sections: {
+        main: /* @__PURE__ */ jsxs4(Fragment, { children: [
+          /* @__PURE__ */ jsx4(LayoutComposer.Entry, { id: "OfferDetailGeneralSection", children: /* @__PURE__ */ jsx4(OfferDetailGeneralSection, { product: typed }) }),
+          /* @__PURE__ */ jsx4(LayoutComposer.Entry, { id: "ProductMediaSection", children: /* @__PURE__ */ jsx4(ProductMediaSection, { product: typed, readOnly: true }) }),
+          /* @__PURE__ */ jsx4(LayoutComposer.Entry, { id: "OfferVariantsSection", children: /* @__PURE__ */ jsx4(
+            OfferVariantsSection,
+            {
+              variants: typed.variants,
+              thumbnail: typed.thumbnail
+            }
+          ) })
+        ] }),
+        side: /* @__PURE__ */ jsx4(LayoutComposer.Entry, { id: "OfferAssociatedProductSection", children: /* @__PURE__ */ jsx4(OfferAssociatedProductSection, { product: typed }) })
+      }
+    }
+  );
 };
-var OfferDetailPage = Object.assign(Root, {
-  Main: TwoColumnPage.Main,
-  Sidebar: TwoColumnPage.Sidebar,
-  General: OfferDetailGeneralSection,
-  Media: ProductMediaSection,
-  Variants: OfferVariantsSection,
-  AssociatedProduct: OfferAssociatedProductSection
-});
-var Component2 = Root;
+var Component2 = OfferDetailPage;
 export {
   Component2 as Component,
   OfferDetailPage

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mercurjs/vendor",
-  "version": "2.3.8-canary.2",
+  "version": "2.3.8-canary.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/mercurjs/mercur",
@@ -37,8 +37,8 @@
     "lint": "oxlint --max-warnings 0"
   },
   "dependencies": {
-    "@mercurjs/dashboard-shared": "2.3.8-canary.2",
-    "@mercurjs/client": "2.3.8-canary.2",
+    "@mercurjs/dashboard-shared": "2.3.8-canary.3",
+    "@mercurjs/client": "2.3.8-canary.3",
     "@ariakit/react": "^0.4.15",
     "@babel/runtime": "^8.0.0",
     "@dnd-kit/core": "^6.1.0",
@@ -91,9 +91,9 @@
     "tsup": "^8.0.2",
     "typescript": "5.9.3",
     "@medusajs/types": "2.21.2",
-    "@mercurjs/core": "2.3.8-canary.2",
-    "@mercurjs/dashboard-sdk": "2.3.8-canary.2",
-    "@mercurjs/types": "2.3.8-canary.2",
+    "@mercurjs/core": "2.3.8-canary.3",
+    "@mercurjs/dashboard-sdk": "2.3.8-canary.3",
+    "@mercurjs/types": "2.3.8-canary.3",
     "react-router-dom": "7.18.1"
   }
 }