@automattic/data-stores 3.1.1 → 3.2.0

package/src/contextual-help/admin-sections.ts

@@ -127,7 +127,7 @@ export function generateAdminSections(
 		},
 		{
 			title: __( "View my site's latest stats" ),
-			link: `/stats/day/${ siteSlug }`,
+			link: `https://${ siteSlug }/wp-admin/admin.php?page=stats`,
 			synonyms: [ 'analytics' ],
 			icon: 'stats-alt',
 		},
@@ -390,7 +390,7 @@ export function generateAdminSections(
 		},
 		{
 			title: __( 'View contact form messages', __i18n_text_domain__ ),
-			link: `https://${ siteSlug }/wp-admin/edit.php?post_type=feedback&calypsoify=1`,
+			link: `https://${ siteSlug }/wp-admin/admin.php?page=jetpack-forms-admin`,
 			synonyms: [ 'contact', 'form' ],
 			icon: 'cog',
 		},

package/src/help-center/actions.ts

@@ -1,11 +1,9 @@
 import { default as apiFetchPromise } from '@wordpress/api-fetch';
 import { select } from '@wordpress/data';
-import { apiFetch } from '@wordpress/data-controls';
 import { addQueryArgs } from '@wordpress/url';
 import { default as wpcomRequestPromise, canAccessWpcomApis } from 'wpcom-proxy-request';
 import { GeneratorReturnType } from '../mapped-types';
 import { SiteDetails } from '../site';
-import { wpcomRequest } from '../wpcom-request-controls';
 import { STORE_KEY } from './constants';
 import { isE2ETest } from '.';
 import type {
@@ -14,43 +12,53 @@ import type {
 	HelpCenterSelect,
 	HelpCenterShowOptions,
 } from './types';
-import type { SupportInteraction } from '@automattic/odie-client/src/types';
+import type { Location } from 'history';
+
+/**
+ * Save the open state of the help center to the remote user preferences.
+ * @param isShown - Whether the help center is shown.
+ * @param isMinimized - Whether the help center is minimized.
+ */
+export const saveOpenState = ( isShown: boolean | undefined, isMinimized: boolean | undefined ) => {
+	const saveState: Record< string, boolean | null > = {};
+
+	if ( typeof isShown === 'boolean' ) {
+		saveState.help_center_open = isShown;
+		if ( ! isShown ) {
+			// Delete the remote version of the navigation history when closing the help center
+			saveState.help_center_router_history = null;
+		}
+	}
 
-export const receiveHasSeenWhatsNewModal = ( value: boolean | undefined ) =>
-	( {
-		type: 'HELP_CENTER_SET_SEEN_WHATS_NEW_MODAL',
-		value,
-	} ) as const;
+	if ( typeof isMinimized === 'boolean' ) {
+		saveState.help_center_minimized = isMinimized;
+	}
 
-export function* setHasSeenWhatsNewModal( value: boolean ) {
-	let response: {
-		has_seen_whats_new_modal: boolean;
-	};
 	if ( canAccessWpcomApis() ) {
-		response = yield wpcomRequest( {
-			path: '/block-editor/has-seen-whats-new-modal',
+		// Use the promise version to do that action without waiting for the result.
+		wpcomRequestPromise( {
+			path: '/me/preferences',
 			apiNamespace: 'wpcom/v2',
 			method: 'PUT',
-			body: {
-				has_seen_whats_new_modal: value,
-			},
-		} );
+			body: { calypso_preferences: saveState },
+		} ).catch( () => {} );
 	} else {
-		response = yield apiFetch( {
+		// Use the promise version to do that action without waiting for the result.
+		apiFetchPromise( {
 			global: true,
-			path: '/wpcom/v2/block-editor/has-seen-whats-new-modal',
+			path: '/help-center/open-state',
 			method: 'PUT',
-			data: { has_seen_whats_new_modal: value },
-		} as APIFetchOptions );
+			data: saveState,
+		} as APIFetchOptions ).catch( () => {} );
 	}
+};
 
-	return receiveHasSeenWhatsNewModal( response.has_seen_whats_new_modal );
-}
-
-export function setCurrentSupportInteraction( supportInteraction: SupportInteraction ) {
+export function setHelpCenterRouterHistory(
+	history: { entries: Location[]; index: number } | undefined
+) {
 	return {
-		type: 'HELP_CENTER_SET_CURRENT_SUPPORT_INTERACTION',
-		supportInteraction,
+		type: 'HELP_CENTER_SET_HELP_CENTER_ROUTER_HISTORY',
+		history,
 	} as const;
 }
 
@@ -78,11 +86,13 @@ export const setOdieBotNameSlug = ( odieBotNameSlug: string ) =>
 		odieBotNameSlug,
 	} ) as const;
 
