AI Agents & MCPs & AI Workflow Automation • (~400 MCP servers for AI agents) • AI Automation / AI Agent with MCPs • AI Workflows & AI Agents • MCPs for AI Agents
TypeScript ai-agentai-agent-toolsai-agentsai-agents-frameworkmcpmcp-servermcp-toolsmcpsn8n-alternativeno-code-automationworkflowworkflow-automationworkflows
feat(projects): let admins choose default projects on Roles & access (#15972)
lina-alomari9c8feef1c4a3
diff --git a/brain/knowledge/decisions/000049-a-default-project-cannot-be-deleted-while-it-is-a-default.md b/brain/knowledge/decisions/000049-a-default-project-cannot-be-deleted-while-it-is-a-default.mdnew file mode 100644index 00000000000..1f75eebc432--- /dev/null+++ b/brain/knowledge/decisions/000049-a-default-project-cannot-be-deleted-while-it-is-a-default.md@@ -0,0 +1,23 @@+---+title: A default project can't be deleted while it is a default+icon: 🛡️+status: accepted+---++# A default project can't be deleted while it is a default++## Decision++Deleting a project from the app is refused while it is in the platform's default projects; the admin removes it from the defaults on Roles & Access first. API-key calls and SCIM still delete it and drop it from the list, and so does the app on a plan without project roles, where defaults are not in effect.++## Context++Default projects used to never block anything: deleting one quietly removed it from the list. A planned auto-provisioning rule will require a default project or personal projects on before people can join an organization automatically.++## Why++If deleting a default silently removed it, an admin could empty the defaults without ever seeing that rule, so the guard would be easy to walk around. Making removal an explicit step on Roles & Access keeps the decision where the rule will live. Refusing API-key deletes too was rejected for now: existing scripts delete projects that happen to be defaults, and breaking them is not worth it before the rule exists.++## Consequences++The Projects page skips default projects when deleting and says why, with a link to Roles & Access. The guard lives in the soft delete itself (`enforceDefaultGuard` on `markForDeletion`, which adds `AND "isDefault" = false`), so a project made a default mid-delete is still refused. When auto-provisioning lands, it can extend to API keys by passing the same flag.diff --git a/brain/knowledge/decisions/000051-default-projects-are-a-flag-on-the-project.md b/brain/knowledge/decisions/000051-default-projects-are-a-flag-on-the-project.mdnew file mode 100644index 00000000000..1f63cecdba1--- /dev/null+++ b/brain/knowledge/decisions/000051-default-projects-are-a-flag-on-the-project.md@@ -0,0 +1,23 @@+---+title: Default projects are a flag on the project+icon: 🏷️+status: accepted+---++# Default projects are a flag on the project++## Decision++Whether a team project is a default project is stored as `project.isDefault`, with a database check that only team projects can have it. It is set one project at a time through the project update endpoint (`POST /v1/projects/:id` with `isDefault`). The platform response still lists `defaultProjectIds`, built from the flagged projects.++## Context++The first version stored a `defaultProjectIds` id array on `platform`. The array had no link to the project rows, so the code had to keep it in sync by hand: removing ids on every delete, a per-platform lock so a save couldn't write back a deleted id, and re-checking that each id was still a live team project on every read. Abdul raised it in review on #15972.++## Why++A flag lives on the row it describes: deleting the project takes the flag with it, `platformId` is already on the row, and the database can refuse a personal project as a default. That removed the lock and the sync code. The API can still return a list because responses don't have to mirror storage, like `GET /flows` returning a version that isn't stored on the flow. The rejected alternative was keeping the array (it matches how Slack and Discord expose default channels), at the cost of that sync code.++## Consequences++Reads are a query (`platformId`, `type = TEAM`, `isDefault`, not deleted), ordered by `created`, because an array's order is gone. Adding or removing several defaults is one request per project; there is no bulk save. Only the platform GET and update endpoints return `defaultProjectIds` (`PlatformResponse`), so other platform reads don't pay for the query. A soft-deleted project keeps its flag until the hard delete removes the row; every read skips deleted rows.diff --git a/brain/knowledge/platform-editions-ee/projects.md b/brain/knowledge/platform-editions-ee/projects.mdindex 1515eb3e174..2e1e33d6c66 100644--- a/brain/knowledge/platform-editions-ee/projects.md+++ b/brain/knowledge/platform-editions-ee/projects.md@@ -24,6 +24,9 @@ A **Project** is the workspace within a platform where flows, connections, table### Gotchas- `projectHooks.postCreate` is where EE creates the associated `ProjectPlan`, sets piece filters, and auto-subscribes an alert receiver (owner email for personal, `context.alertReceiverEmail` for team).- Soft-deleted projects stay in DB; a background job hard-deletes them.+- **A default project is a flag on the project**, `project.isDefault` (see decision 000051). The database only allows it on team projects (`chk_project_is_default_team`). Admins set it per project with `POST /v1/projects/:id` and `isDefault`; only platform admins and API keys can, and a plan without project roles gets `FEATURE_DISABLED` (checked in the controller; the service only takes `enforceDefaultGuard`). There is no cap on how many defaults a platform has; the platform response reads them in cursor pages of 100, so no single query is unbounded. The platform response lists the live team projects with the flag as `defaultProjectIds`, oldest first. The order matters, because the invite dialog preselects the first default.+- The web project collection never sends `isDefault` when it saves other project settings, so a stale cache can't undo another admin's change. Defaults are only changed through `projectCollectionUtils.useSetDefaultProjects`.+- A soft-deleted project keeps its flag until the hard delete; reads skip deleted rows. A default project can't be deleted from the app while it is a default: remove it on Roles & Access first (see decision 000049). API-key deletes, SCIM group deletes, and plans without project roles still delete it. The app check is part of the soft delete (`AND "isDefault" = false`), not a read before it, so a project another admin makes a default mid-delete is still refused.### Key filesEntry point: `projectService`, a log-taking factory in `project-service.ts` that every project read and write routes through.diff --git a/packages/core/shared/package.json b/packages/core/shared/package.jsonindex eefb0293d35..9038d351eee 100644--- a/packages/core/shared/package.json+++ b/packages/core/shared/package.json@@ -1,6 +1,6 @@{"name": "@activepieces/shared",- "version": "0.210.0",+ "version": "0.210.1","type": "commonjs","sideEffects": false,"main": "./dist/src/index.js",diff --git a/packages/core/shared/src/lib/management/platform/platform.model.ts b/packages/core/shared/src/lib/management/platform/platform.model.tsindex 737968f423b..b0fe889c8e7 100644--- a/packages/core/shared/src/lib/management/platform/platform.model.ts+++ b/packages/core/shared/src/lib/management/platform/platform.model.ts@@ -270,6 +270,11 @@ export const PlatformWithoutSensitiveData = z.object({})export type PlatformWithoutSensitiveData = z.infer<typeof PlatformWithoutSensitiveData>+export const PlatformResponse = PlatformWithoutSensitiveData.extend({+ defaultProjectIds: z.array(z.string()),+})+export type PlatformResponse = z.infer<typeof PlatformResponse>+export const AutoTopUpConfig = z.object({featureId: z.enum(ConsumableFeatureId),enabled: z.boolean(),diff --git a/packages/core/shared/src/lib/management/project/project-requests.ts b/packages/core/shared/src/lib/management/project/project-requests.tsindex 26a94b55b61..1d32d8f3210 100644--- a/packages/core/shared/src/lib/management/project/project-requests.ts+++ b/packages/core/shared/src/lib/management/project/project-requests.ts@@ -18,6 +18,7 @@ export const UpdateProjectPlatformRequest = z.object({maxConcurrentJobs: z.optional(Nullable(z.number().int().positive())),executionDataRetentionDays: z.optional(Nullable(z.number().int().positive())),sensitive: z.boolean().optional(),+ isDefault: z.boolean().optional(),})export type UpdateProjectPlatformRequest = z.infer<typeof UpdateProjectPlatformRequest>diff --git a/packages/core/shared/src/lib/management/project/project.ts b/packages/core/shared/src/lib/management/project/project.tsindex d2b71379df1..566dad704d0 100755--- a/packages/core/shared/src/lib/management/project/project.ts+++ b/packages/core/shared/src/lib/management/project/project.ts@@ -63,6 +63,7 @@ export const Project = z.object({workerGroupId: Nullable(z.string()),executionDataRetentionDays: Nullable(z.number()),sensitive: z.boolean(),+ isDefault: z.boolean(),})const projectAnalytics = z.object({@@ -142,4 +143,3 @@ export const PROJECT_COLOR_PALETTE: Record<ColorName, ProjectColor> = {[ColorName.BLUE]: projectColorFor(ColorName.BLUE),[ColorName.LAVENDER]: projectColorFor(ColorName.LAVENDER),}-diff --git a/packages/server/api/src/app/database/migration/postgres/1877000000000-AddIsDefaultToProject.ts b/packages/server/api/src/app/database/migration/postgres/1877000000000-AddIsDefaultToProject.tsnew file mode 100644index 00000000000..b5350ba9c95--- /dev/null+++ b/packages/server/api/src/app/database/migration/postgres/1877000000000-AddIsDefaultToProject.ts@@ -0,0 +1,28 @@+import { QueryRunner } from 'typeorm'+import { Migration } from '../../migration'++export class AddIsDefaultToProject1877000000000 implements Migration {+ name = 'AddIsDefaultToProject1877000000000'+ breaking = false+ release = '0.93.0'++ public async up(queryRunner: QueryRunner): Promise<void> {+ await queryRunner.query(`+ ALTER TABLE "project"+ ADD COLUMN IF NOT EXISTS "isDefault" boolean NOT NULL DEFAULT false+ `)+ await queryRunner.query(`+ ALTER TABLE "project"+ ADD CONSTRAINT "chk_project_is_default_team" CHECK ("type" = 'TEAM' OR "isDefault" = false) NOT VALID+ `)+ }++ public async down(queryRunner: QueryRunner): Promise<void> {+ await queryRunner.query(`+ ALTER TABLE "project" DROP CONSTRAINT IF EXISTS "chk_project_is_default_team"+ `)+ await queryRunner.query(`+ ALTER TABLE "project" DROP COLUMN IF EXISTS "isDefault"+ `)+ }+}diff --git a/packages/server/api/src/app/database/postgres-connection.ts b/packages/server/api/src/app/database/postgres-connection.tsindex 59a6101b845..09f5f2be8e6 100644--- a/packages/server/api/src/app/database/postgres-connection.ts+++ b/packages/server/api/src/app/database/postgres-connection.ts@@ -463,6 +463,7 @@ import { AddBarrierChildAttribution1871000000000 } from './migration/postgres/18import { AddPieceTranslationTable1873000000000 } from './migration/postgres/1873000000000-AddPieceTranslationTable'import { AddDefaultChatModelToPlatformConfiguration1875000000000 } from './migration/postgres/1875000000000-AddDefaultChatModelToPlatformConfiguration'import { AddAgentConversationWaitpointId1876000000000 } from './migration/postgres/1876000000000-AddAgentConversationWaitpointId'+import { AddIsDefaultToProject1877000000000 } from './migration/postgres/1877000000000-AddIsDefaultToProject'import { AddAgentConversationProviderConfigIdIndex1869000000000 } from './migration/postgres/background/1869000000000-AddAgentConversationProviderConfigIdIndex'import { ReshapeFlowRunListIndexesForBarrierChildren1871000000000 } from './migration/postgres/background/1871000000000-ReshapeFlowRunListIndexesForBarrierChildren'import { BackfillPieceTranslation1874000000000 } from './migration/postgres/background/1874000000000-BackfillPieceTranslation'@@ -951,6 +952,7 @@ export const getMigrations = (): (new () => Migration)[] => {AddPieceTranslationTable1873000000000,AddDefaultChatModelToPlatformConfiguration1875000000000,AddAgentConversationWaitpointId1876000000000,+ AddIsDefaultToProject1877000000000,]return migrations}diff --git a/packages/server/api/src/app/ee/projects/platform-project-controller.ts b/packages/server/api/src/app/ee/projects/platform-project-controller.tsindex 8b6a2af78ad..d2121cd6ebe 100644--- a/packages/server/api/src/app/ee/projects/platform-project-controller.ts+++ b/packages/server/api/src/app/ee/projects/platform-project-controller.ts@@ -9,6 +9,7 @@ import { securityAccess } from '../../core/security/authorization/fastify-securiimport { platformService } from '../../platform/platform.service'import { projectService } from '../../project/project-service'import { userService } from '../../user/user-service'+import { platformPlanService } from '../platform/platform-plan/platform-plan.service'import { platformProjectService } from './platform-project-service'const DEFAULT_LIMIT_SIZE = 50@@ -68,6 +69,15 @@ export const platformProjectController: FastifyPluginAsyncZod = async (app) => {params: {},})}+ const isDefault = ownThePlatform ? request.body.isDefault : undefined+ if (isDefault === true && !await isProjectRolesEnabled({ platformId: project.platformId, log: request.log })) {+ throw new ActivepiecesError({+ code: ErrorCode.FEATURE_DISABLED,+ params: {+ message: 'Default projects are not enabled for this platform',+ },+ })+ }return platformProjectService(request.log).update({platformId: request.principal.platform.id,projectId: request.params.id,@@ -75,6 +85,7 @@ export const platformProjectController: FastifyPluginAsyncZod = async (app) => {...request.body,externalId: ownThePlatform ? request.body.externalId : undefined,executionDataRetentionDays: ownThePlatform ? request.body.executionDataRetentionDays : undefined,+ isDefault,},})})@@ -84,6 +95,7 @@ export const platformProjectController: FastifyPluginAsyncZod = async (app) => {await platformProjectService(req.log).markForDeletion({id: req.params.id,platformId: req.principal.platform.id,+ enforceDefaultGuard: req.principal.type === PrincipalType.USER && await isProjectRolesEnabled({ platformId: req.principal.platform.id, log: req.log }),})return res.status(StatusCodes.NO_CONTENT).send()@@ -131,6 +143,11 @@ async function assertProjectIsSafeToDelete(projectId: string, callerPlatformId:}}+async function isProjectRolesEnabled({ platformId, log }: IsProjectRolesEnabledParams): Promise<boolean> {+ const platformPlan = await platformPlanService(log).getOrCreateForPlatform(platformId)+ return platformPlan.projectRolesEnabled+}+async function assertMaximumNumberOfProjectsReachedByEdition(platformId: string, log: FastifyBaseLogger): Promise<void> {const platform = await platformService(log).getOneWithPlanOrThrow(platformId)const billedTeamProjectsLimit = platform.plan.billedTeamProjectsLimit@@ -228,3 +245,8 @@ const DeleteProjectRequest = {security: [SERVICE_KEY_SECURITY_OPENAPI],},}++type IsProjectRolesEnabledParams = {+ platformId: string+ log: FastifyBaseLogger+}diff --git a/packages/server/api/src/app/ee/projects/platform-project-service.ts b/packages/server/api/src/app/ee/projects/platform-project-service.tsindex efd87bdea5a..fd4470fcb13 100644--- a/packages/server/api/src/app/ee/projects/platform-project-service.ts+++ b/packages/server/api/src/app/ee/projects/platform-project-service.ts@@ -221,15 +221,25 @@ export const platformProjectService = (log: FastifyBaseLogger) => ({await scheduleHardDeleteProjectJob({ id: personalProject.id, platformId, log })},- async markForDeletion({ id, platformId }: DeleteProjectParams): Promise<void> {- const result = await projectRepo()+ async markForDeletion({ id, platformId, enforceDefaultGuard = false }: DeleteProjectParams): Promise<void> {+ const query = projectRepo().createQueryBuilder().softDelete().where('"id" = :id AND "platformId" = :platformId', { id, platformId })- .returning('id')- .execute()+ if (enforceDefaultGuard) {+ query.andWhere('"isDefault" = false')+ }+ const result = await query.returning('id').execute()const deletedRows: unknown[] = result.raw ?? []if (deletedRows.length === 0) {+ if (enforceDefaultGuard && await projectRepo().existsBy({ id, platformId, isDefault: true })) {+ throw new ActivepiecesError({+ code: ErrorCode.VALIDATION,+ params: {+ message: 'Remove this project from default projects before deleting it',+ },+ })+ }throw new ActivepiecesError({code: ErrorCode.ENTITY_NOT_FOUND,params: {@@ -390,6 +400,7 @@ type CreateProjectParams = {type DeleteProjectParams = {id: ProjectIdplatformId: PlatformId+ enforceDefaultGuard?: boolean}type ScheduleHardDeleteProjectJobParams = {diff --git a/packages/server/api/src/app/platform/platform.controller.ts b/packages/server/api/src/app/platform/platform.controller.tsindex 506c39788cb..f924b03b994 100644--- a/packages/server/api/src/app/platform/platform.controller.ts+++ b/packages/server/api/src/app/platform/platform.controller.ts@@ -1,6 +1,6 @@import { ActivepiecesError, ApId, assertNotNullOrUndefined, ErrorCode, isNil, tryCatch } from '@activepieces/core-utils'import { apDayjs } from '@activepieces/server-utils'-import { ApEdition, AuthenticationResponse, CreatePlatformRequest, FileType, hasActiveSubscription, PLATFORM_PURGE_DELAY_DAYS, PlatformWithoutSensitiveData, PrincipalType, SERVICE_KEY_SECURITY_OPENAPI, UpdatePlatformRequestBody } from '@activepieces/shared'+import { ApEdition, AuthenticationResponse, CreatePlatformRequest, FileType, hasActiveSubscription, PLATFORM_PURGE_DELAY_DAYS, PlatformResponse, PrincipalType, SERVICE_KEY_SECURITY_OPENAPI, UpdatePlatformRequestBody } from '@activepieces/shared'import { FastifyPluginAsyncZod } from 'fastify-type-provider-zod'import { StatusCodes } from 'http-status-codes'import { z } from 'zod'@@ -210,7 +210,7 @@ const UpdatePlatformRequest = {id: ApId,}),response: {- [StatusCodes.OK]: PlatformWithoutSensitiveData,+ [StatusCodes.OK]: PlatformResponse,},},}@@ -228,7 +228,7 @@ const GetPlatformRequest = {id: ApId,}),response: {- [StatusCodes.OK]: PlatformWithoutSensitiveData,+ [StatusCodes.OK]: PlatformResponse,},},}diff --git a/packages/server/api/src/app/platform/platform.service.ts b/packages/server/api/src/app/platform/platform.service.tsindex 13abd5cc36b..bcd8d079426 100644--- a/packages/server/api/src/app/platform/platform.service.ts+++ b/packages/server/api/src/app/platform/platform.service.ts@@ -1,8 +1,8 @@import { ActivepiecesError, apId, ErrorCode, isNil, PlatformId, spreadIfDefined, spreadIfNotUndefined, tryCatch, UserId } from '@activepieces/core-utils'-import { ApEdition, AUDIT_LOG_RETENTION_MAX_DAYS, AUDIT_LOG_RETENTION_MIN_DAYS, AuthenticationResponse, OPEN_SOURCE_PLAN, Platform, PlatformPlanLimits, PlatformRole, PlatformUsage, PlatformWithoutFederatedAuth, PlatformWithoutSensitiveData, ProjectType, SsoDomainVerification, SsoDomainVerificationStatus, UpdatePlatformRequestBody, User, UserStatus } from '@activepieces/shared'+import { ApEdition, AUDIT_LOG_RETENTION_MAX_DAYS, AUDIT_LOG_RETENTION_MIN_DAYS, AuthenticationResponse, OPEN_SOURCE_PLAN, Platform, PlatformPlanLimits, PlatformResponse, PlatformRole, PlatformUsage, PlatformWithoutFederatedAuth, PlatformWithoutSensitiveData, ProjectType, SsoDomainVerification, SsoDomainVerificationStatus, UpdatePlatformRequestBody, User, UserStatus } from '@activepieces/shared'import { FastifyBaseLogger } from 'fastify'import { nanoid } from 'nanoid'-import { EntityManager } from 'typeorm'+import { EntityManager, IsNull } from 'typeorm'import { authenticationUtils } from '../authentication/authentication-utils'import { userIdentityRepository, userIdentityService } from '../authentication/user-identity/user-identity-service'import { repoFactory } from '../core/db/repo-factory'@@ -11,10 +11,14 @@ import { distributedLock } from '../database/redis-connections'import { invalidateSamlClientCache } from '../ee/authentication/saml-authn/saml-client'import { platformPlanService } from '../ee/platform/platform-plan/platform-plan.service'import { defaultTheme } from '../flags/theme'+import { buildPaginator } from '../helper/pagination/build-paginator'+import { Order } from '../helper/pagination/paginator'import { rejectedPromiseHandler } from '../helper/promise-handler'import { auditLogRetentionCeiling } from '../helper/retention/audit-log-retention-ceiling'import { system } from '../helper/system/system'import { telemetry } from '../helper/telemetry.utils'+import { ProjectEntity } from '../project/project-entity'+import { projectRepo } from '../project/project-repo'import { projectService } from '../project/project-service'import { userService } from '../user/user-service'import { authenticationAuditEvents } from './authentication-audit-events'@@ -24,6 +28,8 @@ import { PlatformEntity } from './platform.entity'export const platformRepo = repoFactory<Platform>(PlatformEntity)+const DEFAULT_PROJECT_IDS_PAGE_SIZE = 100+export const platformService = (log: FastifyBaseLogger) => ({async listPlatformsForIdentityWithAtleastProject(params: ListPlatformsForIdentityParams): Promise<PlatformWithoutSensitiveData[]> {const users = await userService(log).getByIdentityId({ identityId: params.identityId })@@ -244,6 +250,9 @@ export const platformService = (log: FastifyBaseLogger) => ({}return stripFederatedAuth(saved)},+ async listDefaultProjectIds({ platformId, entityManager }: ListDefaultProjectIdsParams): Promise<string[]> {+ return readDefaultProjectIdPages({ platformId, entityManager, afterCursor: null })+ },async getOneOrThrow(id: PlatformId): Promise<PlatformWithoutFederatedAuth> {return platformRepo().findOneByOrFail({ id })},@@ -294,13 +303,14 @@ export const platformService = (log: FastifyBaseLogger) => ({plan,}},- async getOneWithPlanAndUsageOrThrow(id: PlatformId): Promise<PlatformWithoutSensitiveData> {+ async getOneWithPlanAndUsageOrThrow(id: PlatformId): Promise<PlatformResponse> {const platform = await this.getOneOrThrow(id)- const [samlConfigured, usage, plan, billingEnforced] = await Promise.all([+ const [samlConfigured, usage, plan, billingEnforced, defaultProjectIds] = await Promise.all([this.hasSamlConfigured(id),getUsage(log, platform),getPlan(log, platform),getBillingEnforced(log, id),+ this.listDefaultProjectIds({ platformId: id }),])return {...platform,@@ -308,10 +318,38 @@ export const platformService = (log: FastifyBaseLogger) => ({usage,billingEnforced,plan,+ defaultProjectIds,}},})+async function readDefaultProjectIdPages({ platformId, entityManager, afterCursor }: ReadDefaultProjectIdPagesParams): Promise<string[]> {+ const paginator = buildPaginator({+ entity: ProjectEntity,+ query: {+ limit: DEFAULT_PROJECT_IDS_PAGE_SIZE,+ afterCursor: afterCursor ?? undefined,+ orderBy: [+ { field: 'created', order: Order.ASC },+ { field: 'id', order: Order.ASC },+ ],+ },+ })+ const { data, cursor } = await paginator.paginate(+ projectRepo(entityManager).createQueryBuilder('project').where({+ platformId,+ type: ProjectType.TEAM,+ isDefault: true,+ deleted: IsNull(),+ }),+ )+ const pageIds = data.map((project) => project.id)+ if (isNil(cursor.afterCursor)) {+ return pageIds+ }+ return [...pageIds, ...await readDefaultProjectIdPages({ platformId, entityManager, afterCursor: cursor.afterCursor })]+}+async function lockPlatformForUpdate({ entityManager, platformId, includeFederatedAuth }: LockPlatformForUpdateParams): Promise<Platform> {return platformRepo(entityManager).findOneOrFail({where: { id: platformId },@@ -506,6 +544,17 @@ type LockPlatformForUpdateParams = {includeFederatedAuth: boolean}+type ListDefaultProjectIdsParams = {+ platformId: PlatformId+ entityManager?: EntityManager+}++type ReadDefaultProjectIdPagesParams = {+ platformId: PlatformId+ entityManager?: EntityManager+ afterCursor: string | null+}+type UpdateParams = UpdatePlatformRequestBody & {id: PlatformIdplan?: Partial<PlatformPlanLimits>diff --git a/packages/server/api/src/app/project/project-entity.ts b/packages/server/api/src/app/project/project-entity.tsindex 7a184e0c0e4..c027c1f6373 100644--- a/packages/server/api/src/app/project/project-entity.ts+++ b/packages/server/api/src/app/project/project-entity.ts@@ -105,7 +105,18 @@ export const ProjectEntity = new EntitySchema<ProjectSchema>({nullable: false,default: false,},+ isDefault: {+ type: Boolean,+ nullable: false,+ default: false,+ },},+ checks: [+ {+ name: 'chk_project_is_default_team',+ expression: '"type" = \'TEAM\' OR "isDefault" = false',+ },+ ],indices: [{name: 'idx_project_owner_id',diff --git a/packages/server/api/src/app/project/project-service.ts b/packages/server/api/src/app/project/project-service.tsindex 53cf7f014da..a4f1e02010f 100644--- a/packages/server/api/src/app/project/project-service.ts+++ b/packages/server/api/src/app/project/project-service.ts@@ -21,6 +21,7 @@ export const projectService = (log: FastifyBaseLogger) => ({releasesEnabled: false,notifyFlowOwnerOnFailure: false,sensitive: params.sensitive ?? false,+ isDefault: false,}const savedProject = await projectRepo(entityManager).save(newProject)if (callPostCreateHooks) {@@ -84,6 +85,7 @@ export const projectService = (log: FastifyBaseLogger) => ({const teamUpdate = request.type === ProjectType.TEAM ? {...spreadIfDefined('displayName', request.displayName),...spreadIfDefined('icon', request.icon),+ ...spreadIfDefined('isDefault', request.isDefault),} : {}await projectRepo(entityManager).update({ id: projectId }, { ...baseUpdate, ...teamUpdate })@@ -291,6 +293,7 @@ type UpdateTeamProjectParams = {executionDataRetentionDays?: number | nullicon?: ProjectIconsensitive?: boolean+ isDefault?: boolean}type UpdatePersonalProjectParams = {diff --git a/packages/server/api/test/helpers/mocks/index.ts b/packages/server/api/test/helpers/mocks/index.tsindex c8ccbc90bd9..02dfc1679b6 100644--- a/packages/server/api/test/helpers/mocks/index.ts+++ b/packages/server/api/test/helpers/mocks/index.ts@@ -132,6 +132,7 @@ export const createMockProject = (project?: Partial<Project>): Project => {externalId: project?.externalId ?? apId(),releasesEnabled: project?.releasesEnabled ?? false,sensitive: project?.sensitive ?? false,+ isDefault: project?.isDefault ?? false,notifyFlowOwnerOnFailure: project?.notifyFlowOwnerOnFailure ?? false,metadata: project?.metadata ?? null,type: project?.type ?? ProjectType.TEAM,diff --git a/packages/server/api/test/integration/cloud/platform/platform.test.ts b/packages/server/api/test/integration/cloud/platform/platform.test.tsindex 0d2b1d74ce0..412f03db703 100644--- a/packages/server/api/test/integration/cloud/platform/platform.test.ts+++ b/packages/server/api/test/integration/cloud/platform/platform.test.ts@@ -583,6 +583,7 @@ describe('Platform API', () => {'billingEnforced','cloudAuthEnabled','created',+ 'defaultProjectIds','emailAuthEnabled','enforceAllowedAuthDomains','favIconUrl',diff --git a/packages/server/api/test/integration/ee/projects/default-projects.test.ts b/packages/server/api/test/integration/ee/projects/default-projects.test.tsnew file mode 100644index 00000000000..6a3d2c8407a--- /dev/null+++ b/packages/server/api/test/integration/ee/projects/default-projects.test.ts@@ -0,0 +1,320 @@+import { apId, ErrorCode, Permission, RoleType } from '@activepieces/core-utils'+import { PlatformRole, PrincipalType, ProjectType } from '@activepieces/shared'+import { FastifyInstance } from 'fastify'+import { StatusCodes } from 'http-status-codes'+import { In, ObjectLiteral } from 'typeorm'+import { SoftDeleteQueryBuilder } from 'typeorm/query-builder/SoftDeleteQueryBuilder.js'+import { databaseConnection } from '../../../../src/app/database/database-connection'+import { generateMockToken } from '../../../helpers/auth'+import { createMockApiKey, createMockProject, createMockProjectMember, createMockProjectRole, createMockUser, createMockUserIdentity, mockAndSaveBasicSetup } from '../../../helpers/mocks'+import { setupTestEnvironment, teardownTestEnvironment } from '../../../helpers/test-setup'++let app: FastifyInstance | null = null++beforeAll(async () => {+ app = await setupTestEnvironment()+})++afterAll(async () => {+ await teardownTestEnvironment()+})++describe('Default projects', () => {+ it('marks team projects as defaults, and the platform lists them oldest first', async () => {+ const { mockPlatform, mockOwner, mockProject } = await setupPlatform({ projectRolesEnabled: true })+ const secondProject = await saveProject({ platformId: mockPlatform.id, ownerId: mockOwner.id, type: ProjectType.TEAM })+ await databaseConnection().getRepository('project').update({ id: mockProject.id }, { created: '2026-01-01T00:00:00.000Z' })+ await databaseConnection().getRepository('project').update({ id: secondProject.id }, { created: '2026-02-01T00:00:00.000Z' })++ const secondResponse = await setDefault({ platformId: mockPlatform.id, userId: mockOwner.id, projectId: secondProject.id, isDefault: true })+ const firstResponse = await setDefault({ platformId: mockPlatform.id, userId: mockOwner.id, projectId: mockProject.id, isDefault: true })++ expect(secondResponse?.statusCode).toBe(StatusCodes.OK)+ expect(firstResponse?.statusCode).toBe(StatusCodes.OK)+ expect(firstResponse?.json().isDefault).toBe(true)+ expect((await getPlatform({ platformId: mockPlatform.id, userId: mockOwner.id }))?.json().defaultProjectIds).toStrictEqual([mockProject.id, secondProject.id])+ })++ it('removes a project from the defaults', async () => {+ const { mockPlatform, mockOwner, mockProject } = await setupPlatform({ projectRolesEnabled: true })+ await markDefault({ projectIds: [mockProject.id] })++ const response = await setDefault({ platformId: mockPlatform.id, userId: mockOwner.id, projectId: mockProject.id, isDefault: false })++ expect(response?.statusCode).toBe(StatusCodes.OK)+ expect(await defaultProjectIdsOf({ platformId: mockPlatform.id })).toStrictEqual([])+ })++ it('removes the last default, even while personal projects are off', async () => {+ const { mockPlatform, mockOwner, mockProject } = await setupPlatform({ projectRolesEnabled: true })+ await setPlatformState({ platformId: mockPlatform.id, defaultProjectIds: [mockProject.id], autoCreatePersonalProjects: false })++ const response = await setDefault({ platformId: mockPlatform.id, userId: mockOwner.id, projectId: mockProject.id, isDefault: false })++ expect(response?.statusCode).toBe(StatusCodes.OK)+ expect(await defaultProjectIdsOf({ platformId: mockPlatform.id })).toStrictEqual([])+ })++ it('never marks a personal project as a default', async () => {+ const { mockPlatform, mockOwner } = await setupPlatform({ projectRolesEnabled: true })+ const personalProject = await saveProject({ platformId: mockPlatform.id, ownerId: mockOwner.id, type: ProjectType.PERSONAL })++ await setDefault({ platformId: mockPlatform.id, userId: mockOwner.id, projectId: personalProject.id, isDefault: true })++ expect(await defaultProjectIdsOf({ platformId: mockPlatform.id })).toStrictEqual([])+ })++ it('does not mark a project of another platform', async () => {+ const { mockPlatform, mockOwner } = await setupPlatform({ projectRolesEnabled: true })+ const { mockPlatform: otherPlatform, mockProject: otherPlatformProject } = await setupPlatform({ projectRolesEnabled: true })++ const response = await setDefault({ platformId: mockPlatform.id, userId: mockOwner.id, projectId: otherPlatformProject.id, isDefault: true })++ expect(response?.statusCode).not.toBe(StatusCodes.OK)+ expect(await defaultProjectIdsOf({ platformId: otherPlatform.id })).toStrictEqual([])+ })++ it('does not mark a deleted project', async () => {+ const { mockPlatform, mockOwner, mockProject } = await setupPlatform({ projectRolesEnabled: true })+ await databaseConnection().getRepository('project').update({ id: mockProject.id }, { deleted: new Date().toISOString() })++ const response = await setDefault({ platformId: mockPlatform.id, userId: mockOwner.id, projectId: mockProject.id, isDefault: true })++ expect(response?.statusCode).not.toBe(StatusCodes.OK)+ expect(await defaultProjectIdsOf({ platformId: mockPlatform.id })).toStrictEqual([])+ })++ it('refuses default projects on a plan without project roles', async () => {+ const { mockPlatform, mockOwner, mockProject } = await setupPlatform({ projectRolesEnabled: false })++ const response = await setDefault({ platformId: mockPlatform.id, userId: mockOwner.id, projectId: mockProject.id, isDefault: true })++ expect(response?.statusCode).toBe(StatusCodes.PAYMENT_REQUIRED)+ expect(response?.json().code).toBe(ErrorCode.FEATURE_DISABLED)+ expect(await defaultProjectIdsOf({ platformId: mockPlatform.id })).toStrictEqual([])+ })++ it('ignores isDefault from a project admin who is not a platform admin', async () => {+ const { mockPlatform, mockProject } = await setupPlatform({ projectRolesEnabled: true })+ const member = await saveProjectWriter({ platformId: mockPlatform.id, projectId: mockProject.id })++ const response = await setDefault({ platformId: mockPlatform.id, userId: member.id, projectId: mockProject.id, isDefault: true })++ expect(response?.statusCode).toBe(StatusCodes.OK)+ expect(await defaultProjectIdsOf({ platformId: mockPlatform.id })).toStrictEqual([])+ })++ it('keeps the default flag when another project setting is saved', async () => {+ const { mockPlatform, mockOwner, mockProject } = await setupPlatform({ projectRolesEnabled: true })+ await markDefault({ projectIds: [mockProject.id] })+ const token = await generateMockToken({ id: mockOwner.id, type: PrincipalType.USER, platform: { id: mockPlatform.id } })++ const response = await app?.inject({+ method: 'POST',+ url: `/api/v1/projects/${mockProject.id}`,+ headers: { authorization: `Bearer ${token}` },+ body: { displayName: 'Renamed' },+ })++ expect(response?.statusCode).toBe(StatusCodes.OK)+ expect(await defaultProjectIdsOf({ platformId: mockPlatform.id })).toStrictEqual([mockProject.id])+ })++ it('lists every default project oldest first, across more than one page', async () => {+ const { mockPlatform, mockOwner } = await setupPlatform({ projectRolesEnabled: true })+ const defaults = await saveTeamProjects({ platformId: mockPlatform.id, ownerId: mockOwner.id, count: 101 })+ await Promise.all(defaults.map((project, index) => databaseConnection().getRepository('project').update({ id: project.id }, { created: new Date(Date.UTC(2026, 0, 1, 0, 0, index)).toISOString() })))+ await markDefault({ projectIds: defaults.map((project) => project.id) })++ const response = await getPlatform({ platformId: mockPlatform.id, userId: mockOwner.id })++ expect(response?.json().defaultProjectIds).toStrictEqual(defaults.map((project) => project.id))+ })++ it('refuses to delete a default project from the app', async () => {+ const { mockPlatform, mockOwner, mockProject } = await setupPlatform({ projectRolesEnabled: true })+ await setPlatformState({ platformId: mockPlatform.id, defaultProjectIds: [mockProject.id], autoCreatePersonalProjects: true })++ const response = await deleteProject({ platformId: mockPlatform.id, userId: mockOwner.id, projectId: mockProject.id })++ expect(response?.json().code).toBe(ErrorCode.VALIDATION)+ expect(await isLive({ projectId: mockProject.id })).toBe(true)+ expect(await defaultProjectIdsOf({ platformId: mockPlatform.id })).toStrictEqual([mockProject.id])+ })++ it('refuses to delete a project another admin makes a default while the delete is running', async () => {+ const { mockPlatform, mockOwner, mockProject } = await setupPlatform({ projectRolesEnabled: true })+ const originalExecute = SoftDeleteQueryBuilder.prototype.execute+ let madeDefault = false+ const execute = vi.spyOn(SoftDeleteQueryBuilder.prototype, 'execute').mockImplementation(async function (this: SoftDeleteQueryBuilder<ObjectLiteral>) {+ if (!madeDefault && this.expressionMap.mainAlias?.metadata.tableName === 'project') {+ madeDefault = true+ await markDefault({ projectIds: [mockProject.id] })+ }+ return originalExecute.apply(this)+ })++ try {+ const response = await deleteProject({ platformId: mockPlatform.id, userId: mockOwner.id, projectId: mockProject.id })+ expect(response?.json().code).toBe(ErrorCode.VALIDATION)+ }+ finally {+ execute.mockRestore()+ }++ expect(madeDefault).toBe(true)+ expect(await isLive({ projectId: mockProject.id })).toBe(true)+ expect(await defaultProjectIdsOf({ platformId: mockPlatform.id })).toStrictEqual([mockProject.id])+ })++ it('deletes it from the app once it is no longer a default project', async () => {+ const { mockPlatform, mockOwner, mockProject } = await setupPlatform({ projectRolesEnabled: true })+ const otherDefault = await saveProject({ platformId: mockPlatform.id, ownerId: mockOwner.id, type: ProjectType.TEAM })+ await setPlatformState({ platformId: mockPlatform.id, defaultProjectIds: [otherDefault.id], autoCreatePersonalProjects: true })++ const response = await deleteProject({ platformId: mockPlatform.id, userId: mockOwner.id, projectId: mockProject.id })++ expect(response?.statusCode).toBe(StatusCodes.NO_CONTENT)+ expect(await defaultProjectIdsOf({ platformId: mockPlatform.id })).toStrictEqual([otherDefault.id])+ })++ it('still deletes a default project with an API key, and drops it from the list', async () => {+ const { mockPlatform, mockOwner, mockProject } = await setupPlatform({ projectRolesEnabled: true })+ const deletedProject = await saveProject({ platformId: mockPlatform.id, ownerId: mockOwner.id, type: ProjectType.TEAM })+ await setPlatformState({ platformId: mockPlatform.id, defaultProjectIds: [mockProject.id, deletedProject.id], autoCreatePersonalProjects: false })+ const apiKey = createMockApiKey({ platformId: mockPlatform.id })+ await databaseConnection().getRepository('api_key').save(apiKey)++ const response = await app?.inject({+ method: 'DELETE',+ url: `/api/v1/projects/${deletedProject.id}`,+ headers: { authorization: `Bearer ${apiKey.value}` },+ })++ expect(response?.statusCode).toBe(StatusCodes.NO_CONTENT)+ expect(await defaultProjectIdsOf({ platformId: mockPlatform.id })).toStrictEqual([mockProject.id])+ })++ it('still deletes a default project from the app on a plan without project roles, and drops it from the list', async () => {+ const { mockPlatform, mockOwner, mockProject } = await setupPlatform({ projectRolesEnabled: false })+ await setPlatformState({ platformId: mockPlatform.id, defaultProjectIds: [mockProject.id], autoCreatePersonalProjects: true })++ const response = await deleteProject({ platformId: mockPlatform.id, userId: mockOwner.id, projectId: mockProject.id })++ expect(response?.statusCode).toBe(StatusCodes.NO_CONTENT)+ expect(await defaultProjectIdsOf({ platformId: mockPlatform.id })).toStrictEqual([])+ })++ it('drops a project from the list when SCIM deletes its group', async () => {+ const { mockPlatform } = await mockAndSaveBasicSetup({ plan: { projectRolesEnabled: true, scimEnabled: true } })+ const apiKey = createMockApiKey({ platformId: mockPlatform.id })+ await databaseConnection().getRepository('api_key').save(apiKey)+ const group = await app?.inject({+ method: 'POST',+ url: '/api/v1/scim/v2/Groups',+ headers: { authorization: `Bearer ${apiKey.value}` },+ body: { schemas: ['urn:ietf:params:scim:schemas:core:2.0:Group'], displayName: 'Sales', externalId: apId(), members: [] },+ })+ await markDefault({ projectIds: [group?.json().id] })++ const response = await app?.inject({ method: 'DELETE', url: `/api/v1/scim/v2/Groups/${group?.json().id}`, headers: { authorization: `Bearer ${apiKey.value}` } })++ expect(response?.statusCode).toBe(StatusCodes.NO_CONTENT)+ expect(await defaultProjectIdsOf({ platformId: mockPlatform.id })).toStrictEqual([])+ })++ it('leaves out a soft-deleted default project', async () => {+ const { mockPlatform, mockOwner, mockProject } = await setupPlatform({ projectRolesEnabled: true })+ await markDefault({ projectIds: [mockProject.id] })+ await databaseConnection().getRepository('project').update({ id: mockProject.id }, { deleted: new Date().toISOString() })+ const token = await generateMockToken({ id: mockOwner.id, type: PrincipalType.USER, platform: { id: mockPlatform.id } })++ const response = await app?.inject({ method: 'GET', url: `/api/v1/platforms/${mockPlatform.id}`, headers: { authorization: `Bearer ${token}` } })++ expect(response?.json().defaultProjectIds).toStrictEqual([])+ })++ it('never lets a personal project be a default, even when written directly', async () => {+ const { mockPlatform, mockOwner } = await setupPlatform({ projectRolesEnabled: true })+ const personalProject = await saveProject({ platformId: mockPlatform.id, ownerId: mockOwner.id, type: ProjectType.PERSONAL })++ await expect(markDefault({ projectIds: [personalProject.id] })).rejects.toThrow()+ })+})++async function setupPlatform({ projectRolesEnabled }: { projectRolesEnabled: boolean }) {+ return mockAndSaveBasicSetup({+ plan: { projectRolesEnabled },+ project: { type: ProjectType.TEAM },+ })+}++async function saveProject({ platformId, ownerId, type }: { platformId: string, ownerId: string, type: ProjectType }) {+ const project = createMockProject({ platformId, ownerId, type })+ await databaseConnection().getRepository('project').save(project)+ return project+}++async function saveTeamProjects({ platformId, ownerId, count }: { platformId: string, ownerId: string, count: number }) {+ return Promise.all(Array.from({ length: count }, () => saveProject({ platformId, ownerId, type: ProjectType.TEAM })))+}++async function setDefault({ platformId, userId, projectId, isDefault }: { platformId: string, userId: string, projectId: string, isDefault: boolean }) {+ const token = await generateMockToken({ id: userId, type: PrincipalType.USER, platform: { id: platformId } })+ return app?.inject({+ method: 'POST',+ url: `/api/v1/projects/${projectId}`,+ headers: { authorization: `Bearer ${token}` },+ body: { isDefault },+ })+}++async function getPlatform({ platformId, userId }: { platformId: string, userId: string }) {+ const token = await generateMockToken({ id: userId, type: PrincipalType.USER, platform: { id: platformId } })+ return app?.inject({ method: 'GET', url: `/api/v1/platforms/${platformId}`, headers: { authorization: `Bearer ${token}` } })+}++async function saveProjectWriter({ platformId, projectId }: { platformId: string, projectId: string }) {+ const identity = createMockUserIdentity({ verified: true })+ await databaseConnection().getRepository('user_identity').save(identity)+ const member = createMockUser({ identityId: identity.id, platformId, platformRole: PlatformRole.MEMBER })+ await databaseConnection().getRepository('user').save(member)+ const projectRole = createMockProjectRole({ platformId, type: RoleType.CUSTOM, permissions: [Permission.WRITE_PROJECT, Permission.READ_PROJECT] })+ await databaseConnection().getRepository('project_role').save(projectRole)+ await databaseConnection().getRepository('project_member').save(createMockProjectMember({ userId: member.id, projectId, platformId, projectRoleId: projectRole.id }))+ return member+}++async function setPlatformState({ platformId, defaultProjectIds, autoCreatePersonalProjects }: { platformId: string, defaultProjectIds: string[], autoCreatePersonalProjects: boolean }) {+ await databaseConnection().getRepository('platform').update({ id: platformId }, { autoCreatePersonalProjects })+ await markDefault({ projectIds: defaultProjectIds })+}++async function markDefault({ projectIds }: { projectIds: string[] }) {+ if (projectIds.length === 0) {+ return+ }+ await databaseConnection().getRepository('project').update({ id: In(projectIds) }, { isDefault: true })+}++async function deleteProject({ platformId, userId, projectId }: { platformId: string, userId: string, projectId: string }) {+ const token = await generateMockToken({ id: userId, type: PrincipalType.USER, platform: { id: platformId } })+ return app?.inject({+ method: 'DELETE',+ url: `/api/v1/projects/${projectId}`,+ headers: { authorization: `Bearer ${token}` },+ })+}++async function defaultProjectIdsOf({ platformId }: { platformId: string }) {+ const projects = await databaseConnection().getRepository('project').find({+ where: { platformId, isDefault: true },+ order: { created: 'ASC' },+ })+ return projects.map((project) => project.id)+}++async function isLive({ projectId }: { projectId: string }) {+ const project = await databaseConnection().getRepository('project').findOneBy({ id: projectId })+ return project !== null && project.deleted === null+}diff --git a/packages/web/public/locales/en/translation.json b/packages/web/public/locales/en/translation.jsonindex d9886014013..32666e6211c 100644--- a/packages/web/public/locales/en/translation.json+++ b/packages/web/public/locales/en/translation.json@@ -26,6 +26,24 @@"invalidDomain": "Enter a domain like acme.com","duplicateDomain": "This domain is already on the list","Support": "Support",+ "New members won't join {project} anymore. Current members keep their access.": "New members won't join {project} anymore. Current members keep their access.",+ "Remove {project} from default projects?": "Remove {project} from default projects?",+ "New Members join these as Editors.": "New Members join these as Editors.",+ "removeDefaultProjectsMessage": "{count, plural, =1 {New members won't join {projects} anymore. Current members keep their access.} other {New members won't join {projects} anymore. Current members keep their access.}}",+ "removeDefaultProjectsTitle": "{count, plural, =1 {Remove 1 default project?} other {Remove # default projects?}}",+ "showAllDefaultProjects": "Show all {count} projects",+ "No default projects yet": "No default projects yet",+ "New Members will join it as an Editor.": "New Members will join it as an Editor.",+ "Add project": "Add project",+ "Add default projects": "Add default projects",+ "New Members join these as Editors. People already on the platform aren't added.": "New Members join these as Editors. People already on the platform aren't added.",+ "No team projects yet. Create one on the Projects page.": "No team projects yet. Create one on the Projects page.",+ "No projects match \"{search}\"": "No projects match \"{search}\"",+ "projectMemberCount": "{count, plural, =1 {1 member} other {# members}}",+ "addDefaultProjectsCount": "{count, plural, =0 {Add projects} =1 {Add 1 project} other {Add # projects}}",+ "Default projects": "Default projects",+ "Remove {project}": "Remove {project}",+ "Manage roles and where new members land": "Manage roles and where new members land","Runs": "Runs","Edit flow": "Edit flow","View draft": "View draft",@@ -1770,6 +1788,10 @@"Automatic personal project creation updated": "Automatic personal project creation updated","Cannot delete active project, switch to another project first": "Cannot delete active project, switch to another project first","Personal projects cannot be deleted, and you can't subscribe to their alerts": "Personal projects cannot be deleted, and you can't subscribe to their alerts",+ "Go to Roles & Access": "Go to Roles & Access",+ "skippedDefaultProjects": "{count, plural, =1 {{names} is a default project, so it won't be deleted. Remove it from default projects first.} other {{names} are default projects, so they won't be deleted. Remove them from default projects first.}}",+ "deleteProjectsCount": "{count, plural, =1 {Delete 1 project} other {Delete # projects}}",+ "Default projects can't be deleted. Remove them from default projects first.": "Default projects can't be deleted. Remove them from default projects first.","Delete Projects": "Delete Projects","The selected projects and all their data will be permanently deleted.": "The selected projects and all their data will be permanently deleted.","Validation error": "Validation error",@@ -1864,7 +1886,6 @@"No signing keys yet": "No signing keys yet","Delete Signing Key": "Delete Signing Key","Deleting this signing key will invalidate any tokens signed with it.": "Deleting this signing key will invalidate any tokens signed with it.",- "Create roles and control what members can do in each project": "Create roles and control what members can do in each project","View {resource}": "View {resource}","Edit {resource}": "Edit {resource}","No view-only level": "No view-only level",diff --git a/packages/web/src/api/platforms-api.ts b/packages/web/src/api/platforms-api.tsindex e1520cc1ed5..f8e497fb621 100644--- a/packages/web/src/api/platforms-api.ts+++ b/packages/web/src/api/platforms-api.ts@@ -1,6 +1,6 @@import {AuthenticationResponse,- PlatformWithoutSensitiveData,+ PlatformResponse,UpdatePlatformRequestBody,} from '@activepieces/shared';@@ -21,7 +21,7 @@ export const platformApi = {if (!platformId) {throw Error('No platform id found');}- return api.get<PlatformWithoutSensitiveData>(`/v1/platforms/${platformId}`);+ return api.get<PlatformResponse>(`/v1/platforms/${platformId}`);},activateLicenseKey(licenseKey: string) {@@ -31,13 +31,10 @@ export const platformApi = {},update(req: UpdatePlatformRequestBody, platformId: string) {- return api.post<PlatformWithoutSensitiveData>(- `/v1/platforms/${platformId}`,- req,- );+ return api.post<PlatformResponse>(`/v1/platforms/${platformId}`, req);},updateWithFormData(formdata: FormData, platformId: string) {- return api.post<PlatformWithoutSensitiveData>(+ return api.post<PlatformResponse>(`/v1/platforms/${platformId}`,formdata,{},diff --git a/packages/web/src/app/routes/platform/projects/index.tsx b/packages/web/src/app/routes/platform/projects/index.tsxindex b8a660d7b1a..97a94768566 100644--- a/packages/web/src/app/routes/platform/projects/index.tsx+++ b/packages/web/src/app/routes/platform/projects/index.tsx@@ -4,7 +4,7 @@ import { ColumnDef } from '@tanstack/react-table';import { t } from 'i18next';import { CheckIcon, Package, Pencil, Trash, UserCircle } from 'lucide-react';import { useEffect, useMemo, useState } from 'react';-import { useNavigate, useSearchParams } from 'react-router-dom';+import { Link, useNavigate, useSearchParams } from 'react-router-dom';import { toast } from 'sonner';import { platformApi } from '@/api/platforms-api';@@ -47,6 +47,13 @@ export default function ProjectsPage() {const [searchParams, setSearchParams] = useSearchParams();const { project: currentProject } =projectCollectionUtils.useCurrentProject();+ const defaultProjectIds = useMemo(+ () =>+ new Set(+ platform.plan.projectRolesEnabled ? platform.defaultProjectIds : [],+ ),+ [platform.plan.projectRolesEnabled, platform.defaultProjectIds],+ );useEffect(() => {if (!searchParams.has('type')) {@@ -251,55 +258,103 @@ export default function ProjectsPage() {_: RowDataWithActions<ProjectWithLimits>[],resetSelection: () => void,) => {- const canDeleteAny = selectedRows.some(- (row) => row.id !== currentProject?.id,+ const deletableProjects = selectedRows.filter(+ (row) =>+ row.id !== currentProject?.id && !defaultProjectIds.has(row.id),+ );+ const selectedDefaultProjects = selectedRows.filter((row) =>+ defaultProjectIds.has(row.id),);+ const onlyDefaultProjectsBlockDelete =+ deletableProjects.length === 0 &&+ selectedDefaultProjects.length > 0;return (<div onClick={(e) => e.stopPropagation()}>- <ConfirmationDeleteDialog- title={t('Delete Projects')}- message={t(- 'The selected projects and all their data will be permanently deleted.',- )}- entityName={t('Projects')}- buttonText={t('Delete')}- controlId={AdminControl.PROJECTS_DELETE_CONFIRM}- mutationFn={async () => {- const deletableProjects = selectedRows.filter(- (row) => row.id !== currentProject?.id,- );- projectCollectionUtils.delete(- deletableProjects.map((row) => row.id),- );- resetSelection();- setSelectedRows([]);- }}- onError={(error) => {- toast.error(t('Error'), {- description: errorToastMessage(error),- duration: 3000,- });- }}- >- {selectedRows.length > 0 && (- <Button- variant="ghost"- size="sm"- className="text-danger-11 hover:text-danger-11"- disabled={!canDeleteAny}- {...adminControl(AdminControl.PROJECTS_DELETE_OPEN)}+ <Tooltip>+ <TooltipTrigger asChild>+ <span+ tabIndex={onlyDefaultProjectsBlockDelete ? 0 : undefined}+ aria-label={+ onlyDefaultProjectsBlockDelete+ ? t(+ "Default projects can't be deleted. Remove them from default projects first.",+ )+ : undefined+ }>- <Trash className="mr-1 w-4" />- {`${t('Delete')} (${selectedRows.length})`}- </Button>+ <ConfirmationDeleteDialog+ title={t('Delete Projects')}+ message={+ <>+ {t(+ 'The selected projects and all their data will be permanently deleted.',+ )}+ {selectedDefaultProjects.length > 0 && (+ <span className="block pt-2">+ {t('skippedDefaultProjects', {+ count: selectedDefaultProjects.length,+ names: selectedDefaultProjects+ .map((row) => row.displayName)+ .join(', '),+ })}{' '}+ <Link+ to="/platform/users/roles"+ className="whitespace-nowrap font-medium text-accent-11 hover:underline"+ >+ {t('Go to Roles & Access')}+ </Link>+ </span>+ )}+ </>+ }+ entityName={t('Projects')}+ buttonText={t('deleteProjectsCount', {+ count: deletableProjects.length,+ })}+ controlId={AdminControl.PROJECTS_DELETE_CONFIRM}+ mutationFn={async () => {+ projectCollectionUtils.delete(+ deletableProjects.map((row) => row.id),+ );+ resetSelection();+ setSelectedRows([]);+ }}+ onError={(error) => {+ toast.error(t('Error'), {+ description: errorToastMessage(error),+ duration: 3000,+ });+ }}+ >+ {selectedRows.length > 0 && (+ <Button+ variant="ghost"+ size="sm"+ className="text-danger-11 hover:text-danger-11"+ disabled={deletableProjects.length === 0}+ {...adminControl(AdminControl.PROJECTS_DELETE_OPEN)}+ >+ <Trash className="mr-1 w-4" />+ {`${t('Delete')} (${selectedRows.length})`}+ </Button>+ )}+ </ConfirmationDeleteDialog>+ </span>+ </TooltipTrigger>+ {onlyDefaultProjectsBlockDelete && (+ <TooltipContent>+ {t(+ "Default projects can't be deleted. Remove them from default projects first.",+ )}+ </TooltipContent>)}- </ConfirmationDeleteDialog>+ </Tooltip></div>);},},],- [selectedRows, currentProject],+ [selectedRows, currentProject, defaultProjectIds],);const errorToastMessage = (error: unknown): string | undefined => {diff --git a/packages/web/src/app/routes/platform/sample-data.ts b/packages/web/src/app/routes/platform/sample-data.tsindex 4da0ee0b909..b00e90d9a27 100644--- a/packages/web/src/app/routes/platform/sample-data.ts+++ b/packages/web/src/app/routes/platform/sample-data.ts@@ -105,6 +105,16 @@ function projectRoles(): ProjectRole[] {}));}+function defaultProjects(): SampleDefaultProject[] {+ return [+ { displayName: 'Company Wide', memberCount: 41 },+ { displayName: 'Revenue Ops', memberCount: 12 },+ ].map((entry, index) => ({+ id: `sample-default-project-${index}`,+ ...entry,+ }));+}+function eventDestinations(): EventDestination[] {return [{@@ -224,6 +234,13 @@ export const sampleData = {auditEventsPage: () => toPage(auditEvents()),globalConnectionsPage: () => toPage(globalConnections()),projectRolesPage: () => toPage(projectRoles()),+ defaultProjects,eventDestinations,secretManagers,};++export type SampleDefaultProject = {+ id: string;+ displayName: string;+ memberCount: number;+};diff --git a/packages/web/src/app/routes/platform/security/project-role/add-default-projects-dialog.tsx b/packages/web/src/app/routes/platform/security/project-role/add-default-projects-dialog.tsxnew file mode 100644index 00000000000..30f679304ef--- /dev/null+++ b/packages/web/src/app/routes/platform/security/project-role/add-default-projects-dialog.tsx@@ -0,0 +1,250 @@+import { ProjectWithLimits } from '@activepieces/shared';+import { zodResolver } from '@hookform/resolvers/zod';+import { t } from 'i18next';+import { Search } from 'lucide-react';+import { useState } from 'react';+import { useForm } from 'react-hook-form';+import { z } from 'zod';++import { ConfirmationDeleteDialog } from '@/components/custom/delete-dialog';+import { TextWithTooltip } from '@/components/custom/text-with-tooltip';+import { Button } from '@/components/ui/button';+import { Checkbox } from '@/components/ui/checkbox';+import {+ Dialog,+ DialogContent,+ DialogDescription,+ DialogFooter,+ DialogHeader,+ DialogTitle,+} from '@/components/ui/dialog';+import { Form, FormField, FormItem, FormMessage } from '@/components/ui/form';+import { Input } from '@/components/ui/input';+import { ScrollArea } from '@/components/ui/scroll-area';+import { api } from '@/lib/api';++export function AddDefaultProjectsDialog({+ open,+ onOpenChange,+ teamProjects,+ defaultProjectIds,+ isSaving,+ onSave,+}: AddDefaultProjectsDialogProps) {+ return (+ <Dialog open={open} onOpenChange={onOpenChange}>+ <DialogContent className="max-w-lg">+ <AddDefaultProjectsContent+ key={open ? 'open' : 'closed'}+ teamProjects={teamProjects}+ defaultProjectIds={defaultProjectIds}+ isSaving={isSaving}+ onSave={onSave}+ onCancel={() => onOpenChange(false)}+ />+ </DialogContent>+ </Dialog>+ );+}++function AddDefaultProjectsContent({+ teamProjects,+ defaultProjectIds,+ isSaving,+ onSave,+ onCancel,+}: AddDefaultProjectsContentProps) {+ const form = useForm<DefaultProjectsFormValues>({+ defaultValues: { projectIds: defaultProjectIds },+ resolver: zodResolver(defaultProjectsFormSchema),+ });+ const [search, setSearch] = useState('');+ const [isConfirmOpen, setIsConfirmOpen] = useState(false);++ const projectIds = form.watch('projectIds');+ const query = search.trim();+ const filteredProjects = teamProjects.filter((project) =>+ project.displayName.toLowerCase().includes(query.toLowerCase()),+ );+ const hasExistingDefaults = defaultProjectIds.length > 0;++ const selectedIds = teamProjects+ .map((project) => project.id)+ .filter((id) => projectIds.includes(id));+ const removedProjects = teamProjects.filter(+ (project) =>+ defaultProjectIds.includes(project.id) &&+ !projectIds.includes(project.id),+ );++ const showServerError = (error: unknown) => {+ form.setError('root.serverError', {+ type: 'manual',+ message:+ api.serverErrorMessage(error) ??+ t('Failed to save changes. Please try again.'),+ });+ };++ const submit = form.handleSubmit(async () => {+ if (removedProjects.length > 0) {+ setIsConfirmOpen(true);+ return;+ }+ await onSave(selectedIds).catch(showServerError);+ });++ return (+ <Form {...form}>+ <div className="flex flex-col gap-4">+ <DialogHeader>+ <DialogTitle>{t('Add default projects')}</DialogTitle>+ <DialogDescription>+ {t(+ "New Members join these as Editors. People already on the platform aren't added.",+ )}+ </DialogDescription>+ </DialogHeader>++ <div className="flex flex-col gap-3">+ <div className="relative">+ <Search className="absolute left-2.5 top-1/2 size-4 -translate-y-1/2 text-gray-11" />+ <Input+ className="pl-8"+ placeholder={t('Search projects')}+ value={search}+ onChange={(event) => setSearch(event.target.value)}+ />+ </div>++ <FormField+ control={form.control}+ name="projectIds"+ render={({ field }) => (+ <FormItem>+ <ScrollArea className="h-64">+ <div>+ {filteredProjects.length === 0 && (+ <p className="py-8 text-center text-sm text-gray-11">+ {query.length > 0+ ? t('No projects match "{search}"', { search: query })+ : t(+ 'No team projects yet. Create one on the Projects page.',+ )}+ </p>+ )}+ {filteredProjects.map((project) => {+ const isChecked = field.value.includes(project.id);+ const toggleProject = () =>+ field.onChange(+ isChecked+ ? field.value.filter((id) => id !== project.id)+ : [...field.value, project.id],+ );+ return (+ <button+ key={project.id}+ type="button"+ className="flex w-full cursor-pointer items-center gap-3 rounded-md px-2 py-2 text-left hover:bg-gray-3"+ onClick={toggleProject}+ >+ <Checkbox+ checked={isChecked}+ onCheckedChange={toggleProject}+ onClick={(event) => event.stopPropagation()}+ />+ <TextWithTooltip tooltipMessage={project.displayName}>+ <span className="min-w-0 flex-1 truncate text-sm font-medium">+ {project.displayName}+ </span>+ </TextWithTooltip>+ <span className="ml-auto shrink-0 text-xs text-gray-11">+ {t('projectMemberCount', {+ count: project.analytics.totalUsers,+ })}+ </span>+ </button>+ );+ })}+ </div>+ </ScrollArea>+ <FormMessage />+ </FormItem>+ )}+ />+ {form.formState.errors.root?.serverError && (+ <FormMessage>+ {form.formState.errors.root.serverError.message}+ </FormMessage>+ )}+ </div>++ <DialogFooter className="sm:justify-between">+ <span className="self-center text-sm text-gray-11">+ {t('{count} selected', { count: selectedIds.length })}+ </span>+ <div className="flex gap-2">+ <Button type="button" variant="outline" onClick={onCancel}>+ {t('Cancel')}+ </Button>+ <Button+ type="button"+ loading={isSaving}+ disabled={selectedIds.length === 0 && !hasExistingDefaults}+ onClick={submit}+ >+ {hasExistingDefaults+ ? t('Save')+ : t('addDefaultProjectsCount', { count: selectedIds.length })}+ </Button>+ </div>+ </DialogFooter>+ <ConfirmationDeleteDialog+ open={isConfirmOpen}+ onOpenChange={setIsConfirmOpen}+ title={t('removeDefaultProjectsTitle', {+ count: removedProjects.length,+ })}+ message={t('removeDefaultProjectsMessage', {+ count: removedProjects.length,+ projects: removedProjects+ .map((project) => project.displayName)+ .join(', '),+ })}+ entityName={t('Default projects')}+ buttonText={t('Remove')}+ mutationFn={() => onSave(selectedIds)}+ onError={(error) => {+ setIsConfirmOpen(false);+ showServerError(error);+ }}+ />+ </div>+ </Form>+ );+}++const defaultProjectsFormSchema = z.object({+ projectIds: z.array(z.string()),+});++type AddDefaultProjectsDialogProps = {+ open: boolean;+ onOpenChange: (open: boolean) => void;+ teamProjects: TeamProject[];+ defaultProjectIds: string[];+ isSaving: boolean;+ onSave: (defaultProjectIds: string[]) => Promise<void>;+};++type AddDefaultProjectsContentProps = {+ teamProjects: TeamProject[];+ defaultProjectIds: string[];+ isSaving: boolean;+ onSave: (defaultProjectIds: string[]) => Promise<void>;+ onCancel: () => void;+};++type TeamProject = Pick<ProjectWithLimits, 'id' | 'displayName' | 'analytics'>;++type DefaultProjectsFormValues = z.infer<typeof defaultProjectsFormSchema>;diff --git a/packages/web/src/app/routes/platform/security/project-role/default-projects-section.tsx b/packages/web/src/app/routes/platform/security/project-role/default-projects-section.tsxnew file mode 100644index 00000000000..951b9d7bade--- /dev/null+++ b/packages/web/src/app/routes/platform/security/project-role/default-projects-section.tsx@@ -0,0 +1,216 @@+import { ProjectType } from '@activepieces/shared';+import { t } from 'i18next';+import { X } from 'lucide-react';+import { useState } from 'react';++import { AnimatedIconButton } from '@/components/custom/animated-icon-button';+import { ConfirmationDeleteDialog } from '@/components/custom/delete-dialog';+import { TextWithTooltip } from '@/components/custom/text-with-tooltip';+import { PlusIcon } from '@/components/icons/plus';+import { Button } from '@/components/ui/button';+import {+ Item,+ ItemContent,+ ItemDescription,+ ItemTitle,+} from '@/components/ui/item';+import { internalErrorToast } from '@/components/ui/sonner';+import { PLATFORM_FEATURES, useFeatureGate } from '@/features/billing';+import { projectCollectionUtils } from '@/features/projects/stores/project-collection';+import { platformHooks } from '@/hooks/platform-hooks';++import { sampleData } from '../../sample-data';++import { AddDefaultProjectsDialog } from './add-default-projects-dialog';++export function DefaultProjectsSection() {+ const { platform } = platformHooks.useCurrentPlatform();+ const { data: teamProjects } = projectCollectionUtils.useAllPlatformProjects({+ type: [ProjectType.TEAM],+ });+ const [isDialogOpen, setIsDialogOpen] = useState(false);+ const [showsAll, setShowsAll] = useState(false);+ const gate = useFeatureGate({+ locked: !platform.plan.projectRolesEnabled,+ feature: PLATFORM_FEATURES.projectRoles,+ });++ const { mutateAsync: setDefaultProjects, isPending } =+ projectCollectionUtils.useSetDefaultProjects();++ const saveDefaultProjects = async (selectedIds: string[]) => {+ await setDefaultProjects({+ add: selectedIds.filter((id) => !platform.defaultProjectIds.includes(id)),+ remove: platform.defaultProjectIds.filter(+ (id) => !selectedIds.includes(id),+ ),+ });+ setIsDialogOpen(false);+ };++ const defaultProjects: DefaultProject[] = gate.locked+ ? sampleData.defaultProjects()+ : teamProjects+ .filter((project) => platform.defaultProjectIds.includes(project.id))+ .map((project) => ({+ id: project.id,+ displayName: project.displayName,+ memberCount: project.analytics.totalUsers,+ }));+ const visibleProjects = showsAll+ ? defaultProjects+ : defaultProjects.slice(0, VISIBLE_PROJECT_LIMIT);+ const hiddenCount = defaultProjects.length - visibleProjects.length;++ const openDialog = () => {+ if (gate.locked) {+ gate.open();+ return;+ }+ setIsDialogOpen(true);+ };++ const removeDefaultProject = async (projectId: string) => {+ await setDefaultProjects({ add: [], remove: [projectId] });+ };++ return (+ <section className="flex flex-col gap-4">+ <div className="flex items-end justify-between gap-4">+ <div className="flex min-w-0 flex-col gap-1">+ <h2 className="text-base font-medium">{t('Default projects')}</h2>+ <p className="max-w-2xl text-sm text-gray-11">+ {t('New Members join these as Editors.')}+ </p>+ </div>+ <AnimatedIconButton+ icon={PlusIcon}+ iconSize={16}+ size="sm"+ className="shrink-0"+ onClick={openDialog}+ >+ {gate.crown}+ {t('Add project')}+ </AnimatedIconButton>+ </div>+ {defaultProjects.length === 0 ? (+ <Item variant="outline" size="sm" className="bg-panel">+ <ItemContent>+ <ItemTitle>{t('No default projects yet')}</ItemTitle>+ <ItemDescription>+ {t('New Members will join it as an Editor.')}+ </ItemDescription>+ </ItemContent>+ </Item>+ ) : (+ <div className="flex flex-col gap-3">+ <ul className="divide-y rounded-lg border bg-panel">+ {visibleProjects.map((project) => (+ <li+ key={project.id}+ className="flex h-11 items-center gap-3 pl-4 pr-2 text-sm"+ >+ <TextWithTooltip tooltipMessage={project.displayName}>+ <span className="min-w-0 flex-1 leading-snug font-medium">+ {project.displayName}+ </span>+ </TextWithTooltip>+ <span className="ml-auto shrink-0 tabular-nums text-gray-11">+ {t('projectMemberCount', { count: project.memberCount })}+ </span>+ <span className="flex w-8 shrink-0 justify-center">+ {gate.locked ? (+ removeIconButton({+ projectName: project.displayName,+ onClick: gate.open,+ })+ ) : (+ <RemoveDefaultProjectButton+ projectName={project.displayName}+ onRemove={() => removeDefaultProject(project.id)}+ />+ )}+ </span>+ </li>+ ))}+ </ul>+ {hiddenCount > 0 && (+ <Button+ variant="link"+ size="sm"+ className="w-fit"+ onClick={() => setShowsAll(true)}+ >+ {t('showAllDefaultProjects', { count: defaultProjects.length })}+ </Button>+ )}+ </div>+ )}+ <AddDefaultProjectsDialog+ open={isDialogOpen}+ onOpenChange={setIsDialogOpen}+ teamProjects={teamProjects}+ defaultProjectIds={platform.defaultProjectIds}+ isSaving={isPending}+ onSave={saveDefaultProjects}+ />+ {gate.dialog}+ </section>+ );+}++function RemoveDefaultProjectButton({+ projectName,+ onRemove,+}: RemoveDefaultProjectButtonProps) {+ return (+ <ConfirmationDeleteDialog+ title={t('Remove {project} from default projects?', {+ project: projectName,+ })}+ message={t(+ "New members won't join {project} anymore. Current members keep their access.",+ { project: projectName },+ )}+ entityName={projectName}+ buttonText={t('Remove')}+ mutationFn={onRemove}+ onError={() => internalErrorToast()}+ >+ {removeIconButton({ projectName })}+ </ConfirmationDeleteDialog>+ );+}++function removeIconButton({ projectName, onClick }: RemoveIconButtonParams) {+ return (+ <Button+ variant="ghost"+ size="icon-sm"+ className="text-gray-11"+ aria-label={t('Remove {project}', { project: projectName })}+ onClick={onClick}+ >+ <X className="size-4" />+ </Button>+ );+}++const VISIBLE_PROJECT_LIMIT = 5;++type RemoveIconButtonParams = {+ projectName: string;+ onClick?: () => void;+};++type RemoveDefaultProjectButtonProps = {+ projectName: string;+ onRemove: () => Promise<void>;+};++type DefaultProject = {+ id: string;+ displayName: string;+ memberCount: number;+};diff --git a/packages/web/src/app/routes/platform/security/project-role/index.tsx b/packages/web/src/app/routes/platform/security/project-role/index.tsxindex 2b7e59c449c..2bfe4f1ce02 100644--- a/packages/web/src/app/routes/platform/security/project-role/index.tsx+++ b/packages/web/src/app/routes/platform/security/project-role/index.tsx@@ -10,6 +10,7 @@ import { platformHooks } from '@/hooks/platform-hooks';import { sampleData } from '../../sample-data';+import { DefaultProjectsSection } from './default-projects-section';import { RolesCard } from './roles-card';const ProjectRolePage = () => {@@ -24,9 +25,7 @@ const ProjectRolePage = () => {<AdminPage width="content"><AdminPageHeadertitle={t('Roles & Access')}- description={t(- 'Create roles and control what members can do in each project',- )}+ description={t('Manage roles and where new members land')}resources={adminPageResources.roles}/><RolesCard@@ -35,6 +34,7 @@ const ProjectRolePage = () => {isError={isSample ? false : isError}refetch={refetch}/>+ <DefaultProjectsSection /></AdminPage>);};diff --git a/packages/web/src/features/projects/stores/project-collection.ts b/packages/web/src/features/projects/stores/project-collection.tsindex 377e7e012a2..28af143c746 100644--- a/packages/web/src/features/projects/stores/project-collection.ts+++ b/packages/web/src/features/projects/stores/project-collection.ts@@ -1,4 +1,4 @@-import { isNil, SeekPage } from '@activepieces/core-utils';+import { isNil, omit, SeekPage } from '@activepieces/core-utils';import {CreatePlatformProjectRequest,ListProjectRequestForPlatformQueryParams,@@ -16,7 +16,12 @@ import {or,useLiveSuspenseQuery,} from '@tanstack/react-db';-import { QueryClient, useMutation, useQuery } from '@tanstack/react-query';+import {+ QueryClient,+ useMutation,+ useQuery,+ useQueryClient,+} from '@tanstack/react-query';import { useEffect } from 'react';import { useLocation } from 'react-router-dom';@@ -45,7 +50,7 @@ export const projectCollection = createCollection<ProjectWithLimits, string>(onUpdate: async ({ transaction }) => {for (const { original, modified } of transaction.mutations) {const request: UpdateProjectPlatformRequest = {- ...modified,+ ...omit(modified, ['isDefault']),metadata: modified.metadata ?? undefined,externalId: modified.externalId?.trim() || undefined,};@@ -126,6 +131,27 @@ export const projectCollectionUtils = {onError,});},+ useSetDefaultProjects: () => {+ const queryClient = useQueryClient();+ return useMutation({+ mutationFn: async ({ add, remove }: SetDefaultProjectsRequest) => {+ const results = await Promise.allSettled([+ ...add.map((projectId) =>+ api.post(`/v1/projects/${projectId}`, { isDefault: true }),+ ),+ ...remove.map((projectId) =>+ api.post(`/v1/projects/${projectId}`, { isDefault: false }),+ ),+ ]);+ await queryClient.invalidateQueries({ queryKey: ['platform'] });+ const failure = results.find((result) => result.status === 'rejected');+ if (failure?.status === 'rejected') {+ throw failure.reason;+ }+ },+ onError: () => undefined,+ });+ },update: (projectId: string, request: UpdateProjectPlatformRequest) => {return projectCollection.update(projectId, (draft) => {Object.assign(@@ -313,3 +339,8 @@ export const projectHooks = {}, [projectId, embedState.isEmbedded, location.pathname]);},};++type SetDefaultProjectsRequest = {+ add: string[];+ remove: string[];+};diff --git a/packages/web/src/features/projects/stores/projects-collection.test.ts b/packages/web/src/features/projects/stores/projects-collection.test.tsindex 79d2b906077..18290f54e6e 100644--- a/packages/web/src/features/projects/stores/projects-collection.test.ts+++ b/packages/web/src/features/projects/stores/projects-collection.test.ts@@ -57,6 +57,7 @@ function makeProject(notifyFlowOwnerOnFailure: false,metadata: null,sensitive: false,+ isDefault: false,plan: {id: `plan${id}`,created: '2024-01-01T00:00:00.000Z',diff --git a/packages/web/src/hooks/platform-hooks.ts b/packages/web/src/hooks/platform-hooks.tsindex 3c747ed7d71..bc7233120b7 100644--- a/packages/web/src/hooks/platform-hooks.ts+++ b/packages/web/src/hooks/platform-hooks.ts@@ -1,5 +1,5 @@import { isNil } from '@activepieces/core-utils';-import { PlatformWithoutSensitiveData } from '@activepieces/shared';+import { PlatformResponse } from '@activepieces/shared';import {QueryClient,useMutation,@@ -44,7 +44,7 @@ export const platformHooks = {},setCurrentPlatform: (queryClient: QueryClient,- platform: PlatformWithoutSensitiveData,+ platform: PlatformResponse,) => {queryClient.setQueryData(['platform', currentPlatformId], platform);},diff --git a/packages/web/test/app/components/project-settings/form-defaults.test.ts b/packages/web/test/app/components/project-settings/form-defaults.test.tsindex cffaba4bf95..4fc112f23c9 100644--- a/packages/web/test/app/components/project-settings/form-defaults.test.ts+++ b/packages/web/test/app/components/project-settings/form-defaults.test.ts@@ -22,6 +22,7 @@ function makeProject(notifyFlowOwnerOnFailure: false,metadata: null,sensitive: false,+ isDefault: false,plan: {id: 'plan1',created: '2024-01-01T00:00:00.000Z',