From ac1ea8e47ae5fe95b0e45b296dad843a51938811 Mon Sep 17 00:00:00 2001
From: Mikhail Aheichyk <mikhail.aheichyk@nordeck.net>
Date: Fri, 17 Mar 2023 18:00:58 +0300
Subject: [PATCH] Revert "Show room create button in RoomSublist if
 "UIComponent.roomCreation" is enabled"

This reverts commit a332a0b02a6c3253ea7ac606211c41a09c409de5.
---
 src/components/views/rooms/RoomSublist.tsx    |  4 +-
 .../views/rooms/RoomSublist-test.tsx          | 73 -------------------
 2 files changed, 1 insertion(+), 76 deletions(-)
 delete mode 100644 test/components/views/rooms/RoomSublist-test.tsx

diff --git a/src/components/views/rooms/RoomSublist.tsx b/src/components/views/rooms/RoomSublist.tsx
index bdeed9934e4..6e471dde428 100644
--- a/src/components/views/rooms/RoomSublist.tsx
+++ b/src/components/views/rooms/RoomSublist.tsx
@@ -55,8 +55,6 @@ import SettingsStore from "../../../settings/SettingsStore";
 import { SlidingSyncManager } from "../../../SlidingSyncManager";
 import NotificationBadge from "./NotificationBadge";
 import RoomTile from "./RoomTile";
-import { shouldShowComponent } from "../../../customisations/helpers/UIComponents";
-import { UIComponent } from "../../../settings/UIFeature";
 
 const SHOW_N_BUTTON_HEIGHT = 28; // As defined by CSS
 const RESIZE_HANDLE_HEIGHT = 4; // As defined by CSS
@@ -663,7 +661,7 @@ export default class RoomSublist extends React.Component<IProps, IState> {
                     );
 
                     let addRoomButton: JSX.Element | undefined;
-                    if (this.props.AuxButtonComponent && shouldShowComponent(UIComponent.CreateRooms)) {
+                    if (this.props.AuxButtonComponent) {
                         const AuxButtonComponent = this.props.AuxButtonComponent;
                         addRoomButton = <AuxButtonComponent tabIndex={tabIndex} />;
                     }
diff --git a/test/components/views/rooms/RoomSublist-test.tsx b/test/components/views/rooms/RoomSublist-test.tsx
deleted file mode 100644
index 60d8cffa23c..00000000000
--- a/test/components/views/rooms/RoomSublist-test.tsx
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-Copyright 2023 Mikhail Aheichyk
-Copyright 2023 Nordeck IT + Consulting GmbH.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import { render, RenderResult, screen } from "@testing-library/react";
-import { ComponentProps } from "react";
-import React from "react";
-import { EventEmitter } from "events";
-import { mocked } from "jest-mock";
-
-import RoomSublist, { IAuxButtonProps } from "../../../../src/components/views/rooms/RoomSublist";
-import { DefaultTagID } from "../../../../src/stores/room-list/models";
-import ResizeNotifier from "../../../../src/utils/ResizeNotifier";
-import AccessibleButton from "../../../../src/components/views/elements/AccessibleButton";
-import { shouldShowComponent } from "../../../../src/customisations/helpers/UIComponents";
-import { UIComponent } from "../../../../src/settings/UIFeature";
-
-jest.mock("../../../../src/customisations/helpers/UIComponents", () => ({
-    shouldShowComponent: jest.fn(),
-}));
-
-const AuxButton: React.FC<IAuxButtonProps> = ({ tabIndex }) => {
-    return <AccessibleButton onClick={jest.fn()}>Add room</AccessibleButton>;
-};
-
-describe("RoomSublist", () => {
-    function renderComponent(props: Partial<ComponentProps<typeof RoomSublist>> = {}): RenderResult {
-        return render(
-            <RoomSublist
-                forRooms={true}
-                startAsHidden={false}
-                label="Rooms"
-                AuxButtonComponent={AuxButton}
-                isMinimized={false}
-                tagId={DefaultTagID.Untagged}
-                resizeNotifier={new EventEmitter() as unknown as ResizeNotifier}
-                alwaysVisible={true}
-                {...props}
-            />,
-        );
-    }
-
-    it("does not render when UIComponent customisations disable room creation", () => {
-        mocked(shouldShowComponent).mockReturnValue(false);
-
-        renderComponent();
-
-        expect(shouldShowComponent).toHaveBeenCalledWith(UIComponent.CreateRooms);
-        expect(screen.queryByRole("button", { name: "Add room" })).not.toBeInTheDocument();
-    });
-
-    it("renders when UIComponent customisations enable room creation", () => {
-        mocked(shouldShowComponent).mockReturnValue(true);
-
-        renderComponent();
-
-        expect(shouldShowComponent).toHaveBeenCalledWith(UIComponent.CreateRooms);
-        expect(screen.getByRole("button", { name: "Add room" })).toBeInTheDocument();
-    });
-});