fix: sync multiple issues

twentyhq · May 13, 2024 · 9db2e03 · 9db2e03
1 parent 55e4769
commit 9db2e03
Show file tree

Hide file tree

Showing 18 changed files with 180 additions and 120 deletions.
diff --git a/packages/twenty-server/src/app.module.ts b/packages/twenty-server/src/app.module.ts
@@ -7,7 +7,6 @@ import {
 import { ConfigModule } from '@nestjs/config';
 import { ServeStaticModule } from '@nestjs/serve-static';
 import { GraphQLModule } from '@nestjs/graphql';
-import { DevtoolsModule } from '@nestjs/devtools-integration';
 
 import { existsSync } from 'fs';
 import { join } from 'path';
@@ -20,7 +19,6 @@ import { CoreGraphQLApiModule } from 'src/engine/api/graphql/core-graphql-api.mo
 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 { EnvironmentService } from 'src/engine/integrations/environment/environment.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';
 
@@ -30,13 +28,13 @@ import { IntegrationsModule } from './engine/integrations/integrations.module';
 @Module({
   imports: [
     // Nest.js devtools, use devtools.nestjs.com to debug
-    DevtoolsModule.registerAsync({
-      useFactory: (environmentService: EnvironmentService) => ({
-        http: environmentService.get('DEBUG_MODE'),
-        port: environmentService.get('DEBUG_PORT'),
-      }),
-      inject: [EnvironmentService],
-    }),
+    // DevtoolsModule.registerAsync({
+    //   useFactory: (environmentService: EnvironmentService) => ({
+    //     http: environmentService.get('DEBUG_MODE'),
+    //     port: environmentService.get('DEBUG_PORT'),
+    //   }),
+    //   inject: [EnvironmentService],
+    // }),
     ConfigModule.forRoot({
       isGlobal: true,
     }),

diff --git a/...es/twenty-server/src/engine/twenty-orm/decorators/workspace-dynamic-relation.decorator.ts b/...es/twenty-server/src/engine/twenty-orm/decorators/workspace-dynamic-relation.decorator.ts
@@ -21,11 +21,12 @@ export function WorkspaceDynamicRelation<TClass extends object>(
   args: WorkspaceBaseDynamicRelationOptions<TClass>,
 ): PropertyDecorator {
   return (target, propertyKey) => {
-    const isSystem = TypedReflect.getMetadata(
-      'workspace:is-system-metadata-args',
-      target,
-      propertyKey.toString(),
-    );
+    const isSystem =
+      TypedReflect.getMetadata(
+        'workspace:is-system-metadata-args',
+        target,
+        propertyKey.toString(),
+      ) ?? false;
     const gate = TypedReflect.getMetadata(
       'workspace:gate-metadata-args',
       target,
@@ -39,8 +40,9 @@ export function WorkspaceDynamicRelation<TClass extends object>(
       inverseSideTarget: args.inverseSideTarget,
       inverseSideFieldKey: args.inverseSideFieldKey as string | undefined,
       onDelete: args.onDelete,
-      isSystem: isSystem,
+      isSystem,
       isNullable: true,
+      isPrimary: false,
       gate,
     });
   };

diff --git a/packages/twenty-server/src/engine/twenty-orm/decorators/workspace-field.decorator.ts b/packages/twenty-server/src/engine/twenty-orm/decorators/workspace-field.decorator.ts
@@ -16,29 +16,31 @@ export interface WorkspaceFieldOptions<
   description?: string | ((objectMetadata: ObjectMetadataEntity) => string);
   icon?: string;
   defaultValue?: FieldMetadataDefaultValue<T>;
-  joinColumn?: string;
   options?: FieldMetadataOptions<T>;
 }
 
 export function WorkspaceField<T extends FieldMetadataType>(
   options: WorkspaceFieldOptions<T>,
 ): PropertyDecorator {
   return (object, propertyKey) => {
-    const isPrimary = TypedReflect.getMetadata(
-      'workspace:is-primary-field-metadata-args',
-      object,
-      propertyKey.toString(),
-    );
-    const isNullable = TypedReflect.getMetadata(
-      'workspace:is-nullable-metadata-args',
-      object,
-      propertyKey.toString(),
-    );
-    const isSystem = TypedReflect.getMetadata(
-      'workspace:is-system-metadata-args',
-      object,
-      propertyKey.toString(),
-    );
+    const isPrimary =
+      TypedReflect.getMetadata(
+        'workspace:is-primary-field-metadata-args',
+        object,
+        propertyKey.toString(),
+      ) ?? false;
+    const isNullable =
+      TypedReflect.getMetadata(
+        'workspace:is-nullable-metadata-args',
+        object,
+        propertyKey.toString(),
+      ) ?? false;
+    const isSystem =
+      TypedReflect.getMetadata(
+        'workspace:is-system-metadata-args',
+        object,
+        propertyKey.toString(),
+      ) ?? false;
     const gate = TypedReflect.getMetadata(
       'workspace:gate-metadata-args',
       object,

diff --git a/packages/twenty-server/src/engine/twenty-orm/decorators/workspace-object.decorator.ts b/packages/twenty-server/src/engine/twenty-orm/decorators/workspace-object.decorator.ts
@@ -20,10 +20,9 @@ export function WorkspaceEntity(
         'workspace:is-audit-logged-metadata-args',
         target,
       ) ?? true;
-    const isSystem = TypedReflect.getMetadata(
-      'workspace:is-system-metadata-args',
-      target,
-    );
+    const isSystem =
+      TypedReflect.getMetadata('workspace:is-system-metadata-args', target) ??
+      false;
     const gate = TypedReflect.getMetadata(
       'workspace:gate-metadata-args',
       target,

diff --git a/packages/twenty-server/src/engine/twenty-orm/decorators/workspace-relation.decorator.ts b/packages/twenty-server/src/engine/twenty-orm/decorators/workspace-relation.decorator.ts
@@ -39,21 +39,24 @@ export function WorkspaceRelation<TClass extends object>(
     | WorkspaceOtherRelationOptions<TClass>,
 ): PropertyDecorator {
   return (object, propertyKey) => {
-    const isPrimary = TypedReflect.getMetadata(
-      'workspace:is-primary-field-metadata-args',
-      object,
-      propertyKey.toString(),
-    );
-    const isNullable = TypedReflect.getMetadata(
-      'workspace:is-nullable-metadata-args',
-      object,
-      propertyKey.toString(),
-    );
-    const isSystem = TypedReflect.getMetadata(
-      'workspace:is-system-metadata-args',
-      object,
-      propertyKey.toString(),
-    );
+    const isPrimary =
+      TypedReflect.getMetadata(
+        'workspace:is-primary-field-metadata-args',
+        object,
+        propertyKey.toString(),
+      ) ?? false;
+    const isNullable =
+      TypedReflect.getMetadata(
+        'workspace:is-nullable-metadata-args',
+        object,
+        propertyKey.toString(),
+      ) ?? false;
+    const isSystem =
+      TypedReflect.getMetadata(
+        'workspace:is-system-metadata-args',
+        object,
+        propertyKey.toString(),
+      ) ?? false;
     const gate = TypedReflect.getMetadata(
       'workspace:gate-metadata-args',
       object,

diff --git a/...er/src/engine/twenty-orm/interfaces/workspace-dynamic-relation-metadata-args.interface.ts b/...er/src/engine/twenty-orm/interfaces/workspace-dynamic-relation-metadata-args.interface.ts
@@ -47,7 +47,7 @@ export interface WorkspaceDynamicRelationMetadataArgs {
    * Class to which relation is applied.
    */
   // eslint-disable-next-line @typescript-eslint/ban-types
-  readonly target: Function | string;
+  readonly target: Function;
 
   /**
    * Factory function
@@ -77,17 +77,17 @@ export interface WorkspaceDynamicRelationMetadataArgs {
   /**
    * Is primary field.
    */
-  readonly isPrimary?: boolean;
+  readonly isPrimary: boolean;
 
   /**
    * Is system field.
    */
-  readonly isSystem?: boolean;
+  readonly isSystem: boolean;
 
   /**
    * Is nullable field.
    */
-  readonly isNullable?: boolean;
+  readonly isNullable: boolean;
 
   /**
    * Field gate.

diff --git a/...wenty-server/src/engine/twenty-orm/interfaces/workspace-entity-metadata-args.interface.ts b/...wenty-server/src/engine/twenty-orm/interfaces/workspace-entity-metadata-args.interface.ts
@@ -12,7 +12,7 @@ export interface WorkspaceEntityMetadataArgs {
    * String target is a table defined in a json schema.
    */
   // eslint-disable-next-line @typescript-eslint/ban-types
-  readonly target: Function | string;
+  readonly target: Function;
 
   /**
    * Entity name.
@@ -44,7 +44,7 @@ export interface WorkspaceEntityMetadataArgs {
   /**
    * Is system object.
    */
-  readonly isSystem?: boolean;
+  readonly isSystem: boolean;
 
   /**
    * Entity gate.

diff --git a/...ver/src/engine/twenty-orm/interfaces/workspace-extended-entity-metadata-args.interface.ts b/...ver/src/engine/twenty-orm/interfaces/workspace-extended-entity-metadata-args.interface.ts
@@ -7,7 +7,7 @@ export interface WorkspaceExtendedEntityMetadataArgs {
    * String target is a table defined in a json schema.
    */
   // eslint-disable-next-line @typescript-eslint/ban-types
-  readonly target: Function | string;
+  readonly target: Function;
 
   /**
    * Entity gate.

diff --git a/...twenty-server/src/engine/twenty-orm/interfaces/workspace-field-metadata-args.interface.ts b/...twenty-server/src/engine/twenty-orm/interfaces/workspace-field-metadata-args.interface.ts
@@ -15,7 +15,7 @@ export interface WorkspaceFieldMetadataArgs {
    * Class to which field is applied.
    */
   // eslint-disable-next-line @typescript-eslint/ban-types
-  readonly target: Function | string;
+  readonly target: Function;
 
   /**
    * Field name.
@@ -57,17 +57,17 @@ export interface WorkspaceFieldMetadataArgs {
   /**
    * Is primary field.
    */
-  readonly isPrimary?: boolean;
+  readonly isPrimary: boolean;
 
   /**
    * Is system field.
    */
-  readonly isSystem?: boolean;
+  readonly isSystem: boolean;
 
   /**
    * Is nullable field.
    */
-  readonly isNullable?: boolean;
+  readonly isNullable: boolean;
 
   /**
    * Field gate.

diff --git a/...nty-server/src/engine/twenty-orm/interfaces/workspace-relation-metadata-args.interface.ts b/...nty-server/src/engine/twenty-orm/interfaces/workspace-relation-metadata-args.interface.ts
@@ -18,7 +18,7 @@ export interface WorkspaceRelationMetadataArgs {
    * Class to which relation is applied.
    */
   // eslint-disable-next-line @typescript-eslint/ban-types
-  readonly target: Function | string;
+  readonly target: Function;
 
   /**
    * Relation name.
@@ -70,17 +70,17 @@ export interface WorkspaceRelationMetadataArgs {
   /**
    * Is primary field.
    */
-  readonly isPrimary?: boolean;
+  readonly isPrimary: boolean;
 
   /**
    * Is system field.
    */
-  readonly isSystem?: boolean;
+  readonly isSystem: boolean;
 
   /**
    * Is nullable field.
    */
-  readonly isNullable?: boolean;
+  readonly isNullable: boolean;
 
   /**
    * Field gate.