The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Resolve morph relation fields in row-level permission predicates (#28175)
Charles Bochetfc7e26063b7e
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.tsindex 3f780fca0c1..b846324d62f 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@@ -9,7 +9,6 @@ import {import {assertIsDefinedOrThrow,combineFilters,- computeRecordGqlOperationFilter,convertViewFilterValueToString,getFilterTypeFromFieldType,isDefined,@@ -53,7 +52,6 @@ import { WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspaimport { 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';@@ -61,6 +59,7 @@ import { ViewFilterService } from 'src/engine/metadata-modules/view-filter/serviimport { ViewService } from 'src/engine/metadata-modules/view/services/view.service';import { formatColumnNameForRelationField } from 'src/engine/twenty-orm/utils/format-column-name-for-relation-field.util';import { type WorkspaceSelectQueryBuilder } from 'src/engine/twenty-orm/query-builder/workspace-select-query-builder';+import { computeRecordGqlOperationFilterFromFlatMaps } from 'src/engine/utils/compute-record-gql-operation-filter-from-flat-maps.util';@Injectable()export class CommonGroupByQueryRunnerService extends CommonBaseQueryRunnerService<@@ -118,6 +117,7 @@ export class CommonGroupByQueryRunnerService extends CommonBaseQueryRunnerServicappliedFilters,queryBuilder,flatObjectMetadata,+ flatObjectMetadataMaps,flatFieldMetadataMaps,workspaceId: authContext.workspace.id,commonQueryParser,@@ -191,6 +191,7 @@ export class CommonGroupByQueryRunnerService extends CommonBaseQueryRunnerServicprivate async addFiltersFromView({args,flatObjectMetadata,+ flatObjectMetadataMaps,flatFieldMetadataMaps,restrictedFields,appliedFilters,@@ -198,6 +199,7 @@ export class CommonGroupByQueryRunnerService extends CommonBaseQueryRunnerServic}: {args: GroupByQueryArgs;flatObjectMetadata: FlatObjectMetadata;+ flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;restrictedFields: RestrictedFieldsPermissions;appliedFilters: ObjectRecordFilter;@@ -265,22 +267,11 @@ export class CommonGroupByQueryRunnerService extends CommonBaseQueryRunnerServicoptions: field.options as PartialFieldMetadataItemOption[],}));- const {- flatFieldMetadataMaps: fullFlatFieldMetadataMaps,- flatObjectMetadataMaps,- } = await this.workspaceCacheService.getOrRecompute(workspaceId, [- 'flatFieldMetadataMaps',- 'flatObjectMetadataMaps',- ]);-- const filtersFromView = computeRecordGqlOperationFilter({+ const filtersFromView = computeRecordGqlOperationFilterFromFlatMaps({recordFilters,recordFilterGroups: recordFilterGroups,- fieldMetadataItems: computeFieldMetadataItemsForRecordFilters({- recordFilters,- flatFieldMetadataMaps: fullFlatFieldMetadataMaps,- flatObjectMetadataMaps,- }),+ flatFieldMetadataMaps,+ flatObjectMetadataMaps,filterValueDependencies: {timeZone: 'UTC', // TODO: see if we use workspace member timezone here},@@ -315,6 +306,7 @@ export class CommonGroupByQueryRunnerService extends CommonBaseQueryRunnerServicappliedFilters,queryBuilder,flatObjectMetadata,+ flatObjectMetadataMaps,flatFieldMetadataMaps,workspaceId,commonQueryParser,@@ -323,6 +315,7 @@ export class CommonGroupByQueryRunnerService extends CommonBaseQueryRunnerServicappliedFilters: ObjectRecordFilter;queryBuilder: WorkspaceSelectQueryBuilder;flatObjectMetadata: FlatObjectMetadata;+ flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;workspaceId: string;commonQueryParser: GraphqlQueryParser;@@ -333,6 +326,7 @@ export class CommonGroupByQueryRunnerService extends CommonBaseQueryRunnerServicappliedFilters = await this.addFiltersFromView({args,flatObjectMetadata,+ flatObjectMetadataMaps,flatFieldMetadataMaps,restrictedFields:queryBuilder.objectRecordsPermissions[flatObjectMetadata.id]diff --git a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-trigger/triggers/database-event/call-database-event-trigger-jobs.job.ts b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-trigger/triggers/database-event/call-database-event-trigger-jobs.job.tsindex a0fc2a0b81c..a397a17ff5f 100644--- a/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-trigger/triggers/database-event/call-database-event-trigger-jobs.job.ts+++ b/packages/twenty-server/src/engine/core-modules/logic-function/logic-function-trigger/triggers/database-event/call-database-event-trigger-jobs.job.ts@@ -46,6 +46,7 @@ export class CallDatabaseEventTriggerJobsJob {flatRowLevelPermissionPredicateMaps,flatRowLevelPermissionPredicateGroupMaps,flatFieldMetadataMaps,+ flatObjectMetadataMaps,} = await this.workspaceCacheService.getOrRecompute(workspaceEventBatch.workspaceId,[@@ -56,6 +57,7 @@ export class CallDatabaseEventTriggerJobsJob {'flatRowLevelPermissionPredicateMaps','flatRowLevelPermissionPredicateGroupMaps','flatFieldMetadataMaps',+ 'flatObjectMetadataMaps',],);@@ -113,6 +115,7 @@ export class CallDatabaseEventTriggerJobsJob {flatRowLevelPermissionPredicateMaps,flatRowLevelPermissionPredicateGroupMaps,flatFieldMetadataMaps,+ flatObjectMetadataMaps,});const logicFunctionPayloads = transformEventBatchToEventPayloads({logicFunctions,diff --git a/packages/twenty-server/src/engine/core-modules/record-share/services/record-share-principal.service.ts b/packages/twenty-server/src/engine/core-modules/record-share/services/record-share-principal.service.tsindex 4f60f999fdf..603a3528f8a 100644--- a/packages/twenty-server/src/engine/core-modules/record-share/services/record-share-principal.service.ts+++ b/packages/twenty-server/src/engine/core-modules/record-share/services/record-share-principal.service.ts@@ -111,12 +111,14 @@ export class RecordSharePrincipalService {flatRowLevelPermissionPredicateMaps,flatRowLevelPermissionPredicateGroupMaps,flatFieldMetadataMaps,+ flatObjectMetadataMaps,} = await this.workspaceCacheService.getOrRecompute(workspaceId, ['rolesPermissions','roleIdsWithAllRecordsAccess','flatRowLevelPermissionPredicateMaps','flatRowLevelPermissionPredicateGroupMaps','flatFieldMetadataMaps',+ 'flatObjectMetadataMaps',]);const repository = transactionScope.getRepository(flatObjectMetadata.nameSingular,@@ -167,6 +169,7 @@ export class RecordSharePrincipalService {flatRowLevelPermissionPredicateMaps,flatRowLevelPermissionPredicateGroupMaps,flatFieldMetadataMaps,+ flatObjectMetadataMaps,workspaceMember: workspaceMember ?? undefined,});const policy = repository.buildRowAccessPolicy({diff --git a/packages/twenty-server/src/engine/core-modules/record-share/utils/build-role-row-access-policy-subject.util.ts b/packages/twenty-server/src/engine/core-modules/record-share/utils/build-role-row-access-policy-subject.util.tsindex 5058ab7c0f3..2c9d292eac2 100644--- a/packages/twenty-server/src/engine/core-modules/record-share/utils/build-role-row-access-policy-subject.util.ts+++ b/packages/twenty-server/src/engine/core-modules/record-share/utils/build-role-row-access-policy-subject.util.ts@@ -8,6 +8,7 @@ import { type UserWorkspaceAuthContext } from 'src/engine/core-modules/auth/typeimport { canRolesAccessAllRecords } from 'src/engine/core-modules/record-share/utils/can-roles-access-all-records.util';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 { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';import { type FlatRowLevelPermissionPredicateMaps } from 'src/engine/metadata-modules/row-level-permission-predicate/types/flat-row-level-permission-predicate-maps.type';import { type FlatRowLevelPermissionPredicateGroupMaps } from 'src/engine/metadata-modules/row-level-permission-predicate/types/flat-row-level-permission-predicate-group-maps.type';import { type RowAccessPolicySubject } from 'src/engine/twenty-orm/types/row-access-policy.type';@@ -21,6 +22,7 @@ export const buildRoleRowAccessPolicySubject = ({flatRowLevelPermissionPredicateMaps,flatRowLevelPermissionPredicateGroupMaps,flatFieldMetadataMaps,+ flatObjectMetadataMaps,workspaceMember,}: {roleId: string | undefined;@@ -30,6 +32,7 @@ export const buildRoleRowAccessPolicySubject = ({flatRowLevelPermissionPredicateMaps: FlatRowLevelPermissionPredicateMaps;flatRowLevelPermissionPredicateGroupMaps: FlatRowLevelPermissionPredicateGroupMaps;flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;+ flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;workspaceMember?: UserWorkspaceAuthContext['workspaceMember'];}): RowAccessPolicySubject => {const roleIds = isDefined(roleId) ? [roleId] : [];@@ -56,6 +59,7 @@ export const buildRoleRowAccessPolicySubject = ({flatRowLevelPermissionPredicateMaps,flatRowLevelPermissionPredicateGroupMaps,flatFieldMetadataMaps,+ flatObjectMetadataMaps,objectMetadata,roleIds,workspaceMember,diff --git a/packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-automation-admitted-record-ids.util.ts b/packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-automation-admitted-record-ids.util.tsindex 792a6abd658..7f3cfee5a04 100644--- a/packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-automation-admitted-record-ids.util.ts+++ b/packages/twenty-server/src/engine/core-modules/record-share/utils/resolve-automation-admitted-record-ids.util.ts@@ -26,6 +26,7 @@ export const resolveAutomationAdmittedRecordIds = async ({flatRowLevelPermissionPredicateMaps,flatRowLevelPermissionPredicateGroupMaps,flatFieldMetadataMaps,+ flatObjectMetadataMaps,} = await workspaceCacheService.getOrRecompute(payload.workspaceId, ['flatApplicationMaps','flatRoleMaps',@@ -34,6 +35,7 @@ export const resolveAutomationAdmittedRecordIds = async ({'flatRowLevelPermissionPredicateMaps','flatRowLevelPermissionPredicateGroupMaps','flatFieldMetadataMaps',+ 'flatObjectMetadataMaps',]);const standardApplication = findActiveFlatApplicationByUniversalIdentifier(@@ -57,6 +59,7 @@ export const resolveAutomationAdmittedRecordIds = async ({flatRowLevelPermissionPredicateMaps,flatRowLevelPermissionPredicateGroupMaps,flatFieldMetadataMaps,+ flatObjectMetadataMaps,}),);};diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-trigger/jobs/call-agent-database-event-triggers.job.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-trigger/jobs/call-agent-database-event-triggers.job.tsindex b6240246588..f017c21b483 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-trigger/jobs/call-agent-database-event-triggers.job.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-agent-trigger/jobs/call-agent-database-event-triggers.job.ts@@ -53,6 +53,7 @@ export class CallAgentDatabaseEventTriggersJob {flatRowLevelPermissionPredicateMaps,flatRowLevelPermissionPredicateGroupMaps,flatFieldMetadataMaps,+ flatObjectMetadataMaps,} = await this.workspaceCacheService.getOrRecompute(workspaceId, ['flatAgentMaps','flatRoleTargetByAgentIdMaps',@@ -61,6 +62,7 @@ export class CallAgentDatabaseEventTriggersJob {'flatRowLevelPermissionPredicateMaps','flatRowLevelPermissionPredicateGroupMaps','flatFieldMetadataMaps',+ 'flatObjectMetadataMaps',]);const matchingAgentTriggers = findAgentDatabaseEventTriggersMatchingEvent({@@ -98,6 +100,7 @@ export class CallAgentDatabaseEventTriggersJob {flatRowLevelPermissionPredicateMaps,flatRowLevelPermissionPredicateGroupMaps,flatFieldMetadataMaps,+ flatObjectMetadataMaps,}),);const restrictedFields =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.tsdeleted file mode 100644index bdc5a4e8914..00000000000--- a/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/compute-field-metadata-items-for-record-filters.util.ts+++ /dev/null@@ -1,67 +0,0 @@-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/flat-field-metadata/utils/compute-flat-field-metadata-array-for-record-filters.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/compute-flat-field-metadata-array-for-record-filters.util.tsdeleted file mode 100644index 43978561fb3..00000000000--- a/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/compute-flat-field-metadata-array-for-record-filters.util.ts+++ /dev/null@@ -1,34 +0,0 @@-import { isDefined, type RecordFilter } from 'twenty-shared/utils';--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';--export const computeFlatFieldMetadataArrayForRecordFilters = ({- flatFieldMetadataMaps,- recordFilters,-}: {- flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;- recordFilters: Pick<- RecordFilter,- 'fieldMetadataId' | 'relationTargetFieldMetadataId'- >[];-}): FlatFieldMetadata[] => {- const recordFilterFieldMetadataIds = new Set(- recordFilters- .flatMap(({ fieldMetadataId, relationTargetFieldMetadataId }) => [- fieldMetadataId,- relationTargetFieldMetadataId,- ])- .filter(isDefined),- );-- return [...recordFilterFieldMetadataIds]- .map((fieldMetadataId) =>- findFlatEntityByIdInFlatEntityMaps({- flatEntityId: fieldMetadataId,- flatEntityMaps: flatFieldMetadataMaps,- }),- )- .filter(isDefined);-};diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/find-all-others-morph-relation-flat-field-metadatas-or-throw.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/find-all-others-morph-relation-flat-field-metadatas-or-throw.util.tsindex bb6651c0232..c027333b0cb 100644--- a/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/find-all-others-morph-relation-flat-field-metadatas-or-throw.util.ts+++ b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/find-all-others-morph-relation-flat-field-metadatas-or-throw.util.ts@@ -13,16 +13,21 @@ import { type OrmFlatFieldMetadata } from 'src/engine/metadata-modules/flat-fielimport { isFlatFieldMetadataOfType } from 'src/engine/metadata-modules/flat-field-metadata/utils/is-flat-field-metadata-of-type.util';import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';-export type FindAllMorphRelationFlatFieldMetadatasOrThrowArgs = {- flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;- flatFieldMetadata: FlatFieldMetadata<FieldMetadataType.MORPH_RELATION>;- flatObjectMetadata: FlatObjectMetadata;+export type FindAllMorphRelationFlatFieldMetadatasOrThrowArgs<+ TFlatFieldMetadata extends OrmFlatFieldMetadata,+> = {+ flatFieldMetadataMaps: FlatEntityMaps<TFlatFieldMetadata>;+ flatFieldMetadata: Pick<OrmFlatFieldMetadata, 'id' | 'morphId'>;+ flatObjectMetadata: Pick<FlatObjectMetadata, 'fieldIds'>;};-export const findAllOthersMorphRelationFlatFieldMetadatasOrThrow = ({+export const findAllOthersMorphRelationFlatFieldMetadatasOrThrow = <+ TFlatFieldMetadata extends OrmFlatFieldMetadata,+>({flatFieldMetadataMaps,flatObjectMetadata,flatFieldMetadata: morphRelationFlatFieldMetadata,-}: FindAllMorphRelationFlatFieldMetadatasOrThrowArgs): FlatFieldMetadata<FieldMetadataType.MORPH_RELATION>[] => {+}: FindAllMorphRelationFlatFieldMetadatasOrThrowArgs<TFlatFieldMetadata>): (TFlatFieldMetadata &+ FlatFieldMetadata<FieldMetadataType.MORPH_RELATION>)[] => {if (!isDefined(findFlatEntityByIdInFlatEntityMaps({@@ -46,7 +51,8 @@ export const findAllOthersMorphRelationFlatFieldMetadatasOrThrow = ({return objectFlatFieldMetadatas.filter((flatFieldMetadata,- ): flatFieldMetadata is FlatFieldMetadata<FieldMetadataType.MORPH_RELATION> =>+ ): flatFieldMetadata is TFlatFieldMetadata &+ FlatFieldMetadata<FieldMetadataType.MORPH_RELATION> =>isFlatFieldMetadataOfType(flatFieldMetadata,FieldMetadataType.MORPH_RELATION,diff --git a/packages/twenty-server/src/engine/metadata-modules/permissions/utils/resolve-events-readable-by-role.util.ts b/packages/twenty-server/src/engine/metadata-modules/permissions/utils/resolve-events-readable-by-role.util.tsindex 67c7218fa15..4dbad856b5a 100644--- a/packages/twenty-server/src/engine/metadata-modules/permissions/utils/resolve-events-readable-by-role.util.ts+++ b/packages/twenty-server/src/engine/metadata-modules/permissions/utils/resolve-events-readable-by-role.util.ts@@ -8,6 +8,7 @@ import { isUpdateOfHiddenFieldsOnly } from 'src/engine/core-modules/record-shareimport { omitRestrictedFieldsFromEvent } from 'src/engine/core-modules/record-share/utils/omit-restricted-fields-from-event.util';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 { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';import { type FlatRowLevelPermissionPredicateMaps } from 'src/engine/metadata-modules/row-level-permission-predicate/types/flat-row-level-permission-predicate-maps.type';import { type FlatRowLevelPermissionPredicateGroupMaps } from 'src/engine/metadata-modules/row-level-permission-predicate/types/flat-row-level-permission-predicate-group-maps.type';import { type WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/types/workspace-event-batch.type';@@ -24,6 +25,7 @@ export const resolveEventsReadableByRole = async <flatRowLevelPermissionPredicateMaps,flatRowLevelPermissionPredicateGroupMaps,flatFieldMetadataMaps,+ flatObjectMetadataMaps,}: {roleId: string | null;owningApplicationId: string;@@ -34,6 +36,7 @@ export const resolveEventsReadableByRole = async <flatRowLevelPermissionPredicateMaps: FlatRowLevelPermissionPredicateMaps;flatRowLevelPermissionPredicateGroupMaps: FlatRowLevelPermissionPredicateGroupMaps;flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;+ flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;}): Promise<TEvent[]> => {const objectsPermissions = isDefined(roleId)? rolesPermissions[roleId]@@ -53,6 +56,7 @@ export const resolveEventsReadableByRole = async <flatRowLevelPermissionPredicateMaps,flatRowLevelPermissionPredicateGroupMaps,flatFieldMetadataMaps,+ flatObjectMetadataMaps,}),);const restrictedFields =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.tsindex 2c677eafc6e..5ef5c2854a1 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@@ -9,7 +9,6 @@ import {ViewType,} from 'twenty-shared/types';import {- computeRecordGqlOperationFilter,convertViewFilterValueToString,isDefined,type RecordFilter,@@ -20,7 +19,6 @@ import { type ObjectRecordOrderBy } from 'src/engine/api/graphql/workspace-queryimport { 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 { 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 {@@ -32,6 +30,7 @@ import {import { ViewService } from 'src/engine/metadata-modules/view/services/view.service';import { isViewVisibleToUser } from 'src/engine/metadata-modules/view/utils/is-view-visible-to-user.util';import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';+import { computeRecordGqlOperationFilterFromFlatMaps } from 'src/engine/utils/compute-record-gql-operation-filter-from-flat-maps.util';import { type WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';export type ViewQueryParams = {@@ -130,12 +129,9 @@ export class ViewQueryParamsService {: RecordFilterGroupLogicalOperator.AND,}));- const filter = computeRecordGqlOperationFilter({- fieldMetadataItems: computeFieldMetadataItemsForRecordFilters({- recordFilters,- flatFieldMetadataMaps,- flatObjectMetadataMaps,- }),+ const filter = computeRecordGqlOperationFilterFromFlatMaps({+ flatFieldMetadataMaps,+ flatObjectMetadataMaps,recordFilters,recordFilterGroups,filterValueDependencies: { currentWorkspaceMemberId, timeZone },diff --git a/packages/twenty-server/src/engine/subscriptions/object-record-event/object-record-event-publisher.ts b/packages/twenty-server/src/engine/subscriptions/object-record-event/object-record-event-publisher.tsindex 6e29afebc97..a4689cb7f80 100644--- a/packages/twenty-server/src/engine/subscriptions/object-record-event/object-record-event-publisher.ts+++ b/packages/twenty-server/src/engine/subscriptions/object-record-event/object-record-event-publisher.ts@@ -62,6 +62,7 @@ type StreamPermissionsContext = {flatRowLevelPermissionPredicateMaps: FlatRowLevelPermissionPredicateMaps;flatRowLevelPermissionPredicateGroupMaps: FlatRowLevelPermissionPredicateGroupMaps;flatFieldMetadataMaps: FlatEntityMaps<FlatFieldMetadata>;+ flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;userWorkspaceRoleMap: UserWorkspaceRoleMap;rolesPermissions: ObjectsPermissionsByRoleId;roleIdsWithAllRecordsAccess: string[];@@ -526,6 +527,7 @@ export class ObjectRecordEventPublisher {flatRowLevelPermissionPredicateGroupMaps:permissionsContext.flatRowLevelPermissionPredicateGroupMaps,flatFieldMetadataMaps: permissionsContext.flatFieldMetadataMaps,+ flatObjectMetadataMaps: permissionsContext.flatObjectMetadataMaps,objectMetadata,roleIds,workspaceMember: isDefined(subscriberAuthContext.workspaceMemberId)@@ -634,6 +636,7 @@ export class ObjectRecordEventPublisher {flatRowLevelPermissionPredicateMaps,flatRowLevelPermissionPredicateGroupMaps,flatFieldMetadataMaps,+ flatObjectMetadataMaps,userWorkspaceRoleMap,rolesPermissions,roleIdsWithAllRecordsAccess,@@ -642,6 +645,7 @@ export class ObjectRecordEventPublisher {'flatRowLevelPermissionPredicateMaps','flatRowLevelPermissionPredicateGroupMaps','flatFieldMetadataMaps',+ 'flatObjectMetadataMaps','userWorkspaceRoleMap','rolesPermissions','roleIdsWithAllRecordsAccess',@@ -652,6 +656,7 @@ export class ObjectRecordEventPublisher {flatRowLevelPermissionPredicateMaps,flatRowLevelPermissionPredicateGroupMaps,flatFieldMetadataMaps,+ flatObjectMetadataMaps,userWorkspaceRoleMap,rolesPermissions,roleIdsWithAllRecordsAccess,diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/build-row-level-permission-record-filter.util.spec.ts b/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/build-row-level-permission-record-filter.util.spec.tsindex e2113d00553..6587de7313a 100644--- a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/build-row-level-permission-record-filter.util.spec.ts+++ b/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/build-row-level-permission-record-filter.util.spec.ts@@ -1,5 +1,6 @@import {FieldMetadataType,+ RelationType,RowLevelPermissionPredicateGroupLogicalOperator,} from 'twenty-shared/types';@@ -29,6 +30,14 @@ const OR_GROUP_ROLE_ID = 'or-group-role-1';const AND_GROUP_ROLE_ID = 'and-group-role-1';const NESTED_GROUP_ROLE_ID = 'nested-group-role-1';const OR_GROUP_ONLY_MEMBER_ROLE_ID = 'or-group-only-member-role-1';+const COMPANY_OBJECT_ID = 'company-object';+const PERSON_OBJECT_ID = 'person-object';+const OWNER_MORPH_ID = 'owner-morph';+const OWNER_COMPANY_FIELD_ID = 'owner-company-field';+const OWNER_PERSON_FIELD_ID = 'owner-person-field';+const MORPH_TARGET_ROLE_ID = 'morph-target-role-1';+const MORPH_HEAD_ROLE_ID = 'morph-head-role-1';+const OWNER_RECORD_ID = '11111111-1111-4111-8111-111111111111';const buildMaps = (entities: ({ id: string; universalIdentifier: string } & Record<@@ -49,10 +58,44 @@ const flatObjectMetadata = {id: OBJECT_ID,nameSingular: 'thing',namePlural: 'things',- fieldIds: [FIELD_ID, STATUS_FIELD_ID],- fieldUniversalIdentifiers: [FIELD_ID, STATUS_FIELD_ID],+ fieldIds: [+ FIELD_ID,+ STATUS_FIELD_ID,+ OWNER_MORPH_ID,+ OWNER_COMPANY_FIELD_ID,+ OWNER_PERSON_FIELD_ID,+ ],} as unknown as FlatObjectMetadata;+const flatObjectMetadataMaps = buildMaps([+ { ...flatObjectMetadata, universalIdentifier: OBJECT_ID },+ {+ id: COMPANY_OBJECT_ID,+ universalIdentifier: COMPANY_OBJECT_ID,+ nameSingular: 'company',+ namePlural: 'companies',+ },+ {+ id: PERSON_OBJECT_ID,+ universalIdentifier: PERSON_OBJECT_ID,+ nameSingular: 'person',+ namePlural: 'people',+ },+]) as unknown as FlatEntityMaps<FlatObjectMetadata>;++const buildOwnerMorphField = (+ field: { id: string; name: string } & Record<string, unknown>,+) => ({+ universalIdentifier: field.id,+ type: FieldMetadataType.MORPH_RELATION,+ objectMetadataId: OBJECT_ID,+ morphId: OWNER_MORPH_ID,+ relationTargetFieldMetadataId: null,+ relationTargetObjectMetadataId: null,+ settings: { relationType: RelationType.MANY_TO_ONE },+ ...field,+});+const flatFieldMetadataMaps = buildMaps([{id: FIELD_ID,@@ -90,6 +133,19 @@ const flatFieldMetadataMaps = buildMaps([{ value: 'SALES', label: 'Sales' },],},+ buildOwnerMorphField({ id: OWNER_MORPH_ID, name: 'owner' }),+ buildOwnerMorphField({+ id: OWNER_COMPANY_FIELD_ID,+ name: 'ownerCompany',+ relationTargetFieldMetadataId: 'company-owned-things-field',+ relationTargetObjectMetadataId: COMPANY_OBJECT_ID,+ }),+ buildOwnerMorphField({+ id: OWNER_PERSON_FIELD_ID,+ name: 'ownerPerson',+ relationTargetFieldMetadataId: 'person-owned-things-field',+ relationTargetObjectMetadataId: PERSON_OBJECT_ID,+ }),]) as unknown as FlatEntityMaps<FlatFieldMetadata>;const buildPredicate = (@@ -162,6 +218,16 @@ const flatRowLevelPermissionPredicateMaps = buildMaps([workspaceMemberFieldMetadataId: WORKSPACE_MEMBER_LOCALE_FIELD_ID,rowLevelPermissionPredicateGroupId: 'or-group-only-member',}),+ buildPredicate('predicate-morph-target', MORPH_TARGET_ROLE_ID, {+ fieldMetadataId: OWNER_COMPANY_FIELD_ID,+ operand: 'IS',+ value: { selectedRecordIds: [OWNER_RECORD_ID] },+ }),+ buildPredicate('predicate-morph-head', MORPH_HEAD_ROLE_ID, {+ fieldMetadataId: OWNER_MORPH_ID,+ operand: 'IS',+ value: { selectedRecordIds: [OWNER_RECORD_ID] },+ }),]) as unknown as FlatRowLevelPermissionPredicateMaps;const buildPredicateGroup = (@@ -221,6 +287,7 @@ const build = (flatRowLevelPermissionPredicateMaps,flatRowLevelPermissionPredicateGroupMaps,flatFieldMetadataMaps,+ flatObjectMetadataMaps,objectMetadata: flatObjectMetadata,roleIds,workspaceMember,@@ -256,6 +323,21 @@ describe('buildRowLevelPermissionRecordFilter', () => {});});+ it.each([+ ['a morph relation target', MORPH_TARGET_ROLE_ID],+ ['a morph relation head', MORPH_HEAD_ROLE_ID],+ ])(+ 'should check every target join column for a predicate on %s',+ (_, roleId) => {+ expect(build([roleId])).toEqual({+ or: [+ { ownerCompanyId: { in: [OWNER_RECORD_ID] } },+ { ownerPersonId: { in: [OWNER_RECORD_ID] } },+ ],+ });+ },+ );+describe('predicate bound to a workspace member field', () => {it('should filter on the value carried by the workspace member', () => {expect(diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/build-row-level-permission-record-filter.util.ts b/packages/twenty-server/src/engine/twenty-orm/utils/build-row-level-permission-record-filter.util.tsindex 3695a603756..26eecfef772 100644--- a/packages/twenty-server/src/engine/twenty-orm/utils/build-row-level-permission-record-filter.util.ts+++ b/packages/twenty-server/src/engine/twenty-orm/utils/build-row-level-permission-record-filter.util.ts@@ -8,7 +8,6 @@ import {type RowLevelPermissionPredicateValue,} from 'twenty-shared/types';import {- computeRecordGqlOperationFilter,convertViewFilterValueToString,getFilterTypeFromFieldType,isDefined,@@ -32,11 +31,13 @@ import { UNSATISFIABLE_RECORD_FILTER } from 'src/engine/twenty-orm/constants/unsimport { resolveUnsatisfiableRecordFilterGroupIds } from 'src/engine/twenty-orm/utils/resolve-unsatisfiable-record-filter-group-ids.util';import { resolveWorkspaceMemberPredicateValue } from 'src/engine/twenty-orm/utils/resolve-workspace-member-predicate-value.util';import { validatePredicateValueCompatibility } from 'src/engine/twenty-orm/utils/validate-predicate-value-compatibility.util';+import { computeRecordGqlOperationFilterFromFlatMaps } from 'src/engine/utils/compute-record-gql-operation-filter-from-flat-maps.util';type BuildRecordFilterForRoleArgs = {flatRowLevelPermissionPredicateMaps: FlatRowLevelPermissionPredicateMaps;flatRowLevelPermissionPredicateGroupMaps: FlatRowLevelPermissionPredicateGroupMaps;flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;+ flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;objectMetadata: FlatObjectMetadata;roleId: string;workspaceMember?: UserWorkspaceAuthContext['workspaceMember'];@@ -94,6 +95,7 @@ const buildRecordFilterForRole = ({flatRowLevelPermissionPredicateMaps,flatRowLevelPermissionPredicateGroupMaps,flatFieldMetadataMaps,+ flatObjectMetadataMaps,objectMetadata,roleId,workspaceMember,@@ -212,12 +214,11 @@ const buildRecordFilterForRole = ({}));if (unsatisfiableRecordFilterIds.size === 0) {- return computeRecordGqlOperationFilter({+ return computeRecordGqlOperationFilterFromFlatMaps({recordFilters,recordFilterGroups,- fieldMetadataItems: Object.values(- flatFieldMetadataMaps.byUniversalIdentifier,- ).filter(isDefined),+ flatFieldMetadataMaps,+ flatObjectMetadataMaps,filterValueDependencies: {currentWorkspaceMemberId: workspaceMember?.id,},@@ -274,7 +275,7 @@ const buildRecordFilterForRole = ({return UNSATISFIABLE_RECORD_FILTER;}- return computeRecordGqlOperationFilter({+ return computeRecordGqlOperationFilterFromFlatMaps({recordFilters: recordFilters.filter((recordFilter) =>!unsatisfiableRecordFilterIds.has(recordFilter.id) &&@@ -283,9 +284,8 @@ const buildRecordFilterForRole = ({recordFilterGroups: recordFilterGroups.filter((recordFilterGroup) => !isInUnsatisfiableGroup(recordFilterGroup.id),),- fieldMetadataItems: Object.values(- flatFieldMetadataMaps.byUniversalIdentifier,- ).filter(isDefined),+ flatFieldMetadataMaps,+ flatObjectMetadataMaps,filterValueDependencies: {currentWorkspaceMemberId: workspaceMember?.id,},diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/resolve-row-level-permission-record-filter.util.ts b/packages/twenty-server/src/engine/twenty-orm/utils/resolve-row-level-permission-record-filter.util.tsindex aff3894bb21..f5e29c0cec3 100644--- a/packages/twenty-server/src/engine/twenty-orm/utils/resolve-row-level-permission-record-filter.util.ts+++ b/packages/twenty-server/src/engine/twenty-orm/utils/resolve-row-level-permission-record-filter.util.ts@@ -28,6 +28,7 @@ export const resolveRowLevelPermissionRecordFilter = ({flatRowLevelPermissionPredicateGroupMaps:internalContext.flatRowLevelPermissionPredicateGroupMaps,flatFieldMetadataMaps: internalContext.flatFieldMetadataMaps,+ flatObjectMetadataMaps: internalContext.flatObjectMetadataMaps,objectMetadata,roleIds: getRoleIdsFromRolePermissionConfig(rolePermissionConfig),workspaceMember: isUserAuthContext(authContext)diff --git a/packages/twenty-server/src/engine/utils/compute-record-gql-operation-filter-from-flat-maps.util.ts b/packages/twenty-server/src/engine/utils/compute-record-gql-operation-filter-from-flat-maps.util.tsnew file mode 100644index 00000000000..e7215b1a775--- /dev/null+++ b/packages/twenty-server/src/engine/utils/compute-record-gql-operation-filter-from-flat-maps.util.ts@@ -0,0 +1,154 @@+import {+ FieldMetadataType,+ type RecordFilterValueDependencies,+ type RecordGqlOperationFilter,+} from 'twenty-shared/types';+import {+ computeRecordGqlOperationFilter,+ isDefined,+ isMorphRelationHead,+ type RecordFilter,+ type RecordFilterGroup,+} from 'twenty-shared/utils';++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 { findFlatEntityByIdInFlatEntityMapsOrThrow } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps-or-throw.util';+import { type OrmFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/orm-flat-field-metadata.type';+import { findAllOthersMorphRelationFlatFieldMetadatasOrThrow } from 'src/engine/metadata-modules/flat-field-metadata/utils/find-all-others-morph-relation-flat-field-metadatas-or-throw.util';+import { isFlatFieldMetadataOfType } from 'src/engine/metadata-modules/flat-field-metadata/utils/is-flat-field-metadata-of-type.util';+import { isMorphOrRelationFlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/utils/is-morph-or-relation-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';++const findRecordFilterFlatFieldMetadatas = ({+ recordFilters,+ flatFieldMetadataMaps,+}: {+ recordFilters: Omit<RecordFilter, 'id'>[];+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;+}): OrmFlatFieldMetadata[] =>+ [+ ...new Set(+ recordFilters+ .flatMap(({ fieldMetadataId, relationTargetFieldMetadataId }) => [+ fieldMetadataId,+ relationTargetFieldMetadataId,+ ])+ .filter(isDefined),+ ),+ ]+ .map((fieldMetadataId) =>+ findFlatEntityByIdInFlatEntityMaps({+ flatEntityId: fieldMetadataId,+ flatEntityMaps: flatFieldMetadataMaps,+ }),+ )+ .filter(isDefined);++const addMorphRelationsToMorphRelationFlatFieldMetadata = ({+ flatFieldMetadata,+ flatFieldMetadataMaps,+ flatObjectMetadataMaps,+}: {+ flatFieldMetadata: OrmFlatFieldMetadata;+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;+ flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;+}) => {+ if (+ !isFlatFieldMetadataOfType(+ flatFieldMetadata,+ FieldMetadataType.MORPH_RELATION,+ )+ ) {+ return flatFieldMetadata;+ }++ const sourceFlatObjectMetadata = findFlatEntityByIdInFlatEntityMapsOrThrow({+ flatEntityId: flatFieldMetadata.objectMetadataId,+ flatEntityMaps: flatObjectMetadataMaps,+ });++ const morphRelationTargetFlatFieldMetadatas = [+ flatFieldMetadata,+ ...findAllOthersMorphRelationFlatFieldMetadatasOrThrow({+ flatFieldMetadataMaps,+ flatFieldMetadata,+ flatObjectMetadata: sourceFlatObjectMetadata,+ }),+ ].filter(isMorphOrRelationFlatFieldMetadata);++ const morphRelations = morphRelationTargetFlatFieldMetadatas.map(+ (morphRelationTargetFlatFieldMetadata) => {+ const { id, nameSingular, namePlural } =+ findFlatEntityByIdInFlatEntityMapsOrThrow({+ flatEntityId:+ morphRelationTargetFlatFieldMetadata.relationTargetObjectMetadataId,+ flatEntityMaps: flatObjectMetadataMaps,+ });++ return {+ type: morphRelationTargetFlatFieldMetadata.settings.relationType,+ targetObjectMetadata: { id, nameSingular, namePlural },+ };+ },+ );++ const flatFieldMetadataWithMorphRelations = {+ ...flatFieldMetadata,+ morphRelations,+ };++ if (isMorphRelationHead(flatFieldMetadata)) {+ return flatFieldMetadataWithMorphRelations;+ }++ const relationTargetFlatObjectMetadata =+ findFlatEntityByIdInFlatEntityMapsOrThrow({+ flatEntityId: flatFieldMetadata.relationTargetObjectMetadataId,+ flatEntityMaps: flatObjectMetadataMaps,+ });++ return {+ ...flatFieldMetadataWithMorphRelations,+ name: getMorphNameFromMorphFieldMetadataName({+ morphRelationFlatFieldMetadata: {+ name: flatFieldMetadata.name,+ universalSettings: {+ relationType: flatFieldMetadata.settings.relationType,+ },+ },+ nameSingular: relationTargetFlatObjectMetadata.nameSingular,+ namePlural: relationTargetFlatObjectMetadata.namePlural,+ }),+ };+};++export const computeRecordGqlOperationFilterFromFlatMaps = ({+ recordFilters,+ recordFilterGroups,+ filterValueDependencies,+ flatFieldMetadataMaps,+ flatObjectMetadataMaps,+}: {+ recordFilters: Omit<RecordFilter, 'id'>[];+ recordFilterGroups: RecordFilterGroup[];+ filterValueDependencies: RecordFilterValueDependencies;+ flatFieldMetadataMaps: FlatEntityMaps<OrmFlatFieldMetadata>;+ flatObjectMetadataMaps: FlatEntityMaps<FlatObjectMetadata>;+}): RecordGqlOperationFilter =>+ computeRecordGqlOperationFilter({+ recordFilters,+ recordFilterGroups,+ filterValueDependencies,+ fieldMetadataItems: findRecordFilterFlatFieldMetadatas({+ recordFilters,+ flatFieldMetadataMaps,+ }).map((flatFieldMetadata) =>+ addMorphRelationsToMorphRelationFlatFieldMetadata({+ flatFieldMetadata,+ flatFieldMetadataMaps,+ flatObjectMetadataMaps,+ }),+ ),+ });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.tsindex 1fd0db80b53..d2b7713e385 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@@ -6,7 +6,6 @@ import {type ViewFilterOperand,} from 'twenty-shared/types';import {- computeRecordGqlOperationFilter,isDefined,type RecordFilter,type RecordFilterGroup,@@ -17,8 +16,8 @@ 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 { 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';+import { computeRecordGqlOperationFilterFromFlatMaps } from 'src/engine/utils/compute-record-gql-operation-filter-from-flat-maps.util';type ConvertChartFilterToGqlOperationFilterParams = {filter: ChartFilter | undefined;@@ -79,12 +78,9 @@ export const convertChartFilterToGqlOperationFilter = ({recordFilterGroup.logicalOperator as RecordFilterGroupLogicalOperator,}));- return computeRecordGqlOperationFilter({- fieldMetadataItems: computeFieldMetadataItemsForRecordFilters({- recordFilters: convertedRecordFilters,- flatFieldMetadataMaps,- flatObjectMetadataMaps,- }),+ return computeRecordGqlOperationFilterFromFlatMaps({+ flatFieldMetadataMaps,+ flatObjectMetadataMaps,recordFilters: convertedRecordFilters,recordFilterGroups: convertedRecordFilterGroups,filterValueDependencies: {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.tsindex a3df17a9b19..33239526fa5 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@@ -2,7 +2,6 @@ import { Injectable } from '@nestjs/common';import { type RecordGqlOperationFilter } from 'twenty-shared/types';import {- computeRecordGqlOperationFilter,isDefined,isEmptyObject,isNonEmptyArray,@@ -13,7 +12,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 { computeRecordGqlOperationFilterFromFlatMaps } from 'src/engine/utils/compute-record-gql-operation-filter-from-flat-maps.util';import { WorkflowCommonWorkspaceService } from 'src/modules/workflow/common/workspace-services/workflow-common.workspace-service';import {WorkflowStepExecutorException,@@ -91,12 +90,9 @@ export class FindRecordsWorkflowAction implements WorkflowAction {try {gqlOperationFilter = isDefined(recordFilters)- ? computeRecordGqlOperationFilter({- fieldMetadataItems: computeFieldMetadataItemsForRecordFilters({- recordFilters,- flatFieldMetadataMaps,- flatObjectMetadataMaps,- }),+ ? computeRecordGqlOperationFilterFromFlatMaps({+ flatFieldMetadataMaps,+ flatObjectMetadataMaps,recordFilters,recordFilterGroups:workflowActionInput.filter?.recordFilterGroups ?? [],diff --git a/packages/twenty-server/src/modules/workflow/workflow-trigger/automated-trigger/listeners/workflow-database-event-trigger.listener.ts b/packages/twenty-server/src/modules/workflow/workflow-trigger/automated-trigger/listeners/workflow-database-event-trigger.listener.tsindex 0cfac6b981b..1b1944d6c34 100644--- a/packages/twenty-server/src/modules/workflow/workflow-trigger/automated-trigger/listeners/workflow-database-event-trigger.listener.ts+++ b/packages/twenty-server/src/modules/workflow/workflow-trigger/automated-trigger/listeners/workflow-database-event-trigger.listener.ts@@ -510,6 +510,7 @@ export class WorkflowDatabaseEventTriggerListener {flatRowLevelPermissionPredicateMaps,flatRowLevelPermissionPredicateGroupMaps,flatFieldMetadataMaps,+ flatObjectMetadataMaps,} = await this.workspaceCacheService.getOrRecompute(payload.workspaceId, ['flatApplicationMaps','rolesPermissions',@@ -517,6 +518,7 @@ export class WorkflowDatabaseEventTriggerListener {'flatRowLevelPermissionPredicateMaps','flatRowLevelPermissionPredicateGroupMaps','flatFieldMetadataMaps',+ 'flatObjectMetadataMaps',]);return resolveEventsReadableByRole({@@ -532,6 +534,7 @@ export class WorkflowDatabaseEventTriggerListener {flatRowLevelPermissionPredicateMaps,flatRowLevelPermissionPredicateGroupMaps,flatFieldMetadataMaps,+ flatObjectMetadataMaps,});}