@websolutespa/payload-plugin-bowl 1.7.0 → 1.7.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @websolutespa/payload-plugin-bowl
 
+## 1.7.1
+
+### Patch Changes
+
+- Fixing: MenuService & CategoryTree
+
 ## 1.7.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -118,15 +118,19 @@ declare const menuIndexGet: ((options: BowlOptions) => Endpoint);
  * Rest api menu detail get handler.
  */
 declare const menuDetailGet: ((options: BowlOptions) => Endpoint);
-
 /**
- * Rest api page collection detail get handler.
+ * Decorate record for Mixer when queried by market and locale.
  */
-declare const pageDetailGet: ((slug: string) => Endpoint);
+declare const afterMenuReadHook: (slug: string) => CollectionConfig['hooks']['afterRead'][number];
+
 /**
  * Rest api page collection get handler.
  */
 declare const pageIndexGet: ((slug: string) => Endpoint);
+/**
+ * Rest api page collection detail get handler.
+ */
+declare const pageDetailGet: ((slug: string) => Endpoint);
 /**
  * Decorate record for Mixer when queried by market and locale.
  */
@@ -160,8 +164,8 @@ declare function getRouteByCategoryAndLocale(req: PayloadRequest<any>, item: ICa
 declare const routeGet: Endpoint;
 declare const routePost: Endpoint;
 declare function routePostHandler(request: any, response: any, next: any): Promise<any>;
-declare function fetchEachMarketLocale(req: PayloadRequest<any>, callback: (market: IMarket, locale: ILocale, markets: IMarket[], locales: ILocale[]) => void): Promise<void>;
-declare function fetchPages(req: PayloadRequest<any>): Promise<IMemoryStore<ICategorized>>;
+declare function getEachMarketLocale(req: PayloadRequest<any>, callback: (market: IMarket, locale: ILocale, markets: IMarket[], locales: ILocale[]) => void): Promise<void>;
+declare function getPages(req: PayloadRequest<any>): Promise<IMemoryStore<ICategorized>>;
 
 declare function getStore(req: PayloadRequest): Promise<IMemoryStore>;
 declare function getApiUrl(req: PayloadRequest): string;
@@ -210,9 +214,10 @@ type IUndecoratedMenuBase = {
     id: IEquatable;
     type: string;
     items: IUndecoratedMenuItem[];
-    markets?: string[];
     abstract?: string;
+    customClass?: string;
     extra?: string;
+    markets?: string[];
     media?: IMedia;
 };
 type IUndecoratedMenuCategory = Omit<IUndecoratedMenuBase, 'type'> & {
@@ -255,11 +260,15 @@ type MixerContext = {
     routes?: IRoute[];
     categories?: ICategory[];
     richText?: boolean;
+    locales?: string[];
+    markets?: string[];
 };
 
 declare function getObjectParam(value: unknown): {} | undefined;
 declare function getNumericParam(value: unknown): number | undefined;
 declare function getStringParam(value: unknown): string | undefined;
+declare function getSubRequest(req: PayloadRequest): PayloadRequest;
+declare function setMixerContext(req: PayloadRequest, market: string, locale: string): Promise<MixerContext>;
 
 type WithActionProps = (Omit<CollectionConfig, 'fields'> & {
     fields: BowlField[];
@@ -398,8 +407,6 @@ declare function decorateHrefs_<T extends ISchema = ISchema>(items: T[], slug: s
 })[]>;
 
 declare const MAX_INT = 1000000000000;
-declare function getLocales(req: PayloadRequest<any>): Promise<string[]>;
-declare function getMarkets(req: PayloadRequest<any>): Promise<string[]>;
 declare function decorateMenuCategory_(item: IUndecoratedMenuCategory, categories: ICategory[], routes: IRoute[], market: string, depth?: number): IMenuItem;
 declare function decorateMenuGroup_(item: IUndecoratedMenuGroup, categories: ICategory[], routes: IRoute[], market: string): IMenuItem;
 declare function decorateMenuLink_(item: IUndecoratedMenuLink, categories: ICategory[], routes: IRoute[], market: string): IMenuItem;
@@ -407,8 +414,7 @@ declare function decorateMenuPage_(item: IUndecoratedMenuPage, categories: ICate
 declare function decorateMenuRoute_(item: IRoute): IMenuItem;
 declare function decorateMenuItem_(item: IUndecoratedMenuItem, categories: ICategory[], routes: IRoute[], market: string, depth?: number): IMenuItem;
 declare function hasMarket(item: IUndecoratedMenuItem, market: string): boolean;
-declare function decorateMenu_(req: PayloadRequest<any>, item: IUndecoratedMenu, market: string, locale: string): Promise<IMenu>;
-declare function decorateMenus_(req: PayloadRequest<any>, items: IUndecoratedMenu[], market: string, locale: string): Promise<IMenu[]>;
+declare function decorateMenu_(item: IUndecoratedMenu, context: MixerContext): Promise<IMenu>;
 
 declare function decorateNav_<T extends ISchema = ISchema>(item: T, slug: string, context: MixerContext): Promise<T>;
 declare function decorateNavs_<T extends ISchema = ISchema>(items: T[], slug: string, context: MixerContext): Promise<T[]>;
@@ -1097,4 +1103,4 @@ declare const Logo: React__default.FC;
 
 declare function webpack(sourceConfig: BowlConfig): (config: any) => any;
 
-export { ActionDefault, BlockDefaults, BowlArrayField, BowlBlock, BowlBlockField, BowlCollapsibleField, BowlCollection, BowlConfig, BowlField, BowlGlobal, BowlGroup, BowlGroupField, BowlInitOptions, BowlOptions, BowlPlugin, BowlRole, BowlRowField, BowlSlug, BowlTab, BowlTabsField, CategoryDefaults, CategoryMenu, CategoryMenuProps, CategoryTree, CategoryTreeProps, CheckboxDefaults, CollectionDefault, CollectionHelper, CollectionHook, CollectionHookName, CollectionHooks, ColorCell, ColorConfig, ColorField, ComponentsDefaults, CustomEditModal, CustomEditModalProps, DataField, DataTree, DataTreeDragItem, DataTreeItem, DataTreeItemLi, DataTreeItemProps, DataTreeProps, DataTreeProvider, DataTreeRenameItem, DateDefaults, DebugField, DecoratedList, DecoratedListProps, GlobalDefault, GlobalHelper, GlobalHook, GlobalHookName, GlobalHooks, GroupKey, IBulkAction, IBulkRecord, ICache, IImportItem, IPage, IPageFull, IPagination, IRelation, IUndecoratedMenu, IUndecoratedMenuBase, IUndecoratedMenuCategory, IUndecoratedMenuCustom, IUndecoratedMenuGroup, IUndecoratedMenuItem, IUndecoratedMenuLink, IUndecoratedMenuPage, Icon, ImportExportList, ImportExportListProps, ImportExportRedirectList, ImportLogInvalidTypes, ImportLogType, ImportMode, InMemoryCache, InMemoryCacheOptions, LeaveModal, LeaveWithoutSavingModal, LeaveWithoutSavingModalProps, LocalizedDescription, LocalizedDescriptionProps, Logo, MAX_INT, MarketDefaults, MediaDefaults, MediasDefaults, MenuItem, MixerContext, Option, OrderDefaults, PRESENTATION_FIELDS, PageDefault, PresentationField, PublicURL, Publish, RelatedDefaults, RichTextDefaults, Save, SaveDraft, SelectDefaults, StaticCollectionConfig, StaticCollectionDefault, TemplateDefaults, TextDefaults, TreeItems, UIStaticCell, UIStaticField, UserRolesDefaults, WithAbstract, WithAbstractProps, WithAction, WithActionProps, WithBlock, WithBlockProps, WithCategory, WithCategoryProps, WithCheckbox, WithCheckboxProps, WithCollection, WithCollectionProps, WithColor, WithColorProps, WithComponents, WithComponentsProps, WithDate, WithDateProps, WithDescription, WithDescriptionProps, WithGlobal, WithGlobalProps, WithId, WithIdProps, WithIsActive, WithIsActiveProps, WithIsDefault, WithIsDefaultProps, WithLink, WithLinkOptions, WithLinkProps, WithMarkets, WithMarketsProps, WithMedia, WithMediaProps, WithMedias, WithMediasProps, WithMenu, WithMenuProps, WithName, WithNameProps, WithOrder, WithOrderProps, WithPage, WithPageProps, WithRelated, WithRelatedProps, WithRichText, WithRichTextProps, WithRoles, WithRolesProps, WithSelect, WithSelectProps, WithSlug, WithSlugProps, WithStatic, WithStaticProps, WithTemplate, WithTemplateProps, WithText, WithTextProps, WithTitle, WithTitleProps, afterCategoryChangeHook, afterCategoryDeleteHook, afterPageChangeHook, afterPageDeleteHook, afterPageReadHook, appearanceOptions, beforeValidate, bowl, collectionBulkPatch, collectionExportGet, collectionImportPost, collectionIndexGet, collectionUpdatePatch, debugField, decorateCategories_, decorateCategory_, decorateHref_, decorateHrefs_, decorateMenuCategory_, decorateMenuGroup_, decorateMenuItem_, decorateMenuLink_, decorateMenuPage_, decorateMenuRoute_, decorateMenu_, decorateMenus_, decorateNav_, decorateNavs_, decorateSchema_, decorateSchemas_, deepMerge, bowl as default, defaultGroup, defaultLocale, defaultLocales, defaultMarket, defaultSlug, eachDataField, eachField, encryptData, fetchCollection, fetchCollectionItems, fetchEachMarketLocale, fetchEndpoint, fetchGlobal, fetchGlobalItems, fetchPages, formatSlug, getApiUrl, getCollectionItem, getCollectionItems, getGlobalItems, getLivePreviewURL, getLocale, getLocales, getMarkets, getNumericParam, getObjectParam, getPagination, getPreviewURL, getPublicURL, getRoute, getRouteByCategoryAndLocale, getRouteByItemAndLocale, getRoutes, getSearchUrl, getStaticLoader, getStore, getStringParam, getTranslation, getTranslations, getTreeItemClassName, hasMarket, hasRole, importExportListWithParser, internalSlugs, isAdmin, isDataField, isObject, isPresentationField, isRelation, isRole, isUndecoratedMenuItem, keyWithRequest, localeGet, localizeCollection, log, logMissingTranslations, menuDetailGet, menuIndexGet, modalSlug, optinPost, options, pageDetailGet, pageIndexGet, parseDepth, populateStaticFields, redirectParser, richTextAfterReadHook, richTextSerialize, roles, routeGet, routePost, routePostHandler, slugToLabel, slugToLabels, sortByGroup, sortCollection, storeGet, textToSlug, toBlock, toCollection, toField, toGlobal, toTab, translateBlock, translateBlocks, translateCollection, translateField, translateFields, translateGlobal, translateTab, translateTabs, webpack, whereCollection, withAbstract, withAbstractRequired, withAction, withBlock, withCategory, withCategoryRequired, withCheckbox, withCheckboxRequired, withCollection, withCollectionHook, withColor, withColorRequired, withComponents, withDate, withDateRequired, withDescription, withDescriptionRequired, withFieldHook, withGlobal, withGlobalHook, withId, withIdRequired, withIsActive, withIsActiveRequired, withIsDefault, withIsDefaultRequired, withLink, withLocalizedDescription, withMarkets, withMarketsRequired, withMedia, withMediaRequired, withMedias, withMediasRequired, withMenu, withName, withNameRequired, withOrder, withOrderRequired, withPage, withRelated, withRichText, withRichTextRequired, withRoles, withSelect, withSelectRequired, withSlug, withSlugRequired, withStaticCollection, withTemplate, withTemplateRequired, withText, withTextRequired, withTitle, withTitleRequired, withUIStatic };
+export { ActionDefault, BlockDefaults, BowlArrayField, BowlBlock, BowlBlockField, BowlCollapsibleField, BowlCollection, BowlConfig, BowlField, BowlGlobal, BowlGroup, BowlGroupField, BowlInitOptions, BowlOptions, BowlPlugin, BowlRole, BowlRowField, BowlSlug, BowlTab, BowlTabsField, CategoryDefaults, CategoryMenu, CategoryMenuProps, CategoryTree, CategoryTreeProps, CheckboxDefaults, CollectionDefault, CollectionHelper, CollectionHook, CollectionHookName, CollectionHooks, ColorCell, ColorConfig, ColorField, ComponentsDefaults, CustomEditModal, CustomEditModalProps, DataField, DataTree, DataTreeDragItem, DataTreeItem, DataTreeItemLi, DataTreeItemProps, DataTreeProps, DataTreeProvider, DataTreeRenameItem, DateDefaults, DebugField, DecoratedList, DecoratedListProps, GlobalDefault, GlobalHelper, GlobalHook, GlobalHookName, GlobalHooks, GroupKey, IBulkAction, IBulkRecord, ICache, IImportItem, IPage, IPageFull, IPagination, IRelation, IUndecoratedMenu, IUndecoratedMenuBase, IUndecoratedMenuCategory, IUndecoratedMenuCustom, IUndecoratedMenuGroup, IUndecoratedMenuItem, IUndecoratedMenuLink, IUndecoratedMenuPage, Icon, ImportExportList, ImportExportListProps, ImportExportRedirectList, ImportLogInvalidTypes, ImportLogType, ImportMode, InMemoryCache, InMemoryCacheOptions, LeaveModal, LeaveWithoutSavingModal, LeaveWithoutSavingModalProps, LocalizedDescription, LocalizedDescriptionProps, Logo, MAX_INT, MarketDefaults, MediaDefaults, MediasDefaults, MenuItem, MixerContext, Option, OrderDefaults, PRESENTATION_FIELDS, PageDefault, PresentationField, PublicURL, Publish, RelatedDefaults, RichTextDefaults, Save, SaveDraft, SelectDefaults, StaticCollectionConfig, StaticCollectionDefault, TemplateDefaults, TextDefaults, TreeItems, UIStaticCell, UIStaticField, UserRolesDefaults, WithAbstract, WithAbstractProps, WithAction, WithActionProps, WithBlock, WithBlockProps, WithCategory, WithCategoryProps, WithCheckbox, WithCheckboxProps, WithCollection, WithCollectionProps, WithColor, WithColorProps, WithComponents, WithComponentsProps, WithDate, WithDateProps, WithDescription, WithDescriptionProps, WithGlobal, WithGlobalProps, WithId, WithIdProps, WithIsActive, WithIsActiveProps, WithIsDefault, WithIsDefaultProps, WithLink, WithLinkOptions, WithLinkProps, WithMarkets, WithMarketsProps, WithMedia, WithMediaProps, WithMedias, WithMediasProps, WithMenu, WithMenuProps, WithName, WithNameProps, WithOrder, WithOrderProps, WithPage, WithPageProps, WithRelated, WithRelatedProps, WithRichText, WithRichTextProps, WithRoles, WithRolesProps, WithSelect, WithSelectProps, WithSlug, WithSlugProps, WithStatic, WithStaticProps, WithTemplate, WithTemplateProps, WithText, WithTextProps, WithTitle, WithTitleProps, afterCategoryChangeHook, afterCategoryDeleteHook, afterMenuReadHook, afterPageChangeHook, afterPageDeleteHook, afterPageReadHook, appearanceOptions, beforeValidate, bowl, collectionBulkPatch, collectionExportGet, collectionImportPost, collectionIndexGet, collectionUpdatePatch, debugField, decorateCategories_, decorateCategory_, decorateHref_, decorateHrefs_, decorateMenuCategory_, decorateMenuGroup_, decorateMenuItem_, decorateMenuLink_, decorateMenuPage_, decorateMenuRoute_, decorateMenu_, decorateNav_, decorateNavs_, decorateSchema_, decorateSchemas_, deepMerge, bowl as default, defaultGroup, defaultLocale, defaultLocales, defaultMarket, defaultSlug, eachDataField, eachField, encryptData, fetchCollection, fetchCollectionItems, fetchEndpoint, fetchGlobal, fetchGlobalItems, formatSlug, getApiUrl, getCollectionItem, getCollectionItems, getEachMarketLocale, getGlobalItems, getLivePreviewURL, getLocale, getNumericParam, getObjectParam, getPages, getPagination, getPreviewURL, getPublicURL, getRoute, getRouteByCategoryAndLocale, getRouteByItemAndLocale, getRoutes, getSearchUrl, getStaticLoader, getStore, getStringParam, getSubRequest, getTranslation, getTranslations, getTreeItemClassName, hasMarket, hasRole, importExportListWithParser, internalSlugs, isAdmin, isDataField, isObject, isPresentationField, isRelation, isRole, isUndecoratedMenuItem, keyWithRequest, localeGet, localizeCollection, log, logMissingTranslations, menuDetailGet, menuIndexGet, modalSlug, optinPost, options, pageDetailGet, pageIndexGet, parseDepth, populateStaticFields, redirectParser, richTextAfterReadHook, richTextSerialize, roles, routeGet, routePost, routePostHandler, setMixerContext, slugToLabel, slugToLabels, sortByGroup, sortCollection, storeGet, textToSlug, toBlock, toCollection, toField, toGlobal, toTab, translateBlock, translateBlocks, translateCollection, translateField, translateFields, translateGlobal, translateTab, translateTabs, webpack, whereCollection, withAbstract, withAbstractRequired, withAction, withBlock, withCategory, withCategoryRequired, withCheckbox, withCheckboxRequired, withCollection, withCollectionHook, withColor, withColorRequired, withComponents, withDate, withDateRequired, withDescription, withDescriptionRequired, withFieldHook, withGlobal, withGlobalHook, withId, withIdRequired, withIsActive, withIsActiveRequired, withIsDefault, withIsDefaultRequired, withLink, withLocalizedDescription, withMarkets, withMarketsRequired, withMedia, withMediaRequired, withMedias, withMediasRequired, withMenu, withName, withNameRequired, withOrder, withOrderRequired, withPage, withRelated, withRichText, withRichTextRequired, withRoles, withSelect, withSelectRequired, withSlug, withSlugRequired, withStaticCollection, withTemplate, withTemplateRequired, withText, withTextRequired, withTitle, withTitleRequired, withUIStatic };

package/dist/index.js

@@ -241,6 +241,7 @@ __export(src_exports, {
   UserRolesDefaults: () => UserRolesDefaults,
   afterCategoryChangeHook: () => afterCategoryChangeHook,
   afterCategoryDeleteHook: () => afterCategoryDeleteHook,
+  afterMenuReadHook: () => afterMenuReadHook,
   afterPageChangeHook: () => afterPageChangeHook,
   afterPageDeleteHook: () => afterPageDeleteHook,
   afterPageReadHook: () => afterPageReadHook,
@@ -264,7 +265,6 @@ __export(src_exports, {
   decorateMenuPage_: () => decorateMenuPage_,
   decorateMenuRoute_: () => decorateMenuRoute_,
   decorateMenu_: () => decorateMenu_,
-  decorateMenus_: () => decorateMenus_,
   decorateNav_: () => decorateNav_,
   decorateNavs_: () => decorateNavs_,
   decorateSchema_: () => decorateSchema_,
@@ -281,22 +281,20 @@ __export(src_exports, {
   encryptData: () => encryptData,
   fetchCollection: () => fetchCollection,
   fetchCollectionItems: () => fetchCollectionItems,
-  fetchEachMarketLocale: () => fetchEachMarketLocale,
   fetchEndpoint: () => fetchEndpoint,
   fetchGlobal: () => fetchGlobal,
   fetchGlobalItems: () => fetchGlobalItems,
-  fetchPages: () => fetchPages,
   formatSlug: () => formatSlug,
   getApiUrl: () => getApiUrl,
   getCollectionItem: () => getCollectionItem,
   getCollectionItems: () => getCollectionItems,
+  getEachMarketLocale: () => getEachMarketLocale,
   getGlobalItems: () => getGlobalItems,
   getLivePreviewURL: () => getLivePreviewURL,
   getLocale: () => getLocale,
-  getLocales: () => getLocales,
-  getMarkets: () => getMarkets,
   getNumericParam: () => getNumericParam,
   getObjectParam: () => getObjectParam,
+  getPages: () => getPages,
   getPagination: () => getPagination,
   getPreviewURL: () => getPreviewURL,
   getPublicURL: () => getPublicURL,
@@ -308,6 +306,7 @@ __export(src_exports, {
   getStaticLoader: () => getStaticLoader,
   getStore: () => getStore,
   getStringParam: () => getStringParam,
+  getSubRequest: () => getSubRequest,
   getTranslation: () => getTranslation4,
   getTranslations: () => getTranslations,
   getTreeItemClassName: () => getTreeItemClassName,
@@ -343,6 +342,7 @@ __export(src_exports, {
   routeGet: () => routeGet,
   routePost: () => routePost,
   routePostHandler: () => routePostHandler,
+  setMixerContext: () => setMixerContext,
   slugToLabel: () => slugToLabel,
   slugToLabels: () => slugToLabels,
   sortByGroup: () => sortByGroup,
@@ -1673,7 +1673,6 @@ function DataTree(props) {
   }), "onSetName");
   const dataProvider = new DataTreeProvider(items, onSetName);
   dataProvider.onItemsDidChange((items2) => {
-    console.log("onItemsDidChange", items2);
     if (typeof onChange === "function") {
       onChange(items2);
     }
@@ -1844,7 +1843,7 @@ var CategoryTree = /* @__PURE__ */ __name((props) => {
   const onSubmit = /* @__PURE__ */ __name(async () => {
     const changesToCategories = /* @__PURE__ */ __name((changes2) => {
       const newCategories2 = categories.map((x) => ({ ...x }));
-      const root = changes2.root;
+      const root = changes2[ROOT_ITEM];
       let order = 0;
       const parseChildren = /* @__PURE__ */ __name((parent) => {
         const parentIndex = parent.index;
@@ -3134,6 +3133,33 @@ function getStringParam(value) {
   return void 0;
 }
 __name(getStringParam, "getStringParam");
+function getSubRequest(req) {
+  const { transactionID, payload, user } = req;
+  const { where, ...rest } = req.query;
+  const subRequest = {
+    user,
+    transactionID,
+    query: {
+      ...rest
+    },
+    payload
+  };
+  return subRequest;
+}
+__name(getSubRequest, "getSubRequest");
+async function setMixerContext(req, market, locale) {
+  const subRequest = getSubRequest(req);
+  const localeItems = await getGlobalItems(subRequest, options.slug.locale, 0);
+  const locales2 = localeItems.filter((x) => x.isActive).map((x) => x.id);
+  const marketItems = await getCollectionItems(req, options.slug.market, 0);
+  const markets = marketItems.filter((x) => x.isActive).map((x) => x.id);
+  const routes = await getRoutes(subRequest);
+  const categories = await getCollectionItems(subRequest, options.slug.category);
+  const richText = req.query?.richText === "true";
+  const context = Object.assign(req.context, { market, locale, markets, locales: locales2, routes, categories, richText });
+  return context;
+}
+__name(setMixerContext, "setMixerContext");
 
 // src/core/collections/withStaticCollection.ts
 var import_axios = __toESM(require("axios"));
@@ -3593,16 +3619,6 @@ __name(decorateHrefs_, "decorateHrefs_");
 
 // src/core/decorators/menu.ts
 var MAX_INT = 1e12;
-async function getLocales(req) {
-  const locales2 = await getGlobalItems(req, options.slug.locale, 0);
-  return locales2.filter((x) => x.isActive).map((x) => x.id);
-}
-__name(getLocales, "getLocales");
-async function getMarkets(req) {
-  const markets = await getCollectionItems(req, options.slug.market, 0);
-  return markets.filter((x) => x.isActive).map((x) => x.id);
-}
-__name(getMarkets, "getMarkets");
 function decorateMenuCategory_(item, categories, routes, market, depth = 0) {
   const decoratedItem = {
     id: item.id,
@@ -3610,8 +3626,11 @@ function decorateMenuCategory_(item, categories, routes, market, depth = 0) {
     title: "",
     href: "",
     category: "",
-    items: [],
-    extra: item.extra
+    media: item.media,
+    abstract: item.abstract,
+    customClass: item.customClass,
+    extra: item.extra,
+    items: []
   };
   const category = typeof item.category === "string" ? categories.find((x) => x.id === item.category) : item.category;
   if (category) {
@@ -3658,8 +3677,11 @@ function decorateMenuGroup_(item, categories, routes, market) {
     id: item.id,
     type: item.type,
     title: item.title,
-    items: item.items.filter((x) => hasMarket(x, market)).map((x) => decorateMenuItem_(x, categories, routes, market)),
-    extra: item.extra
+    media: item.media,
+    abstract: item.abstract,
+    customClass: item.customClass,
+    extra: item.extra,
+    items: item.items.filter((x) => hasMarket(x, market)).map((x) => decorateMenuItem_(x, categories, routes, market))
   };
   return decoratedItem;
 }
@@ -3671,8 +3693,11 @@ function decorateMenuLink_(item, categories, routes, market) {
     title: item.title,
     href: item.href,
     target: item.target,
-    items: item.items.filter((x) => hasMarket(x, market)).map((x) => decorateMenuItem_(x, categories, routes, market)),
-    extra: item.extra
+    media: item.media,
+    abstract: item.abstract,
+    customClass: item.customClass,
+    extra: item.extra,
+    items: item.items.filter((x) => hasMarket(x, market)).map((x) => decorateMenuItem_(x, categories, routes, market))
   };
   return decoratedItem;
 }
@@ -3686,16 +3711,19 @@ function decorateMenuPage_(item, categories, routes, market) {
     href = route?.id;
   }
   const schema = item.schema || item.page.relationTo;
+  const page = item.page.value;
   const decoratedItem = {
     id: item.id,
     type: item.type,
-    title: item.customTitle || item.page.value.title,
+    title: item.customTitle || page.title,
     href,
-    media: item.page.value.media,
-    page: item.page.value.id,
+    page: page.id,
     schema,
-    items: item.items.filter((x) => hasMarket(x, market)).map((x) => decorateMenuItem_(x, categories, routes, market)),
-    extra: item.extra
+    media: item.media || page.media,
+    abstract: item.abstract,
+    customClass: item.customClass,
+    extra: item.extra,
+    items: item.items.filter((x) => hasMarket(x, market)).map((x) => decorateMenuItem_(x, categories, routes, market))
   };
   return decoratedItem;
 }
@@ -3736,30 +3764,22 @@ function hasMarket(item, market) {
   return Array.isArray(item.markets) ? item.markets.includes(market) : true;
 }
 __name(hasMarket, "hasMarket");
-async function decorateMenu_(req, item, market, locale) {
+async function decorateMenu_(item, context) {
   const decoratedItem = {
     id: item.id,
     items: []
   };
-  const languages = await getLocales(req);
-  if (!languages.includes(locale)) {
+  const { market, locale, markets, locales: locales2, routes, categories } = context;
+  if (!locales2.includes(locale)) {
     return decoratedItem;
   }
-  const markets = await getMarkets(req);
   if (!markets.includes(market)) {
     return decoratedItem;
   }
-  const categories = await getCollectionItems(req, options.slug.category);
-  const routes = (await getRoutes(req)).filter((x) => x.market === market && x.locale === locale);
   decoratedItem.items = item.items.filter((x) => hasMarket(x, market)).map((x) => decorateMenuItem_(x, categories, routes, market));
   return decoratedItem;
 }
 __name(decorateMenu_, "decorateMenu_");
-async function decorateMenus_(req, items, market, locale) {
-  const promises = items.map((x) => decorateMenu_(req, x, market, locale));
-  return await Promise.all(promises);
-}
-__name(decorateMenus_, "decorateMenus_");
 
 // src/core/decorators/nav.ts
 var import_bom_core4 = require("@websolutespa/bom-core");
@@ -3830,14 +3850,13 @@ var menuIndexGet = /* @__PURE__ */ __name((options2) => ({
     if (!(typeof market === "string" && typeof locale === "string")) {
       return next();
     }
+    const context = await setMixerContext(req, market, locale);
     try {
-      let items = await getCollectionItems(req, options2.slug.menu);
+      const items = await getCollectionItems(req, options2.slug.menu);
       if (pagination === "true") {
         const response = await getPagination(items, getNumericParam(page), getNumericParam(limit));
-        response.docs = await decorateMenus_(req, response.docs, market, locale);
         res.status(200).send(response);
       } else {
-        items = await decorateMenus_(req, items, market, locale);
         res.status(200).send(items);
       }
     } catch (error) {
@@ -3858,17 +3877,32 @@ var menuDetailGet = /* @__PURE__ */ __name((options2) => ({
     if (!(typeof market === "string" && typeof locale === "string")) {
       return next();
     }
+    const context = await setMixerContext(req, market, locale);
     try {
       const { id } = req.params;
       const item = await getCollectionItem(req, options2.slug.menu, id);
-      const decoratedItem = await decorateMenu_(req, item, market, locale);
-      res.status(200).send(decoratedItem);
+      res.status(200).send(item);
     } catch (error) {
       console.log("menuDetailGet.error", error);
       res.status(500).send(error);
     }
   }
 }), "menuDetailGet");
+var afterMenuReadHook = /* @__PURE__ */ __name((slug) => async ({
+  doc,
+  req,
+  query,
+  findMany,
+  context
+}) => {
+  const { market, locale, markets, locales: locales2, routes, categories } = context;
+  if (!market || !locale || !markets || !locales2 || !routes || !categories) {
+    return doc;
+  }
+  const withSchema = await decorateSchema_(doc, slug, context);
+  const withMenu2 = await decorateMenu_(withSchema, context);
+  return withMenu2;
+}, "afterMenuReadHook");
 
 // src/core/collections/withMenu.ts
 var withMenu = /* @__PURE__ */ __name((config) => {
@@ -3899,54 +3933,12 @@ var withMenu = /* @__PURE__ */ __name((config) => {
     menuIndexGet(options),
     menuDetailGet(options)
   ];
+  withCollectionHook(menuConfig, "afterRead", afterMenuReadHook(config.slug));
   translateCollection(menuConfig);
   return menuConfig;
 }, "withMenu");
 
 // src/core/api/page.service.ts
-function getSubRequest(req) {
-  const { transactionID, payload, user } = req;
-  const { where, ...rest } = req.query;
-  const subRequest = {
-    user,
-    transactionID,
-    query: {
-      ...rest
-    },
-    payload
-  };
-  return subRequest;
-}
-__name(getSubRequest, "getSubRequest");
-async function setMixerContext(req, market, locale) {
-  const subRequest = getSubRequest(req);
-  const routes = await getRoutes(subRequest);
-  const categories = await getCollectionItems(subRequest, options.slug.category);
-  const richText = req.query?.richText === "true";
-  Object.assign(req.context, { market, locale, routes, categories, richText });
-}
-__name(setMixerContext, "setMixerContext");
-var pageDetailGet = /* @__PURE__ */ __name((slug) => ({
-  path: "/:id/",
-  method: "get",
-  handler: async (req, res, next) => {
-    try {
-      const { query } = req;
-      if (!query) {
-        return next();
-      }
-      const { market, locale } = query;
-      if (!(typeof market === "string" && typeof locale === "string")) {
-        return next();
-      }
-      await setMixerContext(req, market, locale);
-      return next();
-    } catch (error) {
-      console.log("pageDetailGet.error", error);
-      res.status(500).send(error);
-    }
-  }
-}), "pageDetailGet");
 var pageIndexGet = /* @__PURE__ */ __name((slug) => ({
   path: "/",
   method: "get",
@@ -3960,7 +3952,7 @@ var pageIndexGet = /* @__PURE__ */ __name((slug) => ({
       if (!(typeof market === "string" && typeof locale === "string")) {
         return next();
       }
-      await setMixerContext(req, market, locale);
+      const context = await setMixerContext(req, market, locale);
       if (limit === "10000") {
         return next();
       }
@@ -3976,6 +3968,27 @@ var pageIndexGet = /* @__PURE__ */ __name((slug) => ({
     }
   }
 }), "pageIndexGet");
+var pageDetailGet = /* @__PURE__ */ __name((slug) => ({
+  path: "/:id/",
+  method: "get",
+  handler: async (req, res, next) => {
+    try {
+      const { query } = req;
+      if (!query) {
+        return next();
+      }
+      const { market, locale } = query;
+      if (!(typeof market === "string" && typeof locale === "string")) {
+        return next();
+      }
+      const context = await setMixerContext(req, market, locale);
+      return next();
+    } catch (error) {
+      console.log("pageDetailGet.error", error);
+      res.status(500).send(error);
+    }
+  }
+}), "pageDetailGet");
 var afterPageReadHook = /* @__PURE__ */ __name((slug) => async ({
   doc,
   req,
@@ -4048,7 +4061,7 @@ var richTextAfterReadHook = /* @__PURE__ */ __name((args) => {
     return richTextSerialize(value);
   }
   const { market, locale, richText } = req.context;
-  if (!market || !locale || richText) {
+  if (!(typeof market === "string" && typeof locale === "string") || richText === true) {
     return value;
   }
   return richTextSerialize(value);
@@ -4779,7 +4792,7 @@ async function getRoutes(req) {
   locales2 = locales2 ? locales2.filter((x) => x.isActive) : [];
   if (locales2.length > 0 && markets.length > 0) {
     const categories = await getCollectionItems(subRequest, options.slug.category, 1);
-    const store = await fetchPages(subRequest);
+    const store = await getPages(subRequest);
     routes = (0, import_bom_core5.collectRoutes)(store, categories, markets, locales2);
   }
   CACHE_2.set(key, routes);
@@ -4800,7 +4813,7 @@ async function getRouteByItemAndLocale(req, item, localeId, slug) {
   if (!item.isDefault) {
     slugs.push({ slug: item.slug });
   }
-  await fetchEachMarketLocale(req, (market, locale, markets, locales2) => {
+  await getEachMarketLocale(req, (market, locale, markets, locales2) => {
     if ((!item.markets || item.markets.includes(market.id)) && locale.id === localeId) {
       const title = (0, import_bom_core5.localize)(item.title, locale.id);
       const id = (0, import_bom_core5.getRouteHref)(slugs, market, locale, markets, locales2);
@@ -4828,7 +4841,7 @@ async function getRouteByCategoryAndLocale(req, item, localeId, slug) {
   const routes = [];
   const categories = await getCollectionItems(req, options.slug.category, 1);
   const segments = (0, import_bom_core5.getCategorySegmentsByCategory)(item, categories);
-  await fetchEachMarketLocale(req, (market, locale, markets, locales2) => {
+  await getEachMarketLocale(req, (market, locale, markets, locales2) => {
     if (locale.id === localeId) {
       const title = (0, import_bom_core5.localize)(item.title, locale.id);
       const id = (0, import_bom_core5.getRouteHref)(segments, market, locale, markets, locales2);
@@ -4958,15 +4971,15 @@ async function routePostHandler(request, response, next) {
   }
 }
 __name(routePostHandler, "routePostHandler");
-async function fetchEachMarketLocale(req, callback) {
+async function getEachMarketLocale(req, callback) {
   let markets = await getCollectionItems(req, options.slug.market, 0);
   markets = markets ? markets.filter((x) => x.isActive) : [];
   let locales2 = await getGlobalItems(req, options.slug.locale, 0);
   locales2 = locales2 ? locales2.filter((x) => x.isActive) : [];
   return (0, import_bom_core5.eachMarketLocale)(markets, locales2, callback);
 }
-__name(fetchEachMarketLocale, "fetchEachMarketLocale");
-async function fetchPages(req) {
+__name(getEachMarketLocale, "getEachMarketLocale");
+async function getPages(req) {
   const store = {};
   const keys = options.pages;
   for (const key of keys) {
@@ -4975,7 +4988,7 @@ async function fetchPages(req) {
   }
   return store;
 }
-__name(fetchPages, "fetchPages");
+__name(getPages, "getPages");
 
 // src/core/api/redirect.service.ts
 async function collectPageRedirects(req, previousItem, newItem) {
@@ -6873,6 +6886,7 @@ var src_default = bowl;
   UserRolesDefaults,
   afterCategoryChangeHook,
   afterCategoryDeleteHook,
+  afterMenuReadHook,
   afterPageChangeHook,
   afterPageDeleteHook,
   afterPageReadHook,
@@ -6896,7 +6910,6 @@ var src_default = bowl;
   decorateMenuPage_,
   decorateMenuRoute_,
   decorateMenu_,
-  decorateMenus_,
   decorateNav_,
   decorateNavs_,
   decorateSchema_,
@@ -6912,22 +6925,20 @@ var src_default = bowl;
   encryptData,
   fetchCollection,
   fetchCollectionItems,
-  fetchEachMarketLocale,
   fetchEndpoint,
   fetchGlobal,
   fetchGlobalItems,
-  fetchPages,
   formatSlug,
   getApiUrl,
   getCollectionItem,
   getCollectionItems,
+  getEachMarketLocale,
   getGlobalItems,
   getLivePreviewURL,
   getLocale,
-  getLocales,
-  getMarkets,
   getNumericParam,
   getObjectParam,
+  getPages,
   getPagination,
   getPreviewURL,
   getPublicURL,
@@ -6939,6 +6950,7 @@ var src_default = bowl;
   getStaticLoader,
   getStore,
   getStringParam,
+  getSubRequest,
   getTranslation,
   getTranslations,
   getTreeItemClassName,
@@ -6974,6 +6986,7 @@ var src_default = bowl;
   routeGet,
   routePost,
   routePostHandler,
+  setMixerContext,
   slugToLabel,
   slugToLabels,
   sortByGroup,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@websolutespa/payload-plugin-bowl",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "description": "Bowl PayloadCms plugin of the BOM Repository",
   "keywords": [
     "payload",