strapi-plugin-navigation 2.0.11 → 2.0.12

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/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';
@@ -32,6 +32,7 @@ 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();
@@ -109,11 +110,24 @@ const SettingsPage = () => {
     )
   }
 
+  const configContentTypes = navigationConfigData?.contentTypes || [];
+
   const allContentTypes = !isLoading && Object.values(allContentTypesData).filter(({ uid }) => isContentTypeEligible(uid, {
     allowedContentTypes: navigationConfigData?.allowedContentTypes,
     restrictedContentTypes: navigationConfigData?.restrictedContentTypes,
-  }));
-  const selectedContentTypes = navigationConfigData?.contentTypes.map(item => item.uid);
+  })).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 || {}
@@ -188,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}`;
@@ -198,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/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

@@ -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.11",
+  "version": "2.0.12",
   "description": "Strapi - Navigation plugin",
   "strapi": {
     "name": "navigation",

package/server/services/navigation.js

@@ -79,7 +79,7 @@ module.exports = ({ strapi }) => {
         restrictedContentTypes: RESTRICTED_CONTENT_TYPES,
       };
       const result = {
-        contentTypes: await this.configContentTypes(),
+        contentTypes: await this.configContentTypes(viaSettingsPage),
         contentTypesNameFields: {
           default: contentTypesNameFieldsDefaults,
           ...(isObject(contentTypesNameFields) ? contentTypesNameFields : {}),
@@ -144,7 +144,7 @@ module.exports = ({ strapi }) => {
       await strapi.plugin('navigation').service('navigation').setDefaultConfig();
     },
 
-    async configContentTypes() {
+    async configContentTypes(viaSettingsPage = false) {
       const pluginStore = await this.getPluginStore()
       const config = await pluginStore.get({ key: 'config' });
       const eligibleContentTypes =
@@ -154,6 +154,7 @@ module.exports = ({ strapi }) => {
             .map(
               async (key) => {
                 const item = strapi.contentTypes[key];
+
                 const { kind, options, uid } = item;
                 const { draftAndPublish } = options;
 
@@ -175,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);
               },
@@ -219,7 +222,7 @@ module.exports = ({ strapi }) => {
             templateName,
           };
         })
-        .filter((item) => item && item.available);
+        .filter((item) => viaSettingsPage || (item && item.available));
     },
 
     async getRelatedItems(entityItems) {
@@ -767,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 });
       }));
     },