From 8c7aed4b00752c51841f2efb3245d5f67e6e853b Mon Sep 17 00:00:00 2001
From: lebaudantoine <lebaud.antoine131@gmail.com>
Date: Tue, 6 Aug 2024 15:16:37 +0200
Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F(frontend)=20simplify=20the?=
 =?UTF-8?q?=20controls=20component?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

As we duplicated the code, we don't need anymore to configure
the available controls from the video conference.
---
 .../rooms/livekit/prefabs/ControlBar.tsx      | 127 +++++++-----------
 .../rooms/livekit/prefabs/VideoConference.tsx |   5 +-
 2 files changed, 51 insertions(+), 81 deletions(-)

diff --git a/src/frontend/src/features/rooms/livekit/prefabs/ControlBar.tsx b/src/frontend/src/features/rooms/livekit/prefabs/ControlBar.tsx
index ce1282ae..a8036867 100644
--- a/src/frontend/src/features/rooms/livekit/prefabs/ControlBar.tsx
+++ b/src/frontend/src/features/rooms/livekit/prefabs/ControlBar.tsx
@@ -11,7 +11,6 @@ import {
   LeaveIcon,
   MediaDeviceMenu,
   TrackToggle,
-  useLocalParticipantPermissions,
   useMaybeLayoutContext,
   usePersistentUserChoices,
 } from '@livekit/components-react'
@@ -21,6 +20,7 @@ import { mergeProps } from '@/utils/mergeProps.ts'
 import { StartMediaButton } from '../components/controls/StartMediaButton'
 import { useMediaQuery } from '../hooks/useMediaQuery'
 import { useTranslation } from 'react-i18next'
