The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Remove the IS_PRIVATE_RECORD_ENABLED feature flag (#29538)
Charles Bochet2f6396fd2336
diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql b/packages/twenty-client-sdk/src/metadata/generated/schema.graphqlindex 9cbcacf121e..5429b4200e0 100644--- a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.graphql@@ -2335,7 +2335,6 @@ enum FeatureFlagKey {IS_CONFIGURABLE_SEARCH_FIELDS_ENABLEDIS_GETTING_STARTED_ENABLEDIS_MCP_SERVERS_ENABLED- IS_PRIVATE_RECORD_ENABLEDIS_RECORD_LEVEL_SHARING_ENABLEDIS_RELATED_RECORD_PATHS_ENABLEDIS_REST_METADATA_API_NEW_FORMAT_DIRECTdiff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.ts b/packages/twenty-client-sdk/src/metadata/generated/schema.tsindex 8db0010c5ba..33245d40b20 100644--- a/packages/twenty-client-sdk/src/metadata/generated/schema.ts+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.ts@@ -1536,7 +1536,7 @@ export interface FeatureFlag {__typename: 'FeatureFlag'}-export type FeatureFlagKey = 'IS_AGENT_CHAT_DIRECT_MESSAGE_IDENTITY_ENABLED' | 'IS_AI_CHAT_COMPONENT_BUILDER_ENABLED' | 'IS_AI_CHAT_INBOX_ENABLED' | 'IS_APP_PREFERENCES_ENABLED' | 'IS_CALENDAR_EVENT_SHARED_ACROSS_CHANNELS_ENABLED' | 'IS_CONFIGURABLE_SEARCH_FIELDS_ENABLED' | 'IS_GETTING_STARTED_ENABLED' | 'IS_MCP_SERVERS_ENABLED' | 'IS_PRIVATE_RECORD_ENABLED' | 'IS_RECORD_LEVEL_SHARING_ENABLED' | 'IS_RELATED_RECORD_PATHS_ENABLED' | 'IS_REST_METADATA_API_NEW_FORMAT_DIRECT' | 'IS_ROW_LEVEL_PERMISSION_RELATION_HOP_ENABLED'+export type FeatureFlagKey = 'IS_AGENT_CHAT_DIRECT_MESSAGE_IDENTITY_ENABLED' | 'IS_AI_CHAT_COMPONENT_BUILDER_ENABLED' | 'IS_AI_CHAT_INBOX_ENABLED' | 'IS_APP_PREFERENCES_ENABLED' | 'IS_CALENDAR_EVENT_SHARED_ACROSS_CHANNELS_ENABLED' | 'IS_CONFIGURABLE_SEARCH_FIELDS_ENABLED' | 'IS_GETTING_STARTED_ENABLED' | 'IS_MCP_SERVERS_ENABLED' | 'IS_RECORD_LEVEL_SHARING_ENABLED' | 'IS_RELATED_RECORD_PATHS_ENABLED' | 'IS_REST_METADATA_API_NEW_FORMAT_DIRECT' | 'IS_ROW_LEVEL_PERMISSION_RELATION_HOP_ENABLED'export interface Field {applicationId: Scalars['UUID']@@ -12611,7 +12611,6 @@ export const enumFeatureFlagKey = {IS_CONFIGURABLE_SEARCH_FIELDS_ENABLED: 'IS_CONFIGURABLE_SEARCH_FIELDS_ENABLED' as const,IS_GETTING_STARTED_ENABLED: 'IS_GETTING_STARTED_ENABLED' as const,IS_MCP_SERVERS_ENABLED: 'IS_MCP_SERVERS_ENABLED' as const,- IS_PRIVATE_RECORD_ENABLED: 'IS_PRIVATE_RECORD_ENABLED' as const,IS_RECORD_LEVEL_SHARING_ENABLED: 'IS_RECORD_LEVEL_SHARING_ENABLED' as const,IS_RELATED_RECORD_PATHS_ENABLED: 'IS_RELATED_RECORD_PATHS_ENABLED' as const,IS_REST_METADATA_API_NEW_FORMAT_DIRECT: 'IS_REST_METADATA_API_NEW_FORMAT_DIRECT' as const,diff --git a/packages/twenty-front/src/generated-admin/schema.ts b/packages/twenty-front/src/generated-admin/schema.tsindex e5712cccdeb..d398aabd6f0 100644--- a/packages/twenty-front/src/generated-admin/schema.ts+++ b/packages/twenty-front/src/generated-admin/schema.ts@@ -545,7 +545,6 @@ export enum FeatureFlagKey {IS_CONFIGURABLE_SEARCH_FIELDS_ENABLED = 'IS_CONFIGURABLE_SEARCH_FIELDS_ENABLED',IS_GETTING_STARTED_ENABLED = 'IS_GETTING_STARTED_ENABLED',IS_MCP_SERVERS_ENABLED = 'IS_MCP_SERVERS_ENABLED',- IS_PRIVATE_RECORD_ENABLED = 'IS_PRIVATE_RECORD_ENABLED',IS_RECORD_LEVEL_SHARING_ENABLED = 'IS_RECORD_LEVEL_SHARING_ENABLED',IS_RELATED_RECORD_PATHS_ENABLED = 'IS_RELATED_RECORD_PATHS_ENABLED',IS_REST_METADATA_API_NEW_FORMAT_DIRECT = 'IS_REST_METADATA_API_NEW_FORMAT_DIRECT',diff --git a/packages/twenty-front/src/generated-metadata/schema.ts b/packages/twenty-front/src/generated-metadata/schema.tsindex 972787829b4..72f25e8041a 100644--- a/packages/twenty-front/src/generated-metadata/schema.ts+++ b/packages/twenty-front/src/generated-metadata/schema.ts@@ -2468,7 +2468,6 @@ export enum FeatureFlagKey {IS_CONFIGURABLE_SEARCH_FIELDS_ENABLED = 'IS_CONFIGURABLE_SEARCH_FIELDS_ENABLED',IS_GETTING_STARTED_ENABLED = 'IS_GETTING_STARTED_ENABLED',IS_MCP_SERVERS_ENABLED = 'IS_MCP_SERVERS_ENABLED',- IS_PRIVATE_RECORD_ENABLED = 'IS_PRIVATE_RECORD_ENABLED',IS_RECORD_LEVEL_SHARING_ENABLED = 'IS_RECORD_LEVEL_SHARING_ENABLED',IS_RELATED_RECORD_PATHS_ENABLED = 'IS_RELATED_RECORD_PATHS_ENABLED',IS_REST_METADATA_API_NEW_FORMAT_DIRECT = 'IS_REST_METADATA_API_NEW_FORMAT_DIRECT',diff --git a/packages/twenty-front/src/modules/settings/admin-panel/constants/SettingsAdminFeatureFlagMetadata.ts b/packages/twenty-front/src/modules/settings/admin-panel/constants/SettingsAdminFeatureFlagMetadata.tsindex 4a2d686d008..d279621b270 100644--- a/packages/twenty-front/src/modules/settings/admin-panel/constants/SettingsAdminFeatureFlagMetadata.ts+++ b/packages/twenty-front/src/modules/settings/admin-panel/constants/SettingsAdminFeatureFlagMetadata.ts@@ -48,10 +48,6 @@ export const SETTINGS_ADMIN_FEATURE_FLAG_METADATA: Record<label: msg`Related record paths`,description: msg`Define the relations along which a record's permissions extend to related records.`,},- [FeatureFlagKey.IS_PRIVATE_RECORD_ENABLED]: {- label: msg`Private records`,- description: msg`Let people make a record visible only to its creator and the people it is shared with.`,- },[FeatureFlagKey.IS_ROW_LEVEL_PERMISSION_RELATION_HOP_ENABLED]: {label: msg`Record rules through relations`,description: msg`Let record-level permission rules compare a field of a related record.`,diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-55/2-55-workspace-command-1793457458179-make-restricted-records-private.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-55/2-55-workspace-command-1793457458179-make-restricted-records-private.command.tsindex 85f72060c13..ac8c4c0835a 100644--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-55/2-55-workspace-command-1793457458179-make-restricted-records-private.command.ts+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-55/2-55-workspace-command-1793457458179-make-restricted-records-private.command.ts@@ -1,5 +1,4 @@import { Command } from 'nest-commander';-import { FeatureFlagKey } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';import { type QueryRunner } from 'typeorm';@@ -110,7 +109,7 @@ export class MakeRestrictedRecordsPrivateCommand extends ProvisionedWorkspaceCom`INSERT INTO core."featureFlag" ("workspaceId", key, value)VALUES ($1, $2, true)ON CONFLICT ("workspaceId", key) DO UPDATE SET value = true`,- [workspaceId, FeatureFlagKey.IS_PRIVATE_RECORD_ENABLED],+ [workspaceId, 'IS_PRIVATE_RECORD_ENABLED'],);} finally {if (isQueryRunnerConnected) {diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-sharing.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-sharing.service.tsindex 1805e8fcd7f..0edfde0c7e9 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-sharing.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-sharing.service.ts@@ -1,9 +1,5 @@import { STANDARD_OBJECTS } from 'twenty-shared/metadata';-import {- buildPrivateRecordInsertSql,- type PrivateRecordInsertSql,-} from 'src/engine/permissions/private-record/utils/build-private-record-insert-sql.util';-import { isPrivateRecordEnabled } from 'src/engine/permissions/private-record/utils/is-private-record-enabled.util';+import { IS_PRIVATE_COLUMN_NAME } from 'src/engine/permissions/private-record/constants/is-private-column-name.constant';import { AgentChatChannelGrantService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-channel-grant.service';import { AuthException } from 'src/engine/core-modules/auth/auth.exception';import { randomUUID } from 'node:crypto';@@ -351,19 +347,6 @@ export class AgentChatSharingService {);}- async getPrivateRecordInsertSql(- workspaceId: string,- ): Promise<PrivateRecordInsertSql> {- const { featureFlagsMap } = await this.workspaceCacheService.getOrRecompute(- workspaceId,- ['featureFlagsMap'],- );-- return buildPrivateRecordInsertSql({- isPrivateRecordEnabled: isPrivateRecordEnabled(featureFlagsMap),- });- }-async createThread(args: {workspaceId: string;workspaceMemberId: string;@@ -384,8 +367,6 @@ export class AgentChatSharingService {authContext,updatedColumns: isDefined(args.title) ? ['title'] : [],});- const { privateColumn, privateValue } =- await this.getPrivateRecordInsertSql(args.workspaceId);return this.threadRepository.query(args.workspaceId,@@ -403,8 +384,8 @@ export class AgentChatSharingService {channelIds: [args.channelId],});const records = await manager.query<AgentChatThreadWorkspaceEntity[]>(- `INSERT INTO ${table('agentChatThread')} (id, title, "workspaceMemberId"${privateColumn}${isDefined(args.channelId) ? ', "channelId"' : ''})- VALUES ($1, $2, $3${privateValue}${isDefined(args.channelId) ? ', $4' : ''}) RETURNING *`,+ `INSERT INTO ${table('agentChatThread')} (id, title, "workspaceMemberId", "${IS_PRIVATE_COLUMN_NAME}"${isDefined(args.channelId) ? ', "channelId"' : ''})+ VALUES ($1, $2, $3, true${isDefined(args.channelId) ? ', $4' : ''}) RETURNING *`,[args.id ?? randomUUID(),args.title ?? null,@@ -486,8 +467,6 @@ export class AgentChatSharingService {const participantObjectMetadataId =await this.getParticipantObjectMetadataId(args.workspaceId);- const { privateColumn, privateValue } =- await this.getPrivateRecordInsertSql(args.workspaceId);return this.threadRepository.query(args.workspaceId,@@ -530,8 +509,8 @@ export class AgentChatSharingService {}await manager.query(`WITH participant AS (- INSERT INTO ${getAgentChatThreadParticipantTable(args.workspaceId)} ("threadId", "workspaceMemberId"${privateColumn}, "lastReadAt", "isSubscribed")- VALUES ($1, $2${privateValue}, clock_timestamp(), false)+ INSERT INTO ${getAgentChatThreadParticipantTable(args.workspaceId)} ("threadId", "workspaceMemberId", "${IS_PRIVATE_COLUMN_NAME}", "lastReadAt", "isSubscribed")+ VALUES ($1, $2, true, clock_timestamp(), false)ON CONFLICT ("threadId", "workspaceMemberId") DO NOTHINGRETURNING id, "workspaceMemberId"), owner_share AS (@@ -574,9 +553,6 @@ export class AgentChatSharingService {isArchived?: boolean;isSubscribed?: boolean;}): Promise<AgentChatThreadWorkspaceEntity[]> {- const { privateColumn, privateValue } =- await this.getPrivateRecordInsertSql(workspaceId);-return manager.query<AgentChatThreadWorkspaceEntity[]>(`WITH thread AS (UPDATE ${table('agentChatThread')}@@ -584,8 +560,8 @@ export class AgentChatSharingService {WHERE id = ANY($1::uuid[]) AND "lastActivityAt" IS NULLRETURNING *), participant AS (- INSERT INTO ${getAgentChatThreadParticipantTable(workspaceId)} ("threadId", "workspaceMemberId"${privateColumn}, "lastReadAt", "archivedAt", "isSubscribed")- SELECT thread.id, $2${privateValue}, thread."lastActivityAt", CASE WHEN $4::boolean THEN clock_timestamp() END, $5::boolean+ INSERT INTO ${getAgentChatThreadParticipantTable(workspaceId)} ("threadId", "workspaceMemberId", "${IS_PRIVATE_COLUMN_NAME}", "lastReadAt", "archivedAt", "isSubscribed")+ SELECT thread.id, $2, true, thread."lastActivityAt", CASE WHEN $4::boolean THEN clock_timestamp() END, $5::booleanFROM threadON CONFLICT ("threadId", "workspaceMemberId") DO NOTHINGRETURNING id, "workspaceMemberId"diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-thread-participant.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-thread-participant.service.tsindex ad7e088765f..0c73098e46b 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-thread-participant.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-chat-thread-participant.service.ts@@ -3,7 +3,7 @@ import { Injectable } from '@nestjs/common';import { isDefined } from 'twenty-shared/utils';import { type EntityManager } from 'typeorm';-import { type PrivateRecordInsertSql } from 'src/engine/permissions/private-record/utils/build-private-record-insert-sql.util';+import { IS_PRIVATE_COLUMN_NAME } from 'src/engine/permissions/private-record/constants/is-private-column-name.constant';import { InjectMessageQueue } from 'src/engine/core-modules/message-queue/decorators/message-queue.decorator';import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';import { MessageQueueService } from 'src/engine/core-modules/message-queue/services/message-queue.service';@@ -42,12 +42,10 @@ import {} from 'src/engine/permissions/permissions.exception';import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';-type BuildParticipantWriteQuery = (- tables: {- participantTable: string;- threadTable: string;- } & PrivateRecordInsertSql,-) => string;+type BuildParticipantWriteQuery = (tables: {+ participantTable: string;+ threadTable: string;+}) => string;const NEXT_PARTICIPANT_UPDATED_AT = `GREATEST(clock_timestamp(), participant."updatedAt" + interval '1 millisecond')`;@@ -59,13 +57,9 @@ const PARTICIPANT_LOCK_QUERY ='SELECT pg_advisory_xact_lock(hashtextextended($1, 0))';// Saved as ended when already due, since its queued end may have run before this write-const buildSnoozeQuery: BuildParticipantWriteQuery = ({- participantTable,- privateColumn,- privateValue,-}) =>- `INSERT INTO ${participantTable} AS participant ("threadId", "workspaceMemberId"${privateColumn}, "archivedAt", "snoozedUntil", "isSubscribed")- VALUES ($1, $2${privateValue}, CASE WHEN $3::timestamptz <= clock_timestamp() THEN NULL ELSE clock_timestamp() END, $3, true)+const buildSnoozeQuery: BuildParticipantWriteQuery = ({ participantTable }) =>+ `INSERT INTO ${participantTable} AS participant ("threadId", "workspaceMemberId", "${IS_PRIVATE_COLUMN_NAME}", "archivedAt", "snoozedUntil", "isSubscribed")+ VALUES ($1, $2, true, CASE WHEN $3::timestamptz <= clock_timestamp() THEN NULL ELSE clock_timestamp() END, $3, true)ON CONFLICT ("threadId", "workspaceMemberId") DO UPDATE SET"archivedAt" = EXCLUDED."archivedAt","snoozedUntil" = EXCLUDED."snoozedUntil",@@ -91,37 +85,24 @@ const INBOX_ACTION_QUERIES: Record<> = {// Read up to what the thread holds now, never past it, and never back.// Reading or marking unread tracks a chat without following it- [AgentChatInboxAction.READ]: ({- participantTable,- threadTable,- privateColumn,- privateValue,- }) =>- `INSERT INTO ${participantTable} AS participant ("threadId", "workspaceMemberId"${privateColumn}, "lastReadAt", "isSubscribed")- SELECT thread.id, $2${privateValue}, thread."lastActivityAt", false FROM ${threadTable} thread WHERE thread.id = $1+ [AgentChatInboxAction.READ]: ({ participantTable, threadTable }) =>+ `INSERT INTO ${participantTable} AS participant ("threadId", "workspaceMemberId", "${IS_PRIVATE_COLUMN_NAME}", "lastReadAt", "isSubscribed")+ SELECT thread.id, $2, true, thread."lastActivityAt", false FROM ${threadTable} thread WHERE thread.id = $1ON CONFLICT ("threadId", "workspaceMemberId") DO UPDATE SET"lastReadAt" = GREATEST(participant."lastReadAt", EXCLUDED."lastReadAt"),"mentionsResolvedAt" = ${ALL_MENTIONS_RESOLVED_AT},"updatedAt" = ${NEXT_PARTICIPANT_UPDATED_AT}RETURNING *`,- [AgentChatInboxAction.UNREAD]: ({- participantTable,- privateColumn,- privateValue,- }) =>- `INSERT INTO ${participantTable} AS participant ("threadId", "workspaceMemberId"${privateColumn}, "lastReadAt", "isSubscribed")- VALUES ($1, $2${privateValue}, NULL, false)+ [AgentChatInboxAction.UNREAD]: ({ participantTable }) =>+ `INSERT INTO ${participantTable} AS participant ("threadId", "workspaceMemberId", "${IS_PRIVATE_COLUMN_NAME}", "lastReadAt", "isSubscribed")+ VALUES ($1, $2, true, NULL, false)ON CONFLICT ("threadId", "workspaceMemberId") DO UPDATE SET"lastReadAt" = NULL,"updatedAt" = ${NEXT_PARTICIPANT_UPDATED_AT}RETURNING *`,- [AgentChatInboxAction.ARCHIVE]: ({- participantTable,- privateColumn,- privateValue,- }) =>- `INSERT INTO ${participantTable} AS participant ("threadId", "workspaceMemberId"${privateColumn}, "archivedAt", "isSubscribed")- VALUES ($1, $2${privateValue}, clock_timestamp(), true)+ [AgentChatInboxAction.ARCHIVE]: ({ participantTable }) =>+ `INSERT INTO ${participantTable} AS participant ("threadId", "workspaceMemberId", "${IS_PRIVATE_COLUMN_NAME}", "archivedAt", "isSubscribed")+ VALUES ($1, $2, true, clock_timestamp(), true)ON CONFLICT ("threadId", "workspaceMemberId") DO UPDATE SET"archivedAt" = EXCLUDED."archivedAt","snoozedUntil" = NULL,@@ -130,39 +111,27 @@ const INBOX_ACTION_QUERIES: Record<"updatedAt" = ${NEXT_PARTICIPANT_UPDATED_AT}RETURNING *`,[AgentChatInboxAction.SNOOZE]: buildSnoozeQuery,- [AgentChatInboxAction.MOVE_TO_INBOX]: ({- participantTable,- privateColumn,- privateValue,- }) =>- `INSERT INTO ${participantTable} AS participant ("threadId", "workspaceMemberId"${privateColumn})- VALUES ($1, $2${privateValue})+ [AgentChatInboxAction.MOVE_TO_INBOX]: ({ participantTable }) =>+ `INSERT INTO ${participantTable} AS participant ("threadId", "workspaceMemberId", "${IS_PRIVATE_COLUMN_NAME}")+ VALUES ($1, $2, true)ON CONFLICT ("threadId", "workspaceMemberId") DO UPDATE SET"archivedAt" = NULL,"snoozedUntil" = NULL,"isSubscribed" = true,"updatedAt" = ${NEXT_PARTICIPANT_UPDATED_AT}RETURNING *`,- [AgentChatInboxAction.SUBSCRIBE]: ({- participantTable,- privateColumn,- privateValue,- }) =>- `INSERT INTO ${participantTable} AS participant ("threadId", "workspaceMemberId"${privateColumn})- VALUES ($1, $2${privateValue})+ [AgentChatInboxAction.SUBSCRIBE]: ({ participantTable }) =>+ `INSERT INTO ${participantTable} AS participant ("threadId", "workspaceMemberId", "${IS_PRIVATE_COLUMN_NAME}")+ VALUES ($1, $2, true)ON CONFLICT ("threadId", "workspaceMemberId") DO UPDATE SET"isSubscribed" = true,"updatedAt" = ${NEXT_PARTICIPANT_UPDATED_AT}RETURNING *`,// Files the chat under done and keeps it there whatever happens in it,// until the member is mentioned or writes in it again- [AgentChatInboxAction.UNSUBSCRIBE]: ({- participantTable,- privateColumn,- privateValue,- }) =>- `INSERT INTO ${participantTable} AS participant ("threadId", "workspaceMemberId"${privateColumn}, "isSubscribed", "archivedAt")- VALUES ($1, $2${privateValue}, false, clock_timestamp())+ [AgentChatInboxAction.UNSUBSCRIBE]: ({ participantTable }) =>+ `INSERT INTO ${participantTable} AS participant ("threadId", "workspaceMemberId", "${IS_PRIVATE_COLUMN_NAME}", "isSubscribed", "archivedAt")+ VALUES ($1, $2, true, false, clock_timestamp())ON CONFLICT ("threadId", "workspaceMemberId") DO UPDATE SET"isSubscribed" = false,"archivedAt" = EXCLUDED."archivedAt",@@ -280,9 +249,9 @@ export class AgentChatThreadParticipantService {}: AgentChatThreadAccessArgs): Promise<void> {await this.write({ ...args, threadIds: [threadId] },- ({ participantTable, privateColumn, privateValue }) =>- `INSERT INTO ${participantTable} AS participant ("threadId", "workspaceMemberId"${privateColumn}, "lastMentionedAt")- VALUES ($1, $2${privateValue}, clock_timestamp())+ ({ participantTable }) =>+ `INSERT INTO ${participantTable} AS participant ("threadId", "workspaceMemberId", "${IS_PRIVATE_COLUMN_NAME}", "lastMentionedAt")+ VALUES ($1, $2, true, clock_timestamp())ON CONFLICT ("threadId", "workspaceMemberId") DO UPDATE SET"lastReadAt" = NULL,"archivedAt" = NULL,@@ -301,9 +270,9 @@ export class AgentChatThreadParticipantService {async deliverToInbox(args: AgentChatThreadAccessArgs): Promise<void> {await this.write({ ...args, threadIds: [args.threadId] },- ({ participantTable, privateColumn, privateValue }) =>- `INSERT INTO ${participantTable} AS participant ("threadId", "workspaceMemberId"${privateColumn})- VALUES ($1, $2${privateValue})+ ({ participantTable }) =>+ `INSERT INTO ${participantTable} AS participant ("threadId", "workspaceMemberId", "${IS_PRIVATE_COLUMN_NAME}")+ VALUES ($1, $2, true)ON CONFLICT ("threadId", "workspaceMemberId") DO UPDATE SET"lastReadAt" = NULL,"archivedAt" = NULL,@@ -364,9 +333,9 @@ export class AgentChatThreadParticipantService {}): Promise<void> {await this.write({ ...args, threadIds: [threadId] },- ({ participantTable, threadTable, privateColumn, privateValue }) =>- `INSERT INTO ${participantTable} AS participant ("threadId", "workspaceMemberId"${privateColumn}, "lastReadAt")- SELECT thread.id, $2${privateValue}, CASE WHEN $3::boolean THEN thread."lastActivityAt" END+ ({ participantTable, threadTable }) =>+ `INSERT INTO ${participantTable} AS participant ("threadId", "workspaceMemberId", "${IS_PRIVATE_COLUMN_NAME}", "lastReadAt")+ SELECT thread.id, $2, true, CASE WHEN $3::boolean THEN thread."lastActivityAt" ENDFROM ${threadTable} thread WHERE thread.id = $1ON CONFLICT ("threadId", "workspaceMemberId") DO UPDATE SET"lastReadAt" = CASE WHEN $3::boolean THEN participant."lastReadAt" END,@@ -481,8 +450,6 @@ export class AgentChatThreadParticipantService {const participantTable = getAgentChatThreadParticipantTable(workspaceId);const participantObjectMetadataId =await this.sharingService.getParticipantObjectMetadataId(workspaceId);- const { privateColumn, privateValue } =- await this.sharingService.getPrivateRecordInsertSql(workspaceId);const { rows, before, after } = await this.threadRepository.query(workspaceId,@@ -507,8 +474,8 @@ export class AgentChatThreadParticipantService {WHERE id = $1RETURNING id, ${AGENT_CHAT_THREAD_ACTIVITY_COLUMNS}), participant AS (- INSERT INTO ${participantTable} AS participant ("threadId", "workspaceMemberId"${privateColumn}, "lastReadAt")- SELECT thread.id, $2${privateValue}, thread."lastActivityAt" FROM thread+ INSERT INTO ${participantTable} AS participant ("threadId", "workspaceMemberId", "${IS_PRIVATE_COLUMN_NAME}", "lastReadAt")+ SELECT thread.id, $2, true, thread."lastActivityAt" FROM threadON CONFLICT ("threadId", "workspaceMemberId") DO UPDATE SET"lastReadAt" = GREATEST(participant."lastReadAt", EXCLUDED."lastReadAt"),"archivedAt" = NULL,@@ -739,8 +706,6 @@ export class AgentChatThreadParticipantService {): Promise<AgentChatThreadParticipantRow[]> {const objectMetadataId =await this.sharingService.getParticipantObjectMetadataId(workspaceId);- const privateRecordInsertSql =- await this.sharingService.getPrivateRecordInsertSql(workspaceId);const writes = await this.threadRepository.query(workspaceId,@@ -751,7 +716,6 @@ export class AgentChatThreadParticipantService {participantTable:getAgentChatThreadParticipantTable(workspaceId),threadTable: table('agentChatThread'),- ...privateRecordInsertSql,})}), owner_share AS (${buildAgentChatThreadParticipantOwnerShareInsert({diff --git a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-inbox.service.ts b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-inbox.service.tsindex 8f651e4d9a3..9c0cf6622ce 100644--- a/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-inbox.service.ts+++ b/packages/twenty-server/src/engine/metadata-modules/ai/ai-chat/services/agent-inbox.service.ts@@ -4,6 +4,7 @@ import { type ExtendedUIMessagePart } from 'twenty-shared/ai';import { type SendInboxMessageInput } from 'twenty-shared/application';import { isDefined } from 'twenty-shared/utils';+import { IS_PRIVATE_COLUMN_NAME } from 'src/engine/permissions/private-record/constants/is-private-column-name.constant';import { AgentMessageRole } from 'src/engine/metadata-modules/ai/ai-history/enums/agent-message-role.enum';import { AgentChatSharingService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-sharing.service';import { AgentChatThreadService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-thread.service';@@ -416,12 +417,9 @@ export class AgentInboxService {threadId: string;title: string;}): Promise<AgentChatThreadWorkspaceEntity> {- const { privateColumn, privateValue } =- await this.sharingService.getPrivateRecordInsertSql(workspaceId);-await this.threadRepository.query(workspaceId, ({ manager, table }) =>manager.query(- `INSERT INTO ${table('agentChatThread')} (id, title${privateColumn}) VALUES ($1, $2${privateValue})`,+ `INSERT INTO ${table('agentChatThread')} (id, title, "${IS_PRIVATE_COLUMN_NAME}") VALUES ($1, $2, true)`,[threadId, title],),);diff --git a/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/build-permissions-condition.util.spec.ts b/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/build-permissions-condition.util.spec.tsindex 8b77346267d..8124e0cf260 100644--- a/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/build-permissions-condition.util.spec.ts+++ b/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/build-permissions-condition.util.spec.ts@@ -99,15 +99,10 @@ const buildCondition = (recordShareTableExpression: '"workspace"."recordShare"',});-const privateRecordMetadataMaps = {- ...metadataMaps,- featureFlagsMap: { [FeatureFlagKey.IS_PRIVATE_RECORD_ENABLED]: true },-};const sharingMetadataMaps = {...metadataMaps,featureFlagsMap: {[FeatureFlagKey.IS_RECORD_LEVEL_SHARING_ENABLED]: true,- [FeatureFlagKey.IS_PRIVATE_RECORD_ENABLED]: true,},};@@ -214,13 +209,7 @@ describe('buildPermissionsCondition', () => {principal: owningApplication,flatObjectMetadata: object,}),- ).toEqual({ kind: 'open' });- });-- it('opens an object to a principal without predicate', () => {- expect(- build({ principal: readEverything, flatObjectMetadata: note }),- ).toEqual({ kind: 'open' });+ ).toMatchObject({ kind: 'gated' });});it('keeps private records to their creator and shares once record sharing is enabled', () => {@@ -243,29 +232,11 @@ describe('buildPermissionsCondition', () => {expect(policy.condition.sql).toContain('"workspace"."recordShare"');});- it('leaves records open to their role until private records are enabled', () => {- expect(- buildConditionOutcome({- principal: readEverything,- metadataMaps: {- ...metadataMaps,- featureFlagsMap: {- [FeatureFlagKey.IS_RECORD_LEVEL_SHARING_ENABLED]: true,- },- },- tableAlias: 'company',- flatObjectMetadata: buildObject({ id: 'company' }),- operationType: 'select',- }),- ).toEqual({ kind: 'open' });- });-it('gates every object on private records once they are enabled, without record sharing', () => {expect(gatedSql({principal: readEverything,flatObjectMetadata: person,- policyMetadataMaps: privateRecordMetadataMaps,}),).toContain('recordShare');});@@ -392,24 +363,11 @@ describe('buildPermissionsCondition', () => {});});- it('gates an object on the role predicate alone', () => {- (resolveRowLevelPermissionRecordFilter as jest.Mock).mockReturnValue(- NOTE_FILTER,- );- const sql = gatedSql({- principal: readEverything,- flatObjectMetadata: note,- });-- expect(sql).toBe('"note"."title" = :restricted');- });-it('gates records on their share rows', () => {expect(gatedSql({principal: readEverything,flatObjectMetadata: person,- policyMetadataMaps: privateRecordMetadataMaps,}),).toContain('"person_recordShare"."recordId" = "person"."id"');});@@ -417,7 +375,7 @@ describe('buildPermissionsCondition', () => {it('opens private records only to shares naming the member or their roles', () => {const condition = buildCondition({principal: readEverything,- metadataMaps: privateRecordMetadataMaps,+ metadataMaps,flatObjectMetadata: person,operationType: 'select',});@@ -441,7 +399,6 @@ describe('buildPermissionsCondition', () => {const sql = gatedSql({principal: readEverything,flatObjectMetadata: person,- policyMetadataMaps: privateRecordMetadataMaps,});expect(sql).toMatch(@@ -452,7 +409,7 @@ describe('buildPermissionsCondition', () => {it('keeps private records gated regardless of the sharing UI flag', () => {const policy = buildConditionOutcome({principal: readEverything,- metadataMaps: privateRecordMetadataMaps,+ metadataMaps,tableAlias: 'person',flatObjectMetadata: person,operationType: 'select',@@ -501,9 +458,11 @@ describe('buildPermissionsCondition', () => {sql: expect.stringContaining('"note"."title" = :restricted'),},});- expect(policy).toMatchObject({- condition: { sql: expect.not.stringContaining('recordShare') },- });+ expect(+ policy.kind === 'gated'+ ? policy.condition.sql.match(/"note"\."title" = :restricted/g)+ : [],+ ).toHaveLength(2);});it('preserves a disabled edit action', () => {diff --git a/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/find-permissions-admitted-record-ids.util.spec.ts b/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/find-permissions-admitted-record-ids.util.spec.tsindex a993ee19d36..544da4b112f 100644--- a/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/find-permissions-admitted-record-ids.util.spec.ts+++ b/packages/twenty-server/src/engine/permissions/combine/utils/__tests__/find-permissions-admitted-record-ids.util.spec.ts@@ -142,7 +142,7 @@ const buildContext = (): RowAccessEvaluationContext => ({const findAdmitted = ({principal,- featureFlagKeys = [FeatureFlagKey.IS_PRIVATE_RECORD_ENABLED],+ featureFlagKeys = [],context = buildContext(),}: {principal: PermissionsPrincipalsWithRolesContext;@@ -195,13 +195,13 @@ describe('findPermissionsAdmittedRecordIds', () => {);});- it('admits records shared with the member beyond the role, ignoring shares with everyone', async () => {+ it('admits records shared with or created by the member beyond the role', async () => {expect(await findAdmitted({principal: deniedPrincipal,featureFlagKeys: [FeatureFlagKey.IS_RECORD_LEVEL_SHARING_ENABLED],}),- ).toEqual(new Set(['active-shared', 'archived-shared']));+ ).toEqual(new Set(['active-shared', 'active-private', 'archived-shared']));});it('admits private records to their creator within the role filter', async () => {@@ -230,10 +230,9 @@ describe('findPermissionsAdmittedRecordIds', () => {context,}),).toEqual(new Set(records.map((record) => record.id)));- expect(context.findPrivateRecordStates).not.toHaveBeenCalled();expect(context.fetchRecordShares).toHaveBeenCalledWith({objectMetadataId: flatObjectMetadata.id,- recordIds: ['archived-shared'],+ recordIds: ['active-private', 'archived-shared'],});});});diff --git a/packages/twenty-server/src/engine/permissions/combine/utils/build-permissions-condition.util.ts b/packages/twenty-server/src/engine/permissions/combine/utils/build-permissions-condition.util.tsindex 2f1e4a8e1e7..bcded2dcddc 100644--- a/packages/twenty-server/src/engine/permissions/combine/utils/build-permissions-condition.util.ts+++ b/packages/twenty-server/src/engine/permissions/combine/utils/build-permissions-condition.util.ts@@ -10,7 +10,6 @@ import { areRecordGrantsHeldToRowLevelPermissions } from 'src/engine/permissionsimport { combineSqlConditions } from 'src/engine/permissions/combine/utils/combine-sql-conditions.util';import { resolvePermissionsRowAccessOutcome } from 'src/engine/permissions/combine/utils/resolve-permissions-row-access-outcome.util';import { buildPermissionsCreatorCondition } from 'src/engine/permissions/private-record/utils/build-permissions-creator-condition.util';-import { isShareOnlyWhilePrivateRecordFlagDisabled } from 'src/engine/permissions/private-record/utils/is-share-only-while-private-record-flag-disabled.util';import { buildPermissionsShareCondition } from 'src/engine/permissions/record-share/utils/build-permissions-share-condition.util';import { buildPermissionsRlsCondition } from 'src/engine/permissions/rls/utils/build-permissions-rls-condition.util';import { resolvePermissionsRowLevelPermissionFilter } from 'src/engine/permissions/rls/utils/resolve-permissions-row-level-permission-filter.util';@@ -52,10 +51,7 @@ export const buildPermissionsCondition = ({return outcome;}- // TODO(@charlesBochet): remove with isShareOnlyWhilePrivateRecordFlagDisabled after 2.55- const roleConditions = isShareOnlyWhilePrivateRecordFlagDisabled(sqlRequest)- ? []- : buildPermissionsRoleConditions(sqlRequest);+ const roleConditions = buildPermissionsRoleConditions(sqlRequest);if (roleConditions === true) {return true;diff --git a/packages/twenty-server/src/engine/permissions/combine/utils/find-permissions-admitted-record-ids.util.ts b/packages/twenty-server/src/engine/permissions/combine/utils/find-permissions-admitted-record-ids.util.tsindex 6cc3ccf6c21..2994101dfb2 100644--- a/packages/twenty-server/src/engine/permissions/combine/utils/find-permissions-admitted-record-ids.util.ts+++ b/packages/twenty-server/src/engine/permissions/combine/utils/find-permissions-admitted-record-ids.util.ts@@ -6,7 +6,6 @@ import { type PermissionsRowAccessEvaluationRequest } from 'src/engine/permissioimport { areRecordGrantsHeldToRowLevelPermissions } from 'src/engine/permissions/combine/utils/are-record-grants-held-to-row-level-permissions.util';import { resolvePermissionsRowAccessOutcome } from 'src/engine/permissions/combine/utils/resolve-permissions-row-access-outcome.util';import { findPermissionsCreatorAdmittedRecordIds } from 'src/engine/permissions/private-record/utils/find-permissions-creator-admitted-record-ids.util';-import { isShareOnlyWhilePrivateRecordFlagDisabled } from 'src/engine/permissions/private-record/utils/is-share-only-while-private-record-flag-disabled.util';import { findPermissionsShareAdmittedRecordIds } from 'src/engine/permissions/record-share/utils/find-permissions-share-admitted-record-ids.util';import { findPermissionsRlsAdmittedRecordIds } from 'src/engine/permissions/rls/utils/find-permissions-rls-admitted-record-ids.util';import { findRowLevelPermissionMatchingRecordIds } from 'src/engine/permissions/rls/utils/find-row-level-permission-matching-record-ids.util';@@ -26,13 +25,10 @@ export const findPermissionsAdmittedRecordIds = async (return new Set(records.map((record) => record.id));}- // TODO(@charlesBochet): remove with isShareOnlyWhilePrivateRecordFlagDisabled after 2.55- const admittedRecordIds = isShareOnlyWhilePrivateRecordFlagDisabled(request)- ? new Set<string>()- : new Set([- ...(await findPermissionsObjectAdmittedRecordIds(request)),- ...(await findPermissionsRlsAdmittedRecordIds(request)),- ]);+ const admittedRecordIds = new Set([+ ...(await findPermissionsObjectAdmittedRecordIds(request)),+ ...(await findPermissionsRlsAdmittedRecordIds(request)),+ ]);const rowLevelPermissionMatchingRecordIds =areRecordGrantsHeldToRowLevelPermissions(request)? findRowLevelPermissionMatchingRecordIds(request)diff --git a/packages/twenty-server/src/engine/permissions/private-record/services/private-record-storage.service.ts b/packages/twenty-server/src/engine/permissions/private-record/services/private-record-storage.service.tsindex f3e590e7460..58e9fc0292d 100644--- a/packages/twenty-server/src/engine/permissions/private-record/services/private-record-storage.service.ts+++ b/packages/twenty-server/src/engine/permissions/private-record/services/private-record-storage.service.ts@@ -8,7 +8,6 @@ import { CREATED_BY_WORKSPACE_MEMBER_ID_COLUMN_NAME } from 'src/engine/permissioimport { IS_PRIVATE_COLUMN_NAME } from 'src/engine/permissions/private-record/constants/is-private-column-name.constant';import { type PrivateRecordState } from 'src/engine/permissions/private-record/types/private-record-state.type';import { findPrivateRecordStates } from 'src/engine/permissions/private-record/utils/find-private-record-states.util';-import { isPrivateRecordEnabled } from 'src/engine/permissions/private-record/utils/is-private-record-enabled.util';import { RecordShareStorageService } from 'src/engine/permissions/record-share/services/record-share-storage.service';import { isPermissionStorageObject } from 'src/engine/permissions/utils/is-permission-storage-object.util';import { hasCreatedByField } from 'src/engine/permissions/private-record/utils/has-created-by-field.util';@@ -41,10 +40,9 @@ export class PrivateRecordStorageService {recordIds: string[];transactionScope?: WorkspaceTransactionScope;}): Promise<Map<string, PrivateRecordState>> {- const { flatFieldMetadataMaps, featureFlagsMap } =+ const { flatFieldMetadataMaps } =await this.workspaceCacheService.getOrRecompute(workspaceId, ['flatFieldMetadataMaps',- 'featureFlagsMap',]);return this.withRepository({@@ -61,7 +59,6 @@ export class PrivateRecordStorageService {flatObjectMetadata,flatFieldMetadataMaps,recordIds,- isPrivateRecordEnabled: isPrivateRecordEnabled(featureFlagsMap),}),});}@@ -77,16 +74,11 @@ export class PrivateRecordStorageService {creatorWorkspaceMemberId: string;granteeWorkspaceMemberId: string;}): Promise<void> {- const { flatFieldMetadataMaps, featureFlagsMap } =+ const { flatFieldMetadataMaps } =await this.workspaceCacheService.getOrRecompute(workspaceId, ['flatFieldMetadataMaps',- 'featureFlagsMap',]);- if (!isPrivateRecordEnabled(featureFlagsMap)) {- return;- }-const objectsWithCreator = flatObjectMetadatas.filter((flatObjectMetadata) =>!isPermissionStorageObject(flatObjectMetadata) &&@@ -135,15 +127,6 @@ export class PrivateRecordStorageService {return;}- const { featureFlagsMap } = await this.workspaceCacheService.getOrRecompute(- workspaceId,- ['featureFlagsMap'],- );-- if (!isPrivateRecordEnabled(featureFlagsMap)) {- return;- }-await this.withRepository({workspaceId,flatObjectMetadata,diff --git a/packages/twenty-server/src/engine/permissions/private-record/utils/assert-private-record-enabled-or-throw.util.ts b/packages/twenty-server/src/engine/permissions/private-record/utils/assert-private-record-enabled-or-throw.util.tsdeleted file mode 100644index 4e2571fa5d7..00000000000--- a/packages/twenty-server/src/engine/permissions/private-record/utils/assert-private-record-enabled-or-throw.util.ts+++ /dev/null@@ -1,26 +0,0 @@-/* @license Enterprise */--import { msg } from '@lingui/core/macro';-import { type FeatureFlagKey } from 'twenty-shared/types';--import { isPrivateRecordEnabled } from 'src/engine/permissions/private-record/utils/is-private-record-enabled.util';-import {- RecordShareException,- RecordShareExceptionCode,-} from 'src/engine/permissions/record-share/record-share.exception';--export const assertPrivateRecordEnabledOrThrow = (- featureFlagsMap: Partial<Record<FeatureFlagKey, boolean>>,-): void => {- if (isPrivateRecordEnabled(featureFlagsMap)) {- return;- }-- throw new RecordShareException(- 'Private records are not enabled for this workspace yet',- RecordShareExceptionCode.INVALID_SHARE_WITH,- {- userFriendlyMessage: msg`Private records are not available in this workspace yet.`,- },- );-};diff --git a/packages/twenty-server/src/engine/permissions/private-record/utils/build-private-record-insert-sql.util.ts b/packages/twenty-server/src/engine/permissions/private-record/utils/build-private-record-insert-sql.util.tsdeleted file mode 100644index bc55e4c2fce..00000000000--- a/packages/twenty-server/src/engine/permissions/private-record/utils/build-private-record-insert-sql.util.ts+++ /dev/null@@ -1,17 +0,0 @@-/* @license Enterprise */--import { IS_PRIVATE_COLUMN_NAME } from 'src/engine/permissions/private-record/constants/is-private-column-name.constant';--export type PrivateRecordInsertSql = {- privateColumn: string;- privateValue: string;-};--export const buildPrivateRecordInsertSql = ({- isPrivateRecordEnabled,-}: {- isPrivateRecordEnabled: boolean;-}): PrivateRecordInsertSql =>- isPrivateRecordEnabled- ? { privateColumn: `, "${IS_PRIVATE_COLUMN_NAME}"`, privateValue: ', true' }- : { privateColumn: '', privateValue: '' };diff --git a/packages/twenty-server/src/engine/permissions/private-record/utils/find-private-record-states.util.ts b/packages/twenty-server/src/engine/permissions/private-record/utils/find-private-record-states.util.tsindex d66579b1708..88912d41d1d 100644--- a/packages/twenty-server/src/engine/permissions/private-record/utils/find-private-record-states.util.ts+++ b/packages/twenty-server/src/engine/permissions/private-record/utils/find-private-record-states.util.ts@@ -20,14 +20,12 @@ export const findPrivateRecordStates = async <flatObjectMetadata,flatFieldMetadataMaps,recordIds,- isPrivateRecordEnabled,}: {repository: Pick<WorkspaceRepository, 'executeRaw'>;tableExpression: string;flatObjectMetadata: FlatObjectMetadata;flatFieldMetadataMaps: FlatEntityMaps<TFlatFieldMetadata>;recordIds: string[];- isPrivateRecordEnabled: boolean;}): Promise<Map<string, PrivateRecordState>> => {if (!isNonEmptyArray(recordIds)) {return new Map();@@ -41,7 +39,7 @@ export const findPrivateRecordStates = async <: 'NULL';const rows = await repository.executeRaw<{ id: string } & PrivateRecordState>(- `SELECT "id", ${isPrivateRecordEnabled ? escapeIdentifier(IS_PRIVATE_COLUMN_NAME) : 'FALSE'} AS "isPrivate", ${createdBy} AS "createdByWorkspaceMemberId" FROM ${tableExpression} WHERE "id" = ANY(:recordIds)`,+ `SELECT "id", ${escapeIdentifier(IS_PRIVATE_COLUMN_NAME)} AS "isPrivate", ${createdBy} AS "createdByWorkspaceMemberId" FROM ${tableExpression} WHERE "id" = ANY(:recordIds)`,{ recordIds },);diff --git a/packages/twenty-server/src/engine/permissions/private-record/utils/is-private-record-enabled.util.ts b/packages/twenty-server/src/engine/permissions/private-record/utils/is-private-record-enabled.util.tsdeleted file mode 100644index 256a9a54506..00000000000--- a/packages/twenty-server/src/engine/permissions/private-record/utils/is-private-record-enabled.util.ts+++ /dev/null@@ -1,9 +0,0 @@-/* @license Enterprise */--import { FeatureFlagKey } from 'twenty-shared/types';--// TODO(@charlesBochet): remove once 2.55 leaves the cross-upgrade window; the flag goes on once a workspace has the _isPrivate column-export const isPrivateRecordEnabled = (- featureFlagsMap: Partial<Record<FeatureFlagKey, boolean>>,-): boolean =>- featureFlagsMap[FeatureFlagKey.IS_PRIVATE_RECORD_ENABLED] === true;diff --git a/packages/twenty-server/src/engine/permissions/private-record/utils/is-record-privacy-applicable.util.ts b/packages/twenty-server/src/engine/permissions/private-record/utils/is-record-privacy-applicable.util.tsindex 7f2b9ff9715..a81d731deeb 100644--- a/packages/twenty-server/src/engine/permissions/private-record/utils/is-record-privacy-applicable.util.ts+++ b/packages/twenty-server/src/engine/permissions/private-record/utils/is-record-privacy-applicable.util.ts@@ -3,18 +3,15 @@import { isNonEmptyArray } from 'twenty-shared/utils';import { type PermissionsRowAccessRequest } from 'src/engine/permissions/combine/types/row-access-policy.type';-import { isPrivateRecordEnabled } from 'src/engine/permissions/private-record/utils/is-private-record-enabled.util';import { resolveRequiredRecordShareAccessLevels } from 'src/engine/permissions/record-share/utils/resolve-required-record-share-access-levels.util';import { isPermissionStorageObject } from 'src/engine/permissions/utils/is-permission-storage-object.util';export const isRecordPrivacyApplicable = ({- metadataMaps,flatObjectMetadata,operationType,}: Pick<PermissionsRowAccessRequest,- 'metadataMaps' | 'flatObjectMetadata' | 'operationType'+ 'flatObjectMetadata' | 'operationType'>): boolean =>isNonEmptyArray(resolveRequiredRecordShareAccessLevels(operationType)) &&- isPrivateRecordEnabled(metadataMaps.featureFlagsMap) &&!isPermissionStorageObject(flatObjectMetadata);diff --git a/packages/twenty-server/src/engine/permissions/private-record/utils/is-share-only-while-private-record-flag-disabled.util.ts b/packages/twenty-server/src/engine/permissions/private-record/utils/is-share-only-while-private-record-flag-disabled.util.tsdeleted file mode 100644index 98727d9550f..00000000000--- a/packages/twenty-server/src/engine/permissions/private-record/utils/is-share-only-while-private-record-flag-disabled.util.ts+++ /dev/null@@ -1,21 +0,0 @@-/* @license Enterprise */--import { isNonEmptyArray } from 'twenty-shared/utils';--import { type PermissionsRowAccessRequest } from 'src/engine/permissions/combine/types/row-access-policy.type';-import { isPrivateByDefaultObject } from 'src/engine/permissions/private-record/utils/is-private-by-default-object.util';-import { isPrivateRecordEnabled } from 'src/engine/permissions/private-record/utils/is-private-record-enabled.util';-import { resolveRequiredRecordShareAccessLevels } from 'src/engine/permissions/record-share/utils/resolve-required-record-share-access-levels.util';--// TODO(@charlesBochet): remove after 2.55; chats reach only their shares while IS_PRIVATE_RECORD_ENABLED is off-export const isShareOnlyWhilePrivateRecordFlagDisabled = ({- metadataMaps,- flatObjectMetadata,- operationType,-}: Pick<- PermissionsRowAccessRequest,- 'metadataMaps' | 'flatObjectMetadata' | 'operationType'->): boolean =>- isNonEmptyArray(resolveRequiredRecordShareAccessLevels(operationType)) &&- isPrivateByDefaultObject(flatObjectMetadata) &&- !isPrivateRecordEnabled(metadataMaps.featureFlagsMap);diff --git a/packages/twenty-server/src/engine/permissions/record-share/services/record-sharing.service.ts b/packages/twenty-server/src/engine/permissions/record-share/services/record-sharing.service.tsindex 446c79e08b1..c8bf91398d7 100644--- a/packages/twenty-server/src/engine/permissions/record-share/services/record-sharing.service.ts+++ b/packages/twenty-server/src/engine/permissions/record-share/services/record-sharing.service.ts@@ -28,7 +28,6 @@ import {type ObjectSharing,resolveObjectSharing,} from 'src/engine/permissions/record-share/utils/resolve-object-sharing.util';-import { assertPrivateRecordEnabledOrThrow } from 'src/engine/permissions/private-record/utils/assert-private-record-enabled-or-throw.util';import { hasCreatedByField } from 'src/engine/permissions/private-record/utils/has-created-by-field.util';import { resolveRecordSharePrincipalOrThrow } from 'src/engine/permissions/record-share/utils/resolve-record-share-principal-or-throw.util';import { resolveViewerRecordShareAccessLevel } from 'src/engine/permissions/record-share/utils/resolve-viewer-record-share-access-level.util';@@ -254,16 +253,11 @@ export class RecordSharingService {args: RecordSharingArgs & { isPrivate: boolean };}): Promise<void> {const { isPrivate } = args;- const { featureFlagsMap, flatFieldMetadataMaps } =+ const { flatFieldMetadataMaps } =await this.workspaceCacheService.getOrRecompute(workspaceId, [- 'featureFlagsMap','flatFieldMetadataMaps',]);- if (isPrivate) {- assertPrivateRecordEnabledOrThrow(featureFlagsMap);- }-await this.privateRecordStorageService.setPrivate({workspaceId,flatObjectMetadata,diff --git a/packages/twenty-server/src/engine/permissions/record-share/services/share-with.service.ts b/packages/twenty-server/src/engine/permissions/record-share/services/share-with.service.tsindex 38c5b8cacd7..cb81159f373 100644--- a/packages/twenty-server/src/engine/permissions/record-share/services/share-with.service.ts+++ b/packages/twenty-server/src/engine/permissions/record-share/services/share-with.service.ts@@ -5,7 +5,6 @@ import { Injectable } from '@nestjs/common';import { isNonEmptyArray } from 'twenty-shared/utils';import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';-import { assertPrivateRecordEnabledOrThrow } from 'src/engine/permissions/private-record/utils/assert-private-record-enabled-or-throw.util';import { RecordSharePrincipalService } from 'src/engine/permissions/record-share/services/record-share-principal.service';import { PrivateRecordStorageService } from 'src/engine/permissions/private-record/services/private-record-storage.service';import { RecordShareStorageService } from 'src/engine/permissions/record-share/services/record-share-storage.service';@@ -77,15 +76,6 @@ export class ShareWithService {}): Promise<void> {const workspaceId = authContext.workspace.id;- if (isPrivate && !objectSharing.isPrivateByDefault) {- const { featureFlagsMap } =- await this.workspaceCacheService.getOrRecompute(workspaceId, [- 'featureFlagsMap',- ]);-- assertPrivateRecordEnabledOrThrow(featureFlagsMap);- }-// A hard-destroyed record leaves its rows behind, and a client may reuse its idawait this.recordShareStorageService.deleteByRecordIds({workspaceId,diff --git a/packages/twenty-server/src/engine/permissions/record-share/utils/resolve-permissions-share-grant.util.ts b/packages/twenty-server/src/engine/permissions/record-share/utils/resolve-permissions-share-grant.util.tsindex d09e4a91df2..aa27b2d4b3d 100644--- a/packages/twenty-server/src/engine/permissions/record-share/utils/resolve-permissions-share-grant.util.ts+++ b/packages/twenty-server/src/engine/permissions/record-share/utils/resolve-permissions-share-grant.util.ts@@ -5,7 +5,6 @@ import { isNonEmptyArray } from 'twenty-shared/utils';import { type PermissionsRowAccessRequest } from 'src/engine/permissions/combine/types/row-access-policy.type';import { getPermissionsPrincipalShareKeys } from 'src/engine/permissions/principal/utils/get-permissions-principal-share-keys.util';-import { isShareOnlyWhilePrivateRecordFlagDisabled } from 'src/engine/permissions/private-record/utils/is-share-only-while-private-record-flag-disabled.util';import { isRecordPrivacyApplicable } from 'src/engine/permissions/private-record/utils/is-record-privacy-applicable.util';import { isOperationGrantedBeyondRoleToPrincipal } from 'src/engine/permissions/record-share/utils/is-operation-granted-beyond-role-to-principal.util';import { resolveRequiredRecordShareAccessLevels } from 'src/engine/permissions/record-share/utils/resolve-required-record-share-access-levels.util';@@ -24,15 +23,11 @@ export const resolvePermissionsShareGrant = (request.operationType,);const isGrantedBeyondRole = isOperationGrantedBeyondRoleToPrincipal(request);- // TODO(@charlesBochet): remove with isShareOnlyWhilePrivateRecordFlagDisabled after 2.55- const isShareOnly = isShareOnlyWhilePrivateRecordFlagDisabled(request);if (!isNonEmptyArray(principalIds) ||!isNonEmptyArray(accessLevels) ||- (!isGrantedBeyondRole &&- !isShareOnly &&- !isRecordPrivacyApplicable(request))+ (!isGrantedBeyondRole && !isRecordPrivacyApplicable(request))) {return undefined;}@@ -40,6 +35,6 @@ export const resolvePermissionsShareGrant = (return {principalIds,accessLevels,- isLimitedToPrivateRecords: !isGrantedBeyondRole && !isShareOnly,+ isLimitedToPrivateRecords: !isGrantedBeyondRole,};};diff --git a/packages/twenty-server/src/engine/twenty-orm/repository/workspace-repository.ts b/packages/twenty-server/src/engine/twenty-orm/repository/workspace-repository.tsindex 1f0b2a81ecf..61085e8f624 100644--- a/packages/twenty-server/src/engine/twenty-orm/repository/workspace-repository.ts+++ b/packages/twenty-server/src/engine/twenty-orm/repository/workspace-repository.ts@@ -19,7 +19,6 @@ import {import { DatabaseEventAction } from 'src/engine/api/graphql/graphql-query-runner/enums/database-event-action';import { type PrivateRecordState } from 'src/engine/permissions/private-record/types/private-record-state.type';import { findPrivateRecordStates } from 'src/engine/permissions/private-record/utils/find-private-record-states.util';-import { isPrivateRecordEnabled } from 'src/engine/permissions/private-record/utils/is-private-record-enabled.util';import { type WorkspaceAuthContext } from 'src/engine/core-modules/auth/types/workspace-auth-context.type';import { isRecordStockTrackedObject } from 'src/engine/core-modules/usage-limit/utils/is-record-stock-tracked-object.util';import { findFlatEntityByIdInFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/utils/find-flat-entity-by-id-in-flat-entity-maps.util';@@ -1844,9 +1843,6 @@ export class WorkspaceRepository<TEntity extends ObjectLiteral = ObjectRecord> {flatObjectMetadata: this.options.flatObjectMetadata,flatFieldMetadataMaps: this.options.internalContext.flatFieldMetadataMaps,recordIds,- isPrivateRecordEnabled: isPrivateRecordEnabled(- this.options.internalContext.featureFlagsMap,- ),});}diff --git a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/seed-feature-flags.util.ts b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/seed-feature-flags.util.tsindex a3b1dc44b30..7cdebded594 100644--- a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/seed-feature-flags.util.ts+++ b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/seed-feature-flags.util.ts@@ -8,7 +8,6 @@ const DEFAULT_SEEDED_FEATURE_FLAGS: Partial<Record<FeatureFlagKey, boolean>> = {[FeatureFlagKey.IS_CALENDAR_EVENT_SHARED_ACROSS_CHANNELS_ENABLED]: true,[FeatureFlagKey.IS_AI_CHAT_INBOX_ENABLED]: true,[FeatureFlagKey.IS_MCP_SERVERS_ENABLED]: true,- [FeatureFlagKey.IS_PRIVATE_RECORD_ENABLED]: true,[FeatureFlagKey.IS_AGENT_CHAT_DIRECT_MESSAGE_IDENTITY_ENABLED]: true,[FeatureFlagKey.IS_RELATED_RECORD_PATHS_ENABLED]: false,[FeatureFlagKey.IS_ROW_LEVEL_PERMISSION_RELATION_HOP_ENABLED]: false,diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/constant/default-feature-flags.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/constant/default-feature-flags.tsindex 976ac367841..a09e9c7525e 100644--- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/constant/default-feature-flags.ts+++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/constant/default-feature-flags.ts@@ -2,6 +2,5 @@ import { FeatureFlagKey } from 'twenty-shared/types';export const DEFAULT_FEATURE_FLAGS = [FeatureFlagKey.IS_REST_METADATA_API_NEW_FORMAT_DIRECT,- FeatureFlagKey.IS_PRIVATE_RECORD_ENABLED,FeatureFlagKey.IS_AGENT_CHAT_DIRECT_MESSAGE_IDENTITY_ENABLED,] as const satisfies FeatureFlagKey[];diff --git a/packages/twenty-server/test/integration/ai/suites/agent-chat-direct-message-identity.integration-spec.ts b/packages/twenty-server/test/integration/ai/suites/agent-chat-direct-message-identity.integration-spec.tsindex 7bdecacb48c..bb2b207f798 100644--- a/packages/twenty-server/test/integration/ai/suites/agent-chat-direct-message-identity.integration-spec.ts+++ b/packages/twenty-server/test/integration/ai/suites/agent-chat-direct-message-identity.integration-spec.ts@@ -4,7 +4,6 @@ import { createChatParticipationTestContext } from 'test/integration/ai/utils/crimport { makeGraphqlApiRequest } from 'test/integration/graphql/utils/make-graphql-api-request.util';import { updateOneOperationFactory } from 'test/integration/graphql/utils/update-one-operation-factory.util';import { getAppProviderByClassName } from 'test/integration/utils/get-app-provider-by-class-name.util';-import { FeatureFlagKey } from 'twenty-shared/types';import { ErrorCode } from 'src/engine/core-modules/graphql/utils/graphql-errors.util';import { type AgentChatDirectMessageIdentityService } from 'src/engine/metadata-modules/ai/ai-chat/services/agent-chat-direct-message-identity.service';@@ -145,37 +144,16 @@ describe('Canonical direct message identity', () => {}});- it('keeps new identities private when record privacy is enabled', async () => {- const featureFlag = FeatureFlagKey.IS_PRIVATE_RECORD_ENABLED;- const isPrivateRecordInitiallyEnabled =- await context.featureFlagService.isFeatureEnabled(- featureFlag,- context.workspaceId,- );-- try {- await context.featureFlagService.upsertWorkspaceFeatureFlag({- workspaceId: context.workspaceId,- featureFlag,- value: true,- });-- const threadId = await getOrCreate();- const identity = await global.testDataSource- .createQueryBuilder()- .select(`thread."${IS_PRIVATE_COLUMN_NAME}"`, 'isPrivate')- .from(`${context.schema}.agentChatThread`, 'thread')- .where('thread.id = :threadId', { threadId })- .getRawOne<{ isPrivate: boolean }>();+ it('keeps new identities private', async () => {+ const threadId = await getOrCreate();+ const identity = await global.testDataSource+ .createQueryBuilder()+ .select(`thread."${IS_PRIVATE_COLUMN_NAME}"`, 'isPrivate')+ .from(`${context.schema}.agentChatThread`, 'thread')+ .where('thread.id = :threadId', { threadId })+ .getRawOne<{ isPrivate: boolean }>();- expect(identity).toEqual({ isPrivate: true });- } finally {- await context.featureFlagService.upsertWorkspaceFeatureFlag({- workspaceId: context.workspaceId,- featureFlag,- value: isPrivateRecordInitiallyEnabled,- });- }+ expect(identity).toEqual({ isPrivate: true });});it('allocates a normalized dormant identity without inbox or assistant side effects', async () => {diff --git a/packages/twenty-server/test/integration/upgrade/suites/2-55-workspace-command-1793457458179-make-restricted-records-private.integration-spec.ts b/packages/twenty-server/test/integration/upgrade/suites/2-55-workspace-command-1793457458179-make-restricted-records-private.integration-spec.tsindex c92236327eb..f3f8e8665a9 100644--- a/packages/twenty-server/test/integration/upgrade/suites/2-55-workspace-command-1793457458179-make-restricted-records-private.integration-spec.ts+++ b/packages/twenty-server/test/integration/upgrade/suites/2-55-workspace-command-1793457458179-make-restricted-records-private.integration-spec.ts@@ -1,7 +1,6 @@import { randomUUID } from 'node:crypto';import { EVERYONE_PRINCIPAL_ID } from 'twenty-shared/constants';-import { FeatureFlagKey } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';import { getAppProviderByClassName } from 'test/integration/utils/get-app-provider-by-class-name.util';@@ -10,6 +9,7 @@ import { getWorkspaceSchemaName } from 'src/engine/workspace-datasource/utils/geimport { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';const SCHEMA = getWorkspaceSchemaName(SEED_APPLE_WORKSPACE_ID);+const PRIVATE_RECORD_FEATURE_FLAG_KEY = 'IS_PRIVATE_RECORD_ENABLED';describe('2-55 workspace command - make restricted records private (integration)', () => {let command: MakeRestrictedRecordsPrivateCommand;@@ -62,7 +62,7 @@ describe('2-55 workspace command - make restricted records private (integration)if (!isDefined(value)) {await global.testDataSource.query(`DELETE FROM core."featureFlag" WHERE "workspaceId" = $1 AND key = $2`,- [SEED_APPLE_WORKSPACE_ID, FeatureFlagKey.IS_PRIVATE_RECORD_ENABLED],+ [SEED_APPLE_WORKSPACE_ID, PRIVATE_RECORD_FEATURE_FLAG_KEY],);return;@@ -71,18 +71,14 @@ describe('2-55 workspace command - make restricted records private (integration)await global.testDataSource.query(`INSERT INTO core."featureFlag" ("workspaceId", key, value) VALUES ($1, $2, $3)ON CONFLICT ("workspaceId", key) DO UPDATE SET value = $3`,- [- SEED_APPLE_WORKSPACE_ID,- FeatureFlagKey.IS_PRIVATE_RECORD_ENABLED,- value,- ],+ [SEED_APPLE_WORKSPACE_ID, PRIVATE_RECORD_FEATURE_FLAG_KEY, value],);};const findPrivateRecordFlag = async (): Promise<boolean | undefined> => {const [flag] = await global.testDataSource.query(`SELECT value FROM core."featureFlag" WHERE "workspaceId" = $1 AND key = $2`,- [SEED_APPLE_WORKSPACE_ID, FeatureFlagKey.IS_PRIVATE_RECORD_ENABLED],+ [SEED_APPLE_WORKSPACE_ID, PRIVATE_RECORD_FEATURE_FLAG_KEY],);return flag?.value;diff --git a/packages/twenty-shared/src/types/FeatureFlagKey.ts b/packages/twenty-shared/src/types/FeatureFlagKey.tsindex bdb826a70ea..ee4f33bca49 100644--- a/packages/twenty-shared/src/types/FeatureFlagKey.ts+++ b/packages/twenty-shared/src/types/FeatureFlagKey.ts@@ -8,7 +8,6 @@ export enum FeatureFlagKey {IS_AGENT_CHAT_DIRECT_MESSAGE_IDENTITY_ENABLED = 'IS_AGENT_CHAT_DIRECT_MESSAGE_IDENTITY_ENABLED',IS_APP_PREFERENCES_ENABLED = 'IS_APP_PREFERENCES_ENABLED',IS_MCP_SERVERS_ENABLED = 'IS_MCP_SERVERS_ENABLED',- IS_PRIVATE_RECORD_ENABLED = 'IS_PRIVATE_RECORD_ENABLED',IS_RELATED_RECORD_PATHS_ENABLED = 'IS_RELATED_RECORD_PATHS_ENABLED',IS_ROW_LEVEL_PERMISSION_RELATION_HOP_ENABLED = 'IS_ROW_LEVEL_PERMISSION_RELATION_HOP_ENABLED',IS_GETTING_STARTED_ENABLED = 'IS_GETTING_STARTED_ENABLED',