Skip to content

Database governance built for humans and agents — controlling changes and access across every major database.

refactor(frontend): split Users page and migrate IAM settings to React (#19849)

Danny Xu8eb68973e4e7
diff --git a/docs/superpowers/plans/2026-04-03-sa-wi-react-migration.md b/docs/superpowers/plans/2026-04-03-sa-wi-react-migration.md
new file mode 100644
index 0000000000..34b61dc197
--- /dev/null
+++ b/docs/superpowers/plans/2026-04-03-sa-wi-react-migration.md
@@ -0,0 +1,175 @@
+# Service Account & Workload Identity React Migration Plan
+
+> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
+
+**Goal:** Migrate ServiceAccountPanel and WorkloadIdentityPanel from Vue to React, following the same patterns used in the UsersPage/MembersPage/GroupsPage migration.
+
+**Architecture:** Create two new React pages (`ServiceAccountsPage.tsx`, `WorkloadIdentitiesPage.tsx`) that reuse the existing `shared/usePagedData`, `shared/UserAvatar`, and `shared/RoleMultiSelect`. Each page contains its own table and drawer components inline. Update routes to point to React pages. Delete old Vue components.
+
+**Tech Stack:** React, TypeScript, Vue Router, Pinia stores via `useVueState`
+
+---
+
+### Task 1: Create ServiceAccountsPage.tsx
+
+**Files:**
+- Create: `frontend/src/react/pages/settings/ServiceAccountsPage.tsx`
+
+- [ ] **Step 1: Create the page**
+
+Port `ServiceAccountPanel.vue` (231 lines) and `CreateServiceAccountDrawer.vue` (317 lines) into a single React page file. Follow the exact same pattern as `UsersPage.tsx`:
+
+- Import and use `usePagedData`, `PagedTableFooter`, `UserAvatar`, `RoleMultiSelect` from `shared/`
+- `ServiceAccountTable` — renders active service accounts with avatar, title, email, operations (view/deactivate/restore)
+- `CreateServiceAccountDrawer` — form with title, email (with domain suffix), roles (create mode only)
+- Main `ServiceAccountsPage` function — action bar with "Add Service Account" button, active table, inactive toggle, inactive table, drawer
+
+Key stores:
+- `useServiceAccountStore()` — `listServiceAccounts`, `createServiceAccount`, `updateServiceAccount`, `deleteServiceAccount`, `undeleteServiceAccount`, `getServiceAccount`
+- `useWorkspaceV1Store()` — `patchIamPolicy` for role assignment
+- `useActuatorV1Store()` — `workspaceResourceName`
+
+Permissions:
+- `bb.serviceAccounts.create` — Add button
+- `bb.serviceAccounts.update` / `bb.serviceAccounts.delete` / `bb.serviceAccounts.undelete` — row operations
+- Route-level: `bb.serviceAccounts.list`
+
+Email suffix: `getServiceAccountSuffix()` from `@/types` (returns `service.bytebase.com` or project-specific)
+
+The panel currently receives a `project` prop but in the workspace settings context it's always undefined (workspace-level). Only handle workspace-level for this migration.
+
+- [ ] **Step 2: Type check**
+
+Run: `pnpm --dir frontend type-check`
+
+- [ ] **Step 3: Commit**
+
+```bash
+git add frontend/src/react/pages/settings/ServiceAccountsPage.tsx
+git commit -m "feat(frontend): migrate ServiceAccountPanel to React"
+```
+
+---
+
+### Task 2: Create WorkloadIdentitiesPage.tsx
+
+**Files:**
+- Create: `frontend/src/react/pages/settings/WorkloadIdentitiesPage.tsx`
+
+- [ ] **Step 1: Create the page**
+
+Port `WorkloadIdentityPanel.vue` (233 lines) and `CreateWorkloadIdentityDrawer.vue` (743 lines) into a single React page file. Same pattern as Task 1 but with a much more complex drawer.
+
+`WorkloadIdentityTable` — same pattern as ServiceAccountTable.
+
+`CreateWorkloadIdentityDrawer` — complex form with:
+- Title, Email (with domain suffix)
+- Platform select (GitHub Actions / GitLab CI) — `WorkloadIdentityConfig_ProviderType`
+- Owner/Group field (label changes per platform)
+- Repository/Project field (label/hint changes per platform)
+- Allowed Branches/Tags dropdown (GitLab only, options: all/branch/tag)
+- Branch/Tag field (GitHub always, GitLab when specific ref selected)
+- Advanced Settings (collapsible):
+ - Issuer URL / GitLab URL
+ - Audience
+ - Subject Pattern
+- Roles (create mode only)
+
+**Critical: Bidirectional subject pattern binding:**
+- When owner/repo/branch change → auto-compute `subjectPattern` via `computedSubjectPattern`
+- When `subjectPattern` changes → reverse-parse into owner/repo/branch via `parseWorkloadIdentitySubjectPattern` from `@/utils`
+- Use refs as flags to prevent circular updates (same pattern as Vue's `isUpdatingFromPattern`/`isUpdatingFromFields`)
+
+GitHub pattern: `repo:owner/repo:ref:refs/heads/branch`
+GitLab pattern: `project_path:owner/project:ref_type:branch:ref:name`
+
+Platform change resets issuerUrl to preset, clears branch, resets refType to "all".
+
+Key stores:
+- `useWorkloadIdentityStore()` — `listWorkloadIdentities`, `createWorkloadIdentity`, `updateWorkloadIdentity`, `deleteWorkloadIdentity`, `undeleteWorkloadIdentity`, `getWorkloadIdentity`
+- `useWorkspaceV1Store()` — `patchIamPolicy`
+- `useActuatorV1Store()` — `workspaceResourceName`
+
+Import `parseWorkloadIdentitySubjectPattern`, `getWorkloadIdentityProviderText` from `@/utils`.
+Import `WorkloadIdentityConfig_ProviderType`, `WorkloadIdentityConfigSchema`, `WorkloadIdentitySchema` from proto types.
+
+Permissions: same pattern as ServiceAccounts but with `bb.workloadIdentities.*`
+
+- [ ] **Step 2: Type check**
+
+Run: `pnpm --dir frontend type-check`
+
+- [ ] **Step 3: Commit**
+
+```bash
+git add frontend/src/react/pages/settings/WorkloadIdentitiesPage.tsx
+git commit -m "feat(frontend): migrate WorkloadIdentityPanel to React"
+```
+
+---
+
+### Task 3: Update routes
+
+**Files:**
+- Modify: `frontend/src/router/dashboard/workspace.ts:320-340`
+
+- [ ] **Step 1: Update Service Accounts route**
+
+Change `component` from Vue `ServiceAccountPanel.vue` to React `ReactPageMount.vue` with `page: "ServiceAccountsPage"`:
+
+```typescript
+{
+ path: "service-accounts",
+ name: WORKSPACE_ROUTE_SERVICE_ACCOUNTS,
+ meta: {
+ title: () => t("settings.members.service-accounts"),
+ requiredPermissionList: () => ["bb.serviceAccounts.list"],
+ },
+ component: () => import("@/react/ReactPageMount.vue"),
+ props: () => ({ page: "ServiceAccountsPage" }),
+},
+```
+
+- [ ] **Step 2: Update Workload Identities route**
+
+Same pattern:
+
+```typescript
+{
+ path: "workload-identities",
+ name: WORKSPACE_ROUTE_WORKLOAD_IDENTITIES,
+ meta: {
+ title: () => t("settings.members.workload-identities"),
+ requiredPermissionList: () => ["bb.workloadIdentities.list"],
+ },
+ component: () => import("@/react/ReactPageMount.vue"),
+ props: () => ({ page: "WorkloadIdentitiesPage" }),
+},
+```
+
+- [ ] **Step 3: Type check and commit**
+
+```bash
+pnpm --dir frontend type-check
+git add frontend/src/router/dashboard/workspace.ts
+git commit -m "feat(frontend): update routes for React SA and WI pages"
+```
+
+---
+
+### Task 4: Lint, fix, verify, and cleanup
+
+- [ ] **Step 1: Run frontend fix and check**
+
+```bash
+pnpm --dir frontend fix
+pnpm --dir frontend check
+pnpm --dir frontend type-check
+```
+
+- [ ] **Step 2: Commit any fixes**
+
+```bash
+git add -u
+git commit -m "fix(frontend): lint and i18n fixes for SA/WI migration"
+```
diff --git a/docs/superpowers/plans/2026-04-03-users-page-split.md b/docs/superpowers/plans/2026-04-03-users-page-split.md
new file mode 100644
index 0000000000..e9b5766339
--- /dev/null
+++ b/docs/superpowers/plans/2026-04-03-users-page-split.md
@@ -0,0 +1,490 @@
+# Users Page Split Implementation Plan
+
+> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
+
+**Goal:** Split the 3,489-line `UsersPage.tsx` monolith into three independent pages (Users, Members, Groups) with separate routes and sidebar entries.
+
+**Architecture:** Extract shared utilities (`usePagedData`, `PagedTableFooter`, `AADSyncDrawer`) into a `shared/` directory, then create `MembersPage.tsx` and `GroupsPage.tsx` as standalone pages. Update routes and sidebar to expose all three as independent entries. Members becomes visible in both SaaS and non-SaaS modes.
+
+**Tech Stack:** React, TypeScript, Vue Router (routes/sidebar are still Vue), Pinia stores via `useVueState`
+
+**Spec:** `docs/superpowers/specs/2026-04-03-users-page-split-design.md`
+
+---
+
+### Task 1: Extract shared utilities
+
+**Files:**
+- Create: `frontend/src/react/pages/settings/shared/usePagedData.ts`
+- Create: `frontend/src/react/pages/settings/shared/AADSyncDrawer.tsx`
+- Modify: `frontend/src/react/pages/settings/UsersPage.tsx`
+
+- [ ] **Step 1: Create `shared/usePagedData.ts`**
+
+Extract `usePagedData` hook (lines 118-241), `PagedTableFooter` component (lines 247-296), and their imports from `UsersPage.tsx`. The file should export both `usePagedData` and `PagedTableFooter`.
+
+Required imports to include:
+```typescript
+import React, { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { useTranslation } from "react-i18next";
+import { Button } from "@/react/components/ui/button";
+import { getPageSizeOptions, useSessionPageSize } from "@/react/hooks/useSessionPageSize";
+import { cn } from "@/react/lib/utils";
+```
+
+Also export the `PagedDataResult` type (the return type of `usePagedData`) so consumers can reference it.
+
+- [ ] **Step 2: Create `shared/AADSyncDrawer.tsx`**
+
+Extract `AADSyncDrawer` (lines 2098-2284) and its imports. This drawer is used by both Users and Groups pages.
+
+Key imports it needs:
+```typescript
+import { useTranslation } from "react-i18next";
+import { Button } from "@/react/components/ui/button";
+import { Input } from "@/react/components/ui/input";
+import { useVueState } from "@/react/hooks/useVueState";
+import { useActuatorV1Store, useSettingV1Store } from "@/store";
+```
+
+Read lines 2098-2289 carefully for the full set of imports needed.
+
+- [ ] **Step 3: Update `UsersPage.tsx` to import from shared**
+
+Replace the inline `usePagedData`, `PagedTableFooter`, and `AADSyncDrawer` definitions with imports:
+```typescript
+import { usePagedData, PagedTableFooter } from "./shared/usePagedData";
+import { AADSyncDrawer } from "./shared/AADSyncDrawer";
+```
+
+Remove the extracted code blocks (lines 114-296 and 2094-2284) and their now-unused imports.
+
+- [ ] **Step 4: Verify UsersPage still works**
+
+Run:
+```bash
+pnpm --dir frontend type-check
+```
+
+Expected: No type errors.
+
+- [ ] **Step 5: Commit**
+
+```bash
+git add frontend/src/react/pages/settings/shared/
+git add frontend/src/react/pages/settings/UsersPage.tsx
+git commit -m "refactor(frontend): extract shared usePagedData and AADSyncDrawer from UsersPage"
+```
+
+---
+
+### Task 2: Create `MembersPage.tsx`
+
+**Files:**
+- Create: `frontend/src/react/pages/settings/MembersPage.tsx`
+- Modify: `frontend/src/react/pages/settings/UsersPage.tsx` (remove members code)
+
+- [ ] **Step 1: Create `MembersPage.tsx`**
+
+Extract these components from `UsersPage.tsx` into a new standalone page:
+- `MemberTable` (lines 2304-2472)
+- `MemberTableByRole` (lines 2478-2627)
+- `EditMemberRoleDrawer` (lines 2633-2815)
+
+**Important:** The exported function name must be `MembersPage` (matching the filename) for `mount.ts` auto-discovery via `import.meta.glob("./pages/settings/*.tsx")`.
+
+Create a new `MembersPage` export function containing the members-specific state and UI from the main `UsersPage` function. This includes:
+- `memberSearchText`, `memberViewTab`, `selectedMembers`, `showEditMemberDrawer`, `editingMember` state
+- `memberBindings` computed value (lines 2868-2879)
+- `canSetIamPolicy` permission check (lines 2881-2883)
+- `handleRevokeSelected` (lines 2885-2913)
+- `handleMemberUpdateBinding` (lines 2915-2918)
+- `handleMemberRevokeBinding` (lines 2920-2933)
+- The Members tab content (lines 3229-3260 for action bar, lines 3363-3404 for tab panel)
+
+The page should NOT have tabs — it directly renders the member view with sub-tabs ("View by Members" / "View by Roles").
+
+Required imports — pull from the UsersPage imports list:
+```typescript
+import type { MemberBinding } from "@/components/Member/types";
+import { getMemberBindings } from "@/components/Member/utils";
+import { ComponentPermissionGuard } from "@/react/components/ComponentPermissionGuard";
+import { Button } from "@/react/components/ui/button";
+import { Input } from "@/react/components/ui/input";
+import { Tabs, TabsList, TabsPanel, TabsTrigger } from "@/react/components/ui/tabs";
+import { useVueState } from "@/react/hooks/useVueState";
+import { pushNotification, useCurrentUserV1, useRoleStore, useWorkspaceV1Store } from "@/store";
+import { AccountType, ALL_USERS_USER_EMAIL, getAccountTypeByEmail, getUserEmailInBinding, userBindingPrefix } from "@/types";
+import { PRESET_WORKSPACE_ROLES, PresetRoleType } from "@/types/iam";
+import { displayRoleDescription, displayRoleTitle, hasWorkspacePermissionV2, sortRoles } from "@/utils";
+```
+
+Read the extracted components carefully for any additional imports (lucide icons, etc.).
+
+- [ ] **Step 2: Remove members code from `UsersPage.tsx`**
+
+Remove from `UsersPage.tsx`:
+- `MemberTable`, `MemberTableByRole`, `EditMemberRoleDrawer` function definitions
+- Members-related state variables from the main `UsersPage` function (`memberSearchText`, `memberViewTab`, `selectedMembers`, `showEditMemberDrawer`, `editingMember`)
+- `memberBindings`, `canSetIamPolicy`, `handleRevokeSelected`, `handleMemberUpdateBinding`, `handleMemberRevokeBinding`
+- The MEMBERS tab trigger (lines 3111-3114)
+- The MEMBERS tab action bar (lines 3229-3260)
+- The MEMBERS tab panel (lines 3363-3404)
+- The `EditMemberRoleDrawer` render at bottom of UsersPage
+- The `TabValue` type — change to just `"USERS" | "GROUPS"` (or remove tabs entirely if only USERS remains after Task 3)
+- Remove `isSaaSMode` conditional around the USERS tab trigger (it's always shown now since Members is separate)
+- Remove unused imports (`getMemberBindings`, `MemberBinding`, `useWorkspaceV1Store`, etc.)
+
+- [ ] **Step 3: Verify type checking passes**
+
+Run:
+```bash
+pnpm --dir frontend type-check
+```
+
+Expected: No type errors.
+
+- [ ] **Step 4: Commit**
+
+```bash
+git add frontend/src/react/pages/settings/MembersPage.tsx
+git add frontend/src/react/pages/settings/UsersPage.tsx
+git commit -m "refactor(frontend): extract MembersPage from UsersPage"
+```
+
+---
+
+### Task 3: Create `GroupsPage.tsx`
+
+**Files:**
+- Create: `frontend/src/react/pages/settings/GroupsPage.tsx`
+- Modify: `frontend/src/react/pages/settings/UsersPage.tsx` (remove groups code)
+
+- [ ] **Step 1: Create `GroupsPage.tsx`**
+
+Extract these components from `UsersPage.tsx`:
+- `GroupTable` (lines 673-845)
+- `GroupRow` (lines 847-984)
+- `RoleMultiSelect` (lines 990-1186)
+- `extractUserTitle` (lines 1187-1190)
+- `normalizeMemberIdentifier` (lines 1600-1605)
+- `deduplicateMembers` (lines 1607-1622)
+- `CreateGroupDrawer` (lines 1624-2092)
+
+**Important:** The exported function name must be `GroupsPage` (matching the filename) for `mount.ts` auto-discovery.
+
+Create a new `GroupsPage` export function containing the groups-specific state and UI:
+- `groupSearchText` state
+- `showCreateGroupDrawer`, `editingGroup` state
+- `showAadSyncDrawer` state
+- `hasUserGroupFeature`, `workspaceDomains`, `hasDirectorySyncFeature`, `canAccessSettings` computed values
+- `groupPaged` data (using imported `usePagedData`)
+- Deep-link support for `?name=groups/...` query param (lines 3002-3024)
+- The GROUPS tab action bar (lines 3157-3228)
+- The GROUPS tab panel content (lines 3406-3433)
+
+Import shared utilities:
+```typescript
+import { usePagedData, PagedTableFooter } from "./shared/usePagedData";
+import { AADSyncDrawer } from "./shared/AADSyncDrawer";
+```
+
+The page should NOT have tabs — it directly renders the groups table with action bar.
+
+- [ ] **Step 2: Remove groups code from `UsersPage.tsx`**
+
+Remove from `UsersPage.tsx`:
+- `GroupTable`, `GroupRow`, `RoleMultiSelect`, `extractUserTitle`, `normalizeMemberIdentifier`, `deduplicateMembers`, `CreateGroupDrawer` function definitions
+- Groups-related state from main function (`groupSearchText`, `showCreateGroupDrawer`, `editingGroup`)
+- `hasUserGroupFeature`, `workspaceDomains` computed values (if only used by groups)
+- `groupPaged` data
+- Deep-link `?name=groups/...` effect (lines 3002-3024)
+- The GROUPS tab trigger, action bar, and panel
+- The `CreateGroupDrawer` render at bottom
+- The `TabValue` type, `getInitialTab` function, and `handleTabChange` — no more tabs
+- The hash sync effects (lines 3029-3043) — `window.location.hash = tab` and `hashchange` listener
+- Remove all tab-related JSX (`<Tabs>`, `<TabsList>`, `<TabsTrigger>`, `<TabsPanel>`)
+- Remove now-unused imports (`Tabs`, `TabsList`, `TabsPanel`, `TabsTrigger`, etc.)
+
+**Keep in `UsersPage`:**
+- Its own `showAadSyncDrawer` state and `<AADSyncDrawer>` render (imported from shared) — the Directory Sync button on the Users page still needs it
+- `hasDirectorySyncFeature`, `canAccessSettings` — still used by the Directory Sync button
+
+**Update cross-page navigation:**
+- The `UserTable` `onGroupSelected` callback (currently calls `setTab("GROUPS")` + opens drawer) must instead navigate to the Groups page: `router.push({ name: WORKSPACE_ROUTE_GROUPS, query: { name: group.name } })`. Import `WORKSPACE_ROUTE_GROUPS` from `workspaceRoutes`.
+
+After this, `UsersPage.tsx` should contain only:
+- Imports (from shared + own deps)
+- `UserTable` (lines 302-667) and its helpers (`UserGroupsCell`, `HighlightText`)
+- `CreateUserDrawer` (lines 1192-1592)
+- The main `UsersPage` function with only user-related state and UI
+- No tabs — just the user table, search, add user button, directory sync button, inactive users section
+
+- [ ] **Step 3: Verify type checking passes**
+
+Run:
+```bash
+pnpm --dir frontend type-check
+```
+
+Expected: No type errors.
+
+- [ ] **Step 4: Commit**
+
+```bash
+git add frontend/src/react/pages/settings/GroupsPage.tsx
+git add frontend/src/react/pages/settings/UsersPage.tsx
+git commit -m "refactor(frontend): extract GroupsPage from UsersPage"
+```
+
+---
+
+### Task 4: Add routes and route constant
+
+**Files:**
+- Modify: `frontend/src/router/dashboard/workspaceRoutes.ts:28`
+- Modify: `frontend/src/router/dashboard/workspace.ts:310-354`
+
+- [ ] **Step 1: Add `WORKSPACE_ROUTE_GROUPS` constant**
+
+In `frontend/src/router/dashboard/workspaceRoutes.ts`, add after line 28 (`WORKSPACE_ROUTE_MEMBERS`):
+
+```typescript
+export const WORKSPACE_ROUTE_GROUPS = "workspace.groups";
+```
+
+- [ ] **Step 2: Update Users route**
+
+In `frontend/src/router/dashboard/workspace.ts`, update the Users route (lines 310-318) to add permission and title:
+
+```typescript
+{
+ path: "users",
+ name: WORKSPACE_ROUTE_USERS,
+ meta: {
+ title: () => t("common.users"),
+ requiredPermissionList: () => ["bb.users.list"],
+ },
+ component: () => import("@/react/ReactPageMount.vue"),
+ props: () => ({ page: "UsersPage" }),
+},
+```
+
+- [ ] **Step 3: Update Members route**
+
+Update the Members route (lines 342-354) to use React instead of Vue:
+
+```typescript
+{
+ path: "members",
+ name: WORKSPACE_ROUTE_MEMBERS,
+ meta: {
+ title: () => t("settings.sidebar.members"),
+ requiredPermissionList: () => ["bb.workspaces.getIamPolicy"],
+ },
+ component: () => import("@/react/ReactPageMount.vue"),
+ props: () => ({ page: "MembersPage" }),
+},
+```
+
+- [ ] **Step 4: Add Groups route**
+
+Add a new route after the Members route:
+
+```typescript
+{
+ path: "groups",
+ name: WORKSPACE_ROUTE_GROUPS,
+ meta: {
+ title: () => t("settings.members.groups.self"),
+ requiredPermissionList: () => ["bb.groups.list"],
+ },
+ component: () => import("@/react/ReactPageMount.vue"),
+ props: () => ({ page: "GroupsPage" }),
+},
+```
+
+Import `WORKSPACE_ROUTE_GROUPS` at the top of `workspace.ts` alongside the other route constants.
+
+- [ ] **Step 5: Verify type checking passes**
+
+Run:
+```bash
+pnpm --dir frontend type-check
+```
+
+- [ ] **Step 6: Commit**
+
+```bash
+git add frontend/src/router/dashboard/workspaceRoutes.ts
+git add frontend/src/router/dashboard/workspace.ts
+git commit -m "feat(frontend): add routes for separate Members and Groups pages"
+```
+
+---
+
+### Task 5: Update sidebar navigation
+
+**Files:**
+- Modify: `frontend/src/utils/useDashboardSidebar.ts:128-152`
+
+- [ ] **Step 1: Update sidebar entries**
+
+In `frontend/src/utils/useDashboardSidebar.ts`, replace lines 128-152 (the Users and Members entries in the IAM and Admin section):
+
+**Users entry** (line 128-134) — add `hide: isSaaSMode` and fix title:
+```typescript
+{
+ title: t("common.users"),
+ name: WORKSPACE_ROUTE_USERS,
+ type: "route",
+ hide: actuatorStore.isSaaSMode,
+},
+```
+
+**Members entry** (lines 147-152) — remove `hide`:
+```typescript
+{
+ title: t("settings.sidebar.members"),
+ name: WORKSPACE_ROUTE_MEMBERS,
+ type: "route",
+},
+```
+
+**Groups entry** — add new entry after Members:
+```typescript
+{
+ title: t("settings.members.groups.self"),
+ name: WORKSPACE_ROUTE_GROUPS,
+ type: "route",
+},
+```
+
+Import `WORKSPACE_ROUTE_GROUPS` at the top of the file alongside the other route constants.
+
+- [ ] **Step 2: Verify type checking passes**
+
+Run:
+```bash
+pnpm --dir frontend type-check
+```
+
+- [ ] **Step 3: Commit**
+
+```bash
+git add frontend/src/utils/useDashboardSidebar.ts
+git commit -m "feat(frontend): update sidebar with separate Users, Members, Groups entries"
+```
+
+---
+
+### Task 6: Delete dead Vue components
+
+**Files:**
+- Delete: `frontend/src/views/SettingWorkspaceMembers.vue`
+
+- [ ] **Step 1: Verify no other imports of `SettingWorkspaceMembers.vue`**
+
+Search for imports of `SettingWorkspaceMembers` across the codebase. The only reference should be the old route in `workspace.ts` which was already updated in Task 4.
+
+```bash
+rg "SettingWorkspaceMembers" frontend/src/
+```
+
+If there are other references, update them before deleting.
+
+- [ ] **Step 2: Delete the file**
+
+```bash
+rm frontend/src/views/SettingWorkspaceMembers.vue
+```
+
+- [ ] **Step 3: Check if `WorkspaceMembers.vue` can be deleted**
+
+Search for imports of `WorkspaceMembers` from `@/components/Member/Views/`:
+```bash
+rg "WorkspaceMembers" frontend/src/
+```
+
+If `SettingWorkspaceMembers.vue` was its only consumer, delete `frontend/src/components/Member/Views/WorkspaceMembers.vue` too.
+
+- [ ] **Step 4: Verify type checking passes**
+
+Run:
+```bash
+pnpm --dir frontend type-check
+```
+
+- [ ] **Step 5: Commit**
+
+```bash
+git add -u
+git commit -m "chore(frontend): remove dead Vue members components"
+```
+
+---
+
+### Task 7: Lint, fix, and verify
+
+**Files:** All modified/created files
+
+- [ ] **Step 1: Run frontend fix (ESLint + Biome)**
+
+```bash
+pnpm --dir frontend fix
+```
+
+Fix any reported issues.
+
+- [ ] **Step 2: Run frontend check**
+
+```bash
+pnpm --dir frontend check
+```
+
+Expected: No errors.
+
+- [ ] **Step 3: Run type check**
+
+```bash
+pnpm --dir frontend type-check
+```
+
+Expected: No errors.
+
+- [ ] **Step 4: Run frontend tests**
+
+```bash
+pnpm --dir frontend test
+```
+
+Expected: All tests pass.
+
+- [ ] **Step 5: Commit any fixes**
+
+```bash
+git add -u
+git commit -m "fix(frontend): lint and format fixes for users page split"
+```
+
+---
+
+### Task 8: Manual smoke test checklist
+
+No automated tests exist for this page. Verify manually:
+
+- [ ] **Non-SaaS mode:**
+ - Sidebar shows "Users", "Members", "Groups" as separate entries under IAM and Admin
+ - `/settings/users` — shows user table with add/search/inactive users
+ - `/settings/members` — shows member list with grant/revoke, view by members/roles sub-tabs
+ - `/settings/groups` — shows groups table with add/search, expandable member lists
+ - Directory Sync button works on both Users and Groups pages
+
+- [ ] **SaaS mode:**
+ - Sidebar does NOT show "Users" entry
+ - Sidebar shows "Members" and "Groups"
+ - `/settings/members` — works same as non-SaaS
+ - `/settings/groups` — works same as non-SaaS
+
+- [ ] **Cross-page navigation:**
+ - On Users page, clicking a group badge in the user table navigates to `/settings/groups` and opens the group
diff --git a/docs/superpowers/specs/2026-04-03-users-page-split-design.md b/docs/superpowers/specs/2026-04-03-users-page-split-design.md
new file mode 100644
index 0000000000..569bcc1054
--- /dev/null
+++ b/docs/superpowers/specs/2026-04-03-users-page-split-design.md
@@ -0,0 +1,114 @@
+# Users Page Split: Three Independent Pages
+
+## Summary
+
+Split the monolithic `UsersPage.tsx` (3,489 lines) into three independent pages with separate routes and sidebar entries: Users, Members, and Groups.
+
+## Motivation
+
+PR #19829 migrated the `/users` page from Vue to React but consolidated three distinct concepts (user accounts, workspace IAM, groups) into a single tabbed page. This created two problems:
+
+1. **Incorrect tab visibility**: The React version shows the Members tab only in SaaS mode, but the Vue version had a separate "Members" sidebar entry visible in non-SaaS mode (and hidden in SaaS). The Members functionality (workspace IAM policy management) should be available in both modes.
+2. **Monolith file**: A single 3,489-line file mixing unrelated concerns.
+
+## Design
+
+### Route & Sidebar Structure
+
+| Route | Sidebar Entry | Component | Visibility |
+|-------|--------------|-----------|------------|
+| `/settings/users` | "Users" | `UsersPage.tsx` | Non-SaaS only |
+| `/settings/members` | "Members" | `MembersPage.tsx` | Always |
+| `/settings/groups` | "Groups" | `GroupsPage.tsx` | Always |
+
+- Reuse existing route constants `WORKSPACE_ROUTE_USERS` and `WORKSPACE_ROUTE_MEMBERS`
+- Add new `WORKSPACE_ROUTE_GROUPS` constant
+- Sidebar in `useDashboardSidebar.ts`:
+ - Users entry: **add** `hide: isSaaSMode` (currently always visible with a dynamic title)
+ - Members entry: **remove** `hide: isSaaSMode` (currently hidden in SaaS; make always visible)
+ - Groups entry: **add** new sidebar entry (always visible)
+
+### File Structure
+
+```
+frontend/src/react/pages/settings/
+ UsersPage.tsx # User account CRUD
+ MembersPage.tsx # Workspace IAM policy
+ GroupsPage.tsx # Group management
+ shared/
+ usePagedData.ts # Pagination hook + PagedTableFooter component
+ AADSyncDrawer.tsx # Entra/AAD directory sync drawer (used by Users + Groups)
+```
+
+### Page Contents
+
+**UsersPage.tsx** (non-SaaS only, ~800 lines):
+- User count limit alert (shown when remaining count <= 3)
+- Active users table with search + pagination
+- "Add User" button, "Directory Sync" button
+- Expandable "Show Inactive Users" section with its own search + pagination
+- `CreateUserDrawer` for create/edit user accounts
+
+**MembersPage.tsx** (always shown, ~700 lines):
+- Two sub-tabs: "View by Members" / "View by Roles"
+- Member search input
+- Bulk "Revoke Access" button (in Members view), "Grant Access" button
+- `MemberTable` — flat list with checkboxes for bulk operations
+- `MemberTableByRole` — expandable sections grouped by role
+- `EditMemberRoleDrawer` for granting/updating member roles
+- No SaaS-specific logic; identical behavior in both modes
+
+**GroupsPage.tsx** (always shown, ~800 lines):
+- Groups table with search + pagination + expandable member lists
+- "Add Group" button (with workspace domain restriction tooltip)
+- "Directory Sync" button
+- `CreateGroupDrawer` for create/edit groups
+- Deep-link support for `?name=groups/...` query parameter
+
+### Shared Code
+
+**`usePagedData.ts`**: Extract the `usePagedData` hook and `PagedTableFooter` component. Used by all three pages for consistent pagination behavior.
+
+**`AADSyncDrawer.tsx`**: Extract the Entra/AAD directory sync drawer. Used by both Users and Groups pages.
+
+### Route Configuration Changes
+
+In `frontend/src/router/dashboard/workspace.ts`:
+- Keep existing Users route, update component to `ReactPageMount.vue` with `UsersPage`
+- Keep existing Members route (line 342-354), update component from Vue `SettingWorkspaceMembers.vue` to React `ReactPageMount.vue` with `MembersPage`
+- Add new Groups route at path `"groups"` with `WORKSPACE_ROUTE_GROUPS` constant, component `ReactPageMount.vue` with `GroupsPage`
+
+In `frontend/src/router/dashboard/workspaceRoutes.ts`:
+- Add `WORKSPACE_ROUTE_GROUPS` constant
+
+### Route Guards
+
+- `/settings/users`: Add route guard to redirect SaaS users to `/settings/members` (sidebar hides it, but direct URL access should redirect)
+- `/settings/members` and `/settings/groups`: No guard needed, always accessible
+
+### Route Permissions
+
+- Users route: `requiredPermissionList: ["bb.users.list"]`
+- Members route: `requiredPermissionList: ["bb.workspaces.getIamPolicy"]` (simplify from current `["bb.workspaces.getIamPolicy", "bb.users.list", "bb.groups.list"]` since those are no longer on this page)
+- Groups route: `requiredPermissionList: ["bb.groups.list"]`
+
+### Legacy URL Handling
+
+The current implementation uses hash fragments (`#USERS`, `#MEMBERS`, `#GROUPS`) for tab navigation. After the split, these become separate routes. Old bookmarked URLs like `/settings/users#GROUPS` will land on the Users page without a Groups tab. No redirect is needed — the hash will simply be ignored and the user sees the Users page content.
+
+### Vue Component Cleanup
+
+After migration, these Vue components become dead code and should be deleted:
+- `frontend/src/views/SettingWorkspaceMembers.vue`
+- `frontend/src/components/Member/Views/WorkspaceMembers.vue` (verify no other consumers first)
+
+### Mount System
+
+All three pages use `ReactPageMount.vue` with lazy loading via `mount.ts`. Export names must match file names: `UsersPage`, `MembersPage`, `GroupsPage`.
+
+### Behavior Changes
+
+Each page works exactly as the current tabs do. The user-visible changes are:
+- Members page becomes accessible in **both** modes (previously: separate sidebar entry in non-SaaS Vue, tab in SaaS React)
+- Users page hidden in SaaS mode (same as current)
+- Groups gets its own sidebar entry and route (previously a tab under Users)
diff --git a/frontend/src/components/Member/EditMemberRoleDrawer.vue b/frontend/src/components/Member/EditMemberRoleDrawer.vue
deleted file mode 100644
index e3aff61451..0000000000
--- a/frontend/src/components/Member/EditMemberRoleDrawer.vue
+++ /dev/null
@@ -1,210 +0,0 @@
-<template>
- <Drawer @close="$emit('close')">
- <DrawerContent
- class="w-[40rem] max-w-[100vw]"
- :closable="true"
- :title="$t('settings.members.grant-access')"
- >
- <template #default>
- <div class="flex flex-col gap-y-4">
- <MembersBindingSelect
- v-if="isCreating"
- v-model:value="state.memberList"
- :required="true"
- :include-all-users="!isSaaSMode"
- :include-service-account="true"
- :include-workload-identity="true"
- :allow-arbitrary-email="isSaaSMode"
- />
- <div v-else class="w-full flex flex-col gap-y-2">
- <div class="flex items-center gap-x-1">
- {{ $t("common.members") }}
- <RequiredStar />
- </div>
- <NInput :disabled="true" :value="props.member?.binding" />
- </div>
-
- <div class="w-full flex flex-col gap-y-2">
- <div class="flex items-center gap-x-1 text-main">
- {{ $t("settings.members.assign-role", 2 /* multiply*/) }}
- <RequiredStar />
- </div>
- <RoleSelect v-model:value="state.roles" :multiple="true" />
- </div>
- </div>
- </template>
-
- <template #footer>
- <div class="w-full flex justify-between items-center">
- <div>
- <BBButtonConfirm
- v-if="!isCreating"
- ref="confirmRevokeAccessRef"
- :type="'DELETE'"
- :confirm-title="$t('settings.members.revoke-access-alert')"
- :ok-text="$t('settings.members.revoke-access')"
- :button-text="$t('settings.members.revoke-access')"
- :require-confirm="true"
- @confirm="handleRevoke"
- />
- </div>
-
- <div class="flex flex-row items-center justify-end gap-x-3">
- <NButton @click="$emit('close')">
- {{ $t("common.cancel") }}
- </NButton>
- <NButton
- type="primary"
- :disabled="!allowConfirm"
- :loading="state.isRequesting"
- @click="updateRoleBinding"
- >
- {{ $t("common.confirm") }}
- </NButton>
- </div>
- </div>
- </template>
- </DrawerContent>
- </Drawer>
-</template>
-
-<script setup lang="ts">
-import { isEqual } from "lodash-es";
-import { NButton, NInput, useDialog } from "naive-ui";
-import { storeToRefs } from "pinia";
-import { computed, reactive, ref } from "vue";
-import { useI18n } from "vue-i18n";
-import { BBButtonConfirm } from "@/bbkit";
-import RequiredStar from "@/components/RequiredStar.vue";
-import { Drawer, DrawerContent } from "@/components/v2";
-import { RoleSelect } from "@/components/v2/Select";
-import {
- pushNotification,
- useActuatorV1Store,
- useWorkspaceV1Store,
-} from "@/store";
-import { ALL_USERS_USER_EMAIL } from "@/types";
-import MembersBindingSelect from "./MembersBindingSelect.vue";
-import { type MemberBinding } from "./types";
-
-interface LocalState {
- isRequesting: boolean;
- memberList: string[];
- roles: string[];
-}
-
-const props = defineProps<{
- member?: MemberBinding;
-}>();
-
-const emit = defineEmits<{
- (event: "close"): void;
-}>();
-
-const { isSaaSMode } = storeToRefs(useActuatorV1Store());
-
-const initMemberList = () => {
- if (!props.member) {
- return [];
- }
- return [props.member.binding];
-};
-
-const state = reactive<LocalState>({
- isRequesting: false,
- memberList: initMemberList(),
- roles: [...(props.member?.workspaceLevelRoles ?? new Set<string>())],
-});
-
-const { t } = useI18n();
-const workspaceStore = useWorkspaceV1Store();
-const confirmRevokeAccessRef = ref<InstanceType<typeof BBButtonConfirm>>();
-const dialog = useDialog();
-
-const isCreating = computed(() => !props.member);
-
-const allowConfirm = computed(() => {
- if (state.memberList.length === 0) {
- return false;
- }
-
- if (!isCreating.value) {
- return !isEqual(props.member?.workspaceLevelRoles, state.roles);
- }
-
- return state.roles.length !== 0;
-});
-
-const memberListInBinding = computed(() => {
- if (props.member) {
- return [props.member.binding];
- }
- return state.memberList;
-});
-
-const updateRoleBinding = async () => {
- if (state.roles.length === 0) {
- confirmRevokeAccessRef.value?.showAlert();
- return;
- }
-
- const batchPatch = [];
- if (props.member) {
- batchPatch.push({
- member: props.member.binding,
- roles: [...state.roles],
- });
- } else {
- for (const member of memberListInBinding.value) {
- const existedRoles = workspaceStore.findRolesByMember(member);
- batchPatch.push({
- member,
- roles: [...new Set([...state.roles, ...existedRoles])],
- });
- }
- }
- await workspaceStore.patchIamPolicy(batchPatch);
- pushNotification({
- module: "bytebase",
- style: "SUCCESS",
- title: t("common.updated"),
- });
- emit("close");
-};
-
-const handleRevoke = async () => {
- if (!props.member || memberListInBinding.value.length !== 1) {
- return;
- }
- const member = memberListInBinding.value[0];
- if (member === ALL_USERS_USER_EMAIL) {
- dialog.warning({
- title: t("common.warning"),
- content: t("settings.members.revoke-allusers-alert"),
- positiveText: t("common.confirm"),
- negativeText: t("common.cancel"),
- onPositiveClick: async () => {
- await onRevoke(member);
- },
- });
- return;
- }
-
- await onRevoke(member);
-};
-
-const onRevoke = async (member: string) => {
- await workspaceStore.patchIamPolicy([
- {
- member,
- roles: [],
- },
- ]);
- pushNotification({
- module: "bytebase",
- style: "INFO",
- title: t("settings.members.revoked"),
- });
- emit("close");
-};
-</script>
diff --git a/frontend/src/components/Member/Views/WorkspaceMembers.vue b/frontend/src/components/Member/Views/WorkspaceMembers.vue
deleted file mode 100644
index eab0fcba36..0000000000
--- a/frontend/src/components/Member/Views/WorkspaceMembers.vue
+++ /dev/null
@@ -1,210 +0,0 @@
-<template>
- <div class="w-full mx-auto flex flex-col">
- <NTabs v-model:value="state.selectedTab" :type="tabType" animated>
- <NTabPane name="MEMBERS">
- <template #tab>
- <p class="text-base font-medium leading-7 text-main">
- {{ $t("settings.members.view-by-members") }}
- </p>
- </template>
- <MemberDataTable
- scope="workspace"
- :allow-edit="allowEdit"
- :bindings="memberBindings"
- :selected-bindings="state.selectedMembers"
- :select-disabled="() => false"
- :on-click-user="onClickUser"
- @update-binding="selectMember"
- @revoke-binding="revokeMember"
- @update-selected-bindings="state.selectedMembers = $event"
- />
- </NTabPane>
- <NTabPane name="ROLES">
- <template #tab>
- <p class="text-base font-medium leading-7 text-main">
- {{ $t("settings.members.view-by-roles") }}
- </p>
- </template>
- <MemberDataTableByRole
- scope="workspace"
- :allow-edit="allowEdit"
- :bindings="memberBindings"
- :on-click-user="onClickUser"
- @update-binding="selectMember"
- @revoke-binding="revokeMember"
- />
- </NTabPane>
-
- <template #suffix>
- <div class="flex items-center gap-x-2">
- <SearchBox
- v-model:value="state.searchText"
- :placeholder="$t('settings.members.search-member')"
- />
- <PermissionGuardWrapper
- v-slot="slotProps"
- :permissions="['bb.workspaces.setIamPolicy']"
- >
- <div class="flex justify-end gap-x-2">
- <NButton
- v-if="state.selectedTab === 'MEMBERS'"
- :disabled="slotProps.disabled || state.selectedMembers.length === 0"
- @click="handleRevokeSelectedMembers"
- >
- {{ $t("settings.members.revoke-access") }}
- </NButton>
- <NButton
- type="primary"
- :disabled="slotProps.disabled"
- @click="state.showAddMemberPanel = true"
- >
- <template #icon>
- <heroicons-outline:user-add class="w-4 h-4" />
- </template>
- {{ $t("settings.members.grant-access") }}
- </NButton>
- </div>
- </PermissionGuardWrapper>
- </div>
- </template>
- </NTabs>
- </div>
-
- <EditMemberRoleDrawer
- v-if="state.showAddMemberPanel"
- :member="state.editingMember"
- @close="
- () => {
- state.showAddMemberPanel = false;
- state.editingMember = undefined;
- }
- "
- />
-</template>
-
-<script setup lang="ts">
-import { NButton, NTabPane, NTabs, useDialog } from "naive-ui";
-import { computed, reactive } from "vue";
-import { useI18n } from "vue-i18n";
-import EditMemberRoleDrawer from "@/components/Member/EditMemberRoleDrawer.vue";
-import MemberDataTable from "@/components/Member/MemberDataTable/index.vue";
-import MemberDataTableByRole from "@/components/Member/MemberDataTableByRole.vue";
-import type { MemberBinding } from "@/components/Member/types";
-import { getMemberBindings } from "@/components/Member/utils";
-import PermissionGuardWrapper from "@/components/Permission/PermissionGuardWrapper.vue";
-import { SearchBox } from "@/components/v2";
-import {
- pushNotification,
- useCurrentUserV1,
- useWorkspaceV1Store,
-} from "@/store";
-import { userBindingPrefix } from "@/types";
-import type { User } from "@/types/proto-es/v1/user_service_pb";
-import { hasWorkspacePermissionV2 } from "@/utils";
-
-interface LocalState {
- searchText: string;
- selectedTab: "MEMBERS" | "ROLES";
- // the member should in user:{user} or group:{group} format.
- selectedMembers: string[];
- showAddMemberPanel: boolean;
- editingMember?: MemberBinding;
-}
-
-withDefaults(
- defineProps<{
- tabType?: "bar" | "line";
- onClickUser?: (user: User, event: MouseEvent) => void;
- }>(),
- {
- tabType: "line",
- }
-);
-
-const { t } = useI18n();
-const dialog = useDialog();
-const currentUserV1 = useCurrentUserV1();
-const workspaceStore = useWorkspaceV1Store();
-
-const state = reactive<LocalState>({
- searchText: "",
- selectedTab: "MEMBERS",
- selectedMembers: [],
- showAddMemberPanel: false,
-});
-
-const allowEdit = computed(() => {
- return hasWorkspacePermissionV2("bb.workspaces.setIamPolicy");
-});
-
-const handleRevokeSelectedMembers = () => {
- if (state.selectedMembers.length === 0) {
- return;
- }
-
- if (
- state.selectedMembers.includes(
- `${userBindingPrefix}${currentUserV1.value.email}`
- )
- ) {
- pushNotification({
- module: "bytebase",
- style: "WARN",
- title: "You cannot revoke yourself",
- });
- return;
- }
-
- dialog.warning({
- title: t("settings.members.revoke-access"),
- negativeText: t("common.cancel"),
- positiveText: t("common.confirm"),
- onPositiveClick: async () => {
- await workspaceStore.patchIamPolicy(
- state.selectedMembers.map((member) => ({
- member,
- roles: [],
- }))
- );
- pushNotification({
- module: "bytebase",
- style: "INFO",
- title: t("settings.members.revoked"),
- });
- state.selectedMembers = [];
- },
- });
-};
-
-const selectMember = (binding: MemberBinding) => {
- state.editingMember = binding;
- state.showAddMemberPanel = true;
-};
-
-const revokeMember = async (binding: MemberBinding) => {
- await workspaceStore.patchIamPolicy([
- {
- member: binding.binding,
- roles: [],
- },
- ]);
- pushNotification({
- module: "bytebase",
- style: "INFO",
- title: t("settings.members.revoked"),
- });
-};
-
-const memberBindings = computed(() => {
- return getMemberBindings({
- policies: [
- {
- level: "WORKSPACE",
- policy: workspaceStore.workspaceIamPolicy,
- },
- ],
- searchText: state.searchText,
- ignoreRoles: new Set([]),
- });
-});
-</script>
diff --git a/frontend/src/components/User/Settings/CreateServiceAccountDrawer.vue b/frontend/src/components/User/Settings/CreateServiceAccountDrawer.vue
index 07158668d9..1052608840 100644
--- a/frontend/src/components/User/Settings/CreateServiceAccountDrawer.vue
+++ b/frontend/src/components/User/Settings/CreateServiceAccountDrawer.vue
@@ -110,7 +110,6 @@ import {
getServiceAccountNameInBinding,
getServiceAccountSuffix,
} from "@/types";
-import { PresetRoleType } from "@/types/iam";
import { BindingSchema } from "@/types/proto-es/v1/iam_policy_pb";
import type { ServiceAccount } from "@/types/proto-es/v1/service_account_service_pb";
import { ServiceAccountSchema } from "@/types/proto-es/v1/service_account_service_pb";
@@ -141,7 +140,7 @@ const projectIamPolicyStore = useProjectIamPolicyStore();
const state = reactive<LocalState>({
isRequesting: false,
serviceAccount: create(ServiceAccountSchema),
- roles: props.project ? [] : [PresetRoleType.WORKSPACE_MEMBER],
+ roles: [],
});
const projectEntity = computed(() => {
diff --git a/frontend/src/components/User/Settings/CreateWorkloadIdentityDrawer.vue b/frontend/src/components/User/Settings/CreateWorkloadIdentityDrawer.vue
index 8feeab2378..43073040f0 100644
--- a/frontend/src/components/User/Settings/CreateWorkloadIdentityDrawer.vue
+++ b/frontend/src/components/User/Settings/CreateWorkloadIdentityDrawer.vue
@@ -349,7 +349,6 @@ import {
getWorkloadIdentityNameInBinding,
getWorkloadIdentitySuffix,
} from "@/types";
-import { PresetRoleType } from "@/types/iam";
import { BindingSchema } from "@/types/proto-es/v1/iam_policy_pb";
import type { WorkloadIdentity } from "@/types/proto-es/v1/workload_identity_service_pb";
import {
@@ -402,7 +401,7 @@ const projectIamPolicyStore = useProjectIamPolicyStore();
const state = reactive<LocalState>({
isRequesting: false,
workloadIdentity: create(WorkloadIdentitySchema),
- roles: props.project ? [] : [PresetRoleType.WORKSPACE_MEMBER],
+ roles: [],
wif: {
emailPrefix: "",
providerType: WorkloadIdentityConfig_ProviderType.GITHUB,
diff --git a/frontend/src/locales/en-US.json b/frontend/src/locales/en-US.json
index 3f7121092f..90bf54d6a1 100644
--- a/frontend/src/locales/en-US.json
+++ b/frontend/src/locales/en-US.json
@@ -447,8 +447,6 @@
"integration": "Integration",
"general": "General",
"members": "Members",
- "users-and-groups": "Users & Groups",
- "members-and-groups": "Members & Groups",
"iam-and-admin": "IAM & Admin",
"im-integration": "IM",
"mcp": "MCP",
diff --git a/frontend/src/locales/es-ES.json b/frontend/src/locales/es-ES.json
index 327484c455..ee7bba4d68 100644
--- a/frontend/src/locales/es-ES.json
+++ b/frontend/src/locales/es-ES.json
@@ -447,8 +447,6 @@
"integration": "Integración",
"general": "General",
"members": "Miembros",
- "users-and-groups": "Usuarios y grupos",
- "members-and-groups": "Miembros y grupos",
"iam-and-admin": "IAM y administración",
"im-integration": "Integración de IM",
"mcp": "MCP",
diff --git a/frontend/src/locales/ja-JP.json b/frontend/src/locales/ja-JP.json
index 3187c9766c..e0b0a04596 100644
--- a/frontend/src/locales/ja-JP.json
+++ b/frontend/src/locales/ja-JP.json
@@ -447,8 +447,6 @@
"integration": "連携",
"general": "全般",
"members": "メンバー",
- "users-and-groups": "ユーザーとグループ",
- "members-and-groups": "メンバーとグループ",
"iam-and-admin": "IAM と管理",
"im-integration": "IM",
"mcp": "MCP",
diff --git a/frontend/src/locales/vi-VN.json b/frontend/src/locales/vi-VN.json
index 3bd7e42f1a..707c79d7cc 100644
--- a/frontend/src/locales/vi-VN.json
+++ b/frontend/src/locales/vi-VN.json
@@ -447,8 +447,6 @@
"integration": "Tích hợp",
"general": "Chung",
"members": "Thành viên",
- "users-and-groups": "Người dùng & Nhóm",
- "members-and-groups": "Thành viên & Nhóm",
"iam-and-admin": "IAM & Quản trị",
"im-integration": "Tích hợp",
"mcp": "MCP",
diff --git a/frontend/src/locales/zh-CN.json b/frontend/src/locales/zh-CN.json
index 4832db3ebc..356118c57c 100644
--- a/frontend/src/locales/zh-CN.json
+++ b/frontend/src/locales/zh-CN.json
@@ -447,8 +447,6 @@
"integration": "集成",
"general": "通用",
"members": "成员",
- "users-and-groups": "用户和群组",
- "members-and-groups": "成员和群组",
"iam-and-admin": "IAM & 管理",
"im-integration": "IM",
"mcp": "MCP",
diff --git a/frontend/src/react/locales/en-US.json b/frontend/src/react/locales/en-US.json
index 29274e9551..af048784db 100644
--- a/frontend/src/react/locales/en-US.json
+++ b/frontend/src/react/locales/en-US.json
@@ -127,6 +127,7 @@
"rows-per-page": "Rows per page",
"save": "Save",
"search": "Search",
+ "search-for-more": "Search for more",
"select": "Please Select",
"select-all": "Select all",
"sensitive-placeholder": "Sensitive - write only",
@@ -626,8 +627,12 @@
"reactivate-confirm-title": "Are you sure to reactivate"
},
"add-member": "Add member",
+ "add-service-account": "Add Service Account",
"add-user": "Add user",
+ "add-workload-identity": "Add Workload Identity",
+ "all-users": "All users",
"cannot-revoke-self": "You cannot revoke yourself",
+ "copy-service-key": "Copy Service Key",
"entra-sync": {
"description": "Sync users and groups from Entra ID (formerly Azure AD) or Okta to your Bytebase instance.",
"endpoint": "Endpoint",
@@ -653,32 +658,60 @@
"title": "Title"
},
"n-members": "{{n}} members",
- "self": "Groups",
"update-group": "Update Group",
"workspace-domain-required": "Please set a workspace domain first."
},
+ "inactive-service-accounts": "Inactive service accounts",
"inactive-users": "Inactive users",
+ "inactive-workload-identities": "Inactive workload identities",
"revoke-access": "Revoke Access",
"revoke-access-alert": "Are you sure to revoke access?",
"revoke-allusers-alert": "Revoke \"All users\" will revoke related roles from all other users in your workspace. Are you sure to continue?",
+ "reset-service-key": "Reset Service Key",
+ "reset-service-key-alert": "This action cannot be undone. The old key will stop working immediately. Are you sure you want to reset this service key?",
"revoked": "Revoked",
"search-member": "Search member",
- "select-account-hint": "You can search for users and groups, or input the entire email to select the service account or workload identity.",
+ "service-key-copied": "Service Key copied to clipboard, please keep it in secret.",
"select-account_one": "Select account",
"select-account_other": "Select accounts",
"select-role_one": "Select role",
"select-role_other": "Select roles",
"service-account": "Service Account",
+ "service-accounts": "Service Accounts",
"show-inactive": "Show inactive accounts",
"table": {
"account": "Account",
"groups": "Groups",
"roles": "Roles"
},
+ "update-service-account": "Update Service Account",
"update-user": "Update User",
+ "update-workload-identity": "Update Workload Identity",
"view-by-members": "View by members",
"view-by-roles": "View by roles",
- "workload-identity": "Workload Identity"
+ "workload-identities": "Workload Identities",
+ "workload-identity": "Workload Identity",
+ "workload-identity-advanced": "Advanced Settings",
+ "workload-identity-all-branches-tags": "All branches and tags",
+ "workload-identity-allowed-branches-tags": "Allowed Branches/Tags",
+ "workload-identity-audience": "Audience",
+ "workload-identity-branch": "Branch",
+ "workload-identity-branch-hint": "Leave empty for all branches",
+ "workload-identity-gitlab-url": "GitLab URL",
+ "workload-identity-gitlab-url-hint": "Your GitLab instance URL",
+ "workload-identity-group": "Group / Username",
+ "workload-identity-issuer": "Issuer URL",
+ "workload-identity-owner": "Organization / Username",
+ "workload-identity-platform": "Platform",
+ "workload-identity-project": "Project",
+ "workload-identity-project-hint": "Leave empty to allow all projects",
+ "workload-identity-repo": "Repository",
+ "workload-identity-repo-hint": "Leave empty for all repositories in the organization",
+ "workload-identity-specific-branch": "Specific branch",
+ "workload-identity-specific-tag": "Specific tag",
+ "workload-identity-subject": "Subject Pattern",
+ "workload-identity-tag": "Tag",
+ "workload-identity-tag-hint": "Leave empty to allow all tags"
},
"profile": {
"password": "Password",
diff --git a/frontend/src/react/locales/es-ES.json b/frontend/src/react/locales/es-ES.json
index 1a268f1d24..375b1abd80 100644
--- a/frontend/src/react/locales/es-ES.json
+++ b/frontend/src/react/locales/es-ES.json
@@ -127,6 +127,7 @@
"rows-per-page": "Filas por página",
"save": "Guardar",
"search": "Buscar",
+ "search-for-more": "Buscar más",
"select": "Seleccionar",
"select-all": "Seleccionar todo",
"sensitive-placeholder": "Sensible - solo escritura",
@@ -626,8 +627,12 @@
"reactivate-confirm-title": "¿Estás seguro de que deseas reactivar?"
},
"add-member": "Agregar miembro",
+ "add-service-account": "Añadir Cuenta de Servicio",
"add-user": "Agregar usuario",
+ "add-workload-identity": "Añadir Identidad de Carga de Trabajo",
+ "all-users": "Todos los usuarios",
"cannot-revoke-self": "You cannot revoke yourself",
+ "copy-service-key": "Copiar Clave de Servicio",
"entra-sync": {
"description": "Sincronice usuarios y grupos de Entra ID (anteriormente Azure AD) u Okta con su instancia de Bytebase.",
"endpoint": "Punto final",
@@ -653,32 +658,60 @@
"title": "Título"
},
"n-members": "{{n}} miembros",
- "self": "Grupos",
"update-group": "Grupo de actualización",
"workspace-domain-required": "Primero configure un dominio de espacio de trabajo."
},
+ "inactive-service-accounts": "Cuentas de servicio inactivas",
"inactive-users": "Usuarios inactivos",
+ "inactive-workload-identities": "Identidades de carga de trabajo inactivas",
"revoke-access": "Revocar acceso",
"revoke-access-alert": "¿Está seguro de revocar el acceso?",
"revoke-allusers-alert": "Revocar \"Todos los usuarios\" revocará los roles relacionados de todos los demás usuarios de su espacio de trabajo. ¿Desea continuar?",
+ "reset-service-key": "Restablecer Clave de Servicio",
+ "reset-service-key-alert": "Esta acción no se puede deshacer. La clave antigua dejará de funcionar de inmediato. ¿Está seguro de que desea restablecer esta clave de servicio?",
"revoked": "Revocado",
"search-member": "Buscar miembro",
- "select-account-hint": "Puede buscar usuarios y grupos, o introducir el correo electrónico completo para seleccionar la cuenta de servicio o identidad de carga de trabajo.",
+ "service-key-copied": "Clave de Servicio copiada al portapapeles, por favor manténgala en secreto.",
"select-account_one": "Seleccionar cuenta",
"select-account_other": "Seleccionar cuentas",
"select-role_one": "Seleccionar rol",
"select-role_other": "Seleccionar roles",
"service-account": "Cuenta de Servicio",
+ "service-accounts": "Cuentas de Servicio",
"show-inactive": "Mostrar cuentas inactivas",
"table": {
"account": "Cuenta",
"groups": "Grupos",
"roles": "Roles"
},
+ "update-service-account": "Actualizar Cuenta de Servicio",
"update-user": "Actualizar usuario",
+ "update-workload-identity": "Actualizar Identidad de Carga de Trabajo",
"view-by-members": "Ver por miembros",
"view-by-roles": "Ver por roles",
- "workload-identity": "Workload Identity"
+ "workload-identities": "Identidades de Carga de Trabajo",
+ "workload-identity": "Workload Identity",
+ "workload-identity-advanced": "Advanced Settings",
+ "workload-identity-all-branches-tags": "All branches and tags",
+ "workload-identity-allowed-branches-tags": "Allowed Branches/Tags",
+ "workload-identity-audience": "Audience",
+ "workload-identity-branch": "Branch",
+ "workload-identity-branch-hint": "Leave empty for all branches",
+ "workload-identity-gitlab-url": "GitLab URL",
+ "workload-identity-gitlab-url-hint": "Your GitLab instance URL",
+ "workload-identity-group": "Group / Username",
+ "workload-identity-issuer": "Issuer URL",
+ "workload-identity-owner": "Organization / Username",
+ "workload-identity-platform": "Platform",
+ "workload-identity-project": "Project",
+ "workload-identity-project-hint": "Leave empty to allow all projects",
+ "workload-identity-repo": "Repository",
+ "workload-identity-repo-hint": "Leave empty for all repositories in the organization",
+ "workload-identity-specific-branch": "Specific branch",
+ "workload-identity-specific-tag": "Specific tag",
+ "workload-identity-subject": "Subject Pattern",
+ "workload-identity-tag": "Tag",
+ "workload-identity-tag-hint": "Leave empty to allow all tags"
},
"profile": {
"password": "Contraseña",
diff --git a/frontend/src/react/locales/ja-JP.json b/frontend/src/react/locales/ja-JP.json
index 16ffad2b8b..3b1faf289a 100644
--- a/frontend/src/react/locales/ja-JP.json
+++ b/frontend/src/react/locales/ja-JP.json
@@ -127,6 +127,7 @@
"rows-per-page": "ページあたりの行数",
"save": "保存",
"search": "検索",
+ "search-for-more": "さらに検索",
"select": "選択してください",
"select-all": "すべて選択",
"sensitive-placeholder": "機密データ - 書き込みのみ",
@@ -626,8 +627,12 @@
"reactivate-confirm-title": "[OK] を有効にします"
},
"add-member": "メンバーを追加",
+ "add-service-account": "サービスアカウントを追加",
"add-user": "ユーザーを追加",
+ "add-workload-identity": "ワークロードIDを追加",
+ "all-users": "すべてのユーザー",
"cannot-revoke-self": "You cannot revoke yourself",
+ "copy-service-key": "サービスキーをコピーする",
"entra-sync": {
"description": "Entra ID (旧 Azure AD) または Okta のユーザーとグループを Bytebase インスタンスに同期します。",
"endpoint": "Endpoint",
@@ -653,32 +658,60 @@
"title": "タイトル"
},
"n-members": "{{n}} 人のメンバー",
- "self": "グループ",
"update-group": "更新グループ",
"workspace-domain-required": "まずワークスペースドメインを設定してください。"
},
+ "inactive-service-accounts": "非アクティブサービスアカウント",
"inactive-users": "非アクティブユーザー",
+ "inactive-workload-identities": "非アクティブワークロードID",
"revoke-access": "アクセスを取り消す",
"revoke-access-alert": "アクセスを取り消してもよろしいですか?",
"revoke-allusers-alert": "「すべてのユーザー」を取り消すと、ワークスペース内の他のすべてのユーザーの関連ロールが取り消されます。続行しますか?",
+ "reset-service-key": "サービスキーのリセット",
+ "reset-service-key-alert": "古いサービス キーはすぐにリセットされ、この操作は元に戻すことはできません。サービス キーをリセットしてもよろしいですか?",
"revoked": "取り消されました",
"search-member": "メンバーを検索",
- "select-account-hint": "ユーザーやグループを検索するか、完全なメールアドレスを入力してサービスアカウントまたはワークロードアイデンティティを選択できます。",
+ "service-key-copied": "サービスキーはコピーされています。公開しないでください",
"select-account_one": "アカウントを選択",
"select-account_other": "アカウントを選択",
"select-role_one": "ロールを選択",
"select-role_other": "ロールを選択",
"service-account": "サービスアカウント",
+ "service-accounts": "サービスアカウント",
"show-inactive": "非アクティブなアカウントを表示",
"table": {
"account": "アカウント",
"groups": "グループ",
"roles": "ロール"
},
+ "update-service-account": "サービスアカウントを更新",
"update-user": "ユーザーを更新",
+ "update-workload-identity": "ワークロードIDを更新",
"view-by-members": "メンバー別に表示",
"view-by-roles": "ロールごとに表示",
- "workload-identity": "Workload Identity"
+ "workload-identities": "ワークロードID",
+ "workload-identity": "Workload Identity",
+ "workload-identity-advanced": "Advanced Settings",
+ "workload-identity-all-branches-tags": "All branches and tags",
+ "workload-identity-allowed-branches-tags": "Allowed Branches/Tags",
+ "workload-identity-audience": "Audience",
+ "workload-identity-branch": "Branch",
+ "workload-identity-branch-hint": "Leave empty for all branches",
+ "workload-identity-gitlab-url": "GitLab URL",
+ "workload-identity-gitlab-url-hint": "Your GitLab instance URL",
+ "workload-identity-group": "Group / Username",
+ "workload-identity-issuer": "Issuer URL",
+ "workload-identity-owner": "Organization / Username",
+ "workload-identity-platform": "Platform",
+ "workload-identity-project": "Project",
+ "workload-identity-project-hint": "Leave empty to allow all projects",
+ "workload-identity-repo": "Repository",
+ "workload-identity-repo-hint": "Leave empty for all repositories in the organization",
+ "workload-identity-specific-branch": "Specific branch",
+ "workload-identity-specific-tag": "Specific tag",
+ "workload-identity-subject": "Subject Pattern",
+ "workload-identity-tag": "Tag",
+ "workload-identity-tag-hint": "Leave empty to allow all tags"
},
"profile": {
"password": "パスワード",
diff --git a/frontend/src/react/locales/vi-VN.json b/frontend/src/react/locales/vi-VN.json
index 1cb4581eb0..f96a8af8b3 100644
--- a/frontend/src/react/locales/vi-VN.json
+++ b/frontend/src/react/locales/vi-VN.json
@@ -127,6 +127,7 @@
"rows-per-page": "Số dòng mỗi trang",
"save": "Lưu",
"search": "Tìm kiếm",
+ "search-for-more": "Tìm kiếm thêm",
"select": "Vui lòng chọn",
"select-all": "Chọn tất cả",
"sensitive-placeholder": "Nhạy cảm - Chỉ ghi",
@@ -626,8 +627,12 @@
"reactivate-confirm-title": "Bạn có chắc muốn kích hoạt lại?"
},
"add-member": "Thêm thành viên",
+ "add-service-account": "Thêm tài khoản dịch vụ",
"add-user": "Thêm người dùng",
+ "add-workload-identity": "Thêm danh tính Workload",
+ "all-users": "Tất cả người dùng",
"cannot-revoke-self": "You cannot revoke yourself",
+ "copy-service-key": "Sao chép Khóa Dịch vụ",
"entra-sync": {
"description": "Đồng bộ người dùng và nhóm từ Entra ID (trước đây là Azure AD) hoặc Okta sang phiên bản Bytebase của bạn.",
"endpoint": "Điểm cuối",
@@ -653,32 +658,60 @@
"title": "Tiêu đề"
},
"n-members": "{{n}} thành viên",
- "self": "Nhóm",
"update-group": "Cập nhật nhóm",
"workspace-domain-required": "Vui lòng thiết lập tên miền không gian làm việc trước."
},
+ "inactive-service-accounts": "Tài khoản dịch vụ không hoạt động",
"inactive-users": "Người dùng không hoạt động",
+ "inactive-workload-identities": "Danh tính Workload không hoạt động",
"revoke-access": "Thu hồi Quyền truy cập",
"revoke-access-alert": "Bạn có chắc muốn thu hồi quyền truy cập?",
"revoke-allusers-alert": "Thu hồi \"Tất cả người dùng\" sẽ thu hồi các vai trò liên quan từ tất cả người dùng khác trong không gian làm việc của bạn. Bạn có chắc chắn muốn tiếp tục không?",
+ "reset-service-key": "Đặt lại Khóa Dịch vụ",
+ "reset-service-key-alert": "Hành động này không thể hoàn tác. Khóa cũ sẽ ngừng hoạt động ngay lập tức. Bạn có chắc chắn muốn đặt lại khóa dịch vụ này?",
"revoked": "Đã thu hồi",
"search-member": "Tìm kiếm thành viên",
- "select-account-hint": "Bạn có thể tìm kiếm người dùng và nhóm, hoặc nhập toàn bộ email để chọn tài khoản dịch vụ hoặc danh tính khối lượng công việc.",
+ "service-key-copied": "Khóa Dịch vụ đã được sao chép vào khay nhớ tạm, vui lòng giữ bí mật.",
"select-account_one": "Chọn tài khoản",
"select-account_other": "Chọn tài khoản",
"select-role_one": "Chọn vai trò",
"select-role_other": "Chọn vai trò",
"service-account": "Tài khoản dịch vụ",
+ "service-accounts": "Tài khoản dịch vụ",
"show-inactive": "Hiển thị tài khoản không hoạt động",
"table": {
"account": "Tài khoản",
"groups": "Nhóm",
"roles": "Vai trò"
},
+ "update-service-account": "Cập nhật tài khoản dịch vụ",
"update-user": "Cập nhật người dùng",
+ "update-workload-identity": "Cập nhật danh tính Workload",
"view-by-members": "Xem theo thành viên",
"view-by-roles": "Xem theo vai trò",
- "workload-identity": "Workload Identity"
+ "workload-identities": "Danh tính Workload",
+ "workload-identity": "Workload Identity",
+ "workload-identity-advanced": "Advanced Settings",
+ "workload-identity-all-branches-tags": "All branches and tags",
+ "workload-identity-allowed-branches-tags": "Allowed Branches/Tags",
+ "workload-identity-audience": "Audience",
+ "workload-identity-branch": "Branch",
+ "workload-identity-branch-hint": "Leave empty for all branches",
+ "workload-identity-gitlab-url": "GitLab URL",
+ "workload-identity-gitlab-url-hint": "Your GitLab instance URL",
+ "workload-identity-group": "Group / Username",
+ "workload-identity-issuer": "Issuer URL",
+ "workload-identity-owner": "Organization / Username",
+ "workload-identity-platform": "Platform",
+ "workload-identity-project": "Project",
+ "workload-identity-project-hint": "Leave empty to allow all projects",
+ "workload-identity-repo": "Repository",
+ "workload-identity-repo-hint": "Leave empty for all repositories in the organization",
+ "workload-identity-specific-branch": "Specific branch",
+ "workload-identity-specific-tag": "Specific tag",
+ "workload-identity-subject": "Subject Pattern",
+ "workload-identity-tag": "Tag",
+ "workload-identity-tag-hint": "Leave empty to allow all tags"
},
"profile": {
"password": "Mật khẩu",
diff --git a/frontend/src/react/locales/zh-CN.json b/frontend/src/react/locales/zh-CN.json
index 0c55b6e514..d4c2107fbc 100644
--- a/frontend/src/react/locales/zh-CN.json
+++ b/frontend/src/react/locales/zh-CN.json
@@ -127,6 +127,7 @@
"rows-per-page": "每页行数",
"save": "保存",
"search": "搜索",
+ "search-for-more": "搜索更多",
"select": "请选择",
"select-all": "全选",
"sensitive-placeholder": "敏感数据 - 仅写入",
@@ -626,8 +627,12 @@
"reactivate-confirm-title": "确定启用"
},
"add-member": "添加成员",
+ "add-service-account": "添加服务账号",
"add-user": "添加用户",
+ "add-workload-identity": "添加工作负载身份",
+ "all-users": "全部用户",
"cannot-revoke-self": "You cannot revoke yourself",
+ "copy-service-key": "复制 Service Key",
"entra-sync": {
"description": "将 Entra ID(前 Azure AD)或 Okta 中的用户和组同步到您的 Bytebase 实例。",
"endpoint": "Endpoint",
@@ -653,32 +658,60 @@
"title": "名称"
},
"n-members": "{{n}} 位成员",
- "self": "群组",
"update-group": "更新组",
"workspace-domain-required": "请先设置工作空间的域名。"
},
+ "inactive-service-accounts": "未激活服务账号",
"inactive-users": "未激活用户",
+ "inactive-workload-identities": "未激活工作负载身份",
"revoke-access": "撤销访问权限",
"revoke-access-alert": "您确定要撤销访问权限吗?",
"revoke-allusers-alert": "撤销“全部用户”将撤销您工作区中所有其他用户的相关角色。您确定要继续吗?",
+ "reset-service-key": "重置 Service Key",
+ "reset-service-key-alert": "旧 Service Key 将立即被重置,该操作不可逆。确定要重置 Service Key 吗?",
"revoked": "已撤销",
"search-member": "搜索成员",
- "select-account-hint": "您可以搜索用户和组,或输入完整的电子邮件地址来选择服务账号或工作负载身份。",
+ "service-key-copied": "Service Key 已复制,请勿泄漏",
"select-account_one": "选择账户",
"select-account_other": "选择账户",
"select-role_one": "选择角色",
"select-role_other": "选择角色",
"service-account": "服务账号",
+ "service-accounts": "服务账号",
"show-inactive": "显示已停用账户",
"table": {
"account": "账户",
"groups": "群组",
"roles": "角色"
},
+ "update-service-account": "更新服务账号",
"update-user": "更新用户",
+ "update-workload-identity": "更新工作负载身份",
"view-by-members": "按成员查看",
"view-by-roles": "按角色查看",
- "workload-identity": "工作负载标识"
+ "workload-identities": "工作负载身份",
+ "workload-identity": "工作负载标识",
+ "workload-identity-advanced": "高级设置",
+ "workload-identity-all-branches-tags": "所有分支和标签",
+ "workload-identity-allowed-branches-tags": "允许的分支/标签",
+ "workload-identity-audience": "受众",
+ "workload-identity-branch": "分支",
+ "workload-identity-branch-hint": "留空表示允许所有分支",
+ "workload-identity-gitlab-url": "GitLab 地址",
+ "workload-identity-gitlab-url-hint": "您的 GitLab 实例地址",
+ "workload-identity-group": "Group / 用户名",
+ "workload-identity-issuer": "发行者 URL",
+ "workload-identity-owner": "组织 / 用户名",
+ "workload-identity-platform": "平台",
+ "workload-identity-project": "项目",
+ "workload-identity-project-hint": "留空则允许所有项目",
+ "workload-identity-repo": "仓库",
+ "workload-identity-repo-hint": "留空表示允许组织内所有仓库",
+ "workload-identity-specific-branch": "指定分支",
+ "workload-identity-specific-tag": "指定标签",
+ "workload-identity-subject": "主题模式",
+ "workload-identity-tag": "标签",
+ "workload-identity-tag-hint": "留空则允许所有标签"
},
"profile": {
"password": "密码",
diff --git a/frontend/src/react/pages/settings/GroupsPage.tsx b/frontend/src/react/pages/settings/GroupsPage.tsx
new file mode 100644
index 0000000000..9eb522fff3
--- /dev/null
+++ b/frontend/src/react/pages/settings/GroupsPage.tsx
@@ -0,0 +1,1108 @@
+import { create } from "@bufbuild/protobuf";
+import { isEqual } from "lodash-es";
+import {
+ ChevronDown,
+ ChevronRight,
+ Pencil,
+ Plus,
+ Search,
+ Settings,
+ Trash2,
+ Users,
+ X,
+} from "lucide-react";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { useTranslation } from "react-i18next";
+import { ComponentPermissionGuard } from "@/react/components/ComponentPermissionGuard";
+import { FeatureBadge } from "@/react/components/FeatureBadge";
+import { Alert, AlertDescription } from "@/react/components/ui/alert";
+import { Badge } from "@/react/components/ui/badge";
+import { Button } from "@/react/components/ui/button";
+import { Input } from "@/react/components/ui/input";
+import { Tooltip } from "@/react/components/ui/tooltip";
+import { useEscapeKey } from "@/react/hooks/useEscapeKey";
+import { useVueState } from "@/react/hooks/useVueState";
+import { router } from "@/router";
+import { SETTING_ROUTE_WORKSPACE_GENERAL } from "@/router/dashboard/workspaceSetting";
+import {
+ pushNotification,
+ useActuatorV1Store,
+ useCurrentUserV1,
+ useGroupStore,
+ useSettingV1Store,
+ useSubscriptionV1Store,
+ useUserStore,
+} from "@/store";
+import { extractUserEmail, groupNamePrefix } from "@/store/modules/v1/common";
+import { UNKNOWN_USER_NAME } from "@/types";
+import type { Group, GroupMember } from "@/types/proto-es/v1/group_service_pb";
+import {
+ GroupMember_Role,
+ GroupMemberSchema,
+ GroupSchema,
+} from "@/types/proto-es/v1/group_service_pb";
+import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";
+import type { User } from "@/types/proto-es/v1/user_service_pb";
+import { hasWorkspacePermissionV2, isValidEmail } from "@/utils";
+import { AADSyncDrawer } from "./shared/AADSyncDrawer";
+import { PagedTableFooter, usePagedData } from "./shared/usePagedData";
+
+// ============================================================
+// Helpers
+// ============================================================
+
+// Normalize member identifier to users/{email} format.
+// Accepts: "users/[email protected]", "[email protected]" → "users/[email protected]"
+function normalizeMemberIdentifier(member: string): string {
+ const trimmed = member.trim();
+ if (!trimmed) return trimmed;
+ if (trimmed.startsWith("users/")) return trimmed;
+ return `users/${trimmed}`;
+}
+
+function deduplicateMembers(members: GroupMember[]): GroupMember[] {
+ const map = new Map<string, GroupMember>();
+ for (const m of members) {
+ const key = m.member;
+ const existing = map.get(key);
+ if (existing) {
+ // Keep the one with OWNER role
+ if (m.role === GroupMember_Role.OWNER) {
+ map.set(key, m);
+ }
+ } else {
+ map.set(key, m);
+ }
+ }
+ return Array.from(map.values());
+}
+
+// ============================================================
+// HighlightText
+// ============================================================
+
+function HighlightText({ text, keyword }: { text: string; keyword: string }) {
+ if (!keyword.trim()) return <>{text}</>;
+ const idx = text.toLowerCase().indexOf(keyword.toLowerCase());
+ if (idx < 0) return <>{text}</>;
+ return (
+ <>
+ {text.slice(0, idx)}
+ <span className="bg-yellow-100">
+ {text.slice(idx, idx + keyword.length)}
+ </span>
+ {text.slice(idx + keyword.length)}
+ </>
+ );
+}
+
+// ============================================================
+// GroupTable
+// ============================================================
+
+function GroupTable({
+ groups,
+ searchText,
+ onGroupSelected,
+ onGroupDeleted,
+}: {
+ groups: Group[];
+ searchText: string;
+ onGroupSelected: (group: Group) => void;
+ onGroupDeleted: (group: Group) => void;
+}) {
+ const { t } = useTranslation();
+ const currentUser = useVueState(() => useCurrentUserV1().value);
+ const groupStore = useGroupStore();
+ const userStore = useUserStore();
+
+ const [expandedGroups, setExpandedGroups] = useState<Set<string>>(new Set());
+ const [memberCache, setMemberCache] = useState<Map<string, User[]>>(
+ new Map()
+ );
+ const memberCacheRef = useRef(memberCache);
+ memberCacheRef.current = memberCache;
+ const loadingRef = useRef<Set<string>>(new Set());
+
+ const fetchGroupMembers = useCallback(
+ (group: Group) => {
+ if (loadingRef.current.has(group.name)) return;
+ loadingRef.current.add(group.name);
+ const memberNames = group.members.map((m) => m.member);
+ userStore
+ .batchGetOrFetchUsers(memberNames)
+ .then((users) => {
+ setMemberCache((prev) => {
+ const next = new Map(prev);
+ next.set(
+ group.name,
+ users.filter((u): u is User => !!u)
+ );
+ return next;
+ });
+ })
+ .catch(() => {
+ // Allow retry on next expand
+ })
+ .finally(() => {
+ loadingRef.current.delete(group.name);
+ });
+ },
+ [userStore]
+ );
+
+ // Invalidate member cache when groups data changes (e.g. after editing membership)
+ // and refetch members for currently expanded groups
+ const prevGroupsRef = useRef(groups);
+ const expandedGroupsRef = useRef(expandedGroups);
+ expandedGroupsRef.current = expandedGroups;
+ const fetchGroupMembersRef = useRef(fetchGroupMembers);
+ fetchGroupMembersRef.current = fetchGroupMembers;
+ useEffect(() => {
+ if (prevGroupsRef.current !== groups) {
+ prevGroupsRef.current = groups;
+ setMemberCache(new Map());
+ loadingRef.current = new Set();
+ // Refetch members for currently expanded groups
+ for (const groupName of expandedGroupsRef.current) {
+ const group = groups.find((g) => g.name === groupName);
+ if (group) {
+ fetchGroupMembersRef.current(group);
+ }
+ }
+ }
+ }, [groups]);
+
+ const toggleExpand = useCallback(
+ (group: Group) => {
+ setExpandedGroups((prev) => {
+ const next = new Set(prev);
+ if (next.has(group.name)) {
+ next.delete(group.name);
+ } else {
+ next.add(group.name);
+ }
+ return next;
+ });
+
+ // Fetch members if not cached
+ if (!memberCacheRef.current.has(group.name)) {
+ fetchGroupMembers(group);
+ }
+ },
+ [fetchGroupMembers]
+ );
+
+ const isGroupOwner = useCallback(
+ (group: Group) => {
+ return (
+ group.members.find(
+ (m) => extractUserEmail(m.member) === currentUser.email
+ )?.role === GroupMember_Role.OWNER
+ );
+ },
+ [currentUser.email]
+ );
+
+ const handleDelete = useCallback(
+ async (group: Group) => {
+ const confirmed = window.confirm(
+ t("settings.members.action.deactivate-confirm-title")
+ );
+ if (!confirmed) return;
+
+ try {
+ await groupStore.deleteGroup(group.name);
+ onGroupDeleted(group);
+ pushNotification({
+ module: "bytebase",
+ style: "SUCCESS",
+ title: t("common.deleted"),
+ });
+ } catch {
+ // error shown by store
+ }
+ },
+ [groupStore, onGroupDeleted, t]
+ );
+
+ if (groups.length === 0) {
+ return (
+ <div className="py-8 text-center text-control-light text-sm">
+ {t("common.no-data")}
+ </div>
+ );
+ }
+
+ return (
+ <div className="border rounded-sm overflow-hidden">
+ <table className="w-full text-sm">
+ <thead>
+ <tr className="border-b bg-control-bg">
+ <th className="px-4 py-2 text-left font-medium whitespace-nowrap">
+ {t("common.groups")} / {t("common.users")}
+ </th>
+ <th className="px-4 py-2 text-right font-medium whitespace-nowrap w-16" />
+ </tr>
+ </thead>
+ <tbody>
+ {groups.map((group, i) => {
+ const isExpanded = expandedGroups.has(group.name);
+ const members = memberCache.get(group.name);
+ const canEdit =
+ isGroupOwner(group) ||
+ hasWorkspacePermissionV2("bb.groups.update");
+ const canDelete =
+ isGroupOwner(group) ||
+ hasWorkspacePermissionV2("bb.groups.delete");
+
+ return (
+ <GroupRow
+ key={group.name}
+ group={group}
+ index={i}
+ isExpanded={isExpanded}
+ members={members}
+ searchText={searchText}
+ canEdit={canEdit}
+ canDelete={canDelete}
+ onToggle={() => toggleExpand(group)}
+ onEdit={() => onGroupSelected(group)}
+ onDelete={() => handleDelete(group)}
+ />
+ );
+ })}
+ </tbody>
+ </table>
+ </div>
+ );
+}
+
+function GroupRow({
+ group,
+ index,
+ isExpanded,
+ members,
+ searchText,
+ canEdit,
+ canDelete,
+ onToggle,
+ onEdit,
+ onDelete,
+}: {
+ group: Group;
+ index: number;
+ isExpanded: boolean;
+ members: User[] | undefined;
+ searchText: string;
+ canEdit: boolean;
+ canDelete: boolean;
+ onToggle: () => void;
+ onEdit: () => void;
+ onDelete: () => void;
+}) {
+ const { t } = useTranslation();
+ const stripeBg = index % 2 === 1 ? "bg-gray-50" : "";
+
+ return (
+ <>
+ <tr className={`border-b last:border-b-0 ${stripeBg}`}>
+ <td className="px-4 py-2">
+ <div className="flex items-center gap-x-2">
+ <button
+ className="shrink-0 p-0.5 rounded hover:bg-gray-200"
+ onClick={onToggle}
+ >
+ {isExpanded ? (
+ <ChevronDown className="h-4 w-4" />
+ ) : (
+ <ChevronRight className="h-4 w-4" />
+ )}
+ </button>
+ <Users className="h-4 w-4 shrink-0 text-control-light" />
+ <div className="flex flex-col">
+ <div className="flex items-center gap-x-1.5">
+ <span>
+ <HighlightText text={group.title} keyword={searchText} />
+ </span>
+ <span className="text-control-light text-xs">
+ (
+ {t("settings.members.groups.n-members", {
+ n: group.members.length,
+ })}
+ )
+ </span>
+ {group.source && (
+ <Badge className="text-xs px-1.5 py-0">{group.source}</Badge>
+ )}
+ </div>
+ <span className="textinfolabel text-xs">
+ <HighlightText text={group.name} keyword={searchText} />
+ </span>
+ </div>
+ </div>
+ </td>
+ <td className="px-4 py-2">
+ <div className="flex justify-end gap-x-1">
+ {canEdit && (
+ <Tooltip content={t("common.edit")}>
+ <Button
+ variant="ghost"
+ size="icon"
+ className="h-7 w-7"
+ onClick={onEdit}
+ >
+ <Pencil className="h-4 w-4" />
+ </Button>
+ </Tooltip>
+ )}
+ {canDelete && (
+ <Tooltip content={t("common.delete")}>
+ <Button
+ variant="ghost"
+ size="icon"
+ className="h-7 w-7 text-error hover:text-error"
+ onClick={onDelete}
+ >
+ <Trash2 className="h-4 w-4" />
+ </Button>
+ </Tooltip>
+ )}
+ </div>
+ </td>
+ </tr>
+ {isExpanded &&
+ members &&
+ members.map((user) => {
+ const memberInfo = group.members.find(
+ (m) => extractUserEmail(m.member) === user.email
+ );
+ const isOwner = memberInfo?.role === GroupMember_Role.OWNER;
+
+ return (
+ <tr
+ key={user.name}
+ className={`border-b last:border-b-0 ${stripeBg}`}
+ >
+ <td className="px-4 py-2 pl-14">
+ <div className="flex items-center gap-x-2">
+ <span>{user.title}</span>
+ <span className="textinfolabel text-xs">{user.email}</span>
+ {isOwner ? (
+ <Badge variant="secondary" className="text-xs px-1.5 py-0">
+ {t("settings.members.groups.form.role.owner")}
+ </Badge>
+ ) : (
+ <Badge variant="default" className="text-xs px-1.5 py-0">
+ {t("settings.members.groups.form.role.member")}
+ </Badge>
+ )}
+ </div>
+ </td>
+ <td />
+ </tr>
+ );
+ })}
+ {isExpanded && !members && (
+ <tr className={stripeBg}>
+ <td colSpan={2} className="px-4 py-2 pl-14">
+ <div className="flex items-center gap-x-2 text-control-light text-sm">
+ <div className="animate-spin h-4 w-4 border-2 border-accent border-t-transparent rounded-full" />
+ {t("common.loading")}
+ </div>
+ </td>
+ </tr>
+ )}
+ </>
+ );
+}
+
+// ============================================================
+// CreateGroupDrawer
+// ============================================================
+
+function CreateGroupDrawer({
+ group,
+ onClose,
+ onUpdated,
+ onRemoved,
+}: {
+ group: Group | undefined;
+ onClose: () => void;
+ onUpdated: (group: Group) => void;
+ onRemoved: (group: Group) => void;
+}) {
+ const { t } = useTranslation();
+ const groupStore = useGroupStore();
+ const settingV1Store = useSettingV1Store();
+ const actuatorStore = useActuatorV1Store();
+ const currentUser = useVueState(() => useCurrentUserV1().value);
+ const isSaaSMode = useVueState(() => actuatorStore.isSaaSMode);
+ const userStore = useUserStore();
+
+ const isEditMode = !!group;
+ const workspaceDomains = useVueState(
+ () => settingV1Store.workspaceProfile.domains
+ );
+ const domainOptions = workspaceDomains.filter((d) => d.trim());
+
+ const [email, setEmail] = useState(() => {
+ if (!group) return "";
+ return group.email ?? "";
+ });
+ const [selectedDomain, setSelectedDomain] = useState(() => {
+ if (group?.email) {
+ const atIdx = group.email.indexOf("@");
+ if (atIdx >= 0) {
+ const domain = group.email.slice(atIdx + 1);
+ if (domainOptions.includes(domain)) return domain;
+ }
+ }
+ return domainOptions[0] ?? "";
+ });
+ const [title, setTitle] = useState(group?.title ?? "");
+ const [description, setDescription] = useState(group?.description ?? "");
+ const [members, setMembers] = useState<GroupMember[]>(() => {
+ if (group) {
+ return group.members.map((m) =>
+ create(GroupMemberSchema, { member: m.member, role: m.role })
+ );
+ }
+ return [
+ create(GroupMemberSchema, {
+ role: GroupMember_Role.OWNER,
+ member: currentUser.name,
+ }),
+ ];
+ });
+ const [isRequesting, setIsRequesting] = useState(false);
+ const [showDeleteConfirm, setShowDeleteConfirm] = useState(false);
+
+ useEscapeKey(true, onClose);
+
+ const isExternalGroup = !!group?.source;
+
+ const allowEdit = isExternalGroup
+ ? false
+ : isEditMode
+ ? group.members.some(
+ (m) =>
+ extractUserEmail(m.member) === currentUser.email &&
+ m.role === GroupMember_Role.OWNER
+ ) || hasWorkspacePermissionV2("bb.groups.update")
+ : hasWorkspacePermissionV2("bb.groups.create");
+
+ const fullEmail = useMemo(() => {
+ if (isEditMode) return email;
+ if (!email) return "";
+ // When workspace domains are configured, enforce by using selected domain
+ if (domainOptions.length > 0 && selectedDomain) {
+ const localPart = email.split("@")[0];
+ return `${localPart}@${selectedDomain}`;
+ }
+ return email;
+ }, [email, isEditMode, domainOptions, selectedDomain]);
+
+ const errorMessage = useMemo(() => {
+ if (!title.trim())
+ return (
+ t("settings.members.groups.form.title") + " " + t("common.is-required")
+ );
+ if (!fullEmail || !isValidEmail(fullEmail))
+ return t("settings.members.groups.form.email-tips");
+ // Validate member identifiers — extract email part and check format
+ for (const m of members) {
+ const raw = m.member.trim();
+ if (!raw) continue;
+ const memberEmail = raw.startsWith("users/") ? raw.slice(6) : raw;
+ if (!isValidEmail(memberEmail)) {
+ return `Invalid member: ${raw}`;
+ }
+ }
+ return "";
+ }, [title, fullEmail, members, t]);
+
+ const hasChanged = useMemo(() => {
+ if (!isEditMode) return true;
+ if (!group) return true;
+ if (title !== group.title) return true;
+ if (description !== group.description) return true;
+ if (!isEqual(members, group.members)) return true;
+ return false;
+ }, [isEditMode, group, title, description, members]);
+
+ const allowConfirm = !errorMessage && hasChanged;
+
+ const handleAddMember = () => {
+ setMembers((prev) => [
+ ...prev,
+ create(GroupMemberSchema, { role: GroupMember_Role.MEMBER, member: "" }),
+ ]);
+ };
+
+ const handleRemoveMember = (index: number) => {
+ setMembers((prev) => prev.filter((_, i) => i !== index));
+ };
+
+ const handleMemberChange = (
+ index: number,
+ field: "member" | "role",
+ value: string | GroupMember_Role
+ ) => {
+ setMembers((prev) =>
+ prev.map((m, i) => {
+ if (i !== index) return m;
+ return create(GroupMemberSchema, {
+ ...m,
+ [field]: value,
+ });
+ })
+ );
+ };
+
+ const handleSubmit = async () => {
+ if (!allowConfirm || !allowEdit) return;
+ setIsRequesting(true);
+ try {
+ const normalizedMembers = members
+ .filter((m) => m.member.trim())
+ .map((m) =>
+ create(GroupMemberSchema, {
+ ...m,
+ member: normalizeMemberIdentifier(m.member),
+ })
+ );
+
+ // In self-hosted mode, verify all members exist via backend lookup
+ if (!isSaaSMode) {
+ const notFound: string[] = [];
+ for (const m of normalizedMembers) {
+ const user = await userStore.getOrFetchUserByIdentifier({
+ identifier: m.member,
+ silent: true,
+ fallback: false,
+ });
+ if (!user || user.name === UNKNOWN_USER_NAME) {
+ notFound.push(m.member.replace("users/", ""));
+ }
+ }
+ if (notFound.length > 0) {
+ pushNotification({
+ module: "bytebase",
+ style: "WARN",
+ title: `User not found: ${notFound.join(", ")}`,
+ });
+ setIsRequesting(false);
+ return;
+ }
+ }
+
+ const dedupedMembers = deduplicateMembers(normalizedMembers);
+ if (isEditMode && group) {
+ const validGroup = create(GroupSchema, {
+ name: group.name,
+ title,
+ description,
+ members: dedupedMembers,
+ });
+ const updated = await groupStore.updateGroup(validGroup);
+ onUpdated(updated);
+ pushNotification({
+ module: "bytebase",
+ style: "SUCCESS",
+ title: t("common.updated"),
+ });
+ } else {
+ const validGroup = create(GroupSchema, {
+ name: `${groupNamePrefix}${fullEmail}`,
+ title,
+ description,
+ members: dedupedMembers,
+ });
+ const created = await groupStore.createGroup(validGroup);
+ onUpdated(created);
+ pushNotification({
+ module: "bytebase",
+ style: "SUCCESS",
+ title: t("common.created"),
+ });
+ }
+ onClose();
+ } catch {
+ // error shown by store
+ } finally {
+ setIsRequesting(false);
+ }
+ };
+
+ const handleDelete = async () => {
+ if (!group) return;
+ setIsRequesting(true);
+ try {
+ await groupStore.deleteGroup(group.name);
+ onRemoved(group);
+ pushNotification({
+ module: "bytebase",
+ style: "SUCCESS",
+ title: t("common.deleted"),
+ });
+ onClose();
+ } catch {
+ // error shown by store
+ } finally {
+ setIsRequesting(false);
+ setShowDeleteConfirm(false);
+ }
+ };
+
+ const canDelete =
+ isEditMode &&
+ !isExternalGroup &&
+ (group.members.some(
+ (m) =>
+ extractUserEmail(m.member) === currentUser.email &&
+ m.role === GroupMember_Role.OWNER
+ ) ||
+ hasWorkspacePermissionV2("bb.groups.delete"));
+
+ return (
+ <>
+ {/* Backdrop */}
+ <div className="fixed inset-0 z-40 bg-black/30" onClick={onClose} />
+
+ {/* Drawer */}
+ <div
+ role="dialog"
+ aria-modal="true"
+ className="fixed inset-y-0 right-0 z-50 w-[40rem] max-w-[100vw] bg-white shadow-xl flex flex-col"
+ >
+ {/* Header */}
+ <div className="flex items-center justify-between px-6 py-4 border-b">
+ <h2 className="text-lg font-medium">
+ {isEditMode
+ ? t("settings.members.groups.update-group")
+ : t("settings.members.groups.add-group")}
+ </h2>
+ <Button variant="ghost" size="icon" onClick={onClose}>
+ <X className="h-5 w-5" />
+ </Button>
+ </div>
+
+ {/* Content */}
+ <div className="flex-1 overflow-auto px-6 py-6">
+ <div className="flex flex-col gap-y-6">
+ {isExternalGroup && (
+ <Alert variant="info">
+ <AlertDescription>
+ {t("settings.members.groups.external-readonly")}
+ </AlertDescription>
+ </Alert>
+ )}
+
+ {/* Email */}
+ <div className="flex flex-col gap-y-2">
+ <label className="block text-sm font-medium text-control">
+ {t("settings.members.groups.form.email")}
+ <span className="ml-0.5 text-error">*</span>
+ </label>
+ <span className="textinfolabel text-sm">
+ {t("settings.members.groups.form.email-tips")}
+ </span>
+ <div className="flex items-center gap-x-1">
+ <Input
+ value={isEditMode ? email : email.split("@")[0]}
+ onChange={(e) => setEmail(e.target.value)}
+ disabled={isEditMode || !allowEdit}
+ />
+ {!isEditMode && domainOptions.length > 0 && (
+ <>
+ <span className="text-sm text-control-light">@</span>
+ {domainOptions.length === 1 ? (
+ <span className="text-sm text-control-light whitespace-nowrap">
+ {domainOptions[0]}
+ </span>
+ ) : (
+ <select
+ value={selectedDomain}
+ onChange={(e) => setSelectedDomain(e.target.value)}
+ className="border border-control-border rounded-sm text-sm pl-2 pr-6 py-1"
+ disabled={!allowEdit}
+ >
+ {domainOptions.map((d) => (
+ <option key={d} value={d}>
+ {d}
+ </option>
+ ))}
+ </select>
+ )}
+ </>
+ )}
+ </div>
+ </div>
+
+ {/* Title */}
+ <div className="flex flex-col gap-y-2">
+ <label className="block text-sm font-medium text-control">
+ {t("settings.members.groups.form.title")}
+ <span className="ml-0.5 text-error">*</span>
+ </label>
+ <Input
+ value={title}
+ onChange={(e) => setTitle(e.target.value)}
+ maxLength={200}
+ disabled={!allowEdit}
+ />
+ </div>
+
+ {/* Description */}
+ <div className="flex flex-col gap-y-2">
+ <label className="block text-sm font-medium text-control">
+ {t("settings.members.groups.form.description")}
+ </label>
+ <Input
+ value={description}
+ onChange={(e) => setDescription(e.target.value)}
+ maxLength={1000}
+ disabled={!allowEdit}
+ />
+ </div>
+
+ {/* Members */}
+ <div className="flex flex-col gap-y-2">
+ <label className="block text-sm font-medium text-control">
+ {t("common.members", { count: 2 })}
+ </label>
+ <div className="flex flex-col gap-y-2">
+ {members.map((member, index) => (
+ <div key={index} className="flex items-center gap-x-2">
+ <Input
+ className="flex-1"
+ value={member.member}
+ onChange={(e) =>
+ handleMemberChange(index, "member", e.target.value)
+ }
+ placeholder="users/[email protected]"
+ disabled={!allowEdit}
+ />
+ <select
+ value={member.role}
+ onChange={(e) =>
+ handleMemberChange(
+ index,
+ "role",
+ Number(e.target.value) as GroupMember_Role
+ )
+ }
+ className="h-9 rounded-xs border border-control-border bg-transparent px-2 py-1 text-sm"
+ disabled={!allowEdit}
+ >
+ <option value={GroupMember_Role.OWNER}>
+ {t("settings.members.groups.form.role.owner")}
+ </option>
+ <option value={GroupMember_Role.MEMBER}>
+ {t("settings.members.groups.form.role.member")}
+ </option>
+ </select>
+ <Button
+ variant="ghost"
+ size="icon"
+ className="h-7 w-7 shrink-0 text-error hover:text-error"
+ onClick={() => handleRemoveMember(index)}
+ disabled={!allowEdit}
+ >
+ <Trash2 className="h-4 w-4" />
+ </Button>
+ </div>
+ ))}
+ {allowEdit && (
+ <Button
+ variant="outline"
+ size="sm"
+ className="self-start"
+ onClick={handleAddMember}
+ >
+ <Plus className="h-4 w-4 mr-1" />
+ {t("settings.members.add-member")}
+ </Button>
+ )}
+ </div>
+ </div>
+
+ {errorMessage && (
+ <p className="text-error text-sm">{errorMessage}</p>
+ )}
+ </div>
+ </div>
+
+ {/* Footer */}
+ <div className="flex items-center justify-between px-6 py-4 border-t">
+ <div>
+ {canDelete && (
+ <>
+ {showDeleteConfirm ? (
+ <div className="flex items-center gap-x-2">
+ <span className="text-sm text-error">
+ {t("settings.members.action.deactivate-confirm-title")}
+ </span>
+ <Button
+ variant="destructive"
+ size="sm"
+ onClick={handleDelete}
+ disabled={isRequesting}
+ >
+ {t("common.confirm")}
+ </Button>
+ <Button
+ variant="outline"
+ size="sm"
+ onClick={() => setShowDeleteConfirm(false)}
+ >
+ {t("common.cancel")}
+ </Button>
+ </div>
+ ) : (
+ <Button
+ variant="ghost"
+ className="text-error hover:text-error"
+ onClick={() => setShowDeleteConfirm(true)}
+ >
+ <Trash2 className="h-4 w-4 mr-1" />
+ {t("common.delete")}
+ </Button>
+ )}
+ </>
+ )}
+ </div>
+ <div className="flex items-center gap-x-2">
+ <Button variant="outline" onClick={onClose}>
+ {t("common.cancel")}
+ </Button>
+ <Button
+ disabled={!allowEdit || !allowConfirm || isRequesting}
+ onClick={handleSubmit}
+ >
+ {isEditMode ? t("common.update") : t("common.confirm")}
+ </Button>
+ </div>
+ </div>
+ </div>
+ </>
+ );
+}
+
+// ============================================================
+// GroupsPage (main)
+// ============================================================
+
+export function GroupsPage() {
+ const { t } = useTranslation();
+ const subscriptionStore = useSubscriptionV1Store();
+ const settingV1Store = useSettingV1Store();
+ const groupStore = useGroupStore();
+
+ const hasUserGroupFeature = useVueState(() =>
+ subscriptionStore.hasInstanceFeature(PlanFeature.FEATURE_USER_GROUPS)
+ );
+ const workspaceDomains = useVueState(
+ () => settingV1Store.workspaceProfile.domains
+ );
+ const hasDirectorySyncFeature = useVueState(() =>
+ subscriptionStore.hasInstanceFeature(PlanFeature.FEATURE_DIRECTORY_SYNC)
+ );
+ const canAccessSettings = hasWorkspacePermissionV2("bb.settings.get");
+
+ const [groupSearchText, setGroupSearchText] = useState("");
+ const [showCreateGroupDrawer, setShowCreateGroupDrawer] = useState(false);
+ const [showAadSyncDrawer, setShowAadSyncDrawer] = useState(false);
+ const [editingGroup, setEditingGroup] = useState<Group | undefined>(
+ undefined
+ );
+
+ // Groups paged data
+ const fetchGroups = useCallback(
+ async (params: { pageSize: number; pageToken: string }) => {
+ const { groups, nextPageToken } = await groupStore.fetchGroupList({
+ pageSize: params.pageSize,
+ pageToken: params.pageToken,
+ filter: { query: groupSearchText },
+ });
+ return { list: groups, nextPageToken };
+ },
+ [groupStore, groupSearchText]
+ );
+
+ const hasGroupListPermission = hasWorkspacePermissionV2("bb.groups.list");
+ const groupPaged = usePagedData<Group>({
+ sessionKey: "bb.paged-group-table",
+ fetchList: fetchGroups,
+ enabled: hasGroupListPermission,
+ });
+
+ // Handle query param for group opening: ?name=groups/...
+ useEffect(() => {
+ const handleRouteChange = () => {
+ const params = new URLSearchParams(window.location.search);
+ const name = params.get("name");
+ if (name && name.startsWith("groups/")) {
+ // Clear the query param so the drawer doesn't reopen on refresh/navigation
+ router.replace({
+ ...router.currentRoute.value,
+ query: {},
+ });
+ groupStore
+ .getOrFetchGroupByIdentifier(name)
+ .then((group) => {
+ if (group) {
+ setEditingGroup(group);
+ setShowCreateGroupDrawer(true);
+ }
+ })
+ .catch(() => {
+ // Group not found or fetch failed — silently ignore
+ });
+ }
+ };
+ // Run on mount
+ handleRouteChange();
+ // Listen for in-app navigation via Vue router (pushState/replaceState)
+ const unregister = router.afterEach(() => {
+ handleRouteChange();
+ });
+ return () => unregister();
+ }, []); // mount-only setup, router.afterEach handles subsequent changes
+
+ const handleGroupSelected = (group: Group) => {
+ setEditingGroup(group);
+ setShowCreateGroupDrawer(true);
+ };
+
+ const handleGroupDeleted = (group: Group) => {
+ groupPaged.removeCache(group);
+ };
+
+ return (
+ <div className="w-full px-4 overflow-x-hidden flex flex-col pt-2 pb-4">
+ {/* Action bar */}
+ <div className="flex items-center justify-between mb-4">
+ <div className="relative">
+ <Input
+ placeholder={t("common.filter-by-name")}
+ value={groupSearchText}
+ onChange={(e) => setGroupSearchText(e.target.value)}
+ className="h-8 text-sm pr-8"
+ />
+ <Search className="absolute right-2.5 top-1/2 -translate-y-1/2 h-4 w-4 text-control-placeholder pointer-events-none" />
+ </div>
+ <div className="flex items-center gap-x-2">
+ <Button
+ variant="outline"
+ disabled={!hasDirectorySyncFeature || !canAccessSettings}
+ onClick={() => setShowAadSyncDrawer(true)}
+ >
+ <Settings className="h-4 w-4 mr-1" />
+ <FeatureBadge
+ feature={PlanFeature.FEATURE_DIRECTORY_SYNC}
+ clickable={false}
+ />
+ {t("settings.members.entra-sync.self")}
+ </Button>
+ {workspaceDomains.length === 0 ? (
+ <Tooltip
+ content={
+ <span>
+ {t("settings.members.groups.workspace-domain-required")}{" "}
+ <a
+ href={
+ router.resolve({
+ name: SETTING_ROUTE_WORKSPACE_GENERAL,
+ hash: "#domain-restriction",
+ }).href
+ }
+ className="underline text-accent"
+ >
+ {t("common.configure")}
+ </a>
+ </span>
+ }
+ >
+ <Button disabled>
+ <Plus className="h-4 w-4 mr-1" />
+ <FeatureBadge
+ feature={PlanFeature.FEATURE_USER_GROUPS}
+ clickable={false}
+ />
+ {t("settings.members.groups.add-group")}
+ </Button>
+ </Tooltip>
+ ) : (
+ <Button
+ disabled={
+ !hasUserGroupFeature ||
+ !hasWorkspacePermissionV2("bb.groups.create")
+ }
+ onClick={() => {
+ setEditingGroup(undefined);
+ setShowCreateGroupDrawer(true);
+ }}
+ >
+ <Plus className="h-4 w-4 mr-1" />
+ <FeatureBadge
+ feature={PlanFeature.FEATURE_USER_GROUPS}
+ clickable={false}
+ />
+ {t("settings.members.groups.add-group")}
+ </Button>
+ )}
+ </div>
+ </div>
+
+ {/* Groups table */}
+ <ComponentPermissionGuard permissions={["bb.groups.list"]}>
+ {groupPaged.isLoading && groupPaged.dataList.length === 0 ? (
+ <div className="flex items-center justify-center h-32">
+ <div className="animate-spin h-6 w-6 border-2 border-accent border-t-transparent rounded-full" />
+ </div>
+ ) : (
+ <>
+ <GroupTable
+ groups={groupPaged.dataList}
+ searchText={groupSearchText}
+ onGroupSelected={handleGroupSelected}
+ onGroupDeleted={handleGroupDeleted}
+ />
+ <PagedTableFooter
+ pageSize={groupPaged.pageSize}
+ pageSizeOptions={groupPaged.pageSizeOptions}
+ onPageSizeChange={groupPaged.onPageSizeChange}
+ hasMore={groupPaged.hasMore}
+ isFetchingMore={groupPaged.isFetchingMore}
+ onLoadMore={groupPaged.loadMore}
+ />
+ </>
+ )}
+ </ComponentPermissionGuard>
+
+ {showCreateGroupDrawer && (
+ <CreateGroupDrawer
+ group={editingGroup}
+ onClose={() => {
+ setShowCreateGroupDrawer(false);
+ setEditingGroup(undefined);
+ }}
+ onUpdated={(group) => {
+ groupPaged.updateCache([group]);
+ }}
+ onRemoved={(group) => {
+ groupPaged.removeCache(group);
+ setShowCreateGroupDrawer(false);
+ setEditingGroup(undefined);
+ }}
+ />
+ )}
+
+ {showAadSyncDrawer && (
+ <AADSyncDrawer onClose={() => setShowAadSyncDrawer(false)} />
+ )}
+ </div>
+ );
+}
diff --git a/frontend/src/react/pages/settings/MembersPage.tsx b/frontend/src/react/pages/settings/MembersPage.tsx
new file mode 100644
index 0000000000..a009fb8aa8
--- /dev/null
+++ b/frontend/src/react/pages/settings/MembersPage.tsx
@@ -0,0 +1,727 @@
+import {
+ Building2,
+ ChevronDown,
+ ChevronRight,
+ Pencil,
+ Plus,
+ Search,
+ Trash2,
+ Users,
+ X,
+} from "lucide-react";
+import React, { useEffect, useMemo, useRef, useState } from "react";
+import { useTranslation } from "react-i18next";
+import type { MemberBinding } from "@/components/Member/types";
+import { getMemberBindings } from "@/components/Member/utils";
+import { Badge } from "@/react/components/ui/badge";
+import { Button } from "@/react/components/ui/button";
+import { Input } from "@/react/components/ui/input";
+import {
+ Tabs,
+ TabsList,
+ TabsPanel,
+ TabsTrigger,
+} from "@/react/components/ui/tabs";
+import { useEscapeKey } from "@/react/hooks/useEscapeKey";
+import { useVueState } from "@/react/hooks/useVueState";
+import {
+ pushNotification,
+ useActuatorV1Store,
+ useCurrentUserV1,
+ useWorkspaceV1Store,
+} from "@/store";
+import { ALL_USERS_USER_EMAIL, userBindingPrefix } from "@/types";
+import { State } from "@/types/proto-es/v1/common_pb";
+import { displayRoleTitle, hasWorkspacePermissionV2, sortRoles } from "@/utils";
+import { AccountMultiSelect } from "./shared/AccountMultiSelect";
+import { RoleMultiSelect } from "./shared/RoleMultiSelect";
+import { UserAvatar } from "./shared/UserAvatar";
+
+// ============================================================
+// MemberTable (view by members)
+// ============================================================
+
+function MemberTable({
+ bindings,
+ allowEdit,
+ selectedBindings,
+ onSelectionChange,
+ onUpdateBinding,
+ onRevokeBinding,
+}: {
+ bindings: MemberBinding[];
+ allowEdit: boolean;
+ selectedBindings: string[];
+ onSelectionChange: (selected: string[]) => void;
+ onUpdateBinding: (binding: MemberBinding) => void;
+ onRevokeBinding: (binding: MemberBinding) => void;
+}) {
+ const { t } = useTranslation();
+
+ const allSelected =
+ bindings.length > 0 &&
+ bindings.every((b) => selectedBindings.includes(b.binding));
+
+ const toggleAll = () => {
+ if (allSelected) {
+ onSelectionChange([]);
+ } else {
+ onSelectionChange(bindings.map((b) => b.binding));
+ }
+ };
+
+ const toggleOne = (binding: string) => {
+ onSelectionChange(
+ selectedBindings.includes(binding)
+ ? selectedBindings.filter((b) => b !== binding)
+ : [...selectedBindings, binding]
+ );
+ };
+
+ const canEdit = (mb: MemberBinding) => {
+ if (mb.type === "users") return mb.user?.state !== State.DELETED;
+ if (mb.type === "groups") return !mb.group?.deleted;
+ return true;
+ };
+
+ return (
+ <div className="border rounded-sm overflow-hidden">
+ <table className="w-full text-sm">
+ <thead>
+ <tr className="bg-gray-50 border-b">
+ {allowEdit && (
+ <th className="w-10 px-3 py-2">
+ <input
+ type="checkbox"
+ checked={allSelected}
+ onChange={toggleAll}
+ />
+ </th>
+ )}
+ <th className="px-4 py-2 text-left font-medium text-control-light">
+ {t("settings.members.table.account")}
+ </th>
+ <th className="px-4 py-2 text-left font-medium text-control-light">
+ {t("settings.members.table.roles")}
+ </th>
+ <th className="w-24 px-4 py-2 text-left font-medium text-control-light">
+ {t("common.operations")}
+ </th>
+ </tr>
+ </thead>
+ <tbody>
+ {bindings.map((mb) => (
+ <tr
+ key={mb.binding}
+ className="border-b last:border-b-0 hover:bg-gray-50"
+ >
+ {allowEdit && (
+ <td className="px-3 py-2">
+ <input
+ type="checkbox"
+ checked={selectedBindings.includes(mb.binding)}
+ onChange={() => toggleOne(mb.binding)}
+ />
+ </td>
+ )}
+ <td className="px-4 py-2">
+ <div className="flex items-center gap-x-3">
+ {mb.type === "users" ? (
+ <UserAvatar title={mb.title || mb.user?.email || "?"} />
+ ) : (
+ <div className="h-9 w-9 rounded-full bg-gray-200 flex items-center justify-center shrink-0">
+ <Users className="h-4 w-4 text-gray-500" />
+ </div>
+ )}
+ <div className="flex flex-col">
+ <div className="flex items-center gap-x-1.5">
+ <span className="font-medium text-accent">
+ {mb.title}
+ </span>
+ {mb.group && (
+ <span className="text-control-light text-xs">
+ ({mb.group.members.length}{" "}
+ {t("common.members", {
+ count: mb.group.members.length,
+ })}
+ )
+ </span>
+ )}
+ {mb.group?.deleted && (
+ <Badge variant="destructive" className="text-xs">
+ {t("common.deleted")}
+ </Badge>
+ )}
+ </div>
+ <span className="text-control-light text-xs">
+ {mb.type === "users"
+ ? mb.user?.email
+ : mb.binding.replace("group:", "groups/")}
+ </span>
+ </div>
+ </div>
+ </td>
+ <td className="px-4 py-2">
+ <div className="flex flex-wrap gap-1">
+ {sortRoles([...mb.workspaceLevelRoles]).map((role) => (
+ <Badge key={role} className="text-xs gap-x-1">
+ <Building2 className="h-3 w-3" />
+ {displayRoleTitle(role)}
+ </Badge>
+ ))}
+ </div>
+ </td>
+ <td className="px-4 py-2">
+ <div className="flex items-center gap-x-1">
+ {allowEdit && canEdit(mb) && (
+ <Button
+ variant="ghost"
+ size="icon"
+ onClick={() => onUpdateBinding(mb)}
+ >
+ <Pencil className="h-4 w-4" />
+ </Button>
+ )}
+ {allowEdit && (
+ <Button
+ variant="ghost"
+ size="icon"
+ onClick={() => {
+ if (
+ window.confirm(
+ t("settings.members.revoke-access-alert")
+ )
+ ) {
+ onRevokeBinding(mb);
+ }
+ }}
+ >
+ <Trash2 className="h-4 w-4" />
+ </Button>
+ )}
+ </div>
+ </td>
+ </tr>
+ ))}
+ {bindings.length === 0 && (
+ <tr>
+ <td
+ colSpan={allowEdit ? 4 : 3}
+ className="px-4 py-8 text-center text-control-light"
+ >
+ {t("common.no-data")}
+ </td>
+ </tr>
+ )}
+ </tbody>
+ </table>
+ </div>
+ );
+}
+
+// ============================================================
+// MemberTableByRole (view by roles)
+// ============================================================
+
+function MemberTableByRole({
+ bindings,
+ allowEdit,
+ onUpdateBinding,
+ onRevokeBinding,
+}: {
+ bindings: MemberBinding[];
+ allowEdit: boolean;
+ onUpdateBinding: (binding: MemberBinding) => void;
+ onRevokeBinding: (binding: MemberBinding) => void;
+}) {
+ const { t } = useTranslation();
+ const [expandedRoles, setExpandedRoles] = useState<Set<string>>(new Set());
+ const initializedRef = useRef(false);
+
+ const roleToBindings = useMemo(() => {
+ const map = new Map<string, MemberBinding[]>();
+ for (const mb of bindings) {
+ for (const role of mb.workspaceLevelRoles) {
+ if (!map.has(role)) map.set(role, []);
+ map.get(role)!.push(mb);
+ }
+ }
+ const sortedRoles = sortRoles([...map.keys()]);
+ return sortedRoles.map((role) => ({
+ role,
+ members: map.get(role) ?? [],
+ }));
+ }, [bindings]);
+
+ // Expand all roles by default on first load
+ useEffect(() => {
+ if (!initializedRef.current && roleToBindings.length > 0) {
+ initializedRef.current = true;
+ setExpandedRoles(new Set(roleToBindings.map((r) => r.role)));
+ }
+ }, [roleToBindings]);
+
+ const toggleRole = (role: string) => {
+ setExpandedRoles((prev) => {
+ const next = new Set(prev);
+ if (next.has(role)) next.delete(role);
+ else next.add(role);
+ return next;
+ });
+ };
+
+ const canEdit = (mb: MemberBinding) => {
+ if (mb.type === "users") return mb.user?.state !== State.DELETED;
+ if (mb.type === "groups") return !mb.group?.deleted;
+ return true;
+ };
+
+ return (
+ <div className="border rounded-sm overflow-hidden">
+ <table className="w-full text-sm">
+ <tbody>
+ {roleToBindings.map(({ role, members }) => {
+ const expanded = expandedRoles.has(role);
+ return (
+ <React.Fragment key={role}>
+ <tr
+ className="bg-gray-50 border-b cursor-pointer hover:bg-gray-100"
+ onClick={() => toggleRole(role)}
+ >
+ <td colSpan={3} className="px-4 py-2">
+ <div className="flex items-center gap-x-2">
+ {expanded ? (
+ <ChevronDown className="h-4 w-4" />
+ ) : (
+ <ChevronRight className="h-4 w-4" />
+ )}
+ <Building2 className="h-4 w-4 text-control-light" />
+ <span className="font-medium">
+ {displayRoleTitle(role)}
+ </span>
+ <span className="text-control-light text-xs">
+ ({members.length})
+ </span>
+ </div>
+ </td>
+ </tr>
+ {expanded &&
+ members.map((mb) => (
+ <tr
+ key={`${role}-${mb.binding}`}
+ className="border-b last:border-b-0 hover:bg-gray-50"
+ >
+ <td className="px-4 py-2 pl-10">
+ <div className="flex items-center gap-x-3">
+ {mb.type === "users" ? (
+ <UserAvatar
+ title={mb.title || mb.user?.email || "?"}
+ size="sm"
+ />
+ ) : (
+ <div className="h-7 w-7 rounded-full bg-gray-200 flex items-center justify-center shrink-0">
+ <Users className="h-3.5 w-3.5 text-gray-500" />
+ </div>
+ )}
+ <div className="flex flex-col">
+ <span className="font-medium text-accent">
+ {mb.title}
+ </span>
+ <span className="text-control-light text-xs">
+ {mb.type === "users"
+ ? mb.user?.email
+ : mb.binding.replace("group:", "groups/")}
+ </span>
+ </div>
+ {mb.group?.deleted && (
+ <Badge variant="destructive" className="text-xs">
+ {t("common.deleted")}
+ </Badge>
+ )}
+ </div>
+ </td>
+ <td className="px-4 py-2" />
+ <td className="w-24 px-4 py-2">
+ <div className="flex items-center gap-x-1">
+ {allowEdit && canEdit(mb) && (
+ <Button
+ variant="ghost"
+ size="icon"
+ onClick={() => onUpdateBinding(mb)}
+ >
+ <Pencil className="h-4 w-4" />
+ </Button>
+ )}
+ {allowEdit && (
+ <Button
+ variant="ghost"
+ size="icon"
+ onClick={() => {
+ if (
+ window.confirm(
+ t("settings.members.revoke-access-alert")
+ )
+ ) {
+ onRevokeBinding(mb);
+ }
+ }}
+ >
+ <Trash2 className="h-4 w-4" />
+ </Button>
+ )}
+ </div>
+ </td>
+ </tr>
+ ))}
+ </React.Fragment>
+ );
+ })}
+ {roleToBindings.length === 0 && (
+ <tr>
+ <td
+ colSpan={3}
+ className="px-4 py-8 text-center text-control-light"
+ >
+ {t("common.no-data")}
+ </td>
+ </tr>
+ )}
+ </tbody>
+ </table>
+ </div>
+ );
+}
+
+// ============================================================
+// EditMemberRoleDrawer
+// ============================================================
+
+function EditMemberRoleDrawer({
+ member,
+ onClose,
+}: {
+ member?: MemberBinding;
+ onClose: () => void;
+}) {
+ const { t } = useTranslation();
+ const workspaceStore = useWorkspaceV1Store();
+ const isSaaSMode = useVueState(() => useActuatorV1Store().isSaaSMode);
+
+ const isEditMode = !!member;
+
+ const [selectedBindings, setSelectedBindings] = useState<string[]>([]);
+ const [selectedRoles, setSelectedRoles] = useState<string[]>(() =>
+ member ? [...member.workspaceLevelRoles] : []
+ );
+ const [isRequesting, setIsRequesting] = useState(false);
+
+ useEscapeKey(true, onClose);
+
+ const handleSubmit = async () => {
+ setIsRequesting(true);
+ try {
+ if (isEditMode) {
+ await workspaceStore.patchIamPolicy([
+ { member: member.binding, roles: selectedRoles },
+ ]);
+ } else {
+ const batchPatch = selectedBindings.map((binding) => {
+ const existedRoles = workspaceStore.findRolesByMember(binding);
+ return {
+ member: binding,
+ roles: [...new Set([...selectedRoles, ...existedRoles])],
+ };
+ });
+ await workspaceStore.patchIamPolicy(batchPatch);
+ }
+ pushNotification({
+ module: "bytebase",
+ style: "SUCCESS",
+ title: isEditMode ? t("common.updated") : t("common.created"),
+ });
+ onClose();
+ } catch {
+ // error shown by store
+ } finally {
+ setIsRequesting(false);
+ }
+ };
+
+ const handleRevoke = async () => {
+ if (!member) return;
+ const isAllUsers =
+ member.binding === ALL_USERS_USER_EMAIL ||
+ member.binding === `${userBindingPrefix}${ALL_USERS_USER_EMAIL}`;
+ const message = isAllUsers
+ ? t("settings.members.revoke-allusers-alert")
+ : t("settings.members.revoke-access-alert");
+ if (!window.confirm(message)) return;
+
+ setIsRequesting(true);
+ try {
+ await workspaceStore.patchIamPolicy([
+ { member: member.binding, roles: [] },
+ ]);
+ pushNotification({
+ module: "bytebase",
+ style: "INFO",
+ title: t("settings.members.revoked"),
+ });
+ onClose();
+ } catch {
+ // error shown by store
+ } finally {
+ setIsRequesting(false);
+ }
+ };
+
+ const allowConfirm = isEditMode
+ ? selectedRoles.length > 0
+ : selectedBindings.length > 0 && selectedRoles.length > 0;
+
+ return (
+ <>
+ <div className="fixed inset-0 z-40 bg-black/30" onClick={onClose} />
+ <div
+ role="dialog"
+ aria-modal="true"
+ className="fixed inset-y-0 right-0 z-50 w-[40rem] max-w-[100vw] bg-white shadow-xl flex flex-col"
+ >
+ <div className="flex items-center justify-between px-6 py-4 border-b">
+ <h2 className="text-lg font-medium">
+ {t("settings.members.grant-access")}
+ </h2>
+ <Button variant="ghost" size="icon" onClick={onClose}>
+ <X className="h-5 w-5" />
+ </Button>
+ </div>
+
+ <div className="flex-1 overflow-auto px-6 py-6">
+ <div className="flex flex-col gap-y-6">
+ {/* Member input */}
+ <div className="flex flex-col gap-y-2">
+ <label className="block text-sm font-medium text-control">
+ {t("settings.members.select-account", { count: 1 })}
+ </label>
+ {isEditMode ? (
+ <Input value={member.binding} disabled />
+ ) : (
+ <AccountMultiSelect
+ value={selectedBindings}
+ onChange={setSelectedBindings}
+ includeAllUsers={!isSaaSMode}
+ />
+ )}
+ </div>
+
+ {/* Roles */}
+ <div className="flex flex-col gap-y-2">
+ <label className="block text-sm font-medium text-control">
+ {t("settings.members.select-role", { count: 2 })}
+ </label>
+ <RoleMultiSelect
+ value={selectedRoles}
+ onChange={setSelectedRoles}
+ />
+ </div>
+ </div>
+ </div>
+
+ <div className="flex items-center justify-between px-6 py-4 border-t">
+ <div>
+ {isEditMode && (
+ <Button
+ variant="destructive"
+ disabled={isRequesting}
+ onClick={handleRevoke}
+ >
+ {t("settings.members.revoke-access")}
+ </Button>
+ )}
+ </div>
+ <div className="flex items-center gap-x-2">
+ <Button variant="outline" onClick={onClose}>
+ {t("common.cancel")}
+ </Button>
+ <Button
+ disabled={!allowConfirm || isRequesting}
+ onClick={handleSubmit}
+ >
+ {t("common.confirm")}
+ </Button>
+ </div>
+ </div>
+ </div>
+ </>
+ );
+}
+
+// ============================================================
+// MembersPage
+// ============================================================
+
+export function MembersPage() {
+ const { t } = useTranslation();
+ const workspaceStore = useWorkspaceV1Store();
+ const currentUser = useVueState(() => useCurrentUserV1().value);
+
+ const [memberSearchText, setMemberSearchText] = useState("");
+ const [memberViewTab, setMemberViewTab] = useState<"MEMBERS" | "ROLES">(
+ "MEMBERS"
+ );
+ const [selectedMembers, setSelectedMembers] = useState<string[]>([]);
+ const [showEditMemberDrawer, setShowEditMemberDrawer] = useState(false);
+ const [editingMember, setEditingMember] = useState<
+ MemberBinding | undefined
+ >();
+
+ const memberBindings = useVueState(() =>
+ getMemberBindings({
+ policies: [
+ {
+ level: "WORKSPACE" as const,
+ policy: workspaceStore.workspaceIamPolicy,
+ },
+ ],
+ searchText: memberSearchText,
+ ignoreRoles: new Set([]),
+ })
+ );
+
+ const canSetIamPolicy = hasWorkspacePermissionV2(
+ "bb.workspaces.setIamPolicy"
+ );
+
+ const handleRevokeSelected = async () => {
+ if (
+ selectedMembers.some(
+ (m) => m === `${userBindingPrefix}${currentUser.email}`
+ )
+ ) {
+ pushNotification({
+ module: "bytebase",
+ style: "WARN",
+ title: t("settings.members.cannot-revoke-self"),
+ });
+ return;
+ }
+ if (window.confirm(t("settings.members.revoke-access-alert"))) {
+ try {
+ await workspaceStore.patchIamPolicy(
+ selectedMembers.map((m) => ({ member: m, roles: [] }))
+ );
+ pushNotification({
+ module: "bytebase",
+ style: "INFO",
+ title: t("settings.members.revoked"),
+ });
+ setSelectedMembers([]);
+ } catch {
+ // error already shown by store
+ }
+ }
+ };
+
+ const handleMemberUpdateBinding = (binding: MemberBinding) => {
+ setEditingMember(binding);
+ setShowEditMemberDrawer(true);
+ };
+
+ const handleMemberRevokeBinding = async (binding: MemberBinding) => {
+ try {
+ await workspaceStore.patchIamPolicy([
+ { member: binding.binding, roles: [] },
+ ]);
+ pushNotification({
+ module: "bytebase",
+ style: "INFO",
+ title: t("settings.members.revoked"),
+ });
+ } catch {
+ // error already shown by store
+ }
+ };
+
+ return (
+ <div className="w-full px-4 overflow-x-hidden flex flex-col pt-2 pb-4">
+ <div className="flex items-center justify-between mb-4">
+ <div className="relative">
+ <Input
+ placeholder={t("settings.members.search-member")}
+ value={memberSearchText}
+ onChange={(e) => setMemberSearchText(e.target.value)}
+ className="h-8 text-sm pr-8"
+ />
+ <Search className="absolute right-2.5 top-1/2 -translate-y-1/2 h-4 w-4 text-control-placeholder pointer-events-none" />
+ </div>
+ <div className="flex items-center gap-x-2">
+ {memberViewTab === "MEMBERS" && (
+ <Button
+ variant="outline"
+ disabled={!canSetIamPolicy || selectedMembers.length === 0}
+ onClick={handleRevokeSelected}
+ >
+ {t("settings.members.revoke-access")}
+ </Button>
+ )}
+ <Button
+ disabled={!canSetIamPolicy}
+ onClick={() => {
+ setEditingMember(undefined);
+ setShowEditMemberDrawer(true);
+ }}
+ >
+ <Plus className="h-4 w-4 mr-1" />
+ {t("settings.members.grant-access")}
+ </Button>
+ </div>
+ </div>
+
+ <Tabs
+ value={memberViewTab}
+ onValueChange={(v) => setMemberViewTab(v as "MEMBERS" | "ROLES")}
+ >
+ <TabsList>
+ <TabsTrigger value="MEMBERS">
+ {t("settings.members.view-by-members")}
+ </TabsTrigger>
+ <TabsTrigger value="ROLES">
+ {t("settings.members.view-by-roles")}
+ </TabsTrigger>
+ </TabsList>
+ <TabsPanel value="MEMBERS">
+ <div className="py-4">
+ <MemberTable
+ bindings={memberBindings}
+ allowEdit={canSetIamPolicy}
+ selectedBindings={selectedMembers}
+ onSelectionChange={setSelectedMembers}
+ onUpdateBinding={handleMemberUpdateBinding}
+ onRevokeBinding={handleMemberRevokeBinding}
+ />
+ </div>
+ </TabsPanel>
+ <TabsPanel value="ROLES">
+ <div className="py-4">
+ <MemberTableByRole
+ bindings={memberBindings}
+ allowEdit={canSetIamPolicy}
+ onUpdateBinding={handleMemberUpdateBinding}
+ onRevokeBinding={handleMemberRevokeBinding}
+ />
+ </div>
+ </TabsPanel>
+ </Tabs>
+
+ {showEditMemberDrawer && (
+ <EditMemberRoleDrawer
+ member={editingMember}
+ onClose={() => {
+ setShowEditMemberDrawer(false);
+ setEditingMember(undefined);
+ }}
+ />
+ )}
+ </div>
+ );
+}
diff --git a/frontend/src/react/pages/settings/ServiceAccountsPage.tsx b/frontend/src/react/pages/settings/ServiceAccountsPage.tsx
new file mode 100644
index 0000000000..d4e72df7ec
--- /dev/null
+++ b/frontend/src/react/pages/settings/ServiceAccountsPage.tsx
@@ -0,0 +1,716 @@
+import { create } from "@bufbuild/protobuf";
+import { FieldMaskSchema } from "@bufbuild/protobuf/wkt";
+import { Copy, KeyRound, Pencil, Plus, Trash2, Undo2, X } from "lucide-react";
+import { useCallback, useState } from "react";
+import { useTranslation } from "react-i18next";
+import { Badge } from "@/react/components/ui/badge";
+import { Button } from "@/react/components/ui/button";
+import { Tooltip } from "@/react/components/ui/tooltip";
+import { useEscapeKey } from "@/react/hooks/useEscapeKey";
+import { useVueState } from "@/react/hooks/useVueState";
+import {
+ ensureServiceAccountFullName,
+ pushNotification,
+ useActuatorV1Store,
+ useWorkspaceV1Store,
+} from "@/store";
+import {
+ serviceAccountToUser,
+ useServiceAccountStore,
+} from "@/store/modules/serviceAccount";
+import {
+ getServiceAccountNameInBinding,
+ getServiceAccountSuffix,
+} from "@/types";
+import { State } from "@/types/proto-es/v1/common_pb";
+import type { ServiceAccount } from "@/types/proto-es/v1/service_account_service_pb";
+import type { User } from "@/types/proto-es/v1/user_service_pb";
+import { hasWorkspacePermissionV2 } from "@/utils";
+import { RoleMultiSelect } from "./shared/RoleMultiSelect";
+import { UserAvatar } from "./shared/UserAvatar";
+import { PagedTableFooter, usePagedData } from "./shared/usePagedData";
+
+// ============================================================
+// ServiceAccountTable
+// ============================================================
+
+function ServiceAccountTable({
+ users,
+ onUserUpdated,
+ onUserSelected,
+}: {
+ users: User[];
+ onUserUpdated: (user: User) => void;
+ onUserSelected?: (user: User) => void;
+}) {
+ const { t } = useTranslation();
+ const serviceAccountStore = useServiceAccountStore();
+
+ const handleDeactivate = async (user: User) => {
+ const confirmed = window.confirm(
+ t("settings.members.action.deactivate-confirm-title")
+ );
+ if (!confirmed) return;
+
+ try {
+ await serviceAccountStore.deleteServiceAccount(
+ ensureServiceAccountFullName(user.email)
+ );
+ const updated = create(
+ (await import("@/types/proto-es/v1/user_service_pb")).UserSchema,
+ { ...user, state: State.DELETED }
+ );
+ onUserUpdated(updated);
+ pushNotification({
+ module: "bytebase",
+ style: "SUCCESS",
+ title: t("common.updated"),
+ });
+ } catch {
+ // error already shown by store
+ }
+ };
+
+ const handleRestore = async (user: User) => {
+ try {
+ await serviceAccountStore.undeleteServiceAccount(
+ ensureServiceAccountFullName(user.email)
+ );
+ const updated = create(
+ (await import("@/types/proto-es/v1/user_service_pb")).UserSchema,
+ { ...user, state: State.ACTIVE }
+ );
+ onUserUpdated(updated);
+ pushNotification({
+ module: "bytebase",
+ style: "SUCCESS",
+ title: t("common.updated"),
+ });
+ } catch {
+ // error already shown by store
+ }
+ };
+
+ const [resetConfirmUser, setResetConfirmUser] = useState<User | undefined>();
+ const [copiedKeys, setCopiedKeys] = useState<Set<string>>(new Set());
+
+ const handleResetKey = async (user: User) => {
+ setResetConfirmUser(undefined);
+ try {
+ const sa = await serviceAccountStore.updateServiceAccount(
+ { name: ensureServiceAccountFullName(user.email) },
+ create(FieldMaskSchema, { paths: ["service_key"] })
+ );
+ const updated = serviceAccountToUser(sa);
+ onUserUpdated(updated);
+ if (updated.serviceKey) {
+ await navigator.clipboard.writeText(updated.serviceKey);
+ setCopiedKeys((prev) => new Set(prev).add(updated.name));
+ pushNotification({
+ module: "bytebase",
+ style: "INFO",
+ title: t("settings.members.service-key-copied"),
+ });
+ }
+ } catch {
+ // error shown by store
+ }
+ };
+
+ const handleCopyKey = async (user: User) => {
+ await navigator.clipboard.writeText(user.serviceKey);
+ setCopiedKeys((prev) => new Set(prev).add(user.name));
+ pushNotification({
+ module: "bytebase",
+ style: "INFO",
+ title: t("settings.members.service-key-copied"),
+ });
+ };
+
+ if (users.length === 0) {
+ return (
+ <div className="py-8 text-center text-control-light text-sm">
+ {t("common.no-data")}
+ </div>
+ );
+ }
+
+ return (
+ <div className="border rounded-sm overflow-hidden">
+ <table className="w-full text-sm">
+ <thead>
+ <tr className="border-b bg-control-bg">
+ <th className="px-4 py-2 text-left font-medium whitespace-nowrap">
+ {t("settings.members.table.account")}
+ </th>
+ <th className="px-4 py-2 text-right font-medium whitespace-nowrap">
+ {t("common.operations")}
+ </th>
+ </tr>
+ </thead>
+ <tbody>
+ {users.map((user, i) => {
+ const isDeleted = user.state === State.DELETED;
+
+ return (
+ <tr
+ key={user.name}
+ className={`border-b last:border-b-0 ${i % 2 === 1 ? "bg-gray-50" : ""}`}
+ >
+ {/* Account column */}
+ <td className="px-4 py-2">
+ <div className="flex items-center gap-x-3">
+ <UserAvatar title={user.title || user.email} />
+ <div className="flex flex-col min-w-0">
+ <div className="flex items-center gap-x-1.5">
+ <span
+ className={
+ isDeleted
+ ? "line-through text-control-light"
+ : "font-medium text-accent"
+ }
+ >
+ {user.title}
+ </span>
+ <Badge className="text-xs px-1.5 py-0">
+ {t("settings.members.service-account")}
+ </Badge>
+ </div>
+ <span className="textinfolabel text-xs">
+ {user.email}
+ </span>
+ </div>
+ {!isDeleted && (
+ <div className="ml-auto text-xs shrink-0">
+ {user.serviceKey && !copiedKeys.has(user.name) ? (
+ <Button
+ variant="outline"
+ size="sm"
+ className="h-6 text-xs"
+ onClick={(e) => {
+ e.stopPropagation();
+ handleCopyKey(user);
+ }}
+ >
+ <Copy className="h-3 w-3 mr-1" />
+ {t("settings.members.copy-service-key")}
+ </Button>
+ ) : resetConfirmUser?.name === user.name ? (
+ <div className="flex items-center gap-x-1">
+ <span className="text-xs text-error">
+ {t("settings.members.reset-service-key-alert")}
+ </span>
+ <Button
+ variant="destructive"
+ size="sm"
+ className="h-6 text-xs"
+ onClick={(e) => {
+ e.stopPropagation();
+ handleResetKey(user);
+ }}
+ >
+ {t("common.confirm")}
+ </Button>
+ <Button
+ variant="outline"
+ size="sm"
+ className="h-6 text-xs"
+ onClick={(e) => {
+ e.stopPropagation();
+ setResetConfirmUser(undefined);
+ }}
+ >
+ {t("common.cancel")}
+ </Button>
+ </div>
+ ) : (
+ <Button
+ variant="outline"
+ size="sm"
+ className="h-6 text-xs"
+ onClick={(e) => {
+ e.stopPropagation();
+ setResetConfirmUser(user);
+ }}
+ >
+ <KeyRound className="h-3 w-3 mr-1" />
+ {t("settings.members.reset-service-key")}
+ </Button>
+ )}
+ </div>
+ )}
+ </div>
+ </td>
+
+ {/* Operations column */}
+ <td className="px-4 py-2">
+ <div className="flex justify-end gap-x-1">
+ {!isDeleted && (
+ <>
+ {hasWorkspacePermissionV2(
+ "bb.serviceAccounts.delete"
+ ) && (
+ <Tooltip
+ content={t(
+ "settings.members.action.deactivate-confirm-title"
+ )}
+ >
+ <Button
+ variant="ghost"
+ size="icon"
+ className="h-7 w-7 text-error hover:text-error"
+ onClick={() => handleDeactivate(user)}
+ >
+ <Trash2 className="h-4 w-4" />
+ </Button>
+ </Tooltip>
+ )}
+ {hasWorkspacePermissionV2("bb.serviceAccounts.get") && (
+ <Tooltip content={t("common.edit")}>
+ <Button
+ variant="ghost"
+ size="icon"
+ className="h-7 w-7"
+ onClick={() => onUserSelected?.(user)}
+ >
+ <Pencil className="h-4 w-4" />
+ </Button>
+ </Tooltip>
+ )}
+ </>
+ )}
+ {isDeleted &&
+ hasWorkspacePermissionV2(
+ "bb.serviceAccounts.undelete"
+ ) && (
+ <Tooltip
+ content={t(
+ "settings.members.action.reactivate-confirm-title"
+ )}
+ >
+ <Button
+ variant="ghost"
+ size="icon"
+ className="h-7 w-7"
+ onClick={() => handleRestore(user)}
+ >
+ <Undo2 className="h-4 w-4" />
+ </Button>
+ </Tooltip>
+ )}
+ </div>
+ </td>
+ </tr>
+ );
+ })}
+ </tbody>
+ </table>
+ </div>
+ );
+}
+
+// ============================================================
+// CreateServiceAccountDrawer
+// ============================================================
+
+function CreateServiceAccountDrawer({
+ serviceAccount,
+ onClose,
+ onCreated,
+ onUpdated,
+}: {
+ serviceAccount: ServiceAccount | undefined;
+ onClose: () => void;
+ onCreated: (sa: ServiceAccount) => void;
+ onUpdated: (sa: ServiceAccount) => void;
+}) {
+ const { t } = useTranslation();
+ const serviceAccountStore = useServiceAccountStore();
+ const workspaceStore = useWorkspaceV1Store();
+ const actuatorStore = useActuatorV1Store();
+
+ const parent = useVueState(() => actuatorStore.workspaceResourceName);
+
+ const isEditMode = !!serviceAccount && !!serviceAccount.email;
+ const emailSuffix = getServiceAccountSuffix();
+
+ const [title, setTitle] = useState(serviceAccount?.title ?? "");
+ const [emailPrefix, setEmailPrefix] = useState(
+ serviceAccount?.email ? serviceAccount.email.split("@")[0] : ""
+ );
+ const [roles, setRoles] = useState<string[]>([]);
+ const [isRequesting, setIsRequesting] = useState(false);
+
+ useEscapeKey(true, onClose);
+
+ const allowConfirm = isEditMode ? true : emailPrefix.trim().length > 0;
+
+ const hasPermission = hasWorkspacePermissionV2(
+ isEditMode ? "bb.serviceAccounts.update" : "bb.serviceAccounts.create"
+ );
+
+ const handleSubmit = async () => {
+ if (!allowConfirm || !hasPermission) return;
+ setIsRequesting(true);
+ try {
+ if (isEditMode) {
+ await handleUpdate();
+ } else {
+ await handleCreate();
+ }
+ } catch {
+ // error shown by store
+ } finally {
+ setIsRequesting(false);
+ }
+ };
+
+ const handleCreate = async () => {
+ const sa = await serviceAccountStore.createServiceAccount(
+ emailPrefix.trim(),
+ { title: title.trim() || emailPrefix.trim() },
+ parent
+ );
+
+ if (roles.length > 0) {
+ await workspaceStore.patchIamPolicy([
+ {
+ member: getServiceAccountNameInBinding(sa.email),
+ roles,
+ },
+ ]);
+ }
+
+ onCreated(sa);
+ pushNotification({
+ module: "bytebase",
+ style: "SUCCESS",
+ title: t("common.created"),
+ });
+ onClose();
+ };
+
+ const handleUpdate = async () => {
+ if (!serviceAccount) return;
+
+ const updateMask: string[] = [];
+ if (title !== serviceAccount.title) {
+ updateMask.push("title");
+ }
+
+ let updatedSa: ServiceAccount = serviceAccount;
+ if (updateMask.length > 0) {
+ updatedSa = await serviceAccountStore.updateServiceAccount(
+ {
+ name: ensureServiceAccountFullName(serviceAccount.email),
+ title,
+ },
+ create(FieldMaskSchema, { paths: [...updateMask] })
+ );
+ }
+
+ onUpdated(updatedSa);
+ pushNotification({
+ module: "bytebase",
+ style: "SUCCESS",
+ title: t("common.updated"),
+ });
+ onClose();
+ };
+
+ return (
+ <>
+ {/* Backdrop */}
+ <div className="fixed inset-0 z-40 bg-black/30" onClick={onClose} />
+
+ {/* Drawer */}
+ <div
+ role="dialog"
+ aria-modal="true"
+ className="fixed inset-y-0 right-0 z-50 w-[40rem] max-w-[100vw] bg-white shadow-xl flex flex-col"
+ >
+ {/* Header */}
+ <div className="flex items-center justify-between px-6 py-4 border-b">
+ <h2 className="text-lg font-medium">
+ {isEditMode
+ ? t("settings.members.update-service-account")
+ : t("settings.members.add-service-account")}
+ </h2>
+ <Button variant="ghost" size="icon" onClick={onClose}>
+ <X className="h-5 w-5" />
+ </Button>
+ </div>
+
+ {/* Content */}
+ <div className="flex-1 overflow-auto px-6 py-6">
+ <div className="flex flex-col gap-y-6">
+ {/* Name */}
+ <div className="flex flex-col gap-y-2">
+ <label className="block text-sm font-medium text-control">
+ {t("common.name")}
+ </label>
+ <input
+ type="text"
+ autoComplete="off"
+ value={title}
+ onChange={(e) => setTitle(e.target.value)}
+ placeholder="Foo"
+ maxLength={200}
+ className="flex h-9 w-full rounded-xs border border-control-border bg-transparent px-3 py-1 text-sm outline-hidden placeholder:text-control-placeholder focus:ring-2 focus:ring-accent focus:border-accent"
+ />
+ </div>
+
+ {/* Email */}
+ <div className="flex flex-col gap-y-2">
+ <label className="block text-sm font-medium text-control">
+ {t("common.email")}
+ <span className="ml-0.5 text-error">*</span>
+ </label>
+ {isEditMode ? (
+ <input
+ type="text"
+ value={serviceAccount?.email ?? ""}
+ disabled
+ className="flex h-9 w-full rounded-xs border border-control-border bg-gray-50 px-3 py-1 text-sm opacity-60 cursor-not-allowed"
+ />
+ ) : (
+ <div className="flex items-center border border-control-border rounded-xs overflow-hidden focus-within:ring-2 focus-within:ring-accent focus-within:border-accent">
+ <input
+ type="text"
+ autoComplete="off"
+ value={emailPrefix}
+ onChange={(e) => setEmailPrefix(e.target.value)}
+ className="flex-1 h-9 px-3 py-1 text-sm outline-hidden bg-transparent"
+ />
+ <span className="px-2 py-1 text-sm text-control-light bg-control-bg border-l border-control-border whitespace-nowrap">
+ @{emailSuffix}
+ </span>
+ </div>
+ )}
+ </div>
+
+ {/* Roles (create mode only) */}
+ {!isEditMode &&
+ hasWorkspacePermissionV2("bb.workspaces.setIamPolicy") && (
+ <div className="flex flex-col gap-y-2">
+ <label className="block text-sm font-medium text-control">
+ {t("settings.members.table.roles")}
+ </label>
+ <RoleMultiSelect
+ value={roles}
+ onChange={setRoles}
+ disabled={false}
+ />
+ </div>
+ )}
+ </div>
+ </div>
+
+ {/* Footer */}
+ <div className="flex items-center justify-end gap-x-2 px-6 py-4 border-t">
+ <Button variant="outline" onClick={onClose}>
+ {t("common.cancel")}
+ </Button>
+ <Button
+ disabled={!allowConfirm || !hasPermission || isRequesting}
+ onClick={handleSubmit}
+ >
+ {isEditMode ? t("common.update") : t("common.confirm")}
+ </Button>
+ </div>
+ </div>
+ </>
+ );
+}
+
+// ============================================================
+// ServiceAccountsPage (main)
+// ============================================================
+
+export function ServiceAccountsPage() {
+ const { t } = useTranslation();
+ const actuatorStore = useActuatorV1Store();
+ const serviceAccountStore = useServiceAccountStore();
+
+ const parent = useVueState(() => actuatorStore.workspaceResourceName);
+
+ const [showInactive, setShowInactive] = useState(false);
+ const [showDrawer, setShowDrawer] = useState(false);
+ const [editingSa, setEditingSa] = useState<ServiceAccount | undefined>(
+ undefined
+ );
+
+ // Active service accounts
+ const fetchActive = useCallback(
+ async (params: { pageSize: number; pageToken: string }) => {
+ const response = await serviceAccountStore.listServiceAccounts({
+ parent,
+ pageSize: params.pageSize,
+ pageToken: params.pageToken,
+ showDeleted: false,
+ });
+ const list: User[] = response.serviceAccounts.map(serviceAccountToUser);
+ return { list, nextPageToken: response.nextPageToken };
+ },
+ [serviceAccountStore, parent]
+ );
+
+ const activeData = usePagedData<User>({
+ sessionKey: "bb.service-accounts.active.page-size",
+ fetchList: fetchActive,
+ });
+
+ // Inactive service accounts
+ const fetchInactive = useCallback(
+ async (params: { pageSize: number; pageToken: string }) => {
+ const response = await serviceAccountStore.listServiceAccounts({
+ parent,
+ pageSize: params.pageSize,
+ pageToken: params.pageToken,
+ showDeleted: true,
+ filter: { state: State.DELETED },
+ });
+ const list: User[] = response.serviceAccounts.map(serviceAccountToUser);
+ return { list, nextPageToken: response.nextPageToken };
+ },
+ [serviceAccountStore, parent]
+ );
+
+ const inactiveData = usePagedData<User>({
+ sessionKey: "bb.service-accounts.inactive.page-size",
+ enabled: showInactive,
+ fetchList: fetchInactive,
+ });
+
+ const handleActiveUserUpdated = (user: User) => {
+ if (user.state === State.DELETED) {
+ activeData.removeCache(user);
+ inactiveData.updateCache([user]);
+ } else {
+ activeData.updateCache([user]);
+ }
+ };
+
+ const handleInactiveUserUpdated = (user: User) => {
+ if (user.state === State.ACTIVE) {
+ inactiveData.removeCache(user);
+ activeData.updateCache([user]);
+ } else {
+ inactiveData.updateCache([user]);
+ }
+ };
+
+ const handleOpenEdit = (user: User) => {
+ const sa = serviceAccountStore.getServiceAccount(user.email);
+ setEditingSa(sa);
+ setShowDrawer(true);
+ };
+
+ const handleCreated = (sa: ServiceAccount) => {
+ activeData.updateCache([serviceAccountToUser(sa)]);
+ };
+
+ const handleUpdated = (sa: ServiceAccount) => {
+ activeData.updateCache([serviceAccountToUser(sa)]);
+ };
+
+ return (
+ <div className="w-full px-4 overflow-x-hidden flex flex-col pt-2 pb-4">
+ {/* Header */}
+ <div className="flex items-center justify-between mb-4">
+ <h2 className="text-lg font-medium leading-7 text-main">
+ {t("settings.members.service-accounts")}
+ </h2>
+ <Button
+ disabled={!hasWorkspacePermissionV2("bb.serviceAccounts.create")}
+ onClick={() => {
+ setEditingSa(undefined);
+ setShowDrawer(true);
+ }}
+ >
+ <Plus className="h-4 w-4 mr-1" />
+ {t("settings.members.add-service-account")}
+ </Button>
+ </div>
+
+ <div className="flex flex-col gap-y-4">
+ {/* Active list */}
+ {activeData.isLoading && activeData.dataList.length === 0 ? (
+ <div className="flex items-center justify-center h-32">
+ <div className="animate-spin h-6 w-6 border-2 border-accent border-t-transparent rounded-full" />
+ </div>
+ ) : (
+ <>
+ <ServiceAccountTable
+ users={activeData.dataList}
+ onUserUpdated={handleActiveUserUpdated}
+ onUserSelected={handleOpenEdit}
+ />
+ <PagedTableFooter
+ pageSize={activeData.pageSize}
+ pageSizeOptions={activeData.pageSizeOptions}
+ onPageSizeChange={activeData.onPageSizeChange}
+ hasMore={activeData.hasMore}
+ isFetchingMore={activeData.isFetchingMore}
+ onLoadMore={activeData.loadMore}
+ />
+ </>
+ )}
+
+ {/* Inactive toggle */}
+ <label className="flex items-center gap-x-2 text-sm cursor-pointer">
+ <input
+ type="checkbox"
+ checked={showInactive}
+ onChange={(e) => setShowInactive(e.target.checked)}
+ />
+ <span className="textinfolabel">
+ {t("settings.members.show-inactive")}
+ </span>
+ </label>
+
+ {/* Inactive list */}
+ {showInactive && (
+ <div className="flex flex-col gap-y-3">
+ <h3 className="text-base font-medium">
+ {t("settings.members.inactive-service-accounts")}
+ </h3>
+
+ {inactiveData.isLoading && inactiveData.dataList.length === 0 ? (
+ <div className="flex items-center justify-center h-32">
+ <div className="animate-spin h-6 w-6 border-2 border-accent border-t-transparent rounded-full" />
+ </div>
+ ) : (
+ <>
+ <ServiceAccountTable
+ users={inactiveData.dataList}
+ onUserUpdated={handleInactiveUserUpdated}
+ />
+ <PagedTableFooter
+ pageSize={inactiveData.pageSize}
+ pageSizeOptions={inactiveData.pageSizeOptions}
+ onPageSizeChange={inactiveData.onPageSizeChange}
+ hasMore={inactiveData.hasMore}
+ isFetchingMore={inactiveData.isFetchingMore}
+ onLoadMore={inactiveData.loadMore}
+ />
+ </>
+ )}
+ </div>
+ )}
+ </div>
+
+ {showDrawer && (
+ <CreateServiceAccountDrawer
+ serviceAccount={editingSa}
+ onClose={() => {
+ setShowDrawer(false);
+ setEditingSa(undefined);
+ }}
+ onCreated={handleCreated}
+ onUpdated={handleUpdated}
+ />
+ )}
+ </div>
+ );
+}
diff --git a/frontend/src/react/pages/settings/UsersPage.tsx b/frontend/src/react/pages/settings/UsersPage.tsx
index 40c9fe373e..2d83ed85c6 100644
--- a/frontend/src/react/pages/settings/UsersPage.tsx
+++ b/frontend/src/react/pages/settings/UsersPage.tsx
@@ -2,13 +2,8 @@ import { create } from "@bufbuild/protobuf";
import { FieldMaskSchema } from "@bufbuild/protobuf/wkt";
import { isEqual } from "lodash-es";
import {
- Building2,
- Check,
- ChevronDown,
- ChevronRight,
CircleAlert,
CircleCheck,
- Copy,
Eye,
EyeOff,
Pencil,
@@ -17,19 +12,10 @@ import {
Settings,
Trash2,
Undo2,
- Users,
X,
} from "lucide-react";
-import React, {
- useCallback,
- useEffect,
- useMemo,
- useRef,
- useState,
-} from "react";
+import { useCallback, useEffect, useMemo, useState } from "react";
import { useTranslation } from "react-i18next";
-import type { MemberBinding } from "@/components/Member/types";
-import { getMemberBindings } from "@/components/Member/utils";
import { ComponentPermissionGuard } from "@/react/components/ComponentPermissionGuard";
import { FeatureBadge } from "@/react/components/FeatureBadge";
import {
@@ -40,30 +26,19 @@ import {
import { Badge } from "@/react/components/ui/badge";
import { Button } from "@/react/components/ui/button";
import { Input } from "@/react/components/ui/input";
-import {
- Tabs,
- TabsList,
- TabsPanel,
- TabsTrigger,
-} from "@/react/components/ui/tabs";
import { Tooltip } from "@/react/components/ui/tooltip";
-import { useClickOutside } from "@/react/hooks/useClickOutside";
import { useEscapeKey } from "@/react/hooks/useEscapeKey";
-import {
- getPageSizeOptions,
- useSessionPageSize,
-} from "@/react/hooks/useSessionPageSize";
import { useVueState } from "@/react/hooks/useVueState";
-import { cn } from "@/react/lib/utils";
import { router } from "@/router";
-import { WORKSPACE_ROUTE_USER_PROFILE } from "@/router/dashboard/workspaceRoutes";
-import { SETTING_ROUTE_WORKSPACE_GENERAL } from "@/router/dashboard/workspaceSetting";
+import {
+ WORKSPACE_ROUTE_GROUPS,
+ WORKSPACE_ROUTE_USER_PROFILE,
+} from "@/router/dashboard/workspaceRoutes";
import {
pushNotification,
useActuatorV1Store,
useCurrentUserV1,
useGroupStore,
- useRoleStore,
useServiceAccountStore,
useSettingV1Store,
useSubscriptionV1Store,
@@ -71,229 +46,26 @@ import {
useWorkloadIdentityStore,
useWorkspaceV1Store,
} from "@/store";
-import {
- extractUserEmail,
- getUserFullNameByType,
- groupNamePrefix,
-} from "@/store/modules/v1/common";
+import { getUserFullNameByType } from "@/store/modules/v1/common";
import {
AccountType,
- ALL_USERS_USER_EMAIL,
getAccountTypeByEmail,
getUserEmailInBinding,
- UNKNOWN_USER_NAME,
- userBindingPrefix,
} from "@/types";
-import {
- PRESET_PROJECT_ROLES,
- PRESET_ROLES,
- PRESET_WORKSPACE_ROLES,
- PresetRoleType,
-} from "@/types/iam";
+import { PresetRoleType } from "@/types/iam";
import { State } from "@/types/proto-es/v1/common_pb";
-import type { Group, GroupMember } from "@/types/proto-es/v1/group_service_pb";
-import {
- GroupMember_Role,
- GroupMemberSchema,
- GroupSchema,
-} from "@/types/proto-es/v1/group_service_pb";
+import type { Group } from "@/types/proto-es/v1/group_service_pb";
import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";
import type { User } from "@/types/proto-es/v1/user_service_pb";
import {
UpdateUserRequestSchema,
UserSchema,
} from "@/types/proto-es/v1/user_service_pb";
-import {
- displayRoleDescription,
- displayRoleTitle,
- hasWorkspacePermissionV2,
- isValidEmail,
- sortRoles,
-} from "@/utils";
-
-// ============================================================
-// usePagedData hook
-// ============================================================
-
-function usePagedData<T extends { name: string }>({
- sessionKey,
- fetchList,
- enabled = true,
-}: {
- sessionKey: string;
- fetchList: (params: {
- pageSize: number;
- pageToken: string;
- }) => Promise<{ list: T[]; nextPageToken?: string }>;
- enabled?: boolean;
-}) {
- const [pageSize, setPageSize] = useSessionPageSize(sessionKey);
- const pageSizeOptions = getPageSizeOptions();
-
- const [dataList, setDataList] = useState<T[]>([]);
- const [isLoading, setIsLoading] = useState(true);
- const [isFetchingMore, setIsFetchingMore] = useState(false);
- const [hasFetched, setHasFetched] = useState(false);
- const [hasMore, setHasMore] = useState(false);
-
- const abortRef = useRef<AbortController | null>(null);
- const fetchIdRef = useRef(0);
- const nextPageTokenRef = useRef("");
-
- const doFetch = useCallback(
- async (isRefresh: boolean) => {
- const currentFetchId = ++fetchIdRef.current;
- abortRef.current?.abort();
- const controller = new AbortController();
- abortRef.current = controller;
-
- if (isRefresh) {
- setIsLoading(true);
- } else {
- setIsFetchingMore(true);
- }
-
- try {
- const token = isRefresh ? "" : nextPageTokenRef.current;
- const result = await fetchList({ pageSize, pageToken: token });
- if (controller.signal.aborted || currentFetchId !== fetchIdRef.current)
- return;
- setDataList((prev) =>
- isRefresh ? result.list : [...prev, ...result.list]
- );
- nextPageTokenRef.current = result.nextPageToken ?? "";
- setHasMore(Boolean(result.nextPageToken));
- } catch (e) {
- if (e instanceof Error && e.name === "AbortError") return;
- console.error(e);
- } finally {
- if (currentFetchId === fetchIdRef.current) {
- setIsLoading(false);
- setIsFetchingMore(false);
- setHasFetched(true);
- }
- }
- },
- [fetchList, pageSize]
- );
-
- const loadMore = useCallback(() => {
- if (hasMore && !isFetchingMore) {
- doFetch(false);
- }
- }, [hasMore, isFetchingMore, doFetch]);
-
- const refresh = useCallback(() => {
- doFetch(true);
- }, [doFetch]);
-
- const updateCache = useCallback((items: T[]) => {
- setDataList((prev) => {
- const next = [...prev];
- for (const item of items) {
- const idx = next.findIndex((d) => d.name === item.name);
- if (idx >= 0) {
- next[idx] = item;
- } else {
- next.push(item);
- }
- }
- return next;
- });
- }, []);
-
- const removeCache = useCallback((item: T) => {
- setDataList((prev) => prev.filter((d) => d.name !== item.name));
- }, []);
-
- // Fetch on mount and when fetchList/pageSize changes (handles search text reactivity)
- const isFirstLoad = useRef(true);
- useEffect(() => {
- if (!enabled) return;
- if (isFirstLoad.current) {
- isFirstLoad.current = false;
- doFetch(true);
- return;
- }
- const timer = setTimeout(() => doFetch(true), 300);
- return () => clearTimeout(timer);
- }, [doFetch, enabled]);
-
- useEffect(() => {
- return () => {
- abortRef.current?.abort();
- };
- }, []);
-
- return {
- dataList,
- isLoading: enabled && (isLoading || !hasFetched),
- isFetchingMore,
- hasMore,
- loadMore,
- refresh,
- updateCache,
- removeCache,
- pageSize,
- pageSizeOptions,
- onPageSizeChange: setPageSize,
- };
-}
-
-// ============================================================
-// PagedTableFooter
-// ============================================================
-
-function PagedTableFooter({
- pageSize,
- pageSizeOptions,
- onPageSizeChange,
- hasMore,
- isFetchingMore,
- onLoadMore,
-}: {
- pageSize: number;
- pageSizeOptions: number[];
- onPageSizeChange: (size: number) => void;
- hasMore: boolean;
- isFetchingMore: boolean;
- onLoadMore: () => void;
-}) {
- const { t } = useTranslation();
-
- return (
- <div className="flex items-center justify-end gap-x-2">
- <div className="flex items-center gap-x-2">
- <span className="text-sm text-control-light">
- {t("common.rows-per-page")}
- </span>
- <select
- value={pageSize}
- onChange={(e) => onPageSizeChange(Number(e.target.value))}
- className="border border-control-border rounded-sm text-sm pl-2 pr-6 py-1 min-w-[5rem]"
- >
- {pageSizeOptions.map((opt) => (
- <option key={opt} value={opt}>
- {opt}
- </option>
- ))}
- </select>
- </div>
- {hasMore && (
- <Button
- variant="ghost"
- size="sm"
- disabled={isFetchingMore}
- onClick={onLoadMore}
- >
- <span className="text-sm text-control-light">
- {isFetchingMore ? t("common.loading") : t("common.load-more")}
- </span>
- </Button>
- )}
- </div>
- );
-}
+import { hasWorkspacePermissionV2 } from "@/utils";
+import { AADSyncDrawer } from "./shared/AADSyncDrawer";
+import { RoleMultiSelect } from "./shared/RoleMultiSelect";
+import { UserAvatar } from "./shared/UserAvatar";
+import { PagedTableFooter, usePagedData } from "./shared/usePagedData";
// ============================================================
// UserTable
@@ -475,12 +247,15 @@ function UserTable({
>
{/* Account column */}
<td className="px-4 py-2">
- <div className="flex items-center gap-x-2">
+ <div className="flex items-center gap-x-3">
+ <UserAvatar title={user.title || user.email} />
<div className="flex flex-col">
<div className="flex items-center gap-x-1.5">
<span
className={
- isDeleted ? "line-through text-control-light" : ""
+ isDeleted
+ ? "line-through text-control-light"
+ : "font-medium text-accent"
}
>
{user.title}
@@ -647,539 +422,6 @@ function UserGroupsCell({
);
}
-// ============================================================
-// Highlight helper
-// ============================================================
-
-function HighlightText({ text, keyword }: { text: string; keyword: string }) {
- if (!keyword.trim()) return <>{text}</>;
- const idx = text.toLowerCase().indexOf(keyword.toLowerCase());
- if (idx < 0) return <>{text}</>;
- return (
- <>
- {text.slice(0, idx)}
- <span className="bg-yellow-100">
- {text.slice(idx, idx + keyword.length)}
- </span>
- {text.slice(idx + keyword.length)}
- </>
- );
-}
-
-// ============================================================
-// GroupTable
-// ============================================================
-
-function GroupTable({
- groups,
- searchText,
- onGroupSelected,
- onGroupDeleted,
-}: {
- groups: Group[];
- searchText: string;
- onGroupSelected: (group: Group) => void;
- onGroupDeleted: (group: Group) => void;
-}) {
- const { t } = useTranslation();
- const currentUser = useVueState(() => useCurrentUserV1().value);
- const groupStore = useGroupStore();
- const userStore = useUserStore();
-
- const [expandedGroups, setExpandedGroups] = useState<Set<string>>(new Set());
- const [memberCache, setMemberCache] = useState<Map<string, User[]>>(
- new Map()
- );
- const memberCacheRef = useRef(memberCache);
- memberCacheRef.current = memberCache;
- const loadingRef = useRef<Set<string>>(new Set());
-
- const fetchGroupMembers = useCallback(
- (group: Group) => {
- if (loadingRef.current.has(group.name)) return;
- loadingRef.current.add(group.name);
- const memberNames = group.members.map((m) => m.member);
- userStore
- .batchGetOrFetchUsers(memberNames)
- .then((users) => {
- setMemberCache((prev) => {
- const next = new Map(prev);
- next.set(
- group.name,
- users.filter((u): u is User => !!u)
- );
- return next;
- });
- })
- .catch(() => {
- // Allow retry on next expand
- })
- .finally(() => {
- loadingRef.current.delete(group.name);
- });
- },
- [userStore]
- );
-
- // Invalidate member cache when groups data changes (e.g. after editing membership)
- // and refetch members for currently expanded groups
- const prevGroupsRef = useRef(groups);
- useEffect(() => {
- if (prevGroupsRef.current !== groups) {
- prevGroupsRef.current = groups;
- setMemberCache(new Map());
- loadingRef.current = new Set();
- // Refetch members for currently expanded groups
- for (const groupName of expandedGroups) {
- const group = groups.find((g) => g.name === groupName);
- if (group) {
- fetchGroupMembers(group);
- }
- }
- }
- }, [groups, expandedGroups, fetchGroupMembers]);
-
- const toggleExpand = useCallback(
- (group: Group) => {
- setExpandedGroups((prev) => {
- const next = new Set(prev);
- if (next.has(group.name)) {
- next.delete(group.name);
- } else {
- next.add(group.name);
- }
- return next;
- });
-
- // Fetch members if not cached
- if (!memberCacheRef.current.has(group.name)) {
- fetchGroupMembers(group);
- }
- },
- [fetchGroupMembers]
- );
-
- const isGroupOwner = useCallback(
- (group: Group) => {
- return (
- group.members.find(
- (m) => extractUserEmail(m.member) === currentUser.email
- )?.role === GroupMember_Role.OWNER
- );
- },
- [currentUser.email]
- );
-
- const handleDelete = useCallback(
- async (group: Group) => {
- const confirmed = window.confirm(
- t("settings.members.action.deactivate-confirm-title")
- );
- if (!confirmed) return;
-
- try {
- await groupStore.deleteGroup(group.name);
- onGroupDeleted(group);
- pushNotification({
- module: "bytebase",
- style: "SUCCESS",
- title: t("common.deleted"),
- });
- } catch {
- // error shown by store
- }
- },
- [groupStore, onGroupDeleted, t]
- );
-
- if (groups.length === 0) {
- return (
- <div className="py-8 text-center text-control-light text-sm">
- {t("common.no-data")}
- </div>
- );
- }
-
- return (
- <div className="border rounded-sm overflow-hidden">
- <table className="w-full text-sm">
- <thead>
- <tr className="border-b bg-control-bg">
- <th className="px-4 py-2 text-left font-medium whitespace-nowrap">
- {t("common.groups")} / {t("common.users")}
- </th>
- <th className="px-4 py-2 text-right font-medium whitespace-nowrap w-16" />
- </tr>
- </thead>
- <tbody>
- {groups.map((group, i) => {
- const isExpanded = expandedGroups.has(group.name);
- const members = memberCache.get(group.name);
- const canEdit =
- isGroupOwner(group) ||
- hasWorkspacePermissionV2("bb.groups.update");
- const canDelete =
- isGroupOwner(group) ||
- hasWorkspacePermissionV2("bb.groups.delete");
-
- return (
- <GroupRow
- key={group.name}
- group={group}
- index={i}
- isExpanded={isExpanded}
- members={members}
- searchText={searchText}
- canEdit={canEdit}
- canDelete={canDelete}
- onToggle={() => toggleExpand(group)}
- onEdit={() => onGroupSelected(group)}
- onDelete={() => handleDelete(group)}
- />
- );
- })}
- </tbody>
- </table>
- </div>
- );
-}
-
-function GroupRow({
- group,
- index,
- isExpanded,
- members,
- searchText,
- canEdit,
- canDelete,
- onToggle,
- onEdit,
- onDelete,
-}: {
- group: Group;
- index: number;
- isExpanded: boolean;
- members: User[] | undefined;
- searchText: string;
- canEdit: boolean;
- canDelete: boolean;
- onToggle: () => void;
- onEdit: () => void;
- onDelete: () => void;
-}) {
- const { t } = useTranslation();
- const stripeBg = index % 2 === 1 ? "bg-gray-50" : "";
-
- return (
- <>
- <tr className={`border-b last:border-b-0 ${stripeBg}`}>
- <td className="px-4 py-2">
- <div className="flex items-center gap-x-2">
- <button
- className="shrink-0 p-0.5 rounded hover:bg-gray-200"
- onClick={onToggle}
- >
- {isExpanded ? (
- <ChevronDown className="h-4 w-4" />
- ) : (
- <ChevronRight className="h-4 w-4" />
- )}
- </button>
- <Users className="h-4 w-4 shrink-0 text-control-light" />
- <div className="flex flex-col">
- <div className="flex items-center gap-x-1.5">
- <span>
- <HighlightText text={group.title} keyword={searchText} />
- </span>
- <span className="text-control-light text-xs">
- (
- {t("settings.members.groups.n-members", {
- n: group.members.length,
- })}
- )
- </span>
- {group.source && (
- <Badge className="text-xs px-1.5 py-0">{group.source}</Badge>
- )}
- </div>
- <span className="textinfolabel text-xs">
- <HighlightText text={group.name} keyword={searchText} />
- </span>
- </div>
- </div>
- </td>
- <td className="px-4 py-2">
- <div className="flex justify-end gap-x-1">
- {canEdit && (
- <Tooltip content={t("common.edit")}>
- <Button
- variant="ghost"
- size="icon"
- className="h-7 w-7"
- onClick={onEdit}
- >
- <Pencil className="h-4 w-4" />
- </Button>
- </Tooltip>
- )}
- {canDelete && (
- <Tooltip content={t("common.delete")}>
- <Button
- variant="ghost"
- size="icon"
- className="h-7 w-7 text-error hover:text-error"
- onClick={onDelete}
- >
- <Trash2 className="h-4 w-4" />
- </Button>
- </Tooltip>
- )}
- </div>
- </td>
- </tr>
- {isExpanded &&
- members &&
- members.map((user) => {
- const memberInfo = group.members.find(
- (m) => extractUserEmail(m.member) === user.email
- );
- const isOwner = memberInfo?.role === GroupMember_Role.OWNER;
-
- return (
- <tr
- key={user.name}
- className={`border-b last:border-b-0 ${stripeBg}`}
- >
- <td className="px-4 py-2 pl-14">
- <div className="flex items-center gap-x-2">
- <span>{user.title}</span>
- <span className="textinfolabel text-xs">{user.email}</span>
- {isOwner ? (
- <Badge variant="secondary" className="text-xs px-1.5 py-0">
- {t("settings.members.groups.form.role.owner")}
- </Badge>
- ) : (
- <Badge variant="default" className="text-xs px-1.5 py-0">
- {t("settings.members.groups.form.role.member")}
- </Badge>
- )}
- </div>
- </td>
- <td />
- </tr>
- );
- })}
- {isExpanded && !members && (
- <tr className={stripeBg}>
- <td colSpan={2} className="px-4 py-2 pl-14">
- <div className="flex items-center gap-x-2 text-control-light text-sm">
- <div className="animate-spin h-4 w-4 border-2 border-accent border-t-transparent rounded-full" />
- {t("common.loading")}
- </div>
- </td>
- </tr>
- )}
- </>
- );
-}
-
-// ============================================================
-// RoleMultiSelect
-// ============================================================
-
-function RoleMultiSelect({
- value,
- onChange,
- disabled,
-}: {
- value: string[];
- onChange: (roles: string[]) => void;
- disabled?: boolean;
-}) {
- const { t } = useTranslation();
- const roleStore = useRoleStore();
- const subscriptionStore = useSubscriptionV1Store();
- const roleList = useVueState(() => [...roleStore.roleList]);
- const hasCustomRoleFeature = useVueState(() =>
- subscriptionStore.hasInstanceFeature(PlanFeature.FEATURE_CUSTOM_ROLES)
- );
- const [open, setOpen] = useState(false);
- const [search, setSearch] = useState("");
- const containerRef = useRef<HTMLDivElement>(null);
- const inputRef = useRef<HTMLInputElement>(null);
-
- const handleClickOutside = useCallback(() => {
- setOpen(false);
- setSearch("");
- }, []);
- useClickOutside(containerRef, open, handleClickOutside);
-
- const groups = useMemo(() => {
- const kw = search.toLowerCase();
- const matchRole = (name: string) =>
- !kw || displayRoleTitle(name).toLowerCase().includes(kw);
-
- const workspace = PRESET_WORKSPACE_ROLES.filter(matchRole);
- const project = PRESET_PROJECT_ROLES.filter(matchRole);
- const custom = roleList
- .filter((r) => !PRESET_ROLES.includes(r.name))
- .map((r) => r.name)
- .filter(matchRole);
-
- const result: { label: string; roles: string[] }[] = [];
- if (workspace.length > 0)
- result.push({
- label: t("role.workspace-roles.self"),
- roles: workspace,
- });
- if (project.length > 0)
- result.push({ label: t("role.project-roles.self"), roles: project });
- if (custom.length > 0)
- result.push({ label: t("role.custom-roles.self"), roles: custom });
- return result;
- }, [roleList, search, t]);
-
- const isCustomRole = (name: string) => !PRESET_ROLES.includes(name);
-
- const toggle = (roleName: string) => {
- if (disabled) return;
- // Block selecting custom roles without the plan feature
- if (isCustomRole(roleName) && !hasCustomRoleFeature) return;
- if (value.includes(roleName)) {
- onChange(value.filter((r) => r !== roleName));
- } else {
- onChange([...value, roleName]);
- }
- };
-
- const remove = (roleName: string) => {
- if (disabled) return;
- onChange(value.filter((r) => r !== roleName));
- };
-
- return (
- <div ref={containerRef} className="relative">
- {/* Trigger */}
- <div
- className={cn(
- "flex flex-wrap items-center gap-1 min-h-[2.25rem] w-full rounded-xs border border-control-border bg-transparent px-2 py-1 text-sm cursor-pointer",
- disabled && "opacity-50 cursor-not-allowed",
- open && "ring-2 ring-accent border-accent"
- )}
- onClick={() => {
- if (!disabled) {
- setOpen(!open);
- requestAnimationFrame(() => inputRef.current?.focus());
- }
- }}
- >
- {value.map((roleName) => (
- <span
- key={roleName}
- className="inline-flex items-center gap-x-1 rounded-xs bg-gray-100 px-1.5 py-0.5 text-xs"
- >
- {displayRoleTitle(roleName)}
- {!disabled && (
- <button
- type="button"
- className="hover:text-error"
- onClick={(e) => {
- e.stopPropagation();
- remove(roleName);
- }}
- >
- <X className="h-3 w-3" />
- </button>
- )}
- </span>
- ))}
- {open && (
- <input
- ref={inputRef}
- className="flex-1 min-w-[4rem] outline-hidden text-sm bg-transparent"
- value={search}
- onChange={(e) => setSearch(e.target.value)}
- placeholder={
- value.length === 0
- ? t("settings.members.select-role", { count: 2 })
- : ""
- }
- />
- )}
- {!open && value.length === 0 && (
- <span className="text-control-placeholder">
- {t("settings.members.select-role", { count: 2 })}
- </span>
- )}
- <ChevronDown className="ml-auto h-4 w-4 shrink-0 text-control-light" />
- </div>
-
- {/* Dropdown */}
- {open && (
- <div className="absolute z-50 mt-1 w-full bg-white border border-control-border rounded-sm shadow-lg max-h-60 overflow-auto">
- {groups.length === 0 && (
- <div className="px-3 py-2 text-sm text-control-light">
- {t("common.no-data")}
- </div>
- )}
- {groups.map((group) => (
- <div key={group.label}>
- <div className="px-3 py-1.5 text-xs font-medium text-control-light uppercase tracking-wide bg-gray-50">
- {group.label}
- </div>
- {group.roles.map((roleName) => {
- const selected = value.includes(roleName);
- const isCustom = isCustomRole(roleName);
- const blocked = isCustom && !hasCustomRoleFeature;
- return (
- <div
- key={roleName}
- className={cn(
- "flex items-center gap-x-2 px-3 py-1.5 text-sm hover:bg-gray-50",
- selected && "bg-accent/5",
- blocked
- ? "opacity-50 cursor-not-allowed"
- : "cursor-pointer"
- )}
- onClick={() => toggle(roleName)}
- >
- <div
- className={cn(
- "h-4 w-4 rounded-xs border flex items-center justify-center shrink-0",
- selected
- ? "bg-accent border-accent text-white"
- : "border-control-border"
- )}
- >
- {selected && <Check className="h-3 w-3" />}
- </div>
- <div className="flex flex-col">
- <div className="flex items-center gap-x-1">
- <span>{displayRoleTitle(roleName)}</span>
- {blocked && (
- <FeatureBadge
- feature={PlanFeature.FEATURE_CUSTOM_ROLES}
- clickable={false}
- />
- )}
- </div>
- {displayRoleDescription(roleName) && (
- <span className="text-xs text-control-light">
- {displayRoleDescription(roleName)}
- </span>
- )}
- </div>
- </div>
- );
- })}
- </div>
- ))}
- </div>
- )}
- </div>
- );
-}
-
// ============================================================
// CreateUserDrawer
// ============================================================
@@ -1592,1350 +834,37 @@ function CreateUserDrawer({
}
// ============================================================
-// CreateGroupDrawer
+// UsersPage (main)
// ============================================================
-// Normalize member identifier to users/{email} format.
-// Accepts: "users/[email protected]", "[email protected]" → "users/[email protected]"
-function normalizeMemberIdentifier(member: string): string {
- const trimmed = member.trim();
- if (!trimmed) return trimmed;
- if (trimmed.startsWith("users/")) return trimmed;
- return `users/${trimmed}`;
-}
-
-function deduplicateMembers(members: GroupMember[]): GroupMember[] {
- const map = new Map<string, GroupMember>();
- for (const m of members) {
- const key = m.member;
- const existing = map.get(key);
- if (existing) {
- // Keep the one with OWNER role
- if (m.role === GroupMember_Role.OWNER) {
- map.set(key, m);
- }
- } else {
- map.set(key, m);
- }
- }
- return Array.from(map.values());
-}
-
-function CreateGroupDrawer({
- group,
- onClose,
- onUpdated,
- onRemoved,
-}: {
- group: Group | undefined;
- onClose: () => void;
- onUpdated: (group: Group) => void;
- onRemoved: (group: Group) => void;
-}) {
+export function UsersPage() {
const { t } = useTranslation();
- const groupStore = useGroupStore();
- const settingV1Store = useSettingV1Store();
const actuatorStore = useActuatorV1Store();
- const currentUser = useVueState(() => useCurrentUserV1().value);
- const isSaaSMode = useVueState(() => actuatorStore.isSaaSMode);
+ const subscriptionStore = useSubscriptionV1Store();
const userStore = useUserStore();
- const isEditMode = !!group;
- const workspaceDomains = useVueState(
- () => settingV1Store.workspaceProfile.domains
- );
- const domainOptions = workspaceDomains.filter((d) => d.trim());
-
- const [email, setEmail] = useState(() => {
- if (!group) return "";
- // For editing, extract local part if domain is in workspace domains
- return group.email ?? "";
- });
- const [selectedDomain, setSelectedDomain] = useState(() => {
- if (group?.email) {
- const atIdx = group.email.indexOf("@");
- if (atIdx >= 0) {
- const domain = group.email.slice(atIdx + 1);
- if (domainOptions.includes(domain)) return domain;
- }
- }
- return domainOptions[0] ?? "";
- });
- const [title, setTitle] = useState(group?.title ?? "");
- const [description, setDescription] = useState(group?.description ?? "");
- const [members, setMembers] = useState<GroupMember[]>(() => {
- if (group) {
- return group.members.map((m) =>
- create(GroupMemberSchema, { member: m.member, role: m.role })
- );
- }
- return [
- create(GroupMemberSchema, {
- role: GroupMember_Role.OWNER,
- member: currentUser.name,
- }),
- ];
- });
- const [isRequesting, setIsRequesting] = useState(false);
- const [showDeleteConfirm, setShowDeleteConfirm] = useState(false);
-
- useEscapeKey(true, onClose);
+ const isSaaSMode = useVueState(() => actuatorStore.isSaaSMode);
+ const activeUserCount = useVueState(() => actuatorStore.activeUserCount);
+ const userCountLimit = useVueState(() => subscriptionStore.userCountLimit);
- const isExternalGroup = !!group?.source;
-
- const allowEdit = isExternalGroup
- ? false
- : isEditMode
- ? group.members.some(
- (m) =>
- extractUserEmail(m.member) === currentUser.email &&
- m.role === GroupMember_Role.OWNER
- ) || hasWorkspacePermissionV2("bb.groups.update")
- : hasWorkspacePermissionV2("bb.groups.create");
-
- const fullEmail = useMemo(() => {
- if (isEditMode) return email;
- if (!email) return "";
- // When workspace domains are configured, enforce by using selected domain
- if (domainOptions.length > 0 && selectedDomain) {
- const localPart = email.split("@")[0];
- return `${localPart}@${selectedDomain}`;
- }
- return email;
- }, [email, isEditMode, domainOptions, selectedDomain]);
+ const hasDirectorySyncFeature = useVueState(() =>
+ subscriptionStore.hasInstanceFeature(PlanFeature.FEATURE_DIRECTORY_SYNC)
+ );
+ const canAccessSettings = hasWorkspacePermissionV2("bb.settings.get");
- const errorMessage = useMemo(() => {
- if (!title.trim())
- return (
- t("settings.members.groups.form.title") + " " + t("common.is-required")
- );
- if (!fullEmail || !isValidEmail(fullEmail))
- return t("settings.members.groups.form.email-tips");
- // Validate member identifiers — extract email part and check format
- for (const m of members) {
- const raw = m.member.trim();
- if (!raw) continue;
- const memberEmail = raw.startsWith("users/") ? raw.slice(6) : raw;
- if (!isValidEmail(memberEmail)) {
- return `Invalid member: ${raw}`;
- }
- }
- return "";
- }, [title, fullEmail, members, t]);
-
- const hasChanged = useMemo(() => {
- if (!isEditMode) return true;
- if (!group) return true;
- if (title !== group.title) return true;
- if (description !== group.description) return true;
- if (!isEqual(members, group.members)) return true;
- return false;
- }, [isEditMode, group, title, description, members]);
-
- const allowConfirm = !errorMessage && hasChanged;
-
- const handleAddMember = () => {
- setMembers((prev) => [
- ...prev,
- create(GroupMemberSchema, { role: GroupMember_Role.MEMBER, member: "" }),
- ]);
- };
+ const [userSearchText, setUserSearchText] = useState("");
+ const [showInactiveUsers, setShowInactiveUsers] = useState(false);
+ const [inactiveUserSearchText, setInactiveUserSearchText] = useState("");
- const handleRemoveMember = (index: number) => {
- setMembers((prev) => prev.filter((_, i) => i !== index));
- };
+ // Drawer visibility
+ const [showCreateUserDrawer, setShowCreateUserDrawer] = useState(false);
+ const [showAadSyncDrawer, setShowAadSyncDrawer] = useState(false);
+ const [editingUser, setEditingUser] = useState<User | undefined>(undefined);
- const handleMemberChange = (
- index: number,
- field: "member" | "role",
- value: string | GroupMember_Role
- ) => {
- setMembers((prev) =>
- prev.map((m, i) => {
- if (i !== index) return m;
- return create(GroupMemberSchema, {
- ...m,
- [field]: value,
- });
- })
- );
- };
-
- const handleSubmit = async () => {
- if (!allowConfirm || !allowEdit) return;
- setIsRequesting(true);
- try {
- const normalizedMembers = members
- .filter((m) => m.member.trim())
- .map((m) =>
- create(GroupMemberSchema, {
- ...m,
- member: normalizeMemberIdentifier(m.member),
- })
- );
-
- // In self-hosted mode, verify all members exist via backend lookup
- if (!isSaaSMode) {
- const notFound: string[] = [];
- for (const m of normalizedMembers) {
- const user = await userStore.getOrFetchUserByIdentifier({
- identifier: m.member,
- silent: true,
- fallback: false,
- });
- if (!user || user.name === UNKNOWN_USER_NAME) {
- notFound.push(m.member.replace("users/", ""));
- }
- }
- if (notFound.length > 0) {
- pushNotification({
- module: "bytebase",
- style: "WARN",
- title: `User not found: ${notFound.join(", ")}`,
- });
- setIsRequesting(false);
- return;
- }
- }
-
- const dedupedMembers = deduplicateMembers(normalizedMembers);
- if (isEditMode && group) {
- const validGroup = create(GroupSchema, {
- name: group.name,
- title,
- description,
- members: dedupedMembers,
- });
- const updated = await groupStore.updateGroup(validGroup);
- onUpdated(updated);
- pushNotification({
- module: "bytebase",
- style: "SUCCESS",
- title: t("common.updated"),
- });
- } else {
- const validGroup = create(GroupSchema, {
- name: `${groupNamePrefix}${fullEmail}`,
- title,
- description,
- members: dedupedMembers,
- });
- const created = await groupStore.createGroup(validGroup);
- onUpdated(created);
- pushNotification({
- module: "bytebase",
- style: "SUCCESS",
- title: t("common.created"),
- });
- }
- onClose();
- } catch {
- // error shown by store
- } finally {
- setIsRequesting(false);
- }
- };
-
- const handleDelete = async () => {
- if (!group) return;
- setIsRequesting(true);
- try {
- await groupStore.deleteGroup(group.name);
- onRemoved(group);
- pushNotification({
- module: "bytebase",
- style: "SUCCESS",
- title: t("common.deleted"),
- });
- onClose();
- } catch {
- // error shown by store
- } finally {
- setIsRequesting(false);
- setShowDeleteConfirm(false);
- }
- };
-
- const canDelete =
- isEditMode &&
- !isExternalGroup &&
- (group.members.some(
- (m) =>
- extractUserEmail(m.member) === currentUser.email &&
- m.role === GroupMember_Role.OWNER
- ) ||
- hasWorkspacePermissionV2("bb.groups.delete"));
-
- return (
- <>
- {/* Backdrop */}
- <div className="fixed inset-0 z-40 bg-black/30" onClick={onClose} />
-
- {/* Drawer */}
- <div
- role="dialog"
- aria-modal="true"
- className="fixed inset-y-0 right-0 z-50 w-[40rem] max-w-[100vw] bg-white shadow-xl flex flex-col"
- >
- {/* Header */}
- <div className="flex items-center justify-between px-6 py-4 border-b">
- <h2 className="text-lg font-medium">
- {isEditMode
- ? t("settings.members.groups.update-group")
- : t("settings.members.groups.add-group")}
- </h2>
- <Button variant="ghost" size="icon" onClick={onClose}>
- <X className="h-5 w-5" />
- </Button>
- </div>
-
- {/* Content */}
- <div className="flex-1 overflow-auto px-6 py-6">
- <div className="flex flex-col gap-y-6">
- {isExternalGroup && (
- <Alert variant="info">
- <AlertDescription>
- {t("settings.members.groups.external-readonly")}
- </AlertDescription>
- </Alert>
- )}
-
- {/* Email */}
- <div className="flex flex-col gap-y-2">
- <label className="block text-sm font-medium text-control">
- {t("settings.members.groups.form.email")}
- <span className="ml-0.5 text-error">*</span>
- </label>
- <span className="textinfolabel text-sm">
- {t("settings.members.groups.form.email-tips")}
- </span>
- <div className="flex items-center gap-x-1">
- <Input
- value={isEditMode ? email : email.split("@")[0]}
- onChange={(e) => setEmail(e.target.value)}
- disabled={isEditMode || !allowEdit}
- />
- {!isEditMode && domainOptions.length > 0 && (
- <>
- <span className="text-sm text-control-light">@</span>
- {domainOptions.length === 1 ? (
- <span className="text-sm text-control-light whitespace-nowrap">
- {domainOptions[0]}
- </span>
- ) : (
- <select
- value={selectedDomain}
- onChange={(e) => setSelectedDomain(e.target.value)}
- className="border border-control-border rounded-sm text-sm pl-2 pr-6 py-1"
- disabled={!allowEdit}
- >
- {domainOptions.map((d) => (
- <option key={d} value={d}>
- {d}
- </option>
- ))}
- </select>
- )}
- </>
- )}
- </div>
- </div>
-
- {/* Title */}
- <div className="flex flex-col gap-y-2">
- <label className="block text-sm font-medium text-control">
- {t("settings.members.groups.form.title")}
- <span className="ml-0.5 text-error">*</span>
- </label>
- <Input
- value={title}
- onChange={(e) => setTitle(e.target.value)}
- maxLength={200}
- disabled={!allowEdit}
- />
- </div>
-
- {/* Description */}
- <div className="flex flex-col gap-y-2">
- <label className="block text-sm font-medium text-control">
- {t("settings.members.groups.form.description")}
- </label>
- <Input
- value={description}
- onChange={(e) => setDescription(e.target.value)}
- maxLength={1000}
- disabled={!allowEdit}
- />
- </div>
-
- {/* Members */}
- <div className="flex flex-col gap-y-2">
- <label className="block text-sm font-medium text-control">
- {t("common.members", { count: 2 })}
- </label>
- <div className="flex flex-col gap-y-2">
- {members.map((member, index) => (
- <div key={index} className="flex items-center gap-x-2">
- <Input
- className="flex-1"
- value={member.member}
- onChange={(e) =>
- handleMemberChange(index, "member", e.target.value)
- }
- placeholder="users/[email protected]"
- disabled={!allowEdit}
- />
- <select
- value={member.role}
- onChange={(e) =>
- handleMemberChange(
- index,
- "role",
- Number(e.target.value) as GroupMember_Role
- )
- }
- className="h-9 rounded-xs border border-control-border bg-transparent px-2 py-1 text-sm"
- disabled={!allowEdit}
- >
- <option value={GroupMember_Role.OWNER}>
- {t("settings.members.groups.form.role.owner")}
- </option>
- <option value={GroupMember_Role.MEMBER}>
- {t("settings.members.groups.form.role.member")}
- </option>
- </select>
- <Button
- variant="ghost"
- size="icon"
- className="h-7 w-7 shrink-0 text-error hover:text-error"
- onClick={() => handleRemoveMember(index)}
- disabled={!allowEdit}
- >
- <Trash2 className="h-4 w-4" />
- </Button>
- </div>
- ))}
- {allowEdit && (
- <Button
- variant="outline"
- size="sm"
- className="self-start"
- onClick={handleAddMember}
- >
- <Plus className="h-4 w-4 mr-1" />
- {t("settings.members.add-member")}
- </Button>
- )}
- </div>
- </div>
-
- {errorMessage && (
- <p className="text-error text-sm">{errorMessage}</p>
- )}
- </div>
- </div>
-
- {/* Footer */}
- <div className="flex items-center justify-between px-6 py-4 border-t">
- <div>
- {canDelete && (
- <>
- {showDeleteConfirm ? (
- <div className="flex items-center gap-x-2">
- <span className="text-sm text-error">
- {t("settings.members.action.deactivate-confirm-title")}
- </span>
- <Button
- variant="destructive"
- size="sm"
- onClick={handleDelete}
- disabled={isRequesting}
- >
- {t("common.confirm")}
- </Button>
- <Button
- variant="outline"
- size="sm"
- onClick={() => setShowDeleteConfirm(false)}
- >
- {t("common.cancel")}
- </Button>
- </div>
- ) : (
- <Button
- variant="ghost"
- className="text-error hover:text-error"
- onClick={() => setShowDeleteConfirm(true)}
- >
- <Trash2 className="h-4 w-4 mr-1" />
- {t("common.delete")}
- </Button>
- )}
- </>
- )}
- </div>
- <div className="flex items-center gap-x-2">
- <Button variant="outline" onClick={onClose}>
- {t("common.cancel")}
- </Button>
- <Button
- disabled={!allowEdit || !allowConfirm || isRequesting}
- onClick={handleSubmit}
- >
- {isEditMode ? t("common.update") : t("common.confirm")}
- </Button>
- </div>
- </div>
- </div>
- </>
- );
-}
-
-// ============================================================
-// AADSyncDrawer
-// ============================================================
-
-function AADSyncDrawer({ onClose }: { onClose: () => void }) {
- const { t } = useTranslation();
- const actuatorStore = useActuatorV1Store();
- const settingV1Store = useSettingV1Store();
-
- const externalUrl = useVueState(
- () => actuatorStore.serverInfo?.externalUrl ?? ""
- );
- const workspaceResourceName = useVueState(
- () => actuatorStore.workspaceResourceName
- );
- const directorySyncToken = useVueState(
- () => settingV1Store.workspaceProfile.directorySyncToken
- );
-
- useEscapeKey(true, onClose);
-
- const scimUrl =
- externalUrl && workspaceResourceName
- ? `${externalUrl}/hook/scim/${workspaceResourceName}`
- : "";
-
- const copyToClipboard = async (value: string) => {
- try {
- if (navigator.clipboard) {
- await navigator.clipboard.writeText(value);
- } else {
- // Fallback for non-secure contexts (e.g. self-hosted HTTP)
- const textarea = document.createElement("textarea");
- textarea.value = value;
- textarea.style.position = "fixed";
- textarea.style.opacity = "0";
- document.body.appendChild(textarea);
- textarea.select();
- document.execCommand("copy");
- document.body.removeChild(textarea);
- }
- pushNotification({
- module: "bytebase",
- style: "SUCCESS",
- title: t("common.copied"),
- });
- } catch {
- pushNotification({
- module: "bytebase",
- style: "WARN",
- title: t("common.copy-failed"),
- });
- }
- };
-
- const handleResetToken = async () => {
- const confirmed = window.confirm(
- t("settings.members.entra-sync.reset-token-warning")
- );
- if (!confirmed) return;
-
- try {
- await settingV1Store.updateWorkspaceProfile({
- payload: { directorySyncToken: "" },
- updateMask: create(FieldMaskSchema, {
- paths: ["value.workspace_profile.directory_sync_token"],
- }),
- });
- pushNotification({
- module: "bytebase",
- style: "SUCCESS",
- title: t("common.updated"),
- });
- } catch {
- // error already shown by store
- }
- };
-
- return (
- <>
- {/* Backdrop */}
- <div className="fixed inset-0 z-40 bg-black/30" onClick={onClose} />
-
- {/* Drawer */}
- <div
- role="dialog"
- aria-modal="true"
- className="fixed inset-y-0 right-0 z-50 w-[40rem] max-w-[100vw] bg-white shadow-xl flex flex-col"
- >
- {/* Header */}
- <div className="flex items-center justify-between px-6 py-4 border-b">
- <h2 className="text-lg font-medium">
- {t("settings.members.entra-sync.self")}
- </h2>
- <Button variant="ghost" size="icon" onClick={onClose}>
- <X className="h-5 w-5" />
- </Button>
- </div>
-
- {/* Content */}
- <div className="flex-1 overflow-auto px-6 py-6">
- <div className="flex flex-col gap-y-6">
- {/* Description */}
- <p className="text-sm text-control-light">
- {t("settings.members.entra-sync.description")}{" "}
- <a
- href="https://docs.bytebase.com/administration/scim/overview?source=console"
- target="_blank"
- rel="noopener noreferrer"
- className="text-accent hover:underline"
- >
- {t("common.learn-more")}
- </a>
- </p>
-
- {/* Missing external URL warning */}
- {!externalUrl && (
- <Alert variant="warning">
- <AlertDescription>{t("banner.external-url")}</AlertDescription>
- </Alert>
- )}
-
- {/* SCIM Endpoint URL */}
- <div className="flex flex-col gap-y-2">
- <label className="block text-sm font-medium text-control">
- {t("settings.members.entra-sync.endpoint")}
- </label>
- <span className="textinfolabel text-sm">
- {t("settings.members.entra-sync.endpoint-tip")}
- </span>
- <div className="flex items-center gap-x-2">
- <Input readOnly value={scimUrl} className="flex-1 text-sm" />
- <Button
- variant="outline"
- size="sm"
- disabled={!scimUrl}
- onClick={() => copyToClipboard(scimUrl)}
- >
- <Copy className="h-4 w-4" />
- </Button>
- </div>
- </div>
-
- {/* Secret Token */}
- <div className="flex flex-col gap-y-2">
- <label className="block text-sm font-medium text-control">
- {t("settings.members.entra-sync.secret-token")}
- </label>
- <span className="textinfolabel text-sm">
- {t("settings.members.entra-sync.secret-token-tip")}
- </span>
- <div className="flex items-center gap-x-2">
- <Input
- readOnly
- type="password"
- value={directorySyncToken}
- className="flex-1 text-sm"
- />
- <Button
- variant="outline"
- size="sm"
- disabled={!directorySyncToken}
- onClick={() => copyToClipboard(directorySyncToken)}
- >
- <Copy className="h-4 w-4" />
- </Button>
- </div>
- {hasWorkspacePermissionV2("bb.settings.setWorkspaceProfile") && (
- <Button
- variant="outline"
- size="sm"
- className="self-start text-error border-error hover:bg-error/10"
- onClick={handleResetToken}
- >
- {t("settings.members.entra-sync.reset-token")}
- </Button>
- )}
- </div>
- </div>
- </div>
-
- {/* Footer */}
- <div className="flex items-center justify-end gap-x-2 px-6 py-4 border-t">
- <Button variant="outline" onClick={onClose}>
- {t("common.cancel")}
- </Button>
- </div>
- </div>
- </>
- );
-}
-
-// ============================================================
-// UsersPage (main)
-// ============================================================
-
-type TabValue = "USERS" | "MEMBERS" | "GROUPS";
-
-function getInitialTab(isSaaSMode: boolean): TabValue {
- const hash = window.location.hash.replace("#", "").toUpperCase();
- if (hash === "USERS" && !isSaaSMode) return "USERS";
- if (hash === "MEMBERS" && isSaaSMode) return "MEMBERS";
- if (hash === "GROUPS") return "GROUPS";
- return isSaaSMode ? "MEMBERS" : "USERS";
-}
-
-// ============================================================
-// MemberTable (view by members)
-// ============================================================
-
-function MemberTable({
- bindings,
- allowEdit,
- selectedBindings,
- onSelectionChange,
- onUpdateBinding,
- onRevokeBinding,
-}: {
- bindings: MemberBinding[];
- allowEdit: boolean;
- selectedBindings: string[];
- onSelectionChange: (selected: string[]) => void;
- onUpdateBinding: (binding: MemberBinding) => void;
- onRevokeBinding: (binding: MemberBinding) => void;
-}) {
- const { t } = useTranslation();
-
- const allSelected =
- bindings.length > 0 &&
- bindings.every((b) => selectedBindings.includes(b.binding));
-
- const toggleAll = () => {
- if (allSelected) {
- onSelectionChange([]);
- } else {
- onSelectionChange(bindings.map((b) => b.binding));
- }
- };
-
- const toggleOne = (binding: string) => {
- onSelectionChange(
- selectedBindings.includes(binding)
- ? selectedBindings.filter((b) => b !== binding)
- : [...selectedBindings, binding]
- );
- };
-
- const canEdit = (mb: MemberBinding) => {
- if (mb.type === "users") return mb.user?.state !== State.DELETED;
- if (mb.type === "groups") return !mb.group?.deleted;
- return true;
- };
-
- return (
- <div className="border rounded-sm overflow-hidden">
- <table className="w-full text-sm">
- <thead>
- <tr className="bg-gray-50 border-b">
- {allowEdit && (
- <th className="w-10 px-3 py-2">
- <input
- type="checkbox"
- checked={allSelected}
- onChange={toggleAll}
- />
- </th>
- )}
- <th className="px-4 py-2 text-left font-medium text-control-light">
- {t("settings.members.table.account")}
- </th>
- <th className="px-4 py-2 text-left font-medium text-control-light">
- {t("settings.members.table.roles")}
- </th>
- <th className="w-24 px-4 py-2 text-left font-medium text-control-light">
- {t("common.operations")}
- </th>
- </tr>
- </thead>
- <tbody>
- {bindings.map((mb) => (
- <tr
- key={mb.binding}
- className="border-b last:border-b-0 hover:bg-gray-50"
- >
- {allowEdit && (
- <td className="px-3 py-2">
- <input
- type="checkbox"
- checked={selectedBindings.includes(mb.binding)}
- onChange={() => toggleOne(mb.binding)}
- />
- </td>
- )}
- <td className="px-4 py-2">
- {mb.type === "users" ? (
- <div className="flex flex-col">
- <span className="font-medium">{mb.title}</span>
- <span className="text-control-light text-xs">
- {mb.user?.email}
- </span>
- </div>
- ) : (
- <div className="flex items-center gap-x-2">
- <Users className="h-4 w-4 text-control-light" />
- <span className="font-medium">{mb.title}</span>
- {mb.group && (
- <span className="text-control-light text-xs">
- ({mb.group.members.length}{" "}
- {t("common.members", {
- count: mb.group.members.length,
- })}
- )
- </span>
- )}
- {mb.group?.deleted && (
- <Badge variant="destructive" className="text-xs">
- {t("common.deleted")}
- </Badge>
- )}
- </div>
- )}
- </td>
- <td className="px-4 py-2">
- <div className="flex flex-wrap gap-1">
- {sortRoles([...mb.workspaceLevelRoles]).map((role) => (
- <Badge key={role} className="text-xs gap-x-1">
- <Building2 className="h-3 w-3" />
- {displayRoleTitle(role)}
- </Badge>
- ))}
- </div>
- </td>
- <td className="px-4 py-2">
- <div className="flex items-center gap-x-1">
- {allowEdit && canEdit(mb) && (
- <Button
- variant="ghost"
- size="icon"
- onClick={() => onUpdateBinding(mb)}
- >
- <Pencil className="h-4 w-4" />
- </Button>
- )}
- {allowEdit && (
- <Button
- variant="ghost"
- size="icon"
- onClick={() => {
- if (
- window.confirm(
- t("settings.members.revoke-access-alert")
- )
- ) {
- onRevokeBinding(mb);
- }
- }}
- >
- <Trash2 className="h-4 w-4" />
- </Button>
- )}
- </div>
- </td>
- </tr>
- ))}
- {bindings.length === 0 && (
- <tr>
- <td
- colSpan={allowEdit ? 4 : 3}
- className="px-4 py-8 text-center text-control-light"
- >
- {t("common.no-data")}
- </td>
- </tr>
- )}
- </tbody>
- </table>
- </div>
- );
-}
-
-// ============================================================
-// MemberTableByRole (view by roles)
-// ============================================================
-
-function MemberTableByRole({
- bindings,
- allowEdit,
- onUpdateBinding,
- onRevokeBinding,
-}: {
- bindings: MemberBinding[];
- allowEdit: boolean;
- onUpdateBinding: (binding: MemberBinding) => void;
- onRevokeBinding: (binding: MemberBinding) => void;
-}) {
- const { t } = useTranslation();
- const [expandedRoles, setExpandedRoles] = useState<Set<string>>(new Set());
-
- const roleToBindings = useMemo(() => {
- const map = new Map<string, MemberBinding[]>();
- for (const mb of bindings) {
- for (const role of mb.workspaceLevelRoles) {
- if (!map.has(role)) map.set(role, []);
- map.get(role)!.push(mb);
- }
- }
- const sortedRoles = sortRoles([...map.keys()]);
- return sortedRoles.map((role) => ({
- role,
- members: map.get(role) ?? [],
- }));
- }, [bindings]);
-
- const toggleRole = (role: string) => {
- setExpandedRoles((prev) => {
- const next = new Set(prev);
- if (next.has(role)) next.delete(role);
- else next.add(role);
- return next;
- });
- };
-
- const canEdit = (mb: MemberBinding) => {
- if (mb.type === "users") return mb.user?.state !== State.DELETED;
- if (mb.type === "groups") return !mb.group?.deleted;
- return true;
- };
-
- return (
- <div className="border rounded-sm overflow-hidden">
- <table className="w-full text-sm">
- <tbody>
- {roleToBindings.map(({ role, members }) => {
- const expanded = expandedRoles.has(role);
- return (
- <React.Fragment key={role}>
- <tr
- className="bg-gray-50 border-b cursor-pointer hover:bg-gray-100"
- onClick={() => toggleRole(role)}
- >
- <td colSpan={3} className="px-4 py-2">
- <div className="flex items-center gap-x-2">
- {expanded ? (
- <ChevronDown className="h-4 w-4" />
- ) : (
- <ChevronRight className="h-4 w-4" />
- )}
- <Building2 className="h-4 w-4 text-control-light" />
- <span className="font-medium">
- {displayRoleTitle(role)}
- </span>
- <span className="text-control-light text-xs">
- ({members.length})
- </span>
- </div>
- </td>
- </tr>
- {expanded &&
- members.map((mb) => (
- <tr
- key={`${role}-${mb.binding}`}
- className="border-b last:border-b-0 hover:bg-gray-50"
- >
- <td className="px-4 py-2 pl-10">
- {mb.type === "users" ? (
- <div className="flex flex-col">
- <span className="font-medium">{mb.title}</span>
- <span className="text-control-light text-xs">
- {mb.user?.email}
- </span>
- </div>
- ) : (
- <div className="flex items-center gap-x-2">
- <Users className="h-4 w-4 text-control-light" />
- <span className="font-medium">{mb.title}</span>
- {mb.group?.deleted && (
- <Badge variant="destructive" className="text-xs">
- {t("common.deleted")}
- </Badge>
- )}
- </div>
- )}
- </td>
- <td className="px-4 py-2" />
- <td className="w-24 px-4 py-2">
- <div className="flex items-center gap-x-1">
- {allowEdit && canEdit(mb) && (
- <Button
- variant="ghost"
- size="icon"
- onClick={() => onUpdateBinding(mb)}
- >
- <Pencil className="h-4 w-4" />
- </Button>
- )}
- {allowEdit && (
- <Button
- variant="ghost"
- size="icon"
- onClick={() => {
- if (
- window.confirm(
- t("settings.members.revoke-access-alert")
- )
- ) {
- onRevokeBinding(mb);
- }
- }}
- >
- <Trash2 className="h-4 w-4" />
- </Button>
- )}
- </div>
- </td>
- </tr>
- ))}
- </React.Fragment>
- );
- })}
- {roleToBindings.length === 0 && (
- <tr>
- <td
- colSpan={3}
- className="px-4 py-8 text-center text-control-light"
- >
- {t("common.no-data")}
- </td>
- </tr>
- )}
- </tbody>
- </table>
- </div>
- );
-}
-
-// ============================================================
-// EditMemberRoleDrawer
-// ============================================================
-
-function EditMemberRoleDrawer({
- member,
- onClose,
-}: {
- member?: MemberBinding;
- onClose: () => void;
-}) {
- const { t } = useTranslation();
- const workspaceStore = useWorkspaceV1Store();
- const isSaaSMode = useVueState(() => useActuatorV1Store().isSaaSMode);
-
- const isEditMode = !!member;
-
- const [memberInput, setMemberInput] = useState("");
- const [selectedRoles, setSelectedRoles] = useState<string[]>(() =>
- member ? [...member.workspaceLevelRoles] : [PresetRoleType.WORKSPACE_MEMBER]
- );
- const [isRequesting, setIsRequesting] = useState(false);
-
- useEscapeKey(true, onClose);
-
- const handleSubmit = async () => {
- setIsRequesting(true);
- try {
- if (isEditMode) {
- await workspaceStore.patchIamPolicy([
- { member: member.binding, roles: selectedRoles },
- ]);
- } else {
- const emails = memberInput
- .split(",")
- .map((s) => s.trim())
- .filter(Boolean);
- const KNOWN_PREFIXES = [
- "user:",
- "group:",
- "serviceAccount:",
- "workloadIdentity:",
- ];
- const memberList = emails.map((input) => {
- // Preserve the special allUsers principal (self-hosted only)
- if (input === ALL_USERS_USER_EMAIL && !isSaaSMode) {
- return input;
- }
- if (KNOWN_PREFIXES.some((p) => input.startsWith(p))) {
- return input;
- }
- return `${userBindingPrefix}${input}`;
- });
- const batchPatch = memberList.map((m) => {
- const existedRoles = workspaceStore.findRolesByMember(m);
- return {
- member: m,
- roles: [...new Set([...selectedRoles, ...existedRoles])],
- };
- });
- await workspaceStore.patchIamPolicy(batchPatch);
- }
- pushNotification({
- module: "bytebase",
- style: "SUCCESS",
- title: isEditMode ? t("common.updated") : t("common.created"),
- });
- onClose();
- } catch {
- // error shown by store
- } finally {
- setIsRequesting(false);
- }
- };
-
- const handleRevoke = async () => {
- if (!member) return;
- const isAllUsers =
- member.binding === `${userBindingPrefix}${ALL_USERS_USER_EMAIL}`;
- const message = isAllUsers
- ? t("settings.members.revoke-allusers-alert")
- : t("settings.members.revoke-access-alert");
- if (!window.confirm(message)) return;
-
- setIsRequesting(true);
- try {
- await workspaceStore.patchIamPolicy([
- { member: member.binding, roles: [] },
- ]);
- pushNotification({
- module: "bytebase",
- style: "INFO",
- title: t("settings.members.revoked"),
- });
- onClose();
- } catch {
- // error shown by store
- } finally {
- setIsRequesting(false);
- }
- };
-
- const allowConfirm = isEditMode
- ? selectedRoles.length > 0
- : memberInput.trim().length > 0 && selectedRoles.length > 0;
-
- return (
- <>
- <div className="fixed inset-0 z-40 bg-black/30" onClick={onClose} />
- <div
- role="dialog"
- aria-modal="true"
- className="fixed inset-y-0 right-0 z-50 w-[40rem] max-w-[100vw] bg-white shadow-xl flex flex-col"
- >
- <div className="flex items-center justify-between px-6 py-4 border-b">
- <h2 className="text-lg font-medium">
- {t("settings.members.grant-access")}
- </h2>
- <Button variant="ghost" size="icon" onClick={onClose}>
- <X className="h-5 w-5" />
- </Button>
- </div>
-
- <div className="flex-1 overflow-auto px-6 py-6">
- <div className="flex flex-col gap-y-6">
- {/* Member input */}
- <div className="flex flex-col gap-y-2">
- <label className="block text-sm font-medium text-control">
- {t("settings.members.select-account", { count: 1 })}
- </label>
- {isEditMode ? (
- <Input value={member.binding} disabled />
- ) : (
- <>
- <Input
- value={memberInput}
- onChange={(e) => setMemberInput(e.target.value)}
- placeholder="user:[email protected], group:[email protected]"
- />
- <span className="text-xs text-control-light">
- {t("settings.members.select-account-hint")}
- </span>
- </>
- )}
- </div>
-
- {/* Roles */}
- <div className="flex flex-col gap-y-2">
- <label className="block text-sm font-medium text-control">
- {t("settings.members.select-role", { count: 2 })}
- </label>
- <RoleMultiSelect
- value={selectedRoles}
- onChange={setSelectedRoles}
- />
- </div>
- </div>
- </div>
-
- <div className="flex items-center justify-between px-6 py-4 border-t">
- <div>
- {isEditMode && (
- <Button
- variant="destructive"
- disabled={isRequesting}
- onClick={handleRevoke}
- >
- {t("settings.members.revoke-access")}
- </Button>
- )}
- </div>
- <div className="flex items-center gap-x-2">
- <Button variant="outline" onClick={onClose}>
- {t("common.cancel")}
- </Button>
- <Button
- disabled={!allowConfirm || isRequesting}
- onClick={handleSubmit}
- >
- {t("common.confirm")}
- </Button>
- </div>
- </div>
- </div>
- </>
- );
-}
-
-export function UsersPage() {
- const { t } = useTranslation();
- const actuatorStore = useActuatorV1Store();
- const subscriptionStore = useSubscriptionV1Store();
- const settingV1Store = useSettingV1Store();
- const userStore = useUserStore();
- const groupStore = useGroupStore();
-
- const isSaaSMode = useVueState(() => actuatorStore.isSaaSMode);
- const activeUserCount = useVueState(() => actuatorStore.activeUserCount);
- const userCountLimit = useVueState(() => subscriptionStore.userCountLimit);
-
- const [tab, setTab] = useState<TabValue>(() => getInitialTab(isSaaSMode));
- const [userSearchText, setUserSearchText] = useState("");
- const [groupSearchText, setGroupSearchText] = useState("");
- const [showInactiveUsers, setShowInactiveUsers] = useState(false);
- const [inactiveUserSearchText, setInactiveUserSearchText] = useState("");
-
- const hasUserGroupFeature = useVueState(() =>
- subscriptionStore.hasInstanceFeature(PlanFeature.FEATURE_USER_GROUPS)
- );
- const workspaceDomains = useVueState(
- () => settingV1Store.workspaceProfile.domains
- );
- const hasDirectorySyncFeature = useVueState(() =>
- subscriptionStore.hasInstanceFeature(PlanFeature.FEATURE_DIRECTORY_SYNC)
- );
- const canAccessSettings = hasWorkspacePermissionV2("bb.settings.get");
-
- // Drawer visibility
- const [showCreateUserDrawer, setShowCreateUserDrawer] = useState(false);
- const [showCreateGroupDrawer, setShowCreateGroupDrawer] = useState(false);
- const [showAadSyncDrawer, setShowAadSyncDrawer] = useState(false);
- const [editingGroup, setEditingGroup] = useState<Group | undefined>(
- undefined
- );
- const [editingUser, setEditingUser] = useState<User | undefined>(undefined);
-
- // Members tab (SaaS mode)
- const workspaceStore = useWorkspaceV1Store();
- const currentUser = useVueState(() => useCurrentUserV1().value);
- const [memberSearchText, setMemberSearchText] = useState("");
- const [memberViewTab, setMemberViewTab] = useState<"MEMBERS" | "ROLES">(
- "MEMBERS"
- );
- const [selectedMembers, setSelectedMembers] = useState<string[]>([]);
- const [showEditMemberDrawer, setShowEditMemberDrawer] = useState(false);
- const [editingMember, setEditingMember] = useState<
- MemberBinding | undefined
- >();
-
- const memberBindings = useVueState(() =>
- getMemberBindings({
- policies: [
- {
- level: "WORKSPACE" as const,
- policy: workspaceStore.workspaceIamPolicy,
- },
- ],
- searchText: memberSearchText,
- ignoreRoles: new Set([]),
- })
- );
-
- const canSetIamPolicy = hasWorkspacePermissionV2(
- "bb.workspaces.setIamPolicy"
- );
-
- const handleRevokeSelected = async () => {
- if (
- selectedMembers.some(
- (m) => m === `${userBindingPrefix}${currentUser.email}`
- )
- ) {
- pushNotification({
- module: "bytebase",
- style: "WARN",
- title: t("settings.members.cannot-revoke-self"),
- });
- return;
- }
- if (window.confirm(t("settings.members.revoke-access-alert"))) {
- try {
- await workspaceStore.patchIamPolicy(
- selectedMembers.map((m) => ({ member: m, roles: [] }))
- );
- pushNotification({
- module: "bytebase",
- style: "INFO",
- title: t("settings.members.revoked"),
- });
- setSelectedMembers([]);
- } catch {
- // error already shown by store
- }
- }
- };
-
- const handleMemberUpdateBinding = (binding: MemberBinding) => {
- setEditingMember(binding);
- setShowEditMemberDrawer(true);
- };
-
- const handleMemberRevokeBinding = async (binding: MemberBinding) => {
- try {
- await workspaceStore.patchIamPolicy([
- { member: binding.binding, roles: [] },
- ]);
- pushNotification({
- module: "bytebase",
- style: "INFO",
- title: t("settings.members.revoked"),
- });
- } catch {
- // error already shown by store
- }
- };
-
- const remainingUserCount = useMemo(
- () => Math.max(0, userCountLimit - activeUserCount),
- [userCountLimit, activeUserCount]
- );
+ const remainingUserCount = useMemo(
+ () => Math.max(0, userCountLimit - activeUserCount),
+ [userCountLimit, activeUserCount]
+ );
// Active users paged data
const fetchActiveUsers = useCallback(
@@ -2977,75 +906,6 @@ export function UsersPage() {
fetchList: fetchInactiveUsers,
});
- // Groups paged data
- const fetchGroups = useCallback(
- async (params: { pageSize: number; pageToken: string }) => {
- const { groups, nextPageToken } = await groupStore.fetchGroupList({
- pageSize: params.pageSize,
- pageToken: params.pageToken,
- filter: { query: groupSearchText },
- });
- return { list: groups, nextPageToken };
- },
- [groupStore, groupSearchText]
- );
-
- const hasGroupListPermission = hasWorkspacePermissionV2("bb.groups.list");
- const groupPaged = usePagedData<Group>({
- sessionKey: "bb.paged-group-table",
- fetchList: fetchGroups,
- enabled: hasGroupListPermission,
- });
-
- // Handle query param for group opening
- // Watch for ?name=groups/... query param (reactive to route changes)
- useEffect(() => {
- const handleRouteChange = () => {
- const params = new URLSearchParams(window.location.search);
- const name = params.get("name");
- if (name && name.startsWith("groups/")) {
- setTab("GROUPS");
- groupStore
- .getOrFetchGroupByIdentifier(name)
- .then((group) => {
- if (group) {
- setEditingGroup(group);
- setShowCreateGroupDrawer(true);
- }
- })
- .catch(() => {
- // Group not found or fetch failed — silently ignore
- });
- }
- };
- // Run on mount
- handleRouteChange();
- // Listen for in-app navigation via Vue router (pushState/replaceState)
- const unregister = router.afterEach(() => {
- handleRouteChange();
- });
- return () => unregister();
- }, []); // mount-only setup, router.afterEach handles subsequent changes
- // Sync tab ↔ URL hash (bidirectional)
- useEffect(() => {
- window.location.hash = tab;
- }, [tab]);
-
- useEffect(() => {
- const onHashChange = () => {
- const hash = window.location.hash.replace("#", "").toUpperCase();
- if (hash === "USERS" && !isSaaSMode) setTab("USERS");
- else if (hash === "MEMBERS" && isSaaSMode) setTab("MEMBERS");
- else if (hash === "GROUPS") setTab("GROUPS");
- };
- window.addEventListener("hashchange", onHashChange);
- return () => window.removeEventListener("hashchange", onHashChange);
- }, [isSaaSMode]);
-
- const handleTabChange = (value: TabValue) => {
- if (value) setTab(value);
- };
-
const handleActiveUserUpdated = (user: User) => {
if (user.state === State.DELETED) {
// Deactivated: remove from active list, add to inactive list
@@ -3067,12 +927,7 @@ export function UsersPage() {
};
const handleGroupSelected = (group: Group) => {
- setEditingGroup(group);
- setShowCreateGroupDrawer(true);
- };
-
- const handleGroupDeleted = (group: Group) => {
- groupPaged.removeCache(group);
+ router.push({ name: WORKSPACE_ROUTE_GROUPS, query: { name: group.name } });
};
return (
@@ -3094,344 +949,129 @@ export function UsersPage() {
</Alert>
)}
- <Tabs
- value={tab}
- onValueChange={(val) => handleTabChange(val as TabValue)}
- >
- <div className="flex items-center justify-between">
- <TabsList>
- {!isSaaSMode && (
- <TabsTrigger value="USERS">
- {t("common.users")}
- <span className="ml-1 font-normal text-control-light">
- ({activeUserCount})
- </span>
- </TabsTrigger>
- )}
- {isSaaSMode && (
- <TabsTrigger value="MEMBERS">
- {t("common.members", { count: 2 })}
- </TabsTrigger>
- )}
- <TabsTrigger value="GROUPS">
- {t("settings.members.groups.self")}
- </TabsTrigger>
- </TabsList>
+ {/* Action bar */}
+ <div className="flex items-center justify-between mb-4">
+ <div className="relative">
+ <Input
+ placeholder={t("common.filter-by-name")}
+ value={userSearchText}
+ onChange={(e) => setUserSearchText(e.target.value)}
+ className="h-8 text-sm pr-8"
+ />
+ <Search className="absolute right-2.5 top-1/2 -translate-y-1/2 h-4 w-4 text-control-placeholder pointer-events-none" />
+ </div>
+ <div className="flex items-center gap-x-2">
+ <Button
+ variant="outline"
+ disabled={!hasDirectorySyncFeature || !canAccessSettings}
+ onClick={() => setShowAadSyncDrawer(true)}
+ >
+ <Settings className="h-4 w-4 mr-1" />
+ <FeatureBadge
+ feature={PlanFeature.FEATURE_DIRECTORY_SYNC}
+ clickable={false}
+ />
+ {t("settings.members.entra-sync.self")}
+ </Button>
+ <Button
+ disabled={!hasWorkspacePermissionV2("bb.users.create")}
+ onClick={() => {
+ setEditingUser(create(UserSchema, { title: "" }));
+ setShowCreateUserDrawer(true);
+ }}
+ >
+ <Plus className="h-4 w-4 mr-1" />
+ {t("settings.members.add-user")}
+ </Button>
+ </div>
+ </div>
+
+ <div className="flex flex-col gap-y-4">
+ <ComponentPermissionGuard permissions={["bb.users.list"]}>
+ {activeUsers.isLoading && activeUsers.dataList.length === 0 ? (
+ <div className="flex items-center justify-center h-32">
+ <div className="animate-spin h-6 w-6 border-2 border-accent border-t-transparent rounded-full" />
+ </div>
+ ) : (
+ <>
+ <UserTable
+ users={activeUsers.dataList}
+ onUserUpdated={handleActiveUserUpdated}
+ onUserSelected={(user) => {
+ setEditingUser(user);
+ setShowCreateUserDrawer(true);
+ }}
+ onGroupSelected={handleGroupSelected}
+ />
+ <PagedTableFooter
+ pageSize={activeUsers.pageSize}
+ pageSizeOptions={activeUsers.pageSizeOptions}
+ onPageSizeChange={activeUsers.onPageSizeChange}
+ hasMore={activeUsers.hasMore}
+ isFetchingMore={activeUsers.isFetchingMore}
+ onLoadMore={activeUsers.loadMore}
+ />
+ </>
+ )}
+ </ComponentPermissionGuard>
+
+ {/* Inactive users toggle (only shown with list permission) */}
+ {hasUserListPermission && (
+ <label className="flex items-center gap-x-2 text-sm cursor-pointer">
+ <input
+ type="checkbox"
+ checked={showInactiveUsers}
+ onChange={(e) => setShowInactiveUsers(e.target.checked)}
+ />
+ {t("settings.members.show-inactive")}
+ </label>
+ )}
+
+ {showInactiveUsers && (
+ <div className="flex flex-col gap-y-3">
+ <div className="flex items-center justify-between">
+ <h3 className="text-base font-medium">
+ {t("settings.members.inactive-users")}
+ </h3>
+ <div className="relative">
+ <Input
+ placeholder={t("common.filter-by-name")}
+ value={inactiveUserSearchText}
+ onChange={(e) => setInactiveUserSearchText(e.target.value)}
+ className="h-8 text-sm pr-8"
+ />
+ <Search className="absolute right-2.5 top-1/2 -translate-y-1/2 h-4 w-4 text-control-placeholder pointer-events-none" />
+ </div>
+ </div>
- <div className="flex items-center gap-x-2">
- {tab === "USERS" && (
+ {inactiveUsers.isLoading && inactiveUsers.dataList.length === 0 ? (
+ <div className="flex items-center justify-center h-32">
+ <div className="animate-spin h-6 w-6 border-2 border-accent border-t-transparent rounded-full" />
+ </div>
+ ) : (
<>
- <div className="relative">
- <Input
- placeholder={t("common.filter-by-name")}
- value={userSearchText}
- onChange={(e) => setUserSearchText(e.target.value)}
- className="h-8 text-sm pr-8"
- />
- <Search className="absolute right-2.5 top-1/2 -translate-y-1/2 h-4 w-4 text-control-placeholder pointer-events-none" />
- </div>
- <Button
- variant="outline"
- disabled={!hasDirectorySyncFeature || !canAccessSettings}
- onClick={() => setShowAadSyncDrawer(true)}
- >
- <Settings className="h-4 w-4 mr-1" />
- <FeatureBadge
- feature={PlanFeature.FEATURE_DIRECTORY_SYNC}
- clickable={false}
- />
- {t("settings.members.entra-sync.self")}
- </Button>
- <Button
- disabled={!hasWorkspacePermissionV2("bb.users.create")}
- onClick={() => {
- setEditingUser(create(UserSchema, { title: "" }));
+ <UserTable
+ users={inactiveUsers.dataList}
+ onUserUpdated={handleInactiveUserUpdated}
+ onUserSelected={(user) => {
+ setEditingUser(user);
setShowCreateUserDrawer(true);
}}
- >
- <Plus className="h-4 w-4 mr-1" />
- {t("settings.members.add-user")}
- </Button>
- </>
- )}
- {tab === "GROUPS" && (
- <>
- <div className="relative">
- <Input
- placeholder={t("common.filter-by-name")}
- value={groupSearchText}
- onChange={(e) => setGroupSearchText(e.target.value)}
- className="h-8 text-sm pr-8"
- />
- <Search className="absolute right-2.5 top-1/2 -translate-y-1/2 h-4 w-4 text-control-placeholder pointer-events-none" />
- </div>
- <Button
- variant="outline"
- disabled={!hasDirectorySyncFeature || !canAccessSettings}
- onClick={() => setShowAadSyncDrawer(true)}
- >
- <Settings className="h-4 w-4 mr-1" />
- <FeatureBadge
- feature={PlanFeature.FEATURE_DIRECTORY_SYNC}
- clickable={false}
- />
- {t("settings.members.entra-sync.self")}
- </Button>
- {workspaceDomains.length === 0 ? (
- <Tooltip
- content={
- <span>
- {t("settings.members.groups.workspace-domain-required")}{" "}
- <a
- href={
- router.resolve({
- name: SETTING_ROUTE_WORKSPACE_GENERAL,
- hash: "#domain-restriction",
- }).href
- }
- className="underline text-accent"
- >
- {t("common.configure")}
- </a>
- </span>
- }
- >
- <Button disabled>
- <Plus className="h-4 w-4 mr-1" />
- <FeatureBadge
- feature={PlanFeature.FEATURE_USER_GROUPS}
- clickable={false}
- />
- {t("settings.members.groups.add-group")}
- </Button>
- </Tooltip>
- ) : (
- <Button
- disabled={
- !hasUserGroupFeature ||
- !hasWorkspacePermissionV2("bb.groups.create")
- }
- onClick={() => {
- setEditingGroup(undefined);
- setShowCreateGroupDrawer(true);
- }}
- >
- <Plus className="h-4 w-4 mr-1" />
- <FeatureBadge
- feature={PlanFeature.FEATURE_USER_GROUPS}
- clickable={false}
- />
- {t("settings.members.groups.add-group")}
- </Button>
- )}
- </>
- )}
- {tab === "MEMBERS" && (
- <>
- <div className="relative">
- <Input
- placeholder={t("settings.members.search-member")}
- value={memberSearchText}
- onChange={(e) => setMemberSearchText(e.target.value)}
- className="h-8 text-sm pr-8"
- />
- <Search className="absolute right-2.5 top-1/2 -translate-y-1/2 h-4 w-4 text-control-placeholder pointer-events-none" />
- </div>
- {memberViewTab === "MEMBERS" && (
- <Button
- variant="outline"
- disabled={!canSetIamPolicy || selectedMembers.length === 0}
- onClick={handleRevokeSelected}
- >
- {t("settings.members.revoke-access")}
- </Button>
- )}
- <Button
- disabled={!canSetIamPolicy}
- onClick={() => {
- setEditingMember(undefined);
- setShowEditMemberDrawer(true);
- }}
- >
- <Plus className="h-4 w-4 mr-1" />
- {t("settings.members.grant-access")}
- </Button>
+ onGroupSelected={handleGroupSelected}
+ />
+ <PagedTableFooter
+ pageSize={inactiveUsers.pageSize}
+ pageSizeOptions={inactiveUsers.pageSizeOptions}
+ onPageSizeChange={inactiveUsers.onPageSizeChange}
+ hasMore={inactiveUsers.hasMore}
+ isFetchingMore={inactiveUsers.isFetchingMore}
+ onLoadMore={inactiveUsers.loadMore}
+ />
</>
)}
</div>
- </div>
-
- {!isSaaSMode && (
- <TabsPanel value="USERS">
- <div className="py-4 flex flex-col gap-y-4">
- <ComponentPermissionGuard permissions={["bb.users.list"]}>
- {activeUsers.isLoading && activeUsers.dataList.length === 0 ? (
- <div className="flex items-center justify-center h-32">
- <div className="animate-spin h-6 w-6 border-2 border-accent border-t-transparent rounded-full" />
- </div>
- ) : (
- <>
- <UserTable
- users={activeUsers.dataList}
- onUserUpdated={handleActiveUserUpdated}
- onUserSelected={(user) => {
- setEditingUser(user);
- setShowCreateUserDrawer(true);
- }}
- onGroupSelected={(group) => {
- setTab("GROUPS");
- handleGroupSelected(group);
- }}
- />
- <PagedTableFooter
- pageSize={activeUsers.pageSize}
- pageSizeOptions={activeUsers.pageSizeOptions}
- onPageSizeChange={activeUsers.onPageSizeChange}
- hasMore={activeUsers.hasMore}
- isFetchingMore={activeUsers.isFetchingMore}
- onLoadMore={activeUsers.loadMore}
- />
- </>
- )}
- </ComponentPermissionGuard>
-
- {/* Inactive users toggle (only shown with list permission) */}
- {hasUserListPermission && (
- <label className="flex items-center gap-x-2 text-sm cursor-pointer">
- <input
- type="checkbox"
- checked={showInactiveUsers}
- onChange={(e) => setShowInactiveUsers(e.target.checked)}
- />
- {t("settings.members.show-inactive")}
- </label>
- )}
-
- {showInactiveUsers && (
- <div className="flex flex-col gap-y-3">
- <div className="flex items-center justify-between">
- <h3 className="text-base font-medium">
- {t("settings.members.inactive-users")}
- </h3>
- <div className="relative">
- <Input
- placeholder={t("common.filter-by-name")}
- value={inactiveUserSearchText}
- onChange={(e) =>
- setInactiveUserSearchText(e.target.value)
- }
- className="h-8 text-sm pr-8"
- />
- <Search className="absolute right-2.5 top-1/2 -translate-y-1/2 h-4 w-4 text-control-placeholder pointer-events-none" />
- </div>
- </div>
-
- {inactiveUsers.isLoading &&
- inactiveUsers.dataList.length === 0 ? (
- <div className="flex items-center justify-center h-32">
- <div className="animate-spin h-6 w-6 border-2 border-accent border-t-transparent rounded-full" />
- </div>
- ) : (
- <>
- <UserTable
- users={inactiveUsers.dataList}
- onUserUpdated={handleInactiveUserUpdated}
- onUserSelected={(user) => {
- setEditingUser(user);
- setShowCreateUserDrawer(true);
- }}
- onGroupSelected={(group) => {
- setTab("GROUPS");
- handleGroupSelected(group);
- }}
- />
- <PagedTableFooter
- pageSize={inactiveUsers.pageSize}
- pageSizeOptions={inactiveUsers.pageSizeOptions}
- onPageSizeChange={inactiveUsers.onPageSizeChange}
- hasMore={inactiveUsers.hasMore}
- isFetchingMore={inactiveUsers.isFetchingMore}
- onLoadMore={inactiveUsers.loadMore}
- />
- </>
- )}
- </div>
- )}
- </div>
- </TabsPanel>
- )}
- {isSaaSMode && (
- <TabsPanel value="MEMBERS">
- <div className="py-4">
- <Tabs
- value={memberViewTab}
- onValueChange={(v) =>
- setMemberViewTab(v as "MEMBERS" | "ROLES")
- }
- >
- <TabsList>
- <TabsTrigger value="MEMBERS">
- {t("settings.members.view-by-members")}
- </TabsTrigger>
- <TabsTrigger value="ROLES">
- {t("settings.members.view-by-roles")}
- </TabsTrigger>
- </TabsList>
- <TabsPanel value="MEMBERS">
- <div className="py-4">
- <MemberTable
- bindings={memberBindings}
- allowEdit={canSetIamPolicy}
- selectedBindings={selectedMembers}
- onSelectionChange={setSelectedMembers}
- onUpdateBinding={handleMemberUpdateBinding}
- onRevokeBinding={handleMemberRevokeBinding}
- />
- </div>
- </TabsPanel>
- <TabsPanel value="ROLES">
- <div className="py-4">
- <MemberTableByRole
- bindings={memberBindings}
- allowEdit={canSetIamPolicy}
- onUpdateBinding={handleMemberUpdateBinding}
- onRevokeBinding={handleMemberRevokeBinding}
- />
- </div>
- </TabsPanel>
- </Tabs>
- </div>
- </TabsPanel>
)}
- <TabsPanel value="GROUPS">
- <div className="py-4 flex flex-col gap-y-4">
- <ComponentPermissionGuard permissions={["bb.groups.list"]}>
- {groupPaged.isLoading && groupPaged.dataList.length === 0 ? (
- <div className="flex items-center justify-center h-32">
- <div className="animate-spin h-6 w-6 border-2 border-accent border-t-transparent rounded-full" />
- </div>
- ) : (
- <>
- <GroupTable
- groups={groupPaged.dataList}
- searchText={groupSearchText}
- onGroupSelected={handleGroupSelected}
- onGroupDeleted={handleGroupDeleted}
- />
- <PagedTableFooter
- pageSize={groupPaged.pageSize}
- pageSizeOptions={groupPaged.pageSizeOptions}
- onPageSizeChange={groupPaged.onPageSizeChange}
- hasMore={groupPaged.hasMore}
- isFetchingMore={groupPaged.isFetchingMore}
- onLoadMore={groupPaged.loadMore}
- />
- </>
- )}
- </ComponentPermissionGuard>
- </div>
- </TabsPanel>
- </Tabs>
+ </div>
{showCreateUserDrawer && (
<CreateUserDrawer
@@ -3453,37 +1093,9 @@ export function UsersPage() {
/>
)}
- {showCreateGroupDrawer && (
- <CreateGroupDrawer
- group={editingGroup}
- onClose={() => {
- setShowCreateGroupDrawer(false);
- setEditingGroup(undefined);
- }}
- onUpdated={(group) => {
- groupPaged.updateCache([group]);
- }}
- onRemoved={(group) => {
- groupPaged.removeCache(group);
- setShowCreateGroupDrawer(false);
- setEditingGroup(undefined);
- }}
- />
- )}
-
{showAadSyncDrawer && (
<AADSyncDrawer onClose={() => setShowAadSyncDrawer(false)} />
)}
-
- {showEditMemberDrawer && (
- <EditMemberRoleDrawer
- member={editingMember}
- onClose={() => {
- setShowEditMemberDrawer(false);
- setEditingMember(undefined);
- }}
- />
- )}
</div>
);
}
diff --git a/frontend/src/react/pages/settings/WorkloadIdentitiesPage.tsx b/frontend/src/react/pages/settings/WorkloadIdentitiesPage.tsx
new file mode 100644
index 0000000000..85a2ba3b95
--- /dev/null
+++ b/frontend/src/react/pages/settings/WorkloadIdentitiesPage.tsx
@@ -0,0 +1,965 @@
+import { create } from "@bufbuild/protobuf";
+import { FieldMaskSchema } from "@bufbuild/protobuf/wkt";
+import {
+ ChevronDown,
+ ChevronUp,
+ Pencil,
+ Plus,
+ Trash2,
+ Undo2,
+ X,
+} from "lucide-react";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { useTranslation } from "react-i18next";
+import { ComponentPermissionGuard } from "@/react/components/ComponentPermissionGuard";
+import { Button } from "@/react/components/ui/button";
+import { Input } from "@/react/components/ui/input";
+import { Tooltip } from "@/react/components/ui/tooltip";
+import { useEscapeKey } from "@/react/hooks/useEscapeKey";
+import { useVueState } from "@/react/hooks/useVueState";
+import {
+ ensureWorkloadIdentityFullName,
+ pushNotification,
+ useActuatorV1Store,
+ useWorkspaceV1Store,
+} from "@/store";
+import {
+ useWorkloadIdentityStore,
+ workloadIdentityToUser,
+} from "@/store/modules/workloadIdentity";
+import {
+ getWorkloadIdentityNameInBinding,
+ getWorkloadIdentitySuffix,
+} from "@/types";
+import { State } from "@/types/proto-es/v1/common_pb";
+import type { User } from "@/types/proto-es/v1/user_service_pb";
+import type { WorkloadIdentity } from "@/types/proto-es/v1/workload_identity_service_pb";
+import {
+ WorkloadIdentityConfig_ProviderType,
+ WorkloadIdentityConfigSchema,
+ WorkloadIdentitySchema,
+} from "@/types/proto-es/v1/workload_identity_service_pb";
+import {
+ getWorkloadIdentityProviderText,
+ hasWorkspacePermissionV2,
+ parseWorkloadIdentitySubjectPattern,
+} from "@/utils";
+import { RoleMultiSelect } from "./shared/RoleMultiSelect";
+import { UserAvatar } from "./shared/UserAvatar";
+import { PagedTableFooter, usePagedData } from "./shared/usePagedData";
+
+// ============================================================
+// WorkloadIdentityTable
+// ============================================================
+
+function WorkloadIdentityTable({
+ users,
+ onUserUpdated,
+ onUserSelected,
+}: {
+ users: User[];
+ onUserUpdated: (user: User) => void;
+ onUserSelected?: (user: User) => void;
+}) {
+ const { t } = useTranslation();
+ const workloadIdentityStore = useWorkloadIdentityStore();
+
+ const handleDeactivate = async (user: User) => {
+ const confirmed = window.confirm(
+ t("settings.members.action.deactivate-confirm-title")
+ );
+ if (!confirmed) return;
+
+ try {
+ const fullName = ensureWorkloadIdentityFullName(user.email);
+ await workloadIdentityStore.deleteWorkloadIdentity(fullName);
+ const updated = { ...user, state: State.DELETED };
+ onUserUpdated(updated as User);
+ pushNotification({
+ module: "bytebase",
+ style: "SUCCESS",
+ title: t("common.updated"),
+ });
+ } catch {
+ // error already shown by store
+ }
+ };
+
+ const handleRestore = async (user: User) => {
+ try {
+ const fullName = ensureWorkloadIdentityFullName(user.email);
+ await workloadIdentityStore.undeleteWorkloadIdentity(fullName);
+ const updated = { ...user, state: State.ACTIVE };
+ onUserUpdated(updated as User);
+ pushNotification({
+ module: "bytebase",
+ style: "SUCCESS",
+ title: t("common.updated"),
+ });
+ } catch {
+ // error already shown by store
+ }
+ };
+
+ if (users.length === 0) {
+ return (
+ <div className="py-8 text-center text-control-light text-sm">
+ {t("common.no-data")}
+ </div>
+ );
+ }
+
+ return (
+ <div className="border rounded-sm overflow-hidden">
+ <table className="w-full text-sm">
+ <thead>
+ <tr className="border-b bg-control-bg">
+ <th className="px-4 py-2 text-left font-medium whitespace-nowrap">
+ {t("settings.members.table.account")}
+ </th>
+ <th className="px-4 py-2 text-right font-medium whitespace-nowrap">
+ {t("common.operations")}
+ </th>
+ </tr>
+ </thead>
+ <tbody>
+ {users.map((user, i) => {
+ const isDeleted = user.state === State.DELETED;
+
+ return (
+ <tr
+ key={user.name}
+ className={`border-b last:border-b-0 ${i % 2 === 1 ? "bg-gray-50" : ""}`}
+ >
+ {/* Account column */}
+ <td className="px-4 py-2">
+ <div className="flex items-center gap-x-3">
+ <UserAvatar title={user.title || user.email} />
+ <div className="flex flex-col">
+ <span
+ className={
+ isDeleted
+ ? "line-through text-control-light font-medium"
+ : "font-medium text-accent"
+ }
+ >
+ {user.title || user.email}
+ </span>
+ <span className="textinfolabel text-xs">
+ {user.email}
+ </span>
+ </div>
+ </div>
+ </td>
+
+ {/* Operations column */}
+ <td className="px-4 py-2">
+ <div className="flex justify-end gap-x-1">
+ {!isDeleted && (
+ <>
+ {hasWorkspacePermissionV2(
+ "bb.workloadIdentities.delete"
+ ) && (
+ <Tooltip
+ content={t(
+ "settings.members.action.deactivate-confirm-title"
+ )}
+ >
+ <Button
+ variant="ghost"
+ size="icon"
+ className="h-7 w-7 text-error hover:text-error"
+ onClick={() => handleDeactivate(user)}
+ >
+ <Trash2 className="h-4 w-4" />
+ </Button>
+ </Tooltip>
+ )}
+ {hasWorkspacePermissionV2(
+ "bb.workloadIdentities.get"
+ ) &&
+ onUserSelected && (
+ <Tooltip content={t("common.edit")}>
+ <Button
+ variant="ghost"
+ size="icon"
+ className="h-7 w-7"
+ onClick={() => onUserSelected(user)}
+ >
+ <Pencil className="h-4 w-4" />
+ </Button>
+ </Tooltip>
+ )}
+ </>
+ )}
+ {isDeleted &&
+ hasWorkspacePermissionV2(
+ "bb.workloadIdentities.undelete"
+ ) && (
+ <Tooltip
+ content={t(
+ "settings.members.action.reactivate-confirm-title"
+ )}
+ >
+ <Button
+ variant="ghost"
+ size="icon"
+ className="h-7 w-7"
+ onClick={() => handleRestore(user)}
+ >
+ <Undo2 className="h-4 w-4" />
+ </Button>
+ </Tooltip>
+ )}
+ </div>
+ </td>
+ </tr>
+ );
+ })}
+ </tbody>
+ </table>
+ </div>
+ );
+}
+
+// ============================================================
+// CreateWorkloadIdentityDrawer
+// ============================================================
+
+type RefType = "branch" | "tag" | "all";
+
+const PLATFORM_PRESETS: Partial<
+ Record<
+ WorkloadIdentityConfig_ProviderType,
+ { issuerUrl: string; audience: string }
+ >
+> = {
+ [WorkloadIdentityConfig_ProviderType.GITHUB]: {
+ issuerUrl: "https://token.actions.githubusercontent.com",
+ audience: "",
+ },
+ [WorkloadIdentityConfig_ProviderType.GITLAB]: {
+ issuerUrl: "https://gitlab.com",
+ audience: "",
+ },
+};
+
+function computeSubjectPattern(
+ providerType: WorkloadIdentityConfig_ProviderType,
+ owner: string,
+ repo: string,
+ branch: string,
+ refType: RefType
+): string {
+ if (providerType === WorkloadIdentityConfig_ProviderType.GITHUB) {
+ if (!repo) return `repo:${owner}/*`;
+ if (!branch) return `repo:${owner}/${repo}:*`;
+ return `repo:${owner}/${repo}:ref:refs/heads/${branch}`;
+ }
+ if (providerType === WorkloadIdentityConfig_ProviderType.GITLAB) {
+ if (!repo) return `project_path:${owner}/*`;
+ if (refType === "all" || !branch) return `project_path:${owner}/${repo}:*`;
+ return `project_path:${owner}/${repo}:ref_type:${refType}:ref:${branch}`;
+ }
+ return "";
+}
+
+function CreateWorkloadIdentityDrawer({
+ workloadIdentity,
+ project,
+ onClose,
+ onCreated,
+ onUpdated,
+}: {
+ workloadIdentity?: WorkloadIdentity;
+ project?: string;
+ onClose: () => void;
+ onCreated: (wi: WorkloadIdentity) => void;
+ onUpdated: (wi: WorkloadIdentity) => void;
+}) {
+ const { t } = useTranslation();
+ const workloadIdentityStore = useWorkloadIdentityStore();
+ const workspaceStore = useWorkspaceV1Store();
+ const actuatorStore = useActuatorV1Store();
+
+ const isEditMode = !!workloadIdentity && !!workloadIdentity.email;
+
+ // Form state
+ const [title, setTitle] = useState(workloadIdentity?.title ?? "");
+ const [emailPrefix, setEmailPrefix] = useState(() => {
+ if (workloadIdentity?.email) {
+ return workloadIdentity.email.split("@")[0];
+ }
+ return "";
+ });
+
+ const emailSuffix = useMemo(() => {
+ const projectId = project ? project.replace(/^projects\//, "") : "";
+ return getWorkloadIdentitySuffix(projectId || undefined);
+ }, [project]);
+
+ const parent = useMemo(
+ () => project ?? actuatorStore.workspaceResourceName,
+ [project, actuatorStore]
+ );
+
+ // WIF state
+ const [providerType, setProviderType] =
+ useState<WorkloadIdentityConfig_ProviderType>(
+ workloadIdentity?.workloadIdentityConfig?.providerType ??
+ WorkloadIdentityConfig_ProviderType.GITHUB
+ );
+ const [owner, setOwner] = useState("");
+ const [repo, setRepo] = useState("");
+ const [branch, setBranch] = useState("");
+ const [refType, setRefType] = useState<RefType>("all");
+ const [issuerUrl, setIssuerUrl] = useState(
+ PLATFORM_PRESETS[WorkloadIdentityConfig_ProviderType.GITHUB]!.issuerUrl
+ );
+ const [audience, setAudience] = useState("");
+ const [subjectPattern, setSubjectPattern] = useState("");
+ const [showAdvanced, setShowAdvanced] = useState(false);
+ const [roles, setRoles] = useState<string[]>([]);
+ const [isRequesting, setIsRequesting] = useState(false);
+
+ // Circular update prevention refs
+ const isUpdatingFromPatternRef = useRef(false);
+ const isUpdatingFromFieldsRef = useRef(false);
+
+ // Initialize from existing workload identity
+ useEffect(() => {
+ if (!workloadIdentity) return;
+ setTitle(workloadIdentity.title);
+ setEmailPrefix(workloadIdentity.email.split("@")[0]);
+
+ const config = workloadIdentity.workloadIdentityConfig;
+ if (config) {
+ setProviderType(config.providerType);
+ setIssuerUrl(config.issuerUrl);
+ setAudience(config.allowedAudiences[0] ?? "");
+ setSubjectPattern(config.subjectPattern);
+
+ const parsed = parseWorkloadIdentitySubjectPattern(workloadIdentity);
+ if (parsed) {
+ setOwner(parsed.owner);
+ setRepo(parsed.repo);
+ setBranch(parsed.branch);
+ if ("refType" in parsed && parsed.refType) {
+ setRefType(parsed.refType);
+ }
+ }
+ }
+ }, []);
+
+ // When fields change -> update subject pattern
+ useEffect(() => {
+ if (isUpdatingFromPatternRef.current) return;
+ isUpdatingFromFieldsRef.current = true;
+ setSubjectPattern(
+ computeSubjectPattern(providerType, owner, repo, branch, refType)
+ );
+ isUpdatingFromFieldsRef.current = false;
+ }, [owner, repo, branch, providerType, refType]);
+
+ // When subject pattern changes -> reverse-parse fields
+ useEffect(() => {
+ if (isUpdatingFromFieldsRef.current) return;
+ const parsed = parseWorkloadIdentitySubjectPattern({
+ workloadIdentityConfig: {
+ subjectPattern,
+ providerType,
+ },
+ });
+ if (parsed) {
+ isUpdatingFromPatternRef.current = true;
+ setOwner(parsed.owner);
+ setRepo(parsed.repo);
+ setBranch(parsed.branch);
+ if ("refType" in parsed && parsed.refType) {
+ setRefType(parsed.refType);
+ }
+ isUpdatingFromPatternRef.current = false;
+ }
+ }, [subjectPattern]);
+
+ useEscapeKey(true, onClose);
+
+ const handlePlatformChange = (value: WorkloadIdentityConfig_ProviderType) => {
+ setProviderType(value);
+ const preset = PLATFORM_PRESETS[value];
+ if (preset) {
+ setIssuerUrl(preset.issuerUrl);
+ setAudience(preset.audience);
+ }
+ setRefType("all");
+ setBranch("");
+ };
+
+ const allowConfirm = useMemo(() => {
+ if (!emailPrefix && !workloadIdentity?.email) return false;
+ if (!owner) return false;
+ if (!issuerUrl) return false;
+ return true;
+ }, [emailPrefix, workloadIdentity?.email, owner, issuerUrl]);
+
+ const hasPermission = hasWorkspacePermissionV2(
+ isEditMode ? "bb.workloadIdentities.update" : "bb.workloadIdentities.create"
+ );
+
+ const handleSubmit = async () => {
+ if (!allowConfirm || !hasPermission) return;
+ setIsRequesting(true);
+ try {
+ if (isEditMode) {
+ await handleUpdate();
+ } else {
+ await handleCreate();
+ }
+ } catch {
+ // error shown by store
+ } finally {
+ setIsRequesting(false);
+ }
+ };
+
+ const handleCreate = async () => {
+ const wi = await workloadIdentityStore.createWorkloadIdentity(
+ emailPrefix,
+ {
+ title: title || emailPrefix,
+ workloadIdentityConfig: create(WorkloadIdentityConfigSchema, {
+ providerType,
+ issuerUrl,
+ allowedAudiences: audience ? [audience] : [],
+ subjectPattern,
+ }),
+ },
+ parent
+ );
+
+ if (roles.length > 0) {
+ await workspaceStore.patchIamPolicy([
+ {
+ member: getWorkloadIdentityNameInBinding(wi.email),
+ roles,
+ },
+ ]);
+ }
+
+ onCreated(wi);
+ pushNotification({
+ module: "bytebase",
+ style: "SUCCESS",
+ title: t("common.created"),
+ });
+ onClose();
+ };
+
+ const handleUpdate = async () => {
+ if (!workloadIdentity) return;
+
+ const updateMask: string[] = [];
+ if (title !== workloadIdentity.title) {
+ updateMask.push("title");
+ }
+
+ const updated = await workloadIdentityStore.updateWorkloadIdentity(
+ create(WorkloadIdentitySchema, {
+ name: ensureWorkloadIdentityFullName(workloadIdentity.email),
+ title,
+ workloadIdentityConfig: create(WorkloadIdentityConfigSchema, {
+ providerType,
+ issuerUrl,
+ allowedAudiences: audience ? [audience] : [],
+ subjectPattern,
+ }),
+ }),
+ create(FieldMaskSchema, {
+ paths: [...updateMask, "workload_identity_config"],
+ })
+ );
+
+ onUpdated(updated);
+ pushNotification({
+ module: "bytebase",
+ style: "SUCCESS",
+ title: t("common.updated"),
+ });
+ onClose();
+ };
+
+ const isGitLab = providerType === WorkloadIdentityConfig_ProviderType.GITLAB;
+ const showBranchField =
+ providerType === WorkloadIdentityConfig_ProviderType.GITHUB ||
+ refType !== "all";
+ const isTagRefType = isGitLab && refType === "tag";
+
+ return (
+ <>
+ {/* Backdrop */}
+ <div className="fixed inset-0 z-40 bg-black/30" onClick={onClose} />
+
+ {/* Drawer */}
+ <div
+ role="dialog"
+ aria-modal="true"
+ className="fixed inset-y-0 right-0 z-50 w-[40rem] max-w-[100vw] bg-white shadow-xl flex flex-col"
+ >
+ {/* Header */}
+ <div className="flex items-center justify-between px-6 py-4 border-b">
+ <h2 className="text-lg font-medium">
+ {isEditMode
+ ? t("settings.members.update-workload-identity")
+ : t("settings.members.add-workload-identity")}
+ </h2>
+ <Button variant="ghost" size="icon" onClick={onClose}>
+ <X className="h-5 w-5" />
+ </Button>
+ </div>
+
+ {/* Content */}
+ <div className="flex-1 overflow-auto px-6 py-6">
+ <div className="flex flex-col gap-y-6">
+ {/* Title */}
+ <div className="flex flex-col gap-y-2">
+ <label className="block text-sm font-medium text-control">
+ {t("common.name")}
+ </label>
+ <Input
+ value={title}
+ onChange={(e) => setTitle(e.target.value)}
+ placeholder="GitHub Deploy"
+ maxLength={200}
+ autoComplete="off"
+ />
+ </div>
+
+ {/* Email */}
+ <div className="flex flex-col gap-y-2">
+ <label className="block text-sm font-medium text-control">
+ {t("common.email")}
+ <span className="ml-0.5 text-error">*</span>
+ </label>
+ {isEditMode ? (
+ <Input value={workloadIdentity!.email} disabled />
+ ) : (
+ <div className="flex items-center">
+ <Input
+ value={emailPrefix}
+ onChange={(e) => setEmailPrefix(e.target.value)}
+ placeholder="my-workflow"
+ autoComplete="off"
+ className="rounded-r-none"
+ />
+ <span className="inline-flex items-center px-3 h-9 border border-l-0 border-control-border bg-control-bg text-sm text-control rounded-r-xs whitespace-nowrap">
+ @{emailSuffix}
+ </span>
+ </div>
+ )}
+ </div>
+
+ {/* Platform */}
+ <div className="flex flex-col gap-y-2">
+ <label className="block text-sm font-medium text-control">
+ {t("settings.members.workload-identity-platform")}
+ <span className="ml-0.5 text-error">*</span>
+ </label>
+ <select
+ value={providerType}
+ onChange={(e) =>
+ handlePlatformChange(
+ Number(
+ e.target.value
+ ) as WorkloadIdentityConfig_ProviderType
+ )
+ }
+ className="border border-control-border rounded-xs text-sm px-2 py-2 bg-white"
+ >
+ {[
+ WorkloadIdentityConfig_ProviderType.GITHUB,
+ WorkloadIdentityConfig_ProviderType.GITLAB,
+ ].map((pt) => (
+ <option key={pt} value={pt}>
+ {getWorkloadIdentityProviderText(pt)}
+ </option>
+ ))}
+ </select>
+ </div>
+
+ {/* Owner / Group */}
+ <div className="flex flex-col gap-y-2">
+ <label className="block text-sm font-medium text-control">
+ {isGitLab
+ ? t("settings.members.workload-identity-group")
+ : t("settings.members.workload-identity-owner")}
+ <span className="ml-0.5 text-error">*</span>
+ </label>
+ <Input
+ value={owner}
+ onChange={(e) => setOwner(e.target.value)}
+ placeholder={isGitLab ? "my-group" : "my-org"}
+ maxLength={200}
+ autoComplete="off"
+ />
+ </div>
+
+ {/* Repository / Project */}
+ <div className="flex flex-col gap-y-2">
+ <label className="block text-sm font-medium text-control">
+ {isGitLab
+ ? t("settings.members.workload-identity-project")
+ : t("settings.members.workload-identity-repo")}
+ </label>
+ <Input
+ value={repo}
+ onChange={(e) => setRepo(e.target.value)}
+ placeholder={isGitLab ? "my-project" : "my-repo"}
+ maxLength={200}
+ autoComplete="off"
+ />
+ <span className="text-xs text-gray-500">
+ {isGitLab
+ ? t("settings.members.workload-identity-project-hint")
+ : t("settings.members.workload-identity-repo-hint")}
+ </span>
+ </div>
+
+ {/* Allowed Branches/Tags (GitLab only) */}
+ {isGitLab && (
+ <div className="flex flex-col gap-y-2">
+ <label className="block text-sm font-medium text-control">
+ {t(
+ "settings.members.workload-identity-allowed-branches-tags"
+ )}
+ </label>
+ <select
+ value={refType}
+ onChange={(e) => setRefType(e.target.value as RefType)}
+ className="border border-control-border rounded-xs text-sm px-2 py-2 bg-white"
+ >
+ <option value="all">
+ {t("settings.members.workload-identity-all-branches-tags")}
+ </option>
+ <option value="branch">
+ {t("settings.members.workload-identity-specific-branch")}
+ </option>
+ <option value="tag">
+ {t("settings.members.workload-identity-specific-tag")}
+ </option>
+ </select>
+ </div>
+ )}
+
+ {/* Branch / Tag */}
+ {showBranchField && (
+ <div className="flex flex-col gap-y-2">
+ <label className="block text-sm font-medium text-control">
+ {isTagRefType
+ ? t("settings.members.workload-identity-tag")
+ : t("settings.members.workload-identity-branch")}
+ </label>
+ <Input
+ value={branch}
+ onChange={(e) => setBranch(e.target.value)}
+ placeholder={isTagRefType ? "v1.0.0" : "main"}
+ maxLength={200}
+ autoComplete="off"
+ />
+ <span className="text-xs text-gray-500">
+ {isTagRefType
+ ? t("settings.members.workload-identity-tag-hint")
+ : t("settings.members.workload-identity-branch-hint")}
+ </span>
+ </div>
+ )}
+
+ {/* Advanced Settings */}
+ {showAdvanced && (
+ <div className="flex flex-col gap-y-6 pt-6 border-t">
+ {/* Issuer URL / GitLab URL */}
+ <div className="flex flex-col gap-y-2">
+ <label className="block text-sm font-medium text-control">
+ {isGitLab
+ ? t("settings.members.workload-identity-gitlab-url")
+ : t("settings.members.workload-identity-issuer")}
+ </label>
+ <Input
+ value={issuerUrl}
+ onChange={(e) => setIssuerUrl(e.target.value)}
+ maxLength={500}
+ autoComplete="off"
+ />
+ {isGitLab && (
+ <span className="text-xs text-gray-500">
+ {t("settings.members.workload-identity-gitlab-url-hint")}
+ </span>
+ )}
+ </div>
+
+ {/* Audience */}
+ <div className="flex flex-col gap-y-2">
+ <label className="block text-sm font-medium text-control">
+ {t("settings.members.workload-identity-audience")}
+ </label>
+ <Input
+ value={audience}
+ onChange={(e) => setAudience(e.target.value)}
+ maxLength={500}
+ autoComplete="off"
+ />
+ </div>
+
+ {/* Subject Pattern */}
+ <div className="flex flex-col gap-y-2">
+ <label className="block text-sm font-medium text-control">
+ {t("settings.members.workload-identity-subject")}
+ </label>
+ <Input
+ value={subjectPattern}
+ onChange={(e) => setSubjectPattern(e.target.value)}
+ maxLength={500}
+ autoComplete="off"
+ />
+ </div>
+ </div>
+ )}
+
+ {/* Advanced Settings Toggle */}
+ <button
+ type="button"
+ className="flex items-center gap-x-1 text-sm text-accent hover:underline w-fit"
+ onClick={() => setShowAdvanced(!showAdvanced)}
+ >
+ {t("settings.members.workload-identity-advanced")}
+ {showAdvanced ? (
+ <ChevronUp className="w-4 h-4" />
+ ) : (
+ <ChevronDown className="w-4 h-4" />
+ )}
+ </button>
+
+ {/* Roles (create mode only) */}
+ {!isEditMode &&
+ hasWorkspacePermissionV2("bb.workspaces.setIamPolicy") && (
+ <div className="flex flex-col gap-y-2">
+ <label className="block text-sm font-medium text-control">
+ {t("settings.members.table.roles")}
+ </label>
+ <RoleMultiSelect
+ value={roles}
+ onChange={setRoles}
+ disabled={false}
+ />
+ </div>
+ )}
+ </div>
+ </div>
+
+ {/* Footer */}
+ <div className="flex items-center justify-end gap-x-2 px-6 py-4 border-t">
+ <Button variant="outline" onClick={onClose}>
+ {t("common.cancel")}
+ </Button>
+ <Button
+ disabled={!allowConfirm || !hasPermission || isRequesting}
+ onClick={handleSubmit}
+ >
+ {isEditMode ? t("common.update") : t("common.confirm")}
+ </Button>
+ </div>
+ </div>
+ </>
+ );
+}
+
+// ============================================================
+// WorkloadIdentitiesPage (main)
+// ============================================================
+
+export function WorkloadIdentitiesPage() {
+ const { t } = useTranslation();
+ const workloadIdentityStore = useWorkloadIdentityStore();
+ const actuatorStore = useActuatorV1Store();
+
+ const workspaceResourceName = useVueState(
+ () => actuatorStore.workspaceResourceName
+ );
+
+ const [showInactive, setShowInactive] = useState(false);
+ const [showDrawer, setShowDrawer] = useState(false);
+ const [editingWI, setEditingWI] = useState<WorkloadIdentity | undefined>(
+ undefined
+ );
+
+ const fetchActive = useCallback(
+ async (params: { pageSize: number; pageToken: string }) => {
+ const response = await workloadIdentityStore.listWorkloadIdentities({
+ parent: workspaceResourceName,
+ pageSize: params.pageSize,
+ pageToken: params.pageToken,
+ showDeleted: false,
+ });
+ return {
+ list: response.workloadIdentities.map(workloadIdentityToUser),
+ nextPageToken: response.nextPageToken,
+ };
+ },
+ [workloadIdentityStore, workspaceResourceName]
+ );
+
+ const fetchInactive = useCallback(
+ async (params: { pageSize: number; pageToken: string }) => {
+ const response = await workloadIdentityStore.listWorkloadIdentities({
+ parent: workspaceResourceName,
+ pageSize: params.pageSize,
+ pageToken: params.pageToken,
+ showDeleted: true,
+ filter: { state: State.DELETED },
+ });
+ return {
+ list: response.workloadIdentities.map(workloadIdentityToUser),
+ nextPageToken: response.nextPageToken,
+ };
+ },
+ [workloadIdentityStore, workspaceResourceName]
+ );
+
+ const activeData = usePagedData<User>({
+ sessionKey: "bb.paged-workload-identity-table.active",
+ fetchList: fetchActive,
+ });
+
+ const inactiveData = usePagedData<User>({
+ sessionKey: "bb.paged-workload-identity-table.deleted",
+ fetchList: fetchInactive,
+ enabled: showInactive,
+ });
+
+ const handleActiveUpdated = (user: User) => {
+ if (user.state === State.DELETED) {
+ activeData.removeCache(user);
+ inactiveData.updateCache([user]);
+ } else {
+ activeData.updateCache([user]);
+ }
+ };
+
+ const handleInactiveUpdated = (user: User) => {
+ if (user.state === State.ACTIVE) {
+ inactiveData.removeCache(user);
+ activeData.refresh();
+ } else {
+ inactiveData.updateCache([user]);
+ }
+ };
+
+ const handleUserSelected = (user: User) => {
+ const wi = workloadIdentityStore.getWorkloadIdentity(user.email);
+ setEditingWI(wi);
+ setShowDrawer(true);
+ };
+
+ return (
+ <div className="w-full overflow-x-hidden flex flex-col py-4">
+ {/* Header */}
+ <div className="flex justify-between items-center px-4 pb-2">
+ <p className="text-lg font-medium leading-7 text-main">
+ {t("settings.members.workload-identities")}
+ </p>
+ <Button
+ disabled={!hasWorkspacePermissionV2("bb.workloadIdentities.create")}
+ onClick={() => {
+ setEditingWI(undefined);
+ setShowDrawer(true);
+ }}
+ >
+ <Plus className="h-4 w-4 mr-1" />
+ {t("settings.members.add-workload-identity")}
+ </Button>
+ </div>
+
+ <div className="flex flex-col gap-y-4 px-4">
+ <ComponentPermissionGuard permissions={["bb.workloadIdentities.list"]}>
+ {activeData.isLoading && activeData.dataList.length === 0 ? (
+ <div className="flex items-center justify-center h-32">
+ <div className="animate-spin h-6 w-6 border-2 border-accent border-t-transparent rounded-full" />
+ </div>
+ ) : (
+ <>
+ <WorkloadIdentityTable
+ users={activeData.dataList}
+ onUserUpdated={handleActiveUpdated}
+ onUserSelected={handleUserSelected}
+ />
+ <PagedTableFooter
+ pageSize={activeData.pageSize}
+ pageSizeOptions={activeData.pageSizeOptions}
+ onPageSizeChange={activeData.onPageSizeChange}
+ hasMore={activeData.hasMore}
+ isFetchingMore={activeData.isFetchingMore}
+ onLoadMore={activeData.loadMore}
+ />
+ </>
+ )}
+ </ComponentPermissionGuard>
+
+ {/* Show inactive toggle */}
+ <label className="flex items-center gap-x-2 text-sm cursor-pointer">
+ <input
+ type="checkbox"
+ checked={showInactive}
+ onChange={(e) => setShowInactive(e.target.checked)}
+ />
+ <span className="textinfolabel">
+ {t("settings.members.show-inactive")}
+ </span>
+ </label>
+
+ {showInactive && (
+ <div className="flex flex-col gap-y-3">
+ <p className="text-lg font-medium leading-7">
+ {t("settings.members.inactive-workload-identities")}
+ </p>
+
+ {inactiveData.isLoading && inactiveData.dataList.length === 0 ? (
+ <div className="flex items-center justify-center h-32">
+ <div className="animate-spin h-6 w-6 border-2 border-accent border-t-transparent rounded-full" />
+ </div>
+ ) : (
+ <>
+ <WorkloadIdentityTable
+ users={inactiveData.dataList}
+ onUserUpdated={handleInactiveUpdated}
+ />
+ <PagedTableFooter
+ pageSize={inactiveData.pageSize}
+ pageSizeOptions={inactiveData.pageSizeOptions}
+ onPageSizeChange={inactiveData.onPageSizeChange}
+ hasMore={inactiveData.hasMore}
+ isFetchingMore={inactiveData.isFetchingMore}
+ onLoadMore={inactiveData.loadMore}
+ />
+ </>
+ )}
+ </div>
+ )}
+ </div>
+
+ {showDrawer && (
+ <CreateWorkloadIdentityDrawer
+ workloadIdentity={editingWI}
+ onClose={() => {
+ setShowDrawer(false);
+ setEditingWI(undefined);
+ }}
+ onCreated={(wi) => {
+ activeData.updateCache([workloadIdentityToUser(wi)]);
+ }}
+ onUpdated={(wi) => {
+ activeData.updateCache([workloadIdentityToUser(wi)]);
+ }}
+ />
+ )}
+ </div>
+ );
+}
diff --git a/frontend/src/react/pages/settings/shared/AADSyncDrawer.tsx b/frontend/src/react/pages/settings/shared/AADSyncDrawer.tsx
new file mode 100644
index 0000000000..e6b3b5c195
--- /dev/null
+++ b/frontend/src/react/pages/settings/shared/AADSyncDrawer.tsx
@@ -0,0 +1,207 @@
+import { create } from "@bufbuild/protobuf";
+import { FieldMaskSchema } from "@bufbuild/protobuf/wkt";
+import { Copy, X } from "lucide-react";
+import { useTranslation } from "react-i18next";
+import { Alert, AlertDescription } from "@/react/components/ui/alert";
+import { Button } from "@/react/components/ui/button";
+import { Input } from "@/react/components/ui/input";
+import { useEscapeKey } from "@/react/hooks/useEscapeKey";
+import { useVueState } from "@/react/hooks/useVueState";
+import {
+ pushNotification,
+ useActuatorV1Store,
+ useSettingV1Store,
+} from "@/store";
+import { hasWorkspacePermissionV2 } from "@/utils";
+
+// ============================================================
+// AADSyncDrawer
+// ============================================================
+
+export function AADSyncDrawer({ onClose }: { onClose: () => void }) {
+ const { t } = useTranslation();
+ const actuatorStore = useActuatorV1Store();
+ const settingV1Store = useSettingV1Store();
+
+ const externalUrl = useVueState(
+ () => actuatorStore.serverInfo?.externalUrl ?? ""
+ );
+ const workspaceResourceName = useVueState(
+ () => actuatorStore.workspaceResourceName
+ );
+ const directorySyncToken = useVueState(
+ () => settingV1Store.workspaceProfile.directorySyncToken
+ );
+
+ useEscapeKey(true, onClose);
+
+ const scimUrl =
+ externalUrl && workspaceResourceName
+ ? `${externalUrl}/hook/scim/${workspaceResourceName}`
+ : "";
+
+ const copyToClipboard = async (value: string) => {
+ try {
+ if (navigator.clipboard) {
+ await navigator.clipboard.writeText(value);
+ } else {
+ // Fallback for non-secure contexts (e.g. self-hosted HTTP)
+ const textarea = document.createElement("textarea");
+ textarea.value = value;
+ textarea.style.position = "fixed";
+ textarea.style.opacity = "0";
+ document.body.appendChild(textarea);
+ textarea.select();
+ document.execCommand("copy");
+ document.body.removeChild(textarea);
+ }
+ pushNotification({
+ module: "bytebase",
+ style: "SUCCESS",
+ title: t("common.copied"),
+ });
+ } catch {
+ pushNotification({
+ module: "bytebase",
+ style: "WARN",
+ title: t("common.copy-failed"),
+ });
+ }
+ };
+
+ const handleResetToken = async () => {
+ const confirmed = window.confirm(
+ t("settings.members.entra-sync.reset-token-warning")
+ );
+ if (!confirmed) return;
+
+ try {
+ await settingV1Store.updateWorkspaceProfile({
+ payload: { directorySyncToken: "" },
+ updateMask: create(FieldMaskSchema, {
+ paths: ["value.workspace_profile.directory_sync_token"],
+ }),
+ });
+ pushNotification({
+ module: "bytebase",
+ style: "SUCCESS",
+ title: t("common.updated"),
+ });
+ } catch {
+ // error already shown by store
+ }
+ };
+
+ return (
+ <>
+ {/* Backdrop */}
+ <div className="fixed inset-0 z-40 bg-black/30" onClick={onClose} />
+
+ {/* Drawer */}
+ <div
+ role="dialog"
+ aria-modal="true"
+ className="fixed inset-y-0 right-0 z-50 w-[40rem] max-w-[100vw] bg-white shadow-xl flex flex-col"
+ >
+ {/* Header */}
+ <div className="flex items-center justify-between px-6 py-4 border-b">
+ <h2 className="text-lg font-medium">
+ {t("settings.members.entra-sync.self")}
+ </h2>
+ <Button variant="ghost" size="icon" onClick={onClose}>
+ <X className="h-5 w-5" />
+ </Button>
+ </div>
+
+ {/* Content */}
+ <div className="flex-1 overflow-auto px-6 py-6">
+ <div className="flex flex-col gap-y-6">
+ {/* Description */}
+ <p className="text-sm text-control-light">
+ {t("settings.members.entra-sync.description")}{" "}
+ <a
+ href="https://docs.bytebase.com/administration/scim/overview?source=console"
+ target="_blank"
+ rel="noopener noreferrer"
+ className="text-accent hover:underline"
+ >
+ {t("common.learn-more")}
+ </a>
+ </p>
+
+ {/* Missing external URL warning */}
+ {!externalUrl && (
+ <Alert variant="warning">
+ <AlertDescription>{t("banner.external-url")}</AlertDescription>
+ </Alert>
+ )}
+
+ {/* SCIM Endpoint URL */}
+ <div className="flex flex-col gap-y-2">
+ <label className="block text-sm font-medium text-control">
+ {t("settings.members.entra-sync.endpoint")}
+ </label>
+ <span className="textinfolabel text-sm">
+ {t("settings.members.entra-sync.endpoint-tip")}
+ </span>
+ <div className="flex items-center gap-x-2">
+ <Input readOnly value={scimUrl} className="flex-1 text-sm" />
+ <Button
+ variant="outline"
+ size="sm"
+ disabled={!scimUrl}
+ onClick={() => copyToClipboard(scimUrl)}
+ >
+ <Copy className="h-4 w-4" />
+ </Button>
+ </div>
+ </div>
+
+ {/* Secret Token */}
+ <div className="flex flex-col gap-y-2">
+ <label className="block text-sm font-medium text-control">
+ {t("settings.members.entra-sync.secret-token")}
+ </label>
+ <span className="textinfolabel text-sm">
+ {t("settings.members.entra-sync.secret-token-tip")}
+ </span>
+ <div className="flex items-center gap-x-2">
+ <Input
+ readOnly
+ type="password"
+ value={directorySyncToken}
+ className="flex-1 text-sm"
+ />
+ <Button
+ variant="outline"
+ size="sm"
+ disabled={!directorySyncToken}
+ onClick={() => copyToClipboard(directorySyncToken)}
+ >
+ <Copy className="h-4 w-4" />
+ </Button>
+ </div>
+ {hasWorkspacePermissionV2("bb.settings.setWorkspaceProfile") && (
+ <Button
+ variant="outline"
+ size="sm"
+ className="self-start text-error border-error hover:bg-error/10"
+ onClick={handleResetToken}
+ >
+ {t("settings.members.entra-sync.reset-token")}
+ </Button>
+ )}
+ </div>
+ </div>
+ </div>
+
+ {/* Footer */}
+ <div className="flex items-center justify-end gap-x-2 px-6 py-4 border-t">
+ <Button variant="outline" onClick={onClose}>
+ {t("common.cancel")}
+ </Button>
+ </div>
+ </div>
+ </>
+ );
+}
diff --git a/frontend/src/react/pages/settings/shared/AccountMultiSelect.tsx b/frontend/src/react/pages/settings/shared/AccountMultiSelect.tsx
new file mode 100644
index 0000000000..1f7e93c7cc
--- /dev/null
+++ b/frontend/src/react/pages/settings/shared/AccountMultiSelect.tsx
@@ -0,0 +1,525 @@
+import {
+ Check,
+ ChevronDown,
+ KeyRound,
+ Search,
+ Shield,
+ Users,
+ X,
+} from "lucide-react";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { useTranslation } from "react-i18next";
+import { useClickOutside } from "@/react/hooks/useClickOutside";
+import { useVueState } from "@/react/hooks/useVueState";
+import { cn } from "@/react/lib/utils";
+import { useCurrentUserV1, useGroupStore, useUserStore } from "@/store";
+import { extractUserEmail, groupNamePrefix } from "@/store/modules/v1/common";
+import { ALL_USERS_USER_EMAIL, userBindingPrefix } from "@/types";
+import type { Group } from "@/types/proto-es/v1/group_service_pb";
+import type { User } from "@/types/proto-es/v1/user_service_pb";
+import { isValidEmail } from "@/utils";
+
+import { getAvatarColor, getInitials } from "./UserAvatar";
+
+// ---- Account type detection ----
+
+const SERVICE_ACCOUNT_SUFFIX = "@service.bytebase.com";
+const WORKLOAD_IDENTITY_SUFFIX = "@workload.bytebase.com";
+
+type SpecialAccountType = "serviceAccount" | "workloadIdentity" | null;
+
+function detectSpecialAccount(input: string): SpecialAccountType {
+ const lower = input.toLowerCase();
+ if (
+ lower.endsWith(SERVICE_ACCOUNT_SUFFIX) ||
+ lower.startsWith("serviceaccounts/") ||
+ lower.startsWith("serviceaccount:")
+ )
+ return "serviceAccount";
+ if (
+ lower.endsWith(WORKLOAD_IDENTITY_SUFFIX) ||
+ lower.startsWith("workloadidentities/") ||
+ lower.startsWith("workloadidentity:")
+ )
+ return "workloadIdentity";
+ return null;
+}
+
+function extractSpecialEmail(input: string): string {
+ if (input.includes("/")) return input.split("/").slice(1).join("/");
+ if (input.includes(":")) return input.split(":").slice(1).join(":");
+ return input;
+}
+
+// ---- Conversion helpers ----
+
+// binding → fullname
+function bindingToFullname(binding: string): string {
+ if (binding === ALL_USERS_USER_EMAIL) return ALL_USERS_USER_EMAIL;
+ if (binding.startsWith("user:"))
+ return `users/${binding.slice("user:".length)}`;
+ if (binding.startsWith("group:"))
+ return `${groupNamePrefix}${binding.slice("group:".length)}`;
+ if (binding.startsWith("serviceAccount:"))
+ return `serviceAccounts/${binding.slice("serviceAccount:".length)}`;
+ if (binding.startsWith("workloadIdentity:"))
+ return `workloadIdentities/${binding.slice("workloadIdentity:".length)}`;
+ return binding;
+}
+
+// fullname → binding
+function fullnameToBinding(fullname: string): string {
+ if (fullname === ALL_USERS_USER_EMAIL) return ALL_USERS_USER_EMAIL;
+ if (fullname.startsWith("users/"))
+ return `${userBindingPrefix}${fullname.slice("users/".length)}`;
+ if (fullname.startsWith(groupNamePrefix))
+ return `group:${fullname.slice(groupNamePrefix.length)}`;
+ if (fullname.startsWith("serviceAccounts/"))
+ return `serviceAccount:${fullname.slice("serviceAccounts/".length)}`;
+ if (fullname.startsWith("workloadIdentities/"))
+ return `workloadIdentity:${fullname.slice("workloadIdentities/".length)}`;
+ return fullname;
+}
+
+// ---- Sub-components ----
+
+function SelectionCheckbox({ selected }: { selected: boolean }) {
+ return (
+ <div
+ className={cn(
+ "h-4 w-4 rounded-xs border flex items-center justify-center shrink-0",
+ selected
+ ? "bg-accent border-accent text-white"
+ : "border-control-border"
+ )}
+ >
+ {selected && <Check className="h-3 w-3" />}
+ </div>
+ );
+}
+
+function SpecialAccountOption({
+ match,
+ selected,
+ onToggle,
+}: {
+ match: { type: SpecialAccountType; email: string };
+ selected: boolean;
+ onToggle: () => void;
+}) {
+ const { t } = useTranslation();
+ const isServiceAccount = match.type === "serviceAccount";
+ const Icon = isServiceAccount ? KeyRound : Shield;
+ const label = isServiceAccount
+ ? t("settings.members.service-account")
+ : t("settings.members.workload-identity");
+
+ return (
+ <div
+ className={cn(
+ "flex items-center gap-x-3 px-3 py-2 cursor-pointer hover:bg-gray-50",
+ selected && "bg-accent/5"
+ )}
+ onClick={onToggle}
+ >
+ <SelectionCheckbox selected={selected} />
+ <div
+ className="h-7 w-7 rounded-full flex items-center justify-center text-white text-xs font-medium shrink-0"
+ style={{ backgroundColor: getAvatarColor(match.email) }}
+ >
+ <Icon className="h-3.5 w-3.5" />
+ </div>
+ <div className="flex flex-col min-w-0">
+ <div className="flex items-center gap-x-1">
+ <span className="text-sm font-medium truncate">
+ {match.email.split("@")[0]}
+ </span>
+ <span className="text-xs text-control-light bg-gray-100 rounded px-1">
+ {label}
+ </span>
+ </div>
+ <span className="text-xs text-control-light truncate">
+ {match.email}
+ </span>
+ </div>
+ </div>
+ );
+}
+
+// ---- Component ----
+
+export function AccountMultiSelect({
+ value,
+ onChange,
+ disabled,
+ includeAllUsers,
+}: {
+ value: string[];
+ onChange: (value: string[]) => void;
+ disabled?: boolean;
+ includeAllUsers?: boolean;
+}) {
+ const { t } = useTranslation();
+ const userStore = useUserStore();
+ const groupStore = useGroupStore();
+ const currentUser = useVueState(() => useCurrentUserV1().value);
+
+ const [open, setOpen] = useState(false);
+ const [search, setSearch] = useState("");
+ const [users, setUsers] = useState<User[]>([]);
+ const [groups, setGroups] = useState<Group[]>([]);
+
+ const containerRef = useRef<HTMLDivElement>(null);
+ const inputRef = useRef<HTMLInputElement>(null);
+ const debounceRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+ // Cache display labels for selected items so they persist across search changes
+ const labelCacheRef = useRef<Map<string, string>>(new Map());
+
+ // Fetch on search change (debounced 300ms)
+ useEffect(() => {
+ if (debounceRef.current) clearTimeout(debounceRef.current);
+ debounceRef.current = setTimeout(() => {
+ const query = search.trim();
+ userStore
+ .fetchUserList({ pageSize: 50, filter: { query } })
+ .then(({ users: fetched }) => setUsers(fetched));
+ groupStore
+ .fetchGroupList({ pageSize: 50, filter: { query } })
+ .then(({ groups: fetched }) => setGroups(fetched));
+ }, 300);
+ return () => {
+ if (debounceRef.current) clearTimeout(debounceRef.current);
+ };
+ }, [search, userStore, groupStore]);
+
+ const handleClickOutside = useCallback(() => {
+ setOpen(false);
+ setSearch("");
+ }, []);
+ useClickOutside(containerRef, open, handleClickOutside);
+
+ // Selected fullnames set for quick lookup
+ const selectedFullnames = useMemo(
+ () => new Set(value.map(bindingToFullname)),
+ [value]
+ );
+
+ const toggle = (fullname: string) => {
+ if (disabled) return;
+ const binding = fullnameToBinding(fullname);
+ if (selectedFullnames.has(fullname)) {
+ labelCacheRef.current.delete(binding);
+ onChange(value.filter((v) => v !== binding));
+ } else {
+ // Cache display label at selection time so it survives search changes
+ const label = resolveLabel(fullname);
+ if (label) labelCacheRef.current.set(binding, label);
+ onChange([...value, binding]);
+ }
+ };
+
+ const remove = (binding: string) => {
+ if (disabled) return;
+ labelCacheRef.current.delete(binding);
+ onChange(value.filter((v) => v !== binding));
+ };
+
+ // Resolve display label from current search results
+ const resolveLabel = (fullname: string): string | undefined => {
+ if (fullname.startsWith("users/")) {
+ const email = extractUserEmail(fullname);
+ const user = users.find((u) => u.email === email);
+ return user?.title || user?.email;
+ }
+ if (fullname.startsWith(groupNamePrefix)) {
+ const email = fullname.slice(groupNamePrefix.length);
+ const group = groups.find((g) => g.email === email);
+ return group?.title || email;
+ }
+ return undefined;
+ };
+
+ // Detect service account / workload identity typed in search
+ const specialAccountMatch = useMemo((): {
+ type: SpecialAccountType;
+ email: string;
+ fullname: string;
+ } | null => {
+ const trimmed = search.trim();
+ if (!trimmed) return null;
+ const type = detectSpecialAccount(trimmed);
+ if (!type) return null;
+ const email = extractSpecialEmail(trimmed);
+ if (!email) return null;
+ const prefix =
+ type === "serviceAccount" ? "serviceAccounts/" : "workloadIdentities/";
+ return { type, email, fullname: `${prefix}${email}` };
+ }, [search]);
+
+ // Allow selecting arbitrary user emails typed in the search box
+ // (for SaaS where admins grant access to emails before signup, or when
+ // the user can set IAM but cannot list users/groups)
+ const arbitraryEmailMatch = useMemo((): string | null => {
+ const trimmed = search.trim();
+ if (!trimmed || !isValidEmail(trimmed)) return null;
+ // Don't show if it's a service account or workload identity
+ if (specialAccountMatch) return null;
+ // Don't show if it already matches a fetched user
+ if (users.some((u) => u.email === trimmed)) return null;
+ return trimmed;
+ }, [search, specialAccountMatch, users]);
+
+ // Label for a selected binding chip — uses cache to survive search changes
+ const chipLabel = (binding: string): string => {
+ if (binding === ALL_USERS_USER_EMAIL) {
+ return t("settings.members.all-users");
+ }
+ const cached = labelCacheRef.current.get(binding);
+ if (cached) return cached;
+ const fullname = bindingToFullname(binding);
+ if (fullname.startsWith("serviceAccounts/"))
+ return fullname.slice("serviceAccounts/".length);
+ if (fullname.startsWith("workloadIdentities/"))
+ return fullname.slice("workloadIdentities/".length);
+ return resolveLabel(fullname) || binding;
+ };
+
+ return (
+ <div ref={containerRef} className="relative">
+ {/* Trigger */}
+ <div
+ className={cn(
+ "flex flex-wrap items-center gap-1 min-h-[2.25rem] w-full rounded-xs border border-control-border bg-transparent px-2 py-1 text-sm cursor-pointer",
+ disabled && "opacity-50 cursor-not-allowed",
+ open && "ring-2 ring-accent border-accent"
+ )}
+ onClick={() => {
+ if (!disabled) {
+ setOpen(!open);
+ requestAnimationFrame(() => inputRef.current?.focus());
+ }
+ }}
+ >
+ {value.map((binding) => (
+ <span
+ key={binding}
+ className="inline-flex items-center gap-x-1 rounded-xs bg-gray-100 px-1.5 py-0.5 text-xs"
+ >
+ {chipLabel(binding)}
+ {!disabled && (
+ <button
+ type="button"
+ className="hover:text-error"
+ onClick={(e) => {
+ e.stopPropagation();
+ remove(binding);
+ }}
+ >
+ <X className="h-3 w-3" />
+ </button>
+ )}
+ </span>
+ ))}
+ {!open && value.length === 0 && (
+ <span className="text-control-placeholder">
+ {t("settings.members.select-account", { count: 2 })}
+ </span>
+ )}
+ <ChevronDown className="ml-auto h-4 w-4 shrink-0 text-control-light" />
+ </div>
+
+ {/* Dropdown */}
+ {open && (
+ <div className="absolute z-50 mt-1 w-full bg-white border border-control-border rounded-sm shadow-lg max-h-72 overflow-auto flex flex-col">
+ {/* Search input */}
+ <div className="flex items-center gap-x-2 px-3 py-2 border-b sticky top-0 bg-white">
+ <Search className="h-4 w-4 text-control-light shrink-0" />
+ <input
+ ref={inputRef}
+ className="flex-1 outline-hidden text-sm bg-transparent"
+ value={search}
+ onChange={(e) => setSearch(e.target.value)}
+ placeholder={t("common.search-for-more")}
+ />
+ </div>
+
+ <div className="overflow-auto">
+ {/* allUsers option */}
+ {includeAllUsers && (
+ <div
+ className={cn(
+ "flex items-center gap-x-3 px-3 py-2 cursor-pointer hover:bg-gray-50",
+ selectedFullnames.has(ALL_USERS_USER_EMAIL) && "bg-accent/5"
+ )}
+ onClick={() => toggle(ALL_USERS_USER_EMAIL)}
+ >
+ <SelectionCheckbox
+ selected={selectedFullnames.has(ALL_USERS_USER_EMAIL)}
+ />
+ {/* Blue avatar circle */}
+ <div
+ className="h-7 w-7 rounded-full flex items-center justify-center text-white text-xs font-medium shrink-0"
+ style={{ backgroundColor: "#3B82F6" }}
+ >
+ <Users className="h-4 w-4" />
+ </div>
+ <span className="text-sm font-medium">
+ {t("settings.members.all-users")}
+ </span>
+ </div>
+ )}
+
+ {/* Users */}
+ {users.length > 0 && (
+ <div>
+ <div className="px-3 py-1.5 text-xs font-medium text-control-light uppercase tracking-wide bg-gray-50 border-b">
+ {t("common.users")}
+ </div>
+ {users.map((user) => {
+ const fullname = `users/${user.email}`;
+ const selected = selectedFullnames.has(fullname);
+ const isCurrentUser = user.email === currentUser?.email;
+ const displayName = user.title || user.email;
+ const color = getAvatarColor(displayName);
+ const initials = getInitials(displayName);
+ return (
+ <div
+ key={user.name}
+ className={cn(
+ "flex items-center gap-x-3 px-3 py-2 cursor-pointer hover:bg-gray-50",
+ selected && "bg-accent/5"
+ )}
+ onClick={() => toggle(fullname)}
+ >
+ <SelectionCheckbox selected={selected} />
+ {/* Avatar */}
+ <div
+ className="h-7 w-7 rounded-full flex items-center justify-center text-white text-xs font-medium shrink-0"
+ style={{ backgroundColor: color }}
+ >
+ {initials}
+ </div>
+ <div className="flex flex-col min-w-0">
+ <div className="flex items-center gap-x-1">
+ <span className="text-sm font-medium truncate">
+ {displayName}
+ </span>
+ {isCurrentUser && (
+ <span className="text-xs text-control-light bg-gray-100 rounded px-1">
+ {t("common.you")}
+ </span>
+ )}
+ </div>
+ {user.title && (
+ <span className="text-xs text-control-light truncate">
+ {user.email}
+ </span>
+ )}
+ </div>
+ </div>
+ );
+ })}
+ </div>
+ )}
+
+ {/* Groups */}
+ {groups.length > 0 && (
+ <div>
+ <div className="px-3 py-1.5 text-xs font-medium text-control-light uppercase tracking-wide bg-gray-50 border-b">
+ {t("common.groups")}
+ </div>
+ {groups.map((group) => {
+ const fullname = `${groupNamePrefix}${group.email}`;
+ const selected = selectedFullnames.has(fullname);
+ return (
+ <div
+ key={group.name}
+ className={cn(
+ "flex items-center gap-x-3 px-3 py-2 cursor-pointer hover:bg-gray-50",
+ selected && "bg-accent/5"
+ )}
+ onClick={() => toggle(fullname)}
+ >
+ <SelectionCheckbox selected={selected} />
+ <div className="h-7 w-7 rounded-full bg-gray-200 flex items-center justify-center shrink-0">
+ <Users className="h-4 w-4 text-control-light" />
+ </div>
+ <div className="flex flex-col min-w-0">
+ <div className="flex items-center gap-x-1.5">
+ <span className="text-sm font-medium truncate">
+ {group.title || group.email}
+ </span>
+ <span className="text-xs text-control-light">
+ ({group.members.length}{" "}
+ {t("common.members", {
+ count: group.members.length,
+ })}
+ )
+ </span>
+ </div>
+ <span className="text-xs text-control-light truncate">
+ {group.email}
+ </span>
+ </div>
+ </div>
+ );
+ })}
+ </div>
+ )}
+
+ {/* Service account / workload identity match */}
+ {specialAccountMatch && (
+ <SpecialAccountOption
+ match={specialAccountMatch}
+ selected={selectedFullnames.has(specialAccountMatch.fullname)}
+ onToggle={() => toggle(specialAccountMatch.fullname)}
+ />
+ )}
+
+ {/* Arbitrary email fallback */}
+ {arbitraryEmailMatch && (
+ <div
+ className={cn(
+ "flex items-center gap-x-3 px-3 py-2 cursor-pointer hover:bg-gray-50",
+ selectedFullnames.has(`users/${arbitraryEmailMatch}`) &&
+ "bg-accent/5"
+ )}
+ onClick={() => toggle(`users/${arbitraryEmailMatch}`)}
+ >
+ <SelectionCheckbox
+ selected={selectedFullnames.has(
+ `users/${arbitraryEmailMatch}`
+ )}
+ />
+ <div
+ className="h-7 w-7 rounded-full flex items-center justify-center text-white text-xs font-medium shrink-0"
+ style={{
+ backgroundColor: getAvatarColor(arbitraryEmailMatch),
+ }}
+ >
+ {getInitials(arbitraryEmailMatch.split("@")[0])}
+ </div>
+ <div className="flex flex-col min-w-0">
+ <span className="text-sm font-medium truncate">
+ {arbitraryEmailMatch}
+ </span>
+ </div>
+ </div>
+ )}
+
+ {/* Empty state */}
+ {!includeAllUsers &&
+ users.length === 0 &&
+ groups.length === 0 &&
+ !specialAccountMatch &&
+ !arbitraryEmailMatch && (
+ <div className="px-3 py-4 text-sm text-center text-control-light">
+ {t("common.no-data")}
+ </div>
+ )}
+ </div>
+ </div>
+ )}
+ </div>
+ );
+}
diff --git a/frontend/src/react/pages/settings/shared/RoleMultiSelect.tsx b/frontend/src/react/pages/settings/shared/RoleMultiSelect.tsx
new file mode 100644
index 0000000000..fea4513fd4
--- /dev/null
+++ b/frontend/src/react/pages/settings/shared/RoleMultiSelect.tsx
@@ -0,0 +1,208 @@
+import { Check, ChevronDown, X } from "lucide-react";
+import { useCallback, useMemo, useRef, useState } from "react";
+import { useTranslation } from "react-i18next";
+import { FeatureBadge } from "@/react/components/FeatureBadge";
+import { useClickOutside } from "@/react/hooks/useClickOutside";
+import { useVueState } from "@/react/hooks/useVueState";
+import { cn } from "@/react/lib/utils";
+import { useRoleStore, useSubscriptionV1Store } from "@/store";
+import {
+ PRESET_PROJECT_ROLES,
+ PRESET_ROLES,
+ PRESET_WORKSPACE_ROLES,
+} from "@/types/iam";
+import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";
+import { displayRoleDescription, displayRoleTitle } from "@/utils";
+
+export function RoleMultiSelect({
+ value,
+ onChange,
+ disabled,
+}: {
+ value: string[];
+ onChange: (roles: string[]) => void;
+ disabled?: boolean;
+}) {
+ const { t } = useTranslation();
+ const roleStore = useRoleStore();
+ const subscriptionStore = useSubscriptionV1Store();
+ const roleList = useVueState(() => [...roleStore.roleList]);
+ const hasCustomRoleFeature = useVueState(() =>
+ subscriptionStore.hasInstanceFeature(PlanFeature.FEATURE_CUSTOM_ROLES)
+ );
+ const [open, setOpen] = useState(false);
+ const [search, setSearch] = useState("");
+ const containerRef = useRef<HTMLDivElement>(null);
+ const inputRef = useRef<HTMLInputElement>(null);
+
+ const handleClickOutside = useCallback(() => {
+ setOpen(false);
+ setSearch("");
+ }, []);
+ useClickOutside(containerRef, open, handleClickOutside);
+
+ const groups = useMemo(() => {
+ const kw = search.toLowerCase();
+ const matchRole = (name: string) =>
+ !kw || displayRoleTitle(name).toLowerCase().includes(kw);
+
+ const workspace = PRESET_WORKSPACE_ROLES.filter(matchRole);
+ const project = PRESET_PROJECT_ROLES.filter(matchRole);
+ const custom = roleList
+ .filter((r) => !PRESET_ROLES.includes(r.name))
+ .map((r) => r.name)
+ .filter(matchRole);
+
+ const result: { label: string; roles: string[] }[] = [];
+ if (workspace.length > 0)
+ result.push({
+ label: t("role.workspace-roles.self"),
+ roles: workspace,
+ });
+ if (project.length > 0)
+ result.push({ label: t("role.project-roles.self"), roles: project });
+ if (custom.length > 0)
+ result.push({ label: t("role.custom-roles.self"), roles: custom });
+ return result;
+ }, [roleList, search, t]);
+
+ const isCustomRole = (name: string) => !PRESET_ROLES.includes(name);
+
+ const toggle = (roleName: string) => {
+ if (disabled) return;
+ // Block selecting custom roles without the plan feature
+ if (isCustomRole(roleName) && !hasCustomRoleFeature) return;
+ if (value.includes(roleName)) {
+ onChange(value.filter((r) => r !== roleName));
+ } else {
+ onChange([...value, roleName]);
+ }
+ };
+
+ const remove = (roleName: string) => {
+ if (disabled) return;
+ onChange(value.filter((r) => r !== roleName));
+ };
+
+ return (
+ <div ref={containerRef} className="relative">
+ {/* Trigger */}
+ <div
+ className={cn(
+ "flex flex-wrap items-center gap-1 min-h-[2.25rem] w-full rounded-xs border border-control-border bg-transparent px-2 py-1 text-sm cursor-pointer",
+ disabled && "opacity-50 cursor-not-allowed",
+ open && "ring-2 ring-accent border-accent"
+ )}
+ onClick={() => {
+ if (!disabled) {
+ setOpen(!open);
+ requestAnimationFrame(() => inputRef.current?.focus());
+ }
+ }}
+ >
+ {value.map((roleName) => (
+ <span
+ key={roleName}
+ className="inline-flex items-center gap-x-1 rounded-xs bg-gray-100 px-1.5 py-0.5 text-xs"
+ >
+ {displayRoleTitle(roleName)}
+ {!disabled && (
+ <button
+ type="button"
+ className="hover:text-error"
+ onClick={(e) => {
+ e.stopPropagation();
+ remove(roleName);
+ }}
+ >
+ <X className="h-3 w-3" />
+ </button>
+ )}
+ </span>
+ ))}
+ {open && (
+ <input
+ ref={inputRef}
+ className="flex-1 min-w-[4rem] outline-hidden text-sm bg-transparent"
+ value={search}
+ onChange={(e) => setSearch(e.target.value)}
+ placeholder={
+ value.length === 0
+ ? t("settings.members.select-role", { count: 2 })
+ : ""
+ }
+ />
+ )}
+ {!open && value.length === 0 && (
+ <span className="text-control-placeholder">
+ {t("settings.members.select-role", { count: 2 })}
+ </span>
+ )}
+ <ChevronDown className="ml-auto h-4 w-4 shrink-0 text-control-light" />
+ </div>
+
+ {/* Dropdown */}
+ {open && (
+ <div className="absolute z-50 mt-1 w-full bg-white border border-control-border rounded-sm shadow-lg max-h-60 overflow-auto">
+ {groups.length === 0 && (
+ <div className="px-3 py-2 text-sm text-control-light">
+ {t("common.no-data")}
+ </div>
+ )}
+ {groups.map((group) => (
+ <div key={group.label}>
+ <div className="px-3 py-1.5 text-xs font-medium text-control-light uppercase tracking-wide bg-gray-50">
+ {group.label}
+ </div>
+ {group.roles.map((roleName) => {
+ const selected = value.includes(roleName);
+ const isCustom = isCustomRole(roleName);
+ const blocked = isCustom && !hasCustomRoleFeature;
+ return (
+ <div
+ key={roleName}
+ className={cn(
+ "flex items-center gap-x-2 px-3 py-1.5 text-sm hover:bg-gray-50",
+ selected && "bg-accent/5",
+ blocked
+ ? "opacity-50 cursor-not-allowed"
+ : "cursor-pointer"
+ )}
+ onClick={() => toggle(roleName)}
+ >
+ <div
+ className={cn(
+ "h-4 w-4 rounded-xs border flex items-center justify-center shrink-0",
+ selected
+ ? "bg-accent border-accent text-white"
+ : "border-control-border"
+ )}
+ >
+ {selected && <Check className="h-3 w-3" />}
+ </div>
+ <div className="flex flex-col">
+ <div className="flex items-center gap-x-1">
+ <span>{displayRoleTitle(roleName)}</span>
+ {blocked && (
+ <FeatureBadge
+ feature={PlanFeature.FEATURE_CUSTOM_ROLES}
+ clickable={false}
+ />
+ )}
+ </div>
+ {displayRoleDescription(roleName) && (
+ <span className="text-xs text-control-light">
+ {displayRoleDescription(roleName)}
+ </span>
+ )}
+ </div>
+ </div>
+ );
+ })}
+ </div>
+ ))}
+ </div>
+ )}
+ </div>
+ );
+}
diff --git a/frontend/src/react/pages/settings/shared/UserAvatar.tsx b/frontend/src/react/pages/settings/shared/UserAvatar.tsx
new file mode 100644
index 0000000000..cb28f14ba5
--- /dev/null
+++ b/frontend/src/react/pages/settings/shared/UserAvatar.tsx
@@ -0,0 +1,50 @@
+import { cn } from "@/react/lib/utils";
+
+const AVATAR_COLORS = [
+ "#F59E0B",
+ "#10B981",
+ "#8B5CF6",
+ "#EC4899",
+ "#06B6D4",
+ "#EF4444",
+];
+
+export function getAvatarColor(name: string) {
+ let hash = 0;
+ for (let i = 0; i < name.length; i++)
+ hash = (hash * 31 + name.charCodeAt(i)) | 0;
+ return AVATAR_COLORS[Math.abs(hash) % AVATAR_COLORS.length];
+}
+
+export function getInitials(name: string) {
+ return name
+ .split(/\s+/)
+ .map((w) => w[0])
+ .join("")
+ .toUpperCase()
+ .slice(0, 2);
+}
+
+export function UserAvatar({
+ title,
+ size = "md",
+ className,
+}: {
+ title: string;
+ size?: "sm" | "md";
+ className?: string;
+}) {
+ const dim = size === "sm" ? "h-7 w-7 text-xs" : "h-9 w-9 text-sm";
+ return (
+ <div
+ className={cn(
+ "rounded-full flex items-center justify-center text-white font-medium shrink-0",
+ dim,
+ className
+ )}
+ style={{ backgroundColor: getAvatarColor(title) }}
+ >
+ {getInitials(title)}
+ </div>
+ );
+}
diff --git a/frontend/src/react/pages/settings/shared/usePagedData.tsx b/frontend/src/react/pages/settings/shared/usePagedData.tsx
new file mode 100644
index 0000000000..933aeb3b30
--- /dev/null
+++ b/frontend/src/react/pages/settings/shared/usePagedData.tsx
@@ -0,0 +1,205 @@
+import { useCallback, useEffect, useRef, useState } from "react";
+import { useTranslation } from "react-i18next";
+import { Button } from "@/react/components/ui/button";
+import {
+ getPageSizeOptions,
+ useSessionPageSize,
+} from "@/react/hooks/useSessionPageSize";
+
+// ============================================================
+// usePagedData hook
+// ============================================================
+
+export type PagedDataResult<T> = {
+ dataList: T[];
+ isLoading: boolean;
+ isFetchingMore: boolean;
+ hasMore: boolean;
+ loadMore: () => void;
+ refresh: () => void;
+ updateCache: (items: T[]) => void;
+ removeCache: (item: T) => void;
+ pageSize: number;
+ pageSizeOptions: number[];
+ onPageSizeChange: (size: number) => void;
+};
+
+export function usePagedData<T extends { name: string }>({
+ sessionKey,
+ fetchList,
+ enabled = true,
+}: {
+ sessionKey: string;
+ fetchList: (params: {
+ pageSize: number;
+ pageToken: string;
+ }) => Promise<{ list: T[]; nextPageToken?: string }>;
+ enabled?: boolean;
+}): PagedDataResult<T> {
+ const [pageSize, setPageSize] = useSessionPageSize(sessionKey);
+ const pageSizeOptions = getPageSizeOptions();
+
+ const [dataList, setDataList] = useState<T[]>([]);
+ const [isLoading, setIsLoading] = useState(true);
+ const [isFetchingMore, setIsFetchingMore] = useState(false);
+ const [hasFetched, setHasFetched] = useState(false);
+ const [hasMore, setHasMore] = useState(false);
+
+ const abortRef = useRef<AbortController | null>(null);
+ const fetchIdRef = useRef(0);
+ const nextPageTokenRef = useRef("");
+
+ const doFetch = useCallback(
+ async (isRefresh: boolean) => {
+ const currentFetchId = ++fetchIdRef.current;
+ abortRef.current?.abort();
+ const controller = new AbortController();
+ abortRef.current = controller;
+
+ if (isRefresh) {
+ setIsLoading(true);
+ } else {
+ setIsFetchingMore(true);
+ }
+
+ try {
+ const token = isRefresh ? "" : nextPageTokenRef.current;
+ const result = await fetchList({ pageSize, pageToken: token });
+ if (controller.signal.aborted || currentFetchId !== fetchIdRef.current)
+ return;
+ setDataList((prev) =>
+ isRefresh ? result.list : [...prev, ...result.list]
+ );
+ nextPageTokenRef.current = result.nextPageToken ?? "";
+ setHasMore(Boolean(result.nextPageToken));
+ } catch (e) {
+ if (e instanceof Error && e.name === "AbortError") return;
+ console.error(e);
+ } finally {
+ if (currentFetchId === fetchIdRef.current) {
+ setIsLoading(false);
+ setIsFetchingMore(false);
+ setHasFetched(true);
+ }
+ }
+ },
+ [fetchList, pageSize]
+ );
+
+ const loadMore = useCallback(() => {
+ if (hasMore && !isFetchingMore) {
+ doFetch(false);
+ }
+ }, [hasMore, isFetchingMore, doFetch]);
+
+ const refresh = useCallback(() => {
+ doFetch(true);
+ }, [doFetch]);
+
+ const updateCache = useCallback((items: T[]) => {
+ setDataList((prev) => {
+ const next = [...prev];
+ for (const item of items) {
+ const idx = next.findIndex((d) => d.name === item.name);
+ if (idx >= 0) {
+ next[idx] = item;
+ } else {
+ next.push(item);
+ }
+ }
+ return next;
+ });
+ }, []);
+
+ const removeCache = useCallback((item: T) => {
+ setDataList((prev) => prev.filter((d) => d.name !== item.name));
+ }, []);
+
+ // Fetch on mount and when fetchList/pageSize changes (handles search text reactivity)
+ const isFirstLoad = useRef(true);
+ useEffect(() => {
+ if (!enabled) return;
+ if (isFirstLoad.current) {
+ isFirstLoad.current = false;
+ doFetch(true);
+ return;
+ }
+ const timer = setTimeout(() => doFetch(true), 300);
+ return () => clearTimeout(timer);
+ }, [doFetch, enabled]);
+
+ useEffect(() => {
+ return () => {
+ abortRef.current?.abort();
+ };
+ }, []);
+
+ return {
+ dataList,
+ isLoading: enabled && (isLoading || !hasFetched),
+ isFetchingMore,
+ hasMore,
+ loadMore,
+ refresh,
+ updateCache,
+ removeCache,
+ pageSize,
+ pageSizeOptions,
+ onPageSizeChange: setPageSize,
+ };
+}
+
+// ============================================================
+// PagedTableFooter
+// ============================================================
+
+export function PagedTableFooter({
+ pageSize,
+ pageSizeOptions,
+ onPageSizeChange,
+ hasMore,
+ isFetchingMore,
+ onLoadMore,
+}: {
+ pageSize: number;
+ pageSizeOptions: number[];
+ onPageSizeChange: (size: number) => void;
+ hasMore: boolean;
+ isFetchingMore: boolean;
+ onLoadMore: () => void;
+}) {
+ const { t } = useTranslation();
+
+ return (
+ <div className="flex items-center justify-end gap-x-2">
+ <div className="flex items-center gap-x-2">
+ <span className="text-sm text-control-light">
+ {t("common.rows-per-page")}
+ </span>
+ <select
+ value={pageSize}
+ onChange={(e) => onPageSizeChange(Number(e.target.value))}
+ className="border border-control-border rounded-sm text-sm pl-2 pr-6 py-1 min-w-[5rem]"
+ >
+ {pageSizeOptions.map((opt) => (
+ <option key={opt} value={opt}>
+ {opt}
+ </option>
+ ))}
+ </select>
+ </div>
+ {hasMore && (
+ <Button
+ variant="ghost"
+ size="sm"
+ disabled={isFetchingMore}
+ onClick={onLoadMore}
+ >
+ <span className="text-sm text-control-light">
+ {isFetchingMore ? t("common.loading") : t("common.load-more")}
+ </span>
+ </Button>
+ )}
+ </div>
+ );
+}
diff --git a/frontend/src/router/dashboard/workspace.ts b/frontend/src/router/dashboard/workspace.ts
index 00d7ac9159..b070fd2295 100644
--- a/frontend/src/router/dashboard/workspace.ts
+++ b/frontend/src/router/dashboard/workspace.ts
@@ -13,6 +13,7 @@ import {
WORKSPACE_ROUTE_CUSTOM_APPROVAL,
WORKSPACE_ROUTE_DATA_CLASSIFICATION,
WORKSPACE_ROUTE_GLOBAL_MASKING,
+ WORKSPACE_ROUTE_GROUPS,
WORKSPACE_ROUTE_IDENTITY_PROVIDER_DETAIL,
WORKSPACE_ROUTE_IDENTITY_PROVIDERS,
WORKSPACE_ROUTE_IM,
@@ -311,7 +312,8 @@ const workspaceRoutes: RouteRecordRaw[] = [
path: "users",
name: WORKSPACE_ROUTE_USERS,
meta: {
- title: () => t("settings.sidebar.users-and-groups"),
+ title: () => t("common.users"),
+ requiredPermissionList: () => ["bb.users.list"],
},
component: () => import("@/react/ReactPageMount.vue"),
props: () => ({ page: "UsersPage" }),
@@ -323,9 +325,8 @@ const workspaceRoutes: RouteRecordRaw[] = [
title: () => t("settings.members.service-accounts"),
requiredPermissionList: () => ["bb.serviceAccounts.list"],
},
- component: () =>
- import("@/components/User/Settings/ServiceAccountPanel.vue"),
- props: true,
+ component: () => import("@/react/ReactPageMount.vue"),
+ props: () => ({ page: "ServiceAccountsPage" }),
},
{
path: "workload-identities",
@@ -334,23 +335,28 @@ const workspaceRoutes: RouteRecordRaw[] = [
title: () => t("settings.members.workload-identities"),
requiredPermissionList: () => ["bb.workloadIdentities.list"],
},
- component: () =>
- import("@/components/User/Settings/WorkloadIdentityPanel.vue"),
- props: true,
+ component: () => import("@/react/ReactPageMount.vue"),
+ props: () => ({ page: "WorkloadIdentitiesPage" }),
},
{
path: "members",
name: WORKSPACE_ROUTE_MEMBERS,
meta: {
title: () => t("settings.sidebar.members"),
- requiredPermissionList: () => [
- "bb.workspaces.getIamPolicy",
- "bb.users.list",
- "bb.groups.list",
- ],
+ requiredPermissionList: () => ["bb.workspaces.getIamPolicy"],
},
- component: () => import("@/views/SettingWorkspaceMembers.vue"),
- props: true,
+ component: () => import("@/react/ReactPageMount.vue"),
+ props: () => ({ page: "MembersPage" }),
+ },
+ {
+ path: "groups",
+ name: WORKSPACE_ROUTE_GROUPS,
+ meta: {
+ title: () => t("settings.members.groups.self"),
+ requiredPermissionList: () => ["bb.groups.list"],
+ },
+ component: () => import("@/react/ReactPageMount.vue"),
+ props: () => ({ page: "GroupsPage" }),
},
{
path: "roles",
diff --git a/frontend/src/router/dashboard/workspaceRoutes.ts b/frontend/src/router/dashboard/workspaceRoutes.ts
index 3f4319fd49..cb20f15953 100644
--- a/frontend/src/router/dashboard/workspaceRoutes.ts
+++ b/frontend/src/router/dashboard/workspaceRoutes.ts
@@ -25,6 +25,7 @@ export const WORKSPACE_ROUTE_SERVICE_ACCOUNTS = "workspace.service-accounts";
export const WORKSPACE_ROUTE_WORKLOAD_IDENTITIES =
"workspace.workload-identities";
export const WORKSPACE_ROUTE_MEMBERS = "workspace.members";
+export const WORKSPACE_ROUTE_GROUPS = "workspace.groups";
export const WORKSPACE_ROUTE_ROLES = "workspace.roles";
export const WORKSPACE_ROUTE_IDENTITY_PROVIDERS =
diff --git a/frontend/src/utils/useDashboardSidebar.ts b/frontend/src/utils/useDashboardSidebar.ts
index caacc960e7..de6cbeaecf 100644
--- a/frontend/src/utils/useDashboardSidebar.ts
+++ b/frontend/src/utils/useDashboardSidebar.ts
@@ -23,6 +23,7 @@ import {
WORKSPACE_ROUTE_CUSTOM_APPROVAL,
WORKSPACE_ROUTE_DATA_CLASSIFICATION,
WORKSPACE_ROUTE_GLOBAL_MASKING,
+ WORKSPACE_ROUTE_GROUPS,
WORKSPACE_ROUTE_IDENTITY_PROVIDERS,
WORKSPACE_ROUTE_IM,
WORKSPACE_ROUTE_LANDING,
@@ -126,11 +127,10 @@ export const useDashboardSidebar = () => {
type: "div",
children: [
{
- title: actuatorStore.isSaaSMode
- ? t("settings.sidebar.members-and-groups")
- : t("settings.sidebar.users-and-groups"),
+ title: t("common.users"),
name: WORKSPACE_ROUTE_USERS,
type: "route",
+ hide: actuatorStore.isSaaSMode,
},
{
title: t("settings.members.service-accounts"),
@@ -148,7 +148,11 @@ export const useDashboardSidebar = () => {
title: t("settings.sidebar.members"),
name: WORKSPACE_ROUTE_MEMBERS,
type: "route",
- hide: actuatorStore.isSaaSMode,
+ },
+ {
+ title: t("settings.members.groups.self"),
+ name: WORKSPACE_ROUTE_GROUPS,
+ type: "route",
},
{
title: t("settings.sidebar.custom-roles"),
diff --git a/frontend/src/views/SettingWorkspaceMembers.vue b/frontend/src/views/SettingWorkspaceMembers.vue
deleted file mode 100644
index 9f7255e93c..0000000000
--- a/frontend/src/views/SettingWorkspaceMembers.vue
+++ /dev/null
@@ -1,11 +0,0 @@
-<template>
- <div class="px-4 pt-2 pb-4 w-full">
- <WorkspaceMembers
- :tab-type="'line'"
- />
- </div>
-</template>
-
-<script setup lang="ts">
-import WorkspaceMembers from "@/components/Member/Views/WorkspaceMembers.vue";
-</script>