Add a dedicated GQL server for metadata available on /meta (#1820)

server/src/app.module.ts

@@ -33,6 +33,7 @@ import {
       context: ({ req }) => ({ req }),
       driver: YogaDriver,
       autoSchemaFile: true,
+      include: [CoreModule],
       conditionalSchema: async (request) => {
         try {
           // Get the SchemaGenerationService from the AppModule

server/src/core/workspace/services/workspace.service.spec.ts

@@ -8,7 +8,7 @@ import { PersonService } from 'src/core/person/person.service';
 import { CompanyService } from 'src/core/company/company.service';
 import { PipelineProgressService } from 'src/core/pipeline/services/pipeline-progress.service';
 import { ViewService } from 'src/core/view/services/view.service';
-import { DataSourceService } from 'src/tenant/metadata/data-source/data-source.service';
+import { DataSourceService } from 'src/metadata/data-source/data-source.service';
 
 import { WorkspaceService } from './workspace.service';
 

server/src/core/workspace/services/workspace.service.ts

@@ -11,7 +11,7 @@ import { PipelineService } from 'src/core/pipeline/services/pipeline.service';
 import { ViewService } from 'src/core/view/services/view.service';
 import { PrismaService } from 'src/database/prisma.service';
 import { assert } from 'src/utils/assert';
-import { DataSourceService } from 'src/tenant/metadata/data-source/data-source.service';
+import { DataSourceService } from 'src/metadata/data-source/data-source.service';
 
 @Injectable()
 export class WorkspaceService {

server/src/core/workspace/workspace.module.ts

@@ -5,7 +5,7 @@ import { PipelineModule } from 'src/core/pipeline/pipeline.module';
 import { CompanyModule } from 'src/core/company/company.module';
 import { PersonModule } from 'src/core/person/person.module';
 import { ViewModule } from 'src/core/view/view.module';
-import { DataSourceModule } from 'src/tenant/metadata/data-source/data-source.module';
+import { DataSourceModule } from 'src/metadata/data-source/data-source.module';
 
 import { WorkspaceService } from './services/workspace.service';
 import { WorkspaceMemberService } from './services/workspace-member.service';

server/src/metadata/data-source/data-source.module.ts

@@ -1,7 +1,7 @@
 import { Module } from '@nestjs/common';
 
-import { DataSourceMetadataModule } from 'src/tenant/metadata/data-source-metadata/data-source-metadata.module';
-import { EntitySchemaGeneratorModule } from 'src/tenant/metadata/entity-schema-generator/entity-schema-generator.module';
+import { DataSourceMetadataModule } from 'src/metadata/data-source-metadata/data-source-metadata.module';
+import { EntitySchemaGeneratorModule } from 'src/metadata/entity-schema-generator/entity-schema-generator.module';
 
 import { DataSourceService } from './data-source.service';
 

server/src/metadata/data-source/data-source.service.spec.ts

@@ -1,8 +1,8 @@
 import { Test, TestingModule } from '@nestjs/testing';
 
 import { EnvironmentService } from 'src/integrations/environment/environment.service';
-import { DataSourceMetadataService } from 'src/tenant/metadata/data-source-metadata/data-source-metadata.service';
-import { EntitySchemaGeneratorService } from 'src/tenant/metadata/entity-schema-generator/entity-schema-generator.service';
+import { DataSourceMetadataService } from 'src/metadata/data-source-metadata/data-source-metadata.service';
+import { EntitySchemaGeneratorService } from 'src/metadata/entity-schema-generator/entity-schema-generator.service';
 
 import { DataSourceService } from './data-source.service';
 

server/src/metadata/data-source/data-source.service.ts

@@ -3,9 +3,9 @@ import { Injectable, OnModuleDestroy, OnModuleInit } from '@nestjs/common';
 import { DataSource, QueryRunner, Table } from 'typeorm';
 
 import { EnvironmentService } from 'src/integrations/environment/environment.service';
-import { DataSourceMetadataService } from 'src/tenant/metadata/data-source-metadata/data-source-metadata.service';
-import { EntitySchemaGeneratorService } from 'src/tenant/metadata/entity-schema-generator/entity-schema-generator.service';
-import { TenantMigration } from 'src/tenant/metadata/tenant-migration/tenant-migration.entity';
+import { DataSourceMetadataService } from 'src/metadata/data-source-metadata/data-source-metadata.service';
+import { EntitySchemaGeneratorService } from 'src/metadata/entity-schema-generator/entity-schema-generator.service';
+import { TenantMigration } from 'src/metadata/tenant-migration/tenant-migration.entity';
 
 import { uuidToBase36 } from './data-source.util';
 

server/src/metadata/entity-schema-generator/entity-schema-generator.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
 
-import { ObjectMetadataModule } from 'src/tenant/metadata/object-metadata/object-metadata.module';
+import { ObjectMetadataModule } from 'src/metadata/object-metadata/object-metadata.module';
 
 import { EntitySchemaGeneratorService } from './entity-schema-generator.service';
 

server/src/metadata/entity-schema-generator/entity-schema-generator.service.spec.ts

@@ -1,6 +1,6 @@
 import { Test, TestingModule } from '@nestjs/testing';
 
-import { ObjectMetadataService } from 'src/tenant/metadata/object-metadata/object-metadata.service';
+import { ObjectMetadataService } from 'src/metadata/object-metadata/object-metadata.service';
 
 import { EntitySchemaGeneratorService } from './entity-schema-generator.service';
 

server/src/metadata/entity-schema-generator/entity-schema-generator.service.ts

@@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common';
 
 import { EntitySchema } from 'typeorm';
 
-import { ObjectMetadataService } from 'src/tenant/metadata/object-metadata/object-metadata.service';
+import { ObjectMetadataService } from 'src/metadata/object-metadata/object-metadata.service';
 
 import { baseColumns } from './base.entity';
 import {

server/src/metadata/field-metadata/field-metadata.entity.ts

@@ -8,7 +8,7 @@ import {
   UpdateDateColumn,
 } from 'typeorm';
 
-import { ObjectMetadata } from 'src/tenant/metadata/object-metadata/object-metadata.entity';
+import { ObjectMetadata } from 'src/metadata/object-metadata/object-metadata.entity';
 
 @Entity('field_metadata')
 export class FieldMetadata {

server/src/metadata/metadata.controller.ts

@@ -12,7 +12,7 @@ import { DataSourceService } from './data-source/data-source.service';
 import { MigrationGeneratorService } from './migration-generator/migration-generator.service';
 
 @UseGuards(JwtAuthGuard)
-@Controller('metadata')
+@Controller('metadata_legacy')
 export class MetadataController {
   constructor(
     private readonly entitySchemaGeneratorService: EntitySchemaGeneratorService,

server/src/metadata/metadata.module.ts

@@ -1,5 +1,9 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule, TypeOrmModuleOptions } from '@nestjs/typeorm';
+import { GraphQLModule } from '@nestjs/graphql';
+
+import { YogaDriverConfig, YogaDriver } from '@graphql-yoga/nestjs';
+import GraphQLJSON from 'graphql-type-json';
 
 import { MetadataService } from './metadata.service';
 import { MetadataController } from './metadata.controller';
@@ -25,6 +29,15 @@ const typeORMFactory = async (): Promise<TypeOrmModuleOptions> => ({
       useFactory: typeORMFactory,
       name: 'metadata',
     }),
+    GraphQLModule.forRoot<YogaDriverConfig>({
+      context: ({ req }) => ({ req }),
+      driver: YogaDriver,
+      autoSchemaFile: true,
+      include: [MetadataModule],
+      resolvers: { JSON: GraphQLJSON },
+      plugins: [],
+      path: '/metadata',
+    }),
     DataSourceModule,
     DataSourceMetadataModule,
     FieldMetadataModule,

server/src/metadata/metadata.resolver.ts

@@ -1,5 +1,5 @@
 import { UseGuards } from '@nestjs/common';
-import { Args, Mutation, Resolver } from '@nestjs/graphql';
+import { Args, Mutation, Query, Resolver } from '@nestjs/graphql';
 
 import { Workspace } from '@prisma/client';
 
@@ -15,6 +15,11 @@ import { CreateCustomFieldInput } from './args/create-custom-field.input';
 export class MetadataResolver {
   constructor(private readonly metadataService: MetadataService) {}
 
+  @Query(() => String)
+  async hello(): Promise<string> {
+    return 'Hello World!';
+  }
+
   @Mutation(() => String)
   async createCustomField(
     @Args() createCustomFieldInput: CreateCustomFieldInput,

server/src/metadata/migration-generator/migration-generator.module.ts

@@ -1,7 +1,7 @@
 import { Module } from '@nestjs/common';
 
-import { DataSourceModule } from 'src/tenant/metadata/data-source/data-source.module';
-import { TenantMigrationModule } from 'src/tenant/metadata/tenant-migration/tenant-migration.module';
+import { DataSourceModule } from 'src/metadata/data-source/data-source.module';
+import { TenantMigrationModule } from 'src/metadata/tenant-migration/tenant-migration.module';
 
 import { MigrationGeneratorService } from './migration-generator.service';
 

server/src/metadata/migration-generator/migration-generator.service.spec.ts

@@ -1,7 +1,7 @@
 import { Test, TestingModule } from '@nestjs/testing';
 
-import { DataSourceService } from 'src/tenant/metadata/data-source/data-source.service';
-import { TenantMigrationService } from 'src/tenant/metadata/tenant-migration/tenant-migration.service';
+import { DataSourceService } from 'src/metadata/data-source/data-source.service';
+import { TenantMigrationService } from 'src/metadata/tenant-migration/tenant-migration.service';
 
 import { MigrationGeneratorService } from './migration-generator.service';
 

server/src/metadata/migration-generator/migration-generator.service.ts

@@ -2,12 +2,12 @@ import { Injectable } from '@nestjs/common';
 
 import { QueryRunner, Table, TableColumn } from 'typeorm';
 
-import { DataSourceService } from 'src/tenant/metadata/data-source/data-source.service';
+import { DataSourceService } from 'src/metadata/data-source/data-source.service';
 import {
   TenantMigrationTableChange,
   TenantMigrationColumnChange,
-} from 'src/tenant/metadata/tenant-migration/tenant-migration.entity';
-import { TenantMigrationService } from 'src/tenant/metadata/tenant-migration/tenant-migration.service';
+} from 'src/metadata/tenant-migration/tenant-migration.entity';
+import { TenantMigrationService } from 'src/metadata/tenant-migration/tenant-migration.service';
 
 @Injectable()
 export class MigrationGeneratorService {

server/src/metadata/object-metadata/object-metadata.entity.ts

@@ -7,7 +7,7 @@ import {
   UpdateDateColumn,
 } from 'typeorm';
 
-import { FieldMetadata } from 'src/tenant/metadata/field-metadata/field-metadata.entity';
+import { FieldMetadata } from 'src/metadata/field-metadata/field-metadata.entity';
 
 @Entity('object_metadata')
 export class ObjectMetadata {

server/src/metadata/tenant-migration/tenant-migration.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
 
-import { DataSourceModule } from 'src/tenant/metadata/data-source/data-source.module';
+import { DataSourceModule } from 'src/metadata/data-source/data-source.module';
 
 import { TenantMigrationService } from './tenant-migration.service';
 

server/src/metadata/tenant-migration/tenant-migration.service.spec.ts

@@ -1,6 +1,6 @@
 import { Test, TestingModule } from '@nestjs/testing';
 
-import { DataSourceService } from 'src/tenant/metadata/data-source/data-source.service';
+import { DataSourceService } from 'src/metadata/data-source/data-source.service';
 
 import { TenantMigrationService } from './tenant-migration.service';
 

server/src/metadata/tenant-migration/tenant-migration.service.ts

@@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common';
 
 import { IsNull } from 'typeorm';
 
-import { DataSourceService } from 'src/tenant/metadata/data-source/data-source.service';
+import { DataSourceService } from 'src/metadata/data-source/data-source.service';
 
 import {
   TenantMigration,

server/src/tenant/entity-resolver/entity-resolver.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
 
-import { DataSourceModule } from 'src/tenant/metadata/data-source/data-source.module';
+import { DataSourceModule } from 'src/metadata/data-source/data-source.module';
 
 import { EntityResolverService } from './entity-resolver.service';
 

server/src/tenant/entity-resolver/entity-resolver.service.spec.ts

@@ -1,6 +1,6 @@
 import { Test, TestingModule } from '@nestjs/testing';
 
-import { DataSourceService } from 'src/tenant/metadata/data-source/data-source.service';
+import { DataSourceService } from 'src/metadata/data-source/data-source.service';
 import { EnvironmentService } from 'src/integrations/environment/environment.service';
 
 import { EntityResolverService } from './entity-resolver.service';

server/src/tenant/entity-resolver/entity-resolver.service.ts

@@ -7,7 +7,7 @@ import {
 import { GraphQLResolveInfo } from 'graphql';
 import graphqlFields from 'graphql-fields';
 
-import { DataSourceService } from 'src/tenant/metadata/data-source/data-source.service';
+import { DataSourceService } from 'src/metadata/data-source/data-source.service';
 import { EnvironmentService } from 'src/integrations/environment/environment.service';
 
 import { convertFieldsToGraphQL } from './entity-resolver.util';

server/src/tenant/schema-generation/graphql-types/object.graphql-type.ts

@@ -8,8 +8,8 @@ import {
   GraphQLString,
 } from 'graphql';
 
-import { FieldMetadata } from 'src/tenant/metadata/field-metadata/field-metadata.entity';
-import { ObjectMetadata } from 'src/tenant/metadata/object-metadata/object-metadata.entity';
+import { FieldMetadata } from 'src/metadata/field-metadata/field-metadata.entity';
+import { ObjectMetadata } from 'src/metadata/object-metadata/object-metadata.entity';
 import { pascalCase } from 'src/utils/pascal-case';
 
 /**

server/src/tenant/schema-generation/schema-generation.module.ts

@@ -2,9 +2,9 @@ import { Module } from '@nestjs/common';
 
 import { EntityResolverModule } from 'src/tenant/entity-resolver/entity-resolver.module';
 import { JwtAuthGuard } from 'src/guards/jwt.auth.guard';
-import { DataSourceMetadataModule } from 'src/tenant/metadata/data-source-metadata/data-source-metadata.module';
-import { EntitySchemaGeneratorModule } from 'src/tenant/metadata/entity-schema-generator/entity-schema-generator.module';
-import { ObjectMetadataModule } from 'src/tenant/metadata/object-metadata/object-metadata.module';
+import { DataSourceMetadataModule } from 'src/metadata/data-source-metadata/data-source-metadata.module';
+import { EntitySchemaGeneratorModule } from 'src/metadata/entity-schema-generator/entity-schema-generator.module';
+import { ObjectMetadataModule } from 'src/metadata/object-metadata/object-metadata.module';
 
 import { SchemaGenerationService } from './schema-generation.service';
 

server/src/tenant/schema-generation/schema-generation.service.spec.ts

@@ -1,7 +1,7 @@
 import { Test, TestingModule } from '@nestjs/testing';
 
-import { DataSourceMetadataService } from 'src/tenant/metadata/data-source-metadata/data-source-metadata.service';
-import { ObjectMetadataService } from 'src/tenant/metadata/object-metadata/object-metadata.service';
+import { DataSourceMetadataService } from 'src/metadata/data-source-metadata/data-source-metadata.service';
+import { ObjectMetadataService } from 'src/metadata/object-metadata/object-metadata.service';
 import { EntityResolverService } from 'src/tenant/entity-resolver/entity-resolver.service';
 
 import { SchemaGenerationService } from './schema-generation.service';

server/src/tenant/schema-generation/schema-generation.service.ts

@@ -9,10 +9,10 @@ import {
 } from 'graphql';
 
 import { EntityResolverService } from 'src/tenant/entity-resolver/entity-resolver.service';
-import { DataSourceMetadataService } from 'src/tenant/metadata/data-source-metadata/data-source-metadata.service';
+import { DataSourceMetadataService } from 'src/metadata/data-source-metadata/data-source-metadata.service';
 import { pascalCase } from 'src/utils/pascal-case';
-import { ObjectMetadataService } from 'src/tenant/metadata/object-metadata/object-metadata.service';
-import { ObjectMetadata } from 'src/tenant/metadata/object-metadata/object-metadata.entity';
+import { ObjectMetadataService } from 'src/metadata/object-metadata/object-metadata.service';
+import { ObjectMetadata } from 'src/metadata/object-metadata/object-metadata.entity';
 
 import { generateEdgeType } from './graphql-types/edge.graphql-type';
 import { generateConnectionType } from './graphql-types/connection.graphql-type';

server/src/tenant/tenant.module.ts

@@ -1,6 +1,7 @@
 import { Module } from '@nestjs/common';
 
-import { MetadataModule } from './metadata/metadata.module';
+import { MetadataModule } from 'src/metadata/metadata.module';
+
 import { UniversalModule } from './universal/universal.module';
 import { SchemaGenerationModule } from './schema-generation/schema-generation.module';
 

server/src/tenant/universal/universal.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
 
-import { DataSourceModule } from 'src/tenant/metadata/data-source/data-source.module';
+import { DataSourceModule } from 'src/metadata/data-source/data-source.module';
 
 import { UniversalService } from './universal.service';
 import { UniversalResolver } from './universal.resolver';

server/src/tenant/universal/universal.service.spec.ts

@@ -1,6 +1,6 @@
 import { Test, TestingModule } from '@nestjs/testing';
 
-import { DataSourceService } from 'src/tenant/metadata/data-source/data-source.service';
+import { DataSourceService } from 'src/metadata/data-source/data-source.service';
 import { EnvironmentService } from 'src/integrations/environment/environment.service';
 
 import { UniversalService } from './universal.service';

server/src/tenant/universal/universal.service.ts

@@ -2,7 +2,7 @@ import { Injectable, InternalServerErrorException } from '@nestjs/common';
 
 import { Workspace } from '@prisma/client';
 
-import { DataSourceService } from 'src/tenant/metadata/data-source/data-source.service';
+import { DataSourceService } from 'src/metadata/data-source/data-source.service';
 import { findManyCursorConnection } from 'src/utils/pagination';
 
 import { UniversalEntity, PaginatedUniversalEntity } from './universal.entity';