Merge branch 'eik/hide_labs_and_sharedinvites' of https://github.com/…

…verji/matrix-react-sdk into eik/hide_labs_and_sharedinvites

src/components/views/rooms/RoomList.tsx

@@ -163,7 +163,7 @@ const DmAuxButton: React.FC<IAuxButtonProps> = ({ tabIndex, dispatcher = default
                                 }}
                             />
                         )}
-                        {showInviteUsers && (
+                        {showInviteUsers && SettingsStore.getValue(UIFeature.ShowInviteToSpaceFromPeoplePlus) && (
                             <IconizedContextMenuOption
                                 label={_t("action|invite_to_space")}
                                 iconClassName="mx_RoomList_iconInvite"
@@ -193,7 +193,6 @@ const DmAuxButton: React.FC<IAuxButtonProps> = ({ tabIndex, dispatcher = default
                     isExpanded={menuDisplayed}
                     ref={handle}
                 />
-
                 {contextMenu}
             </>
         );

src/i18n/strings/en_EN.json

@@ -81,6 +81,11 @@
             "monday_friday": "Monday - Friday",
             "opening_hours": "08.00 - 16.00",
             "support_phone": "Phone +4790532454"
+        },
+        "user_menu" : {
+            "administration_portal": "Administration portal",
+            "signing_order": "Signing orders",
+            "login_account": "Account & Login"
         }
    },
     "a11y": {

src/i18n/strings/nb_NO.json

@@ -81,6 +81,11 @@
           "support_phone": "Telefon",
           "monday_friday": "Mandag - Fredag",
           "08.00_16.00": "08.00 - 16.00"
+        },
+        "user_menu" : {
+            "administration_portal": "Administrasjonsportal",
+            "signing_order": "Signeringsordre",
+            "login_account": "Konto og innlogging"
         }
     },
   "%(duration)sd": "%(duration)sd",

src/settings/Settings.tsx

@@ -1507,6 +1507,10 @@ export const SETTINGS: { [setting: string]: ISetting } = {
         supportedLevels: LEVELS_UI_FEATURE,
         default: true,
     },
+    [UIFeature.ShowInviteToSpaceFromPeoplePlus]: {
+        supportedLevels: LEVELS_UI_FEATURE,
+        default: true,
+    },
 
     // Electron-specific settings, they are stored by Electron and set/read over an IPC.
     // We store them over there are they are necessary to know before the renderer process launches.

src/settings/UIFeature.ts

@@ -100,6 +100,7 @@ export const enum UIFeature {
     ShowSendMessageToUserLink = "UIFeature.showSendMessageToUserLink",
     SendInviteLinkPrompt = "UIFeature.sendInviteLinkPrompt",
     HelpShowMatrixDisclosurePolicyAndLinks = "UIFeature.helpShowMatrixDisclosurePolicyAndLinks",
+    ShowInviteToSpaceFromPeoplePlus = "UIFeature.showInviteToSpaceFromPeoplePlus",
     SettingShowMessageSearch = "UIFeature.settingShowMessageSearch",
 }
 

test/components/views/rooms/RoomList-test.tsx

@@ -51,7 +51,6 @@ DMRoomMap.sharedInstance = { getUserIdForRoomId, getDMRoomsForUserId };
 
 describe("UIFeature tests", () => {
     stubClient();
-    //const client = MatrixClientPeg.safeGet();
     const store = SpaceStore.instance;
 
     function getComponent(props: Partial<ComponentProps<typeof RoomList>> = {}): JSX.Element {
@@ -383,3 +382,68 @@ describe("RoomList", () => {
         });
     });
 });
+
+describe("UIFeature tests part 2", () => {
+    stubClient();
+    const store = SpaceStore.instance;
+
+    function getComponent(props: Partial<ComponentProps<typeof RoomList>> = {}): JSX.Element {
+        return (
+            <RoomList
+                onKeyDown={jest.fn()}
+                onFocus={jest.fn()}
+                onBlur={jest.fn()}
+                onResize={jest.fn()}
+                resizeNotifier={new ResizeNotifier()}
+                isMinimized={false}
+                activeSpace={MetaSpace.Home}
+                {...props}
+            />
+        );
+    }
+    beforeEach(() => {
+        store.setActiveSpace(MetaSpace.Home);
+        mocked(shouldShowComponent).mockImplementation((feature) => true);
+    });
+    describe("UIFeature.showInviteToSpaceFromPeoplePlus", () => {
+        stubClient();
+        const client = MatrixClientPeg.safeGet();
+        const store = SpaceStore.instance;
+        let rooms: Room[];
+        const mkSpaceForRooms = (spaceId: string, children: string[] = []) => mkSpace(client, spaceId, rooms, children);
+
+        const space1 = "!verjispace1:server";
+
+        beforeEach(async () => {
+            rooms = [];
+            mkSpaceForRooms(space1);
+            mocked(client).getRoom.mockImplementation((roomId) => rooms.find((room) => room.roomId === roomId) || null);
+            await testUtils.setupAsyncStoreWithClient(store, client);
+
+            store.setActiveSpace(space1);
+        });
+        it("UIFeature.showInviteToSpaceFromPeoplePlus = true: renders 'Invite to space'-button", async () => {
+            jest.spyOn(SettingsStore, "getValue").mockImplementation((name: string) => {
+                if (name == UIFeature.ShowInviteToSpaceFromPeoplePlus) return true;
+                return false;
+            });
+            render(getComponent());
+            const peoplePlusButton = screen.getByLabelText("Add people");
+            await userEvent.click(peoplePlusButton);
+
+            expect(screen.getByLabelText("Invite to space")).toBeInTheDocument();
+        });
+
+        it("UIFeature.showInviteToSpaceFromPeoplePlus = false: does not render 'Invite to space'-button", async () => {
+            jest.spyOn(SettingsStore, "getValue").mockImplementation((name: string) => {
+                if (name == UIFeature.ShowInviteToSpaceFromPeoplePlus) return false;
+                return false;
+            });
+            render(getComponent());
+            const peoplePlusButton = screen.getByLabelText("Add people");
+            await userEvent.click(peoplePlusButton);
+
+            expect(screen.queryByLabelText("Invite to space")).not.toBeInTheDocument();
+        });
+    });
+});