+import { SettingsButton } from '@/features/settings'
 
 /** @public */
 export type ControlBarControls = {
@@ -64,7 +64,6 @@ export interface ControlBarProps extends React.HTMLAttributes<HTMLDivElement> {
  */
 export function ControlBar({
   variation,
-  controls,
   saveUserChoices = true,
   onDeviceError,
   ...props
@@ -85,22 +84,6 @@ export function ControlBar({
   const defaultVariation = isTooLittleSpace ? 'minimal' : 'verbose'
   variation ??= defaultVariation
 
-  const visibleControls = { leave: true, ...controls }
-
-  const localPermissions = useLocalParticipantPermissions()
-
-  if (!localPermissions) {
-    visibleControls.camera = false
-    visibleControls.chat = false
-    visibleControls.microphone = false
-    visibleControls.screenShare = false
-  } else {
-    visibleControls.camera ??= localPermissions.canPublish
-    visibleControls.microphone ??= localPermissions.canPublish
-    visibleControls.screenShare ??= localPermissions.canPublish
-    visibleControls.chat ??= localPermissions.canPublishData && controls?.chat
-  }
-
   const showIcon = React.useMemo(
     () => variation === 'minimal' || variation === 'verbose',
     [variation]
@@ -144,51 +127,47 @@ export function ControlBar({
 
   return (
     <div {...htmlProps}>
-      {visibleControls.microphone && (
-        <div className="lk-button-group">
-          <TrackToggle
-            source={Track.Source.Microphone}
-            showIcon={showIcon}
-            onChange={microphoneOnChange}
-            onDeviceError={(error) =>
-              onDeviceError?.({ source: Track.Source.Microphone, error })
+      <div className="lk-button-group">
+        <TrackToggle
+          source={Track.Source.Microphone}
+          showIcon={showIcon}
+          onChange={microphoneOnChange}
+          onDeviceError={(error) =>
+            onDeviceError?.({ source: Track.Source.Microphone, error })
+          }
+        >
+          {showText && t('controls.microphone')}
+        </TrackToggle>
+        <div className="lk-button-group-menu">
+          <MediaDeviceMenu
+            kind="audioinput"
+            onActiveDeviceChange={(_kind, deviceId) =>
+              saveAudioInputDeviceId(deviceId ?? '')
             }
-          >
-            {showText && t('controls.microphone')}
-          </TrackToggle>
-          <div className="lk-button-group-menu">
-            <MediaDeviceMenu
-              kind="audioinput"
-              onActiveDeviceChange={(_kind, deviceId) =>
-                saveAudioInputDeviceId(deviceId ?? '')
-              }
-            />
-          </div>
+          />
         </div>
-      )}
-      {visibleControls.camera && (
-        <div className="lk-button-group">
-          <TrackToggle
-            source={Track.Source.Camera}
-            showIcon={showIcon}
-            onChange={cameraOnChange}
-            onDeviceError={(error) =>
-              onDeviceError?.({ source: Track.Source.Camera, error })
+      </div>
+      <div className="lk-button-group">
+        <TrackToggle
+          source={Track.Source.Camera}
+          showIcon={showIcon}
+          onChange={cameraOnChange}
+          onDeviceError={(error) =>
+            onDeviceError?.({ source: Track.Source.Camera, error })
+          }
+        >
+          {showText && t('controls.camera')}
+        </TrackToggle>
+        <div className="lk-button-group-menu">
+          <MediaDeviceMenu
+            kind="videoinput"
+            onActiveDeviceChange={(_kind, deviceId) =>
+              saveVideoInputDeviceId(deviceId ?? '')
             }
-          >
-            {showText && t('controls.camera')}
-          </TrackToggle>
-          <div className="lk-button-group-menu">
-            <MediaDeviceMenu
-              kind="videoinput"
-              onActiveDeviceChange={(_kind, deviceId) =>
-                saveVideoInputDeviceId(deviceId ?? '')
-              }
-            />
-          </div>
+          />
         </div>
-      )}
-      {visibleControls.screenShare && browserSupportsScreenSharing && (
+      </div>
+      {browserSupportsScreenSharing && (
         <TrackToggle
           source={Track.Source.ScreenShare}
           captureOptions={{ audio: true, selfBrowserSurface: 'include' }}
@@ -206,24 +185,18 @@ export function ControlBar({
             )}
         </TrackToggle>
       )}
-      {visibleControls.chat && (
-        <ChatToggle>
-          {showIcon && <ChatIcon />}
-          {showText && t('controls.chat')}
-        </ChatToggle>
-      )}
-      {visibleControls.settings && (
-        <SettingsMenuToggle>
-          {showIcon && <GearIcon />}
-          {showText && t('controls.settings')}
-        </SettingsMenuToggle>
-      )}
-      {visibleControls.leave && (
-        <DisconnectButton>
-          {showIcon && <LeaveIcon />}
-          {showText && t('controls.leave')}
-        </DisconnectButton>
-      )}
+      <ChatToggle>
+        {showIcon && <ChatIcon />}
+        {showText && t('controls.chat')}
+      </ChatToggle>
+      <SettingsMenuToggle>
+        {showIcon && <GearIcon />}
+        {showText && t('controls.settings')}
+      </SettingsMenuToggle>
+      <DisconnectButton>
+        {showIcon && <LeaveIcon />}
+        {showText && t('controls.leave')}
+      </DisconnectButton>
       <StartMediaButton />
     </div>
   )
diff --git a/src/frontend/src/features/rooms/livekit/prefabs/VideoConference.tsx b/src/frontend/src/features/rooms/livekit/prefabs/VideoConference.tsx
index 695bc62a..28afb91e 100644
--- a/src/frontend/src/features/rooms/livekit/prefabs/VideoConference.tsx
+++ b/src/frontend/src/features/rooms/livekit/prefabs/VideoConference.tsx
@@ -65,7 +65,6 @@ export function VideoConference({
   chatMessageFormatter,
   chatMessageDecoder,
   chatMessageEncoder,
-  SettingsComponent,
   ...props
 }: VideoConferenceProps) {
   const [widgetState, setWidgetState] = React.useState<WidgetState>({
@@ -180,9 +179,7 @@ export function VideoConference({
                 </FocusLayoutContainer>
               </div>
             )}
-            <ControlBar
-              controls={{ chat: true, settings: !!SettingsComponent }}
-            />
+            <ControlBar />
           </div>
           <Chat
             style={{ display: widgetState.showChat ? 'grid' : 'none' }}