fix: fix Select field preview

Closes #4084
twentyhq · Mar 15, 2024 · 8b6fe8a · 8b6fe8a
1 parent d968de2
commit 8b6fe8a
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 13 deletions.
diff --git a/...es/twenty-front/src/modules/object-record/record-field/types/guards/isFieldSelectValue.ts b/...es/twenty-front/src/modules/object-record/record-field/types/guards/isFieldSelectValue.ts
@@ -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;
diff --git a/packages/twenty-front/src/modules/object-record/record-field/utils/isFieldValueEmpty.ts b/packages/twenty-front/src/modules/object-record/record-field/utils/isFieldValueEmpty.ts
@@ -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}}`,
   );
 };
diff --git a/...front/src/modules/object-record/record-field/validation-schemas/selectFieldValueSchema.ts b/...front/src/modules/object-record/record-field/validation-schemas/selectFieldValueSchema.ts
@@ -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();
diff --git a/...ages/twenty-front/src/modules/settings/data-model/fields/preview/hooks/useFieldPreview.ts b/...ages/twenty-front/src/modules/settings/data-model/fields/preview/hooks/useFieldPreview.ts
@@ -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({

diff --git a/packages/twenty-front/src/modules/settings/data-model/utils/getFieldDefaultPreviewValue.ts b/packages/twenty-front/src/modules/settings/data-model/utils/getFieldDefaultPreviewValue.ts
@@ -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

diff --git a/...ages/twenty-front/src/modules/settings/data-model/utils/getFieldPreviewValueFromRecord.ts b/...ages/twenty-front/src/modules/settings/data-model/utils/getFieldPreviewValueFromRecord.ts
@@ -18,7 +18,7 @@ export const getFieldPreviewValueFromRecord = ({
   if (fieldMetadataItem.type === FieldMetadataType.Select) {
     return selectOptions?.find(
       (selectOption) => selectOption.value === recordFieldValue,
-    );
+    )?.value;
   }
 
   // Relation fields (to many)