Progress

Author: alshakero

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

@@ -5,7 +5,7 @@ import { Location } from 'history';
 import { default as wpcomRequestPromise, canAccessWpcomApis } from 'wpcom-proxy-request';
 import { GeneratorReturnType } from '../mapped-types';
 import { SiteDetails } from '../site';
-import { isE2ETest, isLoggedIn } from '../utils';
+import { isE2ETest, isLoggedInHCUser } from '../utils';
 import { STORE_KEY } from './constants';
 import type { HelpCenterOptions, HelpCenterSelect, HelpCenterShowOptions } from './types';
 import type { APIFetchOptions } from '../shared-types';
@@ -16,7 +16,7 @@ import type { APIFetchOptions } from '../shared-types';
  * @param isMinimized - Whether the help center is minimized.
  */
 export const saveOpenState = ( isShown: boolean | undefined, isMinimized: boolean | undefined ) => {
-	if ( ! isLoggedIn() ) {
+	if ( ! isLoggedInHCUser() ) {
 		return null;
 	}
 

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

@@ -1,7 +1,7 @@
 import { registerStore } from '@wordpress/data';
 import { controls } from '@wordpress/data-controls';
 import { registerPlugins } from '../plugins';
-import { isE2ETest, isInSupportSession, isLoggedIn } from '../utils';
+import { isE2ETest, isInSupportSession, isLoggedInHCUser } from '../utils';
 import { controls as wpcomRequestControls } from '../wpcom-request-controls';
 import * as actions from './actions';
 import { STORE_KEY } from './constants';
@@ -13,7 +13,7 @@ export type { State };
 let isRegistered = false;
 
 export function register(): typeof STORE_KEY {
-	const enabledPersistedOpenState = ! isE2ETest() && ! isInSupportSession() && isLoggedIn();
+	const enabledPersistedOpenState = ! isE2ETest() && ! isInSupportSession() && isLoggedInHCUser();
 
 	registerPlugins();
 

packages/data-stores/src/index.ts

@@ -74,4 +74,4 @@ export type { StepperInternalSelect } from './stepper-internal';
 export type { SiteActions } from './site';
 export type { UserActions } from './user';
 export type { Member, UseQuery, UsersQuery } from './users/types';
-export { isE2ETest, isInSupportSession } from './utils';
+export { isE2ETest, isInSupportSession, isLoggedInHCUser } from './utils';

packages/data-stores/src/utils.ts

@@ -33,7 +33,11 @@ export const isInSupportSession = () => {
 	return false;
 };
 
-export const isLoggedIn = () => {
+/**
+ * Check if the user is logged in in a synchronous way. Works in wp-admin and Calypso.
+ * @returns True if the user is logged in, false otherwise.
+ */
+export const isLoggedInHCUser = () => {
 	return (
 		// Calypso
 		( typeof window !== 'undefined' && !! window.currentUser?.ID ) ||

packages/help-center/src/components/help-center.tsx

@@ -4,7 +4,6 @@
  */
 import UnifiedAIAgent from '@automattic/agents-manager';
 import { initializeAnalytics } from '@automattic/calypso-analytics';
-import { useGetSupportInteractions } from '@automattic/odie-client/src/data/use-get-support-interactions';
 import { useCanConnectToZendeskMessaging } from '@automattic/zendesk-client';
 import { useSelect } from '@wordpress/data';
 import { createPortal, useEffect, useState } from '@wordpress/element';
@@ -16,6 +15,7 @@ import {
 	useHelpCenterContext,
 	type HelpCenterRequiredInformation,
 } from '../contexts/HelpCenterContext';
+import { useGetSupportInteractions } from '../data/use-get-support-interactions';
 import { useChatStatus, useShouldUseUnifiedAgent } from '../hooks';
 import { HELP_CENTER_STORE } from '../stores';
 import { Container } from '../types';

…src/data/use-get-support-interactions.ts …src/data/use-get-support-interactions.tspackages/odie-client/src/data/use-get-support-interactions.ts renamed to packages/help-center/src/data/use-get-support-interactions.ts packages/odie-client/src/data/use-get-support-interactions.ts renamed to packages/help-center/src/data/use-get-support-interactions.ts

@@ -1,8 +1,9 @@
+import { isLoggedInHCUser } from '@automattic/data-stores';
+import { handleSupportInteractionsFetch } from '@automattic/odie-client/src/data/handle-support-interactions-fetch';
 import { isTestModeEnvironment, useCanConnectToZendeskMessaging } from '@automattic/zendesk-client';
 import { useQuery } from '@tanstack/react-query';
-import { useOdieAssistantContext } from '../context';
-import { handleSupportInteractionsFetch } from './handle-support-interactions-fetch';
-import type { SupportProvider } from '../types';
+import { useHelpCenterContext } from '../contexts/HelpCenterContext';
+import type { SupportProvider } from '@automattic/odie-client';
 
 /**
  * Get the support interactions.
@@ -13,8 +14,9 @@ export const useGetSupportInteractions = (
 	enabled = true
 ) => {
 	const isTestMode = isTestModeEnvironment();
-	const { currentUser } = useOdieAssistantContext();
-	const { data: canConnectToZendesk } = useCanConnectToZendeskMessaging( !! currentUser?.ID );
+	const { currentUser } = useHelpCenterContext();
+	const { data: canConnectToZendesk } = useCanConnectToZendeskMessaging( isLoggedInHCUser() );
+
 	let shouldFetch = enabled && !! currentUser?.ID;
 	// Only fetch Zendesk interactions if the user can connect to Zendesk.
 	if ( ( provider === 'zendesk' || provider === 'zendesk-staging' ) && ! canConnectToZendesk ) {

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

@@ -2,7 +2,6 @@
 import { HelpCenterSelect } from '@automattic/data-stores';
 import { convertOdieChatToOdieConversation } from '@automattic/odie-client';
 import { useGetOdieConversations } from '@automattic/odie-client/src/data/use-get-odie-conversations';
-import { useGetSupportInteractions } from '@automattic/odie-client/src/data/use-get-support-interactions';
 import { useOdieChat } from '@automattic/odie-client/src/data/use-odie-chat';
 import { useSelect } from '@wordpress/data';
 import { useEffect, useMemo, useState } from '@wordpress/element';
@@ -11,6 +10,7 @@ import {
 	getLastMessage,
 	getZendeskConversations,
 } from '../components/utils';
+import { useGetSupportInteractions } from '../data/use-get-support-interactions';
 import { HELP_CENTER_STORE } from '../stores';
 import type {
 	Conversations,
@@ -146,18 +146,6 @@ export const useGetHistoryChats = (): UseGetHistoryChatsResult => {
 		loggedOutSession ? loggedOutSession.botSlug : undefined
 	);
 
-	useEffect( () => {
-		if ( loggedOutChat.data ) {
-			setRecentConversations( [
-				convertOdieChatToOdieConversation(
-					loggedOutChat.data,
-					loggedOutSession?.sessionId || '',
-					loggedOutSession?.botSlug || ''
-				),
-			] );
-		}
-	}, [ loggedOutChat.data, loggedOutSession?.sessionId, loggedOutSession?.botSlug ] );
-
 	const { data: otherSupportInteractions, isLoading: isLoadingOtherSupportInteractions } =
 		useGetSupportInteractions( 'zendesk' );
 	const { data: odieSupportInteractions, isLoading: isLoadingOdieSupportInteractions } =

packages/help-center/src/types.ts

@@ -1,6 +1,7 @@
 import type { HelpCenterSite, SiteDetails } from '@automattic/data-stores';
 import type { ReactElement } from 'react';
 
+export type SupportProvider = 'zendesk' | 'odie' | 'zendesk-staging' | 'help-center';
 export interface Container {
 	handleClose: () => void;
 	defaultFooterContent?: ReactElement;

packages/odie-client/src/data/index.ts

@@ -1,5 +1,4 @@
 export { handleSupportInteractionsFetch } from './handle-support-interactions-fetch';
-export { useGetSupportInteractions } from './use-get-support-interactions';
 export { useGetZendeskConversation, useGetUnreadConversations } from '@automattic/zendesk-client';
 export { useManageSupportInteraction } from './use-manage-support-interaction';
 export { broadcastOdieMessage, useOdieBroadcastWithCallbacks } from './broadcast-messages';

packages/odie-client/src/hooks/use-get-combined-chat.ts

@@ -1,13 +1,13 @@
 import { recordTracksEvent } from '@automattic/calypso-analytics';
-import { HelpCenterSelect } from '@automattic/data-stores';
+import { HelpCenterSelect, isLoggedInHCUser } from '@automattic/data-stores';
 import { HELP_CENTER_STORE } from '@automattic/help-center/src/stores';
 import { useIsMutating } from '@tanstack/react-query';
 import { useSelect } from '@wordpress/data';
 import { useState, useEffect, useRef } from '@wordpress/element';
 import { useLocation } from 'react-router-dom';
 import { getMessageUniqueIdentifier } from '../components/message/utils/get-message-unique-identifier';
 import { getOdieTransferMessage } from '../constants';
-import { emptyChat, useOdieAssistantContext } from '../context';
+import { emptyChat } from '../context';
 import { useGetZendeskConversation, useManageSupportInteraction, useOdieChat } from '../data';
 import { useCurrentSupportInteraction } from '../data/use-current-support-interaction';
 import {
@@ -49,10 +49,8 @@ export const useGetCombinedChat = (
 	const { data: currentSupportInteraction, isLoading: isLoadingCurrentSupportInteraction } =
 		useCurrentSupportInteraction();
 
-	const { currentUser } = useOdieAssistantContext();
-
 	const location = useLocation();
-	const isLoggedIn = !! currentUser?.ID;
+	const isLoggedIn = isLoggedInHCUser();
 	const params = new URLSearchParams( location.search );
 	const loggedOutOdieChatId = params.get( 'chatId' );
 	const loggedOutOdieSessionId = params.get( 'sessionId' );