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): nobody can be removed from their last project (#15975)
lina-alomari1b6f4dc04dfd
diff --git a/brain/knowledge/platform-editions-ee/ee-projects-rbac.md b/brain/knowledge/platform-editions-ee/ee-projects-rbac.mdindex a7505bee25b..1964bdf7c19 100644--- a/brain/knowledge/platform-editions-ee/ee-projects-rbac.md+++ b/brain/knowledge/platform-editions-ee/ee-projects-rbac.md@@ -23,6 +23,7 @@ Note it lives under `ee/authentication/`, not `ee/projects/`, which is where mos- **Git Sync**: SSH repo URL + branch + folder path; push exports published flows/tables, pull imports as a release source; individual-item push supported.### Gotchas+- **A Member can't be removed from their last project** from the members table: `removeFromProject` refuses with `LAST_PROJECT` (409) when it's their only project on the platform, counting a personal project. Admins and Operators are never blocked, since they see every project. SCIM group changes call `projectMemberService.delete` and are deliberately not guarded, so the identity provider stays the source of truth. API-key calls skip the guard too (`enforceLastProjectGuard`, and the members list's `isLastProject` flag, are only set for a USER principal): embedding customers remove users through the API, and an embedded user is almost always in exactly one project, so the guard would break their offboarding. The no-projects screen is the fallback.- **`rbacMiddleware` only covers HTTP routes. Websocket events bypass it.** A socket is authorized once at connect, against the project it claims in the handshake. After that, every resource id arriving in an event payload is just whatever the client typed, and nothing re-checks it. So a socket handler must look the resource up scoped to the connection's project and check the permission itself. Getting this wrong is how `LOCK_RESOURCE` and `JOIN_PRESENCE` shipped letting any member lock, and read the editors of, another project's flows and tables (SRE-218). `collaborative-resource.ts` has the shape to copy.- **A new `Permission` needs a row in the role grid, or custom roles can never grant it.** The resource-to-permission mapping is a hardcoded array, `groups()` in `packages/web/src/features/members/lib/role-permissions.ts` (it lived inline in `project-role-dialog.tsx` as `initialPermissions` until the Roles & access rebuild), and the grid is a plain `.map()` over it. Default-role grants are hardcoded separately in `access-control-list.ts`, so a permission added there but not here is invisible: ADMIN/EDITOR/VIEWER have it, custom roles cannot be given it, and the feature's tab just never appears for those members. This has already shipped three times — Variables + Knowledge Base (GIT-1751), then Agents, and `PUBLISH_SENSITIVE_FLOW_ACCESS` is missing right now: the grid is **29 of the 30 `Permission` values**, which is why its counter reads "N of 29", and flow-approval rights stay Admin-only. `packages/web/test/features/members/lib/role-permissions.test.ts` now catches the drift — it asserts `PUBLISH_SENSITIVE_FLOW_ACCESS` is the *only* `Permission` absent from the grid, so adding an enum value without a row fails that test.- **The release diff and the release apply have to share one rule, or a field becomes either invisible or permanently dirty.** `flowDiffService` decides whether a flow changed by comparing a `normalize()`d copy of each side, and `projectStateHelper.updateFlowInProject` decides what actually gets written — two places, and for connection auth they disagreed both ways. `normalize()` blanked `input.auth` before comparing, so re-pointing a step at a different connection and changing nothing else was reported `flowsUnchanged` and never applied, while the connection the release created sat unreferenced at status `MISSING`; and when some other edit did make the diff fire, the apply unconditionally restored the destination's old auth on top of the incoming one (`f196530db6`, Jul 2024 secret preservation that predates externalId placeholders). Patching the two sites separately is the trap: it leaves a destination-has-auth / incoming-has-none step reporting changed on **every** apply forever, because the diff and the apply then hold different ideas of what unchanged means. The fix (GIT-1764) is one exported `mergeDestinationAuth` that both call, so the diff compares the merged incoming version — exactly what apply is about to write. Any future field with "keep the destination's value" semantics wants the same shape. Worth knowing while reading this code: `flowStructureUtil.transferFlow` deep-clones before the callback runs, so mutating `step` inside it never touches the caller's state; connection references persist as the literal `{{connections['<externalId>']}}`, identical in both projects, which is why comparing them across instances is meaningful at all; and `flowVersionService` recomputes `connectionIds` via `extractConnectionIds` on every mutation, so the version tracks the new reference without anyone updating it by hand.diff --git a/packages/core/shared/package.json b/packages/core/shared/package.jsonindex 386f32c7984..cacb722049a 100644--- a/packages/core/shared/package.json+++ b/packages/core/shared/package.json@@ -1,6 +1,6 @@{"name": "@activepieces/shared",- "version": "0.210.4",+ "version": "0.210.5","type": "commonjs","sideEffects": false,"main": "./dist/src/index.js",diff --git a/packages/core/shared/src/lib/ee/project-members/project-member.ts b/packages/core/shared/src/lib/ee/project-members/project-member.tsindex 9f5903925e1..c048870851f 100644--- a/packages/core/shared/src/lib/ee/project-members/project-member.ts+++ b/packages/core/shared/src/lib/ee/project-members/project-member.ts@@ -19,6 +19,7 @@ export const ProjectMemberWithUser = ProjectMember.extend({user: UserWithMetaInformation,projectRole: ProjectRole,project: ProjectMetaData,+ isLastProject: z.boolean().optional(),})export type ProjectMemberWithUser = z.infer<typeof ProjectMemberWithUser>diff --git a/packages/core/utils/package.json b/packages/core/utils/package.jsonindex bc584f10393..491ab9503d7 100644--- a/packages/core/utils/package.json+++ b/packages/core/utils/package.json@@ -1,6 +1,6 @@{"name": "@activepieces/core-utils",- "version": "0.10.5",+ "version": "0.10.6","type": "commonjs","main": "./dist/src/index.js","scripts": {diff --git a/packages/core/utils/src/lib/activepieces-error.ts b/packages/core/utils/src/lib/activepieces-error.tsindex da32ea74c76..48ab6f15ffa 100644--- a/packages/core/utils/src/lib/activepieces-error.ts+++ b/packages/core/utils/src/lib/activepieces-error.ts@@ -45,6 +45,7 @@ export type ApErrorParams =| QuotaExceededParams| FeatureDisabledErrorParams| SignUpDisabledParams+ | LastProjectParams| SystemInvalidErrorParams| SystemPropNotDefinedErrorParams| TestTriggerFailedErrorParams@@ -453,6 +454,11 @@ ErrorCode.SIGN_UP_DISABLED,Record<string, never>>+export type LastProjectParams = BaseErrorParams<+ErrorCode.LAST_PROJECT,+Record<string, never>+>+export type AuthenticationParams = BaseErrorParams<ErrorCode.AUTHENTICATION,{@@ -632,6 +638,7 @@ export enum ErrorCode {FEATURE_DISABLED = 'FEATURE_DISABLED',AI_CREDIT_LIMIT_EXCEEDED = 'AI_CREDIT_LIMIT_EXCEEDED',SIGN_UP_DISABLED = 'SIGN_UP_DISABLED',+ LAST_PROJECT = 'LAST_PROJECT',SYSTEM_PROP_INVALID = 'SYSTEM_PROP_INVALID',SYSTEM_PROP_NOT_DEFINED = 'SYSTEM_PROP_NOT_DEFINED',TEST_TRIGGER_FAILED = 'TEST_TRIGGER_FAILED',diff --git a/packages/server/api/src/app/ee/projects/project-members/project-member.controller.ts b/packages/server/api/src/app/ee/projects/project-members/project-member.controller.tsindex b2772746581..00317681ed3 100644--- a/packages/server/api/src/app/ee/projects/project-members/project-member.controller.ts+++ b/packages/server/api/src/app/ee/projects/project-members/project-member.controller.ts@@ -28,6 +28,7 @@ export const projectMemberController: FastifyPluginAsyncZod = async (cursorRequest: request.query.cursor ?? null,limit: request.query.limit ?? DEFAULT_LIMIT_SIZE,projectRoleId: request.query.projectRoleId ?? undefined,+ includeLastProject: request.principal.type === PrincipalType.USER,})})@@ -44,10 +45,11 @@ export const projectMemberController: FastifyPluginAsyncZod = async (app.delete('/:id', DeleteProjectMemberRequest, async (request, reply) => {- await projectMemberService(request.log).delete(- request.projectId,- request.params.id,- )+ await projectMemberService(request.log).removeFromProject({+ projectId: request.projectId,+ memberId: request.params.id,+ enforceLastProjectGuard: request.principal.type === PrincipalType.USER,+ })await reply.status(StatusCodes.NO_CONTENT).send()})}diff --git a/packages/server/api/src/app/ee/projects/project-members/project-member.service.ts b/packages/server/api/src/app/ee/projects/project-members/project-member.service.tsindex f6cd05ac29b..29c992702b4 100644--- a/packages/server/api/src/app/ee/projects/project-members/project-member.service.ts+++ b/packages/server/api/src/app/ee/projects/project-members/project-member.service.ts@@ -4,6 +4,7 @@ import dayjs from 'dayjs'import { FastifyBaseLogger } from 'fastify'import { EntityManager, Equal, In } from 'typeorm'import { repoFactory } from '../../../core/db/repo-factory'+import { distributedLock } from '../../../database/redis-connections'import { buildPaginator } from '../../../helper/pagination/build-paginator'import { paginationHelper } from '../../../helper/pagination/pagination-utils'import { system } from '../../../helper/system/system'@@ -94,6 +95,7 @@ export const projectMemberService = (log: FastifyBaseLogger) => ({cursorRequest,limit,projectRoleId,+ includeLastProject = false,}: ListParams,): Promise<SeekPage<ProjectMemberWithUser>> {const decodedCursor = paginationHelper.decodeCursor(cursorRequest)@@ -127,9 +129,20 @@ export const projectMemberService = (log: FastifyBaseLogger) => ({}const { data, cursor } = await paginator.paginate(queryBuilder)- const enrichedData = data+ const members = data.map(toProjectMemberWithUser).filter((member): member is ProjectMemberWithUser => !isNil(member))+ if (!includeLastProject) {+ return paginationHelper.createPage<ProjectMemberWithUser>(members, cursor)+ }+ const memberUserIds = members+ .filter((member) => isGuardedUser(member.user))+ .map((member) => member.userId)+ const projectCounts = await countProjectsOfUsers({ userIds: memberUserIds, platformId })+ const enrichedData = members.map((member) => ({+ ...member,+ isLastProject: isGuardedUser(member.user) && (projectCounts.get(member.userId) ?? 0) <= 1,+ }))return paginationHelper.createPage<ProjectMemberWithUser>(enrichedData, cursor)},async getRole({@@ -215,6 +228,26 @@ export const projectMemberService = (log: FastifyBaseLogger) => ({})return members.map((member) => member.projectId)},+ async removeFromProject({ projectId, memberId, enforceLastProjectGuard }: RemoveFromProjectParams): Promise<void> {+ const member = await repo().findOneBy({ projectId, id: memberId })+ if (isNil(member)) {+ return+ }+ await distributedLock(log).runExclusive({+ key: `project-member-removal-${member.userId}`,+ timeoutInSeconds: 30,+ fn: async () => {+ const currentMember = await repo().findOneBy({ projectId, id: memberId })+ if (isNil(currentMember)) {+ return+ }+ if (enforceLastProjectGuard) {+ await assertMemberKeepsAProject({ member: currentMember, log })+ }+ await repo().delete({ projectId, id: memberId })+ },+ })+ },async delete(projectId: ProjectId,invitationId: ProjectMemberId,@@ -276,12 +309,62 @@ export const projectMemberService = (log: FastifyBaseLogger) => ({},})+function isGuardedUser({ platformRole, status }: { platformRole: PlatformRole, status: UserStatus }): boolean {+ return platformRole === PlatformRole.MEMBER && status === UserStatus.ACTIVE+}++async function assertMemberKeepsAProject({ member, log }: AssertMemberKeepsAProjectParams): Promise<void> {+ const user = await userService(log).getOneOrFail({ id: member.userId })+ if (!isGuardedUser(user)) {+ return+ }+ const projectCounts = await countProjectsOfUsers({ userIds: [member.userId], platformId: member.platformId })+ if ((projectCounts.get(member.userId) ?? 0) <= 1) {+ throw new ActivepiecesError({+ code: ErrorCode.LAST_PROJECT,+ params: {},+ })+ }+}++async function countProjectsOfUsers({ userIds, platformId }: CountProjectsOfUsersParams): Promise<Map<UserId, number>> {+ if (userIds.length === 0) {+ return new Map()+ }+ const [memberships, personalProjects] = await Promise.all([+ repo()+ .createQueryBuilder('project_member')+ .innerJoin('project', 'project', 'project.id = project_member."projectId" AND project.deleted IS NULL')+ .select('project_member."userId"', 'userId')+ .addSelect('COUNT(*)', 'count')+ .where('project_member."userId" IN (:...userIds)', { userIds })+ .andWhere('project_member."platformId" = :platformId', { platformId })+ .groupBy('project_member."userId"')+ .getRawMany<{ userId: UserId, count: string }>(),+ projectRepo()+ .createQueryBuilder('project')+ .select('project."ownerId"', 'userId')+ .addSelect('COUNT(*)', 'count')+ .where('project."ownerId" IN (:...userIds)', { userIds })+ .andWhere('project."platformId" = :platformId', { platformId })+ .andWhere('project.type = :type', { type: ProjectType.PERSONAL })+ .groupBy('project."ownerId"')+ .getRawMany<{ userId: UserId, count: string }>(),+ ])+ const counts = new Map<UserId, number>()+ for (const row of [...memberships, ...personalProjects]) {+ counts.set(row.userId, (counts.get(row.userId) ?? 0) + Number(row.count))+ }+ return counts+}+type ListParams = {platformId: PlatformIdprojectId?: ProjectIdcursorRequest: Cursor | nulllimit: numberprojectRoleId?: string+ includeLastProject?: boolean}type GetIdsOfProjectsParams = {@@ -304,6 +387,22 @@ type AddToTeamProjectsParams = {entityManager?: EntityManager}+type RemoveFromProjectParams = {+ projectId: ProjectId+ memberId: ProjectMemberId+ enforceLastProjectGuard: boolean+}++type CountProjectsOfUsersParams = {+ userIds: UserId[]+ platformId: PlatformId+}++type AssertMemberKeepsAProjectParams = {+ member: ProjectMemberSchema+ log: FastifyBaseLogger+}+type NewProjectMember = Omit<ProjectMember, 'created' | 'projectRole'>diff --git a/packages/server/api/src/app/helper/error-handler.ts b/packages/server/api/src/app/helper/error-handler.tsindex bd68c9ecc1d..ddae352e242 100644--- a/packages/server/api/src/app/helper/error-handler.ts+++ b/packages/server/api/src/app/helper/error-handler.ts@@ -103,6 +103,7 @@ const statusCodeMap: Partial<Record<ErrorCode, StatusCodes>> = {[ErrorCode.FLOW_OPERATION_IN_PROGRESS]: StatusCodes.CONFLICT,[ErrorCode.AUTHORIZATION]: StatusCodes.FORBIDDEN,[ErrorCode.SIGN_UP_DISABLED]: StatusCodes.FORBIDDEN,+ [ErrorCode.LAST_PROJECT]: StatusCodes.CONFLICT,[ErrorCode.PROJECT_EXTERNAL_ID_ALREADY_EXISTS]: StatusCodes.CONFLICT,[ErrorCode.FLOW_EXTERNAL_ID_ALREADY_EXISTS]: StatusCodes.CONFLICT,[ErrorCode.INVALID_CREDENTIALS]: StatusCodes.UNAUTHORIZED,diff --git a/packages/server/api/test/integration/cloud/project-members/project-members.test.ts b/packages/server/api/test/integration/cloud/project-members/project-members.test.tsindex 063d5f35997..a88b7da5811 100644--- a/packages/server/api/test/integration/cloud/project-members/project-members.test.ts+++ b/packages/server/api/test/integration/cloud/project-members/project-members.test.ts@@ -1,5 +1,5 @@import { Permission, ProjectRole, RoleType } from '@activepieces/core-utils'-import { DefaultProjectRole, PlatformRole, PrincipalType, UpdateProjectMemberRoleRequestBody } from '@activepieces/shared'+import { DefaultProjectRole, PlatformRole, PrincipalType, ProjectType, UpdateProjectMemberRoleRequestBody, UserStatus } from '@activepieces/shared'import { FastifyInstance } from 'fastify'import { StatusCodes } from 'http-status-codes'import { generateMockToken } from '../../../helpers/auth'@@ -239,8 +239,10 @@ describe('Project Member API', () => {const projectRole = await db.findOneByOrFail<ProjectRole>('project_role', { name: DefaultProjectRole.ADMIN })+ await savePersonalProject({ userId: mockMember.id, platformId: ctx.platform.id })const mockProjectMember = createMockProjectMember({projectId: ctx.project.id,+ platformId: ctx.platform.id,userId: mockMember.id,projectRoleId: projectRole.id,})@@ -286,12 +288,14 @@ describe('Project Member API', () => {})it('Delete project member from api', async () => {- const { mockApiKey, mockProject, mockMember } = await createBasicEnvironment()+ const { mockApiKey, mockProject, mockMember, mockPlatform } = await createBasicEnvironment()const projectRole = await db.findOneByOrFail<ProjectRole>('project_role', { name: DefaultProjectRole.ADMIN })+ await savePersonalProject({ userId: mockMember.id, platformId: mockPlatform.id })const mockProjectMember = createMockProjectMember({projectId: mockProject.id,+ platformId: mockPlatform.id,userId: mockMember.id,projectRoleId: projectRole.id,})@@ -331,6 +335,166 @@ describe('Project Member API', () => {})})+describe('Removing someone from their last project', () => {+ it('refuses removing a member from the only project they have', async () => {+ const { mockPlatform, mockProject, mockMember, mockOwnerToken } = await createBasicEnvironment()+ const member = await saveMembership({ userId: mockMember.id, projectId: mockProject.id, platformId: mockPlatform.id })++ const response = await removeMembership({ memberId: member.id, token: mockOwnerToken })++ expect(response?.statusCode).toBe(StatusCodes.CONFLICT)+ expect(response?.json().code).toBe('LAST_PROJECT')+ expect(await db.findOneBy('project_member', { id: member.id })).not.toBeNull()+ })++ it('lets an API key remove a member from their only project', async () => {+ const { mockPlatform, mockProject, mockMember, mockApiKey } = await createBasicEnvironment()+ const member = await saveMembership({ userId: mockMember.id, projectId: mockProject.id, platformId: mockPlatform.id })++ const response = await removeMembership({ memberId: member.id, token: mockApiKey.value })++ expect(response?.statusCode).toBe(StatusCodes.NO_CONTENT)+ expect(await db.findOneBy('project_member', { id: member.id })).toBeNull()+ })++ it('removes a member who is also in another team project', async () => {+ const { mockPlatform, mockProject, mockMember, mockOwner, mockOwnerToken } = await createBasicEnvironment()+ const otherProject = createMockProject({ platformId: mockPlatform.id, ownerId: mockOwner.id })+ await db.save('project', otherProject)+ await saveMembership({ userId: mockMember.id, projectId: otherProject.id, platformId: mockPlatform.id })+ const member = await saveMembership({ userId: mockMember.id, projectId: mockProject.id, platformId: mockPlatform.id })++ const response = await removeMembership({ memberId: member.id, token: mockOwnerToken })++ expect(response?.statusCode).toBe(StatusCodes.NO_CONTENT)+ })++ it('still refuses when the only other project is being deleted', async () => {+ const { mockPlatform, mockProject, mockMember, mockOwner, mockOwnerToken } = await createBasicEnvironment()+ const deletedProject = createMockProject({ platformId: mockPlatform.id, ownerId: mockOwner.id })+ await db.save('project', deletedProject)+ await saveMembership({ userId: mockMember.id, projectId: deletedProject.id, platformId: mockPlatform.id })+ await db.update('project', deletedProject.id, { deleted: new Date().toISOString() })+ const member = await saveMembership({ userId: mockMember.id, projectId: mockProject.id, platformId: mockPlatform.id })++ const response = await removeMembership({ memberId: member.id, token: mockOwnerToken })++ expect(response?.statusCode).toBe(StatusCodes.CONFLICT)+ })++ it('still refuses when their personal project is deleted', async () => {+ const { mockPlatform, mockProject, mockMember, mockOwnerToken } = await createBasicEnvironment()+ const personalProject = await savePersonalProject({ userId: mockMember.id, platformId: mockPlatform.id })+ await db.update('project', personalProject.id, { deleted: new Date().toISOString() })+ const member = await saveMembership({ userId: mockMember.id, projectId: mockProject.id, platformId: mockPlatform.id })++ const response = await removeMembership({ memberId: member.id, token: mockOwnerToken })++ expect(response?.statusCode).toBe(StatusCodes.CONFLICT)+ })++ it('removes a deactivated member from their only project', async () => {+ const { mockPlatform, mockProject, mockMember, mockOwnerToken } = await createBasicEnvironment()+ await db.update('user', mockMember.id, { status: UserStatus.INACTIVE })+ const member = await saveMembership({ userId: mockMember.id, projectId: mockProject.id, platformId: mockPlatform.id })++ const response = await removeMembership({ memberId: member.id, token: mockOwnerToken })++ expect(response?.statusCode).toBe(StatusCodes.NO_CONTENT)+ })++ it('removes an operator from their only project, since they see every project anyway', async () => {+ const { mockPlatform, mockProject, mockOwnerToken } = await createBasicEnvironment()+ const { mockUser: operator } = await mockBasicUser({ user: { platformId: mockPlatform.id, platformRole: PlatformRole.OPERATOR } })+ const member = await saveMembership({ userId: operator.id, projectId: mockProject.id, platformId: mockPlatform.id })++ const response = await removeMembership({ memberId: member.id, token: mockOwnerToken })++ expect(response?.statusCode).toBe(StatusCodes.NO_CONTENT)+ })+})++describe('Members list marks who has no other project', () => {+ it('leaves the flag out for an API key, which the guard never stops', async () => {+ const { mockPlatform, mockProject, mockMember, mockApiKey } = await createBasicEnvironment()+ await saveMembership({ userId: mockMember.id, projectId: mockProject.id, platformId: mockPlatform.id })++ const response = await app?.inject({+ method: 'GET',+ url: `/api/v1/project-members?projectId=${mockProject.id}&limit=50`,+ headers: { authorization: `Bearer ${mockApiKey.value}` },+ })++ expect(response?.statusCode).toBe(StatusCodes.OK)+ expect(response?.json().data.every((member: { isLastProject?: boolean }) => member.isLastProject === undefined)).toBe(true)+ })++ it('does not flag a deactivated member, who can still be removed', async () => {+ const { mockPlatform, mockProject, mockMember, mockOwnerToken } = await createBasicEnvironment()+ await db.update('user', mockMember.id, { status: UserStatus.INACTIVE })+ await saveMembership({ userId: mockMember.id, projectId: mockProject.id, platformId: mockPlatform.id })++ const response = await app?.inject({+ method: 'GET',+ url: `/api/v1/project-members?projectId=${mockProject.id}&limit=50`,+ headers: { authorization: `Bearer ${mockOwnerToken}` },+ })++ const flags = Object.fromEntries(response?.json().data.map((member: { userId: string, isLastProject: boolean }) => [member.userId, member.isLastProject]))+ expect(flags[mockMember.id]).toBe(false)+ })++ it('flags a member whose only project this is, and nobody else', async () => {+ const { mockPlatform, mockProject, mockMember, mockOwner, mockOwnerToken } = await createBasicEnvironment()+ const { mockUser: withPersonal } = await mockBasicUser({ user: { platformId: mockPlatform.id, platformRole: PlatformRole.MEMBER } })+ const { mockUser: withOtherTeam } = await mockBasicUser({ user: { platformId: mockPlatform.id, platformRole: PlatformRole.MEMBER } })+ const { mockUser: operator } = await mockBasicUser({ user: { platformId: mockPlatform.id, platformRole: PlatformRole.OPERATOR } })+ await savePersonalProject({ userId: withPersonal.id, platformId: mockPlatform.id })+ const otherProject = createMockProject({ platformId: mockPlatform.id, ownerId: mockOwner.id })+ await db.save('project', otherProject)+ await saveMembership({ userId: withOtherTeam.id, projectId: otherProject.id, platformId: mockPlatform.id })+ for (const userId of [mockMember.id, withPersonal.id, withOtherTeam.id, operator.id]) {+ await saveMembership({ userId, projectId: mockProject.id, platformId: mockPlatform.id })+ }++ const response = await app?.inject({+ method: 'GET',+ url: `/api/v1/project-members?projectId=${mockProject.id}&limit=50`,+ headers: { authorization: `Bearer ${mockOwnerToken}` },+ })++ expect(response?.statusCode).toBe(StatusCodes.OK)+ const flags = Object.fromEntries(response?.json().data.map((member: { userId: string, isLastProject: boolean }) => [member.userId, member.isLastProject]))+ expect(flags).toStrictEqual({+ [mockMember.id]: true,+ [withPersonal.id]: false,+ [withOtherTeam.id]: false,+ [operator.id]: false,+ })+ })+})++async function savePersonalProject({ userId, platformId }: { userId: string, platformId: string }) {+ const project = createMockProject({ ownerId: userId, platformId, type: ProjectType.PERSONAL })+ await db.save('project', project)+ return project+}++async function saveMembership({ userId, projectId, platformId }: { userId: string, projectId: string, platformId: string }) {+ const editorRole = await db.findOneByOrFail<ProjectRole>('project_role', { name: DefaultProjectRole.EDITOR })+ const member = createMockProjectMember({ userId, projectId, platformId, projectRoleId: editorRole.id })+ await db.save('project_member', member)+ return member+}++async function removeMembership({ memberId, token }: { memberId: string, token: string }) {+ return app?.inject({+ method: 'DELETE',+ url: `/api/v1/project-members/${memberId}`,+ headers: { authorization: `Bearer ${token}` },+ })+}+async function createBasicEnvironment() {const { mockOwner, mockPlatform, mockProject, mockApiKey } = await mockAndSaveBasicSetupWithApiKey({plan: { projectRolesEnabled: true, auditLogEnabled: false },diff --git a/packages/web/public/locales/en/translation.json b/packages/web/public/locales/en/translation.jsonindex 7d7abebab17..8290139d54c 100644--- a/packages/web/public/locales/en/translation.json+++ b/packages/web/public/locales/en/translation.json@@ -35,6 +35,11 @@"Personal projects are off, so they need a project to start in. Create a project first.": "Personal projects are off, so they need a project to start in. Create a project first.","Couldn't change the role. Try again.": "Couldn't change the role. Try again.","Members need a project. {name} isn't in one yet.": "Members need a project. {name} isn't in one yet.",+ "Ask a platform admin to deactivate them.": "Ask a platform admin to deactivate them.",+ "Go to Users": "Go to Users",+ "Want to deactivate them instead?": "Want to deactivate them instead?",+ "Removing them would leave them nowhere to work. Invite them to another project first, then remove them here.": "Removing them would leave them nowhere to work. Invite them to another project first, then remove them here.",+ "{name} has no other project": "{name} has no other project","All new members join this project as Editors.": "All new members join this project as Editors.","Create custom roles, set default projects for new members, and choose whether they get a personal project.": "Create custom roles, set default projects for new members, and choose whether they get a personal project.","Enable Roles & Access": "Enable Roles & Access",diff --git a/packages/web/src/app/components/project-settings/members/columns.tsx b/packages/web/src/app/components/project-settings/members/columns.tsxindex 6d40182ebe5..a489cf9df0a 100644--- a/packages/web/src/app/components/project-settings/members/columns.tsx+++ b/packages/web/src/app/components/project-settings/members/columns.tsx@@ -1,4 +1,4 @@-import { Permission } from '@activepieces/core-utils';+import { ErrorCode, Permission } from '@activepieces/core-utils';import {ProjectMemberWithUser,UserInvitation,@@ -7,6 +7,7 @@ import {import { ColumnDef } from '@tanstack/react-table';import { t } from 'i18next';import { Info, Trash2, User, Shield, ChevronDown } from 'lucide-react';+import { useState } from 'react';import { toast } from 'sonner';import { RowDataWithActions } from '@/components/custom/data-table';@@ -32,8 +33,11 @@ import {import { projectRoleQueries } from '@/features/platform-admin';import { projectCollectionUtils } from '@/features/projects';import { useAuthorization } from '@/hooks/authorization-hooks';+import { api } from '@/lib/api';import { formatUtils } from '@/lib/format-utils';+import { LastProjectDialog } from './last-project-dialog';+export type MemberRowData =| {id: string;@@ -167,6 +171,10 @@ const ActionsCell = ({}) => {const { checkAccess } = useAuthorization();const { project } = projectCollectionUtils.useCurrentProject();+ const [isConfirmOpen, setIsConfirmOpen] = useState(false);+ const [isLastProjectOpen, setIsLastProjectOpen] = useState(false);+ const isLastProject =+ row.original.type === 'member' && row.original.data.isLastProject === true;const userHasPermissionToDelete =row.original.type === 'member'@@ -201,6 +209,23 @@ const ActionsCell = ({return (<PermissionNeededTooltip hasPermission={userHasPermissionToDelete}><ConfirmationDeleteDialog+ open={isConfirmOpen}+ onOpenChange={(open) => {+ if (open && isLastProject) {+ setIsLastProjectOpen(true);+ return;+ }+ setIsConfirmOpen(open);+ }}+ onError={(error) => {+ setIsConfirmOpen(false);+ if (api.isApError(error, ErrorCode.LAST_PROJECT)) {+ setIsLastProjectOpen(true);+ refetch();+ return;+ }+ internalErrorToast();+ }}title={row.original.type === 'invitation'? t('Remove Invitation')@@ -222,6 +247,11 @@ const ActionsCell = ({<Trash2 className="h-4 w-4 text-danger-11" /></Button></ConfirmationDeleteDialog>+ <LastProjectDialog+ open={isLastProjectOpen}+ onOpenChange={setIsLastProjectOpen}+ memberName={displayName}+ /></PermissionNeededTooltip>);};diff --git a/packages/web/src/app/components/project-settings/members/index.tsx b/packages/web/src/app/components/project-settings/members/index.tsxindex 6bac1fcb792..456ca80b9ab 100644--- a/packages/web/src/app/components/project-settings/members/index.tsx+++ b/packages/web/src/app/components/project-settings/members/index.tsx@@ -149,6 +149,7 @@ export const MembersSettings = () => {</div><DataTablecolumns={columns}+ getRowId={(row) => `${row.type}-${row.id}`}page={{data: filteredData,next: null,diff --git a/packages/web/src/app/components/project-settings/members/last-project-dialog.tsx b/packages/web/src/app/components/project-settings/members/last-project-dialog.tsxnew file mode 100644index 00000000000..f899fdb1674--- /dev/null+++ b/packages/web/src/app/components/project-settings/members/last-project-dialog.tsx@@ -0,0 +1,64 @@+import { t } from 'i18next';+import { Link } from 'react-router-dom';++import { Button } from '@/components/ui/button';+import {+ Dialog,+ DialogContent,+ DialogDescription,+ DialogFooter,+ DialogHeader,+ DialogTitle,+} from '@/components/ui/dialog';+import { useIsPlatformAdmin } from '@/hooks/authorization-hooks';++export function LastProjectDialog({+ open,+ onOpenChange,+ memberName,+}: LastProjectDialogProps) {+ const isPlatformAdmin = useIsPlatformAdmin();++ return (+ <Dialog open={open} onOpenChange={onOpenChange}>+ <DialogContent>+ <DialogHeader className="mb-0">+ <DialogTitle>+ {t('{name} has no other project', { name: memberName })}+ </DialogTitle>+ <DialogDescription className="pt-1">+ {t(+ 'Removing them would leave them nowhere to work. Invite them to another project first, then remove them here.',+ )}+ </DialogDescription>+ </DialogHeader>+ <DialogFooter className="mt-2 sm:items-center sm:justify-between">+ <p className="text-sm text-gray-11">+ {isPlatformAdmin ? (+ <>+ {t('Want to deactivate them instead?')}{' '}+ <Link+ to="/platform/users"+ className="font-medium text-accent-11 hover:underline"+ >+ {t('Go to Users')}+ </Link>+ </>+ ) : (+ t('Ask a platform admin to deactivate them.')+ )}+ </p>+ <Button variant="outline" onClick={() => onOpenChange(false)}>+ {t('Close')}+ </Button>+ </DialogFooter>+ </DialogContent>+ </Dialog>+ );+}++type LastProjectDialogProps = {+ open: boolean;+ onOpenChange: (open: boolean) => void;+ memberName: string;+};