strapi-plugin-navigation 2.2.4 → 2.2.5

package/admin/src/pages/View/components/NavigationManager/Form/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { useIntl } from "react-intl";
 import { Effect } from "../../../../../../../types";
 import { Navigation } from "../types";

package/admin/src/pages/View/components/NavigationManager/NavigationUpdate/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { Footer } from "../Footer";
 import { CommonProps, EditState } from "../types";
 interface Props extends EditState, CommonProps {

package/admin/src/pages/View/components/NavigationManager/NewNavigation/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { Footer } from "../Footer";
 import { CommonProps, CreateState, Navigation } from "../types";
 interface Props extends CreateState, CommonProps {

package/admin/src/pages/View/components/NavigationManager/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { VoidEffect } from "../../../../../../types";
 import { State } from "./types";
 interface Props {

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

@@ -40,6 +40,7 @@ const Select_1 = require("@strapi/design-system/Select");
 const helper_plugin_1 = require("@strapi/helper-plugin");
 const EmptyDocuments_1 = __importDefault(require("@strapi/icons/EmptyDocuments"));
 const Plus_1 = __importDefault(require("@strapi/icons/Plus"));
+const permissions_1 = __importDefault(require("../../permissions"));
 const NavigationItemList_1 = __importDefault(require("../../components/NavigationItemList"));
 const NavigationContentHeader_1 = __importDefault(require("./components/NavigationContentHeader"));
 const NavigationHeader_1 = __importDefault(require("./components/NavigationHeader"));
@@ -49,9 +50,15 @@ const Search_1 = __importDefault(require("../../components/Search"));
 const useDataManager_1 = __importDefault(require("../../hooks/useDataManager"));
 const translations_1 = require("../../translations");
 const parsers_1 = require("./utils/parsers");
+const NoAccessPage_1 = __importDefault(require("../NoAccessPage"));
 const View = () => {
     const toggleNotification = (0, helper_plugin_1.useNotification)();
     const { items: availableNavigations, activeItem: activeNavigation, changedActiveItem: changedActiveNavigation, config, navigationItemPopupOpened, isLoading, isLoadingForAdditionalDataToBeSet, isLoadingForSubmit, handleChangeNavigationItemPopupVisibility, handleChangeSelection, handleChangeNavigationData, handleResetNavigationData, handleSubmitNavigation, handleLocalizationSelection, handleI18nCopy, getContentTypeItems, error, availableLocale: allAvailableLocale, readNavigationItemFromLocale, slugify, } = (0, useDataManager_1.default)();
+    const viewPermissions = (0, react_1.useMemo)(() => ({
+        access: permissions_1.default.access || permissions_1.default.update,
+        update: permissions_1.default.update,
+    }), []);
+    const { isLoading: isLoadingForPermissions, allowedActions: { canAccess, canUpdate, }, } = (0, helper_plugin_1.useRBAC)(viewPermissions);
     const availableLocale = (0, react_1.useMemo)(() => allAvailableLocale.filter(locale => locale !== changedActiveNavigation?.localeCode), [changedActiveNavigation, allAvailableLocale]);
     const { i18nCopyItemsModal, i18nCopySourceLocale, setI18nCopyModalOpened, setI18nCopySourceLocale } = (0, useI18nCopyNavigationItemsModal_1.useI18nCopyNavigationItemsModal)((0, react_1.useCallback)((sourceLocale) => {
         const source = activeNavigation?.localizations?.find(({ localeCode }) => localeCode === sourceLocale);
@@ -80,15 +87,17 @@ const View = () => {
         handleChangeNavigationItemPopupVisibility(visible);
     };
     const addNewNavigationItem = (0, react_1.useCallback)((event, viewParentId = null, isMenuAllowedLevel = true, levelPath = '', parentAttachedToMenu = true, structureId = "0") => {
-        event.preventDefault();
-        event.stopPropagation();
-        changeNavigationItemPopupState(true, {
-            viewParentId,
-            isMenuAllowedLevel,
-            levelPath,
-            parentAttachedToMenu,
-            structureId,
-        });
+        if (canUpdate) {
+            event.preventDefault();
+            event.stopPropagation();
+            changeNavigationItemPopupState(true, {
+                viewParentId,
+                isMenuAllowedLevel,
+                levelPath,
+                parentAttachedToMenu,
+                structureId,
+            });
+        }
     }, [changeNavigationItemPopupState]);
     const usedContentTypesData = (0, react_1.useMemo)(() => changedActiveNavigation ? (0, parsers_1.usedContentTypes)(changedActiveNavigation.items) : [], [changedActiveNavigation]);
     const pullUsedContentTypeItem = (items = []) => items.reduce((prev, curr) => [...prev, curr.relatedRef ? {
@@ -198,7 +207,9 @@ const View = () => {
             tradId: 'header.action.collapseAll',
             margin: '8px',
         },
-        {
+    ];
+    if (canUpdate) {
+        endActions.push({
             onClick: addNewNavigationItem,
             startIcon: react_1.default.createElement(Plus_1.default, null),
             disabled: isLoadingForSubmit,
@@ -206,12 +217,17 @@ const View = () => {
             variant: "default",
             tradId: 'header.action.newItem',
             margin: '16px',
-        },
-    ];
+        });
+    }
+    if (!canAccess && !isLoadingForPermissions) {
+        return (react_1.default.createElement(NoAccessPage_1.default, null));
+    }
     return (react_1.default.createElement(Main_1.Main, { labelledBy: "title", "aria-busy": isLoadingForSubmit },
-        react_1.default.createElement(NavigationHeader_1.default, { structureHasErrors: structureHasErrors, structureHasChanged: structureChanged, availableNavigations: availableNavigations, activeNavigation: activeNavigation, handleChangeSelection: handleChangeNavigationSelection, handleSave: handleSave, handleLocalizationSelection: handleLocalizationSelection, config: config }),
+        react_1.default.createElement(NavigationHeader_1.default, { structureHasErrors: structureHasErrors, structureHasChanged: structureChanged, availableNavigations: availableNavigations, activeNavigation: activeNavigation, handleChangeSelection: handleChangeNavigationSelection, handleSave: handleSave, handleLocalizationSelection: handleLocalizationSelection, config: config, permissions: {
+                canAccess, canUpdate
+            } }),
         react_1.default.createElement(Layout_1.ContentLayout, null,
-            isLoading && react_1.default.createElement(helper_plugin_1.LoadingIndicatorPage, null),
+            (isLoading || isLoadingForPermissions) && react_1.default.createElement(helper_plugin_1.LoadingIndicatorPage, null),
             changedActiveNavigation && (react_1.default.createElement(react_1.default.Fragment, null,
                 react_1.default.createElement(NavigationContentHeader_1.default, { startActions: react_1.default.createElement(Search_1.default, { value: searchValue, setValue: setSearchValue }), endActions: endActions.map(({ tradId, margin, ...item }, i) => react_1.default.createElement(Box_1.Box, { marginLeft: margin, key: i },
                         react_1.default.createElement(Button_1.Button, { ...item },
@@ -222,8 +238,8 @@ const View = () => {
                     react_1.default.createElement(Icon_1.Icon, { as: EmptyDocuments_1.default, width: "160px", height: "88px", color: "" }),
                     react_1.default.createElement(Box_1.Box, { padding: 4 },
                         react_1.default.createElement(Typography_1.Typography, { variant: "beta", textColor: "neutral600" }, formatMessage((0, translations_1.getTrad)('empty')))),
-                    react_1.default.createElement(Button_1.Button, { variant: 'secondary', startIcon: react_1.default.createElement(Plus_1.default, null), label: formatMessage((0, translations_1.getTrad)('empty.cta')), onClick: addNewNavigationItem }, formatMessage((0, translations_1.getTrad)('empty.cta'))),
-                    config.i18nEnabled && availableLocale.length ? (react_1.default.createElement(Flex_1.Flex, { direction: "column", justifyContent: "center" },
+                    canUpdate && (react_1.default.createElement(Button_1.Button, { variant: 'secondary', startIcon: react_1.default.createElement(Plus_1.default, null), label: formatMessage((0, translations_1.getTrad)('empty.cta')), onClick: addNewNavigationItem }, formatMessage((0, translations_1.getTrad)('empty.cta')))),
+                    canUpdate && config.i18nEnabled && availableLocale.length ? (react_1.default.createElement(Flex_1.Flex, { direction: "column", justifyContent: "center" },
                         react_1.default.createElement(Box_1.Box, { paddingTop: 3, paddingBottom: 3 },
                             react_1.default.createElement(Typography_1.Typography, { variant: "beta", textColor: "neutral600" }, formatMessage((0, translations_1.getTrad)('view.i18n.fill.cta')))),
                         react_1.default.createElement(Flex_1.Flex, { direction: "row", justifyContent: "center", alignItems: "center" },
@@ -232,9 +248,13 @@ const View = () => {
                             react_1.default.createElement(Box_1.Box, { paddingLeft: 1, paddingRight: 1 },
                                 react_1.default.createElement(Button_1.Button, { variant: "tertiary", onClick: openI18nCopyModalOpened, disabled: !i18nCopySourceLocale, size: "S" }, formatMessage((0, translations_1.getTrad)('view.i18n.fill.cta.button'))))))) : null)),
                 !(0, lodash_1.isEmpty)(changedActiveNavigation.items || [])
-                    && react_1.default.createElement(NavigationItemList_1.default, { items: isSearchEmpty ? changedActiveNavigation.items || [] : filteredList, onItemLevelAdd: addNewNavigationItem, onItemRemove: handleItemRemove, onItemEdit: handleItemEdit, onItemRestore: handleItemRestore, onItemReOrder: handleItemReOrder, onItemToggleCollapse: handleItemToggleCollapse, displayFlat: !isSearchEmpty, root: true, error: error, allowedLevels: config.allowedLevels, contentTypes: config.contentTypes, isParentAttachedToMenu: true, contentTypesNameFields: config.contentTypesNameFields })))),
-        navigationItemPopupOpened && react_1.default.createElement(NavigationItemPopup_1.default, { availableLocale: availableLocale, isLoading: isLoadingForAdditionalDataToBeSet, data: activeNavigationItem, config: config, usedContentTypesData: usedContentTypesData, usedContentTypeItems: usedContentTypeItems, getContentTypeItems: getContentTypeItems, onSubmit: handleSubmitNavigationItem, onClose: onPopUpClose, locale: activeNavigation.localeCode, readNavigationItemFromLocale: readNavigationItemFromLocale, slugify: slugify }),
-        i18nCopyItemsModal));
+                    && react_1.default.createElement(NavigationItemList_1.default, { items: isSearchEmpty ? changedActiveNavigation.items || [] : filteredList, onItemLevelAdd: addNewNavigationItem, onItemRemove: handleItemRemove, onItemEdit: handleItemEdit, onItemRestore: handleItemRestore, onItemReOrder: handleItemReOrder, onItemToggleCollapse: handleItemToggleCollapse, displayFlat: !isSearchEmpty, root: true, error: error, allowedLevels: config.allowedLevels, contentTypes: config.contentTypes, isParentAttachedToMenu: true, contentTypesNameFields: config.contentTypesNameFields, permissions: {
+                            canAccess, canUpdate
+                        } })))),
+        navigationItemPopupOpened && react_1.default.createElement(NavigationItemPopup_1.default, { availableLocale: availableLocale, isLoading: isLoadingForAdditionalDataToBeSet, data: activeNavigationItem, config: config, usedContentTypesData: usedContentTypesData, usedContentTypeItems: usedContentTypeItems, getContentTypeItems: getContentTypeItems, onSubmit: handleSubmitNavigationItem, onClose: onPopUpClose, locale: activeNavigation.localeCode, readNavigationItemFromLocale: readNavigationItemFromLocale, slugify: slugify, permissions: {
+                canAccess, canUpdate
+            } }),
+        canUpdate && i18nCopyItemsModal));
 };
 exports.default = (0, react_1.memo)(View);
 //# sourceMappingURL=index.js.map

package/admin/src/permissions.d.ts

@@ -8,5 +8,9 @@ declare namespace pluginPermissions {
         action: string;
         subject: null;
     }[];
+    const settings: {
+        action: string;
+        subject: null;
+    }[];
 }
 //# sourceMappingURL=permissions.d.ts.map

package/admin/src/permissions.js

@@ -7,6 +7,7 @@ const permissions_1 = __importDefault(require("../../permissions"));
 const pluginPermissions = {
     access: [{ action: permissions_1.default.render(permissions_1.default.navigation.read), subject: null }],
     update: [{ action: permissions_1.default.render(permissions_1.default.navigation.update), subject: null }],
+    settings: [{ action: permissions_1.default.render(permissions_1.default.navigation.settings), subject: null }],
 };
 exports.default = pluginPermissions;
 //# sourceMappingURL=permissions.js.map

package/admin/src/translations/en.json

@@ -10,6 +10,7 @@
     "submit.cta.save": "Save",
     "empty": "Your navigation is empty",
     "empty.cta": "Create first item",
+    "popup.item.header.view": "View navigation item",
     "popup.item.header.edit": "Edit navigation item",
     "popup.item.header.new": "New navigation item",
     "popup.item.form.title.label": "Title",
@@ -83,6 +84,8 @@
     "notification.error": "Error while processing request.",
     "notification.error.customField.type": "Unsupported type of custom field",
     "notification.error.item.relation": "Relations provided in some items are incorrect",
+    "page.auth.noAccess": "No access",
+    "page.auth.not.allowed": "Oops! It seems like You do not have access to this page...",
     "pages.main.search.placeholder": "Type to start searching...",
     "pages.main.header.localization.select.placeholder": "Select locale",
     "pages.settings.general.title": "General settings",
@@ -185,6 +188,10 @@
     "pages.settings.form.customFields.popup.options.description": "Enabling this field will not change already exiting navigation items",
     "pages.settings.form.customFields.popup.multi.label": "Enable multiple options input",
     "components.navigationItem.action.newItem": "Add nested item",
+    "components.navigationItem.action.edit": "Edit",
+    "components.navigationItem.action.view": "View",
+    "components.navigationItem.action.restore": "Restore",
+    "components.navigationItem.action.remove": "Remove",
     "components.navigationItem.badge.removed": "Removed",
     "components.navigationItem.badge.draft": "Draft",
     "components.navigationItem.badge.published": "Published",
@@ -192,6 +199,7 @@
     "components.confirmation.dialog.button.confirm": "Confirm",
     "components.confirmation.dialog.description": "Do you want to continue?",
     "components.confirmation.dialog.header": "Confirmation",
+    "components.notAccessPage.back": "Back to homepage",
     "view.i18n.fill.cta": "or bootstrap",
     "view.i18n.fill.option": "{locale} locale",
     "view.i18n.fill.cta.button": "copy"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-navigation",
-  "version": "2.2.4",
+  "version": "2.2.5",
   "description": "Strapi - Navigation plugin",
   "strapi": {
     "name": "navigation",
@@ -15,7 +15,7 @@
   "scripts": {},
   "dependencies": {
     "@sindresorhus/slugify": "1.1.0",
-    "@strapi/utils": "^4.6.0",
+    "@strapi/utils": "^4.9.0",
     "lodash": "^4.17.11",
     "pluralize": "^8.0.0",
     "react": "^16.9.0",

package/permissions.d.ts

@@ -3,6 +3,7 @@ declare const _default: {
     navigation: {
         read: string;
         update: string;
+        settings: string;
     };
 };
 export default _default;

package/permissions.js

@@ -7,6 +7,7 @@ exports.default = {
     navigation: {
         read: 'read',
         update: 'update',
+        settings: 'settings',
     },
 };
 //# sourceMappingURL=permissions.js.map

package/server/bootstrap/index.js

@@ -28,6 +28,12 @@ const setupPermissions = async ({ strapi }) => {
             uid: permissions_1.default.navigation.update,
             pluginName: "navigation",
         },
+        {
+            section: "plugins",
+            displayName: "Settings",
+            uid: permissions_1.default.navigation.settings,
+            pluginName: "navigation",
+        },
     ];
     await strapi.admin.services.permission.actionProvider.registerMany(actions);
 };