@websolutespa/payload-plugin-bowl 1.1.0 → 1.3.0

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @websolutespa/payload-plugin-bowl
 
+## 1.3.0
+
+### Minor Changes
+
+- c7a99a2b: Added tests
+
+### Patch Changes
+
+- dad63747: Added defaultMarket, defaultLocale
+- 11b63e3b: Fixed test config
+- c7a99a2b: Fixed collection bulk patch handler
+- Updated dependencies [dad63747]
+  - @websolutespa/bom-core@0.6.1
+
+## 1.2.0
+
+### Minor Changes
+
+- Added: MenuItem extra.
+
 ## 1.1.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -130,6 +130,7 @@ type IUndecoratedMenuBase = {
     items: IUndecoratedMenuItem[];
     markets?: string[];
     abstract?: string;
+    extra?: string;
     media?: IMedia;
 };
 type IUndecoratedMenuCategory = Omit<IUndecoratedMenuBase, 'type'> & {
@@ -178,8 +179,8 @@ declare const menuIndexGet: ((options: BowlOptions) => Endpoint);
 declare const menuDetailGet: ((options: BowlOptions) => Endpoint);
 declare function getLocales(req: PayloadRequest<any>): Promise<string[]>;
 declare function getMarkets(req: PayloadRequest<any>): Promise<string[]>;
-declare function decorateMenus(req: PayloadRequest<any>, items: IUndecoratedMenu[], market?: string, locale?: string): Promise<IMenu[]>;
-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(req: PayloadRequest<any>, item: IUndecoratedMenu, market: string, locale: string): Promise<IMenu>;
 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;
@@ -188,10 +189,10 @@ 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 decorateHref<T extends ISchema = ISchema>(req: PayloadRequest<any>, item: T, slug: string, market?: string, locale?: string): Promise<T & {
+declare function decorateHref<T extends ISchema = ISchema>(req: PayloadRequest<any>, item: T, slug: string, market: string, locale: string): Promise<T & {
     href: string | null;
 }>;
-declare function decorateHrefs<T extends ISchema = ISchema>(req: PayloadRequest<any>, items: T[], slug: string, market?: string, locale?: string): Promise<(T & {
+declare function decorateHrefs<T extends ISchema = ISchema>(req: PayloadRequest<any>, items: T[], slug: string, market: string, locale: string): Promise<(T & {
     href: string | null;
 })[]>;
 /**
@@ -344,7 +345,7 @@ type StaticCollectionConfig = {
 declare function whereCollection<T = IEntity>(items: T[], where?: {
     [key: string]: any;
 }): Promise<T[]>;
-declare function populateStaticFields<T = IEntity>(item: T, fields: Field[], locale?: string): Promise<T>;
+declare function populateStaticFields<T = IEntity>(item: T, fields: Field[], locale: string): Promise<T>;
 declare function localizeCollection<T = IEntity>(items: T[], localizedFields: string[], locale?: string): Promise<T[]>;
 declare function sortCollection<T = IEntity>(items: T[], sort?: string): Promise<T[]>;
 declare function getStaticLoader(slug: string): any;
@@ -612,9 +613,9 @@ declare function log(...rest: unknown[]): void;
 
 declare const defaultSlug: BowlSlug;
 declare const defaultGroup: BowlGroup;
-declare const defaultLocale = "en";
 declare const defaultLocales: string[];
-declare const defaultMarket = "ww";
+declare const defaultLocale: string;
+declare const defaultMarket: string;
 declare const options: BowlOptions;
 declare const internalSlugs: string[];
 

package/dist/index.js

@@ -768,6 +768,7 @@ var translations = {
       description: "Description",
       details: "Details",
       englishName: "English Name",
+      extra: "Extra",
       from: "From",
       hasCompatibleCollections: "Has Compatible Collections",
       href: "Href",
@@ -941,6 +942,7 @@ var translations = {
       description: "Descrizione",
       details: "Dettagli",
       englishName: "Nome Inglese",
+      extra: "Extra",
       from: "Da",
       hasCompatibleCollections: "Ha Collezioni Compatibili",
       href: "Href",
@@ -1037,9 +1039,9 @@ var defaultGroup = {
   i18n: "i18n",
   admin: "admin"
 };
-var defaultLocale = "en";
 var defaultLocales = ["en", "it"];
-var defaultMarket = "ww";
+var defaultLocale = process.env.DEFAULT_LOCALE || "en";
+var defaultMarket = process.env.DEFAULT_MARKET || "ww";
 var options = {
   collections: [],
   defaultLocale,
@@ -1299,34 +1301,6 @@ var collectionBulkPatch = /* @__PURE__ */ __name((slug) => ({
       console.log("collectionGet.error", error);
       res.status(500).send(error);
     }
-    try {
-      const payloadItems = req.body;
-      const { modifiedCount } = await Model.bulkWrite(
-        payloadItems.map((x) => ({
-          updateOne: {
-            filter: { _id: x.id },
-            update: {
-              category: x.category,
-              order: x.order
-            }
-            /*
-            update: {
-              $set: {
-                category: x.category,
-                order: x.order
-              }
-            },
-            */
-          }
-        }))
-      );
-      console.log("modifiedCount", modifiedCount);
-      const items = await getCollectionItems(req, slug);
-      res.status(200).send(items);
-    } catch (error) {
-      console.log("collectionGet.error", error);
-      res.status(500).send(error);
-    }
   }
 }), "collectionBulkPatch");
 var collectionUpdatePatch = /* @__PURE__ */ __name((slug) => ({
@@ -2453,7 +2427,7 @@ async function whereCollection(items, where) {
   return items;
 }
 __name(whereCollection, "whereCollection");
-async function populateStaticFields(item, fields, locale = "en") {
+async function populateStaticFields(item, fields, locale) {
   const x = { ...item };
   for (const field of fields) {
     if (field.type === "relationship" && typeof field.relationTo === "string") {
@@ -2474,7 +2448,7 @@ async function populateStaticFields(item, fields, locale = "en") {
   return x;
 }
 __name(populateStaticFields, "populateStaticFields");
-function localizeItem(item, localizedFields, locale = "en") {
+function localizeItem(item, localizedFields, locale) {
   let localizedItem = item;
   if (localizedFields.length > 0) {
     localizedItem = { ...item };
@@ -2579,7 +2553,7 @@ var withStaticCollection = /* @__PURE__ */ __name(({ src, map, duration, ...conf
           let item = collection.find((x) => x.id === id);
           if (item) {
             if (depth !== 0 && Array.isArray(collectionConfig.fields)) {
-              item = await populateStaticFields(item, collectionConfig.fields);
+              item = await populateStaticFields(item, collectionConfig.fields, locale);
             }
             item = localizeItem(item, localizedFields, getStringParam(locale));
             res.status(200).send(item);
@@ -2625,7 +2599,7 @@ var withCollection = /* @__PURE__ */ __name((config) => {
     findMany
     // boolean to denote if this hook is running against finding one, or finding many
   }) => {
-    if (doc && !findMany) {
+    if (doc && !findMany && query) {
       const { query: query2 } = req;
       if (query2) {
         const { locale } = query2;
@@ -2863,12 +2837,12 @@ async function getMarkets(req) {
   return markets.filter((x) => x.isActive).map((x) => x.id);
 }
 __name(getMarkets, "getMarkets");
-async function decorateMenus(req, items, market = "ww", locale = "en") {
+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");
-async function decorateMenu(req, item, market = "ww", locale = "en") {
+async function decorateMenu(req, item, market, locale) {
   const decoratedItem = {
     id: item.id,
     items: []
@@ -2894,7 +2868,8 @@ function decorateMenuCategory(item, categories, routes, market, depth = 0) {
     title: "",
     href: "",
     category: "",
-    items: []
+    items: [],
+    extra: item.extra
   };
   const category = typeof item.category === "string" ? categories.find((x) => x.id === item.category) : item.category;
   if (category) {
@@ -2941,7 +2916,8 @@ 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))
+    items: item.items.filter((x) => hasMarket(x, market)).map((x) => decorateMenuItem(x, categories, routes, market)),
+    extra: item.extra
   };
   return decoratedItem;
 }
@@ -2953,13 +2929,16 @@ 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))
+    items: item.items.filter((x) => hasMarket(x, market)).map((x) => decorateMenuItem(x, categories, routes, market)),
+    extra: item.extra
   };
   return decoratedItem;
 }
 __name(decorateMenuLink, "decorateMenuLink");
 function decorateMenuPage(item, categories, routes, market) {
-  const route = routes.find((x) => x.schema === item.page.relationTo && x.page === item.page.value.id);
+  const route = routes.find(
+    (x) => x.schema === item.page.relationTo && x.page === item.page.value.id
+  );
   const decoratedItem = {
     id: item.id,
     type: item.type,
@@ -2968,7 +2947,8 @@ function decorateMenuPage(item, categories, routes, market) {
     media: item.page.value.media,
     page: item.page.value.id,
     schema: item.page.relationTo,
-    items: item.items.filter((x) => hasMarket(x, market)).map((x) => decorateMenuItem(x, categories, routes, market))
+    items: item.items.filter((x) => hasMarket(x, market)).map((x) => decorateMenuItem(x, categories, routes, market)),
+    extra: item.extra
   };
   return decoratedItem;
 }
@@ -3515,7 +3495,7 @@ __name(withLocalizedDescription, "withLocalizedDescription");
 
 // src/core/api/page.service.ts
 var USE_PAGE_COLLECTION = false;
-async function decorateHref(req, item, slug, market = "ww", locale = "en") {
+async function decorateHref(req, item, slug, market, locale) {
   const route = (await getRoutes(req)).find(
     (x) => x.schema === slug && x.page === item.id && x.market === market && x.locale === locale
   );
@@ -3523,7 +3503,7 @@ async function decorateHref(req, item, slug, market = "ww", locale = "en") {
   return { ...item, href };
 }
 __name(decorateHref, "decorateHref");
-async function decorateHrefs(req, items, slug, market = "ww", locale = "en") {
+async function decorateHrefs(req, items, slug, market, locale) {
   const routes = (await getRoutes(req)).filter(
     (x) => x.schema === slug && x.market === market && x.locale === locale
   );
@@ -5185,7 +5165,6 @@ var MenuItem = /* @__PURE__ */ __name((options2, depth = 0, maxDepth = 10) => {
               {
                 type: "withText",
                 name: "customTitle",
-                label: "title",
                 localized: true,
                 admin: {
                   condition: (_, siblingData) => siblingData?.type === "category" || siblingData?.type === "page"
@@ -5202,7 +5181,13 @@ var MenuItem = /* @__PURE__ */ __name((options2, depth = 0, maxDepth = 10) => {
               // custom class
               {
                 type: "withText",
-                label: "customClass"
+                name: "customClass"
+              },
+              // extra
+              {
+                type: "withText",
+                name: "extra",
+                localized: true
               }
             ]
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@websolutespa/payload-plugin-bowl",
-  "version": "1.1.0",
+  "version": "1.3.0",
   "description": "Bowl PayloadCms plugin of the BOM Repository",
   "keywords": [
     "payload",
@@ -15,7 +15,7 @@
   },
   "scripts": {
     "lint": "eslint *.ts*",
-    "test": "jest",
+    "test": "jest --forceExit --runInBand --workerIdleMemoryLimit='1000MB'",
     "test-watch": "npm test -- --watch",
     "coverage:integration": "npm run test -- --coverage",
     "coverage": "run-s -c --silent coverage:*",
@@ -39,6 +39,7 @@
   "devDependencies": {
     "@types/escape-html": "^1.0.2",
     "@types/express": "^4.17.15",
+    "@types/uuid": "^9.0.2",
     "@types/papaparse": "^5.3.7",
     "@websolutespa/bom-cli": "*",
     "@websolutespa/test": "*",
@@ -48,6 +49,7 @@
     "eslint": "^8.46.0",
     "eslint-config-websolute": "*",
     "i18next": "^22.4.9",
+    "mongodb-memory-server": "^8.13.0",
     "react": "^18.2.0",
     "ts-node": "^10.9.1",
     "tsup": "^6.7.0",