@littlebox/strapi-suite 1.0.34 → 1.0.36

package/dist/server/index.mjs

@@ -1,4 +1,5 @@
 const PLUGIN_ID = "littlebox-strapi-suite";
+const SLUG_LANGUAGE_STRATEGY = "language";
 const config = {
   default: {
     pluginId: PLUGIN_ID,
@@ -433,19 +434,6 @@ const bootstrap = async ({ strapi: strapi2 }) => {
           type: "boolean",
           value: "false"
         },
-        {
-          module: "template",
-          property: "active",
-          type: "boolean",
-          value: "true"
-        }
-      ]
-    });
-  } catch (e) {
-  }
-  try {
-    await strapi2.db.query(config2.uuid.app.setting).createMany({
-      data: [
         {
           module: "slug",
           property: "homepageContentId",
@@ -457,6 +445,24 @@ const bootstrap = async ({ strapi: strapi2 }) => {
           property: "homepageContentModel",
           type: "string",
           value: null
+        },
+        {
+          module: "slug",
+          property: "homepageSlugStrategy",
+          type: "string",
+          value: "language"
+        },
+        {
+          module: "template",
+          property: "active",
+          type: "boolean",
+          value: "true"
+        },
+        {
+          module: "locale",
+          property: "active",
+          type: "boolean",
+          value: "true"
         }
       ]
     });
@@ -1192,6 +1198,17 @@ const TranslationModuleController = ({ strapi: strapi2 }) => ({
     return await strapi2.plugin(PLUGIN_ID).service("TranslationModuleService").getTranslations();
   }
 });
+const LocalesModuleController = ({ strapi: strapi2 }) => ({
+  async getLocales() {
+    const locales = await strapi2.plugin("i18n").service("locales").find();
+    const mappedLocales = locales.map((locale) => locale.code.toLowerCase());
+    const defaultLocale = await strapi2.plugin("i18n").service("locales").getDefaultLocale();
+    return {
+      locales: mappedLocales,
+      default: defaultLocale
+    };
+  }
+});
 const controllers = {
   SettingAppController,
   SlugModuleController,
@@ -1199,10 +1216,12 @@ const controllers = {
   TemplateModuleController,
   MenuModuleController,
   ParameterModuleController,
-  TranslationModuleController
+  TranslationModuleController,
+  LocalesModuleController
 };
 function getModuleName(url) {
   if (url.includes("/pages")) return "slug";
+  if (url.includes("/locales")) return "locale";
   if (url.includes("/parameters")) return "parameter";
   if (url.includes("/translations")) return "translation";
   if (url.includes("/menus")) return "menu";
@@ -1300,6 +1319,16 @@ const contentAPIRoutes = [
       policies: ["check-api-token"],
       auth: false
     }
+  },
+  {
+    method: "GET",
+    path: "/modules/locales",
+    handler: "LocalesModuleController.getLocales",
+    config: {
+      middlewares: [`plugin::${PLUGIN_ID}.check-module-is-active`],
+      policies: ["check-api-token"],
+      auth: false
+    }
   }
 ];
 const adminAPIRoutes = [
@@ -1652,24 +1681,42 @@ const SlugModuleService = ({ strapi: strapi2 }) => ({
     const ctx = strapi2.requestContext.get();
     const config2 = strapi2.config.get(`plugin::${PLUGIN_ID}`);
     const slug = ctx.query.slug.replace(/^\/|\/$/g, "");
+    const locales = await strapi2.plugin("i18n").service("locales").find();
+    const mappedLocales = locales.map((locale) => locale.code.toLowerCase());
     const defaultLocale = await strapi2.plugin("i18n").service("locales").getDefaultLocale();
-    const setting = await strapi2.db.query(config2.uuid.app.setting).findOne({
+    const settings = await strapi2.db.query(config2.uuid.app.setting).findMany({
       where: {
         module: "slug",
-        property: "showDefaultLanguage"
+        property: ["showDefaultLanguage", "homepageContentId", "homepageContentModel", "homepageSlugStrategy"]
       }
     });
-    const showDefaultLanguage = setting.value === "true";
-    const pages = await strapi2.db.query(config2.uuid.modules.slug).findMany({
-      where: {
-        state: "published",
-        slug: slug.split("/")
-      }
-    });
-    pages.forEach((page2) => {
-      page2.fullSlug = buildFullSlug({ pages, page: page2, defaultLocale, showDefaultLanguage });
-    });
-    const page = pages.find((page2) => page2.fullSlug === slug);
+    const showDefaultLanguage = settings.find((setting) => setting.property === "showDefaultLanguage").value === "true";
+    const homepageContentId = settings.find((setting) => setting.property === "homepageContentId").value;
+    const homepageSlugStrategy = settings.find((setting) => setting.property === "homepageSlugStrategy").value;
+    const homepageContentModel = settings.find((setting) => setting.property === "homepageContentModel").value;
+    let page;
+    if (homepageSlugStrategy === SLUG_LANGUAGE_STRATEGY && mappedLocales.includes(slug)) {
+      page = await strapi2.db.query(config2.uuid.modules.slug).findOne({
+        where: {
+          state: "published",
+          contentId: homepageContentId,
+          contentModel: homepageContentModel,
+          locale: slug
+        }
+      });
+      page.fullSlug = slug;
+    } else {
+      const pages = await strapi2.db.query(config2.uuid.modules.slug).findMany({
+        where: {
+          state: "published",
+          slug: slug.split("/")
+        }
+      });
+      pages.forEach((page2) => {
+        page2.fullSlug = buildFullSlug({ pages, page: page2, defaultLocale, showDefaultLanguage });
+      });
+      page = pages.find((page2) => page2.fullSlug === slug);
+    }
     if (!page) {
       ctx.status = 404;
       return;
@@ -1703,13 +1750,17 @@ const SlugModuleService = ({ strapi: strapi2 }) => ({
       documentId: page.contentId
     });
     for (const localization of document.localizations) {
-      localization.slug = await getSlugByDocumentId({
-        contentId: localization.documentId,
-        locale: localization.locale,
-        defaultLocale,
-        showDefaultLanguage,
-        strapi: strapi2
-      });
+      if (homepageSlugStrategy === SLUG_LANGUAGE_STRATEGY && localization.documentId === homepageContentId) {
+        localization.slug = localization.locale === defaultLocale ? "" : localization.locale.toLowerCase();
+      } else {
+        localization.slug = await getSlugByDocumentId({
+          contentId: localization.documentId,
+          locale: localization.locale,
+          defaultLocale,
+          showDefaultLanguage,
+          strapi: strapi2
+        });
+      }
     }
     delete document.createdBy;
     delete document.updatedBy;
@@ -1727,22 +1778,23 @@ const SlugModuleService = ({ strapi: strapi2 }) => ({
     const settings = await strapi2.db.query(config2.uuid.app.setting).findMany({
       where: {
         module: "slug",
-        property: ["showDefaultLanguage", "homepageContentId", "homepageContentModel"]
+        property: ["showDefaultLanguage", "homepageContentId", "homepageContentModel", "homepageSlugStrategy"]
       }
     });
     const showDefaultLanguage = settings.find((setting) => setting.property === "showDefaultLanguage").value === "true";
     const homepageContentId = settings.find((setting) => setting.property === "homepageContentId").value;
-    settings.find((setting) => setting.property === "homepageContentModel").value;
+    const homepageContentModel = settings.find((setting) => setting.property === "homepageContentModel").value;
+    const homepageSlugStrategy = settings.find((setting) => setting.property === "homepageSlugStrategy").value;
     const pages = await strapi2.db.query(config2.uuid.modules.slug).findMany({
       where: {
         state: "published"
       }
     });
     pages.forEach((page) => {
-      if (homepageContentId === page.contentId && defaultLocale === page.locale) {
+      if (homepageContentId === page.contentId && homepageContentModel === page.contentModel && defaultLocale === page.locale) {
         page.fullSlug = "";
-      } else if (homepageContentId === page.contentId && defaultLocale !== page.locale) {
-        page.fullSlug = page.locale;
+      } else if (homepageContentId === page.contentId && homepageContentModel === page.contentModel && defaultLocale !== page.locale && homepageSlugStrategy === SLUG_LANGUAGE_STRATEGY) {
+        page.fullSlug = page.locale.toLowerCase();
       } else {
         page.fullSlug = buildFullSlug({ pages, page, defaultLocale, showDefaultLanguage });
       }
@@ -1771,13 +1823,37 @@ const SlugModuleService = ({ strapi: strapi2 }) => ({
       }
     }
     const mappedPages = pages.map((page) => ({
-      id: page.contentId,
-      model: page.contentModel,
-      slug: page.fullSlug,
-      locale: page.locale,
-      ...page.attributes ? { attributes: page.attributes } : {}
+      ...page,
+      ...page.attributes ? { attributes: page.attributes } : {},
+      localizations: []
     }));
-    return mappedPages;
+    const rootItems = mappedPages.filter((item) => item.locale === defaultLocale);
+    const mappedItems = rootItems.map((rootItem) => {
+      const relatedItems = mappedPages.filter(
+        (item) => item.contentId === rootItem.contentId && item.contentModel === rootItem.contentModel && item.locale !== defaultLocale
+      );
+      return {
+        id: rootItem.id,
+        documentId: rootItem.contentId,
+        slug: rootItem.fullSlug,
+        locale: rootItem.locale,
+        createdAt: rootItem.updatedAt,
+        updatedAt: rootItem.updatedAt,
+        publishedAt: rootItem.updatedAt,
+        ...rootItem.attributes ? { attributes: rootItem.attributes } : {},
+        localizations: relatedItems.map((item) => ({
+          id: item.id,
+          documentId: item.contentId,
+          slug: item.fullSlug,
+          locale: item.locale,
+          createdAt: item.updatedAt,
+          updatedAt: item.updatedAt,
+          publishedAt: item.updatedAt,
+          ...item.attributes ? { attributes: item.attributes } : {}
+        }))
+      };
+    });
+    return mappedItems;
   },
   async getHomePage() {
     const ctx = strapi2.requestContext.get();
@@ -1786,16 +1862,19 @@ const SlugModuleService = ({ strapi: strapi2 }) => ({
     const settings = await strapi2.db.query(config2.uuid.app.setting).findMany({
       where: {
         module: "slug",
-        property: ["homepageContentId", "homepageContentModel"]
+        property: ["showDefaultLanguage", "homepageContentId", "homepageContentModel", "homepageSlugStrategy"]
       }
     });
+    const showDefaultLanguage = settings.find((setting) => setting.property === "showDefaultLanguage").value === "true";
     const homepageContentId = settings.find((setting) => setting.property === "homepageContentId").value;
     const homepageContentModel = settings.find((setting) => setting.property === "homepageContentModel").value;
+    const homepageSlugStrategy = settings.find((setting) => setting.property === "homepageSlugStrategy").value;
     const page = await strapi2.db.query(config2.uuid.modules.slug).findOne({
       where: {
         state: "published",
         contentId: homepageContentId,
-        contentModel: homepageContentModel
+        contentModel: homepageContentModel,
+        locale: defaultLocale
       }
     });
     if (!page) {
@@ -1831,11 +1910,21 @@ const SlugModuleService = ({ strapi: strapi2 }) => ({
       documentId: page.contentId
     });
     for (const localization of document.localizations) {
-      localization.slug = defaultLocale === localization.locale ? "" : localization.locale;
+      if (homepageSlugStrategy === SLUG_LANGUAGE_STRATEGY) {
+        localization.slug = localization.locale === defaultLocale ? "" : localization.locale.toLowerCase();
+      } else {
+        localization.slug = await getSlugByDocumentId({
+          contentId: localization.documentId,
+          locale: localization.locale,
+          defaultLocale,
+          showDefaultLanguage,
+          strapi: strapi2
+        });
+      }
     }
     delete document.createdBy;
     delete document.updatedBy;
-    document.slug = defaultLocale === page.locale ? "" : page.locale;
+    document.slug = "";
     return {
       document,
       ...page.attributes ? { attributes: page.attributes } : {}

package/dist/server/src/config/index.d.ts

@@ -1,5 +1,7 @@
 import { UID } from "@strapi/strapi";
 export declare const PLUGIN_ID = "littlebox-strapi-suite";
+export declare const SLUG_LANGUAGE_STRATEGY = "language";
+export declare const SLUG_CONTENT_STRATEGY = "content";
 export interface LtbConfigs {
     pluginId: string;
     uuid: {

package/dist/server/src/controllers/index.d.ts

@@ -58,5 +58,13 @@ declare const _default: {
         adminBulkDelete(): Promise<any>;
         getTranslations(): Promise<any>;
     };
+    LocalesModuleController: ({ strapi }: {
+        strapi: import("@strapi/types/dist/core").Strapi;
+    }) => {
+        getLocales(): Promise<{
+            locales: any;
+            default: any;
+        }>;
+    };
 };
 export default _default;

package/dist/server/src/controllers/modules/locales.d.ts

@@ -0,0 +1,10 @@
+import type { Core } from '@strapi/strapi';
+declare const LocalesModuleController: ({ strapi }: {
+    strapi: Core.Strapi;
+}) => {
+    getLocales(): Promise<{
+        locales: any;
+        default: any;
+    }>;
+};
+export default LocalesModuleController;

package/dist/server/src/index.d.ts

@@ -99,6 +99,14 @@ declare const _default: {
             adminBulkDelete(): Promise<any>;
             getTranslations(): Promise<any>;
         };
+        LocalesModuleController: ({ strapi }: {
+            strapi: import("@strapi/types/dist/core").Strapi;
+        }) => {
+            getLocales(): Promise<{
+                locales: any;
+                default: any;
+            }>;
+        };
     };
     routes: {
         admin: {
@@ -145,13 +153,7 @@ declare const _default: {
                 attributes?: any;
                 document: import("@strapi/types/dist/modules/documents").AnyDocument;
             }>;
-            getPages(): Promise<{
-                attributes?: any;
-                id: any;
-                model: any;
-                slug: any;
-                locale: any;
-            }[]>;
+            getPages(): Promise<any[]>;
             getHomePage(): Promise<{
                 attributes?: any;
                 document: import("@strapi/types/dist/modules/documents").AnyDocument;

package/dist/server/src/services/index.d.ts

@@ -15,13 +15,7 @@ declare const _default: {
             attributes?: any;
             document: import("@strapi/types/dist/modules/documents").AnyDocument;
         }>;
-        getPages(): Promise<{
-            attributes?: any;
-            id: any;
-            model: any;
-            slug: any;
-            locale: any;
-        }[]>;
+        getPages(): Promise<any[]>;
         getHomePage(): Promise<{
             attributes?: any;
             document: import("@strapi/types/dist/modules/documents").AnyDocument;

package/dist/server/src/services/modules/slug.d.ts

@@ -8,13 +8,7 @@ declare const SlugModuleService: ({ strapi }: {
         attributes?: any;
         document: import("@strapi/types/dist/modules/documents").AnyDocument;
     }>;
-    getPages(): Promise<{
-        attributes?: any;
-        id: any;
-        model: any;
-        slug: any;
-        locale: any;
-    }[]>;
+    getPages(): Promise<any[]>;
     getHomePage(): Promise<{
         attributes?: any;
         document: import("@strapi/types/dist/modules/documents").AnyDocument;

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.34",
+  "version": "1.0.36",
   "keywords": [
     "strapi",
     "strapi plugin",