Skip to content

The open alternative to Salesforce, designed for AI.

Derive chat loading and session start instead of syncing them in effects (#27565)

Félix Malfait35d9c5ee75ee
diff --git a/packages/twenty-front/src/modules/ai/components/AgentChatHasBeenOpenedEffect.tsx b/packages/twenty-front/src/modules/ai/components/AgentChatHasBeenOpenedEffect.tsx
index b843c540abc..1790253f461 100644
--- a/packages/twenty-front/src/modules/ai/components/AgentChatHasBeenOpenedEffect.tsx
+++ b/packages/twenty-front/src/modules/ai/components/AgentChatHasBeenOpenedEffect.tsx
@@ -1,16 +1,20 @@
import { useEffect } from 'react';
+import { Temporal } from 'temporal-polyfill';
-import { hasAgentChatBeenOpenedState } from '@/ai/states/hasAgentChatBeenOpenedState';
+import { agentChatUISessionStartTimeState } from '@/ai/states/agentChatUISessionStartTimeState';
import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';
export const AgentChatHasBeenOpenedEffect = () => {
- const setHasAgentChatBeenOpened = useSetAtomState(
- hasAgentChatBeenOpenedState,
+ const setAgentChatUISessionStartTime = useSetAtomState(
+ agentChatUISessionStartTimeState,
);
useEffect(() => {
- setHasAgentChatBeenOpened(true);
- }, [setHasAgentChatBeenOpened]);
+ setAgentChatUISessionStartTime(
+ (agentChatUISessionStartTime) =>
+ agentChatUISessionStartTime ?? Temporal.Now.instant(),
+ );
+ }, [setAgentChatUISessionStartTime]);
return null;
};
diff --git a/packages/twenty-front/src/modules/ai/components/AgentChatRuntimeEffects.tsx b/packages/twenty-front/src/modules/ai/components/AgentChatRuntimeEffects.tsx
index 8883139403f..63aedcb5e28 100644
--- a/packages/twenty-front/src/modules/ai/components/AgentChatRuntimeEffects.tsx
+++ b/packages/twenty-front/src/modules/ai/components/AgentChatRuntimeEffects.tsx
@@ -1,20 +1,23 @@
import { AgentChatMessagesFetchEffect } from '@/ai/components/AgentChatMessagesFetchEffect';
import { AgentChatPrepromptEffect } from '@/ai/components/AgentChatPrepromptEffect';
-import { AgentChatSessionStartTimeEffect } from '@/ai/components/AgentChatSessionStartTimeEffect';
import { AgentChatStreamKeepAliveEffect } from '@/ai/components/AgentChatStreamKeepAliveEffect';
import { AgentChatStreamSubscriptionEffect } from '@/ai/components/AgentChatStreamSubscriptionEffect';
-import { hasAgentChatBeenOpenedState } from '@/ai/states/hasAgentChatBeenOpenedState';
+import { agentChatUISessionStartTimeState } from '@/ai/states/agentChatUISessionStartTimeState';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { useIsWorkspaceActivationStatusEqualsTo } from '@/workspace/hooks/useIsWorkspaceActivationStatusEqualsTo';
+import { isDefined } from 'twenty-shared/utils';
import { WorkspaceActivationStatus } from 'twenty-shared/workspace';
export const AgentChatRuntimeEffects = () => {
- const hasAgentChatBeenOpened = useAtomStateValue(hasAgentChatBeenOpenedState);
+ // The session starts the first time the chat is opened
+ const agentChatUISessionStartTime = useAtomStateValue(
+ agentChatUISessionStartTimeState,
+ );
const isWorkspaceSuspended = useIsWorkspaceActivationStatusEqualsTo(
WorkspaceActivationStatus.SUSPENDED,
);
- if (!hasAgentChatBeenOpened || isWorkspaceSuspended) {
+ if (!isDefined(agentChatUISessionStartTime) || isWorkspaceSuspended) {
return null;
}
@@ -24,7 +27,6 @@ export const AgentChatRuntimeEffects = () => {
<AgentChatStreamSubscriptionEffect />
<AgentChatPrepromptEffect />
<AgentChatStreamKeepAliveEffect />
- <AgentChatSessionStartTimeEffect />
</>
);
};
diff --git a/packages/twenty-front/src/modules/ai/components/AgentChatSessionStartTimeEffect.tsx b/packages/twenty-front/src/modules/ai/components/AgentChatSessionStartTimeEffect.tsx
deleted file mode 100644
index 12b735f3bbe..00000000000
--- a/packages/twenty-front/src/modules/ai/components/AgentChatSessionStartTimeEffect.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import { agentChatUISessionStartTimeState } from '@/ai/states/agentChatUISessionStartTimeState';
-import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';
-import { useEffect } from 'react';
-import { Temporal } from 'temporal-polyfill';
-
-export const AgentChatSessionStartTimeEffect = () => {
- const [agentChatUISessionStartTime, setAgentChatUISessionStartTime] =
- useAtomState(agentChatUISessionStartTimeState);
-
- useEffect(() => {
- if (agentChatUISessionStartTime === null) {
- setAgentChatUISessionStartTime(Temporal.Now.instant());
- }
- }, [agentChatUISessionStartTime, setAgentChatUISessionStartTime]);
-
- return null;
-};
diff --git a/packages/twenty-front/src/modules/ai/components/AgentChatThreadInitializationEffect.tsx b/packages/twenty-front/src/modules/ai/components/AgentChatThreadInitializationEffect.tsx
index bf7ad87d569..b778a0dc35b 100644
--- a/packages/twenty-front/src/modules/ai/components/AgentChatThreadInitializationEffect.tsx
+++ b/packages/twenty-front/src/modules/ai/components/AgentChatThreadInitializationEffect.tsx
@@ -5,9 +5,8 @@ import { isDefined, isValidUuid } from 'twenty-shared/utils';
import { getAgentChatUsageFromThread } from '@/ai/utils/getAgentChatUsageFromThread';
import { useRefreshAgentChatThreads } from '@/ai/hooks/useRefreshAgentChatThreads';
import { AGENT_CHAT_NEW_THREAD_DRAFT_KEY } from '@/ai/states/agentChatDraftsByThreadIdState';
-import { agentChatThreadListState } from '@/ai/states/agentChatThreadListState';
-import { agentChatThreadsLoadingState } from '@/ai/states/agentChatThreadsLoadingState';
import { agentChatUsageFamilyState } from '@/ai/states/agentChatUsageFamilyState';
+import { agentChatThreadsLoadingSelector } from '@/ai/states/selectors/agentChatThreadsLoadingSelector';
import { agentChatThreadRecordFamilySelector } from '@/ai/states/selectors/agentChatThreadRecordFamilySelector';
import { agentChatVisibleThreadsSelector } from '@/ai/states/selectors/agentChatVisibleThreadsSelector';
import { currentAiChatThreadState } from '@/ai/states/currentAiChatThreadState';
@@ -15,20 +14,15 @@ import { hasInitializedAgentChatThreadsState } from '@/ai/states/hasInitializedA
import { hasTriggeredCreateForDraftState } from '@/ai/states/hasTriggeredCreateForDraftState';
import { sortChatThreadsByLastActivityDesc } from '@/ai/utils/sortChatThreadsByLastActivityDesc';
import { metadataStoreStatusFamilySelector } from '@/metadata-store/states/metadataStoreStatusFamilySelector';
-import { useIsWorkspaceActivationStatusEqualsTo } from '@/workspace/hooks/useIsWorkspaceActivationStatusEqualsTo';
-import { WorkspaceActivationStatus } from 'twenty-shared/workspace';
-import { useHasPermissionFlag } from '@/settings/roles/hooks/useHasPermissionFlag';
import { useAtomFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilySelectorValue';
import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';
-import { PermissionFlagType } from '~/generated-metadata/graphql';
const AGENT_CHAT_THREADS_REFRESH_RETRY_DELAY_MS = 3000;
export const AgentChatThreadInitializationEffect = () => {
const { refreshAgentChatThreads } = useRefreshAgentChatThreads();
- const hasAiPermission = useHasPermissionFlag(PermissionFlagType.AI);
// The record API builds chat queries from the chat object's fields.
const areFieldMetadataItemsLoaded =
useAtomFamilySelectorValue(
@@ -36,32 +30,21 @@ export const AgentChatThreadInitializationEffect = () => {
'fieldMetadataItems',
) === 'up-to-date';
- // The record API refuses a suspended workspace
- const isWorkspaceSuspended = useIsWorkspaceActivationStatusEqualsTo(
- WorkspaceActivationStatus.SUSPENDED,
+ const agentChatThreadsLoading = useAtomStateValue(
+ agentChatThreadsLoadingSelector,
);
- const canLoadAgentChatThreads = hasAiPermission && !isWorkspaceSuspended;
const currentAiChatThread = useAtomStateValue(currentAiChatThreadState);
const setCurrentAiChatThread = useSetAtomState(currentAiChatThreadState);
- const setAgentChatThreadsLoading = useSetAtomState(
- agentChatThreadsLoadingState,
- );
const store = useStore();
const agentChatVisibleThreads = useAtomStateValue(
agentChatVisibleThreadsSelector,
);
- const agentChatThreadList = useAtomStateValue(agentChatThreadListState);
- const areAgentChatThreadsLoaded = agentChatThreadList !== null;
const [hasInitializedAgentChatThreads, setHasInitializedAgentChatThreads] =
useAtomState(hasInitializedAgentChatThreadsState);
useEffect(() => {
- if (
- areAgentChatThreadsLoaded ||
- !canLoadAgentChatThreads ||
- !areFieldMetadataItemsLoaded
- ) {
+ if (!agentChatThreadsLoading || !areFieldMetadataItemsLoaded) {
return;
}
@@ -91,27 +74,13 @@ export const AgentChatThreadInitializationEffect = () => {
}
};
}, [
- areAgentChatThreadsLoaded,
+ agentChatThreadsLoading,
areFieldMetadataItemsLoaded,
- canLoadAgentChatThreads,
refreshAgentChatThreads,
]);
useEffect(() => {
- setAgentChatThreadsLoading(
- !areAgentChatThreadsLoaded && canLoadAgentChatThreads,
- );
- }, [
- areAgentChatThreadsLoaded,
- canLoadAgentChatThreads,
- setAgentChatThreadsLoading,
- ]);
-
- useEffect(() => {
- if (
- hasInitializedAgentChatThreads ||
- (!areAgentChatThreadsLoaded && canLoadAgentChatThreads)
- ) {
+ if (hasInitializedAgentChatThreads || agentChatThreadsLoading) {
return;
}
@@ -151,10 +120,9 @@ export const AgentChatThreadInitializationEffect = () => {
}, [
agentChatVisibleThreads,
currentAiChatThread,
- canLoadAgentChatThreads,
+ agentChatThreadsLoading,
hasInitializedAgentChatThreads,
setHasInitializedAgentChatThreads,
- areAgentChatThreadsLoaded,
setCurrentAiChatThread,
store,
]);
diff --git a/packages/twenty-front/src/modules/ai/components/__tests__/AgentChatRuntimeEffects.test.tsx b/packages/twenty-front/src/modules/ai/components/__tests__/AgentChatRuntimeEffects.test.tsx
index 66abd8b3693..2a01192be01 100644
--- a/packages/twenty-front/src/modules/ai/components/__tests__/AgentChatRuntimeEffects.test.tsx
+++ b/packages/twenty-front/src/modules/ai/components/__tests__/AgentChatRuntimeEffects.test.tsx
@@ -1,9 +1,10 @@
import { render, screen } from '@testing-library/react';
import { Provider as JotaiProvider } from 'jotai';
+import { Temporal } from 'temporal-polyfill';
import { WorkspaceActivationStatus } from 'twenty-shared/workspace';
import { AgentChatRuntimeEffects } from '@/ai/components/AgentChatRuntimeEffects';
-import { hasAgentChatBeenOpenedState } from '@/ai/states/hasAgentChatBeenOpenedState';
+import { agentChatUISessionStartTimeState } from '@/ai/states/agentChatUISessionStartTimeState';
import {
currentWorkspaceState,
type CurrentWorkspace,
@@ -24,9 +25,6 @@ jest.mock('@/ai/components/AgentChatPrepromptEffect', () => ({
jest.mock('@/ai/components/AgentChatStreamKeepAliveEffect', () => ({
AgentChatStreamKeepAliveEffect: () => null,
}));
-jest.mock('@/ai/components/AgentChatSessionStartTimeEffect', () => ({
- AgentChatSessionStartTimeEffect: () => null,
-}));
const renderRuntimeEffects = () =>
render(
@@ -37,7 +35,10 @@ const renderRuntimeEffects = () =>
describe('AgentChatRuntimeEffects', () => {
beforeEach(() => {
- jotaiStore.set(hasAgentChatBeenOpenedState.atom, true);
+ jotaiStore.set(
+ agentChatUISessionStartTimeState.atom,
+ Temporal.Now.instant(),
+ );
jotaiStore.set(currentWorkspaceState.atom, null);
});
diff --git a/packages/twenty-front/src/modules/ai/hooks/useShouldShowAiChatEmptyState.ts b/packages/twenty-front/src/modules/ai/hooks/useShouldShowAiChatEmptyState.ts
index d11054b9598..88bf4d7a85c 100644
--- a/packages/twenty-front/src/modules/ai/hooks/useShouldShowAiChatEmptyState.ts
+++ b/packages/twenty-front/src/modules/ai/hooks/useShouldShowAiChatEmptyState.ts
@@ -4,7 +4,7 @@ import { useIsOnNewAiChatSlot } from '@/ai/hooks/useIsOnNewAiChatSlot';
import { agentChatErrorFamilyState } from '@/ai/states/agentChatErrorFamilyState';
import { agentChatIsAwaitingFirstChunkFamilyState } from '@/ai/states/agentChatIsAwaitingFirstChunkFamilyState';
import { agentChatIsStreamingFamilyState } from '@/ai/states/agentChatIsStreamingFamilyState';
-import { agentChatThreadsLoadingState } from '@/ai/states/agentChatThreadsLoadingState';
+import { agentChatThreadsLoadingSelector } from '@/ai/states/selectors/agentChatThreadsLoadingSelector';
import { agentChatHasMessageSelector } from '@/ai/states/selectors/agentChatHasMessageSelector';
import { currentAiChatThreadState } from '@/ai/states/currentAiChatThreadState';
import { useIsMobile } from 'twenty-ui/utilities';
@@ -25,7 +25,7 @@ export const useShouldShowAiChatEmptyState = () => {
{ threadId: currentAiChatThread },
);
const agentChatThreadsLoading = useAtomStateValue(
- agentChatThreadsLoadingState,
+ agentChatThreadsLoadingSelector,
);
const agentChatHasMessage = useAtomStateValue(agentChatHasMessageSelector);
diff --git a/packages/twenty-front/src/modules/ai/states/agentChatThreadsLoadingState.ts b/packages/twenty-front/src/modules/ai/states/agentChatThreadsLoadingState.ts
deleted file mode 100644
index e58b497dfdf..00000000000
--- a/packages/twenty-front/src/modules/ai/states/agentChatThreadsLoadingState.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { createAtomState } from '@/ui/utilities/state/jotai/utils/createAtomState';
-
-export const agentChatThreadsLoadingState = createAtomState({
- key: 'agentChatThreadsLoadingState',
- defaultValue: false,
-});
diff --git a/packages/twenty-front/src/modules/ai/states/hasAgentChatBeenOpenedState.ts b/packages/twenty-front/src/modules/ai/states/hasAgentChatBeenOpenedState.ts
deleted file mode 100644
index c2b6aa6ee1d..00000000000
--- a/packages/twenty-front/src/modules/ai/states/hasAgentChatBeenOpenedState.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { createAtomState } from '@/ui/utilities/state/jotai/utils/createAtomState';
-
-export const hasAgentChatBeenOpenedState = createAtomState<boolean>({
- key: 'ai/hasAgentChatBeenOpenedState',
- defaultValue: false,
-});
diff --git a/packages/twenty-front/src/modules/ai/states/selectors/agentChatIsLoadingSelector.ts b/packages/twenty-front/src/modules/ai/states/selectors/agentChatIsLoadingSelector.ts
index 7072e7de316..95e35b540e1 100644
--- a/packages/twenty-front/src/modules/ai/states/selectors/agentChatIsLoadingSelector.ts
+++ b/packages/twenty-front/src/modules/ai/states/selectors/agentChatIsLoadingSelector.ts
@@ -1,9 +1,9 @@
import { agentChatMessagesLoadingState } from '@/ai/states/agentChatMessagesLoadingState';
-import { agentChatThreadsLoadingState } from '@/ai/states/agentChatThreadsLoadingState';
+import { agentChatThreadsLoadingSelector } from '@/ai/states/selectors/agentChatThreadsLoadingSelector';
import { createAtomSelector } from '@/ui/utilities/state/jotai/utils/createAtomSelector';
export const agentChatIsLoadingSelector = createAtomSelector<boolean>({
key: 'agentChatIsLoadingSelector',
get: ({ get }) =>
- get(agentChatMessagesLoadingState) || get(agentChatThreadsLoadingState),
+ get(agentChatMessagesLoadingState) || get(agentChatThreadsLoadingSelector),
});
diff --git a/packages/twenty-front/src/modules/ai/states/selectors/agentChatThreadsLoadingSelector.ts b/packages/twenty-front/src/modules/ai/states/selectors/agentChatThreadsLoadingSelector.ts
new file mode 100644
index 00000000000..3309316c078
--- /dev/null
+++ b/packages/twenty-front/src/modules/ai/states/selectors/agentChatThreadsLoadingSelector.ts
@@ -0,0 +1,16 @@
+import { agentChatThreadListState } from '@/ai/states/agentChatThreadListState';
+import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
+import { permissionFlagMapSelector } from '@/settings/roles/states/permissionFlagMapSelector';
+import { createAtomSelector } from '@/ui/utilities/state/jotai/utils/createAtomSelector';
+import { WorkspaceActivationStatus } from 'twenty-shared/workspace';
+import { PermissionFlagType } from '~/generated-metadata/graphql';
+
+// The record API refuses a suspended workspace, so its chats never load
+export const agentChatThreadsLoadingSelector = createAtomSelector<boolean>({
+ key: 'agentChatThreadsLoadingSelector',
+ get: ({ get }) =>
+ get(agentChatThreadListState) === null &&
+ get(permissionFlagMapSelector)[PermissionFlagType.AI] &&
+ get(currentWorkspaceState)?.activationStatus !==
+ WorkspaceActivationStatus.SUSPENDED,
+});
diff --git a/packages/twenty-front/src/modules/side-panel/hooks/__tests__/useOpenAskAiPageInSidePanel.test.tsx b/packages/twenty-front/src/modules/side-panel/hooks/__tests__/useOpenAskAiPageInSidePanel.test.tsx
index 699f5a88375..6a707149afe 100644
--- a/packages/twenty-front/src/modules/side-panel/hooks/__tests__/useOpenAskAiPageInSidePanel.test.tsx
+++ b/packages/twenty-front/src/modules/side-panel/hooks/__tests__/useOpenAskAiPageInSidePanel.test.tsx
@@ -2,7 +2,7 @@ import { act, renderHook } from '@testing-library/react';
import { Provider as JotaiProvider } from 'jotai';
import { type ReactNode } from 'react';
-import { hasAgentChatBeenOpenedState } from '@/ai/states/hasAgentChatBeenOpenedState';
+import { agentChatUISessionStartTimeState } from '@/ai/states/agentChatUISessionStartTimeState';
import {
currentWorkspaceState,
type CurrentWorkspace,
@@ -33,7 +33,7 @@ describe('useOpenAskAiPageInSidePanel', () => {
beforeEach(() => {
jest.clearAllMocks();
jotaiStore.set(isSidePanelOpenedState.atom, false);
- jotaiStore.set(hasAgentChatBeenOpenedState.atom, false);
+ jotaiStore.set(agentChatUISessionStartTimeState.atom, null);
jotaiStore.set(currentWorkspaceState.atom, null);
window.history.pushState({}, '', '/objects/companies');
});
@@ -120,6 +120,6 @@ describe('useOpenAskAiPageInSidePanel', () => {
});
expect(navigateSidePanelMenuMock).not.toHaveBeenCalled();
- expect(jotaiStore.get(hasAgentChatBeenOpenedState.atom)).toBe(false);
+ expect(jotaiStore.get(agentChatUISessionStartTimeState.atom)).toBeNull();
});
});
diff --git a/packages/twenty-front/src/modules/side-panel/hooks/useOpenAskAiPageInSidePanel.ts b/packages/twenty-front/src/modules/side-panel/hooks/useOpenAskAiPageInSidePanel.ts
index addb5661fa8..ed3ab10d606 100644
--- a/packages/twenty-front/src/modules/side-panel/hooks/useOpenAskAiPageInSidePanel.ts
+++ b/packages/twenty-front/src/modules/side-panel/hooks/useOpenAskAiPageInSidePanel.ts
@@ -1,4 +1,4 @@
-import { hasAgentChatBeenOpenedState } from '@/ai/states/hasAgentChatBeenOpenedState';
+import { agentChatUISessionStartTimeState } from '@/ai/states/agentChatUISessionStartTimeState';
import { useIsWorkspaceActivationStatusEqualsTo } from '@/workspace/hooks/useIsWorkspaceActivationStatusEqualsTo';
import { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';
import { isSidePanelOpenedState } from '@/side-panel/states/isSidePanelOpenedState';
@@ -6,6 +6,7 @@ import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomState
import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';
import { t } from '@lingui/core/macro';
import { useCallback } from 'react';
+import { Temporal } from 'temporal-polyfill';
import { SidePanelPages } from 'twenty-shared/types';
import { WorkspaceActivationStatus } from 'twenty-shared/workspace';
import { IconSparkles } from 'twenty-ui/icon';
@@ -15,8 +16,8 @@ import { isCurrentPathAiChatPage } from '~/utils/isCurrentPathAiChatPage';
export const useOpenAskAiPageInSidePanel = () => {
const { navigateSidePanelMenu } = useSidePanelMenu();
const isSidePanelOpened = useAtomStateValue(isSidePanelOpenedState);
- const setHasAgentChatBeenOpened = useSetAtomState(
- hasAgentChatBeenOpenedState,
+ const setAgentChatUISessionStartTime = useSetAtomState(
+ agentChatUISessionStartTimeState,
);
const isWorkspaceSuspended = useIsWorkspaceActivationStatusEqualsTo(
WorkspaceActivationStatus.SUSPENDED,
@@ -37,7 +38,10 @@ export const useOpenAskAiPageInSidePanel = () => {
? resetNavigationStack
: isSidePanelOpened;
- setHasAgentChatBeenOpened(true);
+ setAgentChatUISessionStartTime(
+ (agentChatUISessionStartTime) =>
+ agentChatUISessionStartTime ?? Temporal.Now.instant(),
+ );
navigateSidePanelMenu({
page: SidePanelPages.AskAI,
@@ -50,7 +54,7 @@ export const useOpenAskAiPageInSidePanel = () => {
[
navigateSidePanelMenu,
isSidePanelOpened,
- setHasAgentChatBeenOpened,
+ setAgentChatUISessionStartTime,
isWorkspaceSuspended,
],
);