@aslaluroba/help-center-react 2.1.1 → 2.1.3

package/package.json

@@ -3,7 +3,7 @@
   "main": "dist/index.js",
   "module": "dist/index.esm.js",
   "types": "dist/index.d.ts",
-  "version": "2.1.1",
+  "version": "2.1.3",
   "description": "BabylAI Help Center Widget for React and Next.js",
   "private": false,
   "exports": {
@@ -27,7 +27,7 @@
     "version:patch": "npm version patch --no-git-tag-version",
     "version:minor": "npm version minor --no-git-tag-version",
     "version:major": "npm version major --no-git-tag-version",
-    "publish": "yarn clean && yarn build && yarn version:patch && yarn publish --access public",
+    "publish:patch": "yarn clean && yarn build && yarn version:patch && yarn publish --access public",
     "publish:minor": "yarn clean && yarn build && yarn version:minor && yarn publish --access public",
     "publish:major": "yarn clean && yarn build && yarn version:major && yarn publish --access public"
   },

package/src/ui/help-center.tsx

@@ -41,6 +41,7 @@ export function HelpCenter({
   const [selectedOption, setSelectedOption] = useState<Option | null>(null);
 
   const [sessionId, setSessionId] = useState<string | null>(null);
+  const [reviewSessionId, setReviewSessionId] = useState<string | null>(null);
   const [isSignalRConnected, setIsSignalRConnected] = useState(false);
   const [isChatClosed, setIsChatClosed] = useState(false);
   const [messages, setMessages] = useState<Message[]>([]);
@@ -91,6 +92,14 @@ export function HelpCenter({
       const response = await apiRequest(`Client/ClientChatSession/${sessionId}/close`, 'POST');
       if (!response.ok) throw new Error('Failed to close chat session');
 
+      // Store sessionId for review before clearing the main sessionId
+      setReviewSessionId(sessionId);
+
+      // Clear the sessionId after successfully closing the session
+      setSessionId(null);
+      setSelectedOption(null);
+      setMessages([]);
+
       setIsReviewDialogOpen(true);
       if (option) {
         handleStartChat(option);
@@ -99,19 +108,24 @@ export function HelpCenter({
       console.error('Error ending chat:', error);
       setError('Failed to end chat session');
       setAssistantStatus('idle');
+      // Even if there's an error, clear the session state to prevent stuck state
+      setReviewSessionId(sessionId); // Store for review even if there's an error
+      setSessionId(null);
+      setSelectedOption(null);
     }
   };
 
   const handleSendChatReview = async ({ comment, rating }: ReviewProps) => {
-    if (!sessionId) return;
+    if (!reviewSessionId) return;
 
     const payload = { rating, comment };
 
     try {
-      const response = await apiRequest(`Client/ClientChatSession/${sessionId}/review`, 'POST', payload);
+      const response = await apiRequest(`Client/ClientChatSession/${reviewSessionId}/review`, 'POST', payload);
       if (!response.ok) throw new Error('Failed to send chat review');
 
       setIsReviewDialogOpen(false);
+      setReviewSessionId(null); // Clear review session ID after review is sent
     } catch (error) {
       console.error('Error sending chat review:', error);
       setError('Failed to send chat review');
@@ -120,6 +134,7 @@ export function HelpCenter({
 
   const handleCloseChatReview = () => {
     setIsReviewDialogOpen(false);
+    setReviewSessionId(null); // Clear review session ID when review is closed
   };
 
   const handleStartChat = async (option: Option) => {

package/src/ui/help-popup.tsx

@@ -166,11 +166,51 @@ export function HelpPopup({
   const handleEndAndStartNewChat = useCallback(async () => {
     if (tempSelectedOption) {
       setStartNewChatConfirmation(false);
-      setShowChat(true);
-      onEndChat(tempSelectedOption);
-      setTempSelectedOption(null);
+
+      try {
+        // First end the current chat and wait for it to complete
+        await onEndChat();
+
+        // Wait for sessionId to be cleared (indicating the session is fully closed)
+        // We'll use a polling mechanism to wait for the state to update
+        const maxAttempts = 50; // 5 seconds max wait time
+        let attempts = 0;
+
+        while (sessionId && attempts < maxAttempts) {
+          await new Promise((resolve) => setTimeout(resolve, 100)); // Wait 100ms
+          attempts++;
+        }
+
+        // Only start new chat after current session is fully closed
+        if (!sessionId) {
+          setShowChat(true);
+          onStartChat(tempSelectedOption);
+          setSelectedOption(tempSelectedOption);
+        } else {
+          console.warn('Session did not close properly, but proceeding with new chat');
+          setShowChat(true);
+          onStartChat(tempSelectedOption);
+          setSelectedOption(tempSelectedOption);
+        }
+      } catch (error) {
+        console.error('Error ending current chat:', error);
+        // Even if ending fails, try to start new chat
+        setShowChat(true);
+        onStartChat(tempSelectedOption);
+        setSelectedOption(tempSelectedOption);
+      } finally {
+        setTempSelectedOption(null);
+      }
     }
-  }, [onEndChat, setTempSelectedOption, tempSelectedOption, setStartNewChatConfirmation]);
+  }, [
+    onEndChat,
+    onStartChat,
+    setSelectedOption,
+    setTempSelectedOption,
+    tempSelectedOption,
+    setStartNewChatConfirmation,
+    sessionId,
+  ]);
 
   const handleEndChat = useCallback(() => {
     setEndChatConfirmation(false);