From 0b48e3dd23dd6bb2db5bcb9bbfedde4a8413fb1f Mon Sep 17 00:00:00 2001 From: brendanlaschke Date: Fri, 25 Oct 2024 22:03:48 +0200 Subject: [PATCH] fixed file typo, featureflag, env var example --- ...tionBannerReconnectAccountEmailAliases.tsx | 2 +- ...econnectAccountInsufficientPermissions.tsx | 2 +- .../SettingsAccountsListEmptyStateCard.tsx | 20 +++++++++++------- .../SettingsAccountsRowDropdownMenu.tsx | 2 +- ...rigerApiOAuth.ts => useTriggerApiOAuth.ts} | 0 .../WorkflowEditActionFormSendEmail.tsx | 2 +- .../modules/workspace/types/FeatureFlagKey.ts | 3 ++- .../src/pages/onboarding/SyncEmails.tsx | 2 +- packages/twenty-server/.env.example | 1 + .../typeorm-seeds/core/feature-flags.ts | 5 +++++ ...mircosoft-apis-oauth-request-code.guard.ts | 21 +++++++++++++++++++ .../enums/feature-flag-key.enum.ts | 1 + .../messaging-get-message-list.service.ts | 12 +++++++++++ .../self-hosting/self-hosting-var.mdx | 1 + 14 files changed, 61 insertions(+), 13 deletions(-) rename packages/twenty-front/src/modules/settings/accounts/hooks/{useTrigerApiOAuth.ts => useTriggerApiOAuth.ts} (100%) diff --git a/packages/twenty-front/src/modules/information-banner/components/reconnect-account/InformationBannerReconnectAccountEmailAliases.tsx b/packages/twenty-front/src/modules/information-banner/components/reconnect-account/InformationBannerReconnectAccountEmailAliases.tsx index 032c771aa..67fc042a9 100644 --- a/packages/twenty-front/src/modules/information-banner/components/reconnect-account/InformationBannerReconnectAccountEmailAliases.tsx +++ b/packages/twenty-front/src/modules/information-banner/components/reconnect-account/InformationBannerReconnectAccountEmailAliases.tsx @@ -1,7 +1,7 @@ import { InformationBanner } from '@/information-banner/components/InformationBanner'; import { useAccountToReconnect } from '@/information-banner/hooks/useAccountToReconnect'; import { InformationBannerKeys } from '@/information-banner/types/InformationBannerKeys'; -import { useTriggerApisOAuth } from '@/settings/accounts/hooks/useTrigerApiOauth'; +import { useTriggerApisOAuth } from '@/settings/accounts/hooks/useTriggerApiOAuth'; import { IconRefresh } from 'twenty-ui'; export const InformationBannerReconnectAccountEmailAliases = () => { diff --git a/packages/twenty-front/src/modules/information-banner/components/reconnect-account/InformationBannerReconnectAccountInsufficientPermissions.tsx b/packages/twenty-front/src/modules/information-banner/components/reconnect-account/InformationBannerReconnectAccountInsufficientPermissions.tsx index e18538934..306452b56 100644 --- a/packages/twenty-front/src/modules/information-banner/components/reconnect-account/InformationBannerReconnectAccountInsufficientPermissions.tsx +++ b/packages/twenty-front/src/modules/information-banner/components/reconnect-account/InformationBannerReconnectAccountInsufficientPermissions.tsx @@ -1,7 +1,7 @@ import { InformationBanner } from '@/information-banner/components/InformationBanner'; import { useAccountToReconnect } from '@/information-banner/hooks/useAccountToReconnect'; import { InformationBannerKeys } from '@/information-banner/types/InformationBannerKeys'; -import { useTriggerApisOAuth } from '@/settings/accounts/hooks/useTrigerApiOauth'; +import { useTriggerApisOAuth } from '@/settings/accounts/hooks/useTriggerApiOAuth'; import { IconRefresh } from 'twenty-ui'; export const InformationBannerReconnectAccountInsufficientPermissions = () => { diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsListEmptyStateCard.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsListEmptyStateCard.tsx index 6c3dc5aa1..7cf397d4a 100644 --- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsListEmptyStateCard.tsx +++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsListEmptyStateCard.tsx @@ -1,11 +1,12 @@ import styled from '@emotion/styled'; import { IconGoogle, IconMicrosoft } from 'twenty-ui'; -import { useTriggerApisOAuth } from '@/settings/accounts/hooks/useTrigerApiOauth'; +import { useTriggerApisOAuth } from '@/settings/accounts/hooks/useTriggerApiOAuth'; import { Button } from '@/ui/input/button/components/Button'; import { Card } from '@/ui/layout/card/components/Card'; import { CardContent } from '@/ui/layout/card/components/CardContent'; import { CardHeader } from '@/ui/layout/card/components/CardHeader'; +import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled'; const StyledHeader = styled(CardHeader)` align-items: center; @@ -27,6 +28,9 @@ export const SettingsAccountsListEmptyStateCard = ({ label, }: SettingsAccountsListEmptyStateCardProps) => { const { triggerApisOAuth } = useTriggerApisOAuth(); + const isMicrosoftSyncEnabled = useIsFeatureEnabled( + 'IS_MICROSOFT_SYNC_ENABLED', + ); return ( @@ -38,12 +42,14 @@ export const SettingsAccountsListEmptyStateCard = ({ variant="secondary" onClick={() => triggerApisOAuth('google')} /> -