Merge pull request #280 from microsoft/dev

fix: Merging dev changes to main branch

Author: Roopan-Microsoft

App/frontend-app/src/components/documentViewer/dialogTitleBar.tsx

@@ -45,18 +45,20 @@ export function DialogTitleBar({
 }: IDialogTitleBarProps) {
   const { t } = useTranslation();
   const [activeTab, setActiveTab] = useState(selectedTab);
+  const [isChatTabOpened, setIsChatTabOpened] = useState(false);
 
   useEffect(() => {
     setActiveTab(selectedTab);
-  }, [selectedTab]);
+  }, [selectedTab,clearChatFlag]);
+
+  useEffect(()=>{
+    if(activeTab == "Chat Room")
+      setIsChatTabOpened(true)
+  },[activeTab])
 
   const handleTabSelect = (event: SelectTabEvent, data: SelectTabData) => {
-    setActiveTab(data.value as string);
     onTabSelect(event, data);
 
-    if (data.value === "Chat Room") {
-      setClearChatFlag(false);
-    }
   };
 
   return (
@@ -152,7 +154,7 @@ export function DialogTitleBar({
                   searchResultDocuments={[]}
                   selectedDocuments={[metadata]}
                   chatWithDocument={[metadata]}
-                  clearChatFlag={clearChatFlag}
+                  clearChatFlag={isChatTabOpened ? !isChatTabOpened : clearChatFlag}
                 />
               </div>
             </div>

App/frontend-app/src/components/documentViewer/documentViewer.tsx

@@ -74,7 +74,7 @@ export function DocDialog(
     const [pageMetadata, setPageMetadata] = useState<Document[] | null>(null);
     const [iframeKey, setIframeKey] = useState(0);
     const [isExpanded, setIsExpanded] = useState(false);
-    const [clearedChatFlag, setClearChatFlag] = useState(false);
+    const [clearedChatFlag, setClearChatFlag] = useState(clearChatFlag);
     // const [aiKnowledgeMetadata, setAIKnowledgeMetadata] = useState<Document | null>(null);