From 41c737703c48e0df8237079f00261ca337646eb9 Mon Sep 17 00:00:00 2001 From: Charles Bochet Date: Wed, 9 Jul 2025 11:26:05 +0200 Subject: [PATCH] Refactor data model settings new field folder (#13119) Folder renaming --- .../src/modules/app/components/SettingsRoutes.tsx | 4 ++-- .../forms/components/SettingsObjectNewFieldSelector.tsx | 2 +- .../forms/validation-schemas/settingsFieldFormSchema.ts | 2 +- .../SettingsObjectNewFieldConfigure.stories.tsx | 2 +- .../SettingsObjectNewFieldSelect.stories.tsx | 2 +- .../SettingsObjectNewFieldConfigure.tsx | 5 ----- .../SettingsObjectNewFieldSelect.tsx | 0 7 files changed, 6 insertions(+), 11 deletions(-) rename packages/twenty-front/src/pages/settings/data-model/{SettingsObjectNewField => new-field}/SettingsObjectNewFieldConfigure.tsx (97%) rename packages/twenty-front/src/pages/settings/data-model/{SettingsObjectNewField => new-field}/SettingsObjectNewFieldSelect.tsx (100%) diff --git a/packages/twenty-front/src/modules/app/components/SettingsRoutes.tsx b/packages/twenty-front/src/modules/app/components/SettingsRoutes.tsx index 874cb6aba..8a9f1332f 100644 --- a/packages/twenty-front/src/modules/app/components/SettingsRoutes.tsx +++ b/packages/twenty-front/src/modules/app/components/SettingsRoutes.tsx @@ -248,7 +248,7 @@ const SettingsIntegrationShowDatabaseConnection = lazy(() => const SettingsObjectNewFieldSelect = lazy(() => import( - '~/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldSelect' + '~/pages/settings/data-model/new-field/SettingsObjectNewFieldSelect' ).then((module) => ({ default: module.SettingsObjectNewFieldSelect, })), @@ -256,7 +256,7 @@ const SettingsObjectNewFieldSelect = lazy(() => const SettingsObjectNewFieldConfigure = lazy(() => import( - '~/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure' + '~/pages/settings/data-model/new-field/SettingsObjectNewFieldConfigure' ).then((module) => ({ default: module.SettingsObjectNewFieldConfigure, })), diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsObjectNewFieldSelector.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsObjectNewFieldSelector.tsx index fadefd87b..54ab4b89e 100644 --- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsObjectNewFieldSelector.tsx +++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsObjectNewFieldSelector.tsx @@ -22,7 +22,7 @@ import { H2Title, IconSearch } from 'twenty-ui/display'; import { UndecoratedLink } from 'twenty-ui/navigation'; import { FieldMetadataType } from '~/generated-metadata/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'; type SettingsObjectNewFieldSelectorProps = { diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/validation-schemas/settingsFieldFormSchema.ts b/packages/twenty-front/src/modules/settings/data-model/fields/forms/validation-schemas/settingsFieldFormSchema.ts index 18ae87b97..13a90ecbc 100644 --- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/validation-schemas/settingsFieldFormSchema.ts +++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/validation-schemas/settingsFieldFormSchema.ts @@ -2,7 +2,7 @@ import { settingsDataModelFieldDescriptionFormSchema } from '@/settings/data-mod import { settingsDataModelFieldIconLabelFormSchema } from '@/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm'; import { settingsDataModelFieldSettingsFormSchema } from '@/settings/data-model/fields/forms/components/SettingsDataModelFieldSettingsFormCard'; 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[]) => { return z diff --git a/packages/twenty-front/src/pages/settings/data-model/__stories__/SettingsObjectNewField/SettingsObjectNewFieldConfigure.stories.tsx b/packages/twenty-front/src/pages/settings/data-model/__stories__/SettingsObjectNewField/SettingsObjectNewFieldConfigure.stories.tsx index fc5daa5ba..ac373eb0c 100644 --- a/packages/twenty-front/src/pages/settings/data-model/__stories__/SettingsObjectNewField/SettingsObjectNewFieldConfigure.stories.tsx +++ b/packages/twenty-front/src/pages/settings/data-model/__stories__/SettingsObjectNewField/SettingsObjectNewFieldConfigure.stories.tsx @@ -1,6 +1,6 @@ import { Meta, StoryObj } from '@storybook/react'; 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 { PageDecorator, diff --git a/packages/twenty-front/src/pages/settings/data-model/__stories__/SettingsObjectNewField/SettingsObjectNewFieldSelect.stories.tsx b/packages/twenty-front/src/pages/settings/data-model/__stories__/SettingsObjectNewField/SettingsObjectNewFieldSelect.stories.tsx index 18a0cbf2a..48f39d299 100644 --- a/packages/twenty-front/src/pages/settings/data-model/__stories__/SettingsObjectNewField/SettingsObjectNewFieldSelect.stories.tsx +++ b/packages/twenty-front/src/pages/settings/data-model/__stories__/SettingsObjectNewField/SettingsObjectNewFieldSelect.stories.tsx @@ -1,6 +1,6 @@ import { Meta, StoryObj } from '@storybook/react'; 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 { PageDecorator, diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx b/packages/twenty-front/src/pages/settings/data-model/new-field/SettingsObjectNewFieldConfigure.tsx similarity index 97% rename from packages/twenty-front/src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx rename to packages/twenty-front/src/pages/settings/data-model/new-field/SettingsObjectNewFieldConfigure.tsx index 9748f0a2a..eb5d6875c 100644 --- a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx +++ b/packages/twenty-front/src/pages/settings/data-model/new-field/SettingsObjectNewFieldConfigure.tsx @@ -148,11 +148,6 @@ export const SettingsObjectNewFieldConfigure = () => { objectNamePlural, }); - // TODO: fix optimistic update logic - // Forcing a refetch for now but it's not ideal - await apolloClient.refetchQueries({ - include: ['FindManyViews', 'CombinedFindManyRecords'], - }); setIsSaving(false); } catch (error) { setIsSaving(false); diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldSelect.tsx b/packages/twenty-front/src/pages/settings/data-model/new-field/SettingsObjectNewFieldSelect.tsx similarity index 100% rename from packages/twenty-front/src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldSelect.tsx rename to packages/twenty-front/src/pages/settings/data-model/new-field/SettingsObjectNewFieldSelect.tsx