Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Show room create icon if "UIComponent.roomCreation" is enabled #10364

Merged
merged 14 commits into from
Apr 2, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/components/views/rooms/RoomSublist.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ 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
Expand Down Expand Up @@ -661,7 +663,7 @@ export default class RoomSublist extends React.Component<IProps, IState> {
);

let addRoomButton: JSX.Element | undefined;
if (this.props.AuxButtonComponent) {
if (this.props.AuxButtonComponent && shouldShowComponent(UIComponent.CreateRooms)) {
const AuxButtonComponent = this.props.AuxButtonComponent;
addRoomButton = <AuxButtonComponent tabIndex={tabIndex} />;
}
Expand Down
73 changes: 73 additions & 0 deletions test/components/views/rooms/RoomSublist-test.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
/*
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();
});
});