Progress

Author: alshakero

packages/data-stores/src/help-center/actions.ts

@@ -95,7 +95,7 @@ export const setIsMinimized = function* ( minimized: boolean ) {
 };
 
 export const setLoggedOutOdieChat = (
-	session: { odieId: number; sessionId: string } | undefined
+	session: { odieId: number; sessionId: string; botSlug: string } | undefined
 ) =>
 	( {
 		type: 'HELP_CENTER_SET_LOGGED_OUT_ODIE_CHAT',

packages/data-stores/src/help-center/reducer.ts

@@ -58,7 +58,7 @@ const helpCenterRouterHistory: Reducer<
 };
 
 const loggedOutOdieChat: Reducer<
-	{ odieId: number; sessionId: string } | undefined,
+	{ odieId: number; sessionId: string; botSlug: string } | undefined,
 	HelpCenterAction
 > = ( state = undefined, action ) => {
 	switch ( action.type ) {

packages/help-center/src/contexts/HelpCenterContext.tsx

@@ -1,6 +1,5 @@
 import { ODIE_NEW_INTERACTIONS_BOT_SLUG } from '@automattic/odie-client/src/constants';
 import { useContext, createContext } from '@wordpress/element';
-import { useNewInteractionsBotConfig } from '../hooks/use-new-interaction-bot-config';
 import type { CurrentUser, HelpCenterSite } from '@automattic/data-stores';
 
 export type HelpCenterRequiredInformation = {
@@ -87,11 +86,10 @@ export const HelpCenterRequiredContextProvider: React.FC< {
 	value: Partial< HelpCenterRequiredInformation > &
 		Pick< HelpCenterRequiredInformation, 'currentUser' | 'sectionName' >;
 } > = function ( { children, value } ) {
-	const newInteractionsBotConfig = useNewInteractionsBotConfig( value.currentUser );
 	return (
 		<HelpCenterRequiredContext.Provider
 			value={ {
-				...Object.assign( {}, defaultContext, newInteractionsBotConfig, value ),
+				...Object.assign( {}, defaultContext, value ),
 			} }
 		>
 			{ children }

packages/help-center/src/hooks/use-get-history-chats.ts

@@ -142,7 +142,8 @@ export const useGetHistoryChats = (): UseGetHistoryChatsResult => {
 
 	const loggedOutChat = useOdieChat(
 		loggedOutSession ? loggedOutSession.odieId : null,
-		loggedOutSession ? loggedOutSession.sessionId : null
+		loggedOutSession ? loggedOutSession.sessionId : null,
+		loggedOutSession ? loggedOutSession.botSlug : undefined
 	);
 
 	useEffect( () => {

packages/help-center/src/hooks/use-new-interaction-bot-config.ts

@@ -11,16 +11,16 @@ import type { OdieChat, ReturnedChat } from '../types';
  * Get the ODIE chat and manage the cache to save on API calls.
  * @param chatId - The chat ID to fetch
  */
-export const useOdieChat = ( chatId: number | null, sessionId: string | undefined | null ) => {
-	const { version, currentUser } = useOdieAssistantContext();
+export const useOdieChat = (
+	chatId: number | null,
+	sessionId: string | undefined | null,
+	defaultBotSlug?: string | null
+) => {
+	const { version } = useOdieAssistantContext();
 	const { data: supportInteraction } = useCurrentSupportInteraction();
 
 	// Hover `ODIE_DEFAULT_BOT_SLUG_LEGACY` for more information.
-	let botSlug = supportInteraction?.bot_slug || ODIE_DEFAULT_BOT_SLUG_LEGACY;
-
-	if ( ! currentUser?.ID ) {
-		botSlug = 'wpcom-chat-loggedout';
-	}
+	const botSlug = supportInteraction?.bot_slug || defaultBotSlug || ODIE_DEFAULT_BOT_SLUG_LEGACY;
 
 	return useQuery< OdieChat, Error >( {
 		queryKey: [ 'odie-chat', botSlug, chatId, version, sessionId ],

packages/odie-client/src/data/use-odie-chat.ts

@@ -26,13 +26,18 @@ const HELP_CENTER_STORE = HelpCenter.register();
 
 function getBotSlug(
 	supportInteraction: SupportInteraction | undefined,
-	newInteractionsBotSlug: string
+	newInteractionsBotSlug: string,
+	currentUserId?: number
 ): string {
 	if ( supportInteraction ) {
 		// Legacy support interactions have their botSlug set to `''`. We need to use the legacy bot slug for them.
 		return supportInteraction.bot_slug || ODIE_DEFAULT_BOT_SLUG_LEGACY;
 	}
 
+	if ( ! currentUserId ) {
+		return 'wpcom-chat-loggedout';
+	}
+
 	// When the interaction is undefined, it means we're sending the first message to Odie, which is done before the interaction is created.
 	// In this case, we use the new interactions bot slug.
 	return newInteractionsBotSlug;
@@ -129,12 +134,13 @@ export const useSendOdieMessage = ( signal: AbortSignal ) => {
 	);
 
 	const updateLoggedOutSession = useCallback(
-		( chatId: string, sessionId: string ) => {
+		( chatId: string, sessionId: string, botSlug: string ) => {
 			const params = new URLSearchParams( location.search );
 			params.set( 'chatId', chatId );
 			params.set( 'sessionId', sessionId );
+			params.set( 'botSlug', botSlug );
 			navigate( `${ location.pathname }?${ params.toString() }`, { replace: true } );
-			setLoggedOutOdieChat( { odieId: chatId, sessionId } );
+			setLoggedOutOdieChat( { odieId: chatId, sessionId, botSlug } );
 		},
 		[ location.pathname, location.search, navigate, setLoggedOutOdieChat ]
 	);
@@ -224,7 +230,11 @@ export const useSendOdieMessage = ( signal: AbortSignal ) => {
 
 	return useMutation< ReturnedChat, Error, Message >( {
 		mutationFn: async ( message: Message ): Promise< ReturnedChat > => {
-			const botSlug = getBotSlug( currentSupportInteraction, newInteractionsBotSlug );
+			const botSlug = getBotSlug(
+				currentSupportInteraction,
+				newInteractionsBotSlug,
+				currentUser?.ID
+			);
 			const chatIdSegment = odieId ? `/${ odieId }` : '';
 			const session_id = sessionId;
 
@@ -308,8 +318,10 @@ export const useSendOdieMessage = ( signal: AbortSignal ) => {
 						},
 					} );
 				} else if ( ! isLoggedIn ) {
+					const botSlug = getBotSlug( currentSupportInteraction, newInteractionsBotSlug );
+
 					// If the user is not logged in, we don't need to create a new support interaction.
-					updateLoggedOutSession( chatId.toString(), returnedChat.session_id );
+					updateLoggedOutSession( chatId.toString(), returnedChat.session_id, botSlug );
 				}
 			} catch ( error ) {
 				trackEvent( 'error_updating_support_interaction', {

packages/odie-client/src/data/use-send-odie-message.ts

@@ -56,12 +56,13 @@ export const useGetCombinedChat = (
 	const params = new URLSearchParams( location.search );
 	const loggedOutOdieChatId = params.get( 'chatId' );
 	const loggedOutOdieSessionId = params.get( 'sessionId' );
+	const loggedOutOdieBotSlug = params.get( 'botSlug' );
 
 	const odieId = isLoggedIn
 		? getOdieIdFromInteraction( currentSupportInteraction )
 		: loggedOutOdieChatId;
-
 	const sessionId = isLoggedIn ? undefined : loggedOutOdieSessionId;
+	const botSlug = isLoggedIn ? undefined : loggedOutOdieBotSlug;
 
 	const { isChatLoaded, connectionStatus } = useSelect( ( select ) => {
 		const store = select( HELP_CENTER_STORE ) as HelpCenterSelect;
@@ -79,7 +80,8 @@ export const useGetCombinedChat = (
 	const getZendeskConversation = useGetZendeskConversation();
 	const { data: odieChat, isFetching: isOdieChatLoading } = useOdieChat(
 		Number( odieId ),
-		sessionId
+		sessionId,
+		botSlug
 	);
 	const { startNewInteraction } = useManageSupportInteraction();
 	const isUploadingUnsentMessages = useIsMutating( {