Merge pull request #213 from microsoft/PSL-BUG-14009

fix: expecting reasonable response for an unethical request

Author: Avijit-Microsoft

src/App/frontend/src/components/Chat/Chat.tsx

@@ -542,7 +542,8 @@ const Chat: React.FC<ChatProps> = ({
         }
         // END OF STREAMING
         if (hasError) {
-          const errorMsg = JSON.parse(runningText).error;
+          const errorMsg = JSON.parse(runningText).error === "Attempted to access streaming response content, without having called `read()`."?"An error occurred. Please try again later.": JSON.parse(runningText).error;
+          
           const errorMessage: ChatMessage = {
             id: generateUUIDv4(),
             role: ASSISTANT,
@@ -641,7 +642,6 @@ const Chat: React.FC<ChatProps> = ({
           ];
         }
       }
-      console.log("line 66o:updatedMessages:::", updatedMessages)
       saveToDB(updatedMessages, conversationId, isChatReq);
     } catch (e) {
       console.log("Catched with an error while chat and save", e);
@@ -758,6 +758,8 @@ const Chat: React.FC<ChatProps> = ({
           messages.map((msg, index) => (
             <div key={index} className={`chat-message ${msg.role}`}>
               {(() => {
+                 const isLastAssistantMessage =
+                 msg.role === "assistant" && index === messages.length - 1;
                 if ((msg.role === "user") && typeof msg.content === "string") {
                   if (msg.content == "show in a graph by default") return null;
                     return (
@@ -787,16 +789,25 @@ const Chat: React.FC<ChatProps> = ({
                         remarkPlugins={[remarkGfm, supersub]}
                         children={msg.content}
                       />
-                      <Citations
-                      answer={{
-                        answer: msg.content,
-                        citations:
-                          msg.role === ASSISTANT
-                            ? parseCitationFromMessage(msg.citations)
-                            : [],
-                      }} 
-                      index={index}
-                      />
+                     {/* Citation Loader: Show only while citations are fetching */}
+                      {isLastAssistantMessage && generatingResponse ? (
+                        <div className="typing-indicator">
+                          <span className="dot"></span>
+                          <span className="dot"></span>
+                          <span className="dot"></span>
+                        </div>
+                      ) : (
+                        <Citations
+                          answer={{
+                            answer: msg.content,
+                            citations:
+                              msg.role === "assistant"
+                                ? parseCitationFromMessage(msg.citations)
+                                : [],
+                          }}
+                          index={index}
+                        />
+                      )}
 
                       <div className="answerDisclaimerContainer">
                         <span className="answerDisclaimer">