strapi-plugin-navigation 2.0.8 → 2.0.11

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

@@ -55,7 +55,8 @@ const Item = (props) => {
   const { contentTypes, contentTypesNameFields } = config;
   const isExternal = type === navigationItemType.EXTERNAL;
   const isWrapper = type === navigationItemType.WRAPPER;
-  const isPublished = relatedRef && relatedRef?.publishedAt;
+  const isHandledByPublishFlow = relatedRef && typeof relatedRef.publishedAt !== 'undefined';
+  const isPublished = isHandledByPublishFlow && relatedRef.publishedAt;
   const isNextMenuAllowedLevel = isNumber(allowedLevels) ? level < (allowedLevels - 1) : true;
   const isMenuAllowedLevel = isNumber(allowedLevels) ? level < allowedLevels : true;
   const hasChildren = !isEmpty(item.items) && !isExternal && !displayChildren;
@@ -121,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' }}>
@@ -167,20 +175,20 @@ const Item = (props) => {
                 </Flex>
                 {relatedItemLabel && (
                   <Flex justifyContent='center' alignItems='center'>
-                    <ItemCardBadge
+                    {isHandledByPublishFlow && <ItemCardBadge
                       borderColor={`${relatedBadgeColor}200`}
                       backgroundColor={`${relatedBadgeColor}100`}
                       textColor={`${relatedBadgeColor}600`}
                       className="action"
                       small
                     >
-                      {getMessage({id: `components.navigationItem.badge.${isPublished ? 'published' : 'draft'}`})}
-                    </ItemCardBadge>
+                      {getMessage({ id: `components.navigationItem.badge.${isPublished ? 'published' : 'draft'}` })}
+                    </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/DataManagerProvider/index.js

@@ -94,8 +94,8 @@ const DataManagerProvider = ({ children }) => {
     } catch (err) {
       console.error({ err });
       toggleNotification({
-        type: 'error',
-        message: { id: 'notification.error' },
+        type: 'warning',
+        message: { id: getTrad('notification.error') },
       });
     }
   };
@@ -133,8 +133,8 @@ const DataManagerProvider = ({ children }) => {
     } catch (err) {
       console.error({ err });
       toggleNotification({
-        type: 'error',
-        message: { id: 'notification.error' },
+        type: 'warning',
+        message: { id: getTrad('notification.error') },
       });
     }
   };
@@ -254,7 +254,7 @@ const DataManagerProvider = ({ children }) => {
 
        if (err.response.payload.data && err.response.payload.data.errorTitles) {
          return toggleNotification({
-           type: 'error',
+           type: 'warning',
            message: {
              id: formatMessage(
                getTrad('notification.navigation.error'),
@@ -264,7 +264,7 @@ const DataManagerProvider = ({ children }) => {
          });
        }
        toggleNotification({
-         type: 'error',
+         type: 'warning',
          message: { id: getTrad('notification.error') },
        });
      }

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,7 +57,7 @@ const SettingsPage = () => {
     additionalFields: audienceFieldChecked ? [navigationItemAdditionalFields.AUDIENCE] : [],
     allowedLevels: allowedLevels,
     gql: {
-      navigationItemRelated: selectedContentTypes.map(uid => allContentTypes.find(ct => ct.uid === uid).info.displayName.replace(/\s+/g, ''))
+      navigationItemRelated: selectedContentTypes.map(uid => resolveGlobalLikeId(uid)),
     }
   });
 
@@ -108,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/pages/View/components/NavigationItemForm/index.js

@@ -1,5 +1,5 @@
 import React, { useEffect, useMemo, useState, useCallback } from 'react';
-import { debounce, find, get, isEmpty, isEqual, isNil, isString } from 'lodash';
+import { debounce, find, get, first, isEmpty, isEqual, isNil, isString } from 'lodash';
 import PropTypes from 'prop-types';
 import { Formik } from 'formik'
 import slugify from 'slugify';
@@ -75,9 +75,11 @@ const NavigationItemForm = ({
 
   const sanitizePayload = (payload = {}) => {
     const { onItemClick, onItemLevelAddClick, related, relatedType, menuAttached, type, ...purePayload } = payload;
-    const relatedId = related
+    const relatedId = related;
+    const singleRelatedItem = isSingleSelected ? first(contentTypeEntities) : undefined;
     const relatedCollectionType = relatedType;
-    const title = payload.title || relatedSelectOptions.find(v => v.key == relatedId)?.label
+    const title = payload.title;
+    
     return {
       ...purePayload,
       title,
@@ -88,7 +90,8 @@ const NavigationItemForm = ({
       related: type === navigationItemType.INTERNAL ? relatedId : undefined,
       relatedType: type === navigationItemType.INTERNAL ? relatedCollectionType : undefined,
       isSingle: isSingleSelected,
-      uiRouterKey: generateUiRouterKey(purePayload.title, relatedId, relatedCollectionType),
+      singleRelatedItem,
+      uiRouterKey: generateUiRouterKey(title, relatedId, relatedCollectionType),
     };
   };
 
@@ -134,6 +137,7 @@ const NavigationItemForm = ({
     return undefined;
   };
 
+  const initialRelatedTypeSelected = data?.relatedType?.value;
   const relatedTypeSelectValue = form.relatedType;
   const relatedSelectValue = form.related;
 
@@ -219,6 +223,9 @@ const NavigationItemForm = ({
     () => contentTypes
       .filter((contentType) => {
         if (contentType.isSingle) {
+          if (relatedTypeSelectValue && [relatedTypeSelectValue, initialRelatedTypeSelected].includes(contentType.uid)) {
+            return true;
+          }
           return !usedContentTypesData.some((_) => _.__collectionUid === contentType.uid && _.__collectionUid !== form.relatedType);
         }
         return true;
@@ -232,9 +239,9 @@ const NavigationItemForm = ({
           }
         },
         value: get(item, 'uid'),
-        label: appendLabelPublicationStatus(get(item, 'label', get(item, 'name')), item, true),
+        label: get(item, 'label', get(item, 'name')),
       })),
-    [contentTypes, usedContentTypesData],
+    [contentTypes, usedContentTypesData, relatedTypeSelectValue],
   );
 
   const thereAreNoMoreContentTypes = isEmpty(relatedSelectOptions) && !contentTypeSearchQuery;

package/admin/src/pages/View/utils/parsers.js

@@ -89,10 +89,12 @@ const linkRelations = (item, config) => {
 
   if (isSingle && relatedType) {
     const relatedContentType = contentTypes.find(_ => relatedType === _.uid) || {};
+    const { singleRelatedItem = {} } = item;
     return {
       ...item,
       relatedType,
       relatedRef: {
+        ...singleRelatedItem,
         ...omit(relatedContentType, 'collectionName'),
         isSingle,
         __collectionUid: relatedContentType.uid,
@@ -122,7 +124,7 @@ const linkRelations = (item, config) => {
 
   const shouldFindRelated = (isNumber(related) || isUuid(related) || isString(related)) && !relatedRef;
   const shouldBuildRelated = !relatedRef || (relatedRef && (relatedRef.id !== relatedId));
-  
+
   if (shouldBuildRelated && !shouldFindRelated) {
     const relatedContentType = find(contentTypes,
       ct => ct.uid === relatedItem.__contentType, {});
@@ -295,9 +297,10 @@ export const isRelationPublished = ({ relatedRef, relatedType = {}, type, isColl
 
 export const validateNavigationStructure = (items = []) =>
   items.map(item =>
-    (item.removed || isRelationCorrect({
-      related: item.related,
-      type: item.type,
-    })) &&
+    (
+      item.removed ||
+      isRelationCorrect({ related: item.related, type: item.type }) ||
+      (item.isSingle && isRelationCorrect({ related: item.relatedType, type: item.type }))
+    ) &&
     validateNavigationStructure(item.items)
   ).filter(item => !item).length === 0;

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.8",
+  "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/graphql/types/navigation-related.js

@@ -8,7 +8,9 @@ module.exports = ({ strapi, nexus, config }) => {
 			definition(t) {
 				t.members(...related)
 			},
-			resolveType: (item) => strapi.contentTypes[item.__contentType]?.globalId
+			resolveType: (item) => {
+				return strapi.contentTypes[item.__contentType]?.globalId
+			}
 		});
 	}
 	

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,9 +31,7 @@ module.exports = ({ strapi }) => {
       const entities = await strapi
         .query(masterModel.uid)
         .findMany({
-          paggination: {
-            limit: -1,
-          }
+          limit: Number.MAX_SAFE_INTEGER,
         });
       return entities;
     },
@@ -52,9 +48,7 @@ module.exports = ({ strapi }) => {
           where: {
             master: id,
           },
-          paggination: {
-            limit: -1,
-          },
+          limit: Number.MAX_SAFE_INTEGER,
           sort: ['order:asc'],
           populate: ['related', 'parent', 'audience']
         });
@@ -71,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;
@@ -80,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 : {}),
@@ -99,9 +96,7 @@ module.exports = ({ strapi }) => {
         const audienceItems = await strapi
           .query(audienceModel.uid)
           .findMany({
-            paggination: {
-              limit: -1,
-            }
+            limit: Number.MAX_SAFE_INTEGER,
           });
         extendedResult = {
           ...extendedResult,
@@ -115,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 });
     },
 
@@ -124,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
 
@@ -133,10 +128,10 @@ module.exports = ({ strapi }) => {
       const defaultConfigValue = {
         additionalFields: get(config, 'additionalFields', pluginDefaultConfig('additionalFields')),
         contentTypes: get(config, 'contentTypes', pluginDefaultConfig('contentTypes')),
-        contentTypesNameFields: get(config, 'contentTypesNameFields',  pluginDefaultConfig('contentTypesNameFields')),
-        contentTypesPopulate: get(config, 'contentTypesPopulate',  pluginDefaultConfig('contentTypesPopulate')),
-        allowedLevels: get(config, 'allowedLevels',  pluginDefaultConfig('allowedLevels')),
-        gql: get(config, 'gql',  pluginDefaultConfig('gql')),
+        contentTypesNameFields: get(config, 'contentTypesNameFields', pluginDefaultConfig('contentTypesNameFields')),
+        contentTypesPopulate: get(config, 'contentTypesPopulate', pluginDefaultConfig('contentTypesPopulate')),
+        allowedLevels: get(config, 'allowedLevels', pluginDefaultConfig('allowedLevels')),
+        gql: get(config, 'gql', pluginDefaultConfig('gql')),
       }
       pluginStore.set({ key: 'config', value: defaultConfigValue });
 
@@ -144,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;
@@ -194,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];
@@ -221,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) {
@@ -399,9 +392,7 @@ module.exports = ({ strapi }) => {
             master: entity.id,
             ...itemCriteria,
           },
-          paggination: {
-            limit: -1,
-          },
+          limit: Number.MAX_SAFE_INTEGER,
           sort: ['order:asc'],
           populate: ['related', 'audience', 'parent'],
         });
@@ -428,6 +419,7 @@ module.exports = ({ strapi }) => {
                 id: item.id,
                 title: utilsFunctions.composeItemTitle(item, contentTypesNameFields, contentTypes),
                 menuAttached: item.menuAttached,
+                order: item.order,
                 path: isExternal ? item.externalPath : parentPath,
                 type: item.type,
                 uiRouterKey: item.uiRouterKey,
@@ -511,7 +503,10 @@ module.exports = ({ strapi }) => {
         .filter(utilsFunctions.filterOutUnpublished)
         .map(item => itemParser({
           ...item,
-        }, path, field));
+        }, path, field))
+        .sort((x, y) => {
+          return x.order - y.order;
+       });
     },
 
     renderRFR({ items, parent = null, parentNavItem = null, contentTypes = [] }) {
@@ -632,7 +627,7 @@ module.exports = ({ strapi }) => {
           }
           const navigationItem = await strapi
             .query(itemModel.uid)
-            .create({ data });
+            .create({ data, populate: ['related', 'items'] });
           return !isEmpty(item.items)
             ? service.createBranch(
               item.items,
@@ -735,7 +730,6 @@ module.exports = ({ strapi }) => {
       if (relatedItems) {
         return Promise.all(relatedItems.map(async relatedItem => {
           try {
-
             const model = strapi.query('plugin::navigation.navigations-items-related');
             const entity = await model
               .findOne({

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;
+    },
   };
 }