move implementation to a private method

Author: gitstart-twenty

nx.json

@@ -32,7 +32,7 @@
     },
     "start": {
       "cache": true,
-      "dependsOn": ["^build"]
+      "dependsOn": ["^typecheck","^build"]
     },
     "lint": {
       "executor": "@nx/eslint:lint",

packages/twenty-chrome-extension/src/generated/graphql.tsx

@@ -7455,7 +7455,7 @@ export type Workspace = {
   billingSubscriptions?: Maybe<Array<BillingSubscription>>;
   createdAt: Scalars['DateTime'];
   currentBillingSubscription?: Maybe<BillingSubscription>;
-  currentCacheVersion?: Maybe<Scalars['String']>;
+  metadataVersion?: Maybe<Scalars['String']>;
   deletedAt?: Maybe<Scalars['DateTime']>;
   displayName?: Maybe<Scalars['String']>;
   domainName?: Maybe<Scalars['String']>;

packages/twenty-front/project.json

@@ -10,6 +10,12 @@
         "outputPath": "{projectRoot}/build"
       }
     },
+    "serve": {
+      "executor": "nx:run-commands",
+      "options": {
+        "command": "npx serve -s {projectRoot}/build"
+      }
+    },
     "start": {
       "executor": "@nx/vite:dev-server",
       "options": {

packages/twenty-front/src/generated-metadata/graphql.ts

@@ -1380,14 +1380,17 @@ export type Workspace = {
   billingSubscriptions?: Maybe<Array<BillingSubscription>>;
   createdAt: Scalars['DateTime']['output'];
   currentBillingSubscription?: Maybe<BillingSubscription>;
-  currentCacheVersion?: Maybe<Scalars['String']['output']>;
+  currentMetadataVersion: Scalars['Float']['output'];
+  databaseSchema: Scalars['String']['output'];
+  databaseUrl: Scalars['String']['output'];
   deletedAt?: Maybe<Scalars['DateTime']['output']>;
   displayName?: Maybe<Scalars['String']['output']>;
   domainName?: Maybe<Scalars['String']['output']>;
   featureFlags?: Maybe<Array<FeatureFlag>>;
   id: Scalars['UUID']['output'];
   inviteHash?: Maybe<Scalars['String']['output']>;
   logo?: Maybe<Scalars['String']['output']>;
+  metadataVersion: Scalars['Float']['output'];
   updatedAt: Scalars['DateTime']['output'];
   workspaceMembersCount?: Maybe<Scalars['Float']['output']>;
 };

packages/twenty-front/src/generated/graphql.tsx

@@ -1,6 +1,6 @@
+import { InMemoryCache, NormalizedCacheObject } from '@apollo/client';
 import { useMemo, useRef } from 'react';
 import { useLocation, useNavigate } from 'react-router-dom';
-import { InMemoryCache, NormalizedCacheObject } from '@apollo/client';
 import { useRecoilState, useSetRecoilState } from 'recoil';
 
 import { currentUserState } from '@/auth/states/currentUserState';
@@ -49,8 +49,8 @@ export const useApolloFactory = (options: Partial<Options<any>> = {}) => {
         },
       }),
       headers: {
-        ...(currentWorkspace?.currentCacheVersion && {
-          'X-Schema-Version': currentWorkspace.currentCacheVersion,
+        ...(currentWorkspace?.metadataVersion && {
+          'X-Schema-Version': `${currentWorkspace.metadataVersion}`,
         }),
       },
       defaultOptions: {
@@ -95,7 +95,7 @@ export const useApolloFactory = (options: Partial<Options<any>> = {}) => {
     setCurrentWorkspace,
     setWorkspaces,
     isDebugMode,
-    currentWorkspace?.currentCacheVersion,
+    currentWorkspace?.metadataVersion,
     setPreviousUrl,
   ]);
 

packages/twenty-front/src/modules/apollo/hooks/useApolloFactory.ts

@@ -13,7 +13,7 @@ export type CurrentWorkspace = Pick<
   | 'activationStatus'
   | 'currentBillingSubscription'
   | 'workspaceMembersCount'
-  | 'currentCacheVersion'
+  | 'metadataVersion'
 >;
 
 export const currentWorkspaceState = createState<CurrentWorkspace | null>({

packages/twenty-front/src/modules/auth/states/currentWorkspaceState.ts

@@ -27,6 +27,7 @@ export const StyledSelectableItem = styled(SelectableItem)`
   height: 100%;
   width: 100%;
 `;
+
 export const MultiRecordSelect = ({
   onChange,
   onSubmit,

packages/twenty-front/src/modules/object-record/relation-picker/components/MultiRecordSelect.tsx

@@ -10,7 +10,7 @@ import { FieldContext } from '@/object-record/record-field/contexts/FieldContext
 import { BooleanFieldInput } from '@/object-record/record-field/meta-types/input/components/BooleanFieldInput';
 import { RatingFieldInput } from '@/object-record/record-field/meta-types/input/components/RatingFieldInput';
 import { SettingsDataModelSetFieldValueEffect } from '@/settings/data-model/fields/preview/components/SettingsDataModelSetFieldValueEffect';
-import { SettingsDataModelSetRecordEffect } from '@/settings/data-model/fields/preview/components/SettingsDataModelSetRecordEffect';
+import { SettingsDataModelSetPreviewRecordEffect } from '@/settings/data-model/fields/preview/components/SettingsDataModelSetRecordEffect';
 import { useFieldPreviewValue } from '@/settings/data-model/fields/preview/hooks/useFieldPreviewValue';
 import { usePreviewRecord } from '@/settings/data-model/fields/preview/hooks/usePreviewRecord';
 import { FieldMetadataType } from '~/generated-metadata/graphql';
@@ -96,7 +96,7 @@ export const SettingsDataModelFieldPreview = ({
   return (
     <>
       {previewRecord ? (
-        <SettingsDataModelSetRecordEffect
+        <SettingsDataModelSetPreviewRecordEffect
           fieldName={fieldName}
           record={previewRecord}
         />

packages/twenty-front/src/modules/settings/data-model/fields/preview/components/SettingsDataModelFieldPreview.tsx

@@ -1,7 +1,7 @@
 import { useSetRecordFieldValue } from '@/object-record/record-store/contexts/RecordFieldValueSelectorContext';
 import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';
 import { recordStoreFamilySelector } from '@/object-record/record-store/states/selectors/recordStoreFamilySelector';
-import { previewRecordIdState } from '@/settings/data-model/fields/preview/states/previewRecordIdState';
+import { settingsPreviewRecordIdState } from '@/settings/data-model/fields/preview/states/settingsPreviewRecordIdState';
 import { useEffect } from 'react';
 import { useRecoilValue, useSetRecoilState } from 'recoil';
 import { isDefined } from '~/utils/isDefined';
@@ -17,10 +17,10 @@ export const SettingsDataModelSetFieldValueEffect = ({
   fieldName,
   value,
 }: SettingsDataModelSetFieldValueEffectProps) => {
-  const previewRecordId = useRecoilValue(previewRecordIdState);
+  const settingsPreviewRecordId = useRecoilValue(settingsPreviewRecordIdState);
 
   const upsertedPreviewRecord = useRecoilValue(
-    recordStoreFamilyState(previewRecordId ?? ''),
+    recordStoreFamilyState(settingsPreviewRecordId ?? ''),
   );
 
   const setFieldValue = useSetRecoilState(

packages/twenty-front/src/modules/settings/data-model/fields/preview/components/SettingsDataModelSetFieldValueEffect.tsx

@@ -1,34 +1,36 @@
 import { useSetRecordFieldValue } from '@/object-record/record-store/contexts/RecordFieldValueSelectorContext';
 import { useUpsertRecordsInStore } from '@/object-record/record-store/hooks/useUpsertRecordsInStore';
 import { ObjectRecord } from '@/object-record/types/ObjectRecord';
-import { previewRecordIdState } from '@/settings/data-model/fields/preview/states/previewRecordIdState';
+import { settingsPreviewRecordIdState } from '@/settings/data-model/fields/preview/states/settingsPreviewRecordIdState';
 import { useEffect } from 'react';
 import { useSetRecoilState } from 'recoil';
 
-type SettingsDataModelSetRecordEffectProps = {
+type SettingsDataModelSetPreviewRecordEffectProps = {
   record: ObjectRecord;
   fieldName: string;
 };
 
-export const SettingsDataModelSetRecordEffect = ({
+export const SettingsDataModelSetPreviewRecordEffect = ({
   record,
   fieldName,
-}: SettingsDataModelSetRecordEffectProps) => {
+}: SettingsDataModelSetPreviewRecordEffectProps) => {
   const { upsertRecords: upsertRecordsInStore } = useUpsertRecordsInStore();
   const setRecordFieldValue = useSetRecordFieldValue();
 
-  const setPreviewRecordId = useSetRecoilState(previewRecordIdState);
+  const setSettingsPreviewRecordId = useSetRecoilState(
+    settingsPreviewRecordIdState,
+  );
 
   useEffect(() => {
     upsertRecordsInStore([record]);
     setRecordFieldValue(record.id, fieldName, record[fieldName]);
-    setPreviewRecordId(record.id);
+    setSettingsPreviewRecordId(record.id);
   }, [
     record,
     upsertRecordsInStore,
     setRecordFieldValue,
     fieldName,
-    setPreviewRecordId,
+    setSettingsPreviewRecordId,
   ]);
 
   return null;

packages/twenty-front/src/modules/settings/data-model/fields/preview/components/SettingsDataModelSetRecordEffect.tsx

@@ -0,0 +1,6 @@
+import { createState } from 'twenty-ui';
+
+export const settingsPreviewRecordIdState = createState<string | null>({
+  key: 'settingsPreviewRecordIdState',
+  defaultValue: null,
+});

packages/twenty-front/src/modules/settings/data-model/fields/preview/states/previewRecordIdState.ts

@@ -15,6 +15,7 @@ const meta: Meta<typeof Status> = {
   component: Status,
   args: {
     text: 'Urgent',
+    weight: 'medium',
   },
 };
 

packages/twenty-front/src/modules/settings/data-model/fields/preview/states/settingsPreviewRecordIdState.ts

@@ -29,7 +29,7 @@ export const USER_QUERY_FRAGMENT = gql`
         value
         workspaceId
       }
-      currentCacheVersion
+      metadataVersion
       currentBillingSubscription {
         id
         status

packages/twenty-front/src/modules/ui/display/status/components/__stories__/Status.stories.tsx

@@ -63,14 +63,16 @@ export const mockDefaultWorkspace: Workspace = {
   ],
   createdAt: '2023-04-26T10:23:42.33625+00:00',
   updatedAt: '2023-04-26T10:23:42.33625+00:00',
-  currentCacheVersion: '1',
+  metadataVersion: 1,
   currentBillingSubscription: {
     __typename: 'BillingSubscription',
     id: '7efbc3f7-6e5e-4128-957e-8d86808cdf6a',
     interval: SubscriptionInterval.Month,
     status: SubscriptionStatus.Active,
   },
   workspaceMembersCount: 1,
+  databaseSchema: '',
+  databaseUrl: '',
 };
 
 export const mockedWorkspaceMemberData: WorkspaceMember = {

packages/twenty-front/src/modules/users/graphql/fragments/userQueryFragment.ts

@@ -9,10 +9,6 @@ describe('title-utils', () => {
     expect(getPageTitleFromPath('/invite/:workspaceInviteHash')).toBe('Invite');
     expect(getPageTitleFromPath('/create/workspace')).toBe('Create Workspace');
     expect(getPageTitleFromPath('/create/profile')).toBe('Create Profile');
-    expect(getPageTitleFromPath('/tasks')).toBe('Tasks');
-    expect(getPageTitleFromPath('/objects/opportunities')).toBe(
-      'Opportunities',
-    );
     expect(getPageTitleFromPath('/settings/objects/opportunities')).toBe(
       SettingsPageTitles.Objects,
     );

packages/twenty-front/src/testing/mock-data/users.ts

@@ -0,0 +1,13 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "types": ["node"]
+  },
+  "include": [
+    "src/**/*.js",
+    "src/**/*.jsx",
+    "src/**/*.d.ts",
+    "src/**/*.ts",
+    "src/**/*.tsx"
+  ]
+}

packages/twenty-front/src/utils/__tests__/title-utils.test.ts

@@ -32,7 +32,10 @@
   "include": [],
   "references": [
     {
-      "path": "./tsconfig.app.json"
+      "path": "./tsconfig.dev.json"
+    },
+    {
+      "path": "./tsconfig.build.json"
     },
     {
       "path": "./tsconfig.spec.json"
@@ -42,4 +45,4 @@
     }
   ],
   "extends": "../../tsconfig.base.json"
-}
+}

packages/twenty-front/tsconfig.app.json renamed to packages/twenty-front/tsconfig.build.json

@@ -19,9 +19,13 @@ export default defineConfig(({ command, mode }) => {
 
   const isBuildCommand = command === 'build';
 
+  const tsConfigPath = isBuildCommand
+    ? path.resolve(__dirname, './tsconfig.build.json')
+    : path.resolve(__dirname, './tsconfig.dev.json');
+
   const checkers: Checkers = {
     typescript: {
-      tsconfigPath: path.resolve(__dirname, './tsconfig.app.json'),
+      tsconfigPath: tsConfigPath,
     },
     overlay: false,
   };

packages/twenty-front/tsconfig.dev.json

@@ -8,6 +8,6 @@ declare module 'express-serve-static-core' {
     apiKey?: ApiKeyWorkspaceEntity | null;
     workspace?: Workspace;
     workspaceId?: string;
-    cacheVersion?: string | null;
+    workspaceMetadataVersion?: number;
   }
 }

packages/twenty-front/tsconfig.json

@@ -32,7 +32,7 @@ index 16843949d8589a299d8195b0a349ac4dac0bacbf..21e7fe2bbcba36b04a274be9d2219fd3
              ...options,
 +            schema: async (request) => {
 +                const workspaceId = request.req.workspace?.id ?? 'anonymous'
-+                const workspaceCacheVersion = request.req.cacheVersion ?? '0'
++                const workspaceCacheVersion = request.req.workspaceMetadataVersion ?? '0'
 +                const workspaceUserId = request.req.user?.id ?? 'anonymous'
 +                const url = request.req.baseUrl
 +
@@ -79,7 +79,7 @@ index 16843949d8589a299d8195b0a349ac4dac0bacbf..21e7fe2bbcba36b04a274be9d2219fd3
              ...options,
 +            schema: async (request) => {
 +                const workspaceId = request.req.workspace?.id ?? 'anonymous'
-+                const workspaceCacheVersion = request.req.cacheVersion ?? '0'
++                const workspaceCacheVersion = request.req.workspaceMetadataVersion ?? '0'
 +                const workspaceUserId = request.req.user?.id ?? 'anonymous'
 +                const url = request.req.baseUrl
 +
@@ -146,7 +146,7 @@ index 7068c519320b379917c46763cd280b1cdd3e48f0..418e1030373fc1e0fb85a932ac8da9b3
              ...options,
 +            schema: async (request) => {
 +                const workspaceId = request.req.workspace?.id ?? 'anonymous'
-+                const workspaceCacheVersion = request.req.cacheVersion ?? '0'
++                const workspaceCacheVersion = request.req.workspaceMetadataVersion ?? '0'
 +                const workspaceUserId = request.req.user?.id ?? 'anonymous'
 +                const url = request.req.baseUrl
 +
@@ -193,7 +193,7 @@ index 7068c519320b379917c46763cd280b1cdd3e48f0..418e1030373fc1e0fb85a932ac8da9b3
              ...options,
 +            schema: async (request) => {
 +                const workspaceId = request.req.workspace?.id ?? 'anonymous'
-+                const workspaceCacheVersion = request.req.cacheVersion ?? '0'
++                const workspaceCacheVersion = request.req.workspaceMetadataVersion ?? '0'
 +                const workspaceUserId = request.req.user?.id ?? 'anonymous'
 +                const url = request.req.baseUrl
 +
@@ -387,7 +387,7 @@ index ce142f61ede52499485b19d8af057f4cb828d0f7..5888d31cae1b7aca57ed0819209812ac
        ...options,
 +      schema: async request => {
 +        const workspaceId = request.req.workspace.id
-+        const workspaceCacheVersion = request.req.cacheVersion
++        const workspaceCacheVersion = request.req.workspaceMetadataVersion
 +        const workspaceUserId = request.req.user?.id ?? 'anonymous'
 +        const url = request.req.baseUrl
 +
@@ -448,7 +448,7 @@ index ce142f61ede52499485b19d8af057f4cb828d0f7..5888d31cae1b7aca57ed0819209812ac
        ...options,
 +      schema: async request => {
 +        const workspaceId = request.req.workspace.id
-+        const workspaceCacheVersion = request.req.cacheVersion
++        const workspaceCacheVersion = request.req.workspaceMetadataVersion
 +        const workspaceUserId = request.req.user?.id ?? 'anonymous'
 +        const url = request.req.baseUrl
 +

packages/twenty-front/vite.config.ts

@@ -5,27 +5,27 @@ import {
   RequestMethod,
 } from '@nestjs/common';
 import { ConfigModule } from '@nestjs/config';
-import { ServeStaticModule } from '@nestjs/serve-static';
 import { GraphQLModule } from '@nestjs/graphql';
+import { ServeStaticModule } from '@nestjs/serve-static';
 
 import { existsSync } from 'fs';
 import { join } from 'path';
 
-import { YogaDriverConfig, YogaDriver } from '@graphql-yoga/nestjs';
+import { YogaDriver, YogaDriverConfig } from '@graphql-yoga/nestjs';
 
-import { RestApiModule } from 'src/engine/api/rest/rest-api.module';
-import { ModulesModule } from 'src/modules/modules.module';
 import { CoreGraphQLApiModule } from 'src/engine/api/graphql/core-graphql-api.module';
-import { MetadataGraphQLApiModule } from 'src/engine/api/graphql/metadata-graphql-api.module';
 import { GraphQLConfigModule } from 'src/engine/api/graphql/graphql-config/graphql-config.module';
 import { GraphQLConfigService } from 'src/engine/api/graphql/graphql-config/graphql-config.service';
-import { WorkspaceCacheVersionModule } from 'src/engine/metadata-modules/workspace-cache-version/workspace-cache-version.module';
-import { GraphQLHydrateRequestFromTokenMiddleware } from 'src/engine/middlewares/graphql-hydrate-request-from-token.middleware';
-import { MessageQueueModule } from 'src/engine/integrations/message-queue/message-queue.module';
+import { MetadataGraphQLApiModule } from 'src/engine/api/graphql/metadata-graphql-api.module';
+import { RestApiModule } from 'src/engine/api/rest/rest-api.module';
 import { MessageQueueDriverType } from 'src/engine/integrations/message-queue/interfaces';
+import { MessageQueueModule } from 'src/engine/integrations/message-queue/message-queue.module';
+import { WorkspaceMetadataVersionModule } from 'src/engine/metadata-modules/workspace-metadata-version/workspace-metadata-version.module';
+import { GraphQLHydrateRequestFromTokenMiddleware } from 'src/engine/middlewares/graphql-hydrate-request-from-token.middleware';
+import { ModulesModule } from 'src/modules/modules.module';
 
-import { IntegrationsModule } from './engine/integrations/integrations.module';
 import { CoreEngineModule } from './engine/core-modules/core-engine.module';
+import { IntegrationsModule } from './engine/integrations/integrations.module';
 
 @Module({
   imports: [
@@ -52,7 +52,7 @@ import { CoreEngineModule } from './engine/core-modules/core-engine.module';
     // Modules module, contains all business logic modules
     ModulesModule,
     // Needed for the user workspace middleware
-    WorkspaceCacheVersionModule,
+    WorkspaceMetadataVersionModule,
     // Api modules
     CoreGraphQLApiModule,
     MetadataGraphQLApiModule,