strapi-plugin-navigation 2.2.1 → 2.3.0-beta.0

package/server/content-types/index.d.ts

@@ -67,6 +67,7 @@ declare const _default: {
                     relation: string;
                     target: string;
                     configurable: boolean;
+                    mappedBy: string;
                 };
                 localizations: {
                     type: string;
@@ -167,6 +168,7 @@ declare const _default: {
                     relation: string;
                     target: string;
                     configurable: boolean;
+                    inversedBy: string;
                 };
                 audience: {
                     type: string;

package/server/content-types/navigation/index.d.ts

@@ -41,6 +41,7 @@ declare const _default: {
                 relation: string;
                 target: string;
                 configurable: boolean;
+                mappedBy: string;
             };
             localizations: {
                 type: string;

package/server/content-types/navigation/schema.d.ts

@@ -40,6 +40,7 @@ declare const _default: {
             relation: string;
             target: string;
             configurable: boolean;
+            mappedBy: string;
         };
         localizations: {
             type: string;

package/server/content-types/navigation/schema.js

@@ -41,7 +41,8 @@ exports.default = {
             type: "relation",
             relation: "oneToMany",
             target: "plugin::navigation.navigation-item",
-            configurable: false
+            configurable: false,
+            mappedBy: "master"
         },
         localizations: {
             type: "relation",

package/server/content-types/navigation-item/index.d.ts

@@ -86,6 +86,7 @@ declare const _default: {
                 relation: string;
                 target: string;
                 configurable: boolean;
+                inversedBy: string;
             };
             audience: {
                 type: string;

package/server/content-types/navigation-item/schema.d.ts

@@ -85,6 +85,7 @@ declare const _default: {
             relation: string;
             target: string;
             configurable: boolean;
+            inversedBy: string;
         };
         audience: {
             type: string;

package/server/content-types/navigation-item/schema.js

@@ -90,7 +90,8 @@ exports.default = {
             type: "relation",
             relation: "manyToOne",
             target: "plugin::navigation.navigation",
-            configurable: false
+            configurable: false,
+            inversedBy: "items",
         },
         audience: {
             type: "relation",

package/server/controllers/admin.js

@@ -121,6 +121,19 @@ const adminControllers = {
             throw error;
         }
     },
+    getSlug(ctx) {
+        const { query: { q } } = ctx;
+        try {
+            (0, types_1.assertNotEmpty)(q);
+            return this.getService("common").getSlug(q).then((slug) => ({ slug }));
+        }
+        catch (error) {
+            if (error instanceof Error) {
+                return ctx.badRequest(error.message);
+            }
+            throw error;
+        }
+    },
 };
 const assertCopyParams = (source, target) => {
     (0, types_1.assertIsNumber)(source, new InvalidParamNavigationError_1.InvalidParamNavigationError("Source's id is not a number"));

package/server/index.d.ts

@@ -70,6 +70,7 @@ declare const _default: {
                         relation: string;
                         target: string;
                         configurable: boolean;
+                        mappedBy: string;
                     };
                     localizations: {
                         type: string;
@@ -170,6 +171,7 @@ declare const _default: {
                         relation: string;
                         target: string;
                         configurable: boolean;
+                        inversedBy: string;
                     };
                     audience: {
                         type: string;

package/server/routes/admin.js

@@ -28,6 +28,16 @@ const routes = {
             path: '/config',
             handler: 'admin.restoreConfig',
         },
+        {
+            method: 'GET',
+            path: '/slug',
+            handler: 'admin.getSlug',
+            config: {
+                policies: [
+                    'admin::isAuthenticatedAdmin'
+                ]
+            }
+        },
         {
             method: 'GET',
             path: '/:id',

package/server/services/admin.js

@@ -1,10 +1,6 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("@strapi/utils");
-const slugify_1 = __importDefault(require("@sindresorhus/slugify"));
 const lodash_1 = require("lodash");
 const utils_2 = require("../utils");
 const i18n_1 = require("../i18n");
@@ -16,11 +12,11 @@ const adminService = ({ strapi }) => ({
         const pluginStore = await commonService.getPluginStore();
         const config = await pluginStore.get({ key: 'config' });
         const additionalFields = config.additionalFields;
+        const cascadeMenuAttached = config.cascadeMenuAttached;
         const contentTypesNameFields = config.contentTypesNameFields;
         const contentTypesPopulate = config.contentTypesPopulate;
         const pathDefaultFields = config.pathDefaultFields;
         const allowedLevels = config.allowedLevels;
-        const slugify = config.slugify;
         const isGQLPluginEnabled = !(0, lodash_1.isNil)(strapi.plugin('graphql'));
         let extendedResult = {
             allowedContentTypes: utils_2.ALLOWED_CONTENT_TYPES,
@@ -43,7 +39,7 @@ const adminService = ({ strapi }) => ({
                 navigationItemRelated: configContentTypes.map(({ labelSingular }) => labelSingular.replace(/\s+/g, ''))
             },
             isGQLPluginEnabled: viaSettingsPage ? isGQLPluginEnabled : undefined,
-            slugify,
+            cascadeMenuAttached,
         };
         const i18nConfig = await (0, i18n_1.addI18NConfigFields)({ strapi, viaSettingsPage, previousConfig: {} });
         if (additionalFields.includes('audience')) {
@@ -99,12 +95,11 @@ const adminService = ({ strapi }) => ({
         const commonService = (0, utils_2.getPluginService)('common');
         const adminService = (0, utils_2.getPluginService)('admin');
         const { enabled: i18nEnabled, defaultLocale } = await (0, i18n_1.getI18nStatus)({ strapi });
-        const { slugify: customSlugifyConfig } = await adminService.config(false);
         const { masterModel } = (0, utils_2.getPluginModels)();
         const { name, visible } = payload;
         const data = {
             name,
-            slug: (0, slugify_1.default)(name, customSlugifyConfig).toLowerCase(),
+            slug: await commonService.getSlug(name),
             visible,
         };
         const existingEntity = await strapi
@@ -127,14 +122,13 @@ const adminService = ({ strapi }) => ({
         const adminService = (0, utils_2.getPluginService)('admin');
         const commonService = (0, utils_2.getPluginService)('common');
         const { enabled: i18nEnabled } = await (0, i18n_1.getI18nStatus)({ strapi });
-        const { slugify: customSlugifyConfig } = await adminService.config(false);
         const { masterModel } = (0, utils_2.getPluginModels)();
         const { name, visible } = payload;
         const existingEntity = await adminService.getById(id);
         const detailsHaveChanged = existingEntity.name !== name || existingEntity.visible !== visible;
         if (detailsHaveChanged) {
             const newName = detailsHaveChanged ? name : existingEntity.name;
-            const newSlug = detailsHaveChanged ? (0, slugify_1.default)(name, customSlugifyConfig).toLowerCase() : existingEntity.slug;
+            const newSlug = detailsHaveChanged ? await commonService.getSlug(name) : existingEntity.slug;
             await strapi.query(masterModel.uid).update({
                 where: { id },
                 data: {

package/server/services/client.js

@@ -1,10 +1,6 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const lodash_1 = require("lodash");
-const slugify_1 = __importDefault(require("@sindresorhus/slugify"));
 const uuid_1 = require("uuid");
 const types_1 = require("../../types");
 const utils_1 = require("../utils");
@@ -144,8 +140,8 @@ const clientService = ({ strapi }) => ({
             ...enabledCustomFieldsNames.reduce((acc, field) => ({ ...acc, [field]: (0, lodash_1.get)(item, field) }), {})
         };
     },
-    renderTree(items = [], id = null, field = 'parent', path = '', itemParser = (i) => i) {
-        return items
+    async renderTree(items = [], id = null, field = 'parent', path = '', itemParser = (i) => i) {
+        return (await Promise.all(items
             .filter((item) => {
             if (item[field] === null && id === null) {
                 return true;
@@ -160,9 +156,9 @@ const clientService = ({ strapi }) => ({
             return (data && data === id);
         })
             .filter(utils_1.filterOutUnpublished)
-            .map(item => itemParser({
+            .map(async (item) => itemParser({
             ...item,
-        }, path, field))
+        }, path, field))))
             .sort((x, y) => {
             if (x.order !== undefined && y.order !== undefined)
                 return x.order - y.order;
@@ -204,7 +200,7 @@ const clientService = ({ strapi }) => ({
                 return [];
             }
             const items = await commonService.getRelatedItems(entities, populate);
-            const { contentTypes, contentTypesNameFields, additionalFields, slugify: customSlugifyConfig } = await adminService.config(false);
+            const { contentTypes, contentTypesNameFields, additionalFields } = await adminService.config(false);
             const enabledCustomFieldsNames = (0, utils_1.getCustomFields)(additionalFields)
                 .reduce((acc, curr) => curr.enabled ? [...acc, curr.name] : acc, []);
             const wrapContentType = (itemContentType) => wrapRelated && itemContentType ? {
@@ -215,12 +211,12 @@ const clientService = ({ strapi }) => ({
                 case utils_1.RENDER_TYPES.TREE:
                 case utils_1.RENDER_TYPES.RFR:
                     const getTemplateName = await (0, utils_1.templateNameFactory)(items, strapi, contentTypes);
-                    const itemParser = (item, path = '', field) => {
+                    const itemParser = async (item, path = '', field) => {
                         const isExternal = item.type === "EXTERNAL";
                         const parentPath = isExternal ? undefined : `${path === '/' ? '' : path}/${(0, lodash_1.first)(item.path) === '/'
                             ? item.path.substring(1)
                             : item.path}`;
-                        const slug = (0, lodash_1.isString)(parentPath) ? (0, slugify_1.default)(((0, lodash_1.first)(parentPath) === '/' ? parentPath.substring(1) : parentPath).replace(/\//g, '-'), customSlugifyConfig) : undefined;
+                        const slug = (0, lodash_1.isString)(parentPath) ? await commonService.getSlug(((0, lodash_1.first)(parentPath) === '/' ? parentPath.substring(1) : parentPath).replace(/\//g, '-')) : undefined;
                         const lastRelated = (0, lodash_1.isArray)(item.related) ? (0, lodash_1.last)(item.related) : item.related;
                         const relatedContentType = wrapContentType(lastRelated);
                         return {
@@ -231,19 +227,19 @@ const clientService = ({ strapi }) => ({
                             path: isExternal ? item.externalPath : parentPath,
                             type: item.type,
                             uiRouterKey: item.uiRouterKey,
-                            slug: !slug && item.uiRouterKey ? (0, slugify_1.default)(item.uiRouterKey, customSlugifyConfig) : slug,
+                            slug: !slug && item.uiRouterKey ? commonService.getSlug(item.uiRouterKey) : slug,
                             external: isExternal,
                             related: isExternal || !lastRelated ? undefined : {
                                 ...relatedContentType,
                                 __templateName: getTemplateName((lastRelated.relatedType || lastRelated.__contentType), lastRelated.id),
                             },
                             audience: !(0, lodash_1.isEmpty)(item.audience) ? item.audience.map(({ key }) => key) : undefined,
-                            items: isExternal ? undefined : clientService.renderTree(items, item.id, field, parentPath, itemParser),
+                            items: isExternal ? undefined : await clientService.renderTree(items, item.id, field, parentPath, itemParser),
                             ...enabledCustomFieldsNames.reduce((acc, field) => ({ ...acc, [field]: (0, lodash_1.get)(item, `additionalFields.${field}`) }), {}),
                         };
                     };
                     const { items: itemsFilteredByPath, root: rootElement, } = (0, utils_1.filterByPath)(items, rootPath);
-                    const treeStructure = clientService.renderTree((0, lodash_1.isNil)(rootPath) ? items : itemsFilteredByPath, (0, lodash_1.get)(rootElement, 'parent.id'), 'parent', (0, lodash_1.get)(rootElement, 'parent.path'), itemParser);
+                    const treeStructure = await clientService.renderTree((0, lodash_1.isNil)(rootPath) ? items : itemsFilteredByPath, (0, lodash_1.get)(rootElement, 'parent.id'), 'parent', (0, lodash_1.get)(rootElement, 'parent.path'), itemParser);
                     const filteredStructure = filter
                         ? treeStructure.filter((item) => item.uiRouterKey === filter)
                         : treeStructure;

package/server/services/common.js

@@ -9,6 +9,7 @@ const utils_1 = require("@strapi/utils");
 const config_1 = require("../config");
 const i18n_1 = require("../i18n");
 const utils_2 = require("../utils");
+const slugify_1 = __importDefault(require("@sindresorhus/slugify"));
 const commonService = ({ strapi }) => ({
     analyzeBranch(items = [], masterEntity = null, parentItem = null, prevOperations = {}) {
         const commonService = (0, utils_2.getPluginService)('common');
@@ -326,7 +327,32 @@ const commonService = ({ strapi }) => ({
             where: { id: item.id },
             data: { additionalFields: item.additionalFields },
         })));
-    }
+    },
+    async getSlug(query) {
+        let slug = (0, slugify_1.default)(query);
+        if (slug) {
+            const { itemModel } = (0, utils_2.getPluginModels)();
+            const existingItems = await strapi
+                .query(itemModel.uid)
+                .count({
+                where: {
+                    $or: [
+                        {
+                            uiRouterKey: {
+                                $startsWith: slug
+                            }
+                        },
+                        { uiRouterKey: slug }
+                    ]
+                },
+                limit: Number.MAX_SAFE_INTEGER,
+            });
+            if (existingItems) {
+                slug = `${slug}-${existingItems}`;
+            }
+        }
+        return slug.toLowerCase();
+    },
 });
 exports.default = commonService;
 //# sourceMappingURL=common.js.map

package/strapi-server.d.ts

@@ -70,6 +70,7 @@ declare const _default: () => {
                         relation: string;
                         target: string;
                         configurable: boolean;
+                        mappedBy: string;
                     };
                     localizations: {
                         type: string;
@@ -170,6 +171,7 @@ declare const _default: () => {
                         relation: string;
                         target: string;
                         configurable: boolean;
+                        inversedBy: string;
                     };
                     audience: {
                         type: string;