strapi-plugin-navigation 2.0.10 → 2.0.11

package/admin/src/components/Item/index.js

@@ -122,6 +122,13 @@ const Item = (props) => {
     previewRef: dragPreview(previewRef),
   }
 
+  const contentTypeUid = relatedRef?.__collectionUid;
+  const contentType = contentTypes.find(_ => _.uid === contentTypeUid) || {};
+  const generatePreviewUrl = entity => {
+    const { isSingle } = contentType;
+    return `/content-manager/${ isSingle ? 'singleType' : 'collectionType'}/${entity?.__collectionUid}${!isSingle ? '/' + entity?.id : ''}`
+  }
+
   return (
     <Wrapper level={level} isLast={isLast} style={{ opacity: isDragging ? 0.2 : 1 }} ref={refs ? refs.dropRef : null} >
       <Card style={{ width: "728px", zIndex: 1, position: "relative", overflow: 'hidden' }}>
@@ -179,9 +186,9 @@ const Item = (props) => {
                     </ItemCardBadge>}
                     <Typography variant="omega" textColor='neutral600'>{relatedTypeLabel}&nbsp;/&nbsp;</Typography>
                     <Typography variant="omega" textColor='neutral800'>{relatedItemLabel}</Typography>
-                      <Link
-                        to={`/content-manager/collectionType/${relatedRef?.__collectionUid}/${relatedRef?.id}`}
-                        endIcon={<ArrowRight />}>&nbsp;</Link>
+                    { contentType?.visible && (<Link
+                        to={generatePreviewUrl(relatedRef)}
+                        endIcon={<ArrowRight />}>&nbsp;</Link>) }
                   </Flex>)
                 }
               </Flex>

package/admin/src/pages/SettingsPage/index.js

@@ -31,6 +31,7 @@ import { navigationItemAdditionalFields } from '../View/utils/enums';
 import ConfirmationDialog from '../../components/ConfirmationDialog';
 import RestartAlert from '../../components/RestartAlert';
 import { getMessage } from '../../utils';
+import { isContentTypeEligible, resolveGlobalLikeId } from './utils/functions';
 
 const SettingsPage = () => {
   const { lockApp, unlockApp } = useOverlayBlocker();
@@ -56,13 +57,7 @@ const SettingsPage = () => {
     additionalFields: audienceFieldChecked ? [navigationItemAdditionalFields.AUDIENCE] : [],
     allowedLevels: allowedLevels,
     gql: {
-      navigationItemRelated: selectedContentTypes.map(uid => {
-        const singularName = allContentTypes.find(ct => ct.uid === uid).info.singularName;
-        const globalIdLike = singularName.split('-')
-          .map(_ => capitalize(_))
-          .join('')
-        return globalIdLike;
-      })
+      navigationItemRelated: selectedContentTypes.map(uid => resolveGlobalLikeId(uid)),
     }
   });
 
@@ -114,7 +109,10 @@ const SettingsPage = () => {
     )
   }
 
-  const allContentTypes = !isLoading && Object.values(allContentTypesData).filter(item => item.uid.includes('api::'));
+  const allContentTypes = !isLoading && Object.values(allContentTypesData).filter(({ uid }) => isContentTypeEligible(uid, {
+    allowedContentTypes: navigationConfigData?.allowedContentTypes,
+    restrictedContentTypes: navigationConfigData?.restrictedContentTypes,
+  }));
   const selectedContentTypes = navigationConfigData?.contentTypes.map(item => item.uid);
   const audienceFieldChecked = navigationConfigData?.additionalFields.includes(navigationItemAdditionalFields.AUDIENCE);
   const allowedLevels = navigationConfigData?.allowedLevels || 2;

package/admin/src/pages/SettingsPage/utils/functions.js

