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

Fix addition of new option in select field if there are no existing options (#6718)

Browse Source 
Fixes
[sentry](https://twenty-v7.sentry.io/issues/5745628875/?alert_rule_id=15135099&alert_type=issue&notification_uuid=95108411-b431-4abd-bdd6-687c96a7353e&project=4507072563183616&referrer=discord)
This commit is contained in:
Marie
2024-08-23 12:13:49 +02:00
committed by GitHub
parent 4c5fc2311f
commit 981f311ed0
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/twenty-front/src/modules/settings/data-model/fields/forms/select/utils/generateNewSelectOption.ts
View File

@ -11,7 +11,7 @@ export const generateNewSelectOption = (
const newOptionLabel = generateNewSelectOptionLabel(options); const newOptionLabel = generateNewSelectOptionLabel(options);
return { return {
color: getNextThemeColor(options[options.length - 1].color), color: getNextThemeColor(options[options.length - 1]?.color),
id: v4(), id: v4(),
label: newOptionLabel, label: newOptionLabel,
position: options.length, position: options.length,

5
packages/twenty-ui/src/theme/utils/__tests__/getNextThemeColor.test.ts
View File

@ -20,4 +20,9 @@ describe('getNextThemeColor', () => {
expect(getNextThemeColor(currentColor)).toBe(nextColor); expect(getNextThemeColor(currentColor)).toBe(nextColor);
}); });
it('returns the first color when currentColorIsUndefined', () => {
const firstColor: ThemeColor = MAIN_COLOR_NAMES[0];
expect(getNextThemeColor(undefined)).toBe(firstColor);
});
}); });

6
packages/twenty-ui/src/theme/utils/getNextThemeColor.ts
View File

@ -1,6 +1,10 @@
import { MAIN_COLOR_NAMES, ThemeColor } from '@ui/theme'; import { MAIN_COLOR_NAMES, ThemeColor } from '@ui/theme';
import { isDefined } from '@ui/utilities';
export const getNextThemeColor = (currentColor: ThemeColor): ThemeColor => { export const getNextThemeColor = (currentColor?: ThemeColor): ThemeColor => {
if (!isDefined(currentColor)) {
return MAIN_COLOR_NAMES[0];
}
const currentColorIndex = MAIN_COLOR_NAMES.findIndex( const currentColorIndex = MAIN_COLOR_NAMES.findIndex(
(color) => color === currentColor, (color) => color === currentColor,
); );