admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Refactor data model settings new field folder (#13119)

Browse Source 
Folder renaming
This commit is contained in:
Charles Bochet
2025-07-09 11:26:05 +02:00
committed by GitHub
parent 1cb60f943e
commit 41c737703c
7 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/twenty-front/src/modules/app/components/SettingsRoutes.tsx
View File

@ -248,7 +248,7 @@ const SettingsIntegrationShowDatabaseConnection = lazy(() =>
const SettingsObjectNewFieldSelect = lazy(() => const SettingsObjectNewFieldSelect = lazy(() =>
import( import(
'~/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldSelect' '~/pages/settings/data-model/new-field/SettingsObjectNewFieldSelect'
).then((module) => ({ ).then((module) => ({
default: module.SettingsObjectNewFieldSelect, default: module.SettingsObjectNewFieldSelect,
})), })),
@ -256,7 +256,7 @@ const SettingsObjectNewFieldSelect = lazy(() =>
const SettingsObjectNewFieldConfigure = lazy(() => const SettingsObjectNewFieldConfigure = lazy(() =>
import( import(
'~/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure' '~/pages/settings/data-model/new-field/SettingsObjectNewFieldConfigure'
).then((module) => ({ ).then((module) => ({
default: module.SettingsObjectNewFieldConfigure, default: module.SettingsObjectNewFieldConfigure,
})), })),

2
packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsObjectNewFieldSelector.tsx
View File

@ -22,7 +22,7 @@ import { H2Title, IconSearch } from 'twenty-ui/display';
import { UndecoratedLink } from 'twenty-ui/navigation'; import { UndecoratedLink } from 'twenty-ui/navigation';
import { FieldMetadataType } from '~/generated-metadata/graphql'; import { FieldMetadataType } from '~/generated-metadata/graphql';
import { FeatureFlagKey } from '~/generated/graphql'; import { FeatureFlagKey } from '~/generated/graphql';
import { SettingsDataModelFieldTypeFormValues } from '~/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldSelect'; import { SettingsDataModelFieldTypeFormValues } from '~/pages/settings/data-model/new-field/SettingsObjectNewFieldSelect';
import { getSettingsPath } from '~/utils/navigation/getSettingsPath'; import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
type SettingsObjectNewFieldSelectorProps = { type SettingsObjectNewFieldSelectorProps = {

2
packages/twenty-front/src/modules/settings/data-model/fields/forms/validation-schemas/settingsFieldFormSchema.ts
View File

@ -2,7 +2,7 @@ import { settingsDataModelFieldDescriptionFormSchema } from '@/settings/data-mod
import { settingsDataModelFieldIconLabelFormSchema } from '@/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm'; import { settingsDataModelFieldIconLabelFormSchema } from '@/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm';
import { settingsDataModelFieldSettingsFormSchema } from '@/settings/data-model/fields/forms/components/SettingsDataModelFieldSettingsFormCard'; import { settingsDataModelFieldSettingsFormSchema } from '@/settings/data-model/fields/forms/components/SettingsDataModelFieldSettingsFormCard';
import { z } from 'zod'; import { z } from 'zod';
import { settingsDataModelFieldTypeFormSchema } from '~/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldSelect'; import { settingsDataModelFieldTypeFormSchema } from '~/pages/settings/data-model/new-field/SettingsObjectNewFieldSelect';
export const settingsFieldFormSchema = (existingOtherLabels?: string[]) => { export const settingsFieldFormSchema = (existingOtherLabels?: string[]) => {
return z return z

2
packages/twenty-front/src/pages/settings/data-model/__stories__/SettingsObjectNewField/SettingsObjectNewFieldConfigure.stories.tsx
View File

@ -1,6 +1,6 @@
import { Meta, StoryObj } from '@storybook/react'; import { Meta, StoryObj } from '@storybook/react';
import { userEvent, within } from '@storybook/test'; import { userEvent, within } from '@storybook/test';
import { SettingsObjectNewFieldConfigure } from '~/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure'; import { SettingsObjectNewFieldConfigure } from '~/pages/settings/data-model/new-field/SettingsObjectNewFieldConfigure';
import { import {
PageDecorator, PageDecorator,

2
packages/twenty-front/src/pages/settings/data-model/__stories__/SettingsObjectNewField/SettingsObjectNewFieldSelect.stories.tsx
View File

@ -1,6 +1,6 @@
import { Meta, StoryObj } from '@storybook/react'; import { Meta, StoryObj } from '@storybook/react';
import { userEvent, within } from '@storybook/test'; import { userEvent, within } from '@storybook/test';
import { SettingsObjectNewFieldSelect } from '~/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldSelect'; import { SettingsObjectNewFieldSelect } from '~/pages/settings/data-model/new-field/SettingsObjectNewFieldSelect';
import { import {
PageDecorator, PageDecorator,

5
packages/twenty-front/src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx → packages/twenty-front/src/pages/settings/data-model/new-field/SettingsObjectNewFieldConfigure.tsx
View File

@ -148,11 +148,6 @@ export const SettingsObjectNewFieldConfigure = () => {
objectNamePlural, objectNamePlural,
}); });
// TODO: fix optimistic update logic
// Forcing a refetch for now but it's not ideal
await apolloClient.refetchQueries({
include: ['FindManyViews', 'CombinedFindManyRecords'],
});
setIsSaving(false); setIsSaving(false);
} catch (error) { } catch (error) {
setIsSaving(false); setIsSaving(false);

0
packages/twenty-front/src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldSelect.tsx → packages/twenty-front/src/pages/settings/data-model/new-field/SettingsObjectNewFieldSelect.tsx
View File