@@ -0,0 +1,30 @@
+'use strict';
+
+const { capitalize } = require("lodash");
+
+const UID_REGEX = /^(?<type>[a-z0-9-]+)\:{2}(?<api>[a-z0-9-]+)\.{1}(?<contentType>[a-z0-9-]+)$/i;
+
+const splitTypeUid = (uid = '') => {
+    return uid.split(UID_REGEX).filter((s) => s && s.length > 0);
+};
+
+module.exports = {
+    resolveGlobalLikeId(uid = '') {
+        const parse = (str) => str.split('-')
+            .map(_ => capitalize(_))
+            .join('');
+
+        const [type, scope, contentTypeName] = splitTypeUid(uid);
+        if (type === 'api') {
+            return parse(contentTypeName);
+        }
+        return `${parse(scope)}${parse(contentTypeName)}`;
+    },
+
+    isContentTypeEligible(uid = '', config = {}) {
+        const { allowedContentTypes = [], restrictedContentTypes = []} = config;
+        const isOneOfAllowedType = allowedContentTypes.filter(_ => uid.includes(_) || (uid === _)).length > 0;
+        const isNoneOfRestricted = restrictedContentTypes.filter(_ => uid.includes(_) || (uid === _)).length === 0;
+        return uid && isOneOfAllowedType && isNoneOfRestricted;
+    },
+}

package/admin/src/translations/en.json

@@ -74,9 +74,9 @@
 	"pages.settings.notification.submit.error": "Config update has failed",
 	"pages.settings.notification.restore.error": "Config restore has failed",
 	"pages.settings.notification.restart.error": "Failed to restart your application. Try to do it manually.",
-	"pages.settings.form.contentTypes.label": "Enable for Collection(s)",
+	"pages.settings.form.contentTypes.label": "Enable navigation for",
 	"pages.settings.form.contentTypes.placeholder": "eg. Pages, Posts",
-	"pages.settings.form.contentTypes.hint": "Content types that can be related with navigation items. This configuration is applicable both for REST & GraphQL",
+	"pages.settings.form.contentTypes.hint": "If none is selected, also none of the content types are enabled",
 	"pages.settings.form.allowedLevels.label": "Allowed levels",
 	"pages.settings.form.allowedLevels.placeholder": "eg. 2",
 	"pages.settings.form.allowedLevels.hint": "Maximum level for which you're able to mark item as \"Menu attached\"",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-navigation",
