twentyhq · charlesBochet · Feb 21, 2024 · Feb 21, 2024 · Feb 21, 2024 · Feb 21, 2024
diff --git a/packages/twenty-front/src/modules/object-metadata/types/CoreObjectNameSingular.ts b/packages/twenty-front/src/modules/object-metadata/types/CoreObjectNameSingular.ts
@@ -6,7 +6,7 @@ export enum CoreObjectNameSingular {
   Blocklist = 'blocklist',
   Comment = 'comment',
   Company = 'company',
-  ConenctedAccount = 'conenctedAccount',
+  ConnectedAccount = 'connectedAccount',
   Favorite = 'favorite',
   Message = 'message',
   MessageChannel = 'messageChannel',

diff --git a/...ront/src/modules/settings/accounts/components/SettingsAccountsCalendarSettingsSection.tsx b/...ront/src/modules/settings/accounts/components/SettingsAccountsCalendarSettingsSection.tsx
@@ -0,0 +1,38 @@
+import { useRecoilValue } from 'recoil';
+
+import { ConnectedAccount } from '@/accounts/types/ConnectedAccount';
+import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
+import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
+import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
+import { SettingsAccountsListEmptyStateCard } from '@/settings/accounts/components/SettingsAccountsListEmptyStateCard';
+import { SettingsAccountsListSkeletonCard } from '@/settings/accounts/components/SettingsAccountsListSkeletonCard';
+import { H2Title } from '@/ui/display/typography/components/H2Title';
+import { Section } from '@/ui/layout/section/components/Section';
+
+export const SettingsAccountsCalendarSettingsSection = () => {
+  const currentWorkspaceMember = useRecoilValue(currentWorkspaceMemberState);
+
+  const { records: accounts, loading } = useFindManyRecords<ConnectedAccount>({
+    objectNameSingular: CoreObjectNameSingular.ConnectedAccount,
+    filter: {
+      accountOwnerId: {
+        eq: currentWorkspaceMember?.id,
+      },
+    },
+  });
+
+  return (
+    <Section>
+      <H2Title
+        title="Calendar settings"
+        description="Sync your calendars and set your preferences"
+      />
+
+      {loading ? (
+        <SettingsAccountsListSkeletonCard />
+      ) : !accounts.length ? (
+        <SettingsAccountsListEmptyStateCard />
+      ) : null}
+    </Section>
+  );
+};
diff --git a/...ettingsAccountsInboxSettingsCardMedia.tsx → .../components/SettingsAccountsCardMedia.tsx b/...ettingsAccountsInboxSettingsCardMedia.tsx → .../components/SettingsAccountsCardMedia.tsx
@@ -14,4 +14,4 @@ const StyledCardMedia = styled.div`
   width: ${({ theme }) => theme.spacing(6)};
 `;
 
-export { StyledCardMedia as SettingsAccountsInboxSettingsCardMedia };
+export { StyledCardMedia as SettingsAccountsCardMedia };
diff --git a/...ont/src/modules/settings/accounts/components/SettingsAccountsConnectedAccountsSection.tsx b/...ont/src/modules/settings/accounts/components/SettingsAccountsConnectedAccountsSection.tsx
@@ -4,7 +4,7 @@ import { H2Title } from '@/ui/display/typography/components/H2Title';
 import { Section } from '@/ui/layout/section/components/Section';
 
 import { SettingsAccountsCard } from './SettingsAccountsCard';
-import { SettingsAccountsEmptyStateCard } from './SettingsAccountsEmptyStateCard';
+import { SettingsAccountsListEmptyStateCard } from './SettingsAccountsListEmptyStateCard';
 
 export const SettingsAccountsConnectedAccountsSection = ({
   accounts,
@@ -30,7 +30,7 @@ export const SettingsAccountsConnectedAccountsSection = ({
           onAccountRemove={handleAccountRemove}
         />
       ) : (
-        <SettingsAccountsEmptyStateCard />
+        <SettingsAccountsListEmptyStateCard />
       )}
     </Section>
   );

diff --git a/...enty-front/src/modules/settings/accounts/components/SettingsAccountsEmailsSyncSection.tsx b/...enty-front/src/modules/settings/accounts/components/SettingsAccountsEmailsSyncSection.tsx
@@ -3,20 +3,20 @@ import { useRecoilValue } from 'recoil';
 import { ConnectedAccount } from '@/accounts/types/ConnectedAccount';
 import { MessageChannel } from '@/accounts/types/MessageChannel';
 import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
+import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
 import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
-import { SettingsAccountEmailsSkeletonCard } from '@/settings/accounts/components/SettingsAccountEmailsSkeletonCard';
+import { SettingsAccountsEmailsCard } from '@/settings/accounts/components/SettingsAccountsEmailsCard';
+import { SettingsAccountsListEmptyStateCard } from '@/settings/accounts/components/SettingsAccountsListEmptyStateCard';
+import { SettingsAccountsListSkeletonCard } from '@/settings/accounts/components/SettingsAccountsListSkeletonCard';
 import { H2Title } from '@/ui/display/typography/components/H2Title';
 import { Section } from '@/ui/layout/section/components/Section';
 
-import { SettingsAccountsEmailsCard } from './SettingsAccountsEmailsCard';
-import { SettingsAccountsEmptyStateCard } from './SettingsAccountsEmptyStateCard';
-
 export const SettingsAccountsEmailsSyncSection = () => {
   const currentWorkspaceMember = useRecoilValue(currentWorkspaceMemberState);
 
   const { records: accounts, loading: accountsLoading } =
     useFindManyRecords<ConnectedAccount>({
-      objectNameSingular: 'connectedAccount',
+      objectNameSingular: CoreObjectNameSingular.ConnectedAccount,
       filter: {
         accountOwnerId: {
           eq: currentWorkspaceMember?.id,
@@ -51,13 +51,13 @@ export const SettingsAccountsEmailsSyncSection = () => {
       />
 
       {loading ? (
-        <SettingsAccountEmailsSkeletonCard />
+        <SettingsAccountsListSkeletonCard />
       ) : accounts.length ? (
         <SettingsAccountsEmailsCard
           messageChannels={messageChannelsWithSyncedEmails}
         />
       ) : (
-        <SettingsAccountsEmptyStateCard />
+        <SettingsAccountsListEmptyStateCard />
       )}
     </Section>
   );

diff --git a/.../settings/accounts/components/SettingsAccountsInboxSettingsContactAutoCreationSection.tsx b/.../settings/accounts/components/SettingsAccountsInboxSettingsContactAutoCreationSection.tsx
@@ -2,7 +2,7 @@ import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
 
 import { MessageChannel } from '@/accounts/types/MessageChannel';
-import { SettingsAccountsInboxSettingsCardMedia } from '@/settings/accounts/components/SettingsAccountsInboxSettingsCardMedia';
+import { SettingsAccountsCardMedia } from '@/settings/accounts/components/SettingsAccountsCardMedia';
 import { IconUser } from '@/ui/display/icon';
 import { H2Title } from '@/ui/display/typography/components/H2Title';
 import { Toggle } from '@/ui/input/components/Toggle';
@@ -42,9 +42,9 @@ export const SettingsAccountsInboxSettingsContactAutoCreateSection = ({
       />
       <Card>
         <StyledCardContent>
-          <SettingsAccountsInboxSettingsCardMedia>
+          <SettingsAccountsCardMedia>
             <IconUser size={theme.icon.size.sm} stroke={theme.icon.stroke.lg} />
-          </SettingsAccountsInboxSettingsCardMedia>
+          </SettingsAccountsCardMedia>
           <StyledTitle>Auto-creation</StyledTitle>
           <Toggle
             value={messageChannel.isContactAutoCreationEnabled}

diff --git a/...c/modules/settings/accounts/components/SettingsAccountsInboxSettingsVisibilitySection.tsx b/...c/modules/settings/accounts/components/SettingsAccountsInboxSettingsVisibilitySection.tsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/styled';
 
-import { SettingsAccountsInboxSettingsCardMedia } from '@/settings/accounts/components/SettingsAccountsInboxSettingsCardMedia';
+import { SettingsAccountsCardMedia } from '@/settings/accounts/components/SettingsAccountsCardMedia';
 import { H2Title } from '@/ui/display/typography/components/H2Title';
 import { Radio } from '@/ui/input/components/Radio';
 import { Card } from '@/ui/layout/card/components/Card';
@@ -29,7 +29,7 @@ const StyledCardContent = styled(CardContent)`
   }
 `;
 
-const StyledCardMedia = styled(SettingsAccountsInboxSettingsCardMedia)`
+const StyledCardMedia = styled(SettingsAccountsCardMedia)`
   align-items: stretch;
 `;
 

diff --git a/...onents/SettingsAccountsEmptyStateCard.tsx → ...ts/SettingsAccountsListEmptyStateCard.tsx b/...onents/SettingsAccountsEmptyStateCard.tsx → ...ts/SettingsAccountsListEmptyStateCard.tsx
@@ -20,13 +20,13 @@ const StyledBody = styled(CardContent)`
   justify-content: center;
 `;
 
-type SettingsAccountsEmptyStateCardProps = {
+type SettingsAccountsListEmptyStateCardProps = {
   label?: string;
 };
 
-export const SettingsAccountsEmptyStateCard = ({
+export const SettingsAccountsListEmptyStateCard = ({
   label,
-}: SettingsAccountsEmptyStateCardProps) => {
+}: SettingsAccountsListEmptyStateCardProps) => {
   const [generateTransientToken] = useGenerateTransientTokenMutation();
 
   const handleGmailLogin = useCallback(async () => {

diff --git a/...nts/SettingsAccountEmailsSkeletonCard.tsx → ...ents/SettingsAccountsListSkeletonCard.tsx b/...nts/SettingsAccountEmailsSkeletonCard.tsx → ...ents/SettingsAccountsListSkeletonCard.tsx
@@ -7,4 +7,4 @@ const StyledCard = styled(Card)`
   height: 40px;
 `;
 
-export const SettingsAccountEmailsSkeletonCard = () => <StyledCard />;
+export { StyledCard as SettingsAccountsListSkeletonCard };
diff --git a/...tsInboxSettingsSynchronizationSection.tsx → ...ettingsAccountsSynchronizationSection.tsx b/...tsInboxSettingsSynchronizationSection.tsx → ...ettingsAccountsSynchronizationSection.tsx
@@ -1,8 +1,7 @@
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
 
-import { MessageChannel } from '@/accounts/types/MessageChannel';
-import { SettingsAccountsInboxSettingsCardMedia } from '@/settings/accounts/components/SettingsAccountsInboxSettingsCardMedia';
+import { SettingsAccountsCardMedia } from '@/settings/accounts/components/SettingsAccountsCardMedia';
 import { IconRefresh } from '@/ui/display/icon';
 import { H2Title } from '@/ui/display/typography/components/H2Title';
 import { Toggle } from '@/ui/input/components/Toggle';
@@ -23,33 +22,34 @@ const StyledTitle = styled.span`
   margin-right: auto;
 `;
 
-type SettingsAccountsInboxSettingsSynchronizationSectionProps = {
-  messageChannel: MessageChannel;
+type SettingsAccountsSynchronizationSectionProps = {
+  cardTitle: string;
+  description: string;
+  isSynced: boolean;
   onToggle: (value: boolean) => void;
 };
 
-export const SettingsAccountsInboxSettingsSynchronizationSection = ({
-  messageChannel,
+export const SettingsAccountsSynchronizationSection = ({
+  cardTitle,
+  description,
+  isSynced,
   onToggle,
-}: SettingsAccountsInboxSettingsSynchronizationSectionProps) => {
+}: SettingsAccountsSynchronizationSectionProps) => {
   const theme = useTheme();
 
   return (
     <Section>
-      <H2Title
-        title="Synchronization"
-        description="Past and future emails will automatically be synced to this workspace"
-      />
+      <H2Title title="Synchronization" description={description} />
       <Card>
         <StyledCardContent>
-          <SettingsAccountsInboxSettingsCardMedia>
+          <SettingsAccountsCardMedia>
             <IconRefresh
               size={theme.icon.size.sm}
               stroke={theme.icon.stroke.lg}
             />
-          </SettingsAccountsInboxSettingsCardMedia>
-          <StyledTitle>Sync emails</StyledTitle>
-          <Toggle value={messageChannel.isSynced} onChange={onToggle} />
+          </SettingsAccountsCardMedia>
+          <StyledTitle>{cardTitle}</StyledTitle>
+          <Toggle value={isSynced} onChange={onToggle} />
         </StyledCardContent>
       </Card>
     </Section>

diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsNewAccountSection.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsNewAccountSection.tsx
@@ -1,16 +1,15 @@
+import { SettingsAccountsListEmptyStateCard } from '@/settings/accounts/components/SettingsAccountsListEmptyStateCard';
 import { H2Title } from '@/ui/display/typography/components/H2Title';
 import { Section } from '@/ui/layout/section/components/Section';
 
-import { SettingsAccountsEmptyStateCard } from './SettingsAccountsEmptyStateCard';
-
 export const SettingsNewAccountSection = () => {
   return (
     <Section>
       <H2Title
         title="New account"
         description="Connect a new account to your workspace"
       />
-      <SettingsAccountsEmptyStateCard label="Connect a Google account" />
+      <SettingsAccountsListEmptyStateCard label="Connect a Google account" />
     </Section>
   );
 };
diff --git a/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsCalendars.tsx b/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsCalendars.tsx
@@ -1,3 +1,4 @@
+import { SettingsAccountsCalendarSettingsSection } from '@/settings/accounts/components/SettingsAccountsCalendarSettingsSection';
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
 import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
 import { SettingsPath } from '@/types/SettingsPath';
@@ -17,6 +18,7 @@ export const SettingsAccountsCalendars = () => (
           { children: 'Calendars' },
         ]}
       />
+      <SettingsAccountsCalendarSettingsSection />
     </SettingsPageContainer>
   </SubMenuTopBarContainer>
 );
diff --git a/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsCalendarsSettings.tsx b/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsCalendarsSettings.tsx
@@ -1,5 +1,6 @@
 import { useParams } from 'react-router-dom';
 
+import { SettingsAccountsSynchronizationSection } from '@/settings/accounts/components/SettingsAccountsSynchronizationSection';
 import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
 import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
 import { SettingsPath } from '@/types/SettingsPath';
@@ -30,6 +31,12 @@ export const SettingsAccountsCalendarsSettings = () => {
             { children: connectedAccount?.handle || '' },
           ]}
         />
+        <SettingsAccountsSynchronizationSection
+          description="Past and future calendar events will automatically be synced to this workspace"
+          cardTitle="Sync events"
+          isSynced={false}
+          onToggle={() => {}}
+        />
       </SettingsPageContainer>
     </SubMenuTopBarContainer>
   );

diff --git a/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsEmailsInboxSettings.tsx b/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsEmailsInboxSettings.tsx
@@ -63,8 +63,10 @@ export const SettingsAccountsEmailsInboxSettings = () => {
           ]}
         />
         {/* TODO : discuss the desired sync behaviour */}
-        {/* <SettingsAccountsInboxSettingsSynchronizationSection
-          messageChannel={messageChannel}
+        {/* <SettingsAccountsSynchronizationSection
+          description="Past and future emails will automatically be synced to this workspace"
+          cardTitle="Sync emails"
+          isSynced={!!messageChannel?.isSynced}
           onToggle={handleSynchronizationToggle}
         /> */}
         <SettingsAccountsInboxSettingsVisibilitySection