From f2aa67b7e518681f8a7ed49d67ea2ebbf29e0227 Mon Sep 17 00:00:00 2001
From: Us3r-gitHub <58467104+Us3r-gitHub@users.noreply.github.com>
Date: Wed, 7 Aug 2024 10:32:37 -0400
Subject: [PATCH] feat: Set preselect field type on new field of object page
 (#6314)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

#5661

---------

Co-authored-by: Achsan <achsanh@gmail.com>
Co-authored-by: Félix Malfait <felix.malfait@gmail.com>
---
 .../view-picker/hooks/useGetAvailableFieldsForKanban.ts    | 2 +-
 .../SettingsObjectNewField/SettingsObjectNewFieldStep2.tsx | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/twenty-front/src/modules/views/view-picker/hooks/useGetAvailableFieldsForKanban.ts b/packages/twenty-front/src/modules/views/view-picker/hooks/useGetAvailableFieldsForKanban.ts
index 0f47fcc78..1c595472b 100644
--- a/packages/twenty-front/src/modules/views/view-picker/hooks/useGetAvailableFieldsForKanban.ts
+++ b/packages/twenty-front/src/modules/views/view-picker/hooks/useGetAvailableFieldsForKanban.ts
@@ -37,7 +37,7 @@ export const useGetAvailableFieldsForKanban = () => {
       navigate(
         `/settings/objects/${getObjectSlug(
           objectMetadataItem,
-        )}/new-field/step-2`,
+        )}/new-field/step-2?fieldType=${FieldMetadataType.Select}`,
       );
     } else {
       navigate(`/settings/objects`);
diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldStep2.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldStep2.tsx
index b70ada9a1..53ee908a2 100644
--- a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldStep2.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldStep2.tsx
@@ -4,7 +4,7 @@ import { zodResolver } from '@hookform/resolvers/zod';
 import pick from 'lodash.pick';
 import { useEffect, useState } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
-import { useNavigate, useParams } from 'react-router-dom';
+import { useNavigate, useParams, useSearchParams } from 'react-router-dom';
 import { H2Title, IconSettings } from 'twenty-ui';
 import { z } from 'zod';
 
@@ -48,6 +48,8 @@ const StyledSettingsObjectFieldTypeSelect = styled(
 export const SettingsObjectNewFieldStep2 = () => {
   const navigate = useNavigate();
   const { objectSlug = '' } = useParams();
+  const [searchParams] = useSearchParams();
+  const fieldType = searchParams.get('fieldType') as SettingsSupportedFieldType;
   const { enqueueSnackBar } = useSnackBar();
 
   const { findActiveObjectMetadataItemBySlug } =
@@ -211,6 +213,9 @@ export const SettingsObjectNewFieldStep2 = () => {
               />
               <StyledSettingsObjectFieldTypeSelect
                 excludedFieldTypes={excludedFieldTypes}
+                fieldMetadataItem={{
+                  type: fieldType,
+                }}
               />
               <SettingsDataModelFieldSettingsFormCard
                 fieldMetadataItem={{