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

Support joining non-peekable rooms via the module API #10154

Merged
merged 12 commits into from
Feb 23, 2023
Merged

Support joining non-peekable rooms via the module API #10154

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
5a44a0f
Room joining via module is possible with any 'history_visibility'
Feb 13, 2023
cf18de7
test fix, field comment update
Feb 14, 2023
a753260
test fix
Feb 14, 2023
e0c119c
RoomPreviewBar roomId is optional
Feb 17, 2023
56afd78
room prop not needed, this.state.room is falsey in this case
Feb 17, 2023
7bb6f64
prettier
Feb 21, 2023
486e560
Merge branch 'develop' into module_login_history_visibility_any
maheichyk Feb 21, 2023
4a8d6e4
comment updated
Feb 21, 2023
0dc0807
Update src/components/views/rooms/RoomPreviewBar.tsx
maheichyk Feb 21, 2023
82ca0ac
Update src/components/views/rooms/RoomPreviewBar.tsx
maheichyk Feb 21, 2023
d8ed26e
reverted not needed lines of RoomPreviewBar-test.tsx
Feb 21, 2023
eac3e4a
roomId is moved to the room
Feb 21, 2023
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
5 changes: 5 additions & 0 deletions src/components/structures/RoomView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1903,6 +1903,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
loading={loading}
joining={this.state.joining}
oobData={this.props.oobData}
roomId={this.state.roomId}
richvdh marked this conversation as resolved.
Show resolved Hide resolved
/>
</ErrorBoundary>
</div>
Expand Down Expand Up @@ -1933,6 +1934,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
oobData={this.props.oobData}
signUrl={this.props.threepidInvite?.signUrl}
room={this.state.room}
richvdh marked this conversation as resolved.
Show resolved Hide resolved
roomId={this.state.roomId}
/>
</ErrorBoundary>
</div>
Expand Down Expand Up @@ -1969,6 +1971,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
error={this.state.roomLoadError}
joining={this.state.joining}
rejecting={this.state.rejecting}
roomId={this.state.roomId}
/>
</ErrorBoundary>
);
Expand Down Expand Up @@ -1998,6 +2001,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
canPreview={false}
joining={this.state.joining}
room={this.state.room}
roomId={this.state.roomId}
/>
</ErrorBoundary>
</div>
Expand Down Expand Up @@ -2090,6 +2094,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
oobData={this.props.oobData}
canPreview={this.state.canPeek}
room={this.state.room}
roomId={this.state.roomId}
/>
);
if (!this.state.canPeek && !this.state.room?.isSpaceRoom()) {
Expand Down
15 changes: 7 additions & 8 deletions src/components/views/rooms/RoomPreviewBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@ enum MessageCase {
}

interface IProps {
// The id of the room to be previewed
maheichyk marked this conversation as resolved.
Show resolved Hide resolved
roomId: string;
richvdh marked this conversation as resolved.
Show resolved Hide resolved

// if inviterName is specified, the preview bar will shown an invite to the room.
// You should also specify onRejectClick if specifying inviterName
inviterName?: string;
Expand All @@ -76,6 +79,8 @@ interface IProps {

canPreview?: boolean;
previewLoading?: boolean;

// The room to be previewed
richvdh marked this conversation as resolved.
Show resolved Hide resolved
room?: Room;

loading?: boolean;
Expand Down Expand Up @@ -310,18 +315,12 @@ export default class RoomPreviewBar extends React.Component<IProps, IState> {
}
case MessageCase.NotLoggedIn: {
const opts: RoomPreviewOpts = { canJoin: false };
if (this.props.room?.roomId) {
ModuleRunner.instance.invoke(
RoomViewLifecycle.PreviewRoomNotLoggedIn,
opts,
this.props.room.roomId,
);
}
ModuleRunner.instance.invoke(RoomViewLifecycle.PreviewRoomNotLoggedIn, opts, this.props.roomId);
if (opts.canJoin) {
title = _t("Join the room to participate");
primaryActionLabel = _t("Join");
primaryActionHandler = () => {
ModuleRunner.instance.invoke(RoomViewLifecycle.JoinFromRoomPreview, this.props.room.roomId);
ModuleRunner.instance.invoke(RoomViewLifecycle.JoinFromRoomPreview, this.props.roomId);
};
richvdh marked this conversation as resolved.
Show resolved Hide resolved
} else {
title = _t("Join the conversation with an account");
Expand Down
5 changes: 3 additions & 2 deletions test/components/views/rooms/RoomPreviewBar-test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,9 @@ describe("<RoomPreviewBar />", () => {
const inviterUserId = "@inviter:test.com";
const otherUserId = "@othertester:test.com";

const getComponent = (props: ComponentProps<typeof RoomPreviewBar> = {}) => {
const getComponent = (props: Omit<ComponentProps<typeof RoomPreviewBar>, 'roomId'> = {}) => {
const defaultProps = {
roomId,
room: createRoom(roomId, userId),
};
return render(<RoomPreviewBar {...defaultProps} {...props} />);
Expand Down Expand Up @@ -324,7 +325,7 @@ describe("<RoomPreviewBar />", () => {
{ medium: "not-email", address: "address 2" },
];

const testJoinButton = (props: ComponentProps<typeof RoomPreviewBar>) => async () => {
const testJoinButton = (props: Omit<ComponentProps<typeof RoomPreviewBar>, 'roomId'>) => async () => {
const onJoinClick = jest.fn();
const onRejectClick = jest.fn();
const component = getComponent({ ...props, onJoinClick, onRejectClick });
Expand Down