strapi-plugin-navigation 2.0.9 → 2.0.10

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

@@ -56,7 +56,13 @@ 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 => {
+        const singularName = allContentTypes.find(ct => ct.uid === uid).info.singularName;
+        const globalIdLike = singularName.split('-')
+          .map(_ => capitalize(_))
+          .join('')
+        return globalIdLike;
+      })
     }
   });
 

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,11 +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 = isSingleSelected ?
-      relatedTypeSelectOptions.find(v => v.key == relatedType).label :
-      payload.title || relatedSelectOptions.find(v => v.key == relatedId)?.label;
+    const title = payload.title;
+    
     return {
       ...purePayload,
       title,
@@ -90,6 +90,7 @@ const NavigationItemForm = ({
       related: type === navigationItemType.INTERNAL ? relatedId : undefined,
       relatedType: type === navigationItemType.INTERNAL ? relatedCollectionType : undefined,
       isSingle: isSingleSelected,
+      singleRelatedItem,
       uiRouterKey: generateUiRouterKey(title, relatedId, relatedCollectionType),
     };
   };
@@ -136,6 +137,7 @@ const NavigationItemForm = ({
     return undefined;
   };
 
+  const initialRelatedTypeSelected = data?.relatedType?.value;
   const relatedTypeSelectValue = form.relatedType;
   const relatedSelectValue = form.related;
 
@@ -221,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;
@@ -236,7 +241,7 @@ const NavigationItemForm = ({
         value: get(item, 'uid'),
         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,

package/package.json

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

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

@@ -33,7 +33,7 @@ module.exports = ({ strapi }) => {
       const entities = await strapi
         .query(masterModel.uid)
         .findMany({
-          limit: -1,
+          limit: 0
         });
       return entities;
     },
@@ -50,7 +50,7 @@ module.exports = ({ strapi }) => {
           where: {
             master: id,
           },
-          limit: -1,
+          limit: 0,
           sort: ['order:asc'],
           populate: ['related', 'parent', 'audience']
         });
@@ -95,9 +95,7 @@ module.exports = ({ strapi }) => {
         const audienceItems = await strapi
           .query(audienceModel.uid)
           .findMany({
-            paggination: {
-              limit: -1,
-            }
+            limit: 0
           });
         extendedResult = {
           ...extendedResult,
@@ -395,9 +393,7 @@ module.exports = ({ strapi }) => {
             master: entity.id,
             ...itemCriteria,
           },
-          paggination: {
-            limit: -1,
-          },
+          limit: 0,
           sort: ['order:asc'],
           populate: ['related', 'audience', 'parent'],
         });
@@ -424,6 +420,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,
@@ -507,7 +504,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 = [] }) {