Revert "Prefill Relation Fields with Initiating Object Icon and Name (t…

…wentyhq#7363)" This reverts commit e45e45d.
ehconitin · Oct 11, 2024 · da9c079 · da9c079
1 parent 7ceaa87
commit da9c079
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 96 deletions.
diff --git a/...dules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx b/...dules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx
@@ -3,14 +3,10 @@ import { Controller, useFormContext } from 'react-hook-form';
 import { z } from 'zod';
 
 import { FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
-import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 import { fieldMetadataItemSchema } from '@/object-metadata/validation-schemas/fieldMetadataItemSchema';
 import { getErrorMessageFromError } from '@/settings/data-model/fields/forms/utils/errorMessages';
-import { RelationType } from '@/settings/data-model/types/RelationType';
 import { IconPicker } from '@/ui/input/components/IconPicker';
 import { TextInput } from '@/ui/input/components/TextInput';
-import { useEffect, useState } from 'react';
-import { RelationDefinitionType } from '~/generated-metadata/graphql';
 
 export const settingsDataModelFieldIconLabelFormSchema = (
   existingOtherLabels: string[] = [],
@@ -36,47 +32,19 @@ type SettingsDataModelFieldIconLabelFormProps = {
   disabled?: boolean;
   fieldMetadataItem?: FieldMetadataItem;
   maxLength?: number;
-  relationObjectMetadataItem?: ObjectMetadataItem;
-  relationType?: RelationType;
 };
 
 export const SettingsDataModelFieldIconLabelForm = ({
   disabled,
   fieldMetadataItem,
   maxLength,
-  relationObjectMetadataItem,
-  relationType,
 }: SettingsDataModelFieldIconLabelFormProps) => {
   const {
     control,
     trigger,
     formState: { errors },
-    setValue,
   } = useFormContext<SettingsDataModelFieldIconLabelFormValues>();
 
-  const [labelEditedManually, setLabelEditedManually] = useState(false);
-  const [iconEditedManually, setIconEditedManually] = useState(false);
-
-  useEffect(() => {
-    if (labelEditedManually) return;
-    const label = [
-      RelationDefinitionType.ManyToOne,
-      RelationDefinitionType.ManyToMany,
-    ].includes(relationType ?? RelationDefinitionType.OneToMany)
-      ? relationObjectMetadataItem?.labelPlural
-      : relationObjectMetadataItem?.labelSingular;
-    setValue('label', label ?? '');
-
-    if (iconEditedManually) return;
-    setValue('icon', relationObjectMetadataItem?.icon ?? 'IconUsers');
-  }, [
-    labelEditedManually,
-    iconEditedManually,
-    relationObjectMetadataItem,
-    setValue,
-    relationType,
-  ]);
-
   return (
     <StyledInputsContainer>
       <Controller
@@ -87,10 +55,7 @@ export const SettingsDataModelFieldIconLabelForm = ({
           <IconPicker
             disabled={disabled}
             selectedIconKey={value ?? ''}
-            onChange={({ iconKey }) => {
-              setIconEditedManually(true);
-              onChange(iconKey);
-            }}
+            onChange={({ iconKey }) => onChange(iconKey)}
             variant="primary"
           />
         )}
@@ -104,7 +69,6 @@ export const SettingsDataModelFieldIconLabelForm = ({
             placeholder="Employees"
             value={value}
             onChange={(e) => {
-              setLabelEditedManually(true);
               onChange(e);
               trigger('label');
             }}

diff --git a/...ttings/data-model/fields/forms/relation/components/SettingsDataModelFieldRelationForm.tsx b/...ttings/data-model/fields/forms/relation/components/SettingsDataModelFieldRelationForm.tsx
@@ -10,13 +10,11 @@ import { fieldMetadataItemSchema } from '@/object-metadata/validation-schemas/fi
 import { FIELD_NAME_MAXIMUM_LENGTH } from '@/settings/data-model/constants/FieldNameMaximumLength';
 import { RELATION_TYPES } from '@/settings/data-model/constants/RelationTypes';
 import { useRelationSettingsFormInitialValues } from '@/settings/data-model/fields/forms/relation/hooks/useRelationSettingsFormInitialValues';
-import { SettingsDataModelFieldPreviewCardProps } from '@/settings/data-model/fields/preview/components/SettingsDataModelFieldPreviewCard';
 import { RelationType } from '@/settings/data-model/types/RelationType';
 import { IconPicker } from '@/ui/input/components/IconPicker';
 import { Select } from '@/ui/input/components/Select';
 import { TextInput } from '@/ui/input/components/TextInput';
 import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';
-import { useEffect, useState } from 'react';
 import { RelationDefinitionType } from '~/generated-metadata/graphql';
 
 export const settingsDataModelFieldRelationFormSchema = z.object({
@@ -41,7 +39,6 @@ export type SettingsDataModelFieldRelationFormValues = z.infer<
 
 type SettingsDataModelFieldRelationFormProps = {
   fieldMetadataItem: Pick<FieldMetadataItem, 'type'>;
-  objectMetadataItem: SettingsDataModelFieldPreviewCardProps['objectMetadataItem'];
 };
 
 const StyledContainer = styled.div`
@@ -82,49 +79,26 @@ const RELATION_TYPE_OPTIONS = Object.entries(RELATION_TYPES)
 
 export const SettingsDataModelFieldRelationForm = ({
   fieldMetadataItem,
-  objectMetadataItem,
 }: SettingsDataModelFieldRelationFormProps) => {
-  const {
-    control,
-    watch: watchFormValue,
-    setValue,
-  } = useFormContext<SettingsDataModelFieldRelationFormValues>();
+  const { control, watch: watchFormValue } =
+    useFormContext<SettingsDataModelFieldRelationFormValues>();
   const { getIcon } = useIcons();
   const { objectMetadataItems, findObjectMetadataItemById } =
     useFilteredObjectMetadataItems();
 
-  const [labelEditedManually, setLabelEditedManually] = useState(false);
-
   const {
     disableFieldEdition,
     disableRelationEdition,
     initialRelationFieldMetadataItem,
     initialRelationObjectMetadataItem,
     initialRelationType,
-  } = useRelationSettingsFormInitialValues({
-    fieldMetadataItem,
-    objectMetadataItem,
-  });
+  } = useRelationSettingsFormInitialValues({ fieldMetadataItem });
 
   const selectedObjectMetadataItem = findObjectMetadataItemById(
     watchFormValue('relation.objectMetadataId'),
   );
 
   const isMobile = useIsMobile();
-  const relationType = watchFormValue('relation.type');
-
-  useEffect(() => {
-    if (labelEditedManually) return;
-    setValue(
-      'relation.field.label',
-      [
-        RelationDefinitionType.ManyToMany,
-        RelationDefinitionType.ManyToOne,
-      ].includes(relationType)
-        ? objectMetadataItem.labelPlural
-        : objectMetadataItem.labelSingular,
-    );
-  }, [labelEditedManually, objectMetadataItem, relationType, setValue]);
 
   return (
     <StyledContainer>
@@ -195,10 +169,7 @@ export const SettingsDataModelFieldRelationForm = ({
               disabled={disableFieldEdition}
               placeholder="Field name"
               value={value}
-              onChange={(newValue) => {
-                setLabelEditedManually(true);
-                onChange(newValue);
-              }}
+              onChange={onChange}
               fullWidth
               maxLength={FIELD_NAME_MAXIMUM_LENGTH}
             />

diff --git a/...model/fields/forms/relation/components/SettingsDataModelFieldRelationSettingsFormCard.tsx b/...model/fields/forms/relation/components/SettingsDataModelFieldRelationSettingsFormCard.tsx
@@ -114,7 +114,6 @@ export const SettingsDataModelFieldRelationSettingsFormCard = ({
       form={
         <SettingsDataModelFieldRelationForm
           fieldMetadataItem={fieldMetadataItem}
-          objectMetadataItem={objectMetadataItem}
         />
       }
     />

diff --git a/...s/settings/data-model/fields/forms/relation/hooks/useRelationSettingsFormInitialValues.ts b/...s/settings/data-model/fields/forms/relation/hooks/useRelationSettingsFormInitialValues.ts
@@ -2,17 +2,15 @@ import { useMemo } from 'react';
 
 import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';
 import { useGetRelationMetadata } from '@/object-metadata/hooks/useGetRelationMetadata';
+import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
 import { FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
 import { isObjectMetadataAvailableForRelation } from '@/object-metadata/utils/isObjectMetadataAvailableForRelation';
-import { SettingsDataModelFieldPreviewCardProps } from '@/settings/data-model/fields/preview/components/SettingsDataModelFieldPreviewCard';
 import { RelationDefinitionType } from '~/generated-metadata/graphql';
 
 export const useRelationSettingsFormInitialValues = ({
   fieldMetadataItem,
-  objectMetadataItem,
 }: {
   fieldMetadataItem?: Pick<FieldMetadataItem, 'type' | 'relationDefinition'>;
-  objectMetadataItem?: SettingsDataModelFieldPreviewCardProps['objectMetadataItem'];
 }) => {
   const { objectMetadataItems } = useFilteredObjectMetadataItems();
 
@@ -30,13 +28,11 @@ export const useRelationSettingsFormInitialValues = ({
   const initialRelationObjectMetadataItem = useMemo(
     () =>
       relationObjectMetadataItemFromFieldMetadata ??
-      objectMetadataItem ??
+      objectMetadataItems.find(
+        ({ nameSingular }) => nameSingular === CoreObjectNameSingular.Person,
+      ) ??
       objectMetadataItems.filter(isObjectMetadataAvailableForRelation)[0],
-    [
-      objectMetadataItem,
-      objectMetadataItems,
-      relationObjectMetadataItemFromFieldMetadata,
-    ],
+    [objectMetadataItems, relationObjectMetadataItemFromFieldMetadata],
   );
 
   const initialRelationType =
@@ -48,12 +44,7 @@ export const useRelationSettingsFormInitialValues = ({
     disableRelationEdition: !!relationFieldMetadataItem,
     initialRelationFieldMetadataItem: relationFieldMetadataItem ?? {
       icon: initialRelationObjectMetadataItem.icon ?? 'IconUsers',
-      label: [
-        RelationDefinitionType.ManyToMany,
-        RelationDefinitionType.ManyToOne,
-      ].includes(initialRelationType)
-        ? initialRelationObjectMetadataItem.labelPlural
-        : initialRelationObjectMetadataItem.labelSingular,
+      label: '',
     },
     initialRelationObjectMetadataItem,
     initialRelationType,

diff --git a/.../src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx b/.../src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx
@@ -2,7 +2,6 @@ import { useCreateOneRelationMetadataItem } from '@/object-metadata/hooks/useCre
 import { useFieldMetadataItem } from '@/object-metadata/hooks/useFieldMetadataItem';
 import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
-import { FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
 import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
 import { RecordFieldValueSelectorContextProvider } from '@/object-record/record-store/contexts/RecordFieldValueSelectorContext';
 import { SaveAndCancelButtons } from '@/settings/components/SaveAndCancelButtons/SaveAndCancelButtons';
@@ -48,7 +47,6 @@ export const SettingsObjectNewFieldConfigure = () => {
 
   const { findActiveObjectMetadataItemBySlug } =
     useFilteredObjectMetadataItems();
-
   const activeObjectMetadataItem =
     findActiveObjectMetadataItemBySlug(objectSlug);
   const { createMetadataField } = useFieldMetadataItem();
@@ -69,13 +67,6 @@ export const SettingsObjectNewFieldConfigure = () => {
     },
   });
 
-  const fieldMetadataItem: Pick<FieldMetadataItem, 'icon' | 'label' | 'type'> =
-    {
-      icon: formConfig.watch('icon'),
-      label: formConfig.watch('label') || 'Employees',
-      type: formConfig.watch('type'),
-    };
-
   const [, setObjectViews] = useState<View[]>([]);
   const [, setRelationObjectViews] = useState<View[]>([]);
 
@@ -209,7 +200,11 @@ export const SettingsObjectNewFieldConfigure = () => {
               <H2Title title="Values" description="The values of this field" />
               <SettingsDataModelFieldSettingsFormCard
                 isCreatingField
-                fieldMetadataItem={fieldMetadataItem}
+                fieldMetadataItem={{
+                  icon: formConfig.watch('icon'),
+                  label: formConfig.watch('label') || 'New Field',
+                  type: fieldType as FieldMetadataType,
+                }}
                 objectMetadataItem={activeObjectMetadataItem}
               />
             </Section>