-export const setIsMinimized = ( minimized: boolean ) =>
-	( {
+export const setIsMinimized = function* ( minimized: boolean ) {
+	yield saveOpenState( undefined, minimized );
+	return {
 		type: 'HELP_CENTER_SET_MINIMIZED',
 		minimized,
-	} ) as const;
+	} as const;
+};
 
 export const setIsChatLoaded = ( isChatLoaded: boolean ) =>
 	( {
@@ -102,6 +112,21 @@ export const setZendeskClientId = ( zendeskClientId: string ) =>
 		zendeskClientId,
 	} ) as const;
 
+export const setZendeskConnectionStatus = (
+	connectionStatus: 'disconnected' | 'reconnecting' | 'connected'
+) =>
+	( {
+		type: 'HELP_CENTER_SET_ZENDESK_CONNECTION_STATUS',
+		connectionStatus,
+	} ) as const;
+
+export const setSupportTypingStatus = ( conversationId: string, isTyping: false ) =>
+	( {
+		type: 'HELP_CENTER_SET_TYPING_STATUS',
+		conversationId,
+		isTyping,
+	} ) as const;
+
 export const setShowMessagingLauncher = ( show: boolean ) =>
 	( {
 		type: 'HELP_CENTER_SET_SHOW_MESSAGING_LAUNCHER',
@@ -120,9 +145,15 @@ export const setMessage = ( message: string ) =>
 		message,
 	} ) as const;
 
-export const setAllowPremiumSupport = ( allow: boolean ) =>
+export const setContextTerm = ( contextTerm: string ) =>
 	( {
-		type: 'HELP_CENTER_SET_ALLOW_PREMIUM_SUPPORT',
+		type: 'HELP_CENTER_SET_CONTEXT_TERM',
+		contextTerm,
+	} ) as const;
+
+export const setHasPremiumSupport = ( allow: boolean ) =>
+	( {
+		type: 'HELP_CENTER_SET_HAS_PREMIUM_SUPPORT',
 		allow,
 	} ) as const;
 
