@aslaluroba/help-center-react 2.1.1 → 2.1.3

package/dist/index.esm.js

@@ -1155,11 +1155,50 @@ function HelpPopup({ onClose, helpScreen, status, error, onStartChat, onSendMess
     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);
         onEndChat();
@@ -1248,6 +1287,7 @@ function HelpCenter({ helpScreenId, user, showArrow = true, language = 'en', mes
     const [error, setError] = useState('');
     const [selectedOption, setSelectedOption] = useState(null);
     const [sessionId, setSessionId] = useState(null);
+    const [reviewSessionId, setReviewSessionId] = useState(null);
     const [isSignalRConnected, setIsSignalRConnected] = useState(false);
     const [isChatClosed, setIsChatClosed] = useState(false);
     const [messages, setMessages] = useState([]);
@@ -1288,6 +1328,12 @@ function HelpCenter({ helpScreenId, user, showArrow = true, language = 'en', mes
             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);
@@ -1297,17 +1343,22 @@ function HelpCenter({ helpScreenId, user, showArrow = true, language = 'en', mes
             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 }) => {
-        if (!sessionId)
+        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);
@@ -1316,6 +1367,7 @@ function HelpCenter({ helpScreenId, user, showArrow = true, language = 'en', mes
     };
     const handleCloseChatReview = () => {
         setIsReviewDialogOpen(false);
+        setReviewSessionId(null); // Clear review session ID when review is closed
     };
     const handleStartChat = async (option) => {
         await startNewChatSession(option);