Remove old relations (#11993)
This is a first PR to remove old relation logic Next steps: - remove relationMetadata from cache - remove relationMetadata table content and structure - refactor relationDefinition to leverage field.settings instead
This commit is contained in:
@ -7,6 +7,5 @@ export enum FeatureFlagKey {
|
||||
IsUniqueIndexesEnabled = 'IS_UNIQUE_INDEXES_ENABLED',
|
||||
IsJsonFilterEnabled = 'IS_JSON_FILTER_ENABLED',
|
||||
IsCustomDomainEnabled = 'IS_CUSTOM_DOMAIN_ENABLED',
|
||||
IsNewRelationEnabled = 'IS_NEW_RELATION_ENABLED',
|
||||
IsPermissionsV2Enabled = 'IS_PERMISSIONS_V2_ENABLED',
|
||||
}
|
||||
|
||||
@ -1,13 +1,12 @@
|
||||
import { Module } from '@nestjs/common';
|
||||
|
||||
import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';
|
||||
import { FileModule } from 'src/engine/core-modules/file/file.module';
|
||||
import { SearchResolver } from 'src/engine/core-modules/search/search.resolver';
|
||||
import { SearchService } from 'src/engine/core-modules/search/services/search.service';
|
||||
import { WorkspaceCacheStorageModule } from 'src/engine/workspace-cache-storage/workspace-cache-storage.module';
|
||||
|
||||
@Module({
|
||||
imports: [WorkspaceCacheStorageModule, FeatureFlagModule, FileModule],
|
||||
imports: [WorkspaceCacheStorageModule, FileModule],
|
||||
providers: [SearchResolver, SearchService],
|
||||
})
|
||||
export class SearchModule {}
|
||||
|
||||
@ -5,7 +5,6 @@ import chunk from 'lodash.chunk';
|
||||
|
||||
import { ObjectRecordFilter } from 'src/engine/api/graphql/workspace-query-builder/interfaces/object-record.interface';
|
||||
|
||||
import { FeatureFlagService } from 'src/engine/core-modules/feature-flag/services/feature-flag.service';
|
||||
import { SearchArgs } from 'src/engine/core-modules/search/dtos/search-args';
|
||||
import { SearchRecordDTO } from 'src/engine/core-modules/search/dtos/search-record-dto';
|
||||
import {
|
||||
@ -30,7 +29,6 @@ export class SearchResolver {
|
||||
private readonly workspaceCacheStorageService: WorkspaceCacheStorageService,
|
||||
private readonly twentyORMManager: TwentyORMManager,
|
||||
private readonly searchService: SearchService,
|
||||
private readonly featureFlagService: FeatureFlagService,
|
||||
) {}
|
||||
|
||||
@Query(() => [SearchRecordDTO])
|
||||
@ -68,9 +66,6 @@ export class SearchResolver {
|
||||
);
|
||||
}
|
||||
|
||||
const featureFlagMap =
|
||||
await this.featureFlagService.getWorkspaceFeatureFlagsMap(workspace.id);
|
||||
|
||||
const objectMetadataItemWithFieldMaps = Object.values(
|
||||
objectMetadataMaps.byId,
|
||||
);
|
||||
@ -102,7 +97,6 @@ export class SearchResolver {
|
||||
records: await this.searchService.buildSearchQueryAndGetRecords({
|
||||
entityManager: repository,
|
||||
objectMetadataItem,
|
||||
featureFlagMap,
|
||||
searchTerms: formatSearchTerms(searchInput, 'and'),
|
||||
searchTermsOr: formatSearchTerms(searchInput, 'or'),
|
||||
limit,
|
||||
|
||||
@ -6,7 +6,6 @@ import { getLogoUrlFromDomainName } from 'twenty-shared/utils';
|
||||
import { Brackets, ObjectLiteral } from 'typeorm';
|
||||
|
||||
import { ObjectRecord } from 'src/engine/api/graphql/workspace-query-builder/interfaces/object-record.interface';
|
||||
import { FeatureFlagMap } from 'src/engine/core-modules/feature-flag/interfaces/feature-flag-map.interface';
|
||||
|
||||
import { GraphqlQueryParser } from 'src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query.parser';
|
||||
import { FileService } from 'src/engine/core-modules/file/services/file.service';
|
||||
@ -57,7 +56,6 @@ export class SearchService {
|
||||
async buildSearchQueryAndGetRecords<Entity extends ObjectLiteral>({
|
||||
entityManager,
|
||||
objectMetadataItem,
|
||||
featureFlagMap,
|
||||
searchTerms,
|
||||
searchTermsOr,
|
||||
limit,
|
||||
@ -65,7 +63,6 @@ export class SearchService {
|
||||
}: {
|
||||
entityManager: WorkspaceRepository<Entity>;
|
||||
objectMetadataItem: ObjectMetadataItemWithFieldMaps;
|
||||
featureFlagMap: FeatureFlagMap;
|
||||
searchTerms: string;
|
||||
searchTermsOr: string;
|
||||
limit: number;
|
||||
@ -77,7 +74,6 @@ export class SearchService {
|
||||
objectMetadataItem.fieldsByName,
|
||||
objectMetadataItem.fieldsByJoinColumnName,
|
||||
generateObjectMetadataMaps([objectMetadataItem]),
|
||||
featureFlagMap,
|
||||
);
|
||||
|
||||
queryParser.applyFilterToBuilder(
|
||||
|
||||
Reference in New Issue
Block a user