strapi-plugin-navigation 2.0.10 → 2.0.13

package/README.md

@@ -36,6 +36,21 @@ Strapi Navigation Plugin provides a website navigation / menu builder feature fo
 - Tree (nested)
 - RFR (ready for handling by Redux First Router)
 
+### Table of Contents
+1. [✨ Features](#-features)
+2. [⏳ Installation](#-installation)
+3. [🖐 Requirements](#-requirements)
+4. [🔧 Basic Configuration](#-configuration)
+   - [Settings page](#in-v203-and-newer)
+   - [Plugin file](#in-v202-and-older--default-configuration-state-for-v203-and-newer)
+5. [🔧 GraphQL Configuration](#-gql-configuration)
+6. [🕸️ Public API specification](#%EF%B8%8F-public-api-specification)
+   - [REST API](#rest-api) 
+   - [GraphQL API](#graphql-api)
+8. [💬 FAQ](#-faq)
+9. [🤝 Contributing](#-contributing)
+10. [👨‍💻 Community support](#-community-support)
+
 ## ✨ Features
 
 - **Navigation Public API:** Simple and ready for use API endpoint for consuming the navigation structure you've created
@@ -43,6 +58,7 @@ Strapi Navigation Plugin provides a website navigation / menu builder feature fo
 - **Any Content Type relation:** Navigation can by linked to any of your Content Types by default. Simply, you're controlling it and also limiting available content types by configuration props
 - **Different types of navigation items:** Create navigation with items linked to internal types, to external links or wrapper elements to keep structure clean 
 - **Multiple navigations:** Create as many Navigation containers as you want, setup them and use in the consumer application
+- **Light / Dark mode compatible:** By design we're supporting Strapi ☀️ Light / 🌙 Dark modes 
 - **Customizable:** Possibility to customize the options like: available Content Types, Maximum level for "attach to menu", Additional fields (audience)
 - **[Audit log](https://github.com/VirtusLab/strapi-molecules/tree/master/packages/strapi-plugin-audit-log):** integration with Strapi Molecules Audit Log plugin that provides changes track record
 
@@ -53,13 +69,23 @@ Strapi Navigation Plugin provides a website navigation / menu builder feature fo
 
 ## ⏳ Installation
 
+### Via Strapi Markerplace
+
+As a ✅ **verified** plugin by Strapi team we're available on the [**Strapi Marketplace**](https://market.strapi.io/plugins/strapi-plugin-navigation) as well as **In-App Marketplace** where you can follow the installation instructions.
+
+<div style="margin: 20px 0" align="center">
+  <img style="width: 100%; height: auto;" src="public/assets/marketplace.png" alt="Strapi In-App Marketplace" />
+</div>
+
+### Via command line
+
 It's recommended to use **yarn** to install this plugin within your Strapi project. [You can install yarn with these docs](https://yarnpkg.com/lang/en/docs/install/).
 
 ```bash
 yarn add strapi-plugin-navigation@latest
 ```
 
-After successful installation you've to build a fresh package that includes  plugin UI. To archive that simply use:
+After successful installation you've to re-build your Strapi instance. To archive that simply use:
 
 ```bash
 yarn build
@@ -74,7 +100,9 @@ yarn develop --watch-admin
 
 The **UI Navigation** plugin should appear in the **Plugins** section of Strapi sidebar after you run app again.
 
-Enjoy 🎉
+As a next step you must configure your the plugin by the way you want to. See [**Configuration**](#🔧-configuration) section.
+
+All done. Enjoy 🎉
 
 ## 🖐 Requirements
 
@@ -82,7 +110,7 @@ Complete installation requirements are exact same as for Strapi itself and can b
 
 **Supported Strapi versions**:
 
-- Strapi v4.1.5 (recently tested)
+- Strapi v4.1.8 (recently tested)
 - Strapi v4.x
 
 > This plugin is designed for **Strapi v4** and is not working with v3.x. To get version for **Strapi v3** install version [v1.x](https://github.com/VirtusLab-Open-Source/strapi-plugin-navigation/tree/strapi-v3).
@@ -91,9 +119,17 @@ Complete installation requirements are exact same as for Strapi itself and can b
 
 ## 🔧 Configuration
 
+To start your journey with **Navigation plugin** you must first setup it using the dedicated Settings page (`v2.0.3` and newer) or for any version, put your configuration in `config/plugins.js`. Anyway we're recommending the click-through option where your configuration is going to be properly validated.
+
 ### In `v2.0.3` and newer
 
-Version `2.0.3` introduces the intuitive **Settings** page which you can easily access via `Strapi Settings -> Section: Navigation Plugin -> Configuration`. On the dedicated page, you will be able to set up all crucial properties which drive the plugin and customize each individual collection for which **Navigation plugin** should be enabled.
+Version `2.0.3` introduces the intuitive **Settings** page which you can easily access via `Strapi Settings -> Section: Navigation Plugin -> Configuration`. 
+
+On the dedicated page, you will be able to set up all crucial properties which drive the plugin and customize each individual collection for which **Navigation plugin** should be enabled.
+
+<div style="margin: 20px 0" align="center">
+  <img style="width: 100%; height: auto;" src="public/assets/configuration.png" alt="Plugin configuration" />
+</div>
 
 > *Note*
 > The default configuration for your plugin is fetched from `config/plugins.js` or, if the file is not there, directly from the plugin itself. If you would like to customize the default state to which you might revert, please follow the next section.
@@ -169,7 +205,7 @@ For any role different than **Super Admin**, to access the **Navigation panel**
 ## Base Navigation Item model
 
 ### Flat
-```
+```json
 {
     "id": 1,
     "title": "News",
@@ -182,13 +218,13 @@ For any role different than **Super Admin**, to access the **Navigation panel**
     "master": 1, // Navigation 'id'
     "createdAt": "2020-09-29T13:29:19.086Z",
     "updatedAt": "2020-09-29T13:29:19.128Z",
-    "related": [ <Content Type model > ],
+    "related": {/*<Content Type model >*/ },
     "audience": []
 }
 ```
 
 ### Tree
-```
+```json
 {
     "title": "News",
     "menuAttached": true,
@@ -198,7 +234,7 @@ For any role different than **Super Admin**, to access the **Navigation panel**
     "slug": "benefits",
     "external": false,
     "related": {
-        <Content Type model >
+        // <Content Type model >
     },
     "items": [
         {
@@ -209,13 +245,13 @@ For any role different than **Super Admin**, to access the **Navigation panel**
             "uiRouterKey": "generic",
             "external": true
         },
-        < Tree Navigation Item models >
+       //  < Tree Navigation Item models >
     ]
 }
 ```
 
 ### RFR
-```
+```json
 {
     "id": "News",
     "title": "News",
@@ -234,33 +270,41 @@ For any role different than **Super Admin**, to access the **Navigation panel**
 
 ## 🕸️ Public API specification
 
-### Query Params 
+Plugin supports both **REST API** and **GraphQL API** exposed by Strapi.
 
-- `type` - Enum value representing structure type of returned navigation 
+**Query Params**
 
-    **Example URL**: `https://localhost:1337/api/navigation/render/1?type=FLAT`
+- `navigationIdOrSlug` - ID or slug for which your navigation structure is generated like for REST API:
 
-- `menu` - Boolean value for querying only navigation items that are attached to menu should be rendered eg.
+  > `https://localhost:1337/api/navigation/render/1`
+  > `https://localhost:1337/api/navigation/render/main-menu`
 
-    **Example URL**: `https://localhost:1337/api/navigation/render/1?menu=true`
+- `type` - Enum value representing structure type of returned navigation:
+  > `https://localhost:1337/api/navigation/render/1?type=FLAT`
 
-- `path` - String value for querying navigation items by its path 
+- `menu` (`menuOnly` for GQL) - Boolean value for querying only navigation items that are attached to menu should be rendered eg.
+  > `https://localhost:1337/api/navigation/render/1?menu=true`
 
-    **Example URL**: `https://localhost:1337/api/navigation/render/1?path=/home/about-us`
+- `path` - String value for querying navigation items by its path:
+  > `https://localhost:1337/api/navigation/render/1?path=/home/about-us`
 
-### Render
+### REST API
+
+> **Important!**
+> Version `v2.0.13` introduced breaking change!
+> All responses have changed their structure. Related field will now be of type ContentType instead of Array\<ContentType\>
 
-`GET <host>/api/navigation/render/<idOrSlug>?type=<type>`
+`GET <host>/api/navigation/render/<navigationIdOrSlug>?type=<type>`
 
 Return a rendered navigation structure depends on passed type (`tree`, `rfr` or nothing to render as `flat/raw`).
 
-*Note: The ID of navigation by default is `1`, that's for future extensions and multi-navigation feature.*
+> The ID of navigation by default is `1`, if you've got defined multiple navigations you must work with their IDs or Slugs to fetch.
 
 **Example URL**: `https://localhost:1337/api/navigation/render/1`
 
 **Example response body**
 
-```
+```json
 [
     {
         "id": 1,
@@ -274,14 +318,14 @@ Return a rendered navigation structure depends on passed type (`tree`, `rfr` or
         "master": 1,
         "created_at": "2020-09-29T13:29:19.086Z",
         "updated_at": "2020-09-29T13:29:19.128Z",
-        "related": [{
+        "related": {
             "__contentType": "Page",
             "id": 1,
             "title": "News",
-            ...
-        }]
+            // ...
+        }
     },
-    ...
+    // ...
 ]
 ```
 
@@ -289,7 +333,7 @@ Return a rendered navigation structure depends on passed type (`tree`, `rfr` or
 
 **Example response body**
 
-```
+```json
 [
     {
         "title": "News",
@@ -303,7 +347,7 @@ Return a rendered navigation structure depends on passed type (`tree`, `rfr` or
             "__contentType": "Page",
             "id": 1,
             "title": "News",
-            ...
+            // ...
         },
         "items": [
             {
@@ -314,10 +358,10 @@ Return a rendered navigation structure depends on passed type (`tree`, `rfr` or
                 "uiRouterKey": "generic",
                 "external": true
             },
-            ...
+            // ...
         ]
     },
-    ...
+    // ...
 ]
 ```
 
@@ -325,7 +369,7 @@ Return a rendered navigation structure depends on passed type (`tree`, `rfr` or
 
 **Example response body**
 
-```
+```json
 {
     "pages": {
         "News": {
@@ -370,7 +414,7 @@ Return a rendered navigation structure depends on passed type (`tree`, `rfr` or
             "parent": "Community",
             "menuAttached": false
         },
-        ...
+        // ...
     },
     "nav": {
         "root": [
@@ -389,7 +433,7 @@ Return a rendered navigation structure depends on passed type (`tree`, `rfr` or
                 "type": "external",
                 "url": "http://example.com"
             },
-            ...
+            // ...
         ],
         "Community": [
             {
@@ -397,10 +441,98 @@ Return a rendered navigation structure depends on passed type (`tree`, `rfr` or
                 "type": "internal",
                 "page": "Highlights"
             },
-            ...
+            // ...
         ],
-        ...
+        // ...
+    }
+}
+```
+
+### GraphQL API
+
+Same as [**REST API**](#rest-api) returns a rendered navigation structure depends on passed type (`tree`, `rfr` or nothing to render as `flat/raw`).
+
+**Example request**
+
+```graphql
+query {
+  renderNavigation(
+    navigationIdOrSlug: "main-navigation"
+    type: TREE
+    menuOnly: false
+  ) {
+    id
+    title
+    path
+    related {
+      __typename
+
+      ... on Page {
+        Title
+      }
+
+      ... on WithFlowType {
+        Name
+      }
+    }
+    items {
+      id
+      title
+      path
+      related {
+        __typename
+
+        ... on Page {
+          Title
+        }
+
+        ... on WithFlowType {
+          Name
+        }
+      }
     }
+  }
+}
+```
+
+**Example response**
+
+```json
+{
+  "data": {
+    "renderNavigation": [
+      {
+        "id": 8,
+        "title": "Test page",
+        "path": "/test-path",
+        "related": {
+          "__typename": "WithFlowType",
+          "Name": "Test"
+        },
+        "items": [
+          {
+            "id": 11,
+            "title": "Nested",
+            "path": "/test-path/nested-one",
+            "related": {
+              "__typename": "Page",
+              "Title": "Eg. Page title"
+            }
+          }
+        ]
+      },
+      {
+        "id": 10,
+        "title": "Another page",
+        "path": "/another",
+        "related": {
+          "__typename": "Page",
+          "Title": "dfdfdf"
+        },
+        "items": []
+      }
+    ]
+  }
 }
 ```
 
@@ -416,13 +548,22 @@ For single types a global name of this content type will be used as a template n
 
 Live example of plugin usage can be found in the [VirtusLab Strapi Examples](https://github.com/VirtusLab/strapi-examples/tree/master/strapi-plugin-navigation) repository.
 
-## 💬 Q&A
+## 💬 FAQ
+
+### GraphQL tricks
 
-### Content Types
+**Q:** I would like to use GraphQL schemas but I'm not getting renderNavigation query or even proper types as Navigation, NavigationItem etc. What should I do?
 
-**Q:** I've recognized **Navigation Item** and **Navigation** collection types in the Collections sidebar section, but they are not working properly. What should I do?
+**A:** There is a one trick you might try. Strapi by default is ordering plugins by the way which takes `strapi-plugin-graphql` to initialize earlier than other plugins so types might not be injected. If you don't have it yet, please create `config/plugins.js` file and put there at lease following lines:
+
+```js
+module.exports = {
+  'navigation': { enabled: true },
+  'graphql': { enabled: true },
+};
+```
 
-**A:** As an authors of the plugin we're not supporting any editing of mentioned content types via built-in Strapi Content Manager. Plugin delivers highly customized & extended functionality which might be covered only by dedicated editor UI accessible via **Plugins Section > UI Navigation**. Only issues that has been recognized there, are in the scope of support we've providing.
+If you already got it, make sure that `navigation` plugin is inserted before `graphql`. That should do the job.
 
 ## 🤝 Contributing
 

package/admin/src/components/Alert/styles.js

@@ -0,0 +1,8 @@
+import styled from 'styled-components';
+import { Alert } from '@strapi/design-system/Alert';
+
+export const PermanentAlert = styled(Alert)`
+ button {
+     display: none;
+ }
+`;

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

@@ -18,7 +18,7 @@ justify-content: center;
 height: ${32 / 16}rem;
 width: ${32 / 16}rem;
 
-cursor: pointer;
+cursor: move;
   padding: ${({ theme }) => theme.spaces[2]};
   border-radius: ${({ theme }) => theme.borderRadius};
   background: ${({ theme }) => theme.colors.neutral0};

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

@@ -22,7 +22,7 @@ import { ToggleInput } from '@strapi/design-system/ToggleInput';
 import { NumberInput } from '@strapi/design-system/NumberInput';
 import { Select, Option } from '@strapi/design-system/Select';
 import { Tooltip } from '@strapi/design-system/Tooltip';
-import { Check, Refresh, Play, Information } from '@strapi/icons';
+import { Check, Refresh, Play, Information, ExclamationMarkCircle } from '@strapi/icons';
 
 import permissions from '../../permissions';
 import useNavigationConfig from '../../hooks/useNavigationConfig';
@@ -31,6 +31,8 @@ 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';
+import { PermanentAlert } from '../../components/Alert/styles';
 
 const SettingsPage = () => {
   const { lockApp, unlockApp } = useOverlayBlocker();
@@ -56,13 +58,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,8 +110,24 @@ const SettingsPage = () => {
     )
   }
 
-  const allContentTypes = !isLoading && Object.values(allContentTypesData).filter(item => item.uid.includes('api::'));
-  const selectedContentTypes = navigationConfigData?.contentTypes.map(item => item.uid);
+  const configContentTypes = navigationConfigData?.contentTypes || [];
+
+  const allContentTypes = !isLoading && Object.values(allContentTypesData).filter(({ uid }) => isContentTypeEligible(uid, {
+    allowedContentTypes: navigationConfigData?.allowedContentTypes,
+    restrictedContentTypes: navigationConfigData?.restrictedContentTypes,
+  })).map(ct => {
+    const type = configContentTypes.find(_ => _.uid === ct.uid);
+    if (type) {
+      const { available, isSingle } = type;
+      return {
+        ...ct,
+        available,
+        isSingle,
+      };
+    }
+    return ct;
+  });
+  const selectedContentTypes = configContentTypes.map(item => item.uid);
   const audienceFieldChecked = navigationConfigData?.additionalFields.includes(navigationItemAdditionalFields.AUDIENCE);
   const allowedLevels = navigationConfigData?.allowedLevels || 2;
   const nameFields = navigationConfigData?.contentTypesNameFields || {}
@@ -190,7 +202,7 @@ const SettingsPage = () => {
                                 <Information aria-hidden={true} />
                               </Tooltip>}>
                               {orderBy(values.selectedContentTypes).map(uid => {
-                                const { attributes, info: { displayName } } = allContentTypes.find(item => item.uid == uid);
+                                const { attributes, info: { displayName }, available, isSingle } = allContentTypes.find(item => item.uid == uid);
                                 const stringAttributes = Object.keys(attributes).filter(_ => attributes[_].type === 'string');
                                 const relationAttributes = Object.keys(attributes).filter(_ => attributes[_].type === 'relation');
                                 const key = `collectionSettings-${uid}`;
@@ -200,10 +212,14 @@ const SettingsPage = () => {
                                   key={key}
                                   id={key}
                                   size="S">
-                                  <AccordionToggle title={displayName} togglePosition="left" />
+                                  <AccordionToggle title={displayName} togglePosition="left" startIcon={(isSingle && !available) && (<ExclamationMarkCircle aria-hidden={true} />)} />
                                   <AccordionContent>
                                     <Box padding={6}>
                                       <Stack spacing={4}>
+                                        { (isSingle && !available) && (
+                                          <PermanentAlert title={getMessage('pages.settings.form.contentTypesSettings.initializationWarning.title')} variant="danger" onClose={(e) => e.preventDefault()}>
+                                            { getMessage('pages.settings.form.contentTypesSettings.initializationWarning.content') }
+                                          </PermanentAlert>)}
                                         <Select
                                           name={`collectionSettings-${uid}-entryLabel`}
                                           label={getMessage('pages.settings.form.nameField.label')}

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/utils/parsers.js

@@ -25,6 +25,7 @@ export const transformItemToRESTPayload = (
     audience = [],
     items = [],
     collapsed,
+    isSingle
   } = item;
   const isExternal = type === navigationItemType.EXTERNAL;
   const isWrapper = type === navigationItemType.WRAPPER;
@@ -37,7 +38,7 @@ export const transformItemToRESTPayload = (
     find(contentTypes,
       ct => ct.uid === relatedType) :
     undefined;
-  const itemAttachedToMenu = menuAttached && parentAttachedToMenu
+  const itemAttachedToMenu = menuAttached && parentAttachedToMenu;
   return {
     id,
     parent,
@@ -59,7 +60,7 @@ export const transformItemToRESTPayload = (
       ? undefined
       : [
         {
-          refId: relatedId,
+          refId: isSingle && !relatedId ? 1 : relatedId,
           ref: relatedContentType ? relatedContentType.uid : relatedType,
           field: relatedContentType && relatedContentType.relatedField ? relatedContentType.relatedField : 'navigation',
         },

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\"",
@@ -92,6 +92,8 @@
 	"pages.settings.form.populate.empty": "This content type doesn't have any relation fields",
 	"pages.settings.form.contentTypesSettings.label": "Content types",
 	"pages.settings.form.contentTypesSettings.tooltip": "Custom configuration per content type",
+	"pages.settings.form.contentTypesSettings.initializationWarning.title": "Warning",
+	"pages.settings.form.contentTypesSettings.initializationWarning.content": "- Content Type hasn't yet been initialized. Initialize it first to be able to use in a Visual Editor.",
 	"components.navigationItem.action.newItem": "Add nested item",
 	"components.navigationItem.badge.removed": "Removed",
 	"components.navigationItem.badge.draft": "Draft",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-navigation",
-  "version": "2.0.10",
+  "version": "2.0.13",
   "description": "Strapi - Navigation plugin",
   "strapi": {
     "name": "navigation",
@@ -17,7 +17,7 @@
     "test:unit": "jest --verbose --coverage"
   },
   "dependencies": {
-    "@strapi/utils": "^4.1.5",
+    "@strapi/utils": "^4.1.8",
     "uuid": "^8.3.0",
     "lodash": "^4.17.11",
     "react": "^16.9.0",

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-item.js

@@ -10,7 +10,7 @@ module.exports = ({ nexus }) =>
 			t.nonNull.string("uiRouterKey")
 			t.nonNull.boolean("menuAttached")
 			t.nonNull.int("order")
-			t.int("parent")
+			t.field("parent", { type: "NavigationItem" })
 			t.int("master")
 			t.list.field("items", { type: 'NavigationItem' })
 			t.field("related", { type: 'NavigationRelated' })

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(viaSettingsPage),
         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,24 +139,22 @@ 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()
+    async configContentTypes(viaSettingsPage = false) {
+      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;
 
@@ -177,7 +176,9 @@ module.exports = ({ strapi }) => {
                     return returnType(itemsCountOrBypass !== 0);
                   }
                   const isAvailable = await strapi.query(uid).count();
-                  return isAvailable === 1 ? returnType(true) : undefined;
+                  return isAvailable === 1 ? 
+                    returnType(true) : 
+                    (viaSettingsPage ? returnType(false) : undefined);
                 }
                 return returnType(true);
               },
@@ -188,9 +189,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 +217,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) => viaSettingsPage || (item && item.available));
     },
 
     async getRelatedItems(entityItems) {
@@ -393,7 +395,7 @@ module.exports = ({ strapi }) => {
             master: entity.id,
             ...itemCriteria,
           },
-          limit: 0,
+          limit: Number.MAX_SAFE_INTEGER,
           sort: ['order:asc'],
           populate: ['related', 'audience', 'parent'],
         });
@@ -472,10 +474,10 @@ module.exports = ({ strapi }) => {
                 ...item,
                 audience: item.audience?.map(_ => _.key),
                 title: utilsFunctions.composeItemTitle(item, contentTypesNameFields, contentTypes),
-                related: item.related?.map(({ localizations, ...item }) => item),
+                related: last(item.related?.map(({ localizations, ...item }) => item)),
                 items: null,
               }));
-            return isNil(rootPath) ? items : utilsFunctions.filterByPath(publishedItems, rootPath).items;
+            return isNil(rootPath) ? publishedItems : utilsFunctions.filterByPath(publishedItems, rootPath).items;
         }
       }
       throw new NotFoundError();
@@ -768,7 +770,7 @@ module.exports = ({ strapi }) => {
           related_id: relatedItem.refId,
           related_type: relatedItem.ref,
         };
-        return model.delete({ where: entityToRemove }).then(({ id }) => id);
+        return model.delete({ where: entityToRemove });
       }));
     },
 

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