Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
feat: UX changes for SaaS (#19713)
ecmadao9fab6198a71a
diff --git a/frontend/src/AuthContext.vue b/frontend/src/AuthContext.vueindex b1e0b93eb6..c8aec3fc77 100644--- a/frontend/src/AuthContext.vue+++ b/frontend/src/AuthContext.vue@@ -25,6 +25,7 @@ import {useCurrentUserV1,useGroupStore,useRoleStore,+ useSubscriptionV1Store,useWorkspaceV1Store,} from "./store";import { isDev } from "./utils";@@ -39,6 +40,8 @@ const currentUser = useCurrentUserV1();const workspaceStore = useWorkspaceV1Store();const roleStore = useRoleStore();const groupStore = useGroupStore();+const subscriptionStore = useSubscriptionV1Store();+const ready = ref(false);const authCheckIntervalId = ref<NodeJS.Timeout>();@@ -109,7 +112,9 @@ watch(ready.value = false;try {await Promise.all([+ subscriptionStore.fetchSubscription(),workspaceStore.fetchIamPolicy(),+ workspaceStore.fetchWorkspaceList(),roleStore.fetchRoleList(),// we only care about the groups for the current user.groupStore.batchGetOrFetchGroups(currentUser.value.groups),diff --git a/frontend/src/components/GeneralSetting/AIAugmentationSetting.vue b/frontend/src/components/GeneralSetting/AIAugmentationSetting.vueindex 0173244cc0..f20f5676ab 100644--- a/frontend/src/components/GeneralSetting/AIAugmentationSetting.vue+++ b/frontend/src/components/GeneralSetting/AIAugmentationSetting.vue@@ -11,15 +11,7 @@<ComponentPermissionGuard:permissions="['bb.settings.get']">- <div v-if="actuatorStore.isSaaSMode">- <BBAttention- :type="'info'"- :description="- t('settings.general.workspace.ai-assistant.enabled-in-saas')- "- />- </div>- <div v-else class="mt-4 lg:mt-0 flex flex-col gap-y-4">+ <div class="mt-4 lg:mt-0 flex flex-col gap-y-4"><div><div class="flex items-center gap-x-2"><PermissionGuardWrapper@@ -182,12 +174,12 @@ import { NCollapseTransition, NSelect } from "naive-ui";import scrollIntoView from "scroll-into-view-if-needed";import { computed, onMounted, reactive, ref, watchEffect } from "vue";import { useI18n } from "vue-i18n";-import { BBAttention, BBTextField } from "@/bbkit";+import { BBTextField } from "@/bbkit";import LearnMoreLink from "@/components/LearnMoreLink.vue";import ComponentPermissionGuard from "@/components/Permission/ComponentPermissionGuard.vue";import PermissionGuardWrapper from "@/components/Permission/PermissionGuardWrapper.vue";import { Switch } from "@/components/v2";-import { useActuatorV1Store, useSettingV1Store } from "@/store/modules";+import { useSettingV1Store } from "@/store/modules";import {AISetting_Provider,AISettingSchema,@@ -208,7 +200,6 @@ const props = defineProps<{}>();const settingV1Store = useSettingV1Store();-const actuatorStore = useActuatorV1Store();const containerRef = ref<HTMLDivElement>();const { t } = useI18n();diff --git a/frontend/src/components/GeneralSetting/AuditLogStdoutSetting.vue b/frontend/src/components/GeneralSetting/AuditLogStdoutSetting.vueindex c354dd63b7..6167f19ef4 100644--- a/frontend/src/components/GeneralSetting/AuditLogStdoutSetting.vue+++ b/frontend/src/components/GeneralSetting/AuditLogStdoutSetting.vue@@ -16,7 +16,7 @@:text="true":disabled="!allowEdit || !hasAuditLogFeature"/>- <div class="flex items-center gap-x-2 text-sm">+ <div class="flex items-center gap-x-2 font-medium">{{ $t("settings.general.workspace.audit-log-stdout.enable") }}<FeatureBadge :feature="PlanFeature.FEATURE_AUDIT_LOG" /></div>@@ -32,7 +32,7 @@:text="true":disabled="!allowEdit"/>- <span class="text-sm">+ <span class="font-medium">{{ $t("settings.general.workspace.enable-debug.enable") }}</span></div>diff --git a/frontend/src/components/GeneralSetting/BrandingSetting.vue b/frontend/src/components/GeneralSetting/BrandingSetting.vueindex c46b4e0959..39fcd28293 100644--- a/frontend/src/components/GeneralSetting/BrandingSetting.vue+++ b/frontend/src/components/GeneralSetting/BrandingSetting.vue@@ -5,60 +5,79 @@<h1 class="text-2xl font-bold">{{ title }}</h1>- <FeatureBadge :feature="PlanFeature.FEATURE_CUSTOM_LOGO" /></div></div>- <div class="flex-1 lg:px-4">- <div class="mb-4 mt-4 lg:mt-0">- <span class="font-medium">- {{ $t("settings.general.workspace.logo") }}- </span>- <p class="mb-3 text-sm text-gray-400">- {{ $t("settings.general.workspace.logo-aspect") }}- </p>- <PermissionGuardWrapper- v-slot="slotProps"- :permissions="[- 'bb.settings.setWorkspaceProfile'- ]"- >- <div- class="flex justify-center border-2 border-gray-300 border-dashed rounded-md relative h-48"- >- <div- class="w-full bg-no-repeat bg-contain bg-center rounded-md pointer-events-none m-4"- :style="`background-image: url(${state.logoUrl});`"- ></div>- <SingleFileSelector- class="flex flex-col gap-y-1 text-center justify-center items-center absolute top-0 bottom-0 left-0 right-0"- :class="[state.logoUrl ? 'opacity-0 hover:opacity-90' : '']"- :max-file-size-in-mi-b="maxFileSizeInMiB"- :support-file-extensions="supportImageExtensions"- :disabled="slotProps.disabled || !hasBrandingFeature"- :show-no-data-placeholder="!state.logoUrl"- @on-select="onLogoSelect"- />- </div>- </PermissionGuardWrapper>+ <div class="flex-1 mt-4 lg:px-4 lg:mt-0 flex flex-col gap-y-6">+ <div>+ <label class="font-medium">{{ $t("settings.general.workspace.id") }}</label>+ <NInput :value="workspaceID" disabled class="mt-1" /></div>- <div class="flex justify-end gap-x-3">+ <div>+ <label class="font-medium">{{ $t("settings.general.workspace.title") }}</label><PermissionGuardWrapper- v-if="!!state.logoUrl"v-slot="slotProps"- :permissions="[- 'bb.settings.setWorkspaceProfile'- ]"+ :permissions="['bb.workspaces.update']">- <NButton- secondary+ <NInput+ v-model:value="state.workspaceTitle"+ class="mt-1":disabled="slotProps.disabled"- type="error"- @click="() => (state.logoUrl = '')"- >- {{ $t("common.delete") }}- </NButton>+ /></PermissionGuardWrapper></div>++ <div>+ <div class="mb-4 mt-4 lg:mt-0">+ <div class="flex items-center gap-x-2 font-medium">+ {{ $t("settings.general.workspace.logo") }}+ <FeatureBadge :feature="PlanFeature.FEATURE_CUSTOM_LOGO" />+ </div>+ <p class="mb-3 text-sm text-gray-400">+ {{ $t("settings.general.workspace.logo-aspect") }}+ </p>+ <PermissionGuardWrapper+ v-slot="slotProps"+ :permissions="[+ 'bb.settings.setWorkspaceProfile'+ ]"+ >+ <div+ class="flex justify-center border-2 border-gray-300 border-dashed rounded-md relative h-48"+ >+ <div+ class="w-full bg-no-repeat bg-contain bg-center rounded-md pointer-events-none m-4"+ :style="`background-image: url(${state.logoUrl});`"+ ></div>+ <SingleFileSelector+ class="flex flex-col gap-y-1 text-center justify-center items-center absolute top-0 bottom-0 left-0 right-0"+ :class="[state.logoUrl ? 'opacity-0 hover:opacity-90' : '']"+ :max-file-size-in-mi-b="maxFileSizeInMiB"+ :support-file-extensions="supportImageExtensions"+ :disabled="slotProps.disabled || !hasBrandingFeature"+ :show-no-data-placeholder="!state.logoUrl"+ @on-select="onLogoSelect"+ />+ </div>+ </PermissionGuardWrapper>+ </div>+ <div v-if="!!state.logoUrl" class="flex justify-end gap-x-3">+ <PermissionGuardWrapper+ v-slot="slotProps"+ :permissions="[+ 'bb.settings.setWorkspaceProfile'+ ]"+ >+ <NButton+ secondary+ :disabled="slotProps.disabled"+ type="error"+ @click="() => (state.logoUrl = '')"+ >+ {{ $t("common.delete") }}+ </NButton>+ </PermissionGuardWrapper>+ </div>+ </div></div></div>@@ -72,19 +91,28 @@<script lang="ts" setup>import { create } from "@bufbuild/protobuf";import { FieldMaskSchema } from "@bufbuild/protobuf/wkt";-import { NButton } from "naive-ui";+import { NButton, NInput } from "naive-ui";import { computed, reactive } from "vue";import PermissionGuardWrapper from "@/components/Permission/PermissionGuardWrapper.vue";-import { featureToRef } from "@/store";-import { useActuatorV1Store } from "@/store/modules/v1/actuator";-import { useSettingV1Store } from "@/store/modules/v1/setting";+import { workspaceServiceClientConnect } from "@/connect";+import {+ featureToRef,+ useActuatorV1Store,+ useSettingV1Store,+ useWorkspaceV1Store,+} from "@/store";import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";+import {+ UpdateWorkspaceRequestSchema,+ WorkspaceSchema,+} from "@/types/proto-es/v1/workspace_service_pb";import { FeatureBadge, FeatureModal } from "../FeatureGuard";import SingleFileSelector from "../SingleFileSelector.vue";interface LocalState {logoUrl?: string;loading: boolean;+ workspaceTitle: string;showFeatureModal: boolean;}@@ -105,15 +133,30 @@ const convertFileToBase64 = (file: File) =>});const settingV1Store = useSettingV1Store();+const workspaceStore = useWorkspaceV1Store();+const actuatorV1Store = useActuatorV1Store();++const initialTitle = computed(() => {+ return workspaceStore.currentWorkspace?.title ?? "";+});const state = reactive<LocalState>({logoUrl: settingV1Store.workspaceProfile.brandingLogo,+ workspaceTitle: initialTitle.value,loading: false,showFeatureModal: false,});+const workspaceID = computed(() => {+ const name = workspaceStore.currentWorkspace?.name ?? "";+ return name.replace(/^workspaces\//, "");+});+const allowSave = computed((): boolean => {- return state.logoUrl !== settingV1Store.workspaceProfile.brandingLogo;+ return (+ state.workspaceTitle !== initialTitle.value ||+ state.logoUrl !== settingV1Store.workspaceProfile.brandingLogo+ );});const hasBrandingFeature = featureToRef(PlanFeature.FEATURE_CUSTOM_LOGO);@@ -124,15 +167,36 @@ const doUpdate = async (content: string) => {}state.loading = true;try {- await settingV1Store.updateWorkspaceProfile({- payload: {- brandingLogo: content,- },- updateMask: create(FieldMaskSchema, {- paths: ["value.workspace_profile.branding_logo"],- }),- });- useActuatorV1Store().setLogo(content);+ if (+ state.workspaceTitle !== initialTitle.value &&+ state.workspaceTitle.trim() !== ""+ ) {+ const name = workspaceStore.currentWorkspace?.name ?? "";+ await workspaceServiceClientConnect.updateWorkspace(+ create(UpdateWorkspaceRequestSchema, {+ workspace: create(WorkspaceSchema, {+ name,+ title: state.workspaceTitle,+ }),+ updateMask: create(FieldMaskSchema, {+ paths: ["title"],+ }),+ })+ );+ await workspaceStore.fetchWorkspaceList();+ }++ if (state.logoUrl !== settingV1Store.workspaceProfile.brandingLogo) {+ await settingV1Store.updateWorkspaceProfile({+ payload: {+ brandingLogo: content,+ },+ updateMask: create(FieldMaskSchema, {+ paths: ["value.workspace_profile.branding_logo"],+ }),+ });+ actuatorV1Store.setLogo(content);+ }} finally {state.loading = false;}@@ -151,6 +215,9 @@ defineExpose({title: props.title,isDirty: allowSave,update: uploadLogo,- revert: () => (state.logoUrl = settingV1Store.workspaceProfile.brandingLogo),+ revert: () => {+ state.logoUrl = settingV1Store.workspaceProfile.brandingLogo;+ state.workspaceTitle = initialTitle.value;+ },});</script>diff --git a/frontend/src/components/GeneralSetting/GeneralSetting.vue b/frontend/src/components/GeneralSetting/GeneralSetting.vueindex 676456dfb5..0ff6cb045a 100644--- a/frontend/src/components/GeneralSetting/GeneralSetting.vue+++ b/frontend/src/components/GeneralSetting/GeneralSetting.vue@@ -24,34 +24,25 @@url="https://docs.bytebase.com/get-started/self-host/external-url?source=console"/></div>- <div v-if="externalUrlFromFlag && !isSaaSMode" class="mb-2 text-sm text-accent">- {{ $t("settings.general.workspace.external-url.managed-by-flag") }}- </div>+ <BBAttention+ v-if="externalUrlFromFlag"+ :type="'info'"+ class="mb-3"+ :description="+ $t('settings.general.workspace.external-url.cannot-edit-flag')+ "+ /><PermissionGuardWrapperv-slot="slotProps":permissions="['bb.settings.setWorkspaceProfile']">- <NTooltip- placement="top-start"- :disabled="slotProps.disabled || !externalUrlFromFlag"- >- <template #trigger>- <NInput- v-model:value="state.externalUrl"- class="mb-4 w-full"- :disabled="slotProps.disabled || isSaaSMode || externalUrlFromFlag"- />- </template>- <span class="text-sm text-gray-400 -translate-y-2">- {{- externalUrlFromFlag- ? $t("settings.general.workspace.external-url.cannot-edit-flag")- : ''- }}- </span>- </NTooltip>+ <NInput+ v-model:value="state.externalUrl"+ class="mb-4 w-full"+ :disabled="slotProps.disabled || isSaaSMode || externalUrlFromFlag"+ /></PermissionGuardWrapper></div></div>@@ -88,10 +79,10 @@import { create } from "@bufbuild/protobuf";import { FieldMaskSchema } from "@bufbuild/protobuf/wkt";import { isEqual } from "lodash-es";-import { NButton, NInput, NTooltip } from "naive-ui";+import { NButton, NInput } from "naive-ui";import { storeToRefs } from "pinia";import { computed, reactive, ref } from "vue";-import { BBModal } from "@/bbkit";+import { BBAttention, BBModal } from "@/bbkit";import LearnMoreLink from "@/components/LearnMoreLink.vue";import PermissionGuardWrapper from "@/components/Permission/PermissionGuardWrapper.vue";import { router } from "@/router";@@ -105,10 +96,18 @@ interface LocalState {externalUrl: string;}+const props = defineProps<{+ title: string;+}>();++const settingV1Store = useSettingV1Store();+const actuatorV1Store = useActuatorV1Store();+const { isSaaSMode } = storeToRefs(actuatorV1Store);+const getInitialState = (): LocalState => {const defaultState: LocalState = {databaseChangeMode: DatabaseChangeMode.PIPELINE,- externalUrl: settingV1Store.workspaceProfile.externalUrl,+ externalUrl: actuatorV1Store.serverInfo?.externalUrl ?? "",};if ([DatabaseChangeMode.PIPELINE, DatabaseChangeMode.EDITOR].includes(@@ -121,14 +120,6 @@ const getInitialState = (): LocalState => {return defaultState;};-const props = defineProps<{- title: string;-}>();--const settingV1Store = useSettingV1Store();-const actuatorV1Store = useActuatorV1Store();-const { isSaaSMode } = storeToRefs(actuatorV1Store);-const state = reactive<LocalState>(getInitialState());const showModal = ref(false);diff --git a/frontend/src/components/GeneralSetting/ProductImprovementSetting.vue b/frontend/src/components/GeneralSetting/ProductImprovementSetting.vueindex 20e4981f4b..9c761184c1 100644--- a/frontend/src/components/GeneralSetting/ProductImprovementSetting.vue+++ b/frontend/src/components/GeneralSetting/ProductImprovementSetting.vue@@ -12,7 +12,7 @@:text="true":disabled="!allowEdit"/>- <span class="text-sm">+ <span class="font-medium">{{ $t("settings.general.workspace.product-improvement.participate") }}</span></div>diff --git a/frontend/src/components/GeneralSetting/TokenDurationSetting.vue b/frontend/src/components/GeneralSetting/TokenDurationSetting.vueindex 2fe6695124..6d028a8fe6 100644--- a/frontend/src/components/GeneralSetting/TokenDurationSetting.vue+++ b/frontend/src/components/GeneralSetting/TokenDurationSetting.vue@@ -156,8 +156,8 @@ interface LocalState {const getInitialState = (): LocalState => {const defaultState: LocalState = {- accessTokenDuration: defaultAccessTokenDurationInHours * 60,- accessTokenTimeFormat: "MINUTES",+ accessTokenDuration: defaultAccessTokenDurationInHours,+ accessTokenTimeFormat: "HOURS",refreshTokenDuration: defaultRefreshTokenDurationInHours / 24,refreshTokenTimeFormat: "DAYS",inactiveTimeout: -1,diff --git a/frontend/src/components/IdentityProvider/IdentityProviderCreateWizard.vue b/frontend/src/components/IdentityProvider/IdentityProviderCreateWizard.vueindex 2f3a3ef7e2..1c1093cc72 100644--- a/frontend/src/components/IdentityProvider/IdentityProviderCreateWizard.vue+++ b/frontend/src/components/IdentityProvider/IdentityProviderCreateWizard.vue@@ -413,6 +413,7 @@<script setup lang="ts">import { create as createProto } from "@bufbuild/protobuf";+import { Code, ConnectError } from "@connectrpc/connect";import { head } from "lodash-es";import {ArrowRightIcon,@@ -925,12 +926,16 @@ const handleCreate = async () => {emit("created", createdProvider);} catch (error) {- console.error("Failed to create identity provider:", error);- pushNotification({- module: "bytebase",- style: "CRITICAL",- title: t("identity-provider.identity-provider-create-failed"),- });+ if (error instanceof ConnectError && error.code === Code.AlreadyExists) {+ resourceIdField.value?.addValidationError(error.message);+ } else {+ console.error("Failed to create identity provider:", error);+ pushNotification({+ module: "bytebase",+ style: "CRITICAL",+ title: t("identity-provider.identity-provider-create-failed"),+ });+ }} finally {isCreating.value = false;}diff --git a/frontend/src/components/Instance/InstanceSyncButton.vue b/frontend/src/components/Instance/InstanceSyncButton.vueindex b078e5b0d9..7dcf89cfb0 100644--- a/frontend/src/components/Instance/InstanceSyncButton.vue+++ b/frontend/src/components/Instance/InstanceSyncButton.vue@@ -1,5 +1,6 @@<template>- <NDropdown+ <div>+ <NDropdown:trigger="'click'":options="syncInstnceOptions":render-label="renderDropdownLabel"@@ -29,7 +30,8 @@</template></NButton></PermissionGuardWrapper>- </NDropdown>+ </NDropdown>+ </div></template><script lang="tsx" setup>diff --git a/frontend/src/components/Member/EditMemberRoleDrawer.vue b/frontend/src/components/Member/EditMemberRoleDrawer.vueindex 93f8bde12e..e3aff61451 100644--- a/frontend/src/components/Member/EditMemberRoleDrawer.vue+++ b/frontend/src/components/Member/EditMemberRoleDrawer.vue@@ -14,6 +14,7 @@: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">diff --git a/frontend/src/components/Member/MembersBindingSelect.vue b/frontend/src/components/Member/MembersBindingSelect.vueindex 2ce8004b3b..2d1bbbfd8d 100644--- a/frontend/src/components/Member/MembersBindingSelect.vue+++ b/frontend/src/components/Member/MembersBindingSelect.vue@@ -34,6 +34,7 @@:include-all-users="includeAllUsers":include-service-account="includeServiceAccount":include-workload-identity="includeWorkloadIdentity"+ :allow-arbitrary-email="allowArbitraryEmail"@update:value="onMemberListUpdate($event as string[])"/></div>@@ -64,25 +65,21 @@ import {} from "@/types";import { convertMemberToFullname } from "@/utils";-const props = withDefaults(- defineProps<{- // member binding list, could be- // - user:{email}- // - group:{email}- // - serviceAccount:{email}- // - workloadIdentity:{email}- value: string[];- required: boolean;- projectName?: string;- disabled?: boolean;- includeAllUsers: boolean;- includeServiceAccount: boolean;- includeWorkloadIdentity: boolean;- }>(),- {- projectName: undefined,- }-);+const props = defineProps<{+ // member binding list, could be+ // - user:{email}+ // - group:{email}+ // - serviceAccount:{email}+ // - workloadIdentity:{email}+ value: string[];+ required: boolean;+ projectName?: string;+ disabled?: boolean;+ includeAllUsers: boolean;+ includeServiceAccount: boolean;+ includeWorkloadIdentity: boolean;+ allowArbitraryEmail?: boolean;+}>();const emit = defineEmits<{(event: "update:value", memberList: string[]): void;diff --git a/frontend/src/components/Member/Views/WorkspaceMembers.vue b/frontend/src/components/Member/Views/WorkspaceMembers.vuenew file mode 100644index 0000000000..eab0fcba36--- /dev/null+++ b/frontend/src/components/Member/Views/WorkspaceMembers.vue@@ -0,0 +1,210 @@+<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/Project/ProjectCreatePanel.vue b/frontend/src/components/Project/ProjectCreatePanel.vueindex 9a3967095b..60b93bf0ef 100644--- a/frontend/src/components/Project/ProjectCreatePanel.vue+++ b/frontend/src/components/Project/ProjectCreatePanel.vue@@ -64,6 +64,7 @@</template><script lang="ts" setup>+import { Code, ConnectError } from "@connectrpc/connect";import { isEmpty } from "lodash-es";import { NButton } from "naive-ui";import { computed, reactive, ref } from "vue";@@ -151,6 +152,12 @@ const create = async () => {name: createdProject.title,}),});+ } catch (error) {+ if (error instanceof ConnectError && error.code === Code.AlreadyExists) {+ resourceIdField.value?.addValidationError(error.message);+ } else {+ throw error;+ }} finally {state.isCreating = false;}diff --git a/frontend/src/components/Role/Setting/components/RolePanel.vue b/frontend/src/components/Role/Setting/components/RolePanel.vueindex 206ac5f5c8..cd56a048dc 100644--- a/frontend/src/components/Role/Setting/components/RolePanel.vue+++ b/frontend/src/components/Role/Setting/components/RolePanel.vue@@ -138,6 +138,7 @@<script setup lang="ts">import { create } from "@bufbuild/protobuf";+import { Code, ConnectError } from "@connectrpc/connect";import { cloneDeep, uniq } from "lodash-es";import { PlusIcon } from "lucide-vue-next";import { NButton, NInput, NTransfer } from "naive-ui";@@ -254,6 +255,12 @@ const handleSave = async () => {title: props.mode === "ADD" ? t("common.added") : t("common.updated"),});emit("close");+ } catch (error) {+ if (error instanceof ConnectError && error.code === Code.AlreadyExists) {+ resourceIdField.value?.addValidationError(error.message);+ } else {+ throw error;+ }} finally {state.loading = false;}diff --git a/frontend/src/components/SQLReview/SQLReviewCreation.vue b/frontend/src/components/SQLReview/SQLReviewCreation.vueindex 8dba297af2..acf5c93450 100644--- a/frontend/src/components/SQLReview/SQLReviewCreation.vue+++ b/frontend/src/components/SQLReview/SQLReviewCreation.vue@@ -42,6 +42,7 @@</template><script lang="ts" setup>+import { Code, ConnectError } from "@connectrpc/connect";import { isEqual } from "lodash-es";import { useDialog } from "naive-ui";import { computed, reactive } from "vue";@@ -239,14 +240,22 @@ const tryFinishSetup = async () => {: t("sql-review.policy-created"),});onCancel(policy);- } catch {- pushNotification({- module: "bytebase",- style: "CRITICAL",- title: isUpdate.value- ? t("sql-review.policy-update-failed")- : t("sql-review.policy-create-failed"),- });+ } catch (error) {+ if (error instanceof ConnectError && error.code === Code.AlreadyExists) {+ pushNotification({+ module: "bytebase",+ style: "CRITICAL",+ title: error.message,+ });+ } else {+ pushNotification({+ module: "bytebase",+ style: "CRITICAL",+ title: isUpdate.value+ ? t("sql-review.policy-update-failed")+ : t("sql-review.policy-create-failed"),+ });+ }}};diff --git a/frontend/src/components/User/Settings/CreateGroupDrawer.vue b/frontend/src/components/User/Settings/CreateGroupDrawer.vueindex 578f90c779..4574250353 100644--- a/frontend/src/components/User/Settings/CreateGroupDrawer.vue+++ b/frontend/src/components/User/Settings/CreateGroupDrawer.vue@@ -62,7 +62,7 @@:multiple="false":size="'medium'":disabled="!allowEdit"- :filter="(user) => userFilter(user, member.member)"+ :allow-arbitrary-email="actuatorStore.isSaaSMode"@update:value="($event) => updateMemberEmail(i, $event as (string | undefined))"/><GroupMemberRoleSelect@@ -150,7 +150,12 @@ import { useI18n } from "vue-i18n";import EmailInput from "@/components/EmailInput.vue";import RequiredStar from "@/components/RequiredStar.vue";import { Drawer, DrawerContent, UserSelect } from "@/components/v2";-import { pushNotification, useCurrentUserV1, useGroupStore } from "@/store";+import {+ pushNotification,+ useActuatorV1Store,+ useCurrentUserV1,+ useGroupStore,+} from "@/store";import { extractUserEmail, groupNamePrefix } from "@/store/modules/v1/common";import type { Group, GroupMember } from "@/types/proto-es/v1/group_service_pb";import {@@ -158,7 +163,6 @@ import {GroupMemberSchema,GroupSchema,} from "@/types/proto-es/v1/group_service_pb";-import { type User } from "@/types/proto-es/v1/user_service_pb";import { hasWorkspacePermissionV2, isValidEmail } from "@/utils";import RemoveGroupButton from "./RemoveGroupButton.vue";import GroupMemberRoleSelect from "./UserDataTableByGroup/cells/GroupMemberRoleSelect.vue";@@ -186,6 +190,7 @@ const emit = defineEmits<{const { t } = useI18n();const groupStore = useGroupStore();const currentUserV1 = useCurrentUserV1();+const actuatorStore = useActuatorV1Store();const state = reactive<LocalState>({isRequesting: false,@@ -204,13 +209,6 @@ const state = reactive<LocalState>({},});-const userFilter = (user: User, member: string) => {- if (extractUserEmail(member) === user.email) {- return true;- }- return !state.group.members.find((member) => member.member === user.name);-};-const isCreating = computed(() => !props.group);const isGroupOwner = computed(() => {diff --git a/frontend/src/components/User/Settings/UserDataTableByGroup/cells/GroupNameCell.vue b/frontend/src/components/User/Settings/UserDataTableByGroup/cells/GroupNameCell.vueindex 038d5ff241..b1a4270cca 100644--- a/frontend/src/components/User/Settings/UserDataTableByGroup/cells/GroupNameCell.vue+++ b/frontend/src/components/User/Settings/UserDataTableByGroup/cells/GroupNameCell.vue@@ -8,27 +8,23 @@:tooltip="true":class="deleted ? 'line-through' : ''">- <router-link- v-if="allowGetGroup && link"+ <component+ :is="allowGetGroup && link ? 'router-link' : 'div'"+ :class="allowGetGroup && link && 'normal-link'"+ :active-class="''"+ :exact-active-class="''":to="{name: WORKSPACE_ROUTE_USERS,query: {name: group.name,},}"- class="normal-link font-medium"><HighlightLabelText:text="group.title":keyword="keyword"/>- </router-link>- <HighlightLabelText- v-else- class="font-medium"- :text="group.title"- :keyword="keyword"- />+ </component></NEllipsis><NTag v-if="deleted" size="small" round type="error">{{ $t("common.deleted") }}diff --git a/frontend/src/components/v2/Form/ResourceIdField.vue b/frontend/src/components/v2/Form/ResourceIdField.vueindex 58e4a37981..aafd05ca3a 100644--- a/frontend/src/components/v2/Form/ResourceIdField.vue+++ b/frontend/src/components/v2/Form/ResourceIdField.vue@@ -300,5 +300,9 @@ defineExpose({isValidated: computed(() => {return state.validatedMessages.length === 0;}),+ // Allow parent to inject validation errors (e.g. from Create API returning ALREADY_EXISTS).+ addValidationError: (message: string) => {+ state.validatedMessages.push({ type: "error", message });+ },});</script>diff --git a/frontend/src/components/v2/Select/AccountSelect.vue b/frontend/src/components/v2/Select/AccountSelect.vueindex c7bc64d075..3147397ce1 100644--- a/frontend/src/components/v2/Select/AccountSelect.vue+++ b/frontend/src/components/v2/Select/AccountSelect.vue@@ -26,6 +26,7 @@ import { create } from "@bufbuild/protobuf";import { computedAsync } from "@vueuse/core";import { computed, ref } from "vue";import type { ComponentExposed } from "vue-component-type-helpers";+import { useI18n } from "vue-i18n";import GroupNameCell from "@/components/User/Settings/UserDataTableByGroup/cells/GroupNameCell.vue";import { HighlightLabelText } from "@/components/v2";import { UserNameCell } from "@/components/v2/Model/cells";@@ -50,13 +51,11 @@ import {getAccountTypeByEmail,getAccountTypeByFullname,unknownGroup,- unknownUser,} from "@/types";import type { Group } from "@/types/proto-es/v1/group_service_pb";import { ServiceAccountSchema } from "@/types/proto-es/v1/service_account_service_pb";-import type { User } from "@/types/proto-es/v1/user_service_pb";import { WorkloadIdentitySchema } from "@/types/proto-es/v1/workload_identity_service_pb";-import { ensureUserFullName, hasWorkspacePermissionV2 } from "@/utils";+import { hasWorkspacePermissionV2 } from "@/utils";import { extractGrpcErrorMessage } from "@/utils/connect";import RemoteResourceSelector from "./RemoteResourceSelector/index.vue";import type {@@ -66,12 +65,14 @@ import type {import {getRenderLabelFunc,getRenderTagFunc,+ searchUsersWithFallback,+ type UserResource,} from "./RemoteResourceSelector/utils";interface AccountResource {type: "user" | "group";name: string;- resource: Group | User;+ resource: Group | UserResource;}const props = defineProps<{@@ -84,6 +85,9 @@ const props = defineProps<{includeAllUsers: boolean;includeServiceAccount: boolean;includeWorkloadIdentity: boolean;+ // When true, allow typing arbitrary emails that don't match existing users.+ // Used in SaaS mode to invite users who haven't signed up yet.+ allowArbitraryEmail?: boolean;}>();defineEmits<{@@ -92,6 +96,7 @@ defineEmits<{(event: "update:value", value: string[] | string | undefined): void;}>();+const { t } = useI18n();const combinedPageToken = ref<{user: string;group: string;@@ -108,9 +113,6 @@ const groupStore = useGroupStore();const serviceAccountStore = useServiceAccountStore();const workloadIdentityStore = useWorkloadIdentityStore();-const hasListUserPermission = computed(() =>- hasWorkspacePermissionV2("bb.users.list")-);const hasListGroupPermission = computed(() =>hasWorkspacePermissionV2("bb.groups.list"));@@ -121,7 +123,9 @@ const hasGetServiceAccountPermission = computed(() =>hasWorkspacePermissionV2("bb.serviceAccounts.get"));-const getUserOption = (user: User): ResourceSelectOption<AccountResource> => ({+const getUserOption = (+ user: UserResource+): ResourceSelectOption<AccountResource> => ({resource: {type: "user",name: getUserFullNameByType(user),@@ -376,20 +380,49 @@ const handleSearchUser = async (params: {pageToken: string;pageSize: number;}) => {- if (!hasListUserPermission.value) {- return [getUserOption(unknownUser(ensureUserFullName(params.search)))];- }-- const { nextPageToken, users } = await userStore.fetchUserList({- filter: {- query: params.search,- project: props.projectName,- },- pageToken: params.pageToken,- pageSize: params.pageSize,+ const { users, nextPageToken } = await searchUsersWithFallback({+ ...params,+ project: props.projectName,+ allowArbitraryEmail: props.allowArbitraryEmail,});+combinedPageToken.value.user = nextPageToken;- return users.map(getUserOption);+ return users.map((user) => getUserOption(user));+ // if (!hasListUserPermission.value) {+ // return [getUserOption(unknownUser(ensureUserFullName(params.search)))];+ // }++ // const { nextPageToken, users } = await userStore.fetchUserList({+ // filter: {+ // query: params.search,+ // project: props.projectName,+ // },+ // pageToken: params.pageToken,+ // pageSize: params.pageSize,+ // });+ // combinedPageToken.value.user = nextPageToken;+ // const options = users.map((user) => getUserOption(user));++ // // In SaaS mode (allowArbitraryEmail), if no existing user matches and the+ // // search looks like an email, offer it as a selectable option so admins+ // // can add emails for users who haven't signed up yet.+ // if (+ // props.allowArbitraryEmail &&+ // options.length === 0 &&+ // !params.pageToken &&+ // isValidEmail(params.search)+ // ) {+ // const fullname = ensureUserFullName(params.search);+ // const user = {+ // ...unknownUser(fullname),+ // email: params.search,+ // title: params.search,+ // };+ // const option = getUserOption(user, true /* isExternal */);+ // options.push(option);+ // }++ // return options;};const handleSearchGroup = async (params: {@@ -433,7 +466,18 @@ const customLabel = ();}- const user = resource.resource as User;+ const user = resource.resource as UserResource;+ if (user.isExternal) {+ return (+ <div class="flex items-center gap-x-2 w-full py-0.5">+ <HighlightLabelText keyword={keyword} text={user.email} />+ <span class="ml-auto text-xs text-gray-400 whitespace-nowrap">+ {t("settings.members.not-a-member")}+ </span>+ </div>+ );+ }+return (<UserNameCelluser={user}diff --git a/frontend/src/components/v2/Select/RemoteResourceSelector/utils.tsx b/frontend/src/components/v2/Select/RemoteResourceSelector/utils.tsxindex 370977bafd..67bf478876 100644--- a/frontend/src/components/v2/Select/RemoteResourceSelector/utils.tsx+++ b/frontend/src/components/v2/Select/RemoteResourceSelector/utils.tsx@@ -2,6 +2,14 @@ import { NCheckbox, NTag } from "naive-ui";import { type VNodeChild } from "vue";import EllipsisText from "@/components/EllipsisText.vue";import { HighlightLabelText } from "@/components/v2";+import { useUserStore } from "@/store";+import { unknownUser } from "@/types";+import type { User } from "@/types/proto-es/v1/user_service_pb";+import {+ ensureUserFullName,+ hasWorkspacePermissionV2,+ isValidEmail,+} from "@/utils";import type { ResourceSelectOption, SelectSize } from "./types";export const getRenderLabelFunc =@@ -70,3 +78,65 @@ export const getRenderTagFunc =}return node;};++export interface UserResource extends User {+ // True for emails not yet registered as Bytebase users.+ isExternal?: boolean;+}++export const searchUsersWithFallback = async (params: {+ search: string;+ project?: string;+ pageToken: string;+ pageSize: number;+ allowArbitraryEmail?: boolean;+}): Promise<{+ users: UserResource[];+ nextPageToken: string;+}> => {+ const hasListUserPermission = hasWorkspacePermissionV2("bb.users.list");++ if (!hasListUserPermission) {+ return {+ users: [unknownUser(ensureUserFullName(params.search))],+ nextPageToken: "",+ };+ }++ const { nextPageToken, users } = await useUserStore().fetchUserList({+ filter: {+ query: params.search,+ project: params.project,+ },+ pageToken: params.pageToken,+ pageSize: params.pageSize,+ });++ // In SaaS mode (allowArbitraryEmail), if no existing user matches and the+ // search looks like an email, offer it as a selectable option so admins+ // can add emails for users who haven't signed up yet.+ if (+ params.allowArbitraryEmail &&+ users.length === 0 &&+ !params.pageToken &&+ isValidEmail(params.search)+ ) {+ const fullname = ensureUserFullName(params.search);+ const user: UserResource = {+ ...unknownUser(fullname),+ email: params.search,+ title: params.search,+ isExternal: true,+ };++ return {+ users: [user],+ nextPageToken: "",+ };+ }++ return {+ nextPageToken,+ users,+ };+};diff --git a/frontend/src/components/v2/Select/UserSelect.vue b/frontend/src/components/v2/Select/UserSelect.vueindex 7f18b6ea46..f29788c801 100644--- a/frontend/src/components/v2/Select/UserSelect.vue+++ b/frontend/src/components/v2/Select/UserSelect.vue@@ -5,8 +5,8 @@:disabled="disabled":size="size":value="value"- :tag="!hasPermission"- :remote="hasPermission"+ :tag="true"+ :remote="true":additional-options="additionalOptions":render-label="renderLabel":render-tag="renderTag"@@ -19,11 +19,11 @@<script lang="tsx" setup>import { computedAsync } from "@vueuse/core";import { computed } from "vue";+import { useI18n } from "vue-i18n";import { HighlightLabelText } from "@/components/v2";import { UserNameCell } from "@/components/v2/Model/cells";import { getUserFullNameByType, useUserStore } from "@/store";import { type User } from "@/types/proto-es/v1/user_service_pb";-import { hasWorkspacePermissionV2 } from "@/utils";import RemoteResourceSelector from "./RemoteResourceSelector/index.vue";import type {ResourceSelectOption,@@ -32,6 +32,8 @@ import type {import {getRenderLabelFunc,getRenderTagFunc,+ searchUsersWithFallback,+ type UserResource,} from "./RemoteResourceSelector/utils";const props = defineProps<{@@ -41,6 +43,7 @@ const props = defineProps<{value?: string | string[] | undefined; // user fullnameprojectName?: string;filter?: (user: User) => boolean;+ allowArbitraryEmail?: boolean;}>();defineEmits<{@@ -49,17 +52,16 @@ defineEmits<{}>();const userStore = useUserStore();+const { t } = useI18n();-const hasPermission = computed(() => hasWorkspacePermissionV2("bb.users.list"));--const getOption = (user: User): ResourceSelectOption<User> => ({+const getOption = (user: User): ResourceSelectOption<UserResource> => ({resource: user,value: getUserFullNameByType(user),label: user.title,});const additionalOptions = computedAsync(async () => {- const options: ResourceSelectOption<User>[] = [];+ const options: ResourceSelectOption<UserResource>[] = [];let userEmails: string[] = [];if (Array.isArray(props.value)) {@@ -87,13 +89,10 @@ const handleSearch = async (params: {pageToken: string;pageSize: number;}) => {- const { users, nextPageToken } = await userStore.fetchUserList({- filter: {- query: params.search,- project: props.projectName,- },- pageToken: params.pageToken,- pageSize: params.pageSize,+ const { users, nextPageToken } = await searchUsersWithFallback({+ ...params,+ project: props.projectName,+ allowArbitraryEmail: props.allowArbitraryEmail,});return {nextPageToken,@@ -101,7 +100,18 @@ const handleSearch = async (params: {};};-const customLabel = (user: User, keyword: string) => {+const customLabel = (user: UserResource, keyword: string) => {+ if (user.isExternal) {+ return (+ <div class="flex items-center shrink gap-x-2 py-0.5">+ <HighlightLabelText keyword={keyword} text={user.email} />+ <span class="text-xs text-gray-400 whitespace-nowrap">+ {t("settings.members.not-a-member")}+ </span>+ </div>+ );+ }+return (<UserNameCelluser={user}diff --git a/frontend/src/components/v2/Sidebar/WorkspaceSwitcher.vue b/frontend/src/components/v2/Sidebar/WorkspaceSwitcher.vuenew file mode 100644index 0000000000..307344e349--- /dev/null+++ b/frontend/src/components/v2/Sidebar/WorkspaceSwitcher.vue@@ -0,0 +1,45 @@+<template>+ <div v-if="workspaceStore.workspaceList.length > 1" class="px-2.5 pb-2">+ <NPopselect+ :value="currentWorkspaceName"+ :options="workspaceOptions"+ trigger="click"+ @update:value="onSwitch"+ >+ <button+ class="w-full flex items-center gap-x-2 px-2 py-1.5 rounded-md text-sm font-medium text-gray-700 hover:bg-gray-100 cursor-pointer"+ >+ <Building2 class="w-4 h-4 text-gray-500 shrink-0" />+ <span class="truncate flex-1 text-left">+ {{ workspaceStore.currentWorkspace?.title }}+ </span>+ <ChevronsUpDown class="w-3.5 h-3.5 text-gray-400 shrink-0" />+ </button>+ </NPopselect>+ </div>+</template>++<script lang="ts" setup>+import { Building2, ChevronsUpDown } from "lucide-vue-next";+import { NPopselect } from "naive-ui";+import { computed } from "vue";+import { useWorkspaceV1Store } from "@/store";++const workspaceStore = useWorkspaceV1Store();++const currentWorkspaceName = computed(+ () => workspaceStore.currentWorkspace?.name ?? ""+);++const workspaceOptions = computed(() =>+ workspaceStore.workspaceList.map((ws) => ({+ label: ws.title,+ value: ws.name,+ }))+);++const onSwitch = (workspaceName: string) => {+ if (workspaceName === currentWorkspaceName.value) return;+ workspaceStore.switchWorkspace(workspaceName);+};+</script>diff --git a/frontend/src/locales/en-US.json b/frontend/src/locales/en-US.jsonindex 436ce4c49a..2279912614 100644--- a/frontend/src/locales/en-US.json+++ b/frontend/src/locales/en-US.json@@ -434,6 +434,7 @@"general": "General","members": "Members","users-and-groups": "Users & Groups",+ "members-and-groups": "Members & Groups","iam-and-admin": "IAM & Admin","im-integration": "IM","mcp": "MCP",@@ -531,6 +532,7 @@"view-by-roles": "View by roles","add-member": "Add member","add-user": "Add user",+ "not-a-member": "Not a member yet","update-user": "Update User","entra-sync": {"self": "Sync from SCIM",@@ -670,6 +672,7 @@"general": {"workspace": {"id": "Workspace ID",+ "title": "Workspace title","id-description": "The unique, read-only workspace id.","branding": "Branding","logo": "Logo",@@ -718,7 +721,6 @@"external-url": {"self": "External URL","description": "The external URL where user visits Bytebase, must start with http:// or https://.",- "managed-by-flag": "This setting is managed via the --external-url command-line flag","cannot-edit-flag": "External URL cannot be changed because it is set via --external-url command-line flag"},"access-token-duration": {@@ -790,7 +792,6 @@"failed-to-update-setting": "Failed to update setting \"{title}\"","ai-assistant": {"self": "AI Assistant",- "enabled-in-saas": "Gemini AI is enabled automatically in the SaaS mode","enable-ai-assistant": "Enable AI Assistant","description": "Use AI to assist the database development tasks.","provider": {@@ -1612,7 +1613,7 @@"password-forget": {"title": "Forgot your password?","selfhost": "Please contact your Bytebase Admin to reset your password.",- "cloud": "Please go to the {link} and reset your password.",+ "contact-us": "Please contact us at {email} for help.","return-to-sign-in": "Return to Sign in"},"password-forgot": "Forgot Password",diff --git a/frontend/src/locales/es-ES.json b/frontend/src/locales/es-ES.jsonindex 91ceff5f20..b490c27ddf 100644--- a/frontend/src/locales/es-ES.json+++ b/frontend/src/locales/es-ES.json@@ -434,6 +434,7 @@"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",@@ -531,6 +532,7 @@"view-by-roles": "Ver por roles","add-member": "Agregar miembro","add-user": "Agregar usuario",+ "not-a-member": "Aún no es miembro","update-user": "Actualizar usuario","entra-sync": {"self": "Sincronización desde SCIM",@@ -670,6 +672,7 @@"general": {"workspace": {"id": "ID del espacio de trabajo",+ "title": "Nombre del espacio de trabajo","id-description": "La identificación única del espacio de trabajo de solo lectura.","branding": "Marca","logo": "Logo",@@ -718,7 +721,6 @@"external-url": {"self": "URL Externa","description": "La URL externa donde el usuario visita Bytebase, debe comenzar con http:// o https://.",- "managed-by-flag": "Esta configuración está gestionada a través del parámetro de línea de comandos --external-url","cannot-edit-flag": "La URL externa no se puede cambiar porque está configurada mediante el parámetro de línea de comandos --external-url"},"access-token-duration": {@@ -790,7 +792,6 @@"failed-to-update-setting": "No se pudo actualizar la configuración \"{title}\"","ai-assistant": {"self": "Asistente de AI",- "enabled-in-saas": "Gemini AI se habilita automáticamente en el modo SaaS","enable-ai-assistant": "Habilitar el Asistente de IA","description": "Utilice AI para ayudar en las tareas de desarrollo de bases de datos.","provider": {@@ -1612,7 +1613,7 @@"password-forget": {"title": "¿Olvidaste tu contraseña?","selfhost": "Póngase en contacto con su administrador de Bytebase para restablecer su contraseña.",- "cloud": "Vaya al {link} y restablezca su contraseña.",+ "contact-us": "Contáctenos en {email} para obtener ayuda.","return-to-sign-in": "Volver a iniciar sesión"},"password-forgot": "Contraseña olvidada",diff --git a/frontend/src/locales/ja-JP.json b/frontend/src/locales/ja-JP.jsonindex 01493b1b1a..5b493f0188 100644--- a/frontend/src/locales/ja-JP.json+++ b/frontend/src/locales/ja-JP.json@@ -434,6 +434,7 @@"general": "全般","members": "メンバー","users-and-groups": "ユーザーとグループ",+ "members-and-groups": "メンバーとグループ","iam-and-admin": "IAM と管理","im-integration": "IM","mcp": "MCP",@@ -531,6 +532,7 @@"view-by-roles": "ロールごとに表示","add-member": "メンバーを追加","add-user": "ユーザーを追加",+ "not-a-member": "未参加","update-user": "ユーザーを更新","entra-sync": {"self": "SCIM から同期",@@ -670,6 +672,7 @@"general": {"workspace": {"id": "ワークスペースID",+ "title": "ワークスペース名","id-description": "一意の読み取り専用ワークスペース ID","branding": "ブランド","logo": "ロゴ",@@ -718,7 +721,6 @@"external-url": {"self": "外部URL","description": "ユーザーまたはコールバックがアクセスできる Bytebase URL は、http:// または https:// で始まる必要があります。",- "managed-by-flag": "この設定は --external-url コマンドラインフラグによって管理されています","cannot-edit-flag": "外部URLは --external-url コマンドラインフラグで設定されているため変更できません"},"access-token-duration": {@@ -790,7 +792,6 @@"failed-to-update-setting": "設定「{title}」の更新に失敗しました","ai-assistant": {"self": "AI アシスタント",- "enabled-in-saas": "Gemini AIはSaaSモードで自動的に有効化されます","enable-ai-assistant": "AIアシスタントを有効にする","description": "AI を使用してデータベース開発タスクを支援します。","provider": {@@ -1612,7 +1613,7 @@"password-forget": {"title": "パスワードをお忘れですか?","selfhost": "Bytebase 管理者に連絡してパスワードをリセットしてください",- "cloud": "{link} にログインしてパスワードをリセットしてください",+ "contact-us": "{email} までお問い合わせください。","return-to-sign-in": "ログインに戻る"},"password-forgot": "パスワードを忘れる",diff --git a/frontend/src/locales/vi-VN.json b/frontend/src/locales/vi-VN.jsonindex 28b29fb8ca..36bc1b064f 100644--- a/frontend/src/locales/vi-VN.json+++ b/frontend/src/locales/vi-VN.json@@ -434,6 +434,7 @@"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",@@ -531,6 +532,7 @@"view-by-roles": "Xem theo vai trò","add-member": "Thêm thành viên","add-user": "Thêm người dùng",+ "not-a-member": "Chưa là thành viên","update-user": "Cập nhật người dùng","entra-sync": {"self": "Đồng bộ từ SCIM",@@ -670,6 +672,7 @@"general": {"workspace": {"id": "ID không gian làm việc",+ "title": "Tên không gian làm việc","id-description": "ID không gian làm việc duy nhất, chỉ đọc.","branding": "Thương hiệu","logo": "Logo",@@ -718,7 +721,6 @@"external-url": {"self": "URL bên ngoài","description": "URL bên ngoài mà người dùng truy cập Bytebase, phải bắt đầu bằng http:// hoặc https://.",- "managed-by-flag": "Cài đặt này được quản lý thông qua tham số dòng lệnh --external-url","cannot-edit-flag": "Không thể thay đổi URL bên ngoài vì nó được đặt thông qua tham số dòng lệnh --external-url"},"access-token-duration": {@@ -790,7 +792,6 @@"failed-to-update-setting": "Không cập nhật được cài đặt \"{title}\"","ai-assistant": {"self": "Trợ lý AI",- "enabled-in-saas": "Gemini AI được kích hoạt tự động ở chế độ SaaS","enable-ai-assistant": "Bật Trợ lý AI","description": "Sử dụng AI để hỗ trợ các tác vụ phát triển cơ sở dữ liệu.","provider": {@@ -1612,7 +1613,7 @@"password-forget": {"title": "Quên mật khẩu?","selfhost": "Vui lòng liên hệ với Quản trị viên Bytebase của bạn để đặt lại mật khẩu của bạn.",- "cloud": "Vui lòng truy cập {link} và đặt lại mật khẩu của bạn.",+ "contact-us": "Vui lòng liên hệ {email} để được hỗ trợ.","return-to-sign-in": "Quay lại Đăng nhập"},"password-forgot": "Quên mật khẩu",diff --git a/frontend/src/locales/zh-CN.json b/frontend/src/locales/zh-CN.jsonindex 35a8292286..7b84b9fb26 100644--- a/frontend/src/locales/zh-CN.json+++ b/frontend/src/locales/zh-CN.json@@ -434,6 +434,7 @@"general": "通用","members": "成员","users-and-groups": "用户和群组",+ "members-and-groups": "成员和群组","iam-and-admin": "IAM & 管理","im-integration": "IM","mcp": "MCP",@@ -531,6 +532,7 @@"view-by-roles": "按角色查看","add-member": "添加成员","add-user": "添加用户",+ "not-a-member": "尚未加入","update-user": "更新用户","entra-sync": {"self": "从 SCIM 同步",@@ -670,6 +672,7 @@"general": {"workspace": {"id": "工作空间 ID",+ "title": "工作空间名称","id-description": "唯一且只读的工作空间 ID","branding": "品牌","logo": "Logo",@@ -718,7 +721,6 @@"external-url": {"self": "External URL","description": "用户或回调能访问到的 Bytebase URL,必须以 http:// 或 https:// 开头。",- "managed-by-flag": "此设置由 --external-url 命令行参数管理","cannot-edit-flag": "外部 URL 无法更改,因为它是通过 --external-url 命令行参数设置的"},"access-token-duration": {@@ -790,7 +792,6 @@"failed-to-update-setting": "无法更新设置“{title}”","ai-assistant": {"self": "AI 助手",- "enabled-in-saas": "Gemini AI 在 SaaS 模式下自动启用","enable-ai-assistant": "启用 AI 助手","description": "使用 AI 来辅助数据库开发任务。","provider": {@@ -1612,7 +1613,7 @@"password-forget": {"title": "忘记了您的密码?","selfhost": "请联系您的 Bytebase 管理员重置密码",- "cloud": "请登录 {link} 并重置密码",+ "contact-us": "请联系 {email} 获取帮助。","return-to-sign-in": "返回登录"},"password-forgot": "忘记密码",diff --git a/frontend/src/main.ts b/frontend/src/main.tsindex 2551a169c7..e6d40c7b23 100644--- a/frontend/src/main.ts+++ b/frontend/src/main.ts@@ -16,6 +16,7 @@ import {useActuatorV1Store,useAuthStore,useSubscriptionV1Store,+ useWorkspaceV1Store,} from "./store";import {humanizeDate,@@ -52,6 +53,7 @@ migrateStorageKeys();];if (currentUser) {initPromises.push(useSubscriptionV1Store().fetchSubscription());+ initPromises.push(useWorkspaceV1Store().fetchWorkspaceList());}await Promise.all(initPromises);diff --git a/frontend/src/store/modules/v1/actuator.ts b/frontend/src/store/modules/v1/actuator.tsindex b8fd96cbdf..f3345ac3d2 100644--- a/frontend/src/store/modules/v1/actuator.ts+++ b/frontend/src/store/modules/v1/actuator.ts@@ -164,7 +164,7 @@ export const useActuatorV1Store = defineStore("actuator_v1", () => {const [info, pkg] = await Promise.all([fetchActuatorInfo(workspace),actuatorServiceClientConnect.getResourcePackage({- name: workspace,+ name: workspace ?? "",}),]);setServerInfo(info);diff --git a/frontend/src/store/modules/v1/auth.ts b/frontend/src/store/modules/v1/auth.tsindex d0a4d40df8..66f03d9acb 100644--- a/frontend/src/store/modules/v1/auth.ts+++ b/frontend/src/store/modules/v1/auth.ts@@ -14,12 +14,7 @@ import {} from "@/router/auth";import { SETUP_MODULE } from "@/router/setup";import { SQL_EDITOR_HOME_MODULE } from "@/router/sqlEditor";-import {- useActuatorV1Store,- useAppFeature,- useSubscriptionV1Store,- useUserStore,-} from "@/store";+import { useActuatorV1Store, useAppFeature, useUserStore } from "@/store";import { UNKNOWN_USER_NAME, unknownUser } from "@/types";import {type LoginRequest,@@ -122,7 +117,6 @@ export const useAuthStore = defineStore("auth_v1", () => {setRequireResetPassword(resp.requireResetPassword);await actuatorStore.fetchServerInfo(user?.workspace);- await useSubscriptionV1Store().fetchSubscription();// After user login, we need to reset the auth session key.authSessionKey.value = uniqueId();@@ -165,7 +159,6 @@ export const useAuthStore = defineStore("auth_v1", () => {}await actuatorStore.fetchServerInfo(user?.workspace);- await useSubscriptionV1Store().fetchSubscription();authSessionKey.value = uniqueId();if (actuatorStore.enableOnboarding) {diff --git a/frontend/src/store/modules/v1/workspace.ts b/frontend/src/store/modules/v1/workspace.tsindex 1809831c1c..48e297babc 100644--- a/frontend/src/store/modules/v1/workspace.ts+++ b/frontend/src/store/modules/v1/workspace.ts@@ -2,9 +2,13 @@ import { create } from "@bufbuild/protobuf";import { cloneDeep } from "lodash-es";import { defineStore } from "pinia";import { computed, ref } from "vue";-import { workspaceServiceClientConnect } from "@/connect";+import {+ authServiceClientConnect,+ workspaceServiceClientConnect,+} from "@/connect";import { userNamePrefix } from "@/store/modules/v1/common";import { ALL_USERS_USER_EMAIL } from "@/types";+import { SwitchWorkspaceRequestSchema } from "@/types/proto-es/v1/auth_service_pb";import type { IamPolicy } from "@/types/proto-es/v1/iam_policy_pb";import {BindingSchema,@@ -12,12 +16,21 @@ import {IamPolicySchema,SetIamPolicyRequestSchema,} from "@/types/proto-es/v1/iam_policy_pb";+import type { Workspace } from "@/types/proto-es/v1/workspace_service_pb";import { getUserListInBinding, isBindingPolicyExpired } from "@/utils";import { useActuatorV1Store } from "./actuator";import { composePolicyBindings } from "./projectIamPolicy";+// Notify other tabs when the user switches workspace.+const workspaceSwitchChannel = new BroadcastChannel("bb-workspace-switch");+workspaceSwitchChannel.onmessage = () => {+ // Another tab switched workspace — reload to pick up the new cookie.+ window.location.reload();+};+export const useWorkspaceV1Store = defineStore("workspace_v1", () => {const _workspaceIamPolicy = ref<IamPolicy>(create(IamPolicySchema, {}));+ const workspaceList = ref<Workspace[]>([]);const workspaceIamPolicy = computed(() => {return _workspaceIamPolicy.value;@@ -165,6 +178,29 @@ export const useWorkspaceV1Store = defineStore("workspace_v1", () => {return specificRoles;};+ const currentWorkspace = computed(() => {+ const currentName = useActuatorV1Store().workspaceResourceName;+ return workspaceList.value.find((ws) => ws.name === currentName);+ });++ const fetchWorkspaceList = async () => {+ const resp = await workspaceServiceClientConnect.listWorkspaces({});+ workspaceList.value = resp.workspaces;+ };++ const switchWorkspace = async (workspaceName: string) => {+ await authServiceClientConnect.switchWorkspace(+ create(SwitchWorkspaceRequestSchema, {+ workspace: workspaceName,+ web: true,+ })+ );+ // Notify other tabs to reload with the new workspace.+ workspaceSwitchChannel.postMessage(workspaceName);+ // Full page reload to reset all frontend state with new workspace context.+ window.location.reload();+ };+return {userMapToRoles,workspaceIamPolicy,@@ -173,5 +209,9 @@ export const useWorkspaceV1Store = defineStore("workspace_v1", () => {findRolesByMember,roleMapToUsers,getWorkspaceRolesByName,+ workspaceList,+ currentWorkspace,+ fetchWorkspaceList,+ switchWorkspace,};});diff --git a/frontend/src/utils/useDashboardSidebar.ts b/frontend/src/utils/useDashboardSidebar.tsindex eecf670330..caacc960e7 100644--- a/frontend/src/utils/useDashboardSidebar.ts+++ b/frontend/src/utils/useDashboardSidebar.ts@@ -41,6 +41,7 @@ import {SETTING_ROUTE_WORKSPACE_GENERAL,SETTING_ROUTE_WORKSPACE_SUBSCRIPTION,} from "@/router/dashboard/workspaceSetting";+import { useActuatorV1Store } from "@/store";export interface DashboardSidebarItem extends SidebarItem {navigationId?: string;@@ -73,6 +74,7 @@ export const useDashboardSidebar = () => {};const dashboardSidebarItemList = computed((): DashboardSidebarItem[] => {+ const actuatorStore = useActuatorV1Store();const sidebarList: DashboardSidebarItem[] = [{navigationId: "bb.navigation.home",@@ -124,7 +126,9 @@ export const useDashboardSidebar = () => {type: "div",children: [{- title: t("settings.sidebar.users-and-groups"),+ title: actuatorStore.isSaaSMode+ ? t("settings.sidebar.members-and-groups")+ : t("settings.sidebar.users-and-groups"),name: WORKSPACE_ROUTE_USERS,type: "route",},@@ -132,16 +136,19 @@ export const useDashboardSidebar = () => {title: t("settings.members.service-accounts"),name: WORKSPACE_ROUTE_SERVICE_ACCOUNTS,type: "route",+ hide: actuatorStore.isSaaSMode,},{title: t("settings.members.workload-identities"),name: WORKSPACE_ROUTE_WORKLOAD_IDENTITIES,type: "route",+ hide: actuatorStore.isSaaSMode,},{title: t("settings.sidebar.members"),name: WORKSPACE_ROUTE_MEMBERS,type: "route",+ hide: actuatorStore.isSaaSMode,},{title: t("settings.sidebar.custom-roles"),diff --git a/frontend/src/views/DashboardSidebar.vue b/frontend/src/views/DashboardSidebar.vueindex 94a12a70e1..09c6aab829 100644--- a/frontend/src/views/DashboardSidebar.vue+++ b/frontend/src/views/DashboardSidebar.vue@@ -5,12 +5,17 @@:item-list="dashboardSidebarItemList":get-item-class="getItemClass":logo-redirect="logoRedirect"- />+ >+ <template #prefix>+ <WorkspaceSwitcher />+ </template>+ </CommonSidebar></template><script lang="ts" setup>import { computed } from "vue";import CommonSidebar from "@/components/v2/Sidebar/CommonSidebar.vue";+import WorkspaceSwitcher from "@/components/v2/Sidebar/WorkspaceSwitcher.vue";import { WORKSPACE_ROUTE_LANDING } from "@/router/dashboard/workspaceRoutes";import { SQL_EDITOR_HOME_MODULE } from "@/router/sqlEditor";import { useAppFeature } from "@/store";diff --git a/frontend/src/views/SettingWorkspaceMembers.vue b/frontend/src/views/SettingWorkspaceMembers.vueindex edd786b566..9f7255e93c 100644--- a/frontend/src/views/SettingWorkspaceMembers.vue+++ b/frontend/src/views/SettingWorkspaceMembers.vue@@ -1,204 +1,11 @@<template>- <div class="w-full px-4 mx-auto flex flex-col py-4">- <NTabs v-model:value="state.selectedTab" type="line" 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 class="px-4 pt-2 pb-4 w-full">+ <WorkspaceMembers+ :tab-type="'line'"+ /></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;-}--defineProps<{- onClickUser?: (user: User, event: MouseEvent) => void;-}>();--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([]),- });-});+import WorkspaceMembers from "@/components/Member/Views/WorkspaceMembers.vue";</script>diff --git a/frontend/src/views/SettingWorkspaceSubscription.vue b/frontend/src/views/SettingWorkspaceSubscription.vueindex 1c9019df95..63c1be8203 100644--- a/frontend/src/views/SettingWorkspaceSubscription.vue+++ b/frontend/src/views/SettingWorkspaceSubscription.vue@@ -100,10 +100,10 @@/></div></div>+ <!-- TODO(ed): disable upload license when we support the purchase in the SaaS --><divv-if="- subscriptionStore.isSelfHostLicense &&- !actuatorStore.isSaaSMode+ subscriptionStore.isSelfHostLicense"class="w-full mt-4 flex flex-col">diff --git a/frontend/src/views/SettingWorkspaceUsers.vue b/frontend/src/views/SettingWorkspaceUsers.vueindex 7ac558ff5f..493359df1a 100644--- a/frontend/src/views/SettingWorkspaceUsers.vue+++ b/frontend/src/views/SettingWorkspaceUsers.vue@@ -1,14 +1,14 @@<template>- <div class="w-full px-4 overflow-x-hidden flex flex-col py-4">+ <div class="w-full px-4 overflow-x-hidden flex flex-col pt-2 pb-4"><BBAttention- v-if="remainingUserCount <= 3"+ v-if="!isSaaSMode && remainingUserCount <= 3"class="mb-2":type="'warning'":title="$t('subscription.usage.user-count.title')":description="userCountAttention"/><NTabs v-model:value="state.typeTab" type="line" animated>- <NTabPane name="USERS">+ <NTabPane v-if="!isSaaSMode" name="USERS"><template #tab><div class="flex-1 flex gap-x-2"><p class="text-base font-medium leading-7 text-main">@@ -43,6 +43,17 @@</ComponentPermissionGuard></NTabPane>+ <NTabPane v-if="isSaaSMode" name="MEMBERS">+ <template #tab>+ <div class="flex-1 flex gap-x-2">+ <p class="text-base font-medium leading-7 text-main">+ <span>{{ $t("common.members", 2) }}</span>+ </p>+ </div>+ </template>+ <WorkspaceMembers :tab-type="'bar'" />+ </NTabPane>+<NTabPane name="GROUPS"><template #tab><div>@@ -189,8 +200,8 @@</template></NTabs>- <!-- Inactive users section for USERS tab -->- <div v-if="state.typeTab === 'USERS' && hasListPermission">+ <!-- Inactive users section for USERS tab (self-hosted only) -->+ <div v-if="!isSaaSMode && state.typeTab === 'USERS' && hasListPermission"><NCheckbox v-model:checked="state.showInactiveUserList"><span class="textinfolabel">{{ $t("settings.members.show-inactive") }}@@ -261,12 +272,13 @@<script setup lang="ts">import { PlusIcon, SettingsIcon } from "lucide-vue-next";import { NButton, NCheckbox, NPopover, NTabPane, NTabs } from "naive-ui";-import { computed, onMounted, reactive, ref, watch } from "vue";+import { computed, onMounted, reactive, ref, watch, watchEffect } from "vue";import type { ComponentExposed } from "vue-component-type-helpers";import { useI18n } from "vue-i18n";import { RouterLink, useRoute, useRouter } from "vue-router";import { BBAttention } from "@/bbkit";import { FeatureBadge } from "@/components/FeatureGuard";+import WorkspaceMembers from "@/components/Member/Views/WorkspaceMembers.vue";import ComponentPermissionGuard from "@/components/Permission/ComponentPermissionGuard.vue";import PermissionGuardWrapper from "@/components/Permission/PermissionGuardWrapper.vue";import AADSyncDrawer from "@/components/User/Settings/AADSyncDrawer.vue";@@ -295,11 +307,12 @@ import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";import { type User } from "@/types/proto-es/v1/user_service_pb";import { hasWorkspacePermissionV2 } from "@/utils";-const tabList = ["USERS", "GROUPS"] as const;+const tabList = ["USERS", "MEMBERS", "GROUPS"] as const;type MemberTab = (typeof tabList)[number];const isMemberTab = (tab: unknown): tab is MemberTab =>tabList.includes(tab as MemberTab);-const defaultTab: MemberTab = "USERS";+const isSaaSMode = useActuatorV1Store().isSaaSMode;+const defaultTab: MemberTab = isSaaSMode ? "MEMBERS" : "USERS";type LocalState = {typeTab: MemberTab;@@ -433,7 +446,9 @@ onMounted(async () => {newState: true,});}+});+watchEffect(async () => {const name = route.query.name as string;if (name?.startsWith(groupNamePrefix)) {state.typeTab = "GROUPS";diff --git a/frontend/src/views/auth/PasswordForgot.vue b/frontend/src/views/auth/PasswordForgot.vueindex a972f94487..6569fd67e8 100644--- a/frontend/src/views/auth/PasswordForgot.vue+++ b/frontend/src/views/auth/PasswordForgot.vue@@ -9,20 +9,20 @@<div class="mt-8"><div class="mt-6">+ <!-- TODO(ed): support self-service reset password --><BBAttention type="warning" :title="hint"><template v-if="actuatorStore.isSaaSMode && !hint"><i18n-ttag="h3"class="text-sm font-medium text-yellow-800"- keypath="auth.password-forget.cloud"+ keypath="auth.password-forget.contact-us">- <template #link>+ <template #email><a- href="https://hub.bytebase.com/workspace"- target="_blank"+ href="mailto:[email protected]"class="normal-link">- Bytebase Hub</a></template></i18n-t>