strapi-plugin-navigation 2.2.14 → 2.2.16

package/server/services/admin.js

@@ -5,19 +5,21 @@ const lodash_1 = require("lodash");
 const utils_2 = require("../utils");
 const i18n_1 = require("../i18n");
 const NavigationError_1 = require("../../utils/NavigationError");
-const adminService = ({ strapi }) => ({
+const adminService = ({ strapi, }) => ({
     async config(viaSettingsPage = false) {
-        const commonService = (0, utils_2.getPluginService)('common');
+        const commonService = (0, utils_2.getPluginService)("common");
         const { audienceModel } = (0, utils_2.getPluginModels)();
         const pluginStore = await commonService.getPluginStore();
-        const config = await pluginStore.get({ key: 'config' });
+        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 isGQLPluginEnabled = !(0, lodash_1.isNil)(strapi.plugin('graphql'));
+        const isGQLPluginEnabled = !(0, lodash_1.isNil)(strapi.plugin("graphql"));
         let extendedResult = {
             allowedContentTypes: utils_2.ALLOWED_CONTENT_TYPES,
             restrictedContentTypes: utils_2.RESTRICTED_CONTENT_TYPES,
@@ -29,20 +31,26 @@ const adminService = ({ strapi }) => ({
                 default: utils_2.CONTENT_TYPES_NAME_FIELDS_DEFAULTS,
                 ...((0, lodash_1.isObject)(contentTypesNameFields) ? contentTypesNameFields : {}),
             },
-            contentTypesPopulate: (0, lodash_1.isObject)(contentTypesPopulate) ? contentTypesPopulate : {},
+            contentTypesPopulate: (0, lodash_1.isObject)(contentTypesPopulate)
+                ? contentTypesPopulate
+                : {},
             pathDefaultFields: (0, lodash_1.isObject)(pathDefaultFields) ? pathDefaultFields : {},
             allowedLevels,
             additionalFields: viaSettingsPage
                 ? additionalFields
-                : additionalFields.filter(field => typeof field === 'string' || (0, lodash_1.get)(field, 'enabled', false)),
+                : additionalFields.filter((field) => typeof field === "string" || (0, lodash_1.get)(field, "enabled", false)),
             gql: {
-                navigationItemRelated: configContentTypes.map(({ labelSingular }) => labelSingular.replace(/\s+/g, ''))
+                navigationItemRelated: configContentTypes.map(({ labelSingular }) => labelSingular.replace(/\s+/g, "")),
             },
             isGQLPluginEnabled: viaSettingsPage ? isGQLPluginEnabled : undefined,
             cascadeMenuAttached,
         };
-        const i18nConfig = await (0, i18n_1.addI18NConfigFields)({ strapi, viaSettingsPage, previousConfig: {} });
-        if (additionalFields.includes('audience')) {
+        const i18nConfig = await (0, i18n_1.addI18NConfigFields)({
+            strapi,
+            viaSettingsPage,
+            previousConfig: {},
+        });
+        if (additionalFields.includes("audience")) {
             const audienceItems = await strapi
                 .query(audienceModel.uid)
                 .findMany({
@@ -59,18 +67,23 @@ const adminService = ({ strapi }) => ({
             ...i18nConfig,
         };
     },
-    async get() {
+    async get(ids) {
         const { masterModel } = (0, utils_2.getPluginModels)();
-        const entities = await strapi
-            .query(masterModel.uid)
-            .findMany({
+        const entities = await strapi.query(masterModel.uid).findMany({
             limit: Number.MAX_SAFE_INTEGER,
             populate: utils_2.DEFAULT_POPULATE,
+            where: ids
+                ? {
+                    id: {
+                        $in: ids,
+                    },
+                }
+                : undefined,
         });
         return entities;
     },
     async getById(id) {
-        const commonService = (0, utils_2.getPluginService)('common');
+        const commonService = (0, utils_2.getPluginService)("common");
         const { masterModel, itemModel } = (0, utils_2.getPluginModels)();
         const entity = await strapi
             .query(masterModel.uid)
@@ -82,8 +95,8 @@ const adminService = ({ strapi }) => ({
                 master: id,
             },
             limit: Number.MAX_SAFE_INTEGER,
-            orderBy: [{ order: 'asc', }],
-            populate: ['related', 'parent', 'audience']
+            orderBy: [{ order: "asc" }],
+            populate: ["related", "parent", "audience"],
         });
         const entities = await commonService.getRelatedItems(entityItems);
         return {
@@ -92,9 +105,11 @@ const adminService = ({ strapi }) => ({
         };
     },
     async post(payload, auditLog) {
-        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 commonService = (0, utils_2.getPluginService)("common");
+        const adminService = (0, utils_2.getPluginService)("admin");
+        const { enabled: i18nEnabled, defaultLocale } = await (0, i18n_1.getI18nStatus)({
+            strapi,
+        });
         const { masterModel } = (0, utils_2.getPluginModels)();
         const { name, visible } = payload;
         const data = {
@@ -109,18 +124,22 @@ const adminService = ({ strapi }) => ({
             .createBranch(payload.items, existingEntity, null, {})
             .then(() => adminService.getById(existingEntity.id))
             .then((newEntity) => {
-            (0, utils_2.sendAuditLog)(auditLog, 'onChangeNavigation', { actionType: 'CREATE', oldEntity: existingEntity, newEntity });
+            (0, utils_2.sendAuditLog)(auditLog, "onChangeNavigation", {
+                actionType: "CREATE",
+                oldEntity: existingEntity,
+                newEntity,
+            });
             return newEntity;
         });
-        await commonService.emitEvent(masterModel.uid, 'entry.create', existingEntity);
+        await commonService.emitEvent(masterModel.uid, "entry.create", existingEntity);
         if (i18nEnabled && defaultLocale) {
             await (0, i18n_1.i18nNavigationSetupStrategy)({ strapi });
         }
         return result;
     },
     async put(id, payload, auditLog) {
-        const adminService = (0, utils_2.getPluginService)('admin');
-        const commonService = (0, utils_2.getPluginService)('common');
+        const adminService = (0, utils_2.getPluginService)("admin");
+        const commonService = (0, utils_2.getPluginService)("common");
         const { enabled: i18nEnabled } = await (0, i18n_1.getI18nStatus)({ strapi });
         const { masterModel } = (0, utils_2.getPluginModels)();
         const { name, visible } = payload;
@@ -128,7 +147,9 @@ const adminService = ({ strapi }) => ({
         const detailsHaveChanged = existingEntity.name !== name || existingEntity.visible !== visible;
         if (detailsHaveChanged) {
             const newName = detailsHaveChanged ? name : existingEntity.name;
-            const newSlug = detailsHaveChanged ? await commonService.getSlug(name) : existingEntity.slug;
+            const newSlug = detailsHaveChanged
+                ? await commonService.getSlug(name)
+                : existingEntity.slug;
             await strapi.query(masterModel.uid).update({
                 where: { id },
                 data: {
@@ -138,67 +159,99 @@ const adminService = ({ strapi }) => ({
                 },
             });
             if (i18nEnabled && existingEntity.localizations) {
-                await Promise.all(existingEntity.localizations.map((locale) => strapi.query(masterModel.uid).update({
-                    where: {
-                        id: locale.id,
-                    },
-                    data: {
-                        name: newName,
-                        slug: `${newSlug}-${locale.localeCode}`,
-                        visible,
-                    },
-                })));
+                for (const locale of existingEntity.localizations) {
+                    await strapi.query(masterModel.uid).update({
+                        where: {
+                            id: locale.id,
+                        },
+                        data: {
+                            name: newName,
+                            slug: `${newSlug}-${locale.localeCode}`,
+                            visible,
+                        },
+                    });
+                }
             }
         }
         const result = await commonService
             .analyzeBranch(payload.items, existingEntity)
             .then((auditLogsOperations) => Promise.all([
-            auditLog ? (0, utils_2.prepareAuditLog)((auditLogsOperations || []).flat(Number.MAX_SAFE_INTEGER)) : [],
-            adminService.getById(existingEntity.id)
+            auditLog
+                ? (0, utils_2.prepareAuditLog)((auditLogsOperations || []).flat(Number.MAX_SAFE_INTEGER))
+                : [],
+            adminService.getById(existingEntity.id),
         ]))
             .then(([actionType, newEntity]) => {
-            (0, utils_2.sendAuditLog)(auditLog, 'onChangeNavigation', { actionType, oldEntity: existingEntity, newEntity });
+            (0, utils_2.sendAuditLog)(auditLog, "onChangeNavigation", {
+                actionType,
+                oldEntity: existingEntity,
+                newEntity,
+            });
             return newEntity;
         });
-        const navigationEntity = await strapi.query(masterModel.uid).findOne({ where: { id } });
-        await commonService.emitEvent(masterModel.uid, 'entry.update', navigationEntity);
+        const navigationEntity = await strapi
+            .query(masterModel.uid)
+            .findOne({ where: { id } });
+        await commonService.emitEvent(masterModel.uid, "entry.update", navigationEntity);
         return result;
     },
     async delete(id, auditLog) {
-        const { masterModel } = (0, utils_2.getPluginModels)();
-        const adminService = (0, utils_2.getPluginService)('admin');
+        const { masterModel, itemModel } = (0, utils_2.getPluginModels)();
+        const adminService = (0, utils_2.getPluginService)("admin");
         const entity = await adminService.getById(id);
         const { enabled: i18nEnabled } = await (0, i18n_1.getI18nStatus)({ strapi });
+        const cleanNavigationItems = async (masterIds) => {
+            const navigationItems = await strapi.query(itemModel.uid).findMany({
+                where: {
+                    $or: masterIds.map((id) => ({ master: id }))
+                },
+                limit: Number.MAX_SAFE_INTEGER,
+            });
+            await strapi.query(itemModel.uid).deleteMany({
+                where: {
+                    $or: navigationItems.map(({ id }) => ({ id }))
+                },
+            });
+        };
+        await cleanNavigationItems([id]);
         await strapi.query(masterModel.uid).delete({
             where: {
                 id,
-            }
+            },
         });
         if (i18nEnabled && entity.localizations) {
-            await Promise.all(entity.localizations.map((localeVersion) => strapi.query(masterModel.uid).delete({
+            await cleanNavigationItems(entity.localizations.map(_ => _.id));
+            await strapi.query(masterModel.uid).deleteMany({
                 where: {
-                    id: localeVersion.id,
-                }
-            })));
+                    id: {
+                        $in: entity.localizations.map((_) => _.id),
+                    },
+                },
+            });
         }
-        (0, utils_2.sendAuditLog)(auditLog, 'onNavigationDeletion', { entity, actionType: "DELETE" });
+        (0, utils_2.sendAuditLog)(auditLog, "onNavigationDeletion", {
+            entity,
+            actionType: "DELETE",
+        });
     },
     async restart() {
         setImmediate(() => strapi.reload());
     },
     async restoreConfig() {
-        const commonService = (0, utils_2.getPluginService)('common');
+        const commonService = (0, utils_2.getPluginService)("common");
         const pluginStore = await commonService.getPluginStore();
-        await pluginStore.delete({ key: 'config' });
+        await pluginStore.delete({ key: "config" });
         await commonService.setDefaultConfig();
     },
     async updateConfig(newConfig) {
-        const commonService = (0, utils_2.getPluginService)('common');
+        const commonService = (0, utils_2.getPluginService)("common");
         const pluginStore = await commonService.getPluginStore();
-        const config = await pluginStore.get({ key: 'config' });
+        const config = await pluginStore.get({
+            key: "config",
+        });
         (0, utils_2.validateAdditionalFields)(newConfig.additionalFields);
-        await pluginStore.set({ key: 'config', value: newConfig });
-        const removedFields = (0, lodash_1.differenceBy)(config.additionalFields, newConfig.additionalFields, 'name').filter(i => i !== 'audience');
+        await pluginStore.set({ key: "config", value: newConfig });
+        const removedFields = (0, lodash_1.differenceBy)(config.additionalFields, newConfig.additionalFields, "name").filter((i) => i !== "audience");
         if (!(0, lodash_1.isEmpty)(removedFields)) {
             await commonService.pruneCustomFields(removedFields);
         }
@@ -208,8 +261,8 @@ const adminService = ({ strapi }) => ({
         if (!enabled) {
             throw new NavigationError_1.NavigationError("Not yet implemented.");
         }
-        const adminService = (0, utils_2.getPluginService)('admin');
-        const commonService = (0, utils_2.getPluginService)('common');
+        const adminService = (0, utils_2.getPluginService)("admin");
+        const commonService = (0, utils_2.getPluginService)("common");
         const targetEntity = await adminService.getById(target);
         return await (0, i18n_1.i18nNavigationContentsCopy)({
             source: await adminService.getById(source),
@@ -219,7 +272,11 @@ const adminService = ({ strapi }) => ({
         })
             .then(() => adminService.getById(target))
             .then((updated) => {
-            (0, utils_2.sendAuditLog)(auditLog, 'onChangeNavigation', { actionType: 'UPDATE', oldEntity: targetEntity, newEntity: updated });
+            (0, utils_2.sendAuditLog)(auditLog, "onChangeNavigation", {
+                actionType: "UPDATE",
+                oldEntity: targetEntity,
+                newEntity: updated,
+            });
             return updated;
         });
     },

package/server/services/client.js

@@ -8,6 +8,22 @@ const utils_2 = require("@strapi/utils");
 const i18n_1 = require("../i18n");
 const NavigationError_1 = require("../../utils/NavigationError");
 const clientService = ({ strapi }) => ({
+    async readAll({ locale, orderBy = 'createdAt', orderDirection = "DESC" }) {
+        const { masterModel } = (0, utils_1.getPluginModels)();
+        const navigations = await strapi
+            .query(masterModel.uid)
+            .findMany({
+            where: locale
+                ? {
+                    localeCode: locale,
+                }
+                : undefined,
+            orderBy: { [orderBy]: orderDirection },
+            limit: Number.MAX_SAFE_INTEGER,
+            populate: false
+        });
+        return navigations;
+    },
     async render({ idOrSlug, type = utils_1.RENDER_TYPES.FLAT, menuOnly = false, rootPath = null, wrapRelated = false, locale, populate, }) {
         const clientService = (0, utils_1.getPluginService)('client');
         const findById = !isNaN((0, lodash_1.toNumber)(idOrSlug)) || (0, uuid_1.validate)(idOrSlug);

package/server/services/common.js

@@ -336,10 +336,12 @@ const commonService = ({ strapi }) => ({
         const navigationItemsToUpdate = removedFields.reduce((acc, curr) => {
             return acc.map((item) => (0, lodash_1.omit)(item, [`additionalFields.${curr.name}`]));
         }, navigationItems);
-        await Promise.all(navigationItemsToUpdate.map(async (item) => await databaseModel.update({
-            where: { id: item.id },
-            data: { additionalFields: item.additionalFields },
-        })));
+        for (const item of navigationItemsToUpdate) {
+            await databaseModel.update({
+                where: { id: item.id },
+                data: { additionalFields: item.additionalFields },
+            });
+        }
     },
     async getSlug(query) {
         let slug = (0, slugify_1.default)(query);