admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

3815 blocklist connect frontend (#3930)

Browse Source 
* wip

* wip

* move blocklist to connectedAccount

* wip

* format date

* fix styling

* renaming

* fix imports

* fix imports

* Rename BlockListItem.ts to BlocklistItem.ts

* Add IS_BLOCKLIST_ENABLED feature flag and remove IS_MESSAGING_ENABLED gate at model creation

* hide blocklist if feature flag is disabled
This commit is contained in:
bosiraphael
2024-02-15 17:18:04 +01:00
committed by GitHub
parent 4b3eeac333
commit 0b93a6785b
22 changed files with 91 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/twenty-front/src/pages/settings/accounts/SettingsAccounts.tsx
View File

@ -4,11 +4,13 @@ import { ConnectedAccount } from '@/accounts/types/ConnectedAccount';
import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
import { SettingsAccountsConnectedAccountsSection } from '@/settings/accounts/components/SettingsAccountsConnectedAccountsSection';
import { SettingsAccountsEmailsBlocklistSection } from '@/settings/accounts/components/SettingsAccountsEmailsBlocklistSection';
import { SettingsAccountsSettingsSection } from '@/settings/accounts/components/SettingsAccountsSettingsSection';
import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
import { IconSettings } from '@/ui/display/icon';
import { SubMenuTopBarContainer } from '@/ui/layout/page/SubMenuTopBarContainer';
import { Breadcrumb } from '@/ui/navigation/bread-crumb/components/Breadcrumb';
import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
import { SettingsAccountLoader } from '~/pages/settings/accounts/SettingsAccountLoader';
export const SettingsAccounts = () => {
@ -23,6 +25,8 @@ export const SettingsAccounts = () => {
},
});
const isBlocklistEnabled = useIsFeatureEnabled('IS_BLOCKLIST_ENABLED');
return (
<SubMenuTopBarContainer Icon={IconSettings} title="Settings">
<SettingsPageContainer
@ -39,6 +43,7 @@ export const SettingsAccounts = () => {
) : (
<>
<SettingsAccountsConnectedAccountsSection accounts={accounts} />
{isBlocklistEnabled && <SettingsAccountsEmailsBlocklistSection />}
<SettingsAccountsSettingsSection />
</>
)}

2
packages/twenty-front/src/pages/settings/accounts/SettingsAccountsEmails.tsx
View File

@ -1,4 +1,3 @@
import { SettingsAccountsEmailsBlocklistSection } from '@/settings/accounts/components/SettingsAccountsEmailsBlocklistSection';
import { SettingsAccountsEmailsSyncSection } from '@/settings/accounts/components/SettingsAccountsEmailsSyncSection';
import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
import { IconSettings } from '@/ui/display/icon';
@ -15,7 +14,6 @@ export const SettingsAccountsEmails = () => (
]}
/>
<SettingsAccountsEmailsSyncSection />
<SettingsAccountsEmailsBlocklistSection />
</SettingsPageContainer>
</SubMenuTopBarContainer>
);