From 1ab31f4cacaaf00bea146f33783bccd0fb1c549d Mon Sep 17 00:00:00 2001 From: Anchit Sinha Date: Wed, 17 Apr 2024 21:11:24 +0530 Subject: [PATCH] 4798-feat(front): Add calendar settings option in settings account dropdown (#4997) Closes #4798 ![image](https://github.com/twentyhq/twenty/assets/22574091/cbdd941a-47bf-4bf4-982d-cc9538586e85) --------- Co-authored-by: bosiraphael --- .../accounts/types/ConnectedAccount.ts | 8 ++++---- .../SettingsAccountsRowDropdownMenu.tsx | 20 +++++++++++++++++-- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/packages/twenty-front/src/modules/accounts/types/ConnectedAccount.ts b/packages/twenty-front/src/modules/accounts/types/ConnectedAccount.ts index 45aece6ae..2a78bb62e 100644 --- a/packages/twenty-front/src/modules/accounts/types/ConnectedAccount.ts +++ b/packages/twenty-front/src/modules/accounts/types/ConnectedAccount.ts @@ -1,7 +1,6 @@ -import { MessageChannel } from './MessageChannel'; +import { CalendarChannel } from '@/accounts/types/CalendarChannel'; -type MessageChannelConnection = { edges: [MessageChannelEdge] }; -type MessageChannelEdge = { node: MessageChannel }; +import { MessageChannel } from './MessageChannel'; export type ConnectedAccount = { id: string; @@ -12,5 +11,6 @@ export type ConnectedAccount = { accountOwnerId: string; lastSyncHistoryId: string; authFailedAt: Date | null; - messageChannels: MessageChannelConnection; + messageChannels: MessageChannel[]; + calendarChannels: CalendarChannel[]; }; diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsRowDropdownMenu.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsRowDropdownMenu.tsx index 0e3812778..8e5afcec6 100644 --- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsRowDropdownMenu.tsx +++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsRowDropdownMenu.tsx @@ -1,5 +1,11 @@ import { useNavigate } from 'react-router-dom'; -import { IconDotsVertical, IconMail, IconRefresh, IconTrash } from 'twenty-ui'; +import { + IconCalendarEvent, + IconDotsVertical, + IconMail, + IconRefresh, + IconTrash, +} from 'twenty-ui'; import { ConnectedAccount } from '@/accounts/types/ConnectedAccount'; import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular'; @@ -49,7 +55,17 @@ export const SettingsAccountsRowDropdownMenu = ({ text="Emails settings" onClick={() => { navigate( - `/settings/accounts/emails/${account.messageChannels.edges[0].node.id}`, + `/settings/accounts/emails/${account.messageChannels[0].id}`, + ); + closeDropdown(); + }} + /> + { + navigate( + `/settings/accounts/calendars/${account.calendarChannels[0].id}`, ); closeDropdown(); }}