diff --git a/packages/client/src/components/Article/Body/Items.js b/packages/client/src/components/Article/Body/Items.js index 835b6bb17d..5eebbb19f9 100644 --- a/packages/client/src/components/Article/Body/Items.js +++ b/packages/client/src/components/Article/Body/Items.js @@ -104,7 +104,14 @@ const Item = ({ const onClickAction = React.useCallback( (folderId) => { setBufferSelection(null); - onClick && onClick(folderId, item.title, item.rootFolderType); + + onClick && + onClick( + folderId, + item.title, + item.rootFolderType, + item.security.Create + ); }, [onClick, item.title, item.rootFolderType] ); diff --git a/packages/client/src/components/Article/Body/index.js b/packages/client/src/components/Article/Body/index.js index 16a2497c84..f3053cbf31 100644 --- a/packages/client/src/components/Article/Body/index.js +++ b/packages/client/src/components/Article/Body/index.js @@ -68,7 +68,7 @@ const ArticleBodyContent = (props) => { const isAccounts = location.pathname.includes("accounts/filter"); const onClick = React.useCallback( - (folderId, title, rootFolderType) => { + (folderId, title, rootFolderType, canCreate) => { const { toggleArticleOpen } = props; let params = null; @@ -79,6 +79,7 @@ const ArticleBodyContent = (props) => { isRoot: true, isPublicRoomType: false, rootFolderType, + canCreate, }; let withTimer = !!selectedFolderId; diff --git a/packages/client/src/pages/Home/Section/Header/index.js b/packages/client/src/pages/Home/Section/Header/index.js index 1327488d88..57ec2d79c9 100644 --- a/packages/client/src/pages/Home/Section/Header/index.js +++ b/packages/client/src/pages/Home/Section/Header/index.js @@ -991,6 +991,7 @@ const SectionHeaderContent = (props) => { } const stateTitle = location?.state?.title; + const stateCanCreate = location?.state?.canCreate; const stateIsRoot = location?.state?.isRoot; const stateIsRoom = location?.state?.isRoom; const stateRootRoomTitle = location?.state?.rootRoomTitle; @@ -1009,6 +1010,11 @@ const SectionHeaderContent = (props) => { ? stateTitle : title; + const currentCanCreate = + isLoading && location?.state?.hasOwnProperty("canCreate") + ? stateCanCreate + : security?.Create; + const currentRootRoomTitle = isLoading && stateRootRoomTitle ? stateRootRoomTitle @@ -1053,7 +1059,7 @@ const SectionHeaderContent = (props) => { showText={showText} isRootFolder={isRoot} canCreate={ - (security?.Create || isAccountsPage) && + (currentCanCreate || isAccountsPage) && !isSettingsPage && !isPublicRoom }