Fix add existing rooms button (#7728)

matrix-org · Feb 7, 2022 · 472115c · 472115c
1 parent 7f3f186
commit 472115c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/components/views/rooms/RoomListHeader.tsx b/src/components/views/rooms/RoomListHeader.tsx
@@ -32,6 +32,7 @@ import defaultDispatcher from "../../../dispatcher/dispatcher";
 import dis from "../../../dispatcher/dispatcher";
 import {
     shouldShowSpaceInvite,
+    showAddExistingRooms,
     showCreateNewRoom,
     showCreateNewSubspace,
     showSpaceInvite,
@@ -198,6 +199,7 @@ const RoomListHeader = ({ spacePanelDisabled, onVisibilityChange }: IProps) => {
     }
 
     const communityId = CommunityPrototypeStore.instance.getSelectedCommunityId();
+    const canAddRooms = activeSpace?.currentState?.maySendStateEvent(EventType.SpaceChild, cli.getUserId());
 
     let contextMenu: JSX.Element;
     if (mainMenuDisplayed) {
@@ -283,9 +285,11 @@ const RoomListHeader = ({ spacePanelDisabled, onVisibilityChange }: IProps) => {
                     onClick={(e) => {
                         e.preventDefault();
                         e.stopPropagation();
-                        showCreateNewRoom(activeSpace);
+                        showAddExistingRooms(activeSpace);
                         closePlusMenu();
                     }}
+                    disabled={!canAddRooms}
+                    tooltip={!canAddRooms && _t("You do not have permissions to add rooms to this space")}
                 />
                 <IconizedContextMenuOption
                     label={_t("Add space")}
@@ -296,6 +300,8 @@ const RoomListHeader = ({ spacePanelDisabled, onVisibilityChange }: IProps) => {
                         showCreateNewSubspace(activeSpace);
                         closePlusMenu();
                     }}
+                    disabled={!canAddRooms}
+                    tooltip={!canAddRooms && _t("You do not have permissions to add spaces to this space")}
                 >
                     <BetaPill />
                 </IconizedContextMenuOption>

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
@@ -1781,6 +1781,7 @@
     "%(count)s results|one": "%(count)s result",
     "Invite": "Invite",
     "Add space": "Add space",
+    "You do not have permissions to add spaces to this space": "You do not have permissions to add spaces to this space",
     "Join public room": "Join public room",
     "Currently joining %(count)s rooms|other": "Currently joining %(count)s rooms",
     "Currently joining %(count)s rooms|one": "Currently joining %(count)s room",