Skip to content

Commit 8019ba8

Browse files
authored
1 parent 453525c commit 8019ba8

File tree

53 files changed

+479
-546
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+479
-546
lines changed

packages/twenty-front/.storybook/preview.tsx

+1-2
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,8 @@ initialize({
2929
const preview: Preview = {
3030
decorators: [
3131
(Story) => {
32-
const mode = useDarkMode() ? 'Dark' : 'Light';
32+
const theme = useDarkMode() ? THEME_DARK : THEME_LIGHT;
3333

34-
const theme = mode === 'Dark' ? THEME_DARK : THEME_LIGHT;
3534
return (
3635
<ThemeProvider theme={theme}>
3736
<Story />

packages/twenty-front/src/modules/activities/hooks/useCustomResolver.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import {
88

99
import { ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity';
1010
import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
11+
import { SnackBarVariant } from '@/ui/feedback/snack-bar-manager/components/SnackBar';
1112
import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
1213

1314
type CustomResolverQueryResult<
@@ -62,7 +63,7 @@ export const useCustomResolver = <
6263
variables: queryVariables,
6364
onError: (error) => {
6465
enqueueSnackBar(error.message || `Error loading ${objectName}`, {
65-
variant: 'error',
66+
variant: SnackBarVariant.Error,
6667
});
6768
},
6869
});

packages/twenty-front/src/modules/auth/sign-in-up/hooks/useHandleResetPassword.ts

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { useCallback } from 'react';
22

3+
import { SnackBarVariant } from '@/ui/feedback/snack-bar-manager/components/SnackBar';
34
import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
45
import { useEmailPasswordResetLinkMutation } from '~/generated/graphql';
56

@@ -12,7 +13,7 @@ export const useHandleResetPassword = () => {
1213
return async () => {
1314
if (!email) {
1415
enqueueSnackBar('Invalid email', {
15-
variant: 'error',
16+
variant: SnackBarVariant.Error,
1617
});
1718
return;
1819
}
@@ -24,16 +25,16 @@ export const useHandleResetPassword = () => {
2425

2526
if (data?.emailPasswordResetLink?.success === true) {
2627
enqueueSnackBar('Password reset link has been sent to the email', {
27-
variant: 'success',
28+
variant: SnackBarVariant.Success,
2829
});
2930
} else {
3031
enqueueSnackBar('There was some issue', {
31-
variant: 'error',
32+
variant: SnackBarVariant.Error,
3233
});
3334
}
3435
} catch (error) {
3536
enqueueSnackBar((error as Error).message, {
36-
variant: 'error',
37+
variant: SnackBarVariant.Error,
3738
});
3839
}
3940
};

packages/twenty-front/src/modules/auth/sign-in-up/hooks/useSignInUp.tsx

+3-2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import { Form } from '@/auth/sign-in-up/hooks/useSignInUpForm';
77
import { useReadCaptchaToken } from '@/captcha/hooks/useReadCaptchaToken';
88
import { useRequestFreshCaptchaToken } from '@/captcha/hooks/useRequestFreshCaptchaToken';
99
import { AppPath } from '@/types/AppPath';
10+
import { SnackBarVariant } from '@/ui/feedback/snack-bar-manager/components/SnackBar';
1011
import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
1112
import { useIsMatchingLocation } from '~/hooks/useIsMatchingLocation';
1213

@@ -75,7 +76,7 @@ export const useSignInUp = (form: UseFormReturn<Form>) => {
7576
},
7677
onError: (error) => {
7778
enqueueSnackBar(`${error.message}`, {
78-
variant: 'error',
79+
variant: SnackBarVariant.Error,
7980
});
8081
},
8182
onCompleted: (data) => {
@@ -124,7 +125,7 @@ export const useSignInUp = (form: UseFormReturn<Form>) => {
124125
navigateAfterSignInUp(currentWorkspace, currentWorkspaceMember);
125126
} catch (err: any) {
126127
enqueueSnackBar(err?.message, {
127-
variant: 'error',
128+
variant: SnackBarVariant.Error,
128129
});
129130
}
130131
},

packages/twenty-front/src/modules/error-handler/components/PromiseRejectionEffect.tsx

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import React, { useCallback, useEffect } from 'react';
22

33
import { ObjectMetadataItemNotFoundError } from '@/object-metadata/errors/ObjectMetadataNotFoundError';
4+
import { SnackBarVariant } from '@/ui/feedback/snack-bar-manager/components/SnackBar';
45
import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
56

67
export const PromiseRejectionEffect = () => {
@@ -15,12 +16,12 @@ export const PromiseRejectionEffect = () => {
1516
enqueueSnackBar(
1617
`Error with custom object that cannot be found : ${event.reason}`,
1718
{
18-
variant: 'error',
19+
variant: SnackBarVariant.Error,
1920
},
2021
);
2122
} else {
2223
enqueueSnackBar(`Error: ${event.reason}`, {
23-
variant: 'error',
24+
variant: SnackBarVariant.Error,
2425
});
2526
}
2627
},

packages/twenty-front/src/modules/object-metadata/hooks/useFindManyObjectMetadataItems.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { useMemo } from 'react';
22
import { useQuery } from '@apollo/client';
33

4+
import { SnackBarVariant } from '@/ui/feedback/snack-bar-manager/components/SnackBar';
45
import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
56
import {
67
FieldFilter,
@@ -43,7 +44,7 @@ export const useFindManyObjectMetadataItems = ({
4344
enqueueSnackBar(
4445
`Error during useFindManyObjectMetadataItems, ${error.message}`,
4546
{
46-
variant: 'error',
47+
variant: SnackBarVariant.Error,
4748
},
4849
);
4950
},

packages/twenty-front/src/modules/object-record/hooks/useFindDuplicateRecords.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import { RecordGqlOperationFindManyResult } from '@/object-record/graphql/types/
99
import { useFindDuplicateRecordsQuery } from '@/object-record/hooks/useFindDuplicatesRecordsQuery';
1010
import { ObjectRecord } from '@/object-record/types/ObjectRecord';
1111
import { getFindDuplicateRecordsQueryResponseField } from '@/object-record/utils/getFindDuplicateRecordsQueryResponseField';
12+
import { SnackBarVariant } from '@/ui/feedback/snack-bar-manager/components/SnackBar';
1213
import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
1314
import { logError } from '~/utils/logError';
1415

@@ -54,7 +55,7 @@ export const useFindDuplicateRecords = <T extends ObjectRecord = ObjectRecord>({
5455
enqueueSnackBar(
5556
`Error during useFindDuplicateRecords for "${objectMetadataItem.nameSingular}", ${error.message}`,
5657
{
57-
variant: 'error',
58+
variant: SnackBarVariant.Error,
5859
},
5960
);
6061
},

packages/twenty-front/src/modules/object-record/hooks/useFindManyRecords.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import { RecordGqlOperationVariables } from '@/object-record/graphql/types/Recor
1717
import { useFindManyRecordsQuery } from '@/object-record/hooks/useFindManyRecordsQuery';
1818
import { ObjectRecord } from '@/object-record/types/ObjectRecord';
1919
import { filterUniqueRecordEdgesByCursor } from '@/object-record/utils/filterUniqueRecordEdgesByCursor';
20+
import { SnackBarVariant } from '@/ui/feedback/snack-bar-manager/components/SnackBar';
2021
import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
2122
import { isDefined } from '~/utils/isDefined';
2223
import { logError } from '~/utils/logError';
@@ -116,7 +117,7 @@ export const useFindManyRecords = <T extends ObjectRecord = ObjectRecord>({
116117
enqueueSnackBar(
117118
`Error during useFindManyRecords for "${objectMetadataItem.namePlural}", ${error.message}`,
118119
{
119-
variant: 'error',
120+
variant: SnackBarVariant.Error,
120121
},
121122
);
122123
},
@@ -192,7 +193,7 @@ export const useFindManyRecords = <T extends ObjectRecord = ObjectRecord>({
192193
enqueueSnackBar(
193194
`Error during fetchMoreObjects for "${objectMetadataItem.namePlural}", ${error}`,
194195
{
195-
variant: 'error',
196+
variant: SnackBarVariant.Error,
196197
},
197198
);
198199
} finally {

packages/twenty-front/src/modules/object-record/record-field/components/LightCopyIconButton.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { useTheme } from '@emotion/react';
22
import styled from '@emotion/styled';
33
import { IconCopy } from 'twenty-ui';
44

5+
import { SnackBarVariant } from '@/ui/feedback/snack-bar-manager/components/SnackBar';
56
import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
67
import { LightIconButton } from '@/ui/input/button/components/LightIconButton';
78

@@ -24,7 +25,7 @@ export const LightCopyIconButton = ({ copyText }: LightCopyIconButtonProps) => {
2425
Icon={IconCopy}
2526
onClick={() => {
2627
enqueueSnackBar('Text copied to clipboard', {
27-
variant: 'success',
28+
variant: SnackBarVariant.Success,
2829
icon: <IconCopy size={theme.icon.size.md} />,
2930
duration: 2000,
3031
});

packages/twenty-front/src/modules/object-record/spreadsheet-import/useSpreadsheetRecordImport.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import { useCreateManyRecords } from '@/object-record/hooks/useCreateManyRecords
66
import { getSpreadSheetValidation } from '@/object-record/spreadsheet-import/util/getSpreadSheetValidation';
77
import { useSpreadsheetImport } from '@/spreadsheet-import/hooks/useSpreadsheetImport';
88
import { SpreadsheetOptions, Validation } from '@/spreadsheet-import/types';
9+
import { SnackBarVariant } from '@/ui/feedback/snack-bar-manager/components/SnackBar';
910
import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
1011
import { FieldMetadataType } from '~/generated-metadata/graphql';
1112
import { isDefined } from '~/utils/isDefined';
@@ -163,7 +164,7 @@ export const useSpreadsheetRecordImport = (objectNameSingular: string) => {
163164
await createManyRecords(createInputs);
164165
} catch (error: any) {
165166
enqueueSnackBar(error?.message || 'Something went wrong', {
166-
variant: 'error',
167+
variant: SnackBarVariant.Error,
167168
});
168169
}
169170
},

packages/twenty-front/src/modules/settings/developers/components/ApiKeyInput.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { useTheme } from '@emotion/react';
22
import styled from '@emotion/styled';
33
import { IconCopy } from 'twenty-ui';
44

5+
import { SnackBarVariant } from '@/ui/feedback/snack-bar-manager/components/SnackBar';
56
import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
67
import { Button } from '@/ui/input/button/components/Button';
78
import { TextInput } from '@/ui/input/components/TextInput';
@@ -32,7 +33,7 @@ export const ApiKeyInput = ({ apiKey }: ApiKeyInputProps) => {
3233
title="Copy"
3334
onClick={() => {
3435
enqueueSnackBar('Api Key copied to clipboard', {
35-
variant: 'success',
36+
variant: SnackBarVariant.Success,
3637
icon: <IconCopy size={theme.icon.size.md} />,
3738
duration: 2000,
3839
});

packages/twenty-front/src/modules/settings/integrations/database-connection/components/SettingsIntegrationEditDatabaseConnectionContent.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import { getConnectionDbName } from '@/settings/integrations/utils/getConnection
2020
import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath';
2121
import { SettingsPath } from '@/types/SettingsPath';
2222
import { Info } from '@/ui/display/info/components/Info';
23+
import { SnackBarVariant } from '@/ui/feedback/snack-bar-manager/components/SnackBar';
2324
import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
2425
import { Breadcrumb } from '@/ui/navigation/bread-crumb/components/Breadcrumb';
2526
import {
@@ -91,7 +92,7 @@ export const SettingsIntegrationEditDatabaseConnectionContent = ({
9192
);
9293
} catch (error) {
9394
enqueueSnackBar((error as Error).message, {
94-
variant: 'error',
95+
variant: SnackBarVariant.Error,
9596
});
9697
}
9798
};

packages/twenty-front/src/modules/settings/profile/components/ChangePassword.tsx

+5-4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { useRecoilValue } from 'recoil';
22
import { H2Title } from 'twenty-ui';
33

44
import { currentUserState } from '@/auth/states/currentUserState';
5+
import { SnackBarVariant } from '@/ui/feedback/snack-bar-manager/components/SnackBar';
56
import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
67
import { Button } from '@/ui/input/button/components/Button';
78
import { useEmailPasswordResetLinkMutation } from '~/generated/graphql';
@@ -16,7 +17,7 @@ export const ChangePassword = () => {
1617
const handlePasswordResetClick = async () => {
1718
if (!currentUser?.email) {
1819
enqueueSnackBar('Invalid email', {
19-
variant: 'error',
20+
variant: SnackBarVariant.Error,
2021
});
2122
return;
2223
}
@@ -29,16 +30,16 @@ export const ChangePassword = () => {
2930
});
3031
if (data?.emailPasswordResetLink?.success === true) {
3132
enqueueSnackBar('Password reset link has been sent to the email', {
32-
variant: 'success',
33+
variant: SnackBarVariant.Success,
3334
});
3435
} else {
3536
enqueueSnackBar('There was some issue', {
36-
variant: 'error',
37+
variant: SnackBarVariant.Error,
3738
});
3839
}
3940
} catch (error) {
4041
enqueueSnackBar((error as Error).message, {
41-
variant: 'error',
42+
variant: SnackBarVariant.Error,
4243
});
4344
}
4445
};

packages/twenty-front/src/modules/settings/workspace/components/ToggleImpersonate.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { useRecoilState } from 'recoil';
22

33
import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
4+
import { SnackBarVariant } from '@/ui/feedback/snack-bar-manager/components/SnackBar';
45
import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
56
import { Toggle } from '@/ui/input/components/Toggle';
67
import { useUpdateWorkspaceMutation } from '~/generated/graphql';
@@ -32,7 +33,7 @@ export const ToggleImpersonate = () => {
3233
});
3334
} catch (err: any) {
3435
enqueueSnackBar(err?.message, {
35-
variant: 'error',
36+
variant: SnackBarVariant.Error,
3637
});
3738
}
3839
};

packages/twenty-front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/MatchColumnsStep.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import { setColumn } from '@/spreadsheet-import/utils/setColumn';
1212
import { setIgnoreColumn } from '@/spreadsheet-import/utils/setIgnoreColumn';
1313
import { setSubColumn } from '@/spreadsheet-import/utils/setSubColumn';
1414
import { useDialogManager } from '@/ui/feedback/dialog-manager/hooks/useDialogManager';
15+
import { SnackBarVariant } from '@/ui/feedback/snack-bar-manager/components/SnackBar';
1516
import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
1617
import { Modal } from '@/ui/layout/modal/components/Modal';
1718

@@ -170,7 +171,7 @@ export const MatchColumnsStep = <T extends string>({
170171
} else if (index === existingFieldIndex) {
171172
enqueueSnackBar('Columns cannot duplicate', {
172173
title: 'Another column unselected',
173-
variant: 'error',
174+
variant: SnackBarVariant.Error,
174175
});
175176
return setColumn(column);
176177
} else {

packages/twenty-front/src/modules/spreadsheet-import/steps/components/UploadFlow.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import { RawData } from '@/spreadsheet-import/types';
88
import { exceedsMaxRecords } from '@/spreadsheet-import/utils/exceedsMaxRecords';
99
import { mapWorkbook } from '@/spreadsheet-import/utils/mapWorkbook';
1010
import { CircularProgressBar } from '@/ui/feedback/progress-bar/components/CircularProgressBar';
11+
import { SnackBarVariant } from '@/ui/feedback/snack-bar-manager/components/SnackBar';
1112
import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
1213
import { Modal } from '@/ui/layout/modal/components/Modal';
1314

@@ -80,7 +81,7 @@ export const UploadFlow = ({ nextStep }: UploadFlowProps) => {
8081
(description: string) => {
8182
enqueueSnackBar(description, {
8283
title: 'Error',
83-
variant: 'error',
84+
variant: SnackBarVariant.Error,
8485
});
8586
},
8687
[enqueueSnackBar],

packages/twenty-front/src/modules/spreadsheet-import/steps/components/UploadStep/components/DropZone.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import * as XLSX from 'xlsx-ugnis';
55

66
import { useSpreadsheetImportInternal } from '@/spreadsheet-import/hooks/useSpreadsheetImportInternal';
77
import { readFileAsync } from '@/spreadsheet-import/utils/readFilesAsync';
8+
import { SnackBarVariant } from '@/ui/feedback/snack-bar-manager/components/SnackBar';
89
import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
910
import { MainButton } from '@/ui/input/button/components/MainButton';
1011

@@ -114,7 +115,7 @@ export const DropZone = ({ onContinue, isLoading }: DropZoneProps) => {
114115
fileRejections.forEach((fileRejection) => {
115116
enqueueSnackBar(fileRejection.errors[0].message, {
116117
title: `${fileRejection.file.name} upload rejected`,
117-
variant: 'error',
118+
variant: SnackBarVariant.Error,
118119
});
119120
});
120121
},

0 commit comments

Comments
 (0)