@@ -133,13 +164,24 @@ export const setHelpCenterOptions = ( options: HelpCenterOptions ) => ( {
 
 export const setShowHelpCenter = function* (
 	show: boolean,
-	allowPremiumSupport = false,
-	options: HelpCenterShowOptions = { hideBackButton: false, searchTerm: '' }
+	options: HelpCenterShowOptions = {
+		hasPremiumSupport: false,
+		hideBackButton: false,
+		contextTerm: '',
+	},
+	/**
+	 * When the Help Center is minimized and someone clicks the (?) toggle button, we should maximize it.
+	 * But this means ignoring the `show=false` value the button will send. The problem is we'll also ignore the `show=false` when the close (x) buttons is clicked too.
+	 * `forceClose` listens to the show value always. Which the (x) button sets to true.
+	 */
+	forceClose = false
 ): Generator< unknown, { type: 'HELP_CENTER_SET_SHOW'; show: boolean }, unknown > {
-	const isMinimized = ( select( STORE_KEY ) as HelpCenterSelect ).getIsMinimized();
+	let isMinimized = ( select( STORE_KEY ) as HelpCenterSelect ).getIsMinimized();
 
-	if ( ! show && isMinimized ) {
+	// Opening or closing the Help Center should reset the minimized state.
+	if ( ! show && ! forceClose && isMinimized ) {
 		yield setIsMinimized( false );
+		isMinimized = false;
 
 		return {
 			type: 'HELP_CENTER_SET_SHOW',
@@ -148,41 +190,25 @@ export const setShowHelpCenter = function* (
 	}
 
 	if ( ! isE2ETest() ) {
-		if ( canAccessWpcomApis() ) {
-			// Use the promise version to do that action without waiting for the result.
-			wpcomRequestPromise( {
-				path: '/me/preferences',
-				apiNamespace: 'wpcom/v2',
-				method: 'PUT',
-				body: {
-					calypso_preferences: { help_center_open: show },
-				},
-			} ).catch( () => {} );
-		} else {
-			// Use the promise version to do that action without waiting for the result.
-			apiFetchPromise( {
-				global: true,
-				path: '/help-center/open-state',
-				method: 'PUT',
-				data: { help_center_open: show },
-			} as APIFetchOptions ).catch( () => {} );
-		}
+		saveOpenState( show, isMinimized );
 	}
 
 	if ( ! show ) {
 		yield setNavigateToRoute( undefined );
+		// Reset the local navigation history when closing the help center.
+		yield setHelpCenterRouterHistory( undefined );
 	} else {
 		yield setShowMessagingWidget( false );
 	}
 
-	yield setMessage( options?.searchTerm || '' );
+	yield setContextTerm( options?.contextTerm || '' );
 	yield setIsMinimized( false );
 
-	if ( allowPremiumSupport ) {
-		yield setAllowPremiumSupport( true );
+	if ( options?.hasPremiumSupport ) {
+		yield setHasPremiumSupport( true );
 	}
 
-	if ( options?.hideBackButton ) {
+	if ( options ) {
 		yield setHelpCenterOptions( options );
 	}
 
@@ -220,11 +246,13 @@ export const setNewMessagingChat = function* ( {
 	section,
 	siteUrl,
 	siteId,
+	userFieldFlowName,
 }: {
 	initialMessage: string;
 	section?: string;
 	siteUrl?: string;
 	siteId?: string;
+	userFieldFlowName?: string;
 } ) {
 	const url = addQueryArgs( '/odie', {
 		provider: 'zendesk',
@@ -232,11 +260,17 @@ export const setNewMessagingChat = function* ( {
 		section,
 		siteUrl,
 		siteId,
+		userFieldFlowName,
 	} );
 	yield setNavigateToRoute( url );
 	yield setShowHelpCenter( true );
 };
 
+export const setNavigateToOdie = function* () {
+	yield setNavigateToRoute( '/odie' );
+	yield setShowHelpCenter( true );
+};
+
 export const setShowSupportDoc = function* ( link: string, postId?: number, blogId?: number ) {
 	const params = new URLSearchParams( {
 		link,
@@ -255,20 +289,22 @@ export type HelpCenterAction =
 			| typeof setShowMessagingWidget
 			| typeof setSubject
 			| typeof resetStore
-			| typeof receiveHasSeenWhatsNewModal
 			| typeof setMessage
+			| typeof setContextTerm
 			| typeof setUserDeclaredSite
 			| typeof setUserDeclaredSiteUrl
 			| typeof setUnreadCount
-			| typeof setIsMinimized
+			| typeof setHelpCenterRouterHistory
 			| typeof setIsChatLoaded
 			| typeof setAreSoundNotificationsEnabled
 			| typeof setZendeskClientId
+			| typeof setSupportTypingStatus
+			| typeof setZendeskConnectionStatus
 			| typeof setNavigateToRoute
 			| typeof setOdieInitialPromptText
 			| typeof setOdieBotNameSlug
-			| typeof setCurrentSupportInteraction
-			| typeof setAllowPremiumSupport
+			| typeof setHasPremiumSupport
 			| typeof setHelpCenterOptions
 	  >
-	| GeneratorReturnType< typeof setShowHelpCenter | typeof setHasSeenWhatsNewModal >;
+	| GeneratorReturnType< typeof setShowHelpCenter >
+	| GeneratorReturnType< typeof setIsMinimized >;

package/src/help-center/index.ts

@@ -9,7 +9,9 @@ import { isHelpCenterShown } from './resolvers';
 import * as selectors from './selectors';
 export type { State };
 
-declare const helpCenterData: { isProxied: boolean } | undefined;
+declare const helpCenterData: { isProxied: boolean; isSU: boolean; isSSP: boolean } | undefined;
+declare const isSupportSession: boolean;
+declare const isSSP: boolean;
 
 let isRegistered = false;
 
@@ -19,10 +21,9 @@ const E2E_USER_AGENT = 'wp-e2e-tests';
 export const isE2ETest = () =>
 	typeof window !== 'undefined' && window.navigator.userAgent.includes( E2E_USER_AGENT );
 
-export const isSupportSession = () => {
+export const isInSupportSession = () => {
 	if ( typeof window !== 'undefined' ) {
 		return (
-			'disableHelpCenterAutoOpen' in window ||
 			// A bit hacky but much easier than passing down data from PHP in Jetpack
 			// Simple
 			!! document.querySelector( '#wp-admin-bar-support-session-details' ) ||
@@ -30,16 +31,17 @@ export const isSupportSession = () => {
 			// Atomic
 			document.body.classList.contains( 'support-session' ) ||
 			document.querySelector( '#wpcom > .is-support-session' ) ||
-			// Our failover last hope, don't re-open when proxied.
-			// This is not the same `window.helpCenterData`, because it's defined as `const helpCenterData`
-			( typeof helpCenterData !== 'undefined' && helpCenterData?.isProxied )
+			( typeof isSupportSession !== 'undefined' && !! isSupportSession ) ||
+			( typeof helpCenterData !== 'undefined' && helpCenterData?.isSU ) ||
+			( typeof helpCenterData !== 'undefined' && helpCenterData?.isSSP ) ||
+			( typeof isSSP !== 'undefined' && !! isSSP )
 		);
 	}
 	return false;
 };
 
 export function register(): typeof STORE_KEY {
-	const enabledPesistedOpenState = ! isE2ETest() && ! isSupportSession();
+	const enabledPersistedOpenState = ! isE2ETest() && ! isInSupportSession();
 
 	registerPlugins();
 
@@ -51,7 +53,7 @@ export function register(): typeof STORE_KEY {
 			selectors,
 			persist: [ 'message', 'userDeclaredSite', 'userDeclaredSiteUrl', 'subject' ],
 			// Don't persist the open state for e2e users, because parallel tests will start interfering with each other.
-			resolvers: enabledPesistedOpenState ? { isHelpCenterShown } : undefined,
+			resolvers: enabledPersistedOpenState ? { isHelpCenterShown } : undefined,
 		} );
 		isRegistered = true;
 	}

package/src/help-center/reducer.ts

@@ -2,7 +2,7 @@ import { combineReducers } from '@wordpress/data';
 import { SiteDetails } from '../site';
 import type { HelpCenterAction } from './actions';
 import type { HelpCenterOptions } from './types';
-import type { SupportInteraction } from '@automattic/odie-client/src/types';
+import type { Location } from 'history';
 import type { Reducer } from 'redux';
 
 const showHelpCenter: Reducer< boolean | undefined, HelpCenterAction > = ( state, action ) => {
@@ -13,42 +13,54 @@ const showHelpCenter: Reducer< boolean | undefined, HelpCenterAction > = ( state
 	return state;
 };
 
-const showMessagingLauncher: Reducer< boolean | undefined, HelpCenterAction > = (
-	state,
-	action
-) => {
+const typingConversationStatus: Reducer<
+	Record< string, boolean > | undefined,
+	HelpCenterAction
+> = ( state = undefined, action ) => {
 	switch ( action.type ) {
-		case 'HELP_CENTER_SET_SHOW_MESSAGING_LAUNCHER':
-			return action.show;
+		case 'HELP_CENTER_SET_TYPING_STATUS':
+			return { ...state, [ action.conversationId ]: action.isTyping };
 	}
 	return state;
 };
 
-const showMessagingWidget: Reducer< boolean | undefined, HelpCenterAction > = ( state, action ) => {
+const zendeskConnectionStatus: Reducer<
+	'disconnected' | 'reconnecting' | 'connected' | undefined,
+	HelpCenterAction
+> = ( state = undefined, action ) => {
 	switch ( action.type ) {
-		case 'HELP_CENTER_SET_SHOW_MESSAGING_WIDGET':
-			return action.show;
+		case 'HELP_CENTER_SET_ZENDESK_CONNECTION_STATUS':
+			return action.connectionStatus;
 	}
 	return state;
 };
 
-const hasSeenWhatsNewModal: Reducer< boolean | undefined, HelpCenterAction > = (
+const showMessagingLauncher: Reducer< boolean | undefined, HelpCenterAction > = (
 	state,
 	action
 ) => {
 	switch ( action.type ) {
-		case 'HELP_CENTER_SET_SEEN_WHATS_NEW_MODAL':
-			return action.value;
+		case 'HELP_CENTER_SET_SHOW_MESSAGING_LAUNCHER':
+			return action.show;
 	}
 	return state;
 };
 
-const currentSupportInteraction: Reducer< SupportInteraction | undefined, HelpCenterAction > = (
-	state,
-	action
-) => {
-	if ( action.type === 'HELP_CENTER_SET_CURRENT_SUPPORT_INTERACTION' ) {
-		return action.supportInteraction;
+const helpCenterRouterHistory: Reducer<
+	{ entries: Location[]; index: number } | undefined,
+	HelpCenterAction
+> = ( state, action ) => {
+	switch ( action.type ) {
+		case 'HELP_CENTER_SET_HELP_CENTER_ROUTER_HISTORY':
+			return action.history;
+	}
+	return state;
+};
+
+const showMessagingWidget: Reducer< boolean | undefined, HelpCenterAction > = ( state, action ) => {
+	switch ( action.type ) {
+		case 'HELP_CENTER_SET_SHOW_MESSAGING_WIDGET':
+			return action.show;
 	}
 	return state;
 };
@@ -160,14 +172,21 @@ const odieBotNameSlug: Reducer< string | undefined, HelpCenterAction > = ( state
 	return state;
 };
 
-const allowPremiumSupport: Reducer< boolean, HelpCenterAction > = ( state = false, action ) => {
+const hasPremiumSupport: Reducer< boolean, HelpCenterAction > = ( state = false, action ) => {
 	switch ( action.type ) {
-		case 'HELP_CENTER_SET_ALLOW_PREMIUM_SUPPORT':
+		case 'HELP_CENTER_SET_HAS_PREMIUM_SUPPORT':
 			return action.allow;
 	}
 	return state;
 };
 
+const contextTerm: Reducer< string | undefined, HelpCenterAction > = ( state, action ) => {
+	if ( action.type === 'HELP_CENTER_SET_CONTEXT_TERM' ) {
+		return action.contextTerm;
+	}
+	return state;
+};
+
 const helpCenterOptions: Reducer< HelpCenterOptions, HelpCenterAction > = (
 	state = {},
 	action
@@ -179,24 +198,26 @@ const helpCenterOptions: Reducer< HelpCenterOptions, HelpCenterAction > = (
 };
 
 const reducer = combineReducers( {
-	currentSupportInteraction,
 	showHelpCenter,
 	showMessagingLauncher,
 	showMessagingWidget,
+	zendeskConnectionStatus,
 	subject,
 	message,
 	userDeclaredSite,
 	userDeclaredSiteUrl,
-	hasSeenWhatsNewModal,
 	isMinimized,
 	isChatLoaded,
+	typingConversationStatus,
 	areSoundNotificationsEnabled,
 	zendeskClientId,
 	unreadCount,
 	navigateToRoute,
 	odieInitialPromptText,
 	odieBotNameSlug,
-	allowPremiumSupport,
+	helpCenterRouterHistory,
+	hasPremiumSupport,
+	contextTerm,
 	helpCenterOptions,
 } );
 

package/src/help-center/resolvers.ts

@@ -1,13 +1,24 @@
 import { apiFetch } from '@wordpress/data-controls';
 import { canAccessWpcomApis } from 'wpcom-proxy-request';
 import { wpcomRequest } from '../wpcom-request-controls';
+import { setHelpCenterRouterHistory, setIsMinimized } from './actions';
 import type { APIFetchOptions } from './types';
+import type { Location } from 'history';
+
+type Preferences = {
+	calypso_preferences: {
+		help_center_open: boolean;
+		help_center_minimized: boolean;
+		help_center_router_history: {
+			entries: Location[];
+			index: number;
+		};
+	};
+};
 
 export function* isHelpCenterShown() {
 	try {
-		const preferences: {
-			help_center_open: boolean;
-		} = canAccessWpcomApis()
+		const { calypso_preferences: preferences }: Preferences = canAccessWpcomApis()
 			? yield wpcomRequest( {
 					path: '/me/preferences',
 					apiNamespace: 'wpcom/v2',
@@ -17,6 +28,12 @@ export function* isHelpCenterShown() {
 					path: '/help-center/open-state',
 			  } as APIFetchOptions );
 
+		if ( preferences.help_center_router_history ) {
+			yield setHelpCenterRouterHistory( preferences.help_center_router_history );
+		}
+
+		yield setIsMinimized( preferences.help_center_minimized );
+
 		// We only want to auto-open, we don't want to auto-close (and potentially overrule the user's action).
 		if ( preferences.help_center_open ) {
 			return {

package/src/help-center/selectors.ts

@@ -8,15 +8,18 @@ export const getMessage = ( state: State ) => state.message;
 export const getUserDeclaredSiteUrl = ( state: State ) => state.userDeclaredSiteUrl;
 export const getUserDeclaredSite = ( state: State ) => state.userDeclaredSite;
 export const getUnreadCount = ( state: State ) => state.unreadCount;
+export const getZendeskConnectionStatus = ( state: State ) => state.zendeskConnectionStatus;
 export const getIsMinimized = ( state: State ) => state.isMinimized;
 export const getIsChatLoaded = ( state: State ) => state.isChatLoaded;
 export const getAreSoundNotificationsEnabled = ( state: State ) =>
 	state.areSoundNotificationsEnabled;
 export const getZendeskClientId = ( state: State ) => state.zendeskClientId;
-export const getHasSeenWhatsNewModal = ( state: State ) => state.hasSeenWhatsNewModal;
+export const getHelpCenterRouterHistory = ( state: State ) => state.helpCenterRouterHistory;
 export const getNavigateToRoute = ( state: State ) => state.navigateToRoute;
 export const getOdieInitialPromptText = ( state: State ) => state.odieInitialPromptText;
 export const getOdieBotNameSlug = ( state: State ) => state.odieBotNameSlug;
-export const getCurrentSupportInteraction = ( state: State ) => state.currentSupportInteraction;
-export const getAllowPremiumSupport = ( state: State ) => state.allowPremiumSupport;
+export const getHasPremiumSupport = ( state: State ) => state.hasPremiumSupport;
 export const getHelpCenterOptions = ( state: State ) => state.helpCenterOptions;
+export const getContextTerm = ( state: State ) => state.contextTerm;
+export const getSupportTypingStatus = ( state: State, conversationId: string ) =>
+	state.typingConversationStatus?.[ conversationId ];

package/src/help-center/types.ts

@@ -10,8 +10,9 @@ export type Location = {
 	key?: string;
 };
 export interface HelpCenterShowOptions {
+	hasPremiumSupport: boolean;
 	hideBackButton: boolean;
-	searchTerm: string;
+	contextTerm: string;
 }
 export interface SiteLogo {
 	id: number;
@@ -32,6 +33,7 @@ export interface HelpCenterSite {
 	is_wpcom_atomic: boolean;
 	jetpack: boolean;
 	logo: SiteLogo;
+	site_owner: number;
 	options: {
 		launchpad_screen: string;
 		site_intent: string;

package/src/index.ts

@@ -1,6 +1,4 @@
 import * as AddOns from './add-ons';
-import * as Analyzer from './analyzer';
-import * as DomainSuggestions from './domain-suggestions';
 import * as HelpCenter from './help-center';
 import * as Onboard from './onboard';
 import * as Plans from './plans';
@@ -20,7 +18,6 @@ export * from './starter-designs-queries';
 export * from './site/types';
 export * from './templates';
 export * from './onboard/types';
-export * from './domain-suggestions/types';
 export * from './plans/types';
 export * from './theme';
 export * from './user/types';
@@ -38,9 +35,7 @@ const { SubscriptionManager } = Reader;
 
 export {
 	AddOns,
-	Analyzer,
 	User,
-	DomainSuggestions,
 	HelpCenter,
 	Site,
 	Plans,
@@ -63,9 +58,14 @@ export type { Section } from './contextual-help/contextual-help';
 export { generateAdminSections } from './contextual-help/admin-sections';
 export type { LinksForSection } from './contextual-help/contextual-help';
 export * from './contextual-help/constants';
-export type { HelpCenterSite, HelpCenterSelect } from './help-center/types';
+export type {
+	HelpCenterSite,
+	HelpCenterSelect,
+	Dispatch as HelpCenterDispatch,
+} from './help-center/types';
 export type { OnboardSelect, OnboardActions } from './onboard';
 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 { isInSupportSession } from './help-center';

package/src/newsletter-categories/test/index.tsx

@@ -14,7 +14,7 @@ describe( 'useNewsletterCategories', () => {
 	let wrapper: React.FC< { children: React.ReactNode } >;
 
 	beforeEach( () => {
-		( request as jest.MockedFunction< typeof request > ).mockReset();
+		jest.mocked( request ).mockReset();
 
 		queryClient = new QueryClient( {
 			defaultOptions: {
@@ -34,7 +34,7 @@ describe( 'useNewsletterCategories', () => {
 	} );
 
 	it( 'should return expected data when successful', async () => {
-		( request as jest.MockedFunction< typeof request > ).mockResolvedValue( {
+		jest.mocked( request ).mockResolvedValue( {
 			enabled: true,
 			newsletter_categories: [
 				{ id: 1, name: 'Category 1', slug: 'Slug 1', description: 'Description 1', parent: 1 },
@@ -56,7 +56,7 @@ describe( 'useNewsletterCategories', () => {
 	} );
 
 	it( 'should handle empty response', async () => {
-		( request as jest.MockedFunction< typeof request > ).mockResolvedValue( {
+		jest.mocked( request ).mockResolvedValue( {
 			enabled: false,
 			newsletter_categories: [],
 		} );
@@ -69,7 +69,7 @@ describe( 'useNewsletterCategories', () => {
 	} );
 
 	it( 'should call request with correct arguments', async () => {
-		( request as jest.MockedFunction< typeof request > ).mockResolvedValue( {
+		jest.mocked( request ).mockResolvedValue( {
 			enabled: true,
 			newsletter_categories: [],
 		} );
@@ -88,9 +88,7 @@ describe( 'useNewsletterCategories', () => {
 
 	it( 'should handle error response', async () => {
 		const errorMessage = 'API Error';
-		( request as jest.MockedFunction< typeof request > ).mockRejectedValue(
-			new Error( errorMessage )
-		);
+		jest.mocked( request ).mockRejectedValue( new Error( errorMessage ) );
 
 		const { result } = renderHook( () => useNewsletterCategories( { siteId: 123 } ), { wrapper } );