agora-appbuilder-core 4.1.10-beta.1 → 4.1.11-beta.2

package/template/src/components/EventsConfigure.tsx

@@ -268,66 +268,65 @@ const EventsConfigure: React.FC<Props> = ({
     permissionStatusRef.current = permissionStatus;
   }, [permissionStatus]);
 
-  const {hasUserJoinedRTM, isInitialQueueCompleted, syncUserState} =
-    useContext(ChatContext);
-  const {startSpeechToText, addStreamMessageListener} = useSpeechToText();
-
-  //auto start stt
-  useEffect(() => {
-    if (
-      !isRecordingBot &&
-      $config.ENABLE_CAPTION &&
-      $config.STT_AUTO_START &&
-      callActive &&
-      hasUserJoinedRTM &&
-      isInitialQueueCompleted &&
-      !sttAutoStarted
-    ) {
-      //host will start the caption
-      if (isHost && roomId?.host && !isSTTAlreadyActiveRef.current) {
-        logger.log(LogSource.Internals, 'STT', 'STT_AUTO_START triggered', {
-          uidWhoTriggered: localUid,
-        });
-
-        // add stream message callback listener
-        addStreamMessageListener();
-
-        //start with default language
-        startSpeechToText(['en-US'])
-          .then(() => {
-            logger.log(LogSource.Internals, 'STT', 'STT_AUTO_START success');
-            setSttAutoStarted(true);
-          })
-          .catch(err => {
-            logger.log(
-              LogSource.Internals,
-              'STT',
-              'STT_AUTO_START failed',
-              err,
-            );
-            setSttAutoStarted(false);
-          });
-      }
-
-      if (isHost && roomId?.host && isSTTAlreadyActiveRef.current) {
-        logger.log(
-          LogSource.Internals,
-          'STT',
-          'STT_AUTO_START already triggered by some other host',
-        );
-        setSttAutoStarted(true);
-      }
-    }
-  }, [
-    isRecordingBot,
-    callActive,
-    isHost,
-    hasUserJoinedRTM,
-    roomId,
-    sttAutoStarted,
-    isInitialQueueCompleted,
-    isSTTAlreadyActiveRef.current,
-  ]);
+  // const {hasUserJoinedRTM, isInitialQueueCompleted} = useContext(ChatContext);
+  // const {startSpeechToText, addStreamMessageListener} = useSpeechToText();
+
+  // auto start stt
+  // useEffect(() => {
+  //   if (
+  //     !isRecordingBot &&
+  //     $config.ENABLE_CAPTION &&
+  //     $config.STT_AUTO_START &&
+  //     callActive &&
+  //     hasUserJoinedRTM &&
+  //     isInitialQueueCompleted &&
+  //     !sttAutoStarted
+  //   ) {
+  //     //host will start the caption
+  //     if (isHost && roomId?.host && !isSTTAlreadyActiveRef.current) {
+  //       logger.log(LogSource.Internals, 'STT', 'STT_AUTO_START triggered', {
+  //         uidWhoTriggered: localUid,
+  //       });
+
+  //       // add stream message callback listener
+  //       addStreamMessageListener();
+
+  //       //start with default language
+  //       startSpeechToText(['en-US'])
+  //         .then(() => {
+  //           logger.log(LogSource.Internals, 'STT', 'STT_AUTO_START success');
+  //           setSttAutoStarted(true);
+  //         })
+  //         .catch(err => {
+  //           logger.log(
+  //             LogSource.Internals,
+  //             'STT',
+  //             'STT_AUTO_START failed',
+  //             err,
+  //           );
+  //           setSttAutoStarted(false);
+  //         });
+  //     }
+
+  //     if (isHost && roomId?.host && isSTTAlreadyActiveRef.current) {
+  //       logger.log(
+  //         LogSource.Internals,
+  //         'STT',
+  //         'STT_AUTO_START already triggered by some other host',
+  //       );
+  //       setSttAutoStarted(true);
+  //     }
+  //   }
+  // }, [
+  //   isRecordingBot,
+  //   callActive,
+  //   isHost,
+  //   hasUserJoinedRTM,
+  //   roomId,
+  //   sttAutoStarted,
+  //   isInitialQueueCompleted,
+  //   isSTTAlreadyActiveRef.current,
+  // ]);
 
   useEffect(() => {
     //user joined event listener
@@ -571,53 +570,106 @@ const EventsConfigure: React.FC<Props> = ({
       }
     });
 
-    events.on(EventNames.STT_ACTIVE, data => {
-      const payload = JSON.parse(data?.payload);
-      if (payload.active) {
-        isSTTAlreadyActiveRef.current = true;
-      } else {
-        isSTTAlreadyActiveRef.current = false;
-      }
-      setRoomInfo(prev => {
-        return {
-          ...prev,
-          isSTTActive: payload.active,
-        };
-      });
-    });
+    //  events.on(EventNames.STT_ACTIVE, data => {
+    //   const payload = JSON.parse(data?.payload);
+    //   if (payload.active) {
+    //     isSTTAlreadyActiveRef.current = true;
+    //   } else {
+    //     isSTTAlreadyActiveRef.current = false;
+    //   }
+    //   setRoomInfo(prev => {
+    //     return {
+    //       ...prev,
+    //       isSTTActive: payload.active,
+    //     };
+    //   });
+    // });
 
-    events.on(EventNames.STT_LANGUAGE, data => {
-      const {
-        username,
-        prevLang,
-        newLang,
-        uid,
-      }: RoomInfoContextInterface['sttLanguage'] = JSON.parse(data?.payload);
-      // set this on roominfo then use it in Controls
-      const sttLangObj = {
-        username,
-        prevLang,
-        newLang,
-        uid,
-        langChanged: true,
-      };
-      setRoomInfo(prev => {
-        return {
-          ...prev,
-          sttLanguage: sttLangObj,
-        };
-      });
-    });
+    // events.on(EventNames.STT_LANGUAGE, data => {
+    //   const {
+    //     username,
+    //     prevLang,
+    //     newLang,
+    //     uid,
+    //     remoteLang,
+    //   }: RoomInfoContextInterface['sttLanguage'] = JSON.parse(data?.payload);
+
+    //   setRoomInfo(prev => {
+    //     // Merge remoteLang with existing remoteLang to accumulate protected languages
+    //     const existingRemoteLang = prev.sttLanguage?.remoteLang || [];
+    //     const newRemoteLang = remoteLang || [];
+    //     const mergedRemoteLang = [...new Set([...existingRemoteLang, ...newRemoteLang])];
+
+    //     const sttLangObj = {
+    //       username,
+    //       prevLang,
+    //       newLang, // All languages in the channel
+    //       uid,
+    //       langChanged: true,
+    //       remoteLang: mergedRemoteLang, // Accumulated protected languages
+    //     };
+
+    //     return {
+    //       ...prev,
+    //       sttLanguage: sttLangObj,
+    //     };
+    //   });
+    // });
+
+    // events.on(EventNames.STT_TRANSLATE_LANGUAGE, data => {
+    //   const {
+    //     username,
+    //     uid,
+    //     translateConfig,
+    //   } = JSON.parse(data?.payload);
+
+    //   setRoomInfo(prev => {
+    //     // Merge translate configs with existing configuration
+    //     const existingTranslateConfig = prev.sttLanguage?.translateConfig || [];
+    //     const newTranslateConfig = translateConfig || [];
+
+    //     // Merge logic: for each new source language, merge with existing or add new
+    //     const mergedTranslateConfig = [...existingTranslateConfig];
+
+    //     newTranslateConfig.forEach(newConfig => {
+    //       const existingIndex = mergedTranslateConfig.findIndex(
+    //         existing => existing.source_lang === newConfig.source_lang
+    //       );
+
+    //       if (existingIndex !== -1) {
+    //         // Same source language - merge target languages
+    //         const existingTargets = mergedTranslateConfig[existingIndex].target_lang;
+    //         const mergedTargets = [...new Set([...existingTargets, ...newConfig.target_lang])];
+    //         mergedTranslateConfig[existingIndex] = {
+    //           ...mergedTranslateConfig[existingIndex],
+    //           target_lang: mergedTargets,
+    //         };
+    //       } else {
+    //         // Different source language - add new config
+    //         mergedTranslateConfig.push(newConfig);
+    //       }
+    //     });
+
+    //     const sttLangObj = {
+    //       ...prev.sttLanguage,
+    //       translateConfig: mergedTranslateConfig,
+    //     };
+
+    //     return {
+    //       ...prev,
+    //       sttLanguage: sttLangObj,
+    //     };
+    //   });
+    // });
 
     events.on(EventNames.WAITING_ROOM_STATUS_UPDATE, data => {
       if (!isHostRef.current) return;
       const {attendee_uid, approved} = JSON.parse(data?.payload);
       // update waiting room status in other host's panel
-      // dispatch({
-      //   type: 'UpdateRenderList',
-      //   value: [attendee_uid, {isInWaitingRoom: false}],
-      // });
-      syncUserState(attendee_uid, {isInWaitingRoom: false});
+      dispatch({
+        type: 'UpdateRenderList',
+        value: [attendee_uid, {isInWaitingRoom: false}],
+      });
 
       waitingRoomRef.current[attendee_uid] = approved ? 'APPROVED' : 'REJECTED';
       // hide toast in other host's screen
@@ -662,11 +714,10 @@ const EventsConfigure: React.FC<Props> = ({
         defaultContentRef.current.defaultContent[attendee_uid]?.name ||
         'Attendee';
       // put the attendee in waitingroom in renderlist
-      // dispatch({
-      //   type: 'UpdateRenderList',
-      //   value: [attendee_uid, {isInWaitingRoom: true}],
-      // });
-      syncUserState(attendee_uid, {isInWaitingRoom: true});
+      dispatch({
+        type: 'UpdateRenderList',
+        value: [attendee_uid, {isInWaitingRoom: true}],
+      });
 
       waitingRoomRef.current[attendee_uid] = 'PENDING';
       // check if any other host has approved then dont show permission to join the room
@@ -679,11 +730,10 @@ const EventsConfigure: React.FC<Props> = ({
           attendee_screenshare_uid: attendee_screenshare_uid,
           approved: true,
         });
-        // dispatch({
-        //   type: 'UpdateRenderList',
-        //   value: [attendee_uid, {isInWaitingRoom: false}],
-        // });
-        syncUserState(attendee_uid, {isInWaitingRoom: false});
+        dispatch({
+          type: 'UpdateRenderList',
+          value: [attendee_uid, {isInWaitingRoom: false}],
+        });
 
         waitingRoomRef.current[attendee_uid] = 'APPROVED';
 
@@ -728,11 +778,10 @@ const EventsConfigure: React.FC<Props> = ({
               attendee_screenshare_uid: attendee_screenshare_uid,
               approved: false,
             });
-            // dispatch({
-            //   type: 'UpdateRenderList',
-            //   value: [attendee_uid, {isInWaitingRoom: false}],
-            // });
-            syncUserState(attendee_uid, {isInWaitingRoom: false});
+            dispatch({
+              type: 'UpdateRenderList',
+              value: [attendee_uid, {isInWaitingRoom: false}],
+            });
 
             waitingRoomRef.current[attendee_uid] = 'REJECTED';
 
@@ -876,8 +925,9 @@ const EventsConfigure: React.FC<Props> = ({
       events.off(EventNames.WHITEBOARD_ACTIVE);
       events.off(EventNames.WHITEBOARD_LAST_IMAGE_UPLOAD_POSITION);
       events.off(EventNames.BOARD_COLOR_CHANGED);
-      events.off(EventNames.STT_ACTIVE);
-      events.off(EventNames.STT_LANGUAGE);
+      // events.off(EventNames.STT_ACTIVE);
+      // events.off(EventNames.STT_LANGUAGE);
+      // events.off(EventNames.STT_TRANSLATE_LANGUAGE);
     };
   }, []);
 

package/template/src/components/Navbar.tsx

@@ -70,7 +70,6 @@ import {
   SettingsToolbarItem,
 } from './controls/toolbar-items';
 import {useControlPermissionMatrix} from './controls/useControlPermissionMatrix';
-import BreakoutMeetingTitle from './breakout-room/ui/BreakoutMeetingTitle';
 
 export const ParticipantsCountView = ({
   isMobileView = false,
@@ -377,16 +376,13 @@ export const MeetingTitleToolbarItem = () => {
   } = useRoomInfo();
   return (
     <ToolbarItem>
-      <View style={style.roomNameContainer}>
-        <Text
-          style={style.roomNameText}
-          testID="videocall-meetingName"
-          numberOfLines={1}
-          ellipsizeMode="tail">
-          {trimText(meetingTitle)}
-        </Text>
-        <BreakoutMeetingTitle />
-      </View>
+      <Text
+        style={style.roomNameText}
+        testID="videocall-meetingName"
+        numberOfLines={1}
+        ellipsizeMode="tail">
+        {trimText(meetingTitle)}
+      </Text>
     </ToolbarItem>
   );
 };
@@ -636,11 +632,12 @@ const style = StyleSheet.create({
   roomNameContainer: {
     zIndex: 10,
     flex: 1,
-    flexDirection: 'column',
-    alignItems: 'flex-start',
-    paddingLeft: 13,
+    flexDirection: 'row',
+    alignItems: 'center',
   },
+
   roomNameText: {
+    alignSelf: 'center',
     fontSize: ThemeConfig.FontSize.normal,
     color: $config.FONT_COLOR,
     fontWeight: '600',