Allow standard field default value and settings editing (#7104) (#8559)

Co-authored-by: Marie Stoppa <[email protected]>
twentyhq · Nov 26, 2024 · 2e75fae · 2e75fae
1 parent 7bde200
commit 2e75fae
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 62 deletions.
diff --git a/...settings/data-model/fields/forms/boolean/components/SettingsDataModelFieldBooleanForm.tsx b/...settings/data-model/fields/forms/boolean/components/SettingsDataModelFieldBooleanForm.tsx
@@ -5,7 +5,6 @@ import { z } from 'zod';
 import { FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
 import { SettingsOptionCardContentSelect } from '@/settings/components/SettingsOptions/SettingsOptionCardContentSelect';
 import { useBooleanSettingsFormInitialValues } from '@/settings/data-model/fields/forms/boolean/hooks/useBooleanSettingsFormInitialValues';
-import { isDefined } from '~/utils/isDefined';
 
 export const settingsDataModelFieldBooleanFormSchema = z.object({
   defaultValue: z.boolean(),
@@ -26,7 +25,6 @@ export const SettingsDataModelFieldBooleanForm = ({
 }: SettingsDataModelFieldBooleanFormProps) => {
   const { control } = useFormContext<SettingsDataModelFieldBooleanFormValues>();
 
-  const isEditMode = isDefined(fieldMetadataItem?.defaultValue);
   const { initialDefaultValue } = useBooleanSettingsFormInitialValues({
     fieldMetadataItem,
   });
@@ -44,9 +42,6 @@ export const SettingsDataModelFieldBooleanForm = ({
           value={value}
           onChange={onChange}
           selectClassName={className}
-          // TODO: temporary fix - disabling edition because after editing the defaultValue,
-          // newly created records are not taking into account the updated defaultValue properly.
-          disabled={isEditMode}
           dropdownId="object-field-default-value-select-boolean"
           options={[
             {

diff --git a/...es/settings/data-model/fields/forms/components/SettingsDataModelFieldSettingsFormCard.tsx b/...es/settings/data-model/fields/forms/components/SettingsDataModelFieldSettingsFormCard.tsx
@@ -99,7 +99,6 @@ export const settingsDataModelFieldSettingsFormSchema = z.discriminatedUnion(
 );
 
 type SettingsDataModelFieldSettingsFormCardProps = {
-  isCreatingField?: boolean;
   fieldMetadataItem: Pick<
     FieldMetadataItem,
     'icon' | 'label' | 'type' | 'isCustom'
@@ -132,7 +131,6 @@ const previewableTypes = [
 ];
 
 export const SettingsDataModelFieldSettingsFormCard = ({
-  isCreatingField,
   fieldMetadataItem,
   objectMetadataItem,
 }: SettingsDataModelFieldSettingsFormCardProps) => {
@@ -152,7 +150,6 @@ export const SettingsDataModelFieldSettingsFormCard = ({
   if (fieldMetadataItem.type === FieldMetadataType.Currency) {
     return (
       <SettingsDataModelFieldCurrencySettingsFormCard
-        disabled={!isCreatingField}
         fieldMetadataItem={fieldMetadataItem}
         objectMetadataItem={objectMetadataItem}
       />
@@ -165,7 +162,6 @@ export const SettingsDataModelFieldSettingsFormCard = ({
   ) {
     return (
       <SettingsDataModelFieldDateSettingsFormCard
-        disabled={!isCreatingField}
         fieldMetadataItem={fieldMetadataItem}
         objectMetadataItem={objectMetadataItem}
       />
@@ -184,7 +180,6 @@ export const SettingsDataModelFieldSettingsFormCard = ({
   if (fieldMetadataItem.type === FieldMetadataType.Number) {
     return (
       <SettingsDataModelFieldNumberSettingsFormCard
-        disabled={fieldMetadataItem.isCustom === false}
         fieldMetadataItem={fieldMetadataItem}
         objectMetadataItem={objectMetadataItem}
       />

diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx
@@ -18,7 +18,6 @@ import { useFieldMetadataItem } from '@/object-metadata/hooks/useFieldMetadataIt
 import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';
 import { useGetRelationMetadata } from '@/object-metadata/hooks/useGetRelationMetadata';
 import { useUpdateOneFieldMetadataItem } from '@/object-metadata/hooks/useUpdateOneFieldMetadataItem';
-import { FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
 import { formatFieldMetadataItemInput } from '@/object-metadata/utils/formatFieldMetadataItemInput';
 import { getFieldSlug } from '@/object-metadata/utils/getFieldSlug';
 import { isLabelIdentifierField } from '@/object-metadata/utils/isLabelIdentifierField';
@@ -47,16 +46,6 @@ type SettingsDataModelFieldEditFormValues = z.infer<
 > &
   any;
 
-const canPersistFieldMetadataItemUpdate = (
-  fieldMetadataItem: FieldMetadataItem,
-) => {
-  return (
-    fieldMetadataItem.isCustom ||
-    fieldMetadataItem.type === FieldMetadataType.Select ||
-    fieldMetadataItem.type === FieldMetadataType.MultiSelect
-  );
-};
-
 export const SettingsObjectFieldEdit = () => {
   const navigate = useNavigate();
   const { enqueueSnackBar } = useSnackBar();
@@ -179,9 +168,6 @@ export const SettingsObjectFieldEdit = () => {
     navigate(`/settings/objects/${objectSlug}`);
   };
 
-  const shouldDisplaySaveAndCancel =
-    canPersistFieldMetadataItemUpdate(fieldMetadataItem);
-
   return (
     <RecordFieldValueSelectorContextProvider>
       {/* eslint-disable-next-line react/jsx-props-no-spreading */}
@@ -206,14 +192,12 @@ export const SettingsObjectFieldEdit = () => {
             },
           ]}
           actionButton={
-            shouldDisplaySaveAndCancel && (
-              <SaveAndCancelButtons
-                isSaveDisabled={!canSave}
-                isCancelDisabled={isSubmitting}
-                onCancel={() => navigate(`/settings/objects/${objectSlug}`)}
-                onSave={formConfig.handleSubmit(handleSave)}
-              />
-            )
+            <SaveAndCancelButtons
+              isSaveDisabled={!canSave}
+              isCancelDisabled={isSubmitting}
+              onCancel={() => navigate(`/settings/objects/${objectSlug}`)}
+              onSave={formConfig.handleSubmit(handleSave)}
+            />
           }
         >
           <SettingsPageContainer>

diff --git a/.../src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx b/.../src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx
@@ -209,7 +209,6 @@ export const SettingsObjectNewFieldConfigure = () => {
             <Section>
               <H2Title title="Values" description="The values of this field" />
               <SettingsDataModelFieldSettingsFormCard
-                isCreatingField
                 fieldMetadataItem={{
                   icon: formConfig.watch('icon'),
                   label: formConfig.watch('label') || 'New Field',

diff --git a/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.service.ts b/packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.service.ts
@@ -632,23 +632,25 @@ export class FieldMetadataService extends TypeOrmQueryService<FieldMetadataEntit
     fieldMetadataInput: UpdateFieldInput,
     existingFieldMetadata: FieldMetadataEntity,
   ) {
-    let fieldMetadataInputOverrided = {};
-
-    fieldMetadataInputOverrided = {
+    const updatableStandardFieldInput: UpdateFieldInput = {
       id: fieldMetadataInput.id,
       isActive: fieldMetadataInput.isActive,
       workspaceId: fieldMetadataInput.workspaceId,
       defaultValue: fieldMetadataInput.defaultValue,
+      settings: fieldMetadataInput.settings,
     };
 
-    if (existingFieldMetadata.type === FieldMetadataType.SELECT) {
-      fieldMetadataInputOverrided = {
-        ...fieldMetadataInputOverrided,
+    if (
+      existingFieldMetadata.type === FieldMetadataType.SELECT ||
+      existingFieldMetadata.type === FieldMetadataType.MULTI_SELECT
+    ) {
+      return {
+        ...updatableStandardFieldInput,
         options: fieldMetadataInput.options,
       };
     }
 
-    return fieldMetadataInputOverrided as UpdateFieldInput;
+    return updatableStandardFieldInput;
   }
 
   public async getRelationDefinitionFromRelationMetadata(

diff --git a/...ngine/workspace-manager/workspace-sync-metadata/comparators/workspace-field.comparator.ts b/...ngine/workspace-manager/workspace-sync-metadata/comparators/workspace-field.comparator.ts
@@ -8,10 +8,7 @@ import {
 } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/comparator.interface';
 import { ComputedPartialFieldMetadata } from 'src/engine/workspace-manager/workspace-sync-metadata/interfaces/partial-field-metadata.interface';
 
-import {
-  FieldMetadataEntity,
-  FieldMetadataType,
-} from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
+import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
 import { transformMetadataForComparison } from 'src/engine/workspace-manager/workspace-sync-metadata/comparators/utils/transform-metadata-for-comparison.util';
 
 const commonFieldPropertiesToIgnore = [
@@ -26,6 +23,7 @@ const commonFieldPropertiesToIgnore = [
   'gate',
   'asExpression',
   'generatedType',
+  'defaultValue',
 ];
 
 const fieldPropertiesToStringify = ['defaultValue'] as const;
@@ -57,19 +55,11 @@ export class WorkspaceFieldComparator {
     const originalFieldMetadataMap = transformMetadataForComparison(
       filteredOriginalFieldCollection,
       {
-        shouldIgnoreProperty: (property, originalMetadata) => {
+        shouldIgnoreProperty: (property) => {
           if (commonFieldPropertiesToIgnore.includes(property)) {
             return true;
           }
 
-          if (
-            originalMetadata &&
-            property === 'defaultValue' &&
-            originalMetadata.type === FieldMetadataType.SELECT
-          ) {
-            return true;
-          }
-
           return false;
         },
         propertiesToStringify: fieldPropertiesToStringify,
@@ -82,19 +72,11 @@ export class WorkspaceFieldComparator {
     const standardFieldMetadataMap = transformMetadataForComparison(
       standardFieldMetadataCollection,
       {
-        shouldIgnoreProperty: (property, originalMetadata) => {
+        shouldIgnoreProperty: (property) => {
           if (commonFieldPropertiesToIgnore.includes(property)) {
             return true;
           }
 
-          if (
-            originalMetadata &&
-            property === 'defaultValue' &&
-            originalMetadata.type === FieldMetadataType.SELECT
-          ) {
-            return true;
-          }
-
           return false;
         },
         propertiesToStringify: fieldPropertiesToStringify,