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

Fix sync statuses on the fe (#7117)

Browse Source 
Follows #6685
This commit is contained in:
Raphaël Bosi
2024-09-18 18:46:39 +02:00
committed by GitHub
parent 02618b3e6a
commit 1d56ace2af
12 changed files with 245 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsConnectedAccountsRowRightContainer.tsx
View File

@ -1,8 +1,9 @@
import { ConnectedAccount } from '@/accounts/types/ConnectedAccount';
import { SettingsAccountsRowDropdownMenu } from '@/settings/accounts/components/SettingsAccountsRowDropdownMenu';
import { SyncStatus } from '@/settings/accounts/constants/SyncStatus';
import { computeSyncStatus } from '@/settings/accounts/utils/computeSyncStatus';
import { Status } from '@/ui/display/status/components/Status';
import styled from '@emotion/styled';
import { useMemo } from 'react';
const StyledRowRightContainer = styled.div`
align-items: center;
@ -15,39 +16,26 @@ export const SettingsAccountsConnectedAccountsRowRightContainer = ({
}: {
account: ConnectedAccount;
}) => {
const mCSyncStatus = account.messageChannels[0]?.syncStatus;
const cCSyncStatus = account.calendarChannels[0]?.syncStatus;
const messageChannelSyncStatus = account.messageChannels[0]?.syncStatus;
const calendarChannelSyncStatus = account.calendarChannels[0]?.syncStatus;
const status = useMemo(() => {
if (mCSyncStatus === 'ACTIVE' && cCSyncStatus === 'ACTIVE') {
return 'Synced';
} else if (mCSyncStatus === 'NOT_SYNCED' && cCSyncStatus === 'NOT_SYNCED') {
return 'Not synced';
} else if (mCSyncStatus === 'ONGOING' || cCSyncStatus === 'ONGOING') {
return 'Importing';
} else if (
mCSyncStatus === 'FAILED' ||
mCSyncStatus === 'FAILED_INSUFFICIENT_PERMISSIONS' ||
cCSyncStatus === 'FAILED' ||
cCSyncStatus === 'FAILED_INSUFFICIENT_PERMISSIONS'
) {
return 'Failed';
}
return '';
}, [mCSyncStatus, cCSyncStatus]);
const status = computeSyncStatus(
messageChannelSyncStatus,
calendarChannelSyncStatus,
);
return (
<StyledRowRightContainer>
{status === 'Failed' && (
{status === SyncStatus.FAILED && (
<Status color="red" text="Sync failed" weight="medium" />
)}
{status === 'Synced' && (
{status === SyncStatus.SYNCED && (
<Status color="green" text="Synced" weight="medium" />
)}
{status === 'Not synced' && (
{status === SyncStatus.NOT_SYNCED && (
<Status color="orange" text="Not synced" weight="medium" />
)}
{status === 'Importing' && (
{status === SyncStatus.IMPORTING && (
<Status
color="turquoise"
text="Importing"

6
packages/twenty-front/src/modules/settings/accounts/constants/SyncStatus.ts Normal file
View File

@ -0,0 +1,6 @@
export enum SyncStatus {
SYNCED = 'SYNCED',
FAILED = 'FAILED',
NOT_SYNCED = 'NOT_SYNCED',
IMPORTING = 'IMPORTING',
}

87
packages/twenty-front/src/modules/settings/accounts/utils/__tests__/computeSyncStatus.test.ts Normal file
View File

@ -0,0 +1,87 @@
import { CalendarChannelSyncStatus } from '@/accounts/types/CalendarChannel';
import { MessageChannelSyncStatus } from '@/accounts/types/MessageChannel';
import { SyncStatus } from '@/settings/accounts/constants/SyncStatus';
import { computeSyncStatus } from '../computeSyncStatus';
describe('computeSyncStatus', () => {
test('should return FAILED when both sync statuses are FAILED', () => {
expect(
computeSyncStatus(
MessageChannelSyncStatus.FAILED_UNKNOWN,
CalendarChannelSyncStatus.FAILED_UNKNOWN,
),
).toEqual(SyncStatus.FAILED);
});
test('should return FAILED when message channel sync status is FAILED_UNKNOWN', () => {
expect(
computeSyncStatus(
MessageChannelSyncStatus.FAILED_UNKNOWN,
CalendarChannelSyncStatus.ACTIVE,
),
).toEqual(SyncStatus.FAILED);
});
test('should return FAILED when message channel sync status is FAILED_INSUFFICIENT_PERMISSIONS', () => {
expect(
computeSyncStatus(
MessageChannelSyncStatus.FAILED_INSUFFICIENT_PERMISSIONS,
CalendarChannelSyncStatus.ACTIVE,
),
).toEqual(SyncStatus.FAILED);
});
test('should return FAILED when calendar channel sync status is FAILED_UNKNOWN', () => {
expect(
computeSyncStatus(
MessageChannelSyncStatus.ACTIVE,
CalendarChannelSyncStatus.FAILED_UNKNOWN,
),
).toEqual(SyncStatus.FAILED);
});
test('should return FAILED when calendar channel sync status is FAILED_INSUFFICIENT_PERMISSIONS', () => {
expect(
computeSyncStatus(
MessageChannelSyncStatus.ACTIVE,
CalendarChannelSyncStatus.FAILED_INSUFFICIENT_PERMISSIONS,
),
).toEqual(SyncStatus.FAILED);
});
test('should return IMPORTING when message channel sync status is ONGOING', () => {
expect(
computeSyncStatus(
MessageChannelSyncStatus.ONGOING,
CalendarChannelSyncStatus.ACTIVE,
),
).toEqual(SyncStatus.IMPORTING);
});
test('should return IMPORTING when calendar channel sync status is ONGOING', () => {
expect(
computeSyncStatus(
MessageChannelSyncStatus.ACTIVE,
CalendarChannelSyncStatus.ONGOING,
),
).toEqual(SyncStatus.IMPORTING);
});
test('should return SYNCED when one channel is ACTIVE and the other is NOT_SYNCED', () => {
expect(
computeSyncStatus(
MessageChannelSyncStatus.NOT_SYNCED,
CalendarChannelSyncStatus.ACTIVE,
),
).toEqual(SyncStatus.SYNCED);
});
test('should return SYNCED when one channel is ACTIVE and the other is NOT_SYNCED', () => {
expect(
computeSyncStatus(
MessageChannelSyncStatus.ACTIVE,
CalendarChannelSyncStatus.NOT_SYNCED,
),
).toEqual(SyncStatus.SYNCED);
});
});

42
packages/twenty-front/src/modules/settings/accounts/utils/computeSyncStatus.ts Normal file
View File

@ -0,0 +1,42 @@
import { CalendarChannelSyncStatus } from '@/accounts/types/CalendarChannel';
import { MessageChannelSyncStatus } from '@/accounts/types/MessageChannel';
import { SyncStatus } from '@/settings/accounts/constants/SyncStatus';
export const computeSyncStatus = (
messageChannelSyncStatus: MessageChannelSyncStatus,
calendarChannelSyncStatus: CalendarChannelSyncStatus,
) => {
if (
messageChannelSyncStatus === MessageChannelSyncStatus.FAILED_UNKNOWN ||
messageChannelSyncStatus ===
MessageChannelSyncStatus.FAILED_INSUFFICIENT_PERMISSIONS ||
calendarChannelSyncStatus === CalendarChannelSyncStatus.FAILED_UNKNOWN ||
calendarChannelSyncStatus ===
CalendarChannelSyncStatus.FAILED_INSUFFICIENT_PERMISSIONS
) {
return SyncStatus.FAILED;
}
if (
messageChannelSyncStatus === MessageChannelSyncStatus.ONGOING ||
calendarChannelSyncStatus === CalendarChannelSyncStatus.ONGOING
) {
return SyncStatus.IMPORTING;
}
if (
messageChannelSyncStatus === MessageChannelSyncStatus.NOT_SYNCED &&
calendarChannelSyncStatus === CalendarChannelSyncStatus.NOT_SYNCED
) {
return SyncStatus.NOT_SYNCED;
}
if (
messageChannelSyncStatus === MessageChannelSyncStatus.ACTIVE ||
calendarChannelSyncStatus === CalendarChannelSyncStatus.ACTIVE
) {
return SyncStatus.SYNCED;
}
return SyncStatus.NOT_SYNCED;
};