diff --git a/matrix-meetings-widget/src/components/cockpit/CockpitPanel/CockpitPanel.tsx b/matrix-meetings-widget/src/components/cockpit/CockpitPanel/CockpitPanel.tsx index 140c25fa..f85b6d91 100644 --- a/matrix-meetings-widget/src/components/cockpit/CockpitPanel/CockpitPanel.tsx +++ b/matrix-meetings-widget/src/components/cockpit/CockpitPanel/CockpitPanel.tsx @@ -70,7 +70,7 @@ export const CockpitPanel = withCurrentRoomMeeting( roomId={meeting.meetingId} titleId={titleId} uid={meeting.calendarUid} - showJoinButton={false} + hideJoinButton /> diff --git a/matrix-meetings-widget/src/components/meetings/MeetingDetails/MeetingDetails.tsx b/matrix-meetings-widget/src/components/meetings/MeetingDetails/MeetingDetails.tsx index 7fba1745..75ff15d2 100644 --- a/matrix-meetings-widget/src/components/meetings/MeetingDetails/MeetingDetails.tsx +++ b/matrix-meetings-widget/src/components/meetings/MeetingDetails/MeetingDetails.tsx @@ -31,7 +31,7 @@ type MeetingDetailsProps = WithMeetingProps & { onClose?: () => void; - showJoinButton?: boolean; + hideJoinButton?: boolean; }; export const MeetingDetails = withRoomIdMeeting( @@ -40,7 +40,7 @@ export const MeetingDetails = withRoomIdMeeting( titleId, meetingTimeId, onClose, - showJoinButton = true, + hideJoinButton, }: MeetingDetailsProps) => { return (
@@ -48,7 +48,7 @@ export const MeetingDetails = withRoomIdMeeting( meeting={meeting} onClose={onClose} titleId={titleId} - showJoinButton={showJoinButton} + hideJoinButton={hideJoinButton} /> ', () => { }); it('should render without exploding', () => { - render( - , - { - wrapper: Wrapper, - } - ); + render(, { + wrapper: Wrapper, + }); expect( screen.getByRole('heading', { level: 3, name: /An important meeting/i }) @@ -123,11 +116,7 @@ describe('', () => { it('should have no accessibility violations', async () => { const { container } = render( - , + , { wrapper: Wrapper } ); @@ -135,16 +124,9 @@ describe('', () => { }); it('should close the expended meeting dialog', async () => { - render( - , - { - wrapper: Wrapper, - } - ); + render(, { + wrapper: Wrapper, + }); await userEvent.click( await screen.findByRole('button', { name: /Close/i }), @@ -155,12 +137,9 @@ describe('', () => { }); it('should hide join and close button in meeting details sidebar', async () => { - render( - , - { - wrapper: Wrapper, - } - ); + render(, { + wrapper: Wrapper, + }); expect( screen.queryByRole('button', { name: 'Join' }) @@ -209,7 +188,6 @@ describe('', () => { render( ', () => { render( ', () => { it('should skip editing the meeting if the user aborts the action', async () => { render( ', () => { render( ', () => { render( ', () => { render( ', () => { render( ', () => { render( ', () => { .observeRoomEvents('net.nordeck.meetings.meeting.close') .subscribe(acknowledgeAllEvents(widgetApi)); - render( - , - { - wrapper: Wrapper, - } - ); + render(, { + wrapper: Wrapper, + }); await userEvent.click( await screen.findByRole('button', { name: /Delete/i }) @@ -887,7 +851,6 @@ describe('', () => { render( ', () => { render( - {showJoinButton && ( + {!hideJoinButton && (