Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: Set preselect field type on new field of object page #6314

Merged
merged 8 commits into from
Aug 7, 2024
Merged

feat: Set preselect field type on new field of object page #6314

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f079dc2
feat: Set preselect field type on new field of object page
aikuci Jul 17, 2024
ca591b3
chore: merge main
aikuci Jul 23, 2024
f3d6ea3
feat: Implement navigationMemorizedUrlState for navigation
aikuci Jul 23, 2024
d69d345
feat: Implement navigate(-1) instead
aikuci Jul 23, 2024
acb1811
Merge branch 'main' into feat/kanban/issue-5661/set-preselect-field
FelixMalfait Aug 7, 2024
72722d9
Remove navigateBack
FelixMalfait Aug 7, 2024
22bdde0
Type
FelixMalfait Aug 7, 2024
53641e1
syntax
FelixMalfait Aug 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/twenty-front/src/modules/views/view-picker/hooks/useGetAvailableFieldsForKanban.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`);
Expand Down
7 changes: 6 additions & 1 deletion ...ront/src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldStep2.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down Expand Up @@ -48,6 +48,8 @@ const StyledSettingsObjectFieldTypeSelect = styled(
export const SettingsObjectNewFieldStep2 = () => {
const navigate = useNavigate();
const { objectSlug = '' } = useParams();
const [searchParams] = useSearchParams();
const fieldType = searchParams.get('fieldType');
const { enqueueSnackBar } = useSnackBar();

const { findActiveObjectMetadataItemBySlug } =
Expand Down Expand Up @@ -214,6 +216,9 @@ export const SettingsObjectNewFieldStep2 = () => {
/>
<StyledSettingsObjectFieldTypeSelect
excludedFieldTypes={excludedFieldTypes}
fieldMetadataItem={{
type: fieldType as SettingsSupportedFieldType,
}}
/>
<SettingsDataModelFieldSettingsFormCard
fieldMetadataItem={{
Expand Down
Loading