strapi-plugin-navigation 2.0.8 → 2.0.9

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;
@@ -167,15 +168,15 @@ 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

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/View/components/NavigationItemForm/index.js

@@ -77,7 +77,9 @@ const NavigationItemForm = ({
     const { onItemClick, onItemLevelAddClick, related, relatedType, menuAttached, type, ...purePayload } = payload;
     const relatedId = related
     const relatedCollectionType = relatedType;
-    const title = payload.title || relatedSelectOptions.find(v => v.key == relatedId)?.label
+    const title = isSingleSelected ?
+      relatedTypeSelectOptions.find(v => v.key == relatedType).label :
+      payload.title || relatedSelectOptions.find(v => v.key == relatedId)?.label;
     return {
       ...purePayload,
       title,
@@ -88,7 +90,7 @@ const NavigationItemForm = ({
       related: type === navigationItemType.INTERNAL ? relatedId : undefined,
       relatedType: type === navigationItemType.INTERNAL ? relatedCollectionType : undefined,
       isSingle: isSingleSelected,
-      uiRouterKey: generateUiRouterKey(purePayload.title, relatedId, relatedCollectionType),
+      uiRouterKey: generateUiRouterKey(title, relatedId, relatedCollectionType),
     };
   };
 
@@ -232,7 +234,7 @@ 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],
   );

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

@@ -122,7 +122,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 +295,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/package.json

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

package/server/services/navigation.js

@@ -33,9 +33,7 @@ module.exports = ({ strapi }) => {
       const entities = await strapi
         .query(masterModel.uid)
         .findMany({
-          paggination: {
-            limit: -1,
-          }
+          limit: -1,
         });
       return entities;
     },
@@ -52,9 +50,7 @@ module.exports = ({ strapi }) => {
           where: {
             master: id,
           },
-          paggination: {
-            limit: -1,
-          },
+          limit: -1,
           sort: ['order:asc'],
           populate: ['related', 'parent', 'audience']
         });
@@ -133,10 +129,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 });
 
@@ -632,7 +628,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 +731,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({