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

fix: fix Select field preview (#4507)

Browse Source 
* fix: fix Select field preview

Closes #4084

* fix: fix field preview utils tests
This commit is contained in:
Thaïs
2024-03-25 16:37:41 +01:00
committed by GitHub
parent 2ae59a801f
commit 61e5d5bcb9
8 changed files with 33 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldSelectValue.ts
View File

@ -1,7 +1,8 @@
import { isString } from '@sniptt/guards';
import { FieldSelectValue } from '@/object-record/record-field/types/FieldMetadata';
import { selectFieldValueSchema } from '@/object-record/record-field/validation-schemas/selectFieldValueSchema';
export const isFieldSelectValue = (
fieldValue: unknown,
): fieldValue is FieldSelectValue => isString(fieldValue);
options?: string[],
): fieldValue is FieldSelectValue =>
selectFieldValueSchema(options).safeParse(fieldValue).success;

17
packages/twenty-front/src/modules/object-record/record-field/utils/isFieldValueEmpty.ts
View File

@ -12,7 +12,6 @@ import { isFieldLinkValue } from '@/object-record/record-field/types/guards/isFi
import { isFieldNumber } from '@/object-record/record-field/types/guards/isFieldNumber';
import { isFieldRating } from '@/object-record/record-field/types/guards/isFieldRating';
import { isFieldRelation } from '@/object-record/record-field/types/guards/isFieldRelation';
import { isFieldRelationValue } from '@/object-record/record-field/types/guards/isFieldRelationValue';
import { isFieldSelect } from '@/object-record/record-field/types/guards/isFieldSelect';
import { isFieldSelectValue } from '@/object-record/record-field/types/guards/isFieldSelectValue';
import { isFieldText } from '@/object-record/record-field/types/guards/isFieldText';
@ -24,9 +23,11 @@ const isValueEmpty = (value: unknown) => !isDefined(value) || value === '';
export const isFieldValueEmpty = ({
fieldDefinition,
fieldValue,
selectOptionValues,
}: {
fieldDefinition: Pick<FieldDefinition<FieldMetadata>, 'type'>;
fieldValue: unknown;
selectOptionValues?: string[];
}) => {
if (
isFieldUuid(fieldDefinition) ||
@ -35,18 +36,18 @@ export const isFieldValueEmpty = ({
isFieldNumber(fieldDefinition) ||
isFieldRating(fieldDefinition) ||
isFieldEmail(fieldDefinition) ||
isFieldBoolean(fieldDefinition)
isFieldBoolean(fieldDefinition) ||
isFieldRelation(fieldDefinition)
//|| isFieldPhone(fieldDefinition)
) {
return isValueEmpty(fieldValue);
}
if (isFieldRelation(fieldDefinition)) {
return isFieldRelationValue(fieldValue) && isValueEmpty(fieldValue);
}
if (isFieldSelect(fieldDefinition)) {
return isFieldSelectValue(fieldValue) && !isDefined(fieldValue);
return (
!isFieldSelectValue(fieldValue, selectOptionValues) ||
!isDefined(fieldValue)
);
}
if (isFieldCurrency(fieldDefinition)) {
@ -68,6 +69,6 @@ export const isFieldValueEmpty = ({
}
throw new Error(
`Entity field type not supported in isEntityFieldEditModeEmptyFamilySelector : ${fieldDefinition.type}}`,
`Entity field type not supported in isFieldValueEmpty : ${fieldDefinition.type}}`,
);
};

10
packages/twenty-front/src/modules/object-record/record-field/validation-schemas/selectFieldValueSchema.ts Normal file
View File

@ -0,0 +1,10 @@
import { z } from 'zod';
import { FieldSelectValue } from '@/object-record/record-field/types/FieldMetadata';
export const selectFieldValueSchema = (
options?: string[],
): z.ZodType<FieldSelectValue> =>
options?.length
? z.enum(options as [string, ...string[]]).nullable()
: z.string().nullable();

2
packages/twenty-front/src/modules/settings/data-model/fields/preview/hooks/useFieldPreview.ts
View File

@ -55,11 +55,13 @@ export const useFieldPreview = ({
})
: null;
const selectOptionValues = selectOptions?.map((option) => option.value);
const isValueFromFirstRecord =
firstRecord &&
!isFieldValueEmpty({
fieldDefinition: { type: fieldMetadataItem.type },
fieldValue: fieldPreviewValueFromFirstRecord,
selectOptionValues,
});
const { records: relationRecords } = useFindManyRecords({

6
packages/twenty-front/src/modules/settings/data-model/utils/__tests__/getFieldDefaultPreviewValue.test.ts
View File

@ -37,7 +37,7 @@ describe('getFieldDefaultPreviewValue', () => {
});
// Then
expect(result).toEqual(selectOptions[1]);
expect(result).toEqual(selectOptions[1].value);
});
it('returns the first select option if no default option was found', () => {
@ -46,7 +46,7 @@ describe('getFieldDefaultPreviewValue', () => {
const fieldMetadataItem = mockedCompanyObjectMetadataItem.fields.find(
({ name }) => name === 'industry',
)!;
const selectOptions = [
const selectOptions: SettingsObjectFieldSelectFormValues = [
{
color: 'purple' as const,
label: '🏭 Industry',
@ -67,7 +67,7 @@ describe('getFieldDefaultPreviewValue', () => {
});
// Then
expect(result).toEqual(selectOptions[0]);
expect(result).toEqual(selectOptions[0].value);
});
});

2
packages/twenty-front/src/modules/settings/data-model/utils/__tests__/getFieldPreviewValueFromRecord.test.ts
View File

@ -42,7 +42,7 @@ describe('getFieldPreviewValueFromRecord', () => {
});
// Then
expect(result).toEqual(selectOptions[2]);
expect(result).toEqual(selectOptions[2].value);
});
it('returns undefined if the select option was not found', () => {

4
packages/twenty-front/src/modules/settings/data-model/utils/getFieldDefaultPreviewValue.ts
View File

@ -26,7 +26,9 @@ export const getFieldDefaultPreviewValue = ({
fieldMetadataItem.type === FieldMetadataType.Select &&
isDefined(selectOptions)
) {
return selectOptions.find(({ isDefault }) => isDefault) || selectOptions[0];
const defaultSelectOption =
selectOptions.find(({ isDefault }) => isDefault) || selectOptions[0];
return defaultSelectOption.value;
}
// Relation field

2
packages/twenty-front/src/modules/settings/data-model/utils/getFieldPreviewValueFromRecord.ts
View File

@ -18,7 +18,7 @@ export const getFieldPreviewValueFromRecord = ({
if (fieldMetadataItem.type === FieldMetadataType.Select) {
return selectOptions?.find(
(selectOption) => selectOption.value === recordFieldValue,
);
)?.value;
}
// Relation fields (to many)