From 5e9d20e685819e7c3feb83e8cee878dc852c0ff3 Mon Sep 17 00:00:00 2001 From: lebaudantoine Date: Tue, 5 Aug 2025 14:54:20 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B(frontend)=20fix=20public=20room=20?= =?UTF-8?q?warning=20showing=20for=20all=20rooms?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove incorrect public room warning that was always displayed regardless of room privacy settings. Warning should only appear for genuinely public rooms since the lobby system introduction changed room privacy behavior. Prevents user confusion about room privacy settings. --- .../home/components/LaterMeetingDialog.tsx | 40 +++++++------- .../features/rooms/components/Conference.tsx | 1 - .../rooms/components/InviteDialog.tsx | 52 ++++++++++--------- 3 files changed, 48 insertions(+), 45 deletions(-) diff --git a/src/frontend/src/features/home/components/LaterMeetingDialog.tsx b/src/frontend/src/features/home/components/LaterMeetingDialog.tsx index 74d3ca50..f6831236 100644 --- a/src/frontend/src/features/home/components/LaterMeetingDialog.tsx +++ b/src/frontend/src/features/home/components/LaterMeetingDialog.tsx @@ -5,7 +5,7 @@ import { Bold, Button, Dialog, type DialogProps, P, Text } from '@/primitives' import { HStack } from '@/styled-system/jsx' import { RiCheckLine, RiFileCopyLine, RiSpam2Fill } from '@remixicon/react' import { css } from '@/styled-system/css' -import { ApiRoom } from '@/features/rooms/api/ApiRoom' +import { ApiAccessLevel, ApiRoom } from '@/features/rooms/api/ApiRoom' import { useTelephony } from '@/features/rooms/livekit/hooks/useTelephony' import { formatPinCode } from '@/features/rooms/utils/telephony' @@ -197,26 +197,28 @@ export const LaterMeetingDialog = ({ )} )} - -
- +
-
- - {t('permissions')} - - + > + +
+ + {t('permissions')} + +
+ )} )} diff --git a/src/frontend/src/features/rooms/components/Conference.tsx b/src/frontend/src/features/rooms/components/Conference.tsx index 929e99c6..89e18407 100644 --- a/src/frontend/src/features/rooms/components/Conference.tsx +++ b/src/frontend/src/features/rooms/components/Conference.tsx @@ -240,7 +240,6 @@ export const Conference = ({ setShowInviteDialog(false)} /> )} diff --git a/src/frontend/src/features/rooms/components/InviteDialog.tsx b/src/frontend/src/features/rooms/components/InviteDialog.tsx index 33a73ea2..5bafadc4 100644 --- a/src/frontend/src/features/rooms/components/InviteDialog.tsx +++ b/src/frontend/src/features/rooms/components/InviteDialog.tsx @@ -12,6 +12,8 @@ import { } from '@remixicon/react' import { useEffect, useState } from 'react' import { css } from '@/styled-system/css' +import { useRoomData } from '@/features/rooms/livekit/hooks/useRoomData' +import { ApiAccessLevel } from '@/features/rooms/api/ApiRoom' // fixme - extract in a proper primitive this dialog without overlay const StyledRACDialog = styled(Dialog, { @@ -34,13 +36,11 @@ const StyledRACDialog = styled(Dialog, { }, }) -export const InviteDialog = ({ - roomId, - ...dialogProps -}: { roomId: string } & Omit) => { +export const InviteDialog = (props: Omit) => { const { t } = useTranslation('rooms') - const roomUrl = getRouteUrl('room', roomId) + const roomData = useRoomData() + const roomUrl = getRouteUrl('room', roomData?.slug) const [isCopied, setIsCopied] = useState(false) useEffect(() => { @@ -51,7 +51,7 @@ export const InviteDialog = ({ }, [isCopied]) return ( - + {({ close }) => ( { - dialogProps.onClose?.() + props.onClose?.() close() }} aria-label={t('closeDialog')} @@ -99,26 +99,28 @@ export const InviteDialog = ({ )} - -
- +
-
- - {t('shareDialog.permissions')} - - + > + +
+ + {t('shareDialog.permissions')} + +
+ )}
)}