The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Show sending domain DNS records as a status list and a records table (#25996)
neo773e3019d6eb9ee
diff --git a/packages/twenty-front/src/generated-metadata/graphql.ts b/packages/twenty-front/src/generated-metadata/graphql.tsindex 123468bd41d..1904bab8486 100644--- a/packages/twenty-front/src/generated-metadata/graphql.ts+++ b/packages/twenty-front/src/generated-metadata/graphql.ts@@ -9427,12 +9427,12 @@ export type VerifyEmailingDomainMutationVariables = Exact<{}>;-export type VerifyEmailingDomainMutation = { __typename?: 'Mutation', verifyEmailingDomain: { __typename?: 'EmailingDomain', id: string, domain: string, status: EmailingDomainStatus, verifiedAt?: string | null, createdAt: string, updatedAt: string, verificationRecords?: Array<{ __typename?: 'VerificationRecord', type: string, key: string, value: string, priority?: number | null, status?: string | null }> | null } };+export type VerifyEmailingDomainMutation = { __typename?: 'Mutation', verifyEmailingDomain: { __typename?: 'EmailingDomain', id: string, domain: string, status: EmailingDomainStatus, unsubscribeHostnameStatus?: UnsubscribeHostnameStatus | null, verifiedAt?: string | null, createdAt: string, updatedAt: string, verificationRecords?: Array<{ __typename?: 'VerificationRecord', type: string, key: string, value: string, priority?: number | null, status?: string | null }> | null } };export type GetEmailingDomainsQueryVariables = Exact<{ [key: string]: never; }>;-export type GetEmailingDomainsQuery = { __typename?: 'Query', getEmailingDomains: Array<{ __typename?: 'EmailingDomain', id: string, domain: string, status: EmailingDomainStatus, verifiedAt?: string | null, createdAt: string, updatedAt: string, verificationRecords?: Array<{ __typename?: 'VerificationRecord', type: string, key: string, value: string, priority?: number | null, status?: string | null }> | null }> };+export type GetEmailingDomainsQuery = { __typename?: 'Query', getEmailingDomains: Array<{ __typename?: 'EmailingDomain', id: string, domain: string, status: EmailingDomainStatus, unsubscribeHostnameStatus?: UnsubscribeHostnameStatus | null, verifiedAt?: string | null, createdAt: string, updatedAt: string, verificationRecords?: Array<{ __typename?: 'VerificationRecord', type: string, key: string, value: string, priority?: number | null, status?: string | null }> | null }> };export type RefreshEnterpriseValidityTokenMutationVariables = Exact<{ [key: string]: never; }>;@@ -10313,8 +10313,8 @@ export const CheckPublicDomainValidRecordsDocument = {"kind":"Document","definitexport const CreatePublicDomainDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"CreatePublicDomain"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"domain"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"applicationId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"createPublicDomain"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"domain"},"value":{"kind":"Variable","name":{"kind":"Name","value":"domain"}}},{"kind":"Argument","name":{"kind":"Name","value":"applicationId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"applicationId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"domain"}},{"kind":"Field","name":{"kind":"Name","value":"isValidated"}},{"kind":"Field","name":{"kind":"Name","value":"applicationId"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}}]}}]}}]} as unknown as DocumentNode<CreatePublicDomainMutation, CreatePublicDomainMutationVariables>;export const DeletePublicDomainDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"DeletePublicDomain"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"domain"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"deletePublicDomain"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"domain"},"value":{"kind":"Variable","name":{"kind":"Name","value":"domain"}}}]}]}}]} as unknown as DocumentNode<DeletePublicDomainMutation, DeletePublicDomainMutationVariables>;export const FindManyPublicDomainsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"FindManyPublicDomains"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"findManyPublicDomains"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"domain"}},{"kind":"Field","name":{"kind":"Name","value":"isValidated"}},{"kind":"Field","name":{"kind":"Name","value":"applicationId"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}}]}}]}}]} as unknown as DocumentNode<FindManyPublicDomainsQuery, FindManyPublicDomainsQueryVariables>;-export const VerifyEmailingDomainDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"VerifyEmailingDomain"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"id"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"verifyEmailingDomain"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"id"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"domain"}},{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"verifiedAt"}},{"kind":"Field","name":{"kind":"Name","value":"verificationRecords"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"type"}},{"kind":"Field","name":{"kind":"Name","value":"key"}},{"kind":"Field","name":{"kind":"Name","value":"value"}},{"kind":"Field","name":{"kind":"Name","value":"priority"}},{"kind":"Field","name":{"kind":"Name","value":"status"}}]}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]}}]} as unknown as DocumentNode<VerifyEmailingDomainMutation, VerifyEmailingDomainMutationVariables>;-export const GetEmailingDomainsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetEmailingDomains"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"getEmailingDomains"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"domain"}},{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"verifiedAt"}},{"kind":"Field","name":{"kind":"Name","value":"verificationRecords"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"type"}},{"kind":"Field","name":{"kind":"Name","value":"key"}},{"kind":"Field","name":{"kind":"Name","value":"value"}},{"kind":"Field","name":{"kind":"Name","value":"priority"}},{"kind":"Field","name":{"kind":"Name","value":"status"}}]}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]}}]} as unknown as DocumentNode<GetEmailingDomainsQuery, GetEmailingDomainsQueryVariables>;+export const VerifyEmailingDomainDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"VerifyEmailingDomain"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"id"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"verifyEmailingDomain"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"id"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"domain"}},{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"unsubscribeHostnameStatus"}},{"kind":"Field","name":{"kind":"Name","value":"verifiedAt"}},{"kind":"Field","name":{"kind":"Name","value":"verificationRecords"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"type"}},{"kind":"Field","name":{"kind":"Name","value":"key"}},{"kind":"Field","name":{"kind":"Name","value":"value"}},{"kind":"Field","name":{"kind":"Name","value":"priority"}},{"kind":"Field","name":{"kind":"Name","value":"status"}}]}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]}}]} as unknown as DocumentNode<VerifyEmailingDomainMutation, VerifyEmailingDomainMutationVariables>;+export const GetEmailingDomainsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetEmailingDomains"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"getEmailingDomains"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"domain"}},{"kind":"Field","name":{"kind":"Name","value":"status"}},{"kind":"Field","name":{"kind":"Name","value":"unsubscribeHostnameStatus"}},{"kind":"Field","name":{"kind":"Name","value":"verifiedAt"}},{"kind":"Field","name":{"kind":"Name","value":"verificationRecords"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"type"}},{"kind":"Field","name":{"kind":"Name","value":"key"}},{"kind":"Field","name":{"kind":"Name","value":"value"}},{"kind":"Field","name":{"kind":"Name","value":"priority"}},{"kind":"Field","name":{"kind":"Name","value":"status"}}]}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]}}]} as unknown as DocumentNode<GetEmailingDomainsQuery, GetEmailingDomainsQueryVariables>;export const RefreshEnterpriseValidityTokenDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"RefreshEnterpriseValidityToken"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"refreshEnterpriseValidityToken"}}]}}]} as unknown as DocumentNode<RefreshEnterpriseValidityTokenMutation, RefreshEnterpriseValidityTokenMutationVariables>;export const ReleaseEnterpriseServerBindingDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"ReleaseEnterpriseServerBinding"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"releaseEnterpriseServerBinding"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"isValid"}},{"kind":"Field","name":{"kind":"Name","value":"licensee"}},{"kind":"Field","name":{"kind":"Name","value":"expiresAt"}},{"kind":"Field","name":{"kind":"Name","value":"subscriptionId"}}]}}]}}]} as unknown as DocumentNode<ReleaseEnterpriseServerBindingMutation, ReleaseEnterpriseServerBindingMutationVariables>;export const SetEnterpriseKeyDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"SetEnterpriseKey"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"enterpriseKey"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"setEnterpriseKey"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"enterpriseKey"},"value":{"kind":"Variable","name":{"kind":"Name","value":"enterpriseKey"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"isValid"}},{"kind":"Field","name":{"kind":"Name","value":"licensee"}},{"kind":"Field","name":{"kind":"Name","value":"expiresAt"}},{"kind":"Field","name":{"kind":"Name","value":"subscriptionId"}}]}}]}}]} as unknown as DocumentNode<SetEnterpriseKeyMutation, SetEnterpriseKeyMutationVariables>;diff --git a/packages/twenty-front/src/modules/settings/components/SettingsDnsRecordsTable.tsx b/packages/twenty-front/src/modules/settings/components/SettingsDnsRecordsTable.tsxindex 968ef0e8cef..65402c64f4b 100644--- a/packages/twenty-front/src/modules/settings/components/SettingsDnsRecordsTable.tsx+++ b/packages/twenty-front/src/modules/settings/components/SettingsDnsRecordsTable.tsx@@ -36,6 +36,11 @@ const StyledCopyableCell = styled.div`& input {cursor: pointer;pointer-events: none;+ transition:+ background-color calc(${themeCssVariables.animation.duration.normal} * 1s)+ ease,+ border-color calc(${themeCssVariables.animation.duration.normal} * 1s)+ ease;}&:hover input {diff --git a/packages/twenty-front/src/modules/settings/emailing-domains/components/SettingsEmailingDomainDnsRecords.tsx b/packages/twenty-front/src/modules/settings/emailing-domains/components/SettingsEmailingDomainDnsRecords.tsxnew file mode 100644index 00000000000..0327d33e5df--- /dev/null+++ b/packages/twenty-front/src/modules/settings/emailing-domains/components/SettingsEmailingDomainDnsRecords.tsx@@ -0,0 +1,76 @@+import { FeatureFlagKey } from 'twenty-shared/types';+import { isDefined } from 'twenty-shared/utils';+import { Status } from 'twenty-ui/primitives/data-display';++import { SettingsDnsRecordsTable } from '@/settings/components/SettingsDnsRecordsTable';+import { SettingsListCard } from '@/settings/components/SettingsListCard';+import { VERIFICATION_RECORD_GROUP_DISPLAY_ORDER } from '@/settings/emailing-domains/constants/VerificationRecordGroupDisplayOrder';+import { getVerificationRecordGroupContent } from '@/settings/emailing-domains/utils/getVerificationRecordGroupContent';+import { getVerificationRecordGroupKey } from '@/settings/emailing-domains/utils/getVerificationRecordGroupKey';+import { getVerificationRecordGroupStatusDisplay } from '@/settings/emailing-domains/utils/getVerificationRecordGroupStatusDisplay';+import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';+import { type EmailingDomain } from '~/generated-metadata/graphql';++type SettingsEmailingDomainDnsRecordsProps = {+ emailingDomain: Pick<+ EmailingDomain,+ 'domain' | 'status' | 'unsubscribeHostnameStatus' | 'verificationRecords'+ >;+};++export const SettingsEmailingDomainDnsRecords = ({+ emailingDomain,+}: SettingsEmailingDomainDnsRecordsProps) => {+ const isMessageCampaignEnabled = useIsFeatureEnabled(+ FeatureFlagKey.IS_MESSAGE_CAMPAIGN_ENABLED,+ );++ const groups = VERIFICATION_RECORD_GROUP_DISPLAY_ORDER.filter(+ (groupKey) => groupKey !== 'UNSUBSCRIBE' || isMessageCampaignEnabled,+ )+ .map((groupKey) => ({+ id: groupKey,+ records: (emailingDomain.verificationRecords ?? []).filter(+ (record) =>+ getVerificationRecordGroupKey({+ recordName: record.key,+ domain: emailingDomain.domain,+ }) === groupKey,+ ),+ status: getVerificationRecordGroupStatusDisplay({+ groupKey,+ emailingDomain,+ }),+ ...getVerificationRecordGroupContent(groupKey),+ }))+ .filter(({ records }) => records.length > 0);++ if (groups.length === 0) {+ return null;+ }++ const tableRecords = groups.flatMap(({ records }) =>+ records.map((record) => ({+ type: record.type,+ key: record.key,+ value: isDefined(record.priority)+ ? `${record.priority} ${record.value}`+ : record.value,+ })),+ );++ return (+ <>+ <SettingsListCard+ items={groups}+ rounded+ getItemLabel={(group) => group.title}+ RowIconFn={(group) => group.Icon}+ RowRightComponent={({ item: group }) => (+ <Status color={group.status.color}>{group.status.label}</Status>+ )}+ />+ <SettingsDnsRecordsTable records={tableRecords} />+ </>+ );+};diff --git a/packages/twenty-front/src/modules/settings/emailing-domains/components/SettingsEmailingDomainVerifyButton.tsx b/packages/twenty-front/src/modules/settings/emailing-domains/components/SettingsEmailingDomainVerifyButton.tsxindex 3408eb457bc..8650cee3947 100644--- a/packages/twenty-front/src/modules/settings/emailing-domains/components/SettingsEmailingDomainVerifyButton.tsx+++ b/packages/twenty-front/src/modules/settings/emailing-domains/components/SettingsEmailingDomainVerifyButton.tsx@@ -37,7 +37,6 @@ export const SettingsEmailingDomainVerifyButton = ({isLoading={loading}variant="secondary"Icon={IconRefresh}- size="small"title={t`Check verification`}disabled={loading}/>diff --git a/packages/twenty-front/src/modules/settings/emailing-domains/constants/VerificationRecordGroupDisplayOrder.ts b/packages/twenty-front/src/modules/settings/emailing-domains/constants/VerificationRecordGroupDisplayOrder.tsnew file mode 100644index 00000000000..ad545079dc6--- /dev/null+++ b/packages/twenty-front/src/modules/settings/emailing-domains/constants/VerificationRecordGroupDisplayOrder.ts@@ -0,0 +1,4 @@+import { type VerificationRecordGroupKey } from '@/settings/emailing-domains/types/VerificationRecordGroupKey';++export const VERIFICATION_RECORD_GROUP_DISPLAY_ORDER: VerificationRecordGroupKey[] =+ ['AUTHENTICATION', 'DMARC', 'UNSUBSCRIBE'];diff --git a/packages/twenty-front/src/modules/settings/emailing-domains/graphql/mutations/verifyEmailingDomain.ts b/packages/twenty-front/src/modules/settings/emailing-domains/graphql/mutations/verifyEmailingDomain.tsindex 01d9979b9e3..bde961506dc 100644--- a/packages/twenty-front/src/modules/settings/emailing-domains/graphql/mutations/verifyEmailingDomain.ts+++ b/packages/twenty-front/src/modules/settings/emailing-domains/graphql/mutations/verifyEmailingDomain.ts@@ -6,6 +6,7 @@ export const VERIFY_EMAILING_DOMAIN = gql`iddomainstatus+ unsubscribeHostnameStatusverifiedAtverificationRecords {typediff --git a/packages/twenty-front/src/modules/settings/emailing-domains/graphql/queries/getAllEmailingDomains.ts b/packages/twenty-front/src/modules/settings/emailing-domains/graphql/queries/getAllEmailingDomains.tsindex c4a0187e32c..815842ef418 100644--- a/packages/twenty-front/src/modules/settings/emailing-domains/graphql/queries/getAllEmailingDomains.ts+++ b/packages/twenty-front/src/modules/settings/emailing-domains/graphql/queries/getAllEmailingDomains.ts@@ -6,6 +6,7 @@ export const GET_ALL_EMAILING_DOMAINS = gql`iddomainstatus+ unsubscribeHostnameStatusverifiedAtverificationRecords {typediff --git a/packages/twenty-front/src/modules/settings/emailing-domains/types/VerificationRecordGroupKey.ts b/packages/twenty-front/src/modules/settings/emailing-domains/types/VerificationRecordGroupKey.tsnew file mode 100644index 00000000000..6a17c8a15c6--- /dev/null+++ b/packages/twenty-front/src/modules/settings/emailing-domains/types/VerificationRecordGroupKey.ts@@ -0,0 +1,4 @@+export type VerificationRecordGroupKey =+ | 'AUTHENTICATION'+ | 'DMARC'+ | 'UNSUBSCRIBE';diff --git a/packages/twenty-front/src/modules/settings/emailing-domains/utils/getVerificationRecordGroupContent.ts b/packages/twenty-front/src/modules/settings/emailing-domains/utils/getVerificationRecordGroupContent.tsnew file mode 100644index 00000000000..d29245b7b1e--- /dev/null+++ b/packages/twenty-front/src/modules/settings/emailing-domains/utils/getVerificationRecordGroupContent.ts@@ -0,0 +1,27 @@+import { t } from '@lingui/core/macro';+import {+ type IconComponent,+ IconLogout,+ IconShield,+ IconWorldWww,+} from 'twenty-ui/icon';++import { type VerificationRecordGroupKey } from '@/settings/emailing-domains/types/VerificationRecordGroupKey';++type VerificationRecordGroupContent = {+ Icon: IconComponent;+ title: string;+};++export const getVerificationRecordGroupContent = (+ groupKey: VerificationRecordGroupKey,+): VerificationRecordGroupContent => {+ switch (groupKey) {+ case 'AUTHENTICATION':+ return { Icon: IconWorldWww, title: t`Domain authentication` };+ case 'DMARC':+ return { Icon: IconShield, title: t`DMARC policy` };+ case 'UNSUBSCRIBE':+ return { Icon: IconLogout, title: t`Unsubscribe link` };+ }+};diff --git a/packages/twenty-front/src/modules/settings/emailing-domains/utils/getVerificationRecordGroupKey.ts b/packages/twenty-front/src/modules/settings/emailing-domains/utils/getVerificationRecordGroupKey.tsnew file mode 100644index 00000000000..92d43c14a91--- /dev/null+++ b/packages/twenty-front/src/modules/settings/emailing-domains/utils/getVerificationRecordGroupKey.ts@@ -0,0 +1,19 @@+import { type VerificationRecordGroupKey } from '@/settings/emailing-domains/types/VerificationRecordGroupKey';++export const getVerificationRecordGroupKey = ({+ recordName,+ domain,+}: {+ recordName: string;+ domain: string;+}): VerificationRecordGroupKey => {+ if (recordName === `_dmarc.${domain}`) {+ return 'DMARC';+ }++ if (recordName.endsWith(`unsubscribe.${domain}`)) {+ return 'UNSUBSCRIBE';+ }++ return 'AUTHENTICATION';+};diff --git a/packages/twenty-front/src/modules/settings/emailing-domains/utils/getVerificationRecordGroupStatusDisplay.ts b/packages/twenty-front/src/modules/settings/emailing-domains/utils/getVerificationRecordGroupStatusDisplay.tsnew file mode 100644index 00000000000..b77d3dd11a5--- /dev/null+++ b/packages/twenty-front/src/modules/settings/emailing-domains/utils/getVerificationRecordGroupStatusDisplay.ts@@ -0,0 +1,45 @@+import { t } from '@lingui/core/macro';+import { type ThemeColor } from 'twenty-ui/theme';++import { type VerificationRecordGroupKey } from '@/settings/emailing-domains/types/VerificationRecordGroupKey';+import {+ type EmailingDomain,+ EmailingDomainStatus,+ UnsubscribeHostnameStatus,+} from '~/generated-metadata/graphql';+import { getColorByEmailingDomainStatus } from '~/pages/settings/emailing-domains/utils/getEmailingDomainStatusColor';+import { getTextByEmailingDomainStatus } from '~/pages/settings/emailing-domains/utils/getEmailingDomainStatusText';++type VerificationRecordGroupStatusDisplay = {+ label: string;+ color: ThemeColor;+};++const toStatusDisplay = (+ status: EmailingDomainStatus,+): VerificationRecordGroupStatusDisplay => ({+ label: getTextByEmailingDomainStatus(status),+ color: getColorByEmailingDomainStatus(status),+});++export const getVerificationRecordGroupStatusDisplay = ({+ groupKey,+ emailingDomain,+}: {+ groupKey: VerificationRecordGroupKey;+ emailingDomain: Pick<EmailingDomain, 'status' | 'unsubscribeHostnameStatus'>;+}): VerificationRecordGroupStatusDisplay => {+ switch (groupKey) {+ case 'AUTHENTICATION':+ return toStatusDisplay(emailingDomain.status);+ case 'DMARC':+ return { label: t`Not set`, color: 'gray' };+ case 'UNSUBSCRIBE':+ return toStatusDisplay(+ emailingDomain.unsubscribeHostnameStatus ===+ UnsubscribeHostnameStatus.ACTIVE+ ? EmailingDomainStatus.VERIFIED+ : EmailingDomainStatus.PENDING,+ );+ }+};diff --git a/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceCommunicationGroupChannelDetail.tsx b/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceCommunicationGroupChannelDetail.tsxindex 25203b2d417..a984aa2ceb4 100644--- a/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceCommunicationGroupChannelDetail.tsx+++ b/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceCommunicationGroupChannelDetail.tsx@@ -10,8 +10,8 @@ import { useUpdateEmailGroupChannel } from '@/settings/accounts/hooks/useUpdateEimport { SettingsEditableTitle } from '@/settings/components/SettingsEditableTitle';import { getEmailChannelDomain } from '@/settings/accounts/utils/getEmailChannelDomain';-import { SettingsDnsRecordsTable } from '@/settings/components/SettingsDnsRecordsTable';+import { SettingsEmailingDomainDnsRecords } from '@/settings/emailing-domains/components/SettingsEmailingDomainDnsRecords';import { SettingsEmailingDomainVerifyButton } from '@/settings/emailing-domains/components/SettingsEmailingDomainVerifyButton';import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';import { SettingsSkeletonLoader } from '@/settings/components/SettingsSkeletonLoader';@@ -23,47 +23,34 @@ import { useModal } from '@/ui/layout/modal/hooks/useModal';import { isNonEmptyString } from '@sniptt/guards';import { MessageChannelType, SettingsPath } from 'twenty-shared/types';import { getSettingsPath, isDefined } from 'twenty-shared/utils';-import {- EmailingDomainStatus,- GetEmailingDomainsDocument,-} from '~/generated-metadata/graphql';-import { Status } from 'twenty-ui/primitives/data-display';+import { GetEmailingDomainsDocument } from '~/generated-metadata/graphql';import { IconCopy, IconTrash } from 'twenty-ui/icon';import { H2Title } from 'twenty-ui/primitives/typography';import { Button } from 'twenty-ui/primitives/input';import { Section } from 'twenty-ui/primitives/layout';-import { type ThemeColor } from 'twenty-ui/theme';import { themeCssVariables } from 'twenty-ui/theme-constants';import { NotFound } from '~/pages/not-found/NotFound';-import { getColorByEmailingDomainStatus } from '~/pages/settings/emailing-domains/utils/getEmailingDomainStatusColor';-import { getTextByEmailingDomainStatus } from '~/pages/settings/emailing-domains/utils/getEmailingDomainStatusText';import { useCopyToClipboard } from '~/hooks/useCopyToClipboard';import { useNavigateSettings } from '~/hooks/useNavigateSettings';const DELETE_EMAIL_GROUP_MODAL_ID = 'delete-email-group-channel-modal';-const StyledForwardingRow = styled.div`+const StyledInputRow = styled.div`display: flex;flex-direction: row;`;-const StyledForwardingInputContainer = styled.div`+const StyledInputContainer = styled.div`flex: 1;margin-right: ${themeCssVariables.spacing[2]};`;-const StyledSendingDomainAdornment = styled.div`- align-items: center;+const StyledSendingDomainColumn = styled.div`display: flex;- gap: ${themeCssVariables.spacing[2]};+ flex-direction: column;+ gap: ${themeCssVariables.spacing[3]};`;-const RECORD_STATUS_TO_COLOR: Partial<Record<string, ThemeColor>> = {- success: 'green',- pending: 'yellow',- error: 'red',-};-export const SettingsWorkspaceCommunicationGroupChannelDetail = () => {const { t } = useLingui();const navigateSettings = useNavigateSettings();@@ -102,20 +89,6 @@ export const SettingsWorkspaceCommunicationGroupChannelDetail = () => {(domain) => domain.domain.toLowerCase() === channelDomain,);- const verificationRecords = (emailingDomain?.verificationRecords ?? []).map(- (record) => ({- ...record,- status: record.status ?? undefined,- statusColor: isDefined(record.status)- ? (RECORD_STATUS_TO_COLOR[record.status] ?? 'gray')- : undefined,- }),- );-- const domainStatus = emailingDomain?.status ?? EmailingDomainStatus.PENDING;-- const isDomainVerified = domainStatus === EmailingDomainStatus.VERIFIED;-const displayName = channel.displayName ?? '';const handleDisplayNameSave = async () => {@@ -209,15 +182,15 @@ export const SettingsWorkspaceCommunicationGroupChannelDetail = () => {title={t`Forwarding address`}description={t`Set up forwarding from the source address to this destination.`}/>- <StyledForwardingRow>- <StyledForwardingInputContainer>+ <StyledInputRow>+ <StyledInputContainer><SettingsTextInputinstanceId="email-group-forwarding"value={forwardingAddress}disabledfullWidth/>- </StyledForwardingInputContainer>+ </StyledInputContainer><ButtonIcon={IconCopy}title={t`Copy`}@@ -228,7 +201,7 @@ export const SettingsWorkspaceCommunicationGroupChannelDetail = () => {)}/>- </StyledForwardingRow>+ </StyledInputRow></Section>{isNonEmptyString(channel.displayName) && (<Section>@@ -248,23 +221,26 @@ export const SettingsWorkspaceCommunicationGroupChannelDetail = () => {<Section><H2Titletitle={t`Sending domain`}- description={t`Outbound mail from this channel is sent through this domain. It must be verified before email can be delivered.`}- adornment={- <StyledSendingDomainAdornment>- <Status color={getColorByEmailingDomainStatus(domainStatus)}>- {getTextByEmailingDomainStatus(domainStatus)}- </Status>- {!isDomainVerified && (- <SettingsEmailingDomainVerifyButton- emailingDomainId={emailingDomain.id}- />- )}- </StyledSendingDomainAdornment>- }+ description={t`Add these records at your DNS provider. Twenty checks them automatically.`}/>- {!isDomainVerified && (- <SettingsDnsRecordsTable records={verificationRecords} />- )}+ <StyledSendingDomainColumn>+ <StyledInputRow>+ <StyledInputContainer>+ <SettingsTextInput+ instanceId="email-group-sending-domain"+ value={emailingDomain.domain}+ disabled+ fullWidth+ />+ </StyledInputContainer>+ <SettingsEmailingDomainVerifyButton+ emailingDomainId={emailingDomain.id}+ />+ </StyledInputRow>+ <SettingsEmailingDomainDnsRecords+ emailingDomain={emailingDomain}+ />+ </StyledSendingDomainColumn></Section>)}</SettingsPageContainer>