use isActive parameter instead of isInActive() decorator

twentyhq · Aug 19, 2024 · e820bdc · e820bdc
1 parent 0b5e5ff
commit e820bdc
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 28 deletions.
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
@@ -19,6 +19,7 @@ export interface WorkspaceFieldOptions<
   defaultValue?: FieldMetadataDefaultValue<T>;
   options?: FieldMetadataOptions<T>;
   settings?: FieldMetadataSettings<T>;
+  isActive?: boolean;
 }
 
 export function WorkspaceField<T extends FieldMetadataType>(
@@ -55,13 +56,6 @@ export function WorkspaceField<T extends FieldMetadataType>(
         propertyKey.toString(),
       ) ?? false;
 
-    const isInactive =
-      TypedReflect.getMetadata(
-        'workspace:is-inactive-field-metadata-args',
-        object,
-        propertyKey.toString(),
-      ) ?? false;
-
     const defaultValue = (options.defaultValue ??
       generateDefaultValue(
         options.type,
@@ -82,7 +76,7 @@ export function WorkspaceField<T extends FieldMetadataType>(
       isSystem,
       gate,
       isDeprecated,
-      isInactive,
+      isActive: options.isActive,
     });
   };
 }
diff --git a/packages/twenty-server/src/engine/twenty-orm/decorators/workspace-is-inactive.decorator.ts b/packages/twenty-server/src/engine/twenty-orm/decorators/workspace-is-inactive.decorator.ts
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
@@ -80,7 +80,7 @@ export interface WorkspaceFieldMetadataArgs {
   readonly isDeprecated?: boolean;
 
   /**
-   * Is inactive field.
+   * Is active field.
    */
-  readonly isInactive?: boolean;
+  readonly isActive?: boolean;
 }
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
@@ -83,7 +83,7 @@ export interface WorkspaceRelationMetadataArgs {
   readonly gate?: Gate;
 
   /**
-   * Is inactive field.
+   * Is active field.
    */
-  readonly isInactive?: boolean;
+  readonly isActive?: boolean;
 }
diff --git a/.../src/engine/workspace-manager/workspace-sync-metadata/factories/standard-field.factory.ts b/.../src/engine/workspace-manager/workspace-sync-metadata/factories/standard-field.factory.ts
@@ -172,7 +172,7 @@ export class StandardFieldFactory {
         isNullable: workspaceFieldMetadataArgs.isNullable,
         isCustom: workspaceFieldMetadataArgs.isDeprecated ? true : false,
         isSystem: workspaceFieldMetadataArgs.isSystem ?? false,
-        isActive: !workspaceFieldMetadataArgs.isInactive,
+        isActive: workspaceFieldMetadataArgs.isActive ?? true,
       },
     ];
   }
@@ -223,7 +223,7 @@ export class StandardFieldFactory {
         isCustom: false,
         isSystem: true,
         isNullable: workspaceRelationMetadataArgs.isNullable,
-        isActive: !workspaceRelationMetadataArgs.isInactive,
+        isActive: workspaceRelationMetadataArgs.isActive ?? true,
       });
     }
 
@@ -241,7 +241,7 @@ export class StandardFieldFactory {
         workspaceEntityMetadataArgs?.isSystem ||
         workspaceRelationMetadataArgs.isSystem,
       isNullable: true,
-      isActive: !workspaceRelationMetadataArgs.isInactive,
+      isActive: workspaceRelationMetadataArgs.isActive ?? true,
     });
 
     return fieldMetadataCollection;

diff --git a/packages/twenty-server/src/utils/typed-reflect.ts b/packages/twenty-server/src/utils/typed-reflect.ts
@@ -9,7 +9,6 @@ export interface ReflectMetadataTypeMap {
   ['workspace:is-audit-logged-metadata-args']: false;
   ['workspace:is-primary-field-metadata-args']: true;
   ['workspace:is-deprecated-field-metadata-args']: true;
-  ['workspace:is-inactive-field-metadata-args']: true;
 }
 
 export class TypedReflect {