@websolutespa/payload-plugin-bowl 1.8.1 → 1.8.2

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @websolutespa/payload-plugin-bowl
 
+## 1.8.2
+
+### Patch Changes
+
+- Modified: Media collection
+- Fixing: destructuring request query
+
 ## 1.8.1
 
 ### Patch Changes

package/dist/index.js

@@ -1446,7 +1446,7 @@ var afterStaticReadHook = /* @__PURE__ */ __name((collectionConfig) => async ({
   doc,
   req
 }) => {
-  const { query } = req;
+  const { query = {} } = req;
   const { locale, market } = query;
   const depth = query.depth ? getNumericParam(query.depth) : 1;
   const withStatic = depth > 0 && typeof locale === "string" ? await decorateStatic_(doc, collectionConfig.fields, locale, depth) : doc;
@@ -1481,7 +1481,7 @@ var staticIndexGet = /* @__PURE__ */ __name((collectionConfig) => ({
   method: "get",
   handler: async (req, res, next) => {
     try {
-      const { query } = req;
+      const { query = {} } = req;
       const { market, locale, where, sort, pagination, page, limit } = query;
       let usePagination = pagination !== "false";
       if (typeof market === "string" && typeof locale === "string" && pagination !== "true") {
@@ -1521,7 +1521,7 @@ var staticDetailGet = /* @__PURE__ */ __name((collectionConfig) => ({
     try {
       const loader = getStaticLoader(collectionConfig.slug);
       const collection = await loader();
-      const { query, params } = req;
+      const { query = {}, params = {} } = req;
       const { id } = params;
       let item = collection.find((x) => x.id === id);
       if (item) {
@@ -1710,7 +1710,7 @@ function parseDepth(depth) {
 }
 __name(parseDepth, "parseDepth");
 async function getCollectionItems(req, slug, depth) {
-  const { query, payload: payload2, user } = req;
+  const { query = {}, payload: payload2, user } = req;
   const { locale, where, sort, draft } = query;
   depth = depth !== void 0 ? depth : parseDepth(query.depth);
   query.depth = String(depth);
@@ -1733,7 +1733,7 @@ async function getCollectionItems(req, slug, depth) {
 }
 __name(getCollectionItems, "getCollectionItems");
 async function getCollectionItem(req, slug, id, depth) {
-  const { query, payload: payload2, user } = req;
+  const { query = {}, payload: payload2, user } = req;
   const { locale, draft } = query;
   depth = depth !== void 0 ? depth : parseDepth(query.depth);
   query.depth = String(depth);
@@ -1752,7 +1752,7 @@ async function getCollectionItem(req, slug, id, depth) {
 }
 __name(getCollectionItem, "getCollectionItem");
 async function getGlobalItems(req, slug, depth) {
-  const { query, payload: payload2, user } = req;
+  const { query = {}, payload: payload2, user } = req;
   const { locale, draft } = query;
   depth = depth !== void 0 ? depth : parseDepth(query.depth);
   query.depth = String(depth);
@@ -2043,7 +2043,7 @@ var afterCollectionReadHook = /* @__PURE__ */ __name((collectionConfig) => async
   doc,
   req
 }) => {
-  const { query } = req;
+  const { query = {} } = req;
   const { locale, market } = query;
   const depth = query.depth ? getNumericParam(query.depth) : 1;
   const withStatic = depth > 0 && typeof locale === "string" ? await decorateStatic_(doc, collectionConfig.fields, locale, depth) : doc;
@@ -2194,12 +2194,21 @@ var routeGet = {
   path: "/route",
   method: "get",
   handler: async (req, res, next) => {
-    const routes = await getRoutes(req);
-    if (typeof req.query.where === "object") {
-      const items = await whereCollection(routes, req.query.where);
-      res.status(200).send(items);
-    } else {
-      res.status(200).send(routes);
+    try {
+      const routes = await getRoutes(req);
+      if (typeof req.query.where === "object") {
+        const items = await whereCollection(routes, req.query.where);
+        return res.status(200).send(items);
+      } else {
+        return res.status(200).send(routes);
+      }
+    } catch (error) {
+      console.error("RouteService.routeGet.error", error);
+      return res.status(error.status || 500).json({
+        errors: [{
+          message: error.message || error.name || error.statusText || "An error occurred"
+        }]
+      });
     }
   }
 };
@@ -2425,7 +2434,7 @@ async function collectPageRedirects(req, previousItem, newItem) {
   const collectedRedirects = [];
   const isProduction = (0, import_bom_core3.getIsProduction)();
   if (isProduction) {
-    const { query, collection, payload: payload2, user } = req;
+    const { query = {}, collection, payload: payload2, user } = req;
     const { locale } = query;
     const slug = collection.config.slug;
     const previousRoutes = await getRouteByItemAndLocale(req, previousItem, locale, slug);
@@ -2468,7 +2477,7 @@ async function collectCategoryRedirects(req, previousItem, newItem) {
   const collectedRedirects = [];
   const isProduction = (0, import_bom_core3.getIsProduction)();
   if (isProduction) {
-    const { query, collection, payload: payload2, user } = req;
+    const { query = {}, collection, payload: payload2, user } = req;
     const { locale } = query;
     const slug = collection.config.slug;
     const previousRoutes = await getRouteByCategoryAndLocale(req, previousItem, locale, slug);
@@ -4078,7 +4087,12 @@ var optinGet = {
       await optin(req.params.id, req.params.slug);
       return res.status(200).send({ status: 200, message: "optin success" });
     } catch (error) {
-      return res.status(error.status).send(error);
+      console.error("ActionService.optinGet.error", error);
+      return res.status(error.status || 500).json({
+        errors: [{
+          message: error.message || error.name || error.statusText || "An error occurred"
+        }]
+      });
     }
   }
 };
@@ -4090,7 +4104,12 @@ var optoutGet = {
       await optout(req.params.id, req.params.slug);
       return res.status(200).send({ status: 200, message: "optout success" });
     } catch (error) {
-      return res.status(error.status).send(error);
+      console.error("ActionService.optoutGet.error", error);
+      return res.status(error.status || 500).json({
+        errors: [{
+          message: error.message || error.name || error.statusText || "An error occurred"
+        }]
+      });
     }
   }
 };
@@ -4106,28 +4125,37 @@ var localeGet = {
   path: "/locale",
   method: "get",
   handler: async (req, res, next) => {
-    const { url, query, params } = req;
-    const { locale, where, sort, pagination, page, limit, depth, draft } = query;
-    const loader = getStaticLoader(options.slug.language);
-    const languages = await loader();
-    let items = await getLocale(req);
-    items = items.map((item) => {
-      const language = languages.find((x) => x.id === item.id);
-      item.title = language ? language.name : null;
-      return item;
-    });
-    items = await whereCollection(items, getObjectParam(where));
-    items = await localizeCollection(items, ["title"], getStringParam(locale));
-    items = await sortCollection(items, getStringParam(sort));
-    if (pagination !== "false") {
-      const result = await getPagination(
-        items,
-        getNumericParam(page),
-        getNumericParam(limit)
-      );
-      res.status(200).send(result);
-    } else {
-      res.status(200).send(items);
+    try {
+      const { query = {} } = req;
+      const { locale, where, sort, pagination, page, limit } = query;
+      const loader = getStaticLoader(options.slug.language);
+      const languages = await loader();
+      let items = await getLocale(req);
+      items = items.map((item) => {
+        const language = languages.find((x) => x.id === item.id);
+        item.title = language ? language.name : null;
+        return item;
+      });
+      items = await whereCollection(items, getObjectParam(where));
+      items = await localizeCollection(items, ["title"], getStringParam(locale));
+      items = await sortCollection(items, getStringParam(sort));
+      if (pagination !== "false") {
+        const result = await getPagination(
+          items,
+          getNumericParam(page),
+          getNumericParam(limit)
+        );
+        return res.status(200).send(result);
+      } else {
+        return res.status(200).send(items);
+      }
+    } catch (error) {
+      console.error("RouteService.routeGet.error", error);
+      return res.status(error.status || 500).json({
+        errors: [{
+          message: error.message || error.name || error.statusText || "An error occurred"
+        }]
+      });
     }
   }
 };
@@ -4526,7 +4554,7 @@ var afterMenuReadHook = /* @__PURE__ */ __name((collectionConfig) => async ({
   req,
   context
 }) => {
-  const { query } = req;
+  const { query = {} } = req;
   const depth = query.depth ? getNumericParam(query.depth) : 1;
   const withStatic = depth > 0 && typeof query.locale === "string" ? await decorateStatic_(doc, collectionConfig.fields, query.locale, depth) : doc;
   const { market, locale, markets, locales: locales2, routes, categories } = context;
@@ -4616,7 +4644,7 @@ var afterPageReadHook = /* @__PURE__ */ __name((collectionConfig) => async ({
   req,
   context
 }) => {
-  const { query } = req;
+  const { query = {} } = req;
   const depth = query.depth ? getNumericParam(query.depth) : 1;
   const withStatic = depth > 0 && typeof query.locale === "string" ? await decorateStatic_(doc, collectionConfig.fields, query.locale, depth) : doc;
   const { market, locale, routes, categories } = context;
@@ -4640,7 +4668,7 @@ var afterPageChangeHook = /* @__PURE__ */ __name(async ({
   // name of the operation ie. 'create', 'update'
 }) => {
   if (operation === "update") {
-    const { query } = req;
+    const { query = {} } = req;
     const { draft } = query;
     if (!draft && doc.isDefault !== true && previousDoc.slug && doc.slug) {
       const redirects = await collectPageRedirects(req, previousDoc, doc);
@@ -4656,7 +4684,7 @@ var afterPageDeleteHook = /* @__PURE__ */ __name(async ({
   doc
   // deleted document
 }) => {
-  const { query } = req;
+  const { query = {} } = req;
   const { draft } = query;
   if (!draft && doc.isDefault !== true && doc.slug) {
     console.log("RedirectService.deletePage !!!");
@@ -4669,7 +4697,8 @@ var import_qs2 = __toESM(require("qs"));
 var USE_CACHE = true;
 var CACHE_2 = new InMemoryCache();
 function getStoreRequest_(req, market = "all", locale = "all") {
-  const { where: w, market: m, locale: l, ...rest } = req.query;
+  const { query = {} } = req;
+  const { where: w, market: m, locale: l, ...rest } = query;
   const subQuery = {
     market,
     locale
@@ -4684,7 +4713,7 @@ function getStoreRequest_(req, market = "all", locale = "all") {
 __name(getStoreRequest_, "getStoreRequest_");
 async function getStore_(req) {
   const key = keyWithRequest("store", req);
-  if (CACHE_2.has(key) && USE_CACHE && req.query.nocache != null) {
+  if (CACHE_2.has(key) && USE_CACHE && req.query?.nocache != null) {
     return CACHE_2.get(key);
   }
   const market = "all";
@@ -4736,9 +4765,17 @@ async function getStore_(req) {
       store[slug] = [];
     }
   }
-  const localeCollection = await fetchCollection_(req, "locale", { richText: false });
-  store.locale = localeCollection.docs;
-  const routes = await getRoutes(req);
+  try {
+    const localeCollection = await fetchCollection_(subRequest, "locale", { richText: false });
+    store.locale = localeCollection.docs;
+  } catch (error) {
+    if (error.status !== 403) {
+      throw error;
+    }
+    console.log("StoreService", "no access granted for collection 'locale'");
+    store.locale = [];
+  }
+  const routes = await getRoutes(subRequest);
   store.route = routes;
   CACHE_2.set(key, store);
   return store;
@@ -4771,7 +4808,7 @@ function getApiUrl(req) {
 }
 __name(getApiUrl, "getApiUrl");
 function getSearchUrl(req, overrideQuery) {
-  const { query } = req;
+  const { query = {} } = req;
   const params = Object.assign({
     locale: "all",
     depth: 1,
@@ -5224,7 +5261,7 @@ var afterGlobalReadHook = /* @__PURE__ */ __name((globalConfig) => async ({
   doc,
   req
 }) => {
-  const { query } = req;
+  const { query = {} } = req;
   const { locale, market } = query;
   const depth = query.depth ? getNumericParam(query.depth) : 1;
   const withStatic = depth > 0 && typeof locale === "string" ? await decorateStatic_(doc, globalConfig.fields, locale, depth) : doc;
@@ -6641,6 +6678,8 @@ var Market = /* @__PURE__ */ __name((options2) => ({
 }), "Market");
 
 // src/collections/Media.ts
+var PAYLOAD_IMAGE_MAX_WIDTH = process.env.PAYLOAD_IMAGE_MAX_WIDTH ? parseInt(process.env.PAYLOAD_IMAGE_MAX_WIDTH) : 3840;
+var PAYLOAD_IMAGE_MAX_HEIGHT = process.env.PAYLOAD_IMAGE_MAX_HEIGHT ? parseInt(process.env.PAYLOAD_IMAGE_MAX_HEIGHT) : 3840;
 var Media = /* @__PURE__ */ __name((options2) => ({
   type: "withCollection",
   slug: options2.slug.media,
@@ -6656,19 +6695,12 @@ var Media = /* @__PURE__ */ __name((options2) => ({
     delete: isRole(roles.Admin, roles.Contributor, roles.Editor)
   },
   upload: {
-    adminThumbnail: "card",
-    imageSizes: [
-      {
-        name: "card",
-        width: 640,
-        height: 480
-      },
-      {
-        name: "feature",
-        width: 1024,
-        height: 576
-      }
-    ]
+    focalPoint: true,
+    resizeOptions: {
+      withoutEnlargement: true,
+      width: PAYLOAD_IMAGE_MAX_WIDTH,
+      height: PAYLOAD_IMAGE_MAX_HEIGHT
+    }
   },
   fields: [
     // inherited fields: id, createdAt, updatedAt

package/package.json

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