The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Move code shared by modules out of pages (#27427)
Félix Malfait8e17d5e952fa
diff --git a/packages/twenty-front/src/modules/app/components/SettingsRoutes.tsx b/packages/twenty-front/src/modules/app/components/SettingsRoutes.tsxindex d7f731ad45d..83ee0566b56 100644--- a/packages/twenty-front/src/modules/app/components/SettingsRoutes.tsx+++ b/packages/twenty-front/src/modules/app/components/SettingsRoutes.tsx@@ -106,7 +106,7 @@ const SettingsNewObject = lazy(() =>);const SettingsNewImapSmtpCaldavConnection = lazy(() =>- import('@/settings/accounts/components/SettingsAccountsNewImapSmtpCaldavConnection').then(+ import('~/pages/settings/accounts/SettingsAccountsNewImapSmtpCaldavConnection').then((module) => ({default: module.SettingsAccountsNewImapSmtpCaldavConnection,}),@@ -114,7 +114,7 @@ const SettingsNewImapSmtpCaldavConnection = lazy(() =>);const SettingsEditImapSmtpCaldavConnection = lazy(() =>- import('@/settings/accounts/components/SettingsAccountsEditImapSmtpCaldavConnection').then(+ import('~/pages/settings/accounts/SettingsAccountsEditImapSmtpCaldavConnection').then((module) => ({default: module.SettingsAccountsEditImapSmtpCaldavConnection,}),@@ -122,7 +122,7 @@ const SettingsEditImapSmtpCaldavConnection = lazy(() =>);const SettingsNewEmailGroupChannel = lazy(() =>- import('@/settings/accounts/components/SettingsAccountsNewEmailGroupChannel').then(+ import('~/pages/settings/accounts/SettingsAccountsNewEmailGroupChannel').then((module) => ({default: module.SettingsAccountsNewEmailGroupChannel,}),diff --git a/packages/twenty-front/src/pages/settings/applications/assets/custom-illustrations/custom-logo.webp b/packages/twenty-front/src/modules/applications/assets/custom-logo.webpsimilarity index 100%rename from packages/twenty-front/src/pages/settings/applications/assets/custom-illustrations/custom-logo.webprename to packages/twenty-front/src/modules/applications/assets/custom-logo.webpdiff --git a/packages/twenty-front/src/pages/settings/applications/assets/standard-illustrations/standard-logo.webp b/packages/twenty-front/src/modules/applications/assets/standard-logo.webpsimilarity index 100%rename from packages/twenty-front/src/pages/settings/applications/assets/standard-illustrations/standard-logo.webprename to packages/twenty-front/src/modules/applications/assets/standard-logo.webpdiff --git a/packages/twenty-front/src/modules/applications/hooks/useApplicationChipData.ts b/packages/twenty-front/src/modules/applications/hooks/useApplicationChipData.tsindex c70f5733a64..9d69710cefe 100644--- a/packages/twenty-front/src/modules/applications/hooks/useApplicationChipData.ts+++ b/packages/twenty-front/src/modules/applications/hooks/useApplicationChipData.ts@@ -8,8 +8,8 @@ import { isWorkspaceCustomApplication } from '@/applications/utils/isWorkspaceCuimport { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { isDefined } from 'twenty-shared/utils';-import CustomLogo from '~/pages/settings/applications/assets/custom-illustrations/custom-logo.webp';-import StandardLogo from '~/pages/settings/applications/assets/standard-illustrations/standard-logo.webp';+import CustomLogo from '@/applications/assets/custom-logo.webp';+import StandardLogo from '@/applications/assets/standard-logo.webp';type UseApplicationChipDataArgs = {applicationId?: string | null;diff --git a/packages/twenty-front/src/modules/applications/hooks/useInstalledApplications.ts b/packages/twenty-front/src/modules/applications/hooks/useInstalledApplications.tsindex 739b7d66da8..8185c97badd 100644--- a/packages/twenty-front/src/modules/applications/hooks/useInstalledApplications.ts+++ b/packages/twenty-front/src/modules/applications/hooks/useInstalledApplications.ts@@ -4,7 +4,7 @@ import { applicationsSelector } from '@/applications/states/applicationsSelectorimport { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { useQuery } from '@apollo/client/react';import { FindManyApplicationsDocument } from '~/generated-metadata/graphql';-import { type ApplicationWithoutRelation } from '~/pages/settings/applications/types/ApplicationWithoutRelation';+import { type ApplicationWithoutRelation } from '@/applications/types/ApplicationWithoutRelation';export const useInstalledApplications = (): ApplicationWithoutRelation[] => {const { data, refetch } = useQuery(FindManyApplicationsDocument);diff --git a/packages/twenty-front/src/modules/applications/hooks/useResolvedApplicationDescription.ts b/packages/twenty-front/src/modules/applications/hooks/useResolvedApplicationDescription.tsindex 3c454e2a044..c7e8e70ef00 100644--- a/packages/twenty-front/src/modules/applications/hooks/useResolvedApplicationDescription.ts+++ b/packages/twenty-front/src/modules/applications/hooks/useResolvedApplicationDescription.ts@@ -2,8 +2,8 @@ import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { isTwentyStandardApplication } from '@/applications/utils/isTwentyStandardApplication';import { isWorkspaceCustomApplication } from '@/applications/utils/isWorkspaceCustomApplication';-import { getCustomApplicationDescription } from '~/pages/settings/applications/utils/getCustomApplicationDescription';-import { getStandardApplicationDescription } from '~/pages/settings/applications/utils/getStandardApplicationDescription';+import { getCustomApplicationDescription } from '@/applications/utils/getCustomApplicationDescription';+import { getStandardApplicationDescription } from '@/applications/utils/getStandardApplicationDescription';type ApplicationLike = {id?: string | null;diff --git a/packages/twenty-front/src/pages/settings/applications/types/ApplicationWithoutRelation.ts b/packages/twenty-front/src/modules/applications/types/ApplicationWithoutRelation.tssimilarity index 100%rename from packages/twenty-front/src/pages/settings/applications/types/ApplicationWithoutRelation.tsrename to packages/twenty-front/src/modules/applications/types/ApplicationWithoutRelation.tsdiff --git a/packages/twenty-front/src/pages/settings/applications/utils/getCustomApplicationDescription.ts b/packages/twenty-front/src/modules/applications/utils/getCustomApplicationDescription.tssimilarity index 100%rename from packages/twenty-front/src/pages/settings/applications/utils/getCustomApplicationDescription.tsrename to packages/twenty-front/src/modules/applications/utils/getCustomApplicationDescription.tsdiff --git a/packages/twenty-front/src/pages/settings/applications/utils/getStandardApplicationDescription.ts b/packages/twenty-front/src/modules/applications/utils/getStandardApplicationDescription.tssimilarity index 100%rename from packages/twenty-front/src/pages/settings/applications/utils/getStandardApplicationDescription.tsrename to packages/twenty-front/src/modules/applications/utils/getStandardApplicationDescription.tsdiff --git a/packages/twenty-front/src/modules/object-core/agents/components/CoreAgentSettingsTab.tsx b/packages/twenty-front/src/modules/object-core/agents/components/CoreAgentSettingsTab.tsxindex f191f6bfdcd..bcbe4bca99b 100644--- a/packages/twenty-front/src/modules/object-core/agents/components/CoreAgentSettingsTab.tsx+++ b/packages/twenty-front/src/modules/object-core/agents/components/CoreAgentSettingsTab.tsx@@ -16,7 +16,7 @@ import { themeCssVariables } from 'twenty-ui/theme';import { type Agent } from '~/generated-metadata/graphql';import { CoreAgentDeleteConfirmationModal } from '@/object-core/agents/components/CoreAgentDeleteConfirmationModal';import { CoreAgentResponseFormat } from '@/object-core/agents/components/CoreAgentResponseFormat';-import { computeMetadataNameFromLabel } from '~/pages/settings/data-model/utils/computeMetadataNameFromLabel';+import { computeMetadataNameFromLabel } from '@/object-metadata/utils/computeMetadataNameFromLabel';import { type CoreAgentFormValues } from '@/object-core/agents/validation-schemas/coreAgentFormSchema';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';diff --git a/packages/twenty-front/src/pages/settings/data-model/utils/__tests__/computeMetadataNameFromLabel.test.ts b/packages/twenty-front/src/modules/object-metadata/utils/__tests__/computeMetadataNameFromLabel.test.tssimilarity index 92%rename from packages/twenty-front/src/pages/settings/data-model/utils/__tests__/computeMetadataNameFromLabel.test.tsrename to packages/twenty-front/src/modules/object-metadata/utils/__tests__/computeMetadataNameFromLabel.test.tsindex b4c054a0d60..d4132beaf6a 100644--- a/packages/twenty-front/src/pages/settings/data-model/utils/__tests__/computeMetadataNameFromLabel.test.ts+++ b/packages/twenty-front/src/modules/object-metadata/utils/__tests__/computeMetadataNameFromLabel.test.ts@@ -1,4 +1,4 @@-import { computeMetadataNameFromLabel } from '~/pages/settings/data-model/utils/computeMetadataNameFromLabel';+import { computeMetadataNameFromLabel } from '@/object-metadata/utils/computeMetadataNameFromLabel';describe('computeMetadataNameFromLabel', () => {it('computes name for label with non-latin char', () => {diff --git a/packages/twenty-front/src/pages/settings/data-model/utils/computeMetadataNameFromLabel.ts b/packages/twenty-front/src/modules/object-metadata/utils/computeMetadataNameFromLabel.tssimilarity index 100%rename from packages/twenty-front/src/pages/settings/data-model/utils/computeMetadataNameFromLabel.tsrename to packages/twenty-front/src/modules/object-metadata/utils/computeMetadataNameFromLabel.tsdiff --git a/packages/twenty-front/src/pages/settings/data-model/utils/computeMetadataNamesFromLabels.ts b/packages/twenty-front/src/modules/object-metadata/utils/computeMetadataNamesFromLabels.tssimilarity index 100%rename from packages/twenty-front/src/pages/settings/data-model/utils/computeMetadataNamesFromLabels.tsrename to packages/twenty-front/src/modules/object-metadata/utils/computeMetadataNamesFromLabels.tsdiff --git a/packages/twenty-front/src/pages/settings/data-model/utils/computeOptionValueFromLabel.ts b/packages/twenty-front/src/modules/object-metadata/utils/computeOptionValueFromLabel.tssimilarity index 100%rename from packages/twenty-front/src/pages/settings/data-model/utils/computeOptionValueFromLabel.tsrename to packages/twenty-front/src/modules/object-metadata/utils/computeOptionValueFromLabel.tsdiff --git a/packages/twenty-front/src/modules/object-metadata/validation-schemas/metadataLabelSchema.ts b/packages/twenty-front/src/modules/object-metadata/validation-schemas/metadataLabelSchema.tsindex 622eaeda494..eddbe48684d 100644--- a/packages/twenty-front/src/modules/object-metadata/validation-schemas/metadataLabelSchema.ts+++ b/packages/twenty-front/src/modules/object-metadata/validation-schemas/metadataLabelSchema.ts@@ -1,14 +1,12 @@import { errors } from '@/settings/data-model/fields/forms/utils/errorMessages';import { z } from 'zod';-import { METADATA_LABEL_VALID_PATTERN } from '~/pages/settings/data-model/constants/MetadataLabelValidPattern';-import { computeMetadataNameFromLabel } from '~/pages/settings/data-model/utils/computeMetadataNameFromLabel';+import { computeMetadataNameFromLabel } from '@/object-metadata/utils/computeMetadataNameFromLabel';export const metadataLabelSchema = (existingLabels?: string[]) => {return z.string().trim().min(1, errors.LabelEmpty)- .regex(METADATA_LABEL_VALID_PATTERN, errors.LabelNotFormattable).refine((label) => {const computedName = computeMetadataNameFromLabel(label);diff --git a/packages/twenty-front/src/modules/object-metadata/validation-schemas/selectOptionsSchema.ts b/packages/twenty-front/src/modules/object-metadata/validation-schemas/selectOptionsSchema.tsindex edea9463396..2b4a96b0057 100644--- a/packages/twenty-front/src/modules/object-metadata/validation-schemas/selectOptionsSchema.ts+++ b/packages/twenty-front/src/modules/object-metadata/validation-schemas/selectOptionsSchema.ts@@ -1,7 +1,7 @@import { z } from 'zod';import { themeColorSchema } from 'twenty-ui/utilities';-import { computeOptionValueFromLabel } from '~/pages/settings/data-model/utils/computeOptionValueFromLabel';+import { computeOptionValueFromLabel } from '@/object-metadata/utils/computeOptionValueFromLabel';const selectOptionSchema = z.object({diff --git a/packages/twenty-front/src/modules/settings/admin-panel/ai/components/SettingsAdminAI.tsx b/packages/twenty-front/src/modules/settings/admin-panel/ai/components/SettingsAdminAI.tsxindex 1ef57c67480..e4a131f92d4 100644--- a/packages/twenty-front/src/modules/settings/admin-panel/ai/components/SettingsAdminAI.tsx+++ b/packages/twenty-front/src/modules/settings/admin-panel/ai/components/SettingsAdminAI.tsx@@ -47,7 +47,7 @@ import {type AdminAiModelTierDefault,AiModelTier as GraphqlAiModelTier,} from '~/generated-admin/graphql';-import { OrganizationAdornment } from '~/pages/settings/enterprise/components/OrganizationAdornment';+import { OrganizationAdornment } from '@/settings/enterprise/components/OrganizationAdornment';const USAGE_TABLE_GRID_TEMPLATE_COLUMNS = '1fr 120px';diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsToolParameterTable.tsx b/packages/twenty-front/src/modules/settings/ai/components/SettingsToolParameterTable.tsxsimilarity index 100%rename from packages/twenty-front/src/pages/settings/ai/components/SettingsToolParameterTable.tsxrename to packages/twenty-front/src/modules/settings/ai/components/SettingsToolParameterTable.tsxdiff --git a/packages/twenty-front/src/pages/settings/ai/constants/SettingsAiTabs.ts b/packages/twenty-front/src/modules/settings/ai/constants/SettingsAiTabs.tssimilarity index 100%rename from packages/twenty-front/src/pages/settings/ai/constants/SettingsAiTabs.tsrename to packages/twenty-front/src/modules/settings/ai/constants/SettingsAiTabs.tsdiff --git a/packages/twenty-front/src/modules/settings/applications/hooks/useComputeApplicationContentForLayoutAndLogic.ts b/packages/twenty-front/src/modules/settings/applications/hooks/useComputeApplicationContentForLayoutAndLogic.tsindex da749a5a106..2f830f3d3d6 100644--- a/packages/twenty-front/src/modules/settings/applications/hooks/useComputeApplicationContentForLayoutAndLogic.ts+++ b/packages/twenty-front/src/modules/settings/applications/hooks/useComputeApplicationContentForLayoutAndLogic.ts@@ -8,7 +8,7 @@ import { type Manifest } from 'twenty-shared/application';import { SettingsPath } from 'twenty-shared/types';import { getSettingsPath, isDefined } from 'twenty-shared/utils';import { type Application } from '~/generated-metadata/graphql';-import { type ApplicationContentRow } from '~/pages/settings/applications/components/SettingsApplicationContentSubtable';+import { type ApplicationContentRow } from '@/settings/applications/types/ApplicationContentRow';type InstalledApplicationForContent = Pick<Application, 'agents' | 'id'>;diff --git a/packages/twenty-front/src/modules/settings/applications/hooks/useComputeObjectAndFieldsContentForApplication.ts b/packages/twenty-front/src/modules/settings/applications/hooks/useComputeObjectAndFieldsContentForApplication.tsindex f6e76796c9b..ff91c883f79 100644--- a/packages/twenty-front/src/modules/settings/applications/hooks/useComputeObjectAndFieldsContentForApplication.ts+++ b/packages/twenty-front/src/modules/settings/applications/hooks/useComputeObjectAndFieldsContentForApplication.ts@@ -6,7 +6,7 @@ import { type Manifest } from 'twenty-shared/application';import { SettingsPath } from 'twenty-shared/types';import { getSettingsPath, isDefined } from 'twenty-shared/utils';import { type Application } from '~/generated-metadata/graphql';-import { type ApplicationContentRow } from '~/pages/settings/applications/components/SettingsApplicationContentSubtable';+import { type ApplicationContentRow } from '@/settings/applications/types/ApplicationContentRow';type InstalledApplicationForObjectAndFields = Omit<Application,diff --git a/packages/twenty-front/src/modules/settings/applications/types/ApplicationContentRow.ts b/packages/twenty-front/src/modules/settings/applications/types/ApplicationContentRow.tsnew file mode 100644index 00000000000..1c2a8298df3--- /dev/null+++ b/packages/twenty-front/src/modules/settings/applications/types/ApplicationContentRow.ts@@ -0,0 +1,8 @@+export type ApplicationContentRow = {+ key: string;+ name: string;+ applicationId?: string;+ icon?: string;+ secondary?: string;+ link?: string;+};diff --git a/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingLimitSpenderSelect.tsx b/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingLimitSpenderSelect.tsxindex 2b944858840..80c4897f47a 100644--- a/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingLimitSpenderSelect.tsx+++ b/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingLimitSpenderSelect.tsx@@ -20,7 +20,7 @@ import { Dropdown } from 'twenty-ui/components/navigation';import { IconArrowUp } from 'twenty-ui/icon';import { Avatar } from 'twenty-ui/primitives/data-display';import { ListItem } from 'twenty-ui/primitives/navigation';-import { OrganizationAdornment } from '~/pages/settings/enterprise/components/OrganizationAdornment';+import { OrganizationAdornment } from '@/settings/enterprise/components/OrganizationAdornment';import { getAbsoluteImageUrl } from '~/utils/image/getAbsoluteImageUrl';const SPENDER_DROPDOWN_ID = 'usage-limit-spender';diff --git a/packages/twenty-front/src/modules/settings/components/__tests__/SettingsRoutedFlowStateScope.test.tsx b/packages/twenty-front/src/modules/settings/components/__tests__/SettingsRoutedFlowStateScope.test.tsxindex 28c2b680413..2fcab90d104 100644--- a/packages/twenty-front/src/modules/settings/components/__tests__/SettingsRoutedFlowStateScope.test.tsx+++ b/packages/twenty-front/src/modules/settings/components/__tests__/SettingsRoutedFlowStateScope.test.tsx@@ -23,7 +23,7 @@ import { useAtomFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtoimport { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { useSetAtomFamilyState } from '@/ui/utilities/state/jotai/hooks/useSetAtomFamilyState';import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';-import { updatedObjectNamePluralState } from '~/pages/settings/data-model/states/updatedObjectNamePluralState';+import { updatedObjectNamePluralState } from '@/settings/data-model/object-details/states/updatedObjectNamePluralState';import { mockedRoles } from '~/testing/mock-data/generated/metadata/roles/mock-roles-data';const ROLE_ID = 'role-1';diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsxindex 00fed193f41..d72a0d147f5 100644--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx@@ -19,7 +19,7 @@ import { isDefined } from 'twenty-shared/utils';import { IconInfoCircle, IconRefresh } from 'twenty-ui/icon';import { Card, Tooltip } from 'twenty-ui/primitives/surfaces';import { useTheme, themeCssVariables } from 'twenty-ui/theme';-import { computeMetadataNameFromLabel } from '~/pages/settings/data-model/utils/computeMetadataNameFromLabel';+import { computeMetadataNameFromLabel } from '@/object-metadata/utils/computeMetadataNameFromLabel';export const settingsDataModelFieldIconLabelFormSchema = (existingOtherLabels: string[] = [],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.tsxindex 1ac28336c61..3d635eac7be 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@@ -21,7 +21,7 @@ import { Section } from 'twenty-ui/components/layout';import { IconSearch } from 'twenty-ui/icon';import { useTheme, themeCssVariables } from 'twenty-ui/theme';import { FieldMetadataType } from '~/generated-metadata/graphql';-import { type SettingsDataModelFieldTypeFormValues } from '~/pages/settings/data-model/new-field/SettingsObjectNewFieldSelect';+import { type SettingsDataModelFieldTypeFormValues } from '@/settings/data-model/fields/forms/validation-schemas/settingsDataModelFieldTypeFormSchema';type SettingsObjectNewFieldSelectorProps = {className?: string;diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/currency/hooks/useCurrencySettingsFormInitialValues.ts b/packages/twenty-front/src/modules/settings/data-model/fields/forms/currency/hooks/useCurrencySettingsFormInitialValues.tsindex 576a71ca84a..880b649aa7b 100644--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/currency/hooks/useCurrencySettingsFormInitialValues.ts+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/currency/hooks/useCurrencySettingsFormInitialValues.ts@@ -3,7 +3,7 @@ import { useFormContext } from 'react-hook-form';import { useFieldMetadataItemById } from '@/object-metadata/hooks/useFieldMetadataItemById';import { type SettingsDataModelFieldCurrencyFormValues } from '@/settings/data-model/fields/forms/currency/components/SettingsDataModelFieldCurrencyForm';import { CurrencyCode } from 'twenty-shared/constants';-import { getFieldMetadataItemInitialValues } from '~/pages/settings/data-model/utils/getFieldMetadataItemInitialValues';+import { getFieldMetadataItemInitialValues } from '@/settings/data-model/fields/forms/utils/getFieldMetadataItemInitialValues';import { DEFAULT_DECIMAL_VALUE } from '~/utils/format/formatNumber';import { applySimpleQuotesToString } from '~/utils/string/applySimpleQuotesToString';diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectFormOptionRow.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectFormOptionRow.tsxindex 76c10406851..b3172b48624 100644--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectFormOptionRow.tsx+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectFormOptionRow.tsx@@ -19,7 +19,7 @@ import {import { ColorSample } from 'twenty-ui/primitives/data-display';import { MAIN_COLOR_NAMES, useTheme, themeCssVariables } from 'twenty-ui/theme';-import { computeOptionValueFromLabel } from '~/pages/settings/data-model/utils/computeOptionValueFromLabel';+import { computeOptionValueFromLabel } from '@/object-metadata/utils/computeOptionValueFromLabel';const useColorLabels = (): ColorLabels => ({gray: t`Gray`,diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/hooks/useSelectSettingsFormInitialValues.ts b/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/hooks/useSelectSettingsFormInitialValues.tsindex fc2bee9d2da..2e25b1f6047 100644--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/hooks/useSelectSettingsFormInitialValues.ts+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/hooks/useSelectSettingsFormInitialValues.ts@@ -8,7 +8,7 @@ import { useFieldMetadataItemById } from '@/object-metadata/hooks/useFieldMetadaimport { type FieldMetadataItemOption } from '@/object-metadata/types/FieldMetadataItem';import { type SettingsDataModelFieldSelectFormValues } from '@/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectForm';import { normalizeSelectOptions } from '@/settings/data-model/fields/forms/select/utils/normalizeSelectOptions';-import { computeOptionValueFromLabel } from '~/pages/settings/data-model/utils/computeOptionValueFromLabel';+import { computeOptionValueFromLabel } from '@/object-metadata/utils/computeOptionValueFromLabel';const getDefaultOption = (): FieldMetadataItemOption => {const label = t`Option 1`;diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/utils/generateNewSelectOption.ts b/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/utils/generateNewSelectOption.tsindex adcd9971d87..1134c557cf8 100644--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/utils/generateNewSelectOption.ts+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/utils/generateNewSelectOption.ts@@ -4,7 +4,7 @@ import { type FieldMetadataItemOption } from '@/object-metadata/types/FieldMetadimport { generateNewSelectOptionLabel } from '@/settings/data-model/fields/forms/select/utils/generateNewSelectOptionLabel';import { MAIN_COLOR_NAMES, getNextThemeColor } from 'twenty-ui/theme';-import { computeOptionValueFromLabel } from '~/pages/settings/data-model/utils/computeOptionValueFromLabel';+import { computeOptionValueFromLabel } from '@/object-metadata/utils/computeOptionValueFromLabel';export const generateNewSelectOption = (options: FieldMetadataItemOption[],diff --git a/packages/twenty-front/src/pages/settings/data-model/utils/getFieldMetadataItemInitialValues.ts b/packages/twenty-front/src/modules/settings/data-model/fields/forms/utils/getFieldMetadataItemInitialValues.tssimilarity index 100%rename from packages/twenty-front/src/pages/settings/data-model/utils/getFieldMetadataItemInitialValues.tsrename to packages/twenty-front/src/modules/settings/data-model/fields/forms/utils/getFieldMetadataItemInitialValues.tsdiff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/validation-schemas/settingsDataModelFieldTypeFormSchema.ts b/packages/twenty-front/src/modules/settings/data-model/fields/forms/validation-schemas/settingsDataModelFieldTypeFormSchema.tsnew file mode 100644index 00000000000..a45f5f87d45--- /dev/null+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/validation-schemas/settingsDataModelFieldTypeFormSchema.ts@@ -0,0 +1,16 @@+import { SETTINGS_FIELD_TYPE_CONFIGS } from '@/settings/data-model/constants/SettingsFieldTypeConfigs';+import { type SettingsFieldType } from '@/settings/data-model/types/SettingsFieldType';+import { z } from 'zod';++export const settingsDataModelFieldTypeFormSchema = z.object({+ type: z.enum(+ Object.keys(SETTINGS_FIELD_TYPE_CONFIGS) as [+ SettingsFieldType,+ ...SettingsFieldType[],+ ],+ ),+});++export type SettingsDataModelFieldTypeFormValues = z.infer<+ typeof settingsDataModelFieldTypeFormSchema+>;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.tsindex 26ec5a25327..588bca465a8 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@@ -4,7 +4,7 @@ import { settingsDataModelFieldSettingsFormSchema } from '@/settings/data-model/import { isDefined } from 'twenty-shared/utils';import { z } from 'zod';import { FieldMetadataType } from '~/generated-metadata/graphql';-import { settingsDataModelFieldTypeFormSchema } from '~/pages/settings/data-model/new-field/SettingsObjectNewFieldSelect';+import { settingsDataModelFieldTypeFormSchema } from '@/settings/data-model/fields/forms/validation-schemas/settingsDataModelFieldTypeFormSchema';type SettingsFieldFormSchemaOptions = {existingOtherLabels?: string[];diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/SettingsDataModelFieldPreviewWidget.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/SettingsDataModelFieldPreviewWidget.tsxindex 8c104b52f23..cdc71f0893d 100644--- a/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/SettingsDataModelFieldPreviewWidget.tsx+++ b/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/SettingsDataModelFieldPreviewWidget.tsx@@ -6,7 +6,7 @@ import { SettingsDataModelFieldPreview } from '@/settings/data-model/fields/previmport { SettingsDataModelObjectPreview } from '@/settings/data-model/objects/components/SettingsDataModelObjectSummary';import { Card } from 'twenty-ui/primitives/surfaces';import { themeCssVariables } from 'twenty-ui/theme';-import { computeMetadataNameFromLabel } from '~/pages/settings/data-model/utils/computeMetadataNameFromLabel';+import { computeMetadataNameFromLabel } from '@/object-metadata/utils/computeMetadataNameFromLabel';type SettingsDataModelFieldPreviewWidgetProps = {className?: string;diff --git a/packages/twenty-front/src/modules/settings/data-model/indexes/forms/components/SettingsObjectIndexFieldsForm.tsx b/packages/twenty-front/src/modules/settings/data-model/indexes/forms/components/SettingsObjectIndexFieldsForm.tsxindex f208e64313d..527b5b4a58e 100644--- a/packages/twenty-front/src/modules/settings/data-model/indexes/forms/components/SettingsObjectIndexFieldsForm.tsx+++ b/packages/twenty-front/src/modules/settings/data-model/indexes/forms/components/SettingsObjectIndexFieldsForm.tsx@@ -11,7 +11,7 @@ import { IconTrash, useIcons } from 'twenty-ui/icon';import { type SelectOption } from 'twenty-ui/primitives/input';import { IconButton } from 'twenty-ui/components/input';import { themeCssVariables } from 'twenty-ui/theme';-import { type SettingsObjectNewIndexFormValues } from '~/pages/settings/data-model/new-index/SettingsObjectNewIndexFormValues';+import { type SettingsObjectNewIndexFormValues } from '@/settings/data-model/indexes/forms/validation-schemas/settingsObjectNewIndexFormSchema';type SettingsObjectIndexFieldsFormProps = {indexableFields: FieldMetadataItem[];diff --git a/packages/twenty-front/src/modules/settings/data-model/indexes/forms/components/SettingsObjectIndexOptionsForm.tsx b/packages/twenty-front/src/modules/settings/data-model/indexes/forms/components/SettingsObjectIndexOptionsForm.tsxindex ce4da091a9d..92f35e600fd 100644--- a/packages/twenty-front/src/modules/settings/data-model/indexes/forms/components/SettingsObjectIndexOptionsForm.tsx+++ b/packages/twenty-front/src/modules/settings/data-model/indexes/forms/components/SettingsObjectIndexOptionsForm.tsx@@ -4,7 +4,7 @@ import { useLingui } from '@lingui/react/macro';import { Controller, useFormContext } from 'react-hook-form';import { themeCssVariables } from 'twenty-ui/theme';import { IndexType } from '~/generated-metadata/graphql';-import { type SettingsObjectNewIndexFormValues } from '~/pages/settings/data-model/new-index/SettingsObjectNewIndexFormValues';+import { type SettingsObjectNewIndexFormValues } from '@/settings/data-model/indexes/forms/validation-schemas/settingsObjectNewIndexFormSchema';const StyledContent = styled.div`display: flex;diff --git a/packages/twenty-front/src/pages/settings/data-model/new-index/SettingsObjectNewIndexFormValues.ts b/packages/twenty-front/src/modules/settings/data-model/indexes/forms/validation-schemas/settingsObjectNewIndexFormSchema.tssimilarity index 100%rename from packages/twenty-front/src/pages/settings/data-model/new-index/SettingsObjectNewIndexFormValues.tsrename to packages/twenty-front/src/modules/settings/data-model/indexes/forms/validation-schemas/settingsObjectNewIndexFormSchema.tsdiff --git a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldItemTableRow.tsx b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldItemTableRow.tsxindex 0465fc6ed9b..3e05baf68e1 100644--- a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldItemTableRow.tsx+++ b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldItemTableRow.tsx@@ -33,7 +33,7 @@ import { Tooltip } from 'twenty-ui/primitives/surfaces';import { useTheme, themeCssVariables } from 'twenty-ui/theme';import { RelationType } from '~/generated-metadata/graphql';import { useNavigateSettings } from '~/hooks/useNavigateSettings';-import { type SettingsObjectDetailTableItem } from '~/pages/settings/data-model/types/SettingsObjectDetailTableItem';+import { type SettingsObjectDetailTableItem } from '@/settings/data-model/types/SettingsObjectDetailTableItem';import { SettingsObjectFieldDataType } from './SettingsObjectFieldDataType';type SettingsObjectFieldItemTableRowProps = {diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldTable.tsx b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldTable.tsxsimilarity index 97%rename from packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldTable.tsxrename to packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldTable.tsxindex f51d3de7558..a80cd23c0ca 100644--- a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldTable.tsx+++ b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldTable.tsx@@ -30,8 +30,8 @@ import { Dropdown } from 'twenty-ui/components/navigation';import { SettingsRow } from 'twenty-ui/components/settings';import { IconArchive, IconCircleDashed, IconSettings } from 'twenty-ui/icon';import { themeCssVariables } from 'twenty-ui/theme';-import { useMapFieldMetadataItemToSettingsObjectDetailTableItem } from '~/pages/settings/data-model/hooks/useMapFieldMetadataItemToSettingsObjectDetailTableItem';-import { type SettingsObjectDetailTableItem } from '~/pages/settings/data-model/types/SettingsObjectDetailTableItem';+import { useMapFieldMetadataItemToSettingsObjectDetailTableItem } from '@/settings/data-model/object-details/hooks/useMapFieldMetadataItemToSettingsObjectDetailTableItem';+import { type SettingsObjectDetailTableItem } from '@/settings/data-model/types/SettingsObjectDetailTableItem';import { normalizeSearchText } from 'twenty-ui/utilities';const StyledSearchContainer = styled.div`diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectIndexTable.tsx b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectIndexTable.tsxsimilarity index 97%rename from packages/twenty-front/src/pages/settings/data-model/SettingsObjectIndexTable.tsxrename to packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectIndexTable.tsxindex b355f4edb02..a3b13c41d4b 100644--- a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectIndexTable.tsx+++ b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectIndexTable.tsx@@ -12,7 +12,7 @@ import { useLingui } from '@lingui/react/macro';import { LightIconButton } from 'twenty-ui/components/input';import { IconSquareKey, IconTrash } from 'twenty-ui/icon';import { themeCssVariables } from 'twenty-ui/theme';-import { type SettingsObjectIndexesTableItem } from '~/pages/settings/data-model/types/SettingsObjectIndexesTableItem';+import { type SettingsObjectIndexesTableItem } from '@/settings/data-model/types/SettingsObjectIndexesTableItem';const OBJECT_INDEX_TABLE_GRID_TEMPLATE_COLUMNS = '1fr 70px 80px 32px';diff --git a/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/ObjectFields.tsx b/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/ObjectFields.tsxindex 8e214531d8f..0f4a8f8e77d 100644--- a/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/ObjectFields.tsx+++ b/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/ObjectFields.tsx@@ -13,7 +13,7 @@ import { getSettingsPath } from 'twenty-shared/utils';import { Section } from 'twenty-ui/components/layout';import { IconPlus } from 'twenty-ui/icon';import { themeCssVariables } from 'twenty-ui/theme';-import { SettingsObjectFieldTable } from '~/pages/settings/data-model/SettingsObjectFieldTable';+import { SettingsObjectFieldTable } from '@/settings/data-model/object-details/components/SettingsObjectFieldTable';const StyledButtonContainer = styled.div`display: flex;diff --git a/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/SettingsObjectIndexesSection.tsx b/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/SettingsObjectIndexesSection.tsxindex 76da387e269..2e2ca8574f1 100644--- a/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/SettingsObjectIndexesSection.tsx+++ b/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/SettingsObjectIndexesSection.tsx@@ -23,8 +23,8 @@ import { SettingsRow } from 'twenty-ui/components/settings';import { IconEyeOff, IconPlus } from 'twenty-ui/icon';import { Button } from 'twenty-ui/primitives/input';import { themeCssVariables } from 'twenty-ui/theme';-import { SettingsObjectIndexTable } from '~/pages/settings/data-model/SettingsObjectIndexTable';-import { type SettingsObjectIndexesTableItem } from '~/pages/settings/data-model/types/SettingsObjectIndexesTableItem';+import { SettingsObjectIndexTable } from '@/settings/data-model/object-details/components/SettingsObjectIndexTable';+import { type SettingsObjectIndexesTableItem } from '@/settings/data-model/types/SettingsObjectIndexesTableItem';import { normalizeSearchText } from 'twenty-ui/utilities';type SettingsObjectIndexesSectionProps = {diff --git a/packages/twenty-front/src/pages/settings/data-model/hooks/useMapFieldMetadataItemToSettingsObjectDetailTableItem.ts b/packages/twenty-front/src/modules/settings/data-model/object-details/hooks/useMapFieldMetadataItemToSettingsObjectDetailTableItem.tssimilarity index 91%rename from packages/twenty-front/src/pages/settings/data-model/hooks/useMapFieldMetadataItemToSettingsObjectDetailTableItem.tsrename to packages/twenty-front/src/modules/settings/data-model/object-details/hooks/useMapFieldMetadataItemToSettingsObjectDetailTableItem.tsindex 0b57c138fdf..666072a7e7a 100644--- a/packages/twenty-front/src/pages/settings/data-model/hooks/useMapFieldMetadataItemToSettingsObjectDetailTableItem.ts+++ b/packages/twenty-front/src/modules/settings/data-model/object-details/hooks/useMapFieldMetadataItemToSettingsObjectDetailTableItem.ts@@ -8,8 +8,8 @@ import { type SettingsFieldType } from '@/settings/data-model/types/SettingsFielimport { getFieldIdentifierType } from '@/settings/data-model/utils/getFieldIdentifierType';import { getSettingsFieldTypeConfig } from '@/settings/data-model/utils/getSettingsFieldTypeConfig';import { isFieldTypeSupportedInSettings } from '@/settings/data-model/utils/isFieldTypeSupportedInSettings';-import { type SettingsObjectDetailTableItem } from '~/pages/settings/data-model/types/SettingsObjectDetailTableItem';-import { getSettingsObjectFieldType } from '~/pages/settings/data-model/utils/getSettingsObjectFieldType';+import { type SettingsObjectDetailTableItem } from '@/settings/data-model/types/SettingsObjectDetailTableItem';+import { getSettingsObjectFieldType } from '@/settings/data-model/utils/getSettingsObjectFieldType';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';export const useMapFieldMetadataItemToSettingsObjectDetailTableItem = (diff --git a/packages/twenty-front/src/modules/settings/data-model/object-details/hooks/useSaveUpdateDataModelObjectAboutForm.ts b/packages/twenty-front/src/modules/settings/data-model/object-details/hooks/useSaveUpdateDataModelObjectAboutForm.tsindex 82d7c516f62..cc2f99aa586 100644--- a/packages/twenty-front/src/modules/settings/data-model/object-details/hooks/useSaveUpdateDataModelObjectAboutForm.ts+++ b/packages/twenty-front/src/modules/settings/data-model/object-details/hooks/useSaveUpdateDataModelObjectAboutForm.ts@@ -19,7 +19,7 @@ import { getObjectColorWithFallback } from '@/object-metadata/utils/getObjectColimport { useLocaleOptions } from '~/localization/hooks/useLocaleOptions';import { MetadataTranslationsDocument } from '~/generated-metadata/graphql';import { useNavigateSettings } from '~/hooks/useNavigateSettings';-import { updatedObjectNamePluralState } from '~/pages/settings/data-model/states/updatedObjectNamePluralState';+import { updatedObjectNamePluralState } from '@/settings/data-model/object-details/states/updatedObjectNamePluralState';export const TRANSLATION_INTENT_MODAL_ID ='object-label-translation-intent-modal';diff --git a/packages/twenty-front/src/pages/settings/data-model/states/updatedObjectNamePluralState.ts b/packages/twenty-front/src/modules/settings/data-model/object-details/states/updatedObjectNamePluralState.tssimilarity index 100%rename from packages/twenty-front/src/pages/settings/data-model/states/updatedObjectNamePluralState.tsrename to packages/twenty-front/src/modules/settings/data-model/object-details/states/updatedObjectNamePluralState.tsdiff --git a/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectAboutForm.tsx b/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectAboutForm.tsxindex 71d17f3eea4..c956bd885d5 100644--- a/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectAboutForm.tsx+++ b/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectAboutForm.tsx@@ -21,7 +21,7 @@ import { Card, Tooltip } from 'twenty-ui/primitives/surfaces';import { useTheme, themeCssVariables } from 'twenty-ui/theme';import { type StringKeyOf } from 'type-fest';import { useNavigateSettings } from '~/hooks/useNavigateSettings';-import { computeMetadataNamesFromLabels } from '~/pages/settings/data-model/utils/computeMetadataNamesFromLabels';+import { computeMetadataNamesFromLabels } from '@/object-metadata/utils/computeMetadataNamesFromLabels';type SettingsDataModelObjectAboutFormProps = {disableEdition?: boolean;diff --git a/packages/twenty-front/src/pages/settings/data-model/types/SettingsObjectDetailTableItem.ts b/packages/twenty-front/src/modules/settings/data-model/types/SettingsObjectDetailTableItem.tssimilarity index 100%rename from packages/twenty-front/src/pages/settings/data-model/types/SettingsObjectDetailTableItem.tsrename to packages/twenty-front/src/modules/settings/data-model/types/SettingsObjectDetailTableItem.tsdiff --git a/packages/twenty-front/src/pages/settings/data-model/types/SettingsObjectIndexesTableItem.ts b/packages/twenty-front/src/modules/settings/data-model/types/SettingsObjectIndexesTableItem.tssimilarity index 100%rename from packages/twenty-front/src/pages/settings/data-model/types/SettingsObjectIndexesTableItem.tsrename to packages/twenty-front/src/modules/settings/data-model/types/SettingsObjectIndexesTableItem.tsdiff --git a/packages/twenty-front/src/pages/settings/data-model/utils/getSettingsObjectFieldType.ts b/packages/twenty-front/src/modules/settings/data-model/utils/getSettingsObjectFieldType.tssimilarity index 100%rename from packages/twenty-front/src/pages/settings/data-model/utils/getSettingsObjectFieldType.tsrename to packages/twenty-front/src/modules/settings/data-model/utils/getSettingsObjectFieldType.tsdiff --git a/packages/twenty-front/src/modules/settings/developers/components/SettingsDevelopersWebhookForm.tsx b/packages/twenty-front/src/modules/settings/developers/components/SettingsDevelopersWebhookForm.tsxindex 6df690e7d5b..750c32b302d 100644--- a/packages/twenty-front/src/modules/settings/developers/components/SettingsDevelopersWebhookForm.tsx+++ b/packages/twenty-front/src/modules/settings/developers/components/SettingsDevelopersWebhookForm.tsx@@ -23,7 +23,7 @@ import { Section } from 'twenty-ui/components/layout';import { IconTrash } from 'twenty-ui/icon';import { Button } from 'twenty-ui/primitives/input';import { useNavigateSettings } from '~/hooks/useNavigateSettings';-import { SETTINGS_API_WEBHOOKS_TABS } from '~/pages/settings/api-webhooks/constants/SettingsApiWebhooksTabs';+import { SETTINGS_API_WEBHOOKS_TABS } from '@/settings/developers/constants/SettingsApiWebhooksTabs';import { SettingsDatabaseEventsForm } from '@/settings/components/SettingsDatabaseEventsForm';const DELETE_WEBHOOK_MODAL_ID = 'delete-webhook-modal';diff --git a/packages/twenty-front/src/pages/settings/api-webhooks/constants/SettingsApiWebhooksTabs.ts b/packages/twenty-front/src/modules/settings/developers/constants/SettingsApiWebhooksTabs.tssimilarity index 100%rename from packages/twenty-front/src/pages/settings/api-webhooks/constants/SettingsApiWebhooksTabs.tsrename to packages/twenty-front/src/modules/settings/developers/constants/SettingsApiWebhooksTabs.tsdiff --git a/packages/twenty-front/src/modules/settings/developers/constants/WebhookEmptyOperation.ts b/packages/twenty-front/src/modules/settings/developers/constants/WebhookEmptyOperation.tsnew file mode 100644index 00000000000..fc8f2d0b395--- /dev/null+++ b/packages/twenty-front/src/modules/settings/developers/constants/WebhookEmptyOperation.ts@@ -0,0 +1,6 @@+import { type WebhookOperationType } from '@/settings/developers/types/WebhookOperationsType';++export const WEBHOOK_EMPTY_OPERATION: WebhookOperationType = {+ object: null,+ action: '*',+};diff --git a/packages/twenty-front/src/modules/settings/developers/hooks/__tests__/useWebhookForm.test.tsx b/packages/twenty-front/src/modules/settings/developers/hooks/__tests__/useWebhookForm.test.tsxindex 9b7ee7f6314..b9057886101 100644--- a/packages/twenty-front/src/modules/settings/developers/hooks/__tests__/useWebhookForm.test.tsx+++ b/packages/twenty-front/src/modules/settings/developers/hooks/__tests__/useWebhookForm.test.tsx@@ -10,7 +10,7 @@ import { DELETE_WEBHOOK } from '@/settings/developers/graphql/mutations/deleteWeimport { UPDATE_WEBHOOK } from '@/settings/developers/graphql/mutations/updateWebhook';import { GET_WEBHOOK } from '@/settings/developers/graphql/queries/getWebhook';import { useWebhookForm } from '@/settings/developers/hooks/useWebhookForm';-import { WEBHOOK_EMPTY_OPERATION } from '~/pages/settings/developers/webhooks/constants/WebhookEmptyOperation';+import { WEBHOOK_EMPTY_OPERATION } from '@/settings/developers/constants/WebhookEmptyOperation';const mockNavigateSettings = jest.fn();diff --git a/packages/twenty-front/src/modules/settings/developers/hooks/useWebhookForm.ts b/packages/twenty-front/src/modules/settings/developers/hooks/useWebhookForm.tsindex 8524f66d0a3..42936b8c4a5 100644--- a/packages/twenty-front/src/modules/settings/developers/hooks/useWebhookForm.ts+++ b/packages/twenty-front/src/modules/settings/developers/hooks/useWebhookForm.ts@@ -25,7 +25,7 @@ import {UpdateWebhookDocument,} from '~/generated-metadata/graphql';import { useNavigateSettings } from '~/hooks/useNavigateSettings';-import { SETTINGS_API_WEBHOOKS_TABS } from '~/pages/settings/api-webhooks/constants/SettingsApiWebhooksTabs';+import { SETTINGS_API_WEBHOOKS_TABS } from '@/settings/developers/constants/SettingsApiWebhooksTabs';type UseWebhookFormProps = {webhookId?: string;diff --git a/packages/twenty-front/src/pages/settings/developers/webhooks/types/WebhookOperationsType.ts b/packages/twenty-front/src/modules/settings/developers/types/WebhookOperationsType.tssimilarity index 100%rename from packages/twenty-front/src/pages/settings/developers/webhooks/types/WebhookOperationsType.tsrename to packages/twenty-front/src/modules/settings/developers/types/WebhookOperationsType.tsdiff --git a/packages/twenty-front/src/modules/settings/developers/utils/__tests__/addEmptyOperationIfNecessary.test.ts b/packages/twenty-front/src/modules/settings/developers/utils/__tests__/addEmptyOperationIfNecessary.test.tsindex dbe97e12cfd..12a56bcc8ac 100644--- a/packages/twenty-front/src/modules/settings/developers/utils/__tests__/addEmptyOperationIfNecessary.test.ts+++ b/packages/twenty-front/src/modules/settings/developers/utils/__tests__/addEmptyOperationIfNecessary.test.ts@@ -1,5 +1,5 @@-import { WEBHOOK_EMPTY_OPERATION } from '~/pages/settings/developers/webhooks/constants/WebhookEmptyOperation';-import { type WebhookOperationType } from '~/pages/settings/developers/webhooks/types/WebhookOperationsType';+import { WEBHOOK_EMPTY_OPERATION } from '@/settings/developers/constants/WebhookEmptyOperation';+import { type WebhookOperationType } from '@/settings/developers/types/WebhookOperationsType';import { addEmptyOperationIfNecessary } from '@/settings/developers/utils/addEmptyOperationIfNecessary';describe('addEmptyOperationIfNecessary', () => {diff --git a/packages/twenty-front/src/modules/settings/developers/utils/__tests__/cleanAndFormatOperations.test.ts b/packages/twenty-front/src/modules/settings/developers/utils/__tests__/cleanAndFormatOperations.test.tsindex 4a5fd342817..b61a0fcced4 100644--- a/packages/twenty-front/src/modules/settings/developers/utils/__tests__/cleanAndFormatOperations.test.ts+++ b/packages/twenty-front/src/modules/settings/developers/utils/__tests__/cleanAndFormatOperations.test.ts@@ -1,4 +1,4 @@-import { type WebhookOperationType } from '~/pages/settings/developers/webhooks/types/WebhookOperationsType';+import { type WebhookOperationType } from '@/settings/developers/types/WebhookOperationsType';import { cleanAndFormatOperations } from '@/settings/developers/utils/cleanAndFormatOperations';describe('cleanAndFormatOperations', () => {diff --git a/packages/twenty-front/src/modules/settings/developers/utils/addEmptyOperationIfNecessary.ts b/packages/twenty-front/src/modules/settings/developers/utils/addEmptyOperationIfNecessary.tsindex b6a3f508fa2..5d410936ede 100644--- a/packages/twenty-front/src/modules/settings/developers/utils/addEmptyOperationIfNecessary.ts+++ b/packages/twenty-front/src/modules/settings/developers/utils/addEmptyOperationIfNecessary.ts@@ -1,5 +1,5 @@-import { WEBHOOK_EMPTY_OPERATION } from '~/pages/settings/developers/webhooks/constants/WebhookEmptyOperation';-import { type WebhookOperationType } from '~/pages/settings/developers/webhooks/types/WebhookOperationsType';+import { WEBHOOK_EMPTY_OPERATION } from '@/settings/developers/constants/WebhookEmptyOperation';+import { type WebhookOperationType } from '@/settings/developers/types/WebhookOperationsType';export const addEmptyOperationIfNecessary = (newOperations: WebhookOperationType[],diff --git a/packages/twenty-front/src/modules/settings/developers/utils/cleanAndFormatOperations.ts b/packages/twenty-front/src/modules/settings/developers/utils/cleanAndFormatOperations.tsindex 35b9ad1bebd..847a32e1520 100644--- a/packages/twenty-front/src/modules/settings/developers/utils/cleanAndFormatOperations.ts+++ b/packages/twenty-front/src/modules/settings/developers/utils/cleanAndFormatOperations.ts@@ -1,6 +1,6 @@import { isDefined } from 'twenty-shared/utils';-import { type WebhookOperationType } from '~/pages/settings/developers/webhooks/types/WebhookOperationsType';+import { type WebhookOperationType } from '@/settings/developers/types/WebhookOperationsType';export const cleanAndFormatOperations = (operations: WebhookOperationType[],diff --git a/packages/twenty-front/src/modules/settings/developers/utils/parseOperationsFromStrings.ts b/packages/twenty-front/src/modules/settings/developers/utils/parseOperationsFromStrings.tsindex b68b80aaee0..c458ce09b5e 100644--- a/packages/twenty-front/src/modules/settings/developers/utils/parseOperationsFromStrings.ts+++ b/packages/twenty-front/src/modules/settings/developers/utils/parseOperationsFromStrings.ts@@ -1,4 +1,4 @@-import { type WebhookOperationType } from '~/pages/settings/developers/webhooks/types/WebhookOperationsType';+import { type WebhookOperationType } from '@/settings/developers/types/WebhookOperationsType';export const parseOperationsFromStrings = (operations: string[],diff --git a/packages/twenty-front/src/modules/settings/emailing-domains/utils/getEmailingDomainStatusDisplay.ts b/packages/twenty-front/src/modules/settings/emailing-domains/utils/getEmailingDomainStatusDisplay.tsnew file mode 100644index 00000000000..71735ec3ef0--- /dev/null+++ b/packages/twenty-front/src/modules/settings/emailing-domains/utils/getEmailingDomainStatusDisplay.ts@@ -0,0 +1,21 @@+import { t } from '@lingui/core/macro';+import { type ThemeColor } from 'twenty-ui/theme';++import { EmailingDomainStatus } from '~/generated-metadata/graphql';++export const getEmailingDomainStatusDisplay = (+ status: EmailingDomainStatus,+): { label: string; color: ThemeColor } => {+ switch (status) {+ case EmailingDomainStatus.VERIFIED:+ return { label: t`Verified`, color: 'turquoise' };+ case EmailingDomainStatus.PENDING:+ return { label: t`Pending`, color: 'orange' };+ case EmailingDomainStatus.TEMPORARY_FAILURE:+ return { label: t`Temporary Failure`, color: 'orange' };+ case EmailingDomainStatus.FAILED:+ return { label: t`Failed`, color: 'red' };+ default:+ return { label: t`Unknown`, color: 'gray' };+ }+};diff --git a/packages/twenty-front/src/modules/settings/emailing-domains/utils/getVerificationRecordGroupStatusDisplay.ts b/packages/twenty-front/src/modules/settings/emailing-domains/utils/getVerificationRecordGroupStatusDisplay.tsindex b77d3dd11a5..d505a68583e 100644--- a/packages/twenty-front/src/modules/settings/emailing-domains/utils/getVerificationRecordGroupStatusDisplay.ts+++ b/packages/twenty-front/src/modules/settings/emailing-domains/utils/getVerificationRecordGroupStatusDisplay.ts@@ -7,21 +7,13 @@ import {EmailingDomainStatus,UnsubscribeHostnameStatus,} from '~/generated-metadata/graphql';-import { getColorByEmailingDomainStatus } from '~/pages/settings/emailing-domains/utils/getEmailingDomainStatusColor';-import { getTextByEmailingDomainStatus } from '~/pages/settings/emailing-domains/utils/getEmailingDomainStatusText';+import { getEmailingDomainStatusDisplay } from '@/settings/emailing-domains/utils/getEmailingDomainStatusDisplay';type VerificationRecordGroupStatusDisplay = {label: string;color: ThemeColor;};-const toStatusDisplay = (- status: EmailingDomainStatus,-): VerificationRecordGroupStatusDisplay => ({- label: getTextByEmailingDomainStatus(status),- color: getColorByEmailingDomainStatus(status),-});-export const getVerificationRecordGroupStatusDisplay = ({groupKey,emailingDomain,@@ -31,11 +23,11 @@ export const getVerificationRecordGroupStatusDisplay = ({}): VerificationRecordGroupStatusDisplay => {switch (groupKey) {case 'AUTHENTICATION':- return toStatusDisplay(emailingDomain.status);+ return getEmailingDomainStatusDisplay(emailingDomain.status);case 'DMARC':return { label: t`Not set`, color: 'gray' };case 'UNSUBSCRIBE':- return toStatusDisplay(+ return getEmailingDomainStatusDisplay(emailingDomain.unsubscribeHostnameStatus ===UnsubscribeHostnameStatus.ACTIVE? EmailingDomainStatus.VERIFIEDdiff --git a/packages/twenty-front/src/pages/settings/enterprise/components/OrganizationAdornment.tsx b/packages/twenty-front/src/modules/settings/enterprise/components/OrganizationAdornment.tsxsimilarity index 100%rename from packages/twenty-front/src/pages/settings/enterprise/components/OrganizationAdornment.tsxrename to packages/twenty-front/src/modules/settings/enterprise/components/OrganizationAdornment.tsxdiff --git a/packages/twenty-front/src/pages/settings/profile/appearance/components/DateTimeSettingsCalendarStartDaySelect.tsx b/packages/twenty-front/src/modules/settings/experience/components/DateTimeSettingsCalendarStartDaySelect.tsxsimilarity index 100%rename from packages/twenty-front/src/pages/settings/profile/appearance/components/DateTimeSettingsCalendarStartDaySelect.tsxrename to packages/twenty-front/src/modules/settings/experience/components/DateTimeSettingsCalendarStartDaySelect.tsxdiff --git a/packages/twenty-front/src/modules/settings/experience/components/FormatPreferencesSettings.tsx b/packages/twenty-front/src/modules/settings/experience/components/FormatPreferencesSettings.tsxindex 8cad343e2d3..8e61db3f2fd 100644--- a/packages/twenty-front/src/modules/settings/experience/components/FormatPreferencesSettings.tsx+++ b/packages/twenty-front/src/modules/settings/experience/components/FormatPreferencesSettings.tsx@@ -17,7 +17,7 @@ import {WorkspaceMemberNumberFormatEnum,WorkspaceMemberTimeFormatEnum,} from '~/generated-metadata/graphql';-import { DateTimeSettingsCalendarStartDaySelect } from '~/pages/settings/profile/appearance/components/DateTimeSettingsCalendarStartDaySelect';+import { DateTimeSettingsCalendarStartDaySelect } from '@/settings/experience/components/DateTimeSettingsCalendarStartDaySelect';import { themeCssVariables } from 'twenty-ui/theme';const StyledContainer = styled.div`diff --git a/packages/twenty-front/src/modules/settings/logic-functions/components/triggers/SettingsLogicFunctionToolTriggerSection.tsx b/packages/twenty-front/src/modules/settings/logic-functions/components/triggers/SettingsLogicFunctionToolTriggerSection.tsxindex ab269cfbb75..d38041c1d26 100644--- a/packages/twenty-front/src/modules/settings/logic-functions/components/triggers/SettingsLogicFunctionToolTriggerSection.tsx+++ b/packages/twenty-front/src/modules/settings/logic-functions/components/triggers/SettingsLogicFunctionToolTriggerSection.tsx@@ -3,7 +3,7 @@ import { useLingui } from '@lingui/react/macro';import { type ToolTriggerSettings } from 'twenty-shared/application';import { DEFAULT_TOOL_INPUT_SCHEMA } from 'twenty-shared/logic-function';import { isDefined } from 'twenty-shared/utils';-import { SettingsToolParameterTable } from '~/pages/settings/ai/components/SettingsToolParameterTable';+import { SettingsToolParameterTable } from '@/settings/ai/components/SettingsToolParameterTable';const DEFAULT_TOOL_TRIGGER_SETTINGS: ToolTriggerSettings = {inputSchema: DEFAULT_TOOL_INPUT_SCHEMA,diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelSection.tsx b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelSection.tsxindex caa34cda94a..f0b9d60db9a 100644--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelSection.tsx+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelSection.tsx@@ -15,7 +15,7 @@ import { SettingsPath } from 'twenty-shared/types';import { Button } from 'twenty-ui/primitives/input';import { themeCssVariables } from 'twenty-ui/theme';import { useNavigateSettings } from '~/hooks/useNavigateSettings';-import { OrganizationAdornment } from '~/pages/settings/enterprise/components/OrganizationAdornment';+import { OrganizationAdornment } from '@/settings/enterprise/components/OrganizationAdornment';const StyledContent = styled.div`padding-bottom: ${themeCssVariables.spacing[2]};diff --git a/packages/twenty-front/src/modules/settings/security/components/SettingsSecuritySettings.tsx b/packages/twenty-front/src/modules/settings/security/components/SettingsSecuritySettings.tsxindex bdf90d58b2c..e9a7e8fbe52 100644--- a/packages/twenty-front/src/modules/settings/security/components/SettingsSecuritySettings.tsx+++ b/packages/twenty-front/src/modules/settings/security/components/SettingsSecuritySettings.tsx@@ -30,7 +30,7 @@ import {BillingEntitlementKey,UpdateWorkspaceDocument,} from '~/generated-metadata/graphql';-import { OrganizationAdornment } from '~/pages/settings/enterprise/components/OrganizationAdornment';+import { OrganizationAdornment } from '@/settings/enterprise/components/OrganizationAdornment';import { getToastOptionsFromError } from '@/error-handler/utils/getToastOptionsFromError';diff --git a/packages/twenty-front/src/modules/settings/usage/components/SettingsUsageAnalyticsSection.tsx b/packages/twenty-front/src/modules/settings/usage/components/SettingsUsageAnalyticsSection.tsxindex 36eb57fe001..5cff09c70ce 100644--- a/packages/twenty-front/src/modules/settings/usage/components/SettingsUsageAnalyticsSection.tsx+++ b/packages/twenty-front/src/modules/settings/usage/components/SettingsUsageAnalyticsSection.tsx@@ -13,7 +13,7 @@ import { SettingsPath } from 'twenty-shared/types';import { getSettingsPath } from 'twenty-shared/utils';import { Section } from 'twenty-ui/components/layout';import { IconSparkles } from 'twenty-ui/icon';-import { SETTINGS_AI_TABS } from '~/pages/settings/ai/constants/SettingsAiTabs';+import { SETTINGS_AI_TABS } from '@/settings/ai/constants/SettingsAiTabs';export const SettingsUsageAnalyticsSection = () => {const isClickHouseConfigured = useAtomStateValue(isClickHouseConfiguredState);diff --git a/packages/twenty-front/src/modules/settings/workspace/components/SettingsWorkspaceEmailChannelDomainStatusCell.tsx b/packages/twenty-front/src/modules/settings/workspace/components/SettingsWorkspaceEmailChannelDomainStatusCell.tsxindex 81c74c7b10a..86e3cd6ef94 100644--- a/packages/twenty-front/src/modules/settings/workspace/components/SettingsWorkspaceEmailChannelDomainStatusCell.tsx+++ b/packages/twenty-front/src/modules/settings/workspace/components/SettingsWorkspaceEmailChannelDomainStatusCell.tsx@@ -3,8 +3,7 @@ import { useQuery } from '@apollo/client/react';import { type MessageChannel } from '@/accounts/types/MessageChannel';import { getEmailChannelDomain } from '@/settings/accounts/utils/getEmailChannelDomain';import { GetEmailingDomainsDocument } from '~/generated-metadata/graphql';-import { getColorByEmailingDomainStatus } from '~/pages/settings/emailing-domains/utils/getEmailingDomainStatusColor';-import { getTextByEmailingDomainStatus } from '~/pages/settings/emailing-domains/utils/getEmailingDomainStatusText';+import { getEmailingDomainStatusDisplay } from '@/settings/emailing-domains/utils/getEmailingDomainStatusDisplay';import { isDefined } from 'twenty-shared/utils';import { Status } from 'twenty-ui/primitives/data-display';@@ -26,9 +25,9 @@ export const SettingsWorkspaceEmailChannelDomainStatusCell = ({return null;}- return (- <Status color={getColorByEmailingDomainStatus(emailingDomain.status)}>- {getTextByEmailingDomainStatus(emailingDomain.status)}- </Status>+ const { label, color } = getEmailingDomainStatusDisplay(+ emailingDomain.status,);++ return <Status color={color}>{label}</Status>;};diff --git a/packages/twenty-front/src/pages/object-record/RecordShowPageContent.tsx b/packages/twenty-front/src/pages/object-record/RecordShowPageContent.tsxindex 1c751ad4a89..5c846020b00 100644--- a/packages/twenty-front/src/pages/object-record/RecordShowPageContent.tsx+++ b/packages/twenty-front/src/pages/object-record/RecordShowPageContent.tsx@@ -1,6 +1,6 @@import { type ReactNode } from 'react';-import { RecordShowPageShell } from '@/object-record/record-show/components/RecordShowPageShell';+import { RecordShowPageShell } from '~/pages/object-record/RecordShowPageShell';import { useRecordShowPage } from '@/object-record/record-show/hooks/useRecordShowPage';import { useRecordShowPageResource } from '@/object-record/record-show/hooks/useRecordShowPageResource';import { type RecordShowPageHeaderTitleMode } from '@/object-record/record-show/types/RecordShowPageHeaderTitleMode';diff --git a/packages/twenty-front/src/modules/object-record/record-show/components/RecordShowPageShell.tsx b/packages/twenty-front/src/pages/object-record/RecordShowPageShell.tsxsimilarity index 100%rename from packages/twenty-front/src/modules/object-record/record-show/components/RecordShowPageShell.tsxrename to packages/twenty-front/src/pages/object-record/RecordShowPageShell.tsxdiff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsEditImapSmtpCaldavConnection.tsx b/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsEditImapSmtpCaldavConnection.tsxsimilarity index 96%rename from packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsEditImapSmtpCaldavConnection.tsxrename to packages/twenty-front/src/pages/settings/accounts/SettingsAccountsEditImapSmtpCaldavConnection.tsxindex 706adafe7f2..c7272d5593e 100644--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsEditImapSmtpCaldavConnection.tsx+++ b/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsEditImapSmtpCaldavConnection.tsx@@ -16,7 +16,7 @@ import { useNavigateSettings } from '~/hooks/useNavigateSettings';import { ACCOUNT_TYPES } from 'twenty-shared/constants';import { NotFound } from '~/pages/not-found/NotFound';import { useImapSmtpCaldavConnectionForm } from '@/settings/accounts/hooks/useImapSmtpCaldavConnectionForm';-import { SettingsAccountsConnectionForm } from './SettingsAccountsConnectionForm';+import { SettingsAccountsConnectionForm } from '@/settings/accounts/components/SettingsAccountsConnectionForm';const StyledLoadingContainer = styled.div`align-items: center;diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsNewEmailGroupChannel.tsx b/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsNewEmailGroupChannel.tsxsimilarity index 100%rename from packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsNewEmailGroupChannel.tsxrename to packages/twenty-front/src/pages/settings/accounts/SettingsAccountsNewEmailGroupChannel.tsxdiff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsNewImapSmtpCaldavConnection.tsx b/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsNewImapSmtpCaldavConnection.tsxsimilarity index 100%rename from packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsNewImapSmtpCaldavConnection.tsxrename to packages/twenty-front/src/pages/settings/accounts/SettingsAccountsNewImapSmtpCaldavConnection.tsxdiff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminNewAiModel.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminNewAiModel.tsxindex 5a3ee33b64c..bb89e41acc3 100644--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminNewAiModel.tsx+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminNewAiModel.tsx@@ -24,7 +24,7 @@ import { Section } from 'twenty-ui/components/layout';import { IconPlus } from 'twenty-ui/icon';import { Checkbox, Switch } from 'twenty-ui/primitives/input';import { themeCssVariables } from 'twenty-ui/theme';-import { OrganizationAdornment } from '~/pages/settings/enterprise/components/OrganizationAdornment';+import { OrganizationAdornment } from '@/settings/enterprise/components/OrganizationAdornment';const StyledComboInputContainer = styled.div`display: flex;diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminNewAiProvider.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminNewAiProvider.tsxindex 1bddd486fc4..4147802f6c9 100644--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminNewAiProvider.tsx+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminNewAiProvider.tsx@@ -26,7 +26,7 @@ import { capitalize, getSettingsPath } from 'twenty-shared/utils';import { InlineBanner, useToast } from 'twenty-ui/components/feedback';import { Section } from 'twenty-ui/components/layout';import { IconPlus } from 'twenty-ui/icon';-import { OrganizationAdornment } from '~/pages/settings/enterprise/components/OrganizationAdornment';+import { OrganizationAdornment } from '@/settings/enterprise/components/OrganizationAdornment';type ModelsDevProvider = { id: string; modelCount: number; npm: AiSdkPackage };diff --git a/packages/twenty-front/src/pages/settings/ai/SettingsAI.tsx b/packages/twenty-front/src/pages/settings/ai/SettingsAI.tsxindex 06c81fb98d5..2c4ef173dcf 100644--- a/packages/twenty-front/src/pages/settings/ai/SettingsAI.tsx+++ b/packages/twenty-front/src/pages/settings/ai/SettingsAI.tsx@@ -26,7 +26,7 @@ import { SettingsAiSystemPromptsSection } from '~/pages/settings/ai/components/Simport { SettingsAiModelsTab } from '~/pages/settings/ai/components/SettingsAiModelsTab';import { SettingsAiOverviewTab } from '~/pages/settings/ai/components/SettingsAiOverviewTab';import { SettingsAiUsageTab } from '~/pages/settings/ai/components/SettingsAiUsageTab';-import { SETTINGS_AI_TABS } from '~/pages/settings/ai/constants/SettingsAiTabs';+import { SETTINGS_AI_TABS } from '@/settings/ai/constants/SettingsAiTabs';import { useCreateTool } from '~/pages/settings/ai/hooks/useCreateTool';const AI_HERO_LIGHT = '/images/ai/ai-tools-cover-light.png';diff --git a/packages/twenty-front/src/pages/settings/ai/SettingsToolDetail.tsx b/packages/twenty-front/src/pages/settings/ai/SettingsToolDetail.tsxindex 5f4a672c9ae..62a209cf75b 100644--- a/packages/twenty-front/src/pages/settings/ai/SettingsToolDetail.tsx+++ b/packages/twenty-front/src/pages/settings/ai/SettingsToolDetail.tsx@@ -26,7 +26,7 @@ import {GetToolInputSchemaDocument,} from '~/generated-metadata/graphql';import { SettingsToolIcon } from '~/pages/settings/ai/components/SettingsToolIcon';-import { SettingsToolParameterTable } from '~/pages/settings/ai/components/SettingsToolParameterTable';+import { SettingsToolParameterTable } from '@/settings/ai/components/SettingsToolParameterTable';const DELETE_TOOL_MODAL_ID = 'delete-tool-modal';diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsAiUsageTab.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsAiUsageTab.tsxindex b5b10e331ed..8ddd65f025c 100644--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsAiUsageTab.tsx+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsAiUsageTab.tsx@@ -14,7 +14,7 @@ import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateimport { t } from '@lingui/core/macro';import { SettingsPath } from 'twenty-shared/types';import { getSettingsPath } from 'twenty-shared/utils';-import { OrganizationAdornment } from '~/pages/settings/enterprise/components/OrganizationAdornment';+import { OrganizationAdornment } from '@/settings/enterprise/components/OrganizationAdornment';import { Section } from 'twenty-ui/components/layout';export const SettingsAiUsageTab = () => {diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsSkillFormContent.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsSkillFormContent.tsxindex cc1f1bd79bd..b9dc6f818bc 100644--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsSkillFormContent.tsx+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsSkillFormContent.tsx@@ -27,7 +27,7 @@ import { useSettingsSkillSave } from '~/pages/settings/ai/hooks/useSettingsSkillimport { type SettingsSkillFormValues } from '~/pages/settings/ai/types/SettingsSkillFormValues';import { getSettingsAiBreadcrumbLinks } from '~/pages/settings/ai/utils/getSettingsAiBreadcrumbLinks';import { getSettingsSkillInitialFormValues } from '~/pages/settings/ai/utils/getSettingsSkillInitialFormValues';-import { computeMetadataNameFromLabel } from '~/pages/settings/data-model/utils/computeMetadataNameFromLabel';+import { computeMetadataNameFromLabel } from '@/object-metadata/utils/computeMetadataNameFromLabel';const StyledFormContainer = styled.div`display: flex;diff --git a/packages/twenty-front/src/pages/settings/ai/utils/getSettingsSkillInitialFormValues.ts b/packages/twenty-front/src/pages/settings/ai/utils/getSettingsSkillInitialFormValues.tsindex a713326b919..505ba9ea627 100644--- a/packages/twenty-front/src/pages/settings/ai/utils/getSettingsSkillInitialFormValues.ts+++ b/packages/twenty-front/src/pages/settings/ai/utils/getSettingsSkillInitialFormValues.ts@@ -1,6 +1,6 @@import { isDefined } from 'twenty-shared/utils';import { type FindOneSkillQuery } from '~/generated-metadata/graphql';-import { computeMetadataNameFromLabel } from '~/pages/settings/data-model/utils/computeMetadataNameFromLabel';+import { computeMetadataNameFromLabel } from '@/object-metadata/utils/computeMetadataNameFromLabel';import { type SettingsSkillFormValues } from '~/pages/settings/ai/types/SettingsSkillFormValues';export const getSettingsSkillInitialFormValues = (diff --git a/packages/twenty-front/src/pages/settings/api-webhooks/SettingsApiWebhooks.tsx b/packages/twenty-front/src/pages/settings/api-webhooks/SettingsApiWebhooks.tsxindex 157fe3225dd..8edac5ac794 100644--- a/packages/twenty-front/src/pages/settings/api-webhooks/SettingsApiWebhooks.tsx+++ b/packages/twenty-front/src/pages/settings/api-webhooks/SettingsApiWebhooks.tsx@@ -27,7 +27,7 @@ import {IconWebhook,} from 'twenty-ui/icon';import { MOBILE_VIEWPORT, themeCssVariables } from 'twenty-ui/theme';-import { SETTINGS_API_WEBHOOKS_TABS } from '~/pages/settings/api-webhooks/constants/SettingsApiWebhooksTabs';+import { SETTINGS_API_WEBHOOKS_TABS } from '@/settings/developers/constants/SettingsApiWebhooksTabs';type TabKey =(typeof SETTINGS_API_WEBHOOKS_TABS.TABS_IDS)[keyof typeof SETTINGS_API_WEBHOOKS_TABS.TABS_IDS];diff --git a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationContentSubtable.tsx b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationContentSubtable.tsxindex 9b3da317b1c..f9012a100f9 100644--- a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationContentSubtable.tsx+++ b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationContentSubtable.tsx@@ -1,4 +1,5 @@import { AppChip } from '@/applications/components/AppChip';+import { type ApplicationContentRow } from '@/settings/applications/types/ApplicationContentRow';import {StyledActionTableCell,StyledNameTableCell,@@ -11,15 +12,6 @@ import { OverflowingTextWithTooltip } from 'twenty-ui/primitives/typography';import { IconChevronRight, useIcons } from 'twenty-ui/icon';import { useTheme, themeCssVariables } from 'twenty-ui/theme';-export type ApplicationContentRow = {- key: string;- name: string;- applicationId?: string;- icon?: string;- secondary?: string;- link?: string;-};-const GRID_TEMPLATE_COLUMNS = '200px 1fr 160px 32px';export const SettingsApplicationContentSubtable = ({diff --git a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationsTable.tsx b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationsTable.tsxindex 716dd4d0034..d3582c9b132 100644--- a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationsTable.tsx+++ b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationsTable.tsx@@ -15,7 +15,7 @@ import {APPLICATION_TABLE_ROW_GRID_TEMPLATE_COLUMNS,SettingsApplicationTableRow,} from '~/pages/settings/applications/components/SettingsApplicationTableRow';-import { type ApplicationWithoutRelation } from '~/pages/settings/applications/types/ApplicationWithoutRelation';+import { type ApplicationWithoutRelation } from '@/applications/types/ApplicationWithoutRelation';import { isNewerSemver } from '~/pages/settings/applications/utils/isNewerSemver';const StyledTableRowsContainer = styled.div`diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationDetailContentTab.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationDetailContentTab.tsxindex 166fd076830..bd3090626ea 100644--- a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationDetailContentTab.tsx+++ b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationDetailContentTab.tsx@@ -11,10 +11,8 @@ import { getSettingsPath, isDefined } from 'twenty-shared/utils';import { SearchInput } from 'twenty-ui/components/input';import { Section } from 'twenty-ui/components/layout';import { type Application } from '~/generated-metadata/graphql';-import {- type ApplicationContentRow,- SettingsApplicationContentSubtable,-} from '~/pages/settings/applications/components/SettingsApplicationContentSubtable';+import { SettingsApplicationContentSubtable } from '~/pages/settings/applications/components/SettingsApplicationContentSubtable';+import { type ApplicationContentRow } from '@/settings/applications/types/ApplicationContentRow';import { useInstalledTimelineActivityTypes } from '~/pages/settings/applications/hooks/useInstalledTimelineActivityTypes';import { filterSettingsApplicationTimelineActivityTypes } from '~/pages/settings/applications/utils/filterSettingsApplicationTimelineActivityTypes';import { getSettingsApplicationTimelineActivityTypes } from '~/pages/settings/applications/utils/getSettingsApplicationTimelineActivityTypes';diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectDetailPage.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectDetailPage.tsxindex 66a29b99c22..6024cddec95 100644--- a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectDetailPage.tsx+++ b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectDetailPage.tsx@@ -37,7 +37,7 @@ import {} from 'twenty-ui/icon';import { useNavigateApp } from '~/hooks/useNavigateApp';import { SETTINGS_OBJECT_DETAIL_TABS } from '~/pages/settings/data-model/constants/SettingsObjectDetailTabs';-import { updatedObjectNamePluralState } from '~/pages/settings/data-model/states/updatedObjectNamePluralState';+import { updatedObjectNamePluralState } from '@/settings/data-model/object-details/states/updatedObjectNamePluralState';const StyledContentContainer = styled.div`flex: 1;diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsxindex 1f32e9248d9..6dde4256200 100644--- a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx+++ b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx@@ -43,7 +43,7 @@ import { themeCssVariables } from 'twenty-ui/theme';import { FieldMetadataType } from '~/generated-metadata/graphql';import { useNavigateApp } from '~/hooks/useNavigateApp';import { useNavigateSettings } from '~/hooks/useNavigateSettings';-import { getFieldMetadataItemInitialValues } from '~/pages/settings/data-model/utils/getFieldMetadataItemInitialValues';+import { getFieldMetadataItemInitialValues } from '@/settings/data-model/fields/forms/utils/getFieldMetadataItemInitialValues';const DELETE_FIELD_MODAL_ID = 'delete-field-confirmation-modal';const StyledDangerButtons = styled.div`diff --git a/packages/twenty-front/src/pages/settings/data-model/constants/MetadataLabelValidPattern.ts b/packages/twenty-front/src/pages/settings/data-model/constants/MetadataLabelValidPattern.tsdeleted file mode 100644index 379d1c9519e..00000000000--- a/packages/twenty-front/src/pages/settings/data-model/constants/MetadataLabelValidPattern.ts+++ /dev/null@@ -1 +0,0 @@-export const METADATA_LABEL_VALID_PATTERN = /^.*$/;diff --git a/packages/twenty-front/src/pages/settings/data-model/new-field/SettingsObjectNewFieldSelect.tsx b/packages/twenty-front/src/pages/settings/data-model/new-field/SettingsObjectNewFieldSelect.tsxindex 6c4bfa5c435..f55553e29f4 100644--- a/packages/twenty-front/src/pages/settings/data-model/new-field/SettingsObjectNewFieldSelect.tsx+++ b/packages/twenty-front/src/pages/settings/data-model/new-field/SettingsObjectNewFieldSelect.tsx@@ -3,11 +3,10 @@ import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteimport { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';import { SettingsPageLayout } from '@/settings/components/layout/SettingsPageLayout';import { SettingsWizardStepBar } from '@/settings/components/layout/SettingsWizardStepBar';-import { SETTINGS_FIELD_TYPE_CONFIGS } from '@/settings/data-model/constants/SettingsFieldTypeConfigs';import { SettingsObjectNewFieldHeaderIcon } from '@/settings/data-model/fields/components/SettingsObjectNewFieldHeaderIcon';import { SettingsObjectNewFieldSelector } from '@/settings/data-model/fields/forms/components/SettingsObjectNewFieldSelector';import { type FieldType } from '@/settings/data-model/types/FieldType';-import { type SettingsFieldType } from '@/settings/data-model/types/SettingsFieldType';+import { settingsDataModelFieldTypeFormSchema } from '@/settings/data-model/fields/forms/validation-schemas/settingsDataModelFieldTypeFormSchema';import { useWorkspaceSurface } from '@/ui/layout/hooks/useWorkspaceSurface';import { zodResolver } from '@hookform/resolvers/zod';import { t } from '@lingui/core/macro';@@ -17,23 +16,9 @@ import { useParams } from 'react-router-dom';import { AppPath, SettingsPath } from 'twenty-shared/types';import { getSettingsPath, isDefined } from 'twenty-shared/utils';import { themeCssVariables } from 'twenty-ui/theme';-import { z } from 'zod';import { FieldMetadataType } from '~/generated-metadata/graphql';import { useNavigateApp } from '~/hooks/useNavigateApp';-export const settingsDataModelFieldTypeFormSchema = z.object({- type: z.enum(- Object.keys(SETTINGS_FIELD_TYPE_CONFIGS) as [- SettingsFieldType,- ...SettingsFieldType[],- ],- ),-});--export type SettingsDataModelFieldTypeFormValues = z.infer<- typeof settingsDataModelFieldTypeFormSchema->;-export const SettingsObjectNewFieldSelect = () => {const navigate = useNavigateApp();const workspaceSurface = useWorkspaceSurface();diff --git a/packages/twenty-front/src/pages/settings/data-model/new-index/SettingsObjectNewIndex.tsx b/packages/twenty-front/src/pages/settings/data-model/new-index/SettingsObjectNewIndex.tsxindex b0b0a7e4b61..afa50b0c325 100644--- a/packages/twenty-front/src/pages/settings/data-model/new-index/SettingsObjectNewIndex.tsx+++ b/packages/twenty-front/src/pages/settings/data-model/new-index/SettingsObjectNewIndex.tsx@@ -28,7 +28,7 @@ import { useNavigateSettings } from '~/hooks/useNavigateSettings';import {settingsObjectNewIndexFormSchema,type SettingsObjectNewIndexFormValues,-} from '~/pages/settings/data-model/new-index/SettingsObjectNewIndexFormValues';+} from '@/settings/data-model/indexes/forms/validation-schemas/settingsObjectNewIndexFormSchema';const isFieldIndexable = (field: FieldMetadataItem): boolean => {if (field.name === SEARCH_VECTOR_FIELD_NAME) return false;diff --git a/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx b/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsxindex 77457802045..79e9e90145f 100644--- a/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx+++ b/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx@@ -34,7 +34,7 @@ import {RevokeApiKeyDocument,} from '~/generated-metadata/graphql';import { useNavigateSettings } from '~/hooks/useNavigateSettings';-import { SETTINGS_API_WEBHOOKS_TABS } from '~/pages/settings/api-webhooks/constants/SettingsApiWebhooksTabs';+import { SETTINGS_API_WEBHOOKS_TABS } from '@/settings/developers/constants/SettingsApiWebhooksTabs';const StyledInfo = styled.span`color: ${themeCssVariables.font.color.light};diff --git a/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx b/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsxindex b9d39572f56..8c78f6be971 100644--- a/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx+++ b/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeysNew.tsx@@ -23,7 +23,7 @@ import {GetApiKeysDocument,} from '~/generated-metadata/graphql';import { useNavigateSettings } from '~/hooks/useNavigateSettings';-import { SETTINGS_API_WEBHOOKS_TABS } from '~/pages/settings/api-webhooks/constants/SettingsApiWebhooksTabs';+import { SETTINGS_API_WEBHOOKS_TABS } from '@/settings/developers/constants/SettingsApiWebhooksTabs';import { Section } from 'twenty-ui/components/layout';export const SettingsDevelopersApiKeysNew = () => {diff --git a/packages/twenty-front/src/pages/settings/developers/playground/SettingsGraphQLPlayground.tsx b/packages/twenty-front/src/pages/settings/developers/playground/SettingsGraphQLPlayground.tsxindex d7e54ca7ddb..1ba90904da1 100644--- a/packages/twenty-front/src/pages/settings/developers/playground/SettingsGraphQLPlayground.tsx+++ b/packages/twenty-front/src/pages/settings/developers/playground/SettingsGraphQLPlayground.tsx@@ -7,7 +7,7 @@ import { Trans } from '@lingui/react/macro';import { useParams } from 'react-router-dom';import { getSettingsPath } from 'twenty-shared/utils';import { useNavigateSettings } from '~/hooks/useNavigateSettings';-import { SETTINGS_API_WEBHOOKS_TABS } from '~/pages/settings/api-webhooks/constants/SettingsApiWebhooksTabs';+import { SETTINGS_API_WEBHOOKS_TABS } from '@/settings/developers/constants/SettingsApiWebhooksTabs';export const SettingsGraphQLPlayground = () => {const navigateSettings = useNavigateSettings();diff --git a/packages/twenty-front/src/pages/settings/developers/playground/SettingsRestPlayground.tsx b/packages/twenty-front/src/pages/settings/developers/playground/SettingsRestPlayground.tsxindex 81a9cca57b5..aa79cd2329a 100644--- a/packages/twenty-front/src/pages/settings/developers/playground/SettingsRestPlayground.tsx+++ b/packages/twenty-front/src/pages/settings/developers/playground/SettingsRestPlayground.tsx@@ -7,7 +7,7 @@ import { useParams } from 'react-router-dom';import { SettingsPath } from 'twenty-shared/types';import { getSettingsPath } from 'twenty-shared/utils';import { useNavigateSettings } from '~/hooks/useNavigateSettings';-import { SETTINGS_API_WEBHOOKS_TABS } from '~/pages/settings/api-webhooks/constants/SettingsApiWebhooksTabs';+import { SETTINGS_API_WEBHOOKS_TABS } from '@/settings/developers/constants/SettingsApiWebhooksTabs';export const SettingsRestPlayground = () => {const navigateSettings = useNavigateSettings();diff --git a/packages/twenty-front/src/pages/settings/developers/webhooks/constants/WebhookEmptyOperation.ts b/packages/twenty-front/src/pages/settings/developers/webhooks/constants/WebhookEmptyOperation.tsdeleted file mode 100644index b193ebfb226..00000000000--- a/packages/twenty-front/src/pages/settings/developers/webhooks/constants/WebhookEmptyOperation.ts+++ /dev/null@@ -1,6 +0,0 @@-import { type WebhookOperationType } from '~/pages/settings/developers/webhooks/types/WebhookOperationsType';--export const WEBHOOK_EMPTY_OPERATION: WebhookOperationType = {- object: null,- action: '*',-};diff --git a/packages/twenty-front/src/pages/settings/emailing-domains/utils/getEmailingDomainStatusColor.ts b/packages/twenty-front/src/pages/settings/emailing-domains/utils/getEmailingDomainStatusColor.tsdeleted file mode 100644index ba3c07c3651..00000000000--- a/packages/twenty-front/src/pages/settings/emailing-domains/utils/getEmailingDomainStatusColor.ts+++ /dev/null@@ -1,18 +0,0 @@-import { EmailingDomainStatus } from '~/generated-metadata/graphql';--export const getColorByEmailingDomainStatus = (- status: EmailingDomainStatus,-) => {- switch (status) {- case EmailingDomainStatus.VERIFIED:- return 'turquoise';- case EmailingDomainStatus.PENDING:- return 'orange';- case EmailingDomainStatus.TEMPORARY_FAILURE:- return 'orange';- case EmailingDomainStatus.FAILED:- return 'red';- default:- return 'gray';- }-};diff --git a/packages/twenty-front/src/pages/settings/emailing-domains/utils/getEmailingDomainStatusText.ts b/packages/twenty-front/src/pages/settings/emailing-domains/utils/getEmailingDomainStatusText.tsdeleted file mode 100644index 8907a905d69..00000000000--- a/packages/twenty-front/src/pages/settings/emailing-domains/utils/getEmailingDomainStatusText.ts+++ /dev/null@@ -1,17 +0,0 @@-import { t } from '@lingui/core/macro';-import { EmailingDomainStatus } from '~/generated-metadata/graphql';--export const getTextByEmailingDomainStatus = (status: EmailingDomainStatus) => {- switch (status) {- case EmailingDomainStatus.VERIFIED:- return t`Verified`;- case EmailingDomainStatus.PENDING:- return t`Pending`;- case EmailingDomainStatus.TEMPORARY_FAILURE:- return t`Temporary Failure`;- case EmailingDomainStatus.FAILED:- return t`Failed`;- default:- return t`Unknown`;- }-};