The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Resolve the connected account when an email is clicked, not per cell (#27947)
Charles Bochet9f3f775692f5
diff --git a/packages/twenty-front/src/modules/accounts/components/MyConnectedAccountsLoadEffect.tsx b/packages/twenty-front/src/modules/accounts/components/MyConnectedAccountsLoadEffect.tsxnew file mode 100644index 00000000000..fdc4fd394d6--- /dev/null+++ b/packages/twenty-front/src/modules/accounts/components/MyConnectedAccountsLoadEffect.tsx@@ -0,0 +1,39 @@+import { useQuery } from '@apollo/client/react';+import { useEffect } from 'react';+import { isDefined } from 'twenty-shared/utils';++import { myConnectedAccountsState } from '@/accounts/states/myConnectedAccountsState';+import { type ConnectedAccount } from '@/accounts/types/ConnectedAccount';+import { useIsLogged } from '@/auth/hooks/useIsLogged';+import { useIsOnAuthOrOnboardingPage } from '@/auth/hooks/useIsOnAuthOrOnboardingPage';+import { GET_MY_CONNECTED_ACCOUNTS } from '@/settings/accounts/graphql/queries/getMyConnectedAccounts';+import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';++export const MyConnectedAccountsLoadEffect = () => {+ const isLogged = useIsLogged();+ const isOnAuthOrOnboardingPage = useIsOnAuthOrOnboardingPage();+ const setMyConnectedAccounts = useSetAtomState(myConnectedAccountsState);++ const { data, error } = useQuery<{+ myConnectedAccounts: Omit<+ ConnectedAccount,+ 'messageChannels' | 'calendarChannels'+ >[];+ }>(GET_MY_CONNECTED_ACCOUNTS, {+ skip: !isLogged || isOnAuthOrOnboardingPage,+ });++ useEffect(() => {+ if (isDefined(data?.myConnectedAccounts)) {+ setMyConnectedAccounts(data.myConnectedAccounts);++ return;+ }++ if (isDefined(error)) {+ setMyConnectedAccounts([]);+ }+ }, [data, error, setMyConnectedAccounts]);++ return null;+};diff --git a/packages/twenty-front/src/modules/accounts/states/myConnectedAccountsState.ts b/packages/twenty-front/src/modules/accounts/states/myConnectedAccountsState.tsnew file mode 100644index 00000000000..370439e1077--- /dev/null+++ b/packages/twenty-front/src/modules/accounts/states/myConnectedAccountsState.ts@@ -0,0 +1,9 @@+import { type ConnectedAccount } from '@/accounts/types/ConnectedAccount';+import { createAtomState } from '@/ui/utilities/state/jotai/utils/createAtomState';++export const myConnectedAccountsState = createAtomState<+ Omit<ConnectedAccount, 'messageChannels' | 'calendarChannels'>[] | null+>({+ key: 'myConnectedAccountsState',+ defaultValue: null,+});diff --git a/packages/twenty-front/src/modules/accounts/utils/findFirstConnectedAccountAbleToSendEmail.ts b/packages/twenty-front/src/modules/accounts/utils/findFirstConnectedAccountAbleToSendEmail.tsnew file mode 100644index 00000000000..8aae0c9a0b0--- /dev/null+++ b/packages/twenty-front/src/modules/accounts/utils/findFirstConnectedAccountAbleToSendEmail.ts@@ -0,0 +1,17 @@+import {+ type ConnectedAccountEmailFields,+ EmailOperation,+} from 'twenty-shared/types';+import { canConnectedAccountPerformEmailOperation } from 'twenty-shared/utils';++export const findFirstConnectedAccountAbleToSendEmail = <+ TConnectedAccount extends ConnectedAccountEmailFields,+>(+ connectedAccounts: TConnectedAccount[],+): TConnectedAccount | null =>+ connectedAccounts.find((connectedAccount) =>+ canConnectedAccountPerformEmailOperation({+ connectedAccount,+ operation: EmailOperation.SEND,+ }),+ ) ?? null;diff --git a/packages/twenty-front/src/modules/activities/emails/hooks/useFirstConnectedAccount.ts b/packages/twenty-front/src/modules/activities/emails/hooks/useFirstConnectedAccount.tsindex 45380bbb812..e4acd926a23 100644--- a/packages/twenty-front/src/modules/activities/emails/hooks/useFirstConnectedAccount.ts+++ b/packages/twenty-front/src/modules/activities/emails/hooks/useFirstConnectedAccount.ts@@ -1,37 +1,19 @@-import { EmailOperation } from 'twenty-shared/types';-import { useQuery } from '@apollo/client/react';+import { isDefined } from 'twenty-shared/utils';-import { type ConnectedAccount } from '@/accounts/types/ConnectedAccount';-import { GET_MY_CONNECTED_ACCOUNTS } from '@/settings/accounts/graphql/queries/getMyConnectedAccounts';-import { canConnectedAccountPerformEmailOperation } from 'twenty-shared/utils';+import { myConnectedAccountsState } from '@/accounts/states/myConnectedAccountsState';+import { findFirstConnectedAccountAbleToSendEmail } from '@/accounts/utils/findFirstConnectedAccountAbleToSendEmail';+import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';-type UseFirstConnectedAccountOptions = {- skip?: boolean;-};--export const useFirstConnectedAccount = (- options?: UseFirstConnectedAccountOptions,-) => {- const { data, loading } = useQuery<{- myConnectedAccounts: Pick<- ConnectedAccount,- 'id' | 'handle' | 'provider' | 'connectionParameters'- >[];- }>(GET_MY_CONNECTED_ACCOUNTS, {- skip: options?.skip,- });+export const useFirstConnectedAccount = () => {+ const myConnectedAccounts = useAtomStateValue(myConnectedAccountsState);- const firstAccount =- data?.myConnectedAccounts?.find((connectedAccount) =>- canConnectedAccountPerformEmailOperation({- connectedAccount,- operation: EmailOperation.SEND,- }),- ) ?? null;+ const firstAccount = findFirstConnectedAccountAbleToSendEmail(+ myConnectedAccounts ?? [],+ );return {connectedAccountId: firstAccount?.id ?? null,connectedAccountHandle: firstAccount?.handle ?? null,- loading,+ loading: !isDefined(myConnectedAccounts),};};diff --git a/packages/twenty-front/src/modules/activities/emails/hooks/useOpenEmailInAppOrFallback.ts b/packages/twenty-front/src/modules/activities/emails/hooks/useOpenEmailInAppOrFallback.tsindex cd59c0e4998..303610caddf 100644--- a/packages/twenty-front/src/modules/activities/emails/hooks/useOpenEmailInAppOrFallback.ts+++ b/packages/twenty-front/src/modules/activities/emails/hooks/useOpenEmailInAppOrFallback.ts@@ -1,29 +1,25 @@+import { useStore } from 'jotai';import { useCallback } from 'react';-import { useFirstConnectedAccount } from '@/activities/emails/hooks/useFirstConnectedAccount';+import { myConnectedAccountsState } from '@/accounts/states/myConnectedAccountsState';+import { findFirstConnectedAccountAbleToSendEmail } from '@/accounts/utils/findFirstConnectedAccountAbleToSendEmail';import { useOpenComposeEmailInSidePanel } from '@/side-panel/hooks/useOpenComposeEmailInSidePanel';import { isDefined } from 'twenty-shared/utils';import { openUrlInNewTab } from '~/utils/openUrlInNewTab';-type UseOpenEmailInAppOrFallbackOptions = {- skip?: boolean;-};--// Falls back to mailto: when no connected account exists, rather than-// redirecting to settings.-export const useOpenEmailInAppOrFallback = (- options?: UseOpenEmailInAppOrFallbackOptions,-) => {- const { connectedAccountId, loading } = useFirstConnectedAccount({- skip: options?.skip,- });+export const useOpenEmailInAppOrFallback = () => {+ const store = useStore();const { openComposeEmailInSidePanel } = useOpenComposeEmailInSidePanel();const openEmail = useCallback((email: string) => {- if (isDefined(connectedAccountId)) {+ const connectedAccount = findFirstConnectedAccountAbleToSendEmail(+ store.get(myConnectedAccountsState.atom) ?? [],+ );++ if (isDefined(connectedAccount)) {openComposeEmailInSidePanel({- connectedAccountId,+ connectedAccountId: connectedAccount.id,defaultTo: email,});@@ -32,8 +28,8 @@ export const useOpenEmailInAppOrFallback = (openUrlInNewTab(`mailto:${email}`);},- [connectedAccountId, openComposeEmailInSidePanel],+ [store, openComposeEmailInSidePanel],);- return { openEmail, loading };+ return { openEmail };};diff --git a/packages/twenty-front/src/modules/app/components/WorkspaceAppProviders.tsx b/packages/twenty-front/src/modules/app/components/WorkspaceAppProviders.tsxindex 18006689a5f..bcfcfb359aa 100644--- a/packages/twenty-front/src/modules/app/components/WorkspaceAppProviders.tsx+++ b/packages/twenty-front/src/modules/app/components/WorkspaceAppProviders.tsx@@ -9,6 +9,7 @@ import { GotoHotkeysEffectsProvider } from '@/app/effect-components/GotoHotkeysEimport { InitializeQueryParamStateEffect } from '@/app/effect-components/InitializeQueryParamStateEffect';import { PageChangeEffect } from '@/app/effect-components/PageChangeEffect';import { ApplicationsLoadEffect } from '@/applications/components/ApplicationsLoadEffect';+import { MyConnectedAccountsLoadEffect } from '@/accounts/components/MyConnectedAccountsLoadEffect';import { AuthProvider } from '@/auth/components/AuthProvider';import { SignOutOnOtherTabSignOutEffect } from '@/auth/effect-components/SignOutOnOtherTabSignOutEffect';import { CaptchaProvider } from '@/captcha/components/CaptchaProvider';@@ -56,6 +57,7 @@ export const WorkspaceAppProviders = () => {<ApolloAdminProvider><SSEProvider><ApplicationsLoadEffect />+ <MyConnectedAccountsLoadEffect /><UserThemeProviderEffect /><UserUiScaleProviderEffect /><ContextStoreComponentInstanceContext.Providerdiff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/useGetSecondaryFieldButton.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/useGetSecondaryFieldButton.tsindex 87979a0a24e..0bb7702cf85 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/useGetSecondaryFieldButton.ts+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/useGetSecondaryFieldButton.ts@@ -23,7 +23,7 @@ export const useGetSecondaryFieldButton = () => {const isEmailField = isFieldEmails(fieldDefinition);- const { openEmail } = useOpenEmailInAppOrFallback({ skip: !isEmailField });+ const { openEmail } = useOpenEmailInAppOrFallback();const fieldValue = useRecordFieldValue<FieldPhonesValue | FieldEmailsValue | FieldLinksValue | undefineddiff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/display/components/EmailsFieldDisplay.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/display/components/EmailsFieldDisplay.tsxindex 207f06bcac3..4d3391cafad 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/display/components/EmailsFieldDisplay.tsx+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/display/components/EmailsFieldDisplay.tsx@@ -18,7 +18,7 @@ export const EmailsFieldDisplay = () => {const isOpenInApp =onClickAction === FieldMetadataSettingsOnClickAction.OPEN_IN_APP;- const { openEmail } = useOpenEmailInAppOrFallback({ skip: !isOpenInApp });+ const { openEmail } = useOpenEmailInAppOrFallback();const handleEmailClick = (email: string,