From df968b758ee77abe82dd40c760fef160de9b4ddc Mon Sep 17 00:00:00 2001 From: Timofey Boyko <55255132+TimofeyBoyko@users.noreply.github.com> Date: Wed, 22 Feb 2023 12:58:53 +0300 Subject: [PATCH] Web:Client:Article: remove custom check for disabled state --- .../client/src/components/Article/MainButton/index.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/client/src/components/Article/MainButton/index.js b/packages/client/src/components/Article/MainButton/index.js index 2ec69084bc..37a7474bf4 100644 --- a/packages/client/src/components/Article/MainButton/index.js +++ b/packages/client/src/components/Article/MainButton/index.js @@ -121,6 +121,7 @@ const ArticleMainButtonContent = (props) => { mainButtonMobileVisible, isCollaborator, + security, } = props; const isAccountsPage = selectedTreeNode[0] === "accounts"; @@ -446,10 +447,7 @@ const ArticleMainButtonContent = (props) => { ? t("Common:Invite") : t("Common:Actions"); - const isDisabled = - ((!canCreate || (!canCreateFiles && !isRoomsFolder)) && !canInvite) || - isArchiveFolder || - (isCollaborator && isRoomsFolder); + const isDisabled = isAccountsPage ? !canInvite : !security?.Create; const isProfile = history.location.pathname === "/accounts/view/@self"; @@ -553,6 +551,8 @@ export default inject( const { enablePlugins, currentColorScheme } = auth.settingsStore; + const security = selectedFolderStore.security; + const currentFolderId = selectedFolderStore.id; const { isAdmin, isOwner, isVisitor, isCollaborator } = auth.userStore.user; @@ -595,6 +595,7 @@ export default inject( isCollaborator, mainButtonMobileVisible, + security, }; } )(