Skip to content

The open alternative to Salesforce, designed for AI.

Match every morph target join column in relation filters (#28159)

Charles Bochetcc9d960d3350
diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/common-group-by-query-runner.service.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/common-group-by-query-runner.service.ts
index 05c1a287916..3f780fca0c1 100644
--- a/packages/twenty-server/src/engine/api/common/common-query-runners/common-group-by-query-runner.service.ts
+++ b/packages/twenty-server/src/engine/api/common/common-query-runners/common-group-by-query-runner.service.ts
@@ -53,6 +53,7 @@ import { WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspa
import { FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
import { type OrmFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/orm-flat-field-metadata.type';
+import { computeFieldMetadataItemsForRecordFilters } from 'src/engine/metadata-modules/flat-field-metadata/utils/compute-field-metadata-items-for-record-filters.util';
import { isMorphOrRelationFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/utils/is-morph-or-relation-flat-field-metadata.util';
import { FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
import { ViewFilterGroupService } from 'src/engine/metadata-modules/view-filter-group/services/view-filter-group.service';
@@ -264,12 +265,22 @@ export class CommonGroupByQueryRunnerService extends CommonBaseQueryRunnerServic
options: field.options as PartialFieldMetadataItemOption[],
}));
+ const {
+ flatFieldMetadataMaps: fullFlatFieldMetadataMaps,
+ flatObjectMetadataMaps,
+ } = await this.workspaceCacheService.getOrRecompute(workspaceId, [
+ 'flatFieldMetadataMaps',
+ 'flatObjectMetadataMaps',
+ ]);
+
const filtersFromView = computeRecordGqlOperationFilter({
recordFilters,
recordFilterGroups: recordFilterGroups,
- fieldMetadataItems: Object.values(
- flatFieldMetadataMaps.byUniversalIdentifier,
- ).filter(isDefined),
+ fieldMetadataItems: computeFieldMetadataItemsForRecordFilters({
+ recordFilters,
+ flatFieldMetadataMaps: fullFlatFieldMetadataMaps,
+ flatObjectMetadataMaps,
+ }),
filterValueDependencies: {
timeZone: 'UTC', // TODO: see if we use workspace member timezone here
},
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/add-morph-relations-to-morph-relation-head-flat-field-metadatas.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/add-morph-relations-to-morph-relation-head-flat-field-metadatas.util.ts
deleted file mode 100644
index d1f3b9e5b75..00000000000
--- a/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/add-morph-relations-to-morph-relation-head-flat-field-metadatas.util.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import { FieldMetadataType } from 'twenty-shared/types';
-import { isMorphRelationHead } from 'twenty-shared/utils';
-
-import { type RelationDTO } from 'src/engine/metadata-modules/field-metadata/dtos/relation.dto';
-import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
-import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
-import { isFlatFieldMetadataOfType } from 'src/engine/metadata-modules/flat-field-metadata/utils/is-flat-field-metadata-of-type.util';
-import { resolveMorphRelationsFromFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/utils/resolve-morph-relations-from-flat-field-metadata.util';
-import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
-
-export const addMorphRelationsToMorphRelationHeadFlatFieldMetadatas = ({
- flatFieldMetadatas,
- flatFieldMetadataMaps,
- flatObjectMetadataMaps,
-}: {
- flatFieldMetadatas: FlatFieldMetadata[];
- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
- flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;
-}): (FlatFieldMetadata & { morphRelations?: RelationDTO[] })[] => {
- const resolveMorphRelations = (morphRelationHead: FlatFieldMetadata) =>
- isFlatFieldMetadataOfType(
- morphRelationHead,
- FieldMetadataType.MORPH_RELATION,
- )
- ? resolveMorphRelationsFromFlatFieldMetadata({
- morphFlatFieldMetadata: morphRelationHead,
- flatFieldMetadataMaps,
- flatObjectMetadataMaps,
- })
- : [];
-
- return flatFieldMetadatas.map((flatFieldMetadata) =>
- isMorphRelationHead<FlatFieldMetadata>(flatFieldMetadata)
- ? {
- ...flatFieldMetadata,
- morphRelations: resolveMorphRelations(flatFieldMetadata),
- }
- : flatFieldMetadata,
- );
-};
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/compute-field-metadata-items-for-record-filters.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/compute-field-metadata-items-for-record-filters.util.ts
new file mode 100644
index 00000000000..bdc5a4e8914
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/compute-field-metadata-items-for-record-filters.util.ts
@@ -0,0 +1,67 @@
+import { FieldMetadataType } from 'twenty-shared/types';
+import { isMorphRelationHead, type RecordFilter } from 'twenty-shared/utils';
+
+import { type RelationDTO } from 'src/engine/metadata-modules/field-metadata/dtos/relation.dto';
+import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
+import { findFlatEntityByIdInFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps-or-throw.util';
+import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
+import { computeFlatFieldMetadataArrayForRecordFilters } from 'src/engine/metadata-modules/flat-field-metadata/utils/compute-flat-field-metadata-array-for-record-filters.util';
+import { isFlatFieldMetadataOfType } from 'src/engine/metadata-modules/flat-field-metadata/utils/is-flat-field-metadata-of-type.util';
+import { resolveMorphRelationsFromFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/utils/resolve-morph-relations-from-flat-field-metadata.util';
+import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
+import { getMorphNameFromMorphFieldMetadataName } from 'src/engine/metadata-modules/flat-object-metadata/utils/get-morph-name-from-morph-field-metadata-name.util';
+
+// Morph fields get the morph name and morphRelations the metadata API gives the frontend
+export const computeFieldMetadataItemsForRecordFilters = ({
+ recordFilters,
+ flatFieldMetadataMaps,
+ flatObjectMetadataMaps,
+}: {
+ recordFilters: Pick<
+ RecordFilter,
+ 'fieldMetadataId' | 'relationTargetFieldMetadataId'
+ >[];
+ flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;
+ flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;
+}): (FlatFieldMetadata & { morphRelations?: RelationDTO[] })[] =>
+ computeFlatFieldMetadataArrayForRecordFilters({
+ flatFieldMetadataMaps,
+ recordFilters,
+ }).map((flatFieldMetadata) => {
+ if (
+ !isFlatFieldMetadataOfType(
+ flatFieldMetadata,
+ FieldMetadataType.MORPH_RELATION,
+ )
+ ) {
+ return flatFieldMetadata;
+ }
+
+ const flatFieldMetadataWithMorphRelations = {
+ ...flatFieldMetadata,
+ morphRelations: resolveMorphRelationsFromFlatFieldMetadata({
+ morphFlatFieldMetadata: flatFieldMetadata,
+ flatFieldMetadataMaps,
+ flatObjectMetadataMaps,
+ }),
+ };
+
+ if (isMorphRelationHead(flatFieldMetadata)) {
+ return flatFieldMetadataWithMorphRelations;
+ }
+
+ const relationTargetFlatObjectMetadata =
+ findFlatEntityByIdInFlatEntityMapsOrThrow({
+ flatEntityId: flatFieldMetadata.relationTargetObjectMetadataId,
+ flatEntityMaps: flatObjectMetadataMaps,
+ });
+
+ return {
+ ...flatFieldMetadataWithMorphRelations,
+ name: getMorphNameFromMorphFieldMetadataName({
+ morphRelationFlatFieldMetadata: flatFieldMetadata,
+ nameSingular: relationTargetFlatObjectMetadata.nameSingular,
+ namePlural: relationTargetFlatObjectMetadata.namePlural,
+ }),
+ };
+ });
diff --git a/packages/twenty-server/src/engine/metadata-modules/view/services/view-query-params.service.ts b/packages/twenty-server/src/engine/metadata-modules/view/services/view-query-params.service.ts
index 54d8b399ac8..2c677eafc6e 100644
--- a/packages/twenty-server/src/engine/metadata-modules/view/services/view-query-params.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/view/services/view-query-params.service.ts
@@ -20,8 +20,7 @@ import { type ObjectRecordOrderBy } from 'src/engine/api/graphql/workspace-query
import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.service';
import { findFlatEntityByIdInFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps-or-throw.util';
-import { addMorphRelationsToMorphRelationHeadFlatFieldMetadatas } from 'src/engine/metadata-modules/flat-field-metadata/utils/add-morph-relations-to-morph-relation-head-flat-field-metadatas.util';
-import { computeFlatFieldMetadataArrayForRecordFilters } from 'src/engine/metadata-modules/flat-field-metadata/utils/compute-flat-field-metadata-array-for-record-filters.util';
+import { computeFieldMetadataItemsForRecordFilters } from 'src/engine/metadata-modules/flat-field-metadata/utils/compute-field-metadata-items-for-record-filters.util';
import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
import { DEFAULT_TIMEZONE } from 'src/engine/metadata-modules/view/constants/default-timezone.constant';
import {
@@ -132,15 +131,11 @@ export class ViewQueryParamsService {
}));
const filter = computeRecordGqlOperationFilter({
- fieldMetadataItems:
- addMorphRelationsToMorphRelationHeadFlatFieldMetadatas({
- flatFieldMetadatas: computeFlatFieldMetadataArrayForRecordFilters({
- flatFieldMetadataMaps,
- recordFilters: recordFilters,
- }),
- flatFieldMetadataMaps,
- flatObjectMetadataMaps,
- }),
+ fieldMetadataItems: computeFieldMetadataItemsForRecordFilters({
+ recordFilters,
+ flatFieldMetadataMaps,
+ flatObjectMetadataMaps,
+ }),
recordFilters,
recordFilterGroups,
filterValueDependencies: { currentWorkspaceMemberId, timeZone },
diff --git a/packages/twenty-server/src/modules/dashboard/chart-data/utils/__tests__/convert-chart-filter-to-gql-operation-filter.util.spec.ts b/packages/twenty-server/src/modules/dashboard/chart-data/utils/__tests__/convert-chart-filter-to-gql-operation-filter.util.spec.ts
index 8cea0002157..963259e2e52 100644
--- a/packages/twenty-server/src/modules/dashboard/chart-data/utils/__tests__/convert-chart-filter-to-gql-operation-filter.util.spec.ts
+++ b/packages/twenty-server/src/modules/dashboard/chart-data/utils/__tests__/convert-chart-filter-to-gql-operation-filter.util.spec.ts
@@ -251,7 +251,7 @@ describe('convertChartFilterToGqlOperationFilter', () => {
});
});
- it('checks the join column of a morph relation target for an empty filter on that target', () => {
+ it('checks every target join column for an empty filter on a morph relation target', () => {
const filter: ChartFilter = {
recordFilters: [
{
@@ -270,6 +270,11 @@ describe('convertChartFilterToGqlOperationFilter', () => {
userTimezone,
});
- expect(result).toEqual({ ownerCompanyId: { is: 'NULL' } });
+ expect(result).toEqual({
+ and: [
+ { ownerCompanyId: { is: 'NULL' } },
+ { ownerPersonId: { is: 'NULL' } },
+ ],
+ });
});
});
diff --git a/packages/twenty-server/src/modules/dashboard/chart-data/utils/convert-chart-filter-to-gql-operation-filter.util.ts b/packages/twenty-server/src/modules/dashboard/chart-data/utils/convert-chart-filter-to-gql-operation-filter.util.ts
index 0e021ddfb63..1fd0db80b53 100644
--- a/packages/twenty-server/src/modules/dashboard/chart-data/utils/convert-chart-filter-to-gql-operation-filter.util.ts
+++ b/packages/twenty-server/src/modules/dashboard/chart-data/utils/convert-chart-filter-to-gql-operation-filter.util.ts
@@ -17,8 +17,7 @@ import { type ObjectRecordFilter } from 'src/engine/api/graphql/workspace-query-
import { type FlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/types/flat-entity-maps.type';
import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';
import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
-import { addMorphRelationsToMorphRelationHeadFlatFieldMetadatas } from 'src/engine/metadata-modules/flat-field-metadata/utils/add-morph-relations-to-morph-relation-head-flat-field-metadatas.util';
-import { computeFlatFieldMetadataArrayForRecordFilters } from 'src/engine/metadata-modules/flat-field-metadata/utils/compute-flat-field-metadata-array-for-record-filters.util';
+import { computeFieldMetadataItemsForRecordFilters } from 'src/engine/metadata-modules/flat-field-metadata/utils/compute-field-metadata-items-for-record-filters.util';
import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
type ConvertChartFilterToGqlOperationFilterParams = {
@@ -81,11 +80,8 @@ export const convertChartFilterToGqlOperationFilter = ({
}));
return computeRecordGqlOperationFilter({
- fieldMetadataItems: addMorphRelationsToMorphRelationHeadFlatFieldMetadatas({
- flatFieldMetadatas: computeFlatFieldMetadataArrayForRecordFilters({
- flatFieldMetadataMaps,
- recordFilters: convertedRecordFilters,
- }),
+ fieldMetadataItems: computeFieldMetadataItemsForRecordFilters({
+ recordFilters: convertedRecordFilters,
flatFieldMetadataMaps,
flatObjectMetadataMaps,
}),
diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/find-records.workflow-action.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/find-records.workflow-action.ts
index 6eac7ce9f5f..a3df17a9b19 100644
--- a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/find-records.workflow-action.ts
+++ b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/find-records.workflow-action.ts
@@ -13,6 +13,7 @@ import {
import { type WorkflowAction } from 'src/modules/workflow/workflow-executor/interfaces/workflow-action.interface';
import { FindRecordsService } from 'src/engine/core-modules/record-crud/services/find-records.service';
+import { computeFieldMetadataItemsForRecordFilters } from 'src/engine/metadata-modules/flat-field-metadata/utils/compute-field-metadata-items-for-record-filters.util';
import { WorkflowCommonWorkspaceService } from 'src/modules/workflow/common/workspace-services/workflow-common.workspace-service';
import {
WorkflowStepExecutorException,
@@ -69,7 +70,7 @@ export class FindRecordsWorkflowAction implements WorkflowAction {
const executionContext =
await this.workflowExecutionContextService.getExecutionContext(runInfo);
- const { flatFieldMetadataMaps } =
+ const { flatFieldMetadataMaps, flatObjectMetadataMaps } =
await this.workflowCommonWorkspaceService.getObjectMetadataInfo(
workflowActionInput.objectName,
workspaceId,
@@ -91,9 +92,11 @@ export class FindRecordsWorkflowAction implements WorkflowAction {
try {
gqlOperationFilter = isDefined(recordFilters)
? computeRecordGqlOperationFilter({
- fieldMetadataItems: Object.values(
- flatFieldMetadataMaps.byUniversalIdentifier,
- ).filter(isDefined),
+ fieldMetadataItems: computeFieldMetadataItemsForRecordFilters({
+ recordFilters,
+ flatFieldMetadataMaps,
+ flatObjectMetadataMaps,
+ }),
recordFilters,
recordFilterGroups:
workflowActionInput.filter?.recordFilterGroups ?? [],
diff --git a/packages/twenty-shared/src/utils/filter/__tests__/turnRecordFilterIntoGqlOperationFilter.test.ts b/packages/twenty-shared/src/utils/filter/__tests__/turnRecordFilterIntoGqlOperationFilter.test.ts
index 8dd118a1718..77dfb3f1d0a 100644
--- a/packages/twenty-shared/src/utils/filter/__tests__/turnRecordFilterIntoGqlOperationFilter.test.ts
+++ b/packages/twenty-shared/src/utils/filter/__tests__/turnRecordFilterIntoGqlOperationFilter.test.ts
@@ -626,7 +626,9 @@ describe('turnRecordFilterIntoRecordGqlOperationFilter', () => {
fieldMetadataItemById,
});
- expect(result).toHaveProperty('companyId.in');
+ expect(result).toEqual({
+ companyId: { in: ['550e8400-e29b-41d4-a716-446655440000'] },
+ });
});
it('should handle IS_NOT operand', () => {
@@ -640,10 +642,83 @@ describe('turnRecordFilterIntoRecordGqlOperationFilter', () => {
fieldMetadataItemById,
});
- expect(result).toHaveProperty('or');
+ expect(result).toEqual({
+ or: [
+ {
+ not: {
+ companyId: { in: ['550e8400-e29b-41d4-a716-446655440000'] },
+ },
+ },
+ { companyId: { is: 'NULL' } },
+ ],
+ });
+ });
+
+ it('should match any morph target join column for IS operand', () => {
+ const result = turnRecordFilterIntoRecordGqlOperationFilter({
+ filterValueDependencies,
+ recordFilter: makeFilter(
+ 'f-morph-relation',
+ RecordFilterOperand.IS,
+ '["550e8400-e29b-41d4-a716-446655440000"]',
+ 'RELATION',
+ ),
+ fieldMetadataItemById,
+ });
+
+ expect(result).toEqual({
+ or: [
+ { targetPersonId: { in: ['550e8400-e29b-41d4-a716-446655440000'] } },
+ {
+ targetCompanyId: { in: ['550e8400-e29b-41d4-a716-446655440000'] },
+ },
+ ],
+ });
});
- it('should resolve programmatic current-record morph relation-table filters to the matching join column', () => {
+ it('should exclude the selected records from every morph target join column for IS_NOT operand', () => {
+ const result = turnRecordFilterIntoRecordGqlOperationFilter({
+ filterValueDependencies,
+ recordFilter: makeFilter(
+ 'f-morph-relation',
+ RecordFilterOperand.IS_NOT,
+ '["550e8400-e29b-41d4-a716-446655440000"]',
+ 'RELATION',
+ ),
+ fieldMetadataItemById,
+ });
+
+ expect(result).toEqual({
+ and: [
+ {
+ or: [
+ {
+ not: {
+ targetPersonId: {
+ in: ['550e8400-e29b-41d4-a716-446655440000'],
+ },
+ },
+ },
+ { targetPersonId: { is: 'NULL' } },
+ ],
+ },
+ {
+ or: [
+ {
+ not: {
+ targetCompanyId: {
+ in: ['550e8400-e29b-41d4-a716-446655440000'],
+ },
+ },
+ },
+ { targetCompanyId: { is: 'NULL' } },
+ ],
+ },
+ ],
+ });
+ });
+
+ it('should resolve programmatic current-record morph relation-table filters to every target join column', () => {
const result = turnRecordFilterIntoRecordGqlOperationFilter({
filterValueDependencies: {
...filterValueDependencies,
@@ -665,11 +740,16 @@ describe('turnRecordFilterIntoRecordGqlOperationFilter', () => {
});
expect(result).toEqual({
- targetPersonId: { in: ['11111111-1111-4111-8111-111111111111'] },
+ or: [
+ { targetPersonId: { in: ['11111111-1111-4111-8111-111111111111'] } },
+ {
+ targetCompanyId: { in: ['11111111-1111-4111-8111-111111111111'] },
+ },
+ ],
});
});
- it('should omit programmatic current-record morph filters when morph relation metadata is missing', () => {
+ it('should use its own join column for a morph relation target without morph relations', () => {
const fieldMetadataItemByIdWithoutMorphRelations = new Map(
fieldMetadataItemById,
);
@@ -701,7 +781,9 @@ describe('turnRecordFilterIntoRecordGqlOperationFilter', () => {
fieldMetadataItemById: fieldMetadataItemByIdWithoutMorphRelations,
});
- expect(result).toBeUndefined();
+ expect(result).toEqual({
+ targetId: { in: ['11111111-1111-4111-8111-111111111111'] },
+ });
});
});
diff --git a/packages/twenty-shared/src/utils/filter/computeEmptyGqlOperationFilterForMorphRelation.ts b/packages/twenty-shared/src/utils/filter/computeEmptyGqlOperationFilterForMorphRelation.ts
index ea92caf6179..7cb80353c55 100644
--- a/packages/twenty-shared/src/utils/filter/computeEmptyGqlOperationFilterForMorphRelation.ts
+++ b/packages/twenty-shared/src/utils/filter/computeEmptyGqlOperationFilterForMorphRelation.ts
@@ -4,7 +4,7 @@ import {
type RelationFilter,
} from '@/types';
import { isNonEmptyArray } from '@/utils/array/isNonEmptyArray';
-import { computeMorphRelationGqlFieldJoinColumnName } from '@/utils/fieldMetadata/compute-relation-gql-field-join-column-name';
+import { computeMorphRelationJoinColumnNames } from '@/utils/filter/computeMorphRelationJoinColumnNames';
import { type FieldShared } from '@/utils/filter/turnRecordFilterIntoGqlOperationFilter';
export const computeEmptyGqlOperationFilterForMorphRelation = ({
@@ -20,15 +20,10 @@ export const computeEmptyGqlOperationFilterForMorphRelation = ({
}
return {
- and: morphRelations.map((morphRelation) => ({
- [computeMorphRelationGqlFieldJoinColumnName({
- fieldName: name,
- relationType: morphRelation.type,
- targetObjectMetadataNameSingular:
- morphRelation.targetObjectMetadata.nameSingular,
- targetObjectMetadataNamePlural:
- morphRelation.targetObjectMetadata.namePlural,
- })]: { is: 'NULL' } satisfies RelationFilter,
+ and: computeMorphRelationJoinColumnNames({
+ fieldMetadataItem: correspondingFieldMetadataItem,
+ }).map((joinColumnName) => ({
+ [joinColumnName]: { is: 'NULL' } satisfies RelationFilter,
})),
};
};
diff --git a/packages/twenty-shared/src/utils/filter/computeMorphRelationJoinColumnNames.ts b/packages/twenty-shared/src/utils/filter/computeMorphRelationJoinColumnNames.ts
new file mode 100644
index 00000000000..5b1ca057417
--- /dev/null
+++ b/packages/twenty-shared/src/utils/filter/computeMorphRelationJoinColumnNames.ts
@@ -0,0 +1,20 @@
+import { type PartialFieldMetadataItem } from '@/types';
+import { computeMorphRelationGqlFieldJoinColumnName } from '@/utils/fieldMetadata/compute-relation-gql-field-join-column-name';
+import { type FieldShared } from '@/utils/filter/turnRecordFilterIntoGqlOperationFilter';
+
+export const computeMorphRelationJoinColumnNames = ({
+ fieldMetadataItem,
+}: {
+ fieldMetadataItem: Pick<PartialFieldMetadataItem, 'name'> &
+ Pick<FieldShared, 'morphRelations'>;
+}): string[] =>
+ (fieldMetadataItem.morphRelations ?? []).map((morphRelation) =>
+ computeMorphRelationGqlFieldJoinColumnName({
+ fieldName: fieldMetadataItem.name,
+ relationType: morphRelation.type,
+ targetObjectMetadataNameSingular:
+ morphRelation.targetObjectMetadata.nameSingular,
+ targetObjectMetadataNamePlural:
+ morphRelation.targetObjectMetadata.namePlural,
+ }),
+ );
diff --git a/packages/twenty-shared/src/utils/filter/turnRecordFilterIntoGqlOperationFilter.ts b/packages/twenty-shared/src/utils/filter/turnRecordFilterIntoGqlOperationFilter.ts
index 8cd91f34f86..7ef366d4066 100644
--- a/packages/twenty-shared/src/utils/filter/turnRecordFilterIntoGqlOperationFilter.ts
+++ b/packages/twenty-shared/src/utils/filter/turnRecordFilterIntoGqlOperationFilter.ts
@@ -46,6 +46,7 @@ import {
getNextPeriodStart,
getPeriodStart,
isDefined,
+ isNonEmptyArray,
isRecordFilterValueValid,
resolveDateFilter,
resolveDateTimeFilter,
@@ -64,10 +65,8 @@ import {
import { arrayOfUuidOrVariableSchema } from '@/utils/filter/utils/validation-schemas/arrayOfUuidsOrVariablesSchema';
import { jsonRelationFilterValueSchema } from '@/utils/filter/utils/validation-schemas/jsonRelationFilterValueSchema';
import { computeMorphRelationGqlFieldName } from '@/utils/fieldMetadata/compute-morph-relation-gql-field-name';
-import {
- computeMorphRelationGqlFieldJoinColumnName,
- computeRelationGqlFieldJoinColumnName,
-} from '@/utils/fieldMetadata/compute-relation-gql-field-join-column-name';
+import { computeRelationGqlFieldJoinColumnName } from '@/utils/fieldMetadata/compute-relation-gql-field-join-column-name';
+import { computeMorphRelationJoinColumnNames } from '@/utils/filter/computeMorphRelationJoinColumnNames';
const PHONE_FILTER_NON_SIGNIFICANT_CHARS = /(?!^)\+|[^0-9+]/g;
@@ -216,37 +215,28 @@ type BuildDirectFieldGqlOperationFilterParams = {
fieldMetadataItem: FieldShared;
};
-const getRelationFilterJoinColumnName = ({
+const getRelationFilterJoinColumnNames = ({
fieldMetadataItem,
- filterValueDependencies,
}: {
- fieldMetadataItem: FieldShared;
- filterValueDependencies: RecordFilterValueDependencies;
-}): string | undefined => {
- if (fieldMetadataItem.type !== FieldMetadataType.MORPH_RELATION) {
- return computeRelationGqlFieldJoinColumnName({
- name: fieldMetadataItem.name,
- });
- }
-
- const matchingMorphRelation = fieldMetadataItem.morphRelations?.find(
- (morphRelation) =>
- morphRelation.targetObjectMetadata.nameSingular ===
- filterValueDependencies.currentRecord?.objectMetadataNameSingular,
- );
-
- if (!isDefined(matchingMorphRelation)) {
- return;
- }
-
- return computeMorphRelationGqlFieldJoinColumnName({
- fieldName: fieldMetadataItem.name,
- relationType: matchingMorphRelation.type,
- targetObjectMetadataNameSingular:
- matchingMorphRelation.targetObjectMetadata.nameSingular,
- targetObjectMetadataNamePlural:
- matchingMorphRelation.targetObjectMetadata.namePlural,
- });
+ fieldMetadataItem: Pick<FieldShared, 'type' | 'name' | 'morphRelations'>;
+}): string[] =>
+ fieldMetadataItem.type === FieldMetadataType.MORPH_RELATION &&
+ isNonEmptyArray(fieldMetadataItem.morphRelations)
+ ? computeMorphRelationJoinColumnNames({ fieldMetadataItem })
+ : [computeRelationGqlFieldJoinColumnName({ name: fieldMetadataItem.name })];
+
+const combineRelationJoinColumnFilters = ({
+ joinColumnFilters,
+ logicalOperator,
+}: {
+ joinColumnFilters: RecordGqlOperationFilter[];
+ logicalOperator: 'and' | 'or';
+}): RecordGqlOperationFilter => {
+ const [firstJoinColumnFilter] = joinColumnFilters;
+
+ return joinColumnFilters.length === 1 && isDefined(firstJoinColumnFilter)
+ ? firstJoinColumnFilter
+ : { [logicalOperator]: joinColumnFilters };
};
const buildDirectFieldGqlOperationFilter = ({
@@ -733,41 +723,44 @@ const buildDirectFieldGqlOperationFilter = ({
if (recordIds.length === 0) return;
- const relationFilterJoinColumnName = getRelationFilterJoinColumnName({
+ const relationFilterJoinColumnNames = getRelationFilterJoinColumnNames({
fieldMetadataItem,
- filterValueDependencies,
});
- if (!isDefined(relationFilterJoinColumnName)) {
+ if (relationFilterJoinColumnNames.length === 0) {
return;
}
switch (recordFilter.operand) {
case RecordFilterOperand.IS:
- return {
- [relationFilterJoinColumnName]: {
- in: recordIds,
- } as RelationFilter,
- };
- case RecordFilterOperand.IS_NOT: {
- if (!isDefined(recordIds) || recordIds.length === 0) return;
- return {
- or: [
- {
- not: {
- [relationFilterJoinColumnName]: {
- in: recordIds,
- } as RelationFilter,
- },
- },
- {
- [relationFilterJoinColumnName]: {
- is: 'NULL',
- } as RelationFilter,
- },
- ],
- };
- }
+ return combineRelationJoinColumnFilters({
+ joinColumnFilters: relationFilterJoinColumnNames.map(
+ (joinColumnName) => ({
+ [joinColumnName]: { in: recordIds } satisfies RelationFilter,
+ }),
+ ),
+ logicalOperator: 'or',
+ });
+ case RecordFilterOperand.IS_NOT:
+ return combineRelationJoinColumnFilters({
+ joinColumnFilters: relationFilterJoinColumnNames.map(
+ (joinColumnName) => ({
+ or: [
+ {
+ not: {
+ [joinColumnName]: {
+ in: recordIds,
+ } satisfies RelationFilter,
+ },
+ },
+ {
+ [joinColumnName]: { is: 'NULL' } satisfies RelationFilter,
+ },
+ ],
+ }),
+ ),
+ logicalOperator: 'and',
+ });
default:
throw new Error(
`Unknown operand ${recordFilter.operand} for ${filterType} filter`,
diff --git a/packages/twenty-shared/src/utils/index.ts b/packages/twenty-shared/src/utils/index.ts
index c1de1f1222a..66acebd78ad 100644
--- a/packages/twenty-shared/src/utils/index.ts
+++ b/packages/twenty-shared/src/utils/index.ts
@@ -89,6 +89,7 @@ export { computeGqlOperationFilterForLinks } from './filter/compute-record-gql-o
export { computeEmptyGqlOperationFilterForEmails } from './filter/computeEmptyGqlOperationFilterForEmails';
export { computeEmptyGqlOperationFilterForLinks } from './filter/computeEmptyGqlOperationFilterForLinks';
export { computeEmptyGqlOperationFilterForMorphRelation } from './filter/computeEmptyGqlOperationFilterForMorphRelation';
+export { computeMorphRelationJoinColumnNames } from './filter/computeMorphRelationJoinColumnNames';
export { computeRecordGqlOperationFilter } from './filter/computeRecordGqlOperationFilter';
export type { DateTimePeriod } from './filter/dates/types/DateTimePeriod';
export { addUnitToDateTime } from './filter/dates/utils/addUnitToDateTime';