-  "version": "2.0.10",
+  "version": "2.0.11",
   "description": "Strapi - Navigation plugin",
   "strapi": {
     "name": "navigation",

package/server/controllers/navigation.js

@@ -25,12 +25,20 @@ module.exports = ({strapi}) => ({
   },
 
   async updateConfig(ctx) {
-    await getService().updateConfig(ctx.request.body)
+    try {
+      await getService().updateConfig(ctx.request.body);
+    } catch (e) { 
+      errorHandler(ctx)(e);
+    }
     return ctx.send({ status: 200 });
   },
 
   async restoreConfig(ctx) {
-    await getService().restoreConfig()
+    try {
+      await getService().restoreConfig();
+    } catch (e) { 
+      errorHandler(ctx)(e);
+    }
     return ctx.send({ status: 200 })
   },
 
@@ -43,7 +51,7 @@ module.exports = ({strapi}) => ({
       await getService().restart();
       return ctx.send({ status: 200 });
     } catch (e) {
-      errorHandler(ctx, e);
+      errorHandler(ctx)(e);
     }
   },
 

package/server/services/navigation.js

@@ -11,16 +11,14 @@ const {
   toNumber,
   isString,
   first,
-
 } = require('lodash');
 const { validate: isUuid } = require('uuid');
 const slugify = require('slugify');
-const { KIND_TYPES } = require('./utils/constant');
+const { KIND_TYPES, ALLOWED_CONTENT_TYPES, RESTRICTED_CONTENT_TYPES } = require('./utils/constant');
 const utilsFunctionsFactory = require('./utils/functions');
 const { renderType } = require('../content-types/navigation/lifecycle');
 const { type: itemType, additionalFields: configAdditionalFields } = require('../content-types/navigation-item').lifecycle;
 const { NotFoundError } = require('@strapi/utils').errors
-const excludedContentTypes = ['strapi::'];
 const contentTypesNameFieldsDefaults = ['title', 'subject', 'name'];
 
 module.exports = ({ strapi }) => {
@@ -33,7 +31,7 @@ module.exports = ({ strapi }) => {
       const entities = await strapi
         .query(masterModel.uid)
         .findMany({
-          limit: 0
+          limit: Number.MAX_SAFE_INTEGER,
         });
       return entities;
     },
@@ -50,7 +48,7 @@ module.exports = ({ strapi }) => {
           where: {
             master: id,
           },
-          limit: 0,
+          limit: Number.MAX_SAFE_INTEGER,
           sort: ['order:asc'],
           populate: ['related', 'parent', 'audience']
         });
@@ -67,8 +65,8 @@ module.exports = ({ strapi }) => {
 
     // Get plugin config
     async config(viaSettingsPage = false) {
-      const { audienceModel, service } = utilsFunctions.extractMeta(strapi.plugins);
-      const pluginStore = await strapi.plugin('navigation').service('navigation').getPluginStore()
+      const { audienceModel } = utilsFunctions.extractMeta(strapi.plugins);
+      const pluginStore = await this.getPluginStore()
       const config = await pluginStore.get({ key: 'config' });
       const additionalFields = config.additionalFields;
       const contentTypesNameFields = config.contentTypesNameFields;
@@ -76,9 +74,12 @@ module.exports = ({ strapi }) => {
       const allowedLevels = config.allowedLevels;
       const isGQLPluginEnabled = !isNil(strapi.plugin('graphql'));
 
-      let extendedResult = {};
+      let extendedResult = {
+        allowedContentTypes: ALLOWED_CONTENT_TYPES,
+        restrictedContentTypes: RESTRICTED_CONTENT_TYPES,
+      };
       const result = {
-        contentTypes: await service.configContentTypes(),
+        contentTypes: await this.configContentTypes(),
         contentTypesNameFields: {
           default: contentTypesNameFieldsDefaults,
           ...(isObject(contentTypesNameFields) ? contentTypesNameFields : {}),
@@ -95,7 +96,7 @@ module.exports = ({ strapi }) => {
         const audienceItems = await strapi
           .query(audienceModel.uid)
           .findMany({
-            limit: 0
+            limit: Number.MAX_SAFE_INTEGER,
           });
         extendedResult = {
           ...extendedResult,
@@ -109,7 +110,7 @@ module.exports = ({ strapi }) => {
     },
 
     async updateConfig(newConfig) {
-      const pluginStore = await strapi.plugin('navigation').service('navigation').getPluginStore()
+      const pluginStore = await this.getPluginStore()
       await pluginStore.set({ key: 'config', value: newConfig });
     },
 
@@ -118,7 +119,7 @@ module.exports = ({ strapi }) => {
     },
 
     async setDefaultConfig() {
-      const pluginStore = await strapi.plugin('navigation').service('navigation').getPluginStore()
+      const pluginStore = await this.getPluginStore()
       const config = await pluginStore.get({ key: 'config' });
       const pluginDefaultConfig = await strapi.plugin('navigation').config
 
@@ -138,23 +139,20 @@ module.exports = ({ strapi }) => {
     },
 
     async restoreConfig() {
-      const pluginStore = await strapi.plugin('navigation').service('navigation').getPluginStore()
+      const pluginStore = await this.getPluginStore()
       await pluginStore.delete({ key: 'config' });
       await strapi.plugin('navigation').service('navigation').setDefaultConfig();
     },
 
     async configContentTypes() {
-      const pluginStore = await strapi.plugin('navigation').service('navigation').getPluginStore()
+      const pluginStore = await this.getPluginStore()
       const config = await pluginStore.get({ key: 'config' });
       const eligibleContentTypes =
         await Promise.all(
           config.contentTypes
-            .filter(contentType => !!strapi.contentTypes[contentType])
+            .filter(contentType => !!strapi.contentTypes[contentType] && utilsFunctions.isContentTypeEligible(contentType))
             .map(
               async (key) => {
-                if (find(excludedContentTypes, name => key.includes(name))) { // exclude internal content types
-                  return;
-                }
                 const item = strapi.contentTypes[key];
                 const { kind, options, uid } = item;
                 const { draftAndPublish } = options;
@@ -188,9 +186,10 @@ module.exports = ({ strapi }) => {
         .map(({ key, available }) => {
           const item = strapi.contentTypes[key];
           const relatedField = (item.associations || []).find(_ => _.model === 'navigationitem');
-          const { uid, options, info, collectionName, modelName, apiName, plugin, kind } = item;
+          const { uid, options, info, collectionName, modelName, apiName, plugin, kind, pluginOptions } = item;
+          const { visible = true } =  pluginOptions['content-manager'] || {};
           const { name, description } = info;
-          const { isManaged, hidden, templateName } = options;
+          const { hidden, templateName } = options;
           const findRouteConfig = find(get(strapi.api, `[${modelName}].config.routes`, []),
             route => route.handler.includes('.find'));
           const findRoutePath = findRouteConfig && findRouteConfig.path.split('/')[1];
@@ -215,12 +214,12 @@ module.exports = ({ strapi }) => {
             labelSingular: utilsFunctions.singularize(labelSingular),
             endpoint,
             plugin,
-            available,
-            visible: (isManaged || isNil(isManaged)) && !hidden,
+            available: available && !hidden,
+            visible,
             templateName,
           };
         })
-        .filter((item) => item && item.visible);
+        .filter((item) => item && item.available);
     },
 
     async getRelatedItems(entityItems) {
@@ -393,7 +392,7 @@ module.exports = ({ strapi }) => {
             master: entity.id,
             ...itemCriteria,
           },
-          limit: 0,
+          limit: Number.MAX_SAFE_INTEGER,
           sort: ['order:asc'],
           populate: ['related', 'audience', 'parent'],
         });

package/server/services/utils/constant.js

@@ -8,5 +8,14 @@ module.exports = {
 
     MODEL_TYPES: {
         CONTENT_TYPE: 'contentType'
-    }
+    },
+    ALLOWED_CONTENT_TYPES: [
+        'api::',
+        'plugin::'
+    ],
+    RESTRICTED_CONTENT_TYPES: [
+        'plugin::users-permissions',
+        'plugin::i18n.locale',
+        'plugin::navigation',
+    ],
 };

package/server/services/utils/functions.js

@@ -13,7 +13,7 @@ const {
 
 const { type: itemType } = require('../../content-types/navigation-item/lifecycle');
 const { NavigationError } = require('../../../utils/NavigationError');
-const { TEMPLATE_DEFAULT } = require('./constant');
+const { TEMPLATE_DEFAULT, ALLOWED_CONTENT_TYPES, RESTRICTED_CONTENT_TYPES } = require('./constant');
 
 module.exports = ({ strapi }) => {
   return {
@@ -216,5 +216,11 @@ module.exports = ({ strapi }) => {
       }
       return (item.type !== itemType.INTERNAL) || relatedItem;
     },
+
+    isContentTypeEligible(uid = '') {
+      const isOneOfAllowedType = ALLOWED_CONTENT_TYPES.filter(_ => uid.includes(_)).length > 0;
+      const isNoneOfRestricted = RESTRICTED_CONTENT_TYPES.filter(_ => uid.includes(_) || (uid === _)).length === 0;
+      return uid && isOneOfAllowedType && isNoneOfRestricted;
+    },
   };
 }