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

Room call banner #9378

Merged
merged 23 commits into from
Oct 17, 2022
Merged
Show file tree
Hide file tree
Changes from 14 commits
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
1 change: 1 addition & 0 deletions res/css/_components.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,7 @@
@import "./views/rooms/_ReplyPreview.pcss";
@import "./views/rooms/_ReplyTile.pcss";
@import "./views/rooms/_RoomBreadcrumbs.pcss";
@import "./views/rooms/_RoomCallBanner.pcss";
@import "./views/rooms/_RoomHeader.pcss";
@import "./views/rooms/_RoomInfoLine.pcss";
@import "./views/rooms/_RoomList.pcss";
Expand Down
44 changes: 44 additions & 0 deletions res/css/views/rooms/_RoomCallBanner.pcss
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
/*
Copyright 2022 The Matrix.org Foundation C.I.C.

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.
*/

.mx_RoomCallBanner {
.mx_RoomCallBanner_text {
display: flex;
flex: 1;
align-items: center;
}
.mx_RoomCallBanner_label {
color: $primary-content;
font-weight: 600;
padding-right: 8px;
toger5 marked this conversation as resolved.
Show resolved Hide resolved

&::before {
display: inline-block;
vertical-align: text-top;
content: "";
background-color: $secondary-content;
mask-size: 16px;
width: 16px;
height: 16px;
margin-right: 4px;
bottom: 2px;
mask-image: url("$(res)/img/element-icons/call/video-call.svg");
}
}
.mx_RoomCallBanner_button {
left: 16px;
toger5 marked this conversation as resolved.
Show resolved Hide resolved
}
}
180 changes: 180 additions & 0 deletions src/components/views/beacon/RoomCallBanner.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,180 @@
/*
Copyright 2022 The Matrix.org Foundation C.I.C.

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 React, { Fragment, useCallback } from "react";
import { MatrixEvent, Room } from "matrix-js-sdk/src/matrix";

import { _t } from "../../../languageHandler";
import AccessibleButton, { ButtonEvent } from "../elements/AccessibleButton";
import dispatcher, { defaultDispatcher } from "../../../dispatcher/dispatcher";
import { ViewRoomPayload } from "../../../dispatcher/payloads/ViewRoomPayload";
import { Action } from "../../../dispatcher/actions";
import { Call, ConnectionState, ElementCall } from "../../../models/Call";
import { useCall } from "../../../hooks/useCall";
import { RoomViewStore } from "../../../stores/RoomViewStore";
import { useEventEmitterState } from "../../../hooks/useEventEmitter";
import {
OwnBeaconStore,
OwnBeaconStoreEvent,
} from "../../../stores/OwnBeaconStore";
import { CallDurationFromEvent } from "../voip/CallDuration";
import { MockedCall } from "../../../../test/test-utils/call";
toger5 marked this conversation as resolved.
Show resolved Hide resolved

interface RoomCallBannerProps {
roomId: Room["roomId"];
call: Call;
}

const RoomCallBannerInner: React.FC<RoomCallBannerProps> = ({
roomId,
call,
}) => {
let callEvent: MatrixEvent | null = null;

if (!!(call as ElementCall).groupCall) {
toger5 marked this conversation as resolved.
Show resolved Hide resolved
callEvent = (call as ElementCall).groupCall;
}
if (!!(call as MockedCall).event) {
callEvent = (call as MockedCall).event;
}
toger5 marked this conversation as resolved.
Show resolved Hide resolved

const connect = useCallback(
(ev: ButtonEvent) => {
ev.preventDefault();
defaultDispatcher.dispatch<ViewRoomPayload>({
action: Action.ViewRoom,
room_id: roomId,
view_call: true,
metricsTrigger: undefined,
});
},
[roomId],
);

const disconnect = useCallback(
(ev: ButtonEvent) => {
ev.preventDefault();
call?.disconnect();
},
[call],
);

const onClick = () => {
toger5 marked this conversation as resolved.
Show resolved Hide resolved
dispatcher.dispatch<ViewRoomPayload>({
action: Action.ViewRoom,
room_id: roomId,
metricsTrigger: undefined,
event_id: callEvent.getId(),
scroll_into_view: true,
highlighted: true,
});
};

let [buttonText, buttonKind, onButtonClick] = [null, null, null, null];
toger5 marked this conversation as resolved.
Show resolved Hide resolved

switch (call.connectionState) {
case ConnectionState.Disconnected:
[buttonText, buttonKind, onButtonClick] = [
_t("Join"),
"primary",
connect,
];
break;
case ConnectionState.Connecting:
[buttonText, buttonKind, onButtonClick] = [
_t("Join"),
"primary",
null,
];
break;
case ConnectionState.Connected:
[buttonText, buttonKind, onButtonClick] = [
_t("Leave"),
"danger",
disconnect,
];
break;
case ConnectionState.Disconnecting:
[buttonText, buttonKind, onButtonClick] = [
_t("Leave"),
toger5 marked this conversation as resolved.
Show resolved Hide resolved
"danger",
null,
];
break;
}
if (!call) return <Fragment />;
toger5 marked this conversation as resolved.
Show resolved Hide resolved

return (
<div
className="mx_RoomLiveShareWarning mx_RoomCallBanner"
toger5 marked this conversation as resolved.
Show resolved Hide resolved
onClick={onClick}
>
<div className="mx_RoomCallBanner_text">
<span className="mx_RoomCallBanner_label">{ _t("Video call") }</span>
<CallDurationFromEvent mxEvent={callEvent} />
</div>

<AccessibleButton
className="mx_RoomCallBanner_button"
data-test-id="room-live-share-primary-button"
onClick={onButtonClick}
kind={buttonKind}
element="button"
disabled={false}
>
{ buttonText }
</AccessibleButton>
</div>
);
};

interface Props {
roomId: Room["roomId"];
}

const RoomCallBanner: React.FC<Props> = ({ roomId }) => {
const call = useCall(roomId);

// this section is to check if we have a live location share. If so, we dont show the call banner
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If the comment could mention why, it could be helpful - I'm assuming because they just occupy the same space, in which case this i obviously a bit nonideal & we probably want something a bit more like the toast manager that decides which one takes precedence (but no need to block on that part).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, carry also proposed a better solution than what it currently is. (this makes testing easier though (I think) since it is all inside one component)

const isMonitoringLiveLocation = useEventEmitterState(
OwnBeaconStore.instance,
OwnBeaconStoreEvent.MonitoringLivePosition,
() => OwnBeaconStore.instance.isMonitoringLiveLocation,
);

const liveBeaconIds = useEventEmitterState(
OwnBeaconStore.instance,
OwnBeaconStoreEvent.LivenessChange,
() => OwnBeaconStore.instance.getLiveBeaconIds(roomId),
);

if (isMonitoringLiveLocation && liveBeaconIds.length) {
toger5 marked this conversation as resolved.
Show resolved Hide resolved
return null;
}

// Check if the call is already showing. No banner is needed in this case.
toger5 marked this conversation as resolved.
Show resolved Hide resolved
if (RoomViewStore.instance.isViewingCall()) {
return null;
}

// split into outer/inner to avoid watching various parts if there is no call
if (call) {
return <RoomCallBannerInner call={call} roomId={roomId} />;
}
return null;
};

export default RoomCallBanner;
2 changes: 2 additions & 0 deletions src/components/views/rooms/RoomHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ import IconizedContextMenu, {
import { ViewRoomPayload } from "../../../dispatcher/payloads/ViewRoomPayload";
import { CallDurationFromEvent } from "../voip/CallDuration";
import { Alignment } from "../elements/Tooltip";
import RoomCallBanner from '../beacon/RoomCallBanner';

class DisabledWithReason {
constructor(public readonly reason: string) { }
Expand Down Expand Up @@ -733,6 +734,7 @@ export default class RoomHeader extends React.Component<IProps, IState> {
{ betaPill }
{ buttons }
</div>
<RoomCallBanner roomId={this.props.room.roomId} />
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could avoid having RoomCallBanner depend on beacon store by doing something like:

// banners in order of priority, only one banner rendered at a time
const prioritisedBanners = [
    <RoomLiveShareWarning roomId={this.props.room.roomId} />,
    <RoomCallBanner roomId={this.props.room.roomId} />
].filter(Boolean);
const banner = prioritisedBanners[0] || null;

Would keep things simpler in RoomCallBanner, and make this more future proof

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That makes sense. It would make the tests involve the whole Room Header though.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you think it is fine leaving it like this in favor of not changing the tests?

<RoomLiveShareWarning roomId={this.props.room.roomId} />
</header>
);
Expand Down
143 changes: 143 additions & 0 deletions test/components/views/beacon/RoomCallBanner-test.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,143 @@
/*
Copyright 2022 The Matrix.org Foundation C.I.C.

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 React from "react";
import { act } from "react-dom/test-utils";
import {
Room,
PendingEventOrdering,
MatrixClient,
RoomMember,
RoomStateEvent,
} from "matrix-js-sdk/src/matrix";
import { ClientWidgetApi, Widget } from "matrix-widget-api";
import {
cleanup,
render,
screen,
} from "@testing-library/react";
import { mocked, Mocked } from "jest-mock";

import {
mkRoomMember,
MockedCall,
setupAsyncStoreWithClient,
stubClient,
useMockedCalls,
} from "../../../test-utils";
import RoomCallBanner from "../../../../src/components/views/beacon/RoomCallBanner";
import { CallStore } from "../../../../src/stores/CallStore";
import { WidgetMessagingStore } from "../../../../src/stores/widgets/WidgetMessagingStore";
import { MatrixClientPeg } from "../../../../src/MatrixClientPeg";
import { RoomViewStore } from "../../../../src/stores/RoomViewStore";
import { ConnectionState } from "../../../../src/models/Call";

describe("<RoomCallBanner />", () => {
toger5 marked this conversation as resolved.
Show resolved Hide resolved
let client: Mocked<MatrixClient>;
let room: Room;
let alice: RoomMember;
useMockedCalls();

const defaultProps = {
roomId: "!1:example.org",
};

beforeEach(() => {
stubClient();

client = mocked(MatrixClientPeg.get());

room = new Room("!1:example.org", client, "@alice:example.org", {
pendingEventOrdering: PendingEventOrdering.Detached,
});
alice = mkRoomMember(room.roomId, "@alice:example.org");
jest.spyOn(room, "getMember").mockImplementation((userId) =>
userId === alice.userId ? alice : null,
);

client.getRoom.mockImplementation((roomId) =>
roomId === room.roomId ? room : null,
);
client.getRooms.mockReturnValue([room]);
client.reEmitter.reEmit(room, [RoomStateEvent.Events]);

setupAsyncStoreWithClient(CallStore.instance, client);
setupAsyncStoreWithClient(WidgetMessagingStore.instance, client);
});

afterEach(async () => {
client.reEmitter.stopReEmitting(room, [RoomStateEvent.Events]);
});

const renderBanner = async (props = {}): Promise<void> => {
render(<RoomCallBanner {...defaultProps} {...props} />);
await act(() => Promise.resolve()); // Let effects settle
};

it("renders nothing when there is no call", async () => {
await renderBanner();
const banner = await screen.queryByText("Video call");
expect(banner).toBeFalsy();
});

describe("call started", () => {
let call: MockedCall;
let widget: Widget;

beforeEach(() => {
MockedCall.create(room, "1");
const maybeCall = CallStore.instance.getCall(room.roomId);
if (!(maybeCall instanceof MockedCall)) {throw new Error("Failed to create call");}
call = maybeCall;

widget = new Widget(call.widget);
WidgetMessagingStore.instance.storeMessaging(widget, room.roomId, {
stop: () => {},
} as unknown as ClientWidgetApi);
});
afterEach(() => {
cleanup(); // Unmount before we do any cleanup that might update the component
call.destroy();
WidgetMessagingStore.instance.stopMessaging(widget, room.roomId);
});

it("renders if there is a call", async () => {
await renderBanner();
await screen.findByText("Video call");
});

it("shows Join button if the user has not joined", async () => {
await renderBanner();
const videoCallLabel = await screen.findByText("Join");
expect(videoCallLabel.innerHTML).toBe("Join");
});

it("shows Leave button if the user has not joined", async () => {
call.setConnectionState(ConnectionState.Connected);
await renderBanner();
const videoCallLabel = await screen.findByText("Leave");
expect(videoCallLabel.innerHTML).toBe("Leave");
});

it("dont show banner if the call is shown", async () => {
jest.spyOn(RoomViewStore.instance, 'isViewingCall').mockReturnValue(false);
await renderBanner();
const videoCallLabel = await screen.findByText("Video call");
expect(videoCallLabel.innerHTML).toBe("Video call");
});
});
// TODO: add live location share warning test (should not render if there is an active live location share)
});
Loading