Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
refactor(frontend): migrate dashboard header to react (#20108)
boojackb287874f2a3a
diff --git a/frontend/src/components/BytebaseLogo.vue b/frontend/src/components/BytebaseLogo.vuedeleted file mode 100644index 61e1121d30..0000000000--- a/frontend/src/components/BytebaseLogo.vue+++ /dev/null@@ -1,63 +0,0 @@-<template>- <div- class="shrink-0 max-w-44 flex items-center overflow-hidden"- @click="recordRedirect"- >- <!-- The active-class and exact-active-class need to set as ""- to avoid unexpected route-link class override -->- <component- :is="component"- :to="{- name: redirect,- }"- class="h-full w-full select-none flex flex-row justify-center items-center"- active-class=""- exact-active-class=""- >- <img- v-if="workspaceStore.currentWorkspace?.logo"- :src="workspaceStore.currentWorkspace?.logo"- alt="branding logo"- class="h-full object-contain"- />-- <img- v-else- class="h-8 md:h-10 w-auto object-contain"- src="@/assets/logo-full.svg"- alt="Bytebase"- />- </component>- </div>-</template>--<script lang="ts" setup>-import { computed } from "vue";-import { useRouter } from "vue-router";-import { useRecentVisit } from "@/router/useRecentVisit";-import { useWorkspaceV1Store } from "@/store";--const props = withDefaults(- defineProps<{- redirect?: string;- }>(),- {- redirect: "",- }-);--const component = computed(() => (props.redirect ? "router-link" : "span"));-const { record } = useRecentVisit();-const router = useRouter();-const workspaceStore = useWorkspaceV1Store();--const recordRedirect = () => {- if (!props.redirect) {- return;- }- const route = router.resolve({- name: props.redirect,- });- record(route.fullPath);-};-</script>diff --git a/frontend/src/components/ProfileBrandingLogo.vue b/frontend/src/components/ProfileBrandingLogo.vuedeleted file mode 100644index 68f60e1fa5..0000000000--- a/frontend/src/components/ProfileBrandingLogo.vue+++ /dev/null@@ -1,31 +0,0 @@-<template>- <div- class="flex justify-center items-center bg-gray-100 rounded-3xl"- :class="workspaceStore.currentWorkspace?.logo ? (size === 'small' ? 'md:px-1 md:py-0.5' : 'md:px-2 md:py-1.5') : ''"- >- <img- v-if="workspaceStore.currentWorkspace?.logo"- class="hidden md:block h-6 ml-1 bg-no-repeat bg-contain bg-center"- :class="size === 'small' ? 'mr-2' : 'mr-4'"- :src="logoUrl"- />- <slot />- </div>-</template>--<script lang="ts" setup>-import defaultLogo from "@/assets/logo-full.svg";-import { useWorkspaceV1Store } from "@/store";--withDefaults(- defineProps<{- logoUrl?: string;- size: "small" | "medium";- }>(),- {- logoUrl: defaultLogo,- }-);--const workspaceStore = useWorkspaceV1Store();-</script>diff --git a/frontend/src/components/ProfileDropdown.vue b/frontend/src/components/ProfileDropdown.vuedeleted file mode 100644index 4c7ad1afad..0000000000--- a/frontend/src/components/ProfileDropdown.vue+++ /dev/null@@ -1,312 +0,0 @@-<template>- <NDropdown- :show="showDropdown"- :options="options"- @clickoutside="showDropdown = false"- >- <UserAvatar- class="cursor-pointer"- :size="'SMALL'"- :user="currentUserV1"- @click="showDropdown = true"- />- </NDropdown>-</template>--<script lang="tsx" setup>-import type { DropdownOption } from "naive-ui";-import { NDropdown } from "naive-ui";-import { storeToRefs } from "pinia";-import { twMerge } from "tailwind-merge";-import { computed, ref } from "vue";-import { useI18n } from "vue-i18n";-import { useRouter } from "vue-router";-import { useLanguage } from "@/composables/useLanguage";-import { WORKSPACE_ROUTE_LANDING } from "@/router/dashboard/workspaceRoutes";-import { SQL_EDITOR_HOME_MODULE } from "@/router/sqlEditor";-import {- useActuatorV1Store,- useAuthStore,- useCurrentUserV1,- useSubscriptionV1Store,- useUIStateStore,-} from "@/store";-import { PlanType } from "@/types/proto-es/v1/subscription_service_pb";-import { isDev, isSQLEditorRoute } from "@/utils";-import Version from "./misc/Version.vue";-import ProfilePreview from "./ProfilePreview.vue";-import UserAvatar from "./User/UserAvatar.vue";--const { t } = useI18n();--const props = defineProps<{- link?: boolean;-}>();--const router = useRouter();-const actuatorStore = useActuatorV1Store();-const authStore = useAuthStore();-const subscriptionStore = useSubscriptionV1Store();-const uiStateStore = useUIStateStore();-const { setLocale, locale } = useLanguage();-const currentUserV1 = useCurrentUserV1();-const showDropdown = ref(false);--const { currentPlan } = storeToRefs(subscriptionStore);--const logout = () => {- authStore.logout();-};--const resetQuickstart = () => {- const keys = [- "hidden",- "issue.visit",- "project.visit",- "environment.visit",- "instance.visit",- "database.visit",- "member.visit",- "data.query",- ];- keys.forEach((key) => {- uiStateStore.saveIntroStateByKey({- key,- newState: false,- });- });- showDropdown.value = false;-};--const toggleLocale = (lang: string) => {- setLocale(lang);- showDropdown.value = false;-};--const switchPlan = (license: string) => {- subscriptionStore.uploadLicense(license);- showDropdown.value = false;-};--const languageOptions = computed((): DropdownOption[] => {- const languages = [- {- label: "English",- value: "en-US",- },- {- label: "简体中文",- value: "zh-CN",- },- {- label: "Español",- value: "es-ES",- },- {- label: "日本語",- value: "ja-JP",- },- {- label: "Tiếng việt",- value: "vi-VN",- },- ];-- return languages.map((item) => {- const classes: string[] = [- "menu-item cursor-pointer px-3 py-1 hover:bg-gray-100 w-48",- ];- if (locale.value === item.value) {- classes.push("bg-gray-100");- }-- return {- key: item.value,- type: "render",- render() {- return (- <div- key={item.value}- class={twMerge(classes)}- onClick={() => toggleLocale(item.value)}- >- <div class="radio cursor-pointer text-sm">- <input- type="radio"- class="btn"- checked={locale.value === item.value}- />- <label class="ml-2 cursor-pointer">{item.label}</label>- </div>- </div>- );- },- };- });-});--const licenseOptions = computed((): DropdownOption[] => {- const options = [- {- label: t("subscription.plan.free.title"),- value: "",- plan: PlanType.FREE,- },- {- label: t("subscription.plan.team.title"),- value: import.meta.env.BB_DEV_TEAM_LICENSE as string,- plan: PlanType.TEAM,- },- {- label: t("subscription.plan.enterprise.title"),- value: import.meta.env.BB_DEV_ENTERPRISE_LICENSE as string,- plan: PlanType.ENTERPRISE,- },- ];-- return options.map((item) => {- const classes = ["menu-item px-3 py-1 hover:bg-gray-100 w-48"];- if (item.plan === currentPlan.value) {- classes.push("bg-gray-100");- }-- return {- key: item.plan,- type: "render",- render() {- return (- <div- key={item.value}- class={classes.join(" ")}- onClick={() => switchPlan(item.value)}- >- <div class="radio cursor-pointer text-sm">- <input- type="radio"- class="btn"- checked={currentPlan.value === item.plan}- />- <label class="ml-2 cursor-pointer">{item.label}</label>- </div>- </div>- );- },- };- });-});--const options = computed((): DropdownOption[] => [- {- key: "profile",- type: "render",- render() {- return (- <ProfilePreview- link={props.link}- onClick={() => (showDropdown.value = false)}- />- );- },- },- {- key: "header-divider",- type: "divider",- },- {- key: "language",- type: "render",- render() {- return (- <NDropdown- key="switch-language"- options={languageOptions.value}- placement="left-start"- >- <div class="menu-item">{t("common.language")}</div>- </NDropdown>- );- },- },- {- key: "license",- type: "render",- show: isDev(),- render() {- return (- <NDropdown- key="switch-license"- options={licenseOptions.value}- placement="left-start"- >- <div class="menu-item">{t("common.license")}</div>- </NDropdown>- );- },- },- {- key: "quick-start",- type: "render",- show: actuatorStore.quickStartEnabled,- render() {- return (- <div class="menu-item" onClick={resetQuickstart}>- {t("quick-start.self")}- </div>- );- },- },- {- key: "sql-editor",- type: "render",- render() {- const link = router.resolve({- name: isSQLEditorRoute(router)- ? WORKSPACE_ROUTE_LANDING- : SQL_EDITOR_HOME_MODULE,- });- return (- <a- class="menu-item"- href={link.fullPath}- target="_blank"- rel="noopener noreferrer"- >- {isSQLEditorRoute(router)- ? t(- "settings.general.workspace.default-landing-page.go-to-workspace"- )- : t(- "settings.general.workspace.default-landing-page.go-to-sql-editor"- )}- </a>- );- },- },- {- key: "header-divider",- type: "divider",- },- {- key: "version",- type: "render",- render() {- return <Version tooltipProps={{ placement: "left" }} />;- },- },- {- key: "header-divider",- type: "divider",- },- {- key: "logout",- type: "render",- render() {- return (- <div class="menu-item" onClick={logout}>- {t("common.logout")}- </div>- );- },- },-]);-</script>diff --git a/frontend/src/components/ProfilePreview.vue b/frontend/src/components/ProfilePreview.vuedeleted file mode 100644index 15ce866353..0000000000--- a/frontend/src/components/ProfilePreview.vue+++ /dev/null@@ -1,48 +0,0 @@-<template>- <component- :is="link ? 'router-link' : 'div'"- class="px-4 py-3 menu-item w-48"- role="menuitem"- v-bind="bindings"- @click="$emit('click')"- >- <p class="text-sm flex justify-between gap-x-2">- <span class="text-main font-medium truncate text-ellipsis">- {{ currentUserV1.title }}- </span>- </p>- <p class="text-sm text-control truncate text-ellipsis">- {{ currentUserV1.email }}- </p>- </component>-</template>--<script setup lang="ts">-import { computed } from "vue";-import { SETTING_ROUTE_PROFILE } from "@/router/dashboard/workspaceSetting";-import { useCurrentUserV1 } from "@/store";--const props = withDefaults(- defineProps<{- link?: boolean;- }>(),- {- link: true,- }-);--defineEmits<{- (event: "click"): void;-}>();--const currentUserV1 = useCurrentUserV1();--const bindings = computed(() => {- if (!props.link) return {};- return {- to: {- name: SETTING_ROUTE_PROFILE,- },- };-});-</script>diff --git a/frontend/src/components/Project/ProjectCreatePanel.vue b/frontend/src/components/Project/ProjectCreatePanel.vuedeleted file mode 100644index 60b93bf0ef..0000000000--- a/frontend/src/components/Project/ProjectCreatePanel.vue+++ /dev/null@@ -1,169 +0,0 @@-<template>- <DrawerContent- :title="$t('quick-action.create-project')"- class="w-[40rem] max-w-[100vw]"- >- <div class="w-full">- <div class="grid gap-y-6 gap-x-4 grid-cols-1">- <div class="col-span-1">- <label- for="name"- class="text-base leading-6 font-medium text-control"- >- {{ $t("project.create-modal.project-name") }}- <RequiredStar />- </label>- <BBTextField- v-model:value="state.project.title"- class="mt-2 mb-1 w-full"- :required="true"- :placeholder="$t('project.create-modal.project-name')"- :maxlength="200"- />- <ResourceIdField- ref="resourceIdField"- editing-class="mt-2"- resource-type="project"- :value="state.resourceId"- :resource-title="state.project.title"- :fetch-resource="- (id) =>- projectV1Store.getOrFetchProjectByName(- `${projectNamePrefix}${id}`,- true /* silent */- )- "- @update:value="state.resourceId = $event"- />- </div>- </div>- </div>-- <div- v-if="state.isCreating"- class="absolute inset-0 bg-white/50 flex justify-center items-center"- >- <BBSpin />- </div>-- <template #footer>- <div class="flex justify-end items-center gap-x-3">- <NButton quaternary @click.prevent="cancel">- {{ $t("common.cancel") }}- </NButton>- <NButton- type="primary"- :disabled="!allowCreate"- @click.prevent="create"- >- {{ $t("common.create") }}- </NButton>- </div>- </template>- </DrawerContent>-</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";-import { useI18n } from "vue-i18n";-import { useRouter } from "vue-router";-import { BBSpin, BBTextField } from "@/bbkit";-import RequiredStar from "@/components/RequiredStar.vue";-import { DrawerContent } from "@/components/v2";-import ResourceIdField from "@/components/v2/Form/ResourceIdField.vue";-import { pushNotification, useUIStateStore } from "@/store";-import { projectNamePrefix } from "@/store/modules/v1/common";-import { useProjectV1Store } from "@/store/modules/v1/project";-import { unknownProject } from "@/types";-import type { Project } from "@/types/proto-es/v1/project_service_pb";-import { hasWorkspacePermissionV2 } from "@/utils";--interface LocalState {- project: Project;- resourceId: string;- isCreating: boolean;-}--const props = defineProps<{- onCreated?: (project: Project) => void;-}>();--const emit = defineEmits<{- (event: "dismiss"): void;-}>();--const router = useRouter();-const { t } = useI18n();-const projectV1Store = useProjectV1Store();--const state = reactive<LocalState>({- project: {- ...unknownProject(),- title: "New Project",- },- resourceId: "",- isCreating: false,-});-const resourceIdField = ref<InstanceType<typeof ResourceIdField>>();--const allowCreate = computed(() => {- if (isEmpty(state.project.title)) return false;- if (!resourceIdField.value?.isValidated) return false;- if (!hasWorkspacePermissionV2("bb.projects.create")) {- return false;- }- return true;-});--const create = async () => {- if (!allowCreate.value) {- return;- }-- try {- state.isCreating = true;- const createdProject = await projectV1Store.createProject(- state.project,- state.resourceId- );-- if (props.onCreated) {- props.onCreated(createdProject);- } else {- useUIStateStore().saveIntroStateByKey({- key: "project.visit",- newState: true,- });-- const url = {- path: `/${createdProject.name}`,- };- router.push(url);- emit("dismiss");- }-- pushNotification({- module: "bytebase",- style: "SUCCESS",- title: t("project.create-modal.success-prompt", {- 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;- }-};--const cancel = () => {- emit("dismiss");-};-</script>diff --git a/frontend/src/components/Project/ProjectSwitch/ProjectSwitchContent.vue b/frontend/src/components/Project/ProjectSwitch/ProjectSwitchContent.vuedeleted file mode 100644index c63babc99b..0000000000--- a/frontend/src/components/Project/ProjectSwitch/ProjectSwitchContent.vue+++ /dev/null@@ -1,204 +0,0 @@-<template>- <div class="w-full max-h-[calc(100vh-10rem)]">- <div v-if="isValidProjectName(project.name)">- <NButton size="small" text @click="gotoWorkspace">- <template #icon>- <ChevronLeftIcon class="w-4 opacity-80" />- </template>- {{ $t("common.back-to-workspace") }}- </NButton>- </div>- <NTabs- :value="actualSelectedTab"- type="line"- @update:value="state.selectedTab = $event"- >- <template #suffix>- <div class="flex flex-row justify-end items-center gap-x-2">- <SearchBox- v-model:value="state.searchText"- :placeholder="$t('common.filter-by-name')"- :autofocus="false"- class="w-40!"- size="small"- />- <NTooltip v-if="allowToCreateProject" trigger="hover">- <template #trigger>- <NButton size="small" @click="$emit('on-create')">- <template #icon>- <PlusIcon class="w-4 h-auto" />- </template>- </NButton>- </template>- {{ $t("quick-action.new-project") }}- </NTooltip>- </div>- </template>- <NTabPane- v-for="tab in tabList"- :key="tab.id"- :name="tab.id"- :tab="tab.title"- :disabled="- tab.id === 'recent' &&- state.searchText.trim().length > 0 &&- filteredRecentProjectList.length === 0- "- >- <ProjectV1Table- v-if="tab.id === 'recent'"- :project-list="tab.list"- :current-project="- isValidProjectName(project.name) ? project : undefined- "- :keyword="state.searchText"- :show-labels="false"- @row-click="onProjectSelect"- />- <PagedProjectTable- v-else- class="mb-2"- session-key="bb.project-table"- :filter="filter"- :loading="state.loading"- :show-labels="false"- @row-click="onProjectSelect"- />- </NTabPane>- </NTabs>- </div>-</template>--<script lang="ts" setup>-import { ChevronLeftIcon, PlusIcon } from "lucide-vue-next";-import { NButton, NTabPane, NTabs, NTooltip } from "naive-ui";-import { computed, onMounted, reactive, watch } from "vue";-import { useI18n } from "vue-i18n";-import { useRouter } from "vue-router";-import { useRecentProjects } from "@/components/Project/useRecentProjects";-import { PagedProjectTable, ProjectV1Table, SearchBox } from "@/components/v2";-import { PROJECT_V1_ROUTE_DETAIL } from "@/router/dashboard/projectV1";-import { WORKSPACE_ROUTE_LANDING } from "@/router/dashboard/workspaceRoutes";-import { useRecentVisit } from "@/router/useRecentVisit";-import { useCurrentProjectV1 } from "@/store";-import { getProjectName } from "@/store/modules/v1/common";-import { isDefaultProject, isValidProjectName } from "@/types";-import type { Project } from "@/types/proto-es/v1/project_service_pb";-import {- filterProjectV1ListByKeyword,- hasWorkspacePermissionV2,-} from "@/utils";--type LocalTabType = "recent" | "all";--interface LocalState {- showPopover: boolean;- searchText: string;- loading: boolean;- selectedTab: LocalTabType;-}--const emit = defineEmits<{- (event: "on-create"): void;- (event: "close"): void;-}>();--const { t } = useI18n();-const state = reactive<LocalState>({- showPopover: false,- searchText: "",- selectedTab: "all",- loading: true,-});--const { recentViewProjects } = useRecentProjects();-const router = useRouter();-const { record } = useRecentVisit();--const { project } = useCurrentProjectV1();--const filter = computed(() => ({- query: state.searchText,- excludeDefault: true,-}));--onMounted(() => {- state.selectedTab = recentViewProjects.value.length < 1 ? "all" : "recent";-});--const getFilteredProjectList = (projectList: Project[]): Project[] => {- const list = projectList.filter((project) => !isDefaultProject(project.name));- return filterProjectV1ListByKeyword(list, state.searchText);-};--const filteredRecentProjectList = computed(() => {- return getFilteredProjectList(recentViewProjects.value);-});--const allowToCreateProject = computed(() =>- hasWorkspacePermissionV2("bb.projects.create")-);--const tabList = computed(- (): { title: string; id: LocalTabType; list: Project[] }[] => [- {- title: t("common.recent"),- id: "recent",- list: filteredRecentProjectList.value,- },- {- title: t("common.all"),- id: "all",- list: [],- },- ]-);--const actualSelectedTab = computed((): LocalState["selectedTab"] => {- if (- state.searchText.trim().length > 0 &&- filteredRecentProjectList.value.length === 0- ) {- // Force to view 'ALL' tab when search by keyword but "Recent" is empty.- return "all";- }- return state.selectedTab;-});--const onProjectSelect = (selected: Project) => {- const route = router.resolve({- name: PROJECT_V1_ROUTE_DETAIL,- params: {- projectId: getProjectName(selected.name),- },- });- record(route.fullPath);- if (selected.name === project.value.name) {- // Same project — ProjectV1Table already navigated but the route didn't- // change, so the watcher won't fire. Close the popover explicitly.- emit("close");- }- // For different projects, ProjectV1Table handles router.push() before- // emitting row-click, and the watcher on project.name closes the popover.-};--const gotoWorkspace = (e: MouseEvent) => {- const route = router.resolve({- name: WORKSPACE_ROUTE_LANDING,- });- record(route.fullPath);- if (e.ctrlKey || e.metaKey) {- window.open(route.fullPath, "_blank");- } else {- router.push(route.fullPath);- }-};--// Close popover when current project changed.-watch(- () => project.value.name,- () => {- state.showPopover = false;- }-);-</script>diff --git a/frontend/src/components/Project/ProjectSwitch/ProjectSwitchModal.vue b/frontend/src/components/Project/ProjectSwitch/ProjectSwitchModal.vuedeleted file mode 100644index c6e063dc31..0000000000--- a/frontend/src/components/Project/ProjectSwitch/ProjectSwitchModal.vue+++ /dev/null@@ -1,46 +0,0 @@-<template>- <BBModal- :close-on-esc="true"- :mask-closable="true"- :trap-focus="false"- :show="show"- :title="$t('project.select')"- class="w-3xl max-w-full h-auto max-h-full"- @close="$emit('dismiss')"- >- <ProjectSwitchContent- @on-create="- () => {- showCreateDrawer = true;- }- "- />- </BBModal>-- <Drawer- :auto-focus="true"- :close-on-esc="true"- :show="showCreateDrawer"- @close="showCreateDrawer = false"- >- <ProjectCreatePanel @dismiss="showCreateDrawer = false" />- </Drawer>-</template>--<script lang="ts" setup>-import { ref } from "vue";-import { BBModal } from "@/bbkit";-import ProjectCreatePanel from "@/components/Project/ProjectCreatePanel.vue";-import { Drawer } from "@/components/v2";-import ProjectSwitchContent from "./ProjectSwitchContent.vue";--defineProps<{- show: boolean;-}>();--defineEmits<{- (event: "dismiss"): void;-}>();--const showCreateDrawer = ref<boolean>(false);-</script>diff --git a/frontend/src/components/Project/ProjectSwitch/ProjectSwitchPopover.vue b/frontend/src/components/Project/ProjectSwitch/ProjectSwitchPopover.vuedeleted file mode 100644index 490dbc75d7..0000000000--- a/frontend/src/components/Project/ProjectSwitch/ProjectSwitchPopover.vue+++ /dev/null@@ -1,83 +0,0 @@-<template>- <NPopover- v-model:show="state.showPopover"- class="max-h-[80vh] w-[24rem] max-w-[90vw]"- placement="bottom-start"- scrollable- trigger="click"- :show-arrow="false"- :display-directive="'if'"- >- <template #trigger>- <NButton- class="hidden sm:inline"- size="small"- @click="state.showPopover = !state.showPopover"- icon-placement="right"- >- <div class="min-w-32 text-left">- <ProjectNameCell- v-if="isValidProjectName(project.name)"- :project="project"- />- <span v-else class="text-control-placeholder text-sm">- {{ $t("project.select") }}- </span>- </div>- <template #icon>- <ChevronDownIcon class="w-5 h-auto opacity-80" />- </template>- </NButton>- </template>-- <ProjectSwitchContent- @on-create="- () => {- state.showCreateDrawer = true;- state.showPopover = false;- }- "- @close="state.showPopover = false"- />- </NPopover>- <Drawer- :auto-focus="true"- :close-on-esc="true"- :show="state.showCreateDrawer"- @close="state.showCreateDrawer = false"- >- <ProjectCreatePanel @dismiss="state.showCreateDrawer = false" />- </Drawer>-</template>--<script lang="ts" setup>-import { ChevronDownIcon } from "lucide-vue-next";-import { NButton, NPopover } from "naive-ui";-import { reactive, watch } from "vue";-import ProjectCreatePanel from "@/components/Project/ProjectCreatePanel.vue";-import { Drawer } from "@/components/v2";-import { ProjectNameCell } from "@/components/v2/Model/cells";-import { useCurrentProjectV1 } from "@/store";-import { isValidProjectName } from "@/types";-import ProjectSwitchContent from "./ProjectSwitchContent.vue";--interface LocalState {- showPopover: boolean;- showCreateDrawer: boolean;-}--const state = reactive<LocalState>({- showPopover: false,- showCreateDrawer: false,-});--const { project } = useCurrentProjectV1();--watch(- () => project.value.name,- () => {- // Close popover when current project changed.- state.showPopover = false;- }-);-</script>diff --git a/frontend/src/components/misc/Version.vue b/frontend/src/components/misc/Version.vuedeleted file mode 100644index 7686279a0a..0000000000--- a/frontend/src/components/misc/Version.vue+++ /dev/null@@ -1,135 +0,0 @@-<template>- <div class="flex flex-col px-4 whitespace-nowrap text-sm">- <div v-if="isDemo" class="flex gap-1 items-center text-accent py-2">- <heroicons-outline:presentation-chart-bar class="w-5 h-5" />- {{ $t("common.demo-mode") }}- </div>- <div v-else class="py-2">- <RequireEnterpriseButton- v-if="subscriptionViewMode === 'TRIAL'"- text- size="small"- >- <template #icon>- <SparklesIcon class="w-5 h-5 text-accent" />- </template>- {{ $t("subscription.plan.try") }}- </RequireEnterpriseButton>- <router-link- v-if="subscriptionViewMode === 'LINK'"- :to="autoSubscriptionRoute()"- exact-active-class=""- >- {{ $t(readableCurrentPlan) }}- </router-link>- </div>-- <NTooltip v-bind="tooltipProps">- <template #trigger>- <div- class="flex items-center gap-1 py-2"- :class="- canUpgrade- ? 'text-success cursor-pointer'- : 'text-control-light cursor-default'- "- @click="state.showReleaseModal = canUpgrade"- >- <Volume2Icon v-if="canUpgrade" class="h-5 w-5" />- {{ version }}- </div>- </template>- <template #default>- <div class="flex flex-col gap-y-1">- <div v-if="canUpgrade" class="whitespace-nowrap">- {{ $t("remind.release.new-version-available") }}- </div>- <template v-if="!isSaaSMode">- <div>BE Git hash: {{ gitCommitBE }}</div>- <div>FE Git hash: {{ gitCommitFE }}</div>- </template>- </div>- </template>- </NTooltip>- </div>-- <ReleaseRemindModal- v-if="state.showReleaseModal"- @cancel="state.showReleaseModal = false"- />-</template>--<script lang="ts" setup>-import { SparklesIcon, Volume2Icon } from "lucide-vue-next";-import { NTooltip, type TooltipProps } from "naive-ui";-import { storeToRefs } from "pinia";-import { computed, reactive } from "vue";-import RequireEnterpriseButton from "@/components/RequireEnterpriseButton.vue";-import {- useActuatorV1Store,- useAppFeature,- useSubscriptionV1Store,-} from "@/store";-import { PlanType } from "@/types/proto-es/v1/subscription_service_pb";-import { autoSubscriptionRoute, hasWorkspacePermissionV2 } from "@/utils";-import ReleaseRemindModal from "../ReleaseRemindModal.vue";--interface LocalState {- showReleaseModal: boolean;-}--defineProps<{- tooltipProps?: TooltipProps;-}>();--const actuatorStore = useActuatorV1Store();-const subscriptionStore = useSubscriptionV1Store();-const hideTrial = useAppFeature("bb.feature.hide-trial");--const state = reactive<LocalState>({- showReleaseModal: false,-});--const { isDemo, isSaaSMode } = storeToRefs(actuatorStore);-const canUpgrade = computed(() => {- return actuatorStore.hasNewRelease;-});--const subscriptionViewMode = computed(() => {- if (- !hideTrial.value &&- subscriptionStore.currentPlan === PlanType.FREE &&- hasWorkspacePermissionV2("bb.settings.set")- ) {- return "TRIAL";- }- return "LINK";-});--const readableCurrentPlan = computed((): string => {- const plan = subscriptionStore.currentPlan;- switch (plan) {- case PlanType.TEAM:- return "subscription.plan.team.title";- case PlanType.ENTERPRISE:- return "subscription.plan.enterprise.title";- default:- return "subscription.plan.free.title";- }-});--const version = computed(() => {- const v = actuatorStore.version;- if (v.split(".").length === 3) {- return `v${v}`;- }- return v;-});--const gitCommitBE = computed(() => {- return `${actuatorStore.gitCommitBE.substring(0, 7)}`;-});-const gitCommitFE = computed(() => {- return `${actuatorStore.gitCommitFE.substring(0, 7)}`;-});-</script>diff --git a/frontend/src/layouts/BodyLayout.vue b/frontend/src/layouts/BodyLayout.vueindex 8c32bc0f47..5a7a7f6ab8 100644--- a/frontend/src/layouts/BodyLayout.vue+++ b/frontend/src/layouts/BodyLayout.vue@@ -1,96 +1,55 @@<template>- <div class="h-full flex flex-col overflow-hidden">- <div class="flex-1 flex overflow-hidden">- <template v-if="!isRootPath">- <!-- Mobile sidebar drawer -->- <NDrawer- v-model:show="state.showMobileOverlay"- placement="left"- :width="208"- :class="[sidebarView === 'MOBILE' ? '' : 'hidden!']"- >- <NDrawerContent body-content-class="!p-0">- <div class="h-full overflow-y-auto bg-control-bg">- <router-view v-if="sidebarView === 'MOBILE'" name="leftSidebar" />- </div>- </NDrawerContent>- </NDrawer>-- <!-- Static sidebar for desktop -->- <aside- v-if="sidebarView === 'DESKTOP'"- class="shrink-0 flex"- data-label="bb-dashboard-static-sidebar"- >- <div class="flex flex-col w-52 bg-control-bg">- <div class="flex-1 flex flex-col py-0 overflow-y-auto">- <router-view name="leftSidebar" />- </div>- </div>- </aside>- </template>-- <div- class="flex flex-col min-w-0 flex-1"- data-label="bb-main-body-wrapper"- >- <nav- v-if="!isRootPath"- class="bg-white border-b border-block-border"- data-label="bb-dashboard-header"- >- <div class="max-w-full mx-auto">- <DashboardHeader- :show-logo="false"- :show-mobile-sidebar-toggle="true"- @toggle-mobile-sidebar="state.showMobileOverlay = true"- />- </div>- </nav>-- <!-- This area may scroll -->- <div- id="bb-layout-main"- ref="mainContainerRef"- class="md:min-w-0 flex-1 overflow-y-auto"- >- <RoutePermissionGuard- class="m-4"- :routes="[- ...workspaceRoutes,- ...workspaceSettingRoutes,- ...environmentV1Routes,- ...instanceRoutes,- ]"- >- <!-- Start main area-->- <router-view name="content" />- <!-- End main area -->- </RoutePermissionGuard>- </div>- </div>- </div>+ <ReactPageMount+ page="DashboardBodyShell"+ :page-props="{+ variant: 'workspace',+ isRootPath,+ routeKey: route.fullPath,+ onReady: handleReady,+ }"+ />+ <teleport v-if="sidebarTarget && !isRootPath" :to="sidebarTarget">+ <router-view name="leftSidebar" />+ </teleport>++ <teleport v-if="contentTarget" :to="contentTarget">+ <RoutePermissionGuard+ class="m-4"+ :routes="[+ ...workspaceRoutes,+ ...workspaceSettingRoutes,+ ...environmentV1Routes,+ ...instanceRoutes,+ ]"+ >+ <router-view name="content" />+ </RoutePermissionGuard>+ </teleport>++ <teleport v-if="quickstartTarget" :to="quickstartTarget"><Quickstart />- </div>+ </teleport><AgentWindowMount /><ReleaseRemindModal- v-if="state.showReleaseModal && route.name !== WORKSPACE_ROOT_MODULE"- @cancel="state.showReleaseModal = false"+ v-if="showReleaseModal && route.name !== WORKSPACE_ROOT_MODULE"+ @cancel="showReleaseModal = false"/></template><script lang="ts" setup>import { useWindowSize } from "@vueuse/core";-import { NDrawer, NDrawerContent } from "naive-ui";-import { computed, onMounted, onUnmounted, reactive, ref, watch } from "vue";+import { computed, onMounted, onUnmounted, ref, shallowRef } from "vue";import { useRoute, useRouter } from "vue-router";import AgentWindowMount from "@/components/AgentWindowMount.vue";import RoutePermissionGuard from "@/components/Permission/RoutePermissionGuard.vue";+import Quickstart from "@/components/Quickstart.vue";import ReleaseRemindModal from "@/components/ReleaseRemindModal.vue";import { t } from "@/plugins/i18n";+import type { DashboardShellTargets } from "@/react/dashboard-shell";+import ReactPageMount from "@/react/ReactPageMount.vue";import environmentV1Routes from "@/router/dashboard/environmentV1";import instanceRoutes from "@/router/dashboard/instance";import workspaceRoutes from "@/router/dashboard/workspace";@@ -104,47 +63,43 @@ import {} from "@/store";import { PresetRoleType } from "@/types";import { PlanType } from "@/types/proto-es/v1/subscription_service_pb";-import DashboardHeader from "@/views/DashboardHeader.vue";-import Quickstart from "../components/Quickstart.vue";import { provideBodyLayoutContext } from "./common";-interface LocalState {- showMobileOverlay: boolean;- showReleaseModal: boolean;- showRefreshRemindModal: boolean;-}-const actuatorStore = useActuatorV1Store();const permissionStore = usePermissionStore();const subscriptionStore = useSubscriptionV1Store();const route = useRoute();const router = useRouter();+const { width: windowWidth } = useWindowSize();-const state = reactive<LocalState>({- showMobileOverlay: false,- showReleaseModal: false,- showRefreshRemindModal: false,+const shellTargets = shallowRef<DashboardShellTargets>({+ desktopSidebar: null,+ mobileSidebar: null,+ content: null,+ quickstart: null,+ mainContainer: null,});--// Close mobile drawer on route change-watch(- () => route.fullPath,- () => {- state.showMobileOverlay = false;- }-);-const mainContainerRef = ref<HTMLDivElement>();-const { width: windowWidth } = useWindowSize();+const showReleaseModal = ref(false);const isRootPath = computed(() => {return router.currentRoute.value.name === WORKSPACE_ROOT_MODULE;});-const sidebarView = computed(() => {- return windowWidth.value >= 768 ? "DESKTOP" : "MOBILE";+const contentTarget = computed(() => shellTargets.value.content);+const quickstartTarget = computed(() => shellTargets.value.quickstart);+const sidebarTarget = computed(() => {+ if (windowWidth.value >= 768) {+ return shellTargets.value.desktopSidebar;+ }+ return shellTargets.value.mobileSidebar;});+const handleReady = (targets: DashboardShellTargets) => {+ shellTargets.value = targets;+ mainContainerRef.value = targets.mainContainer ?? undefined;+};+actuatorStore.tryToRemindRelease().then((openRemindModal) => {if (subscriptionStore.currentPlan === PlanType.ENTERPRISE &&@@ -152,11 +107,9 @@ actuatorStore.tryToRemindRelease().then((openRemindModal) => {) {return;}- state.showReleaseModal = openRemindModal;+ showReleaseModal.value = openRemindModal;});-// compare BE and FE commit hash every 30 minutes.-// if they are different, show the refresh remind modal.const refreshRemindTimer = ref<NodeJS.Timeout>();onMounted(async () => {const remind = await actuatorStore.tryToRemindRefresh();@@ -191,7 +144,6 @@ onUnmounted(() => {}});-// Agent keyboard shortcut (Ctrl/Cmd+Shift+A) — calls Zustand store directlyconst agentShortcutHandler = async (e: KeyboardEvent) => {if ((e.ctrlKey || e.metaKey) && e.shiftKey && e.key === "A") {e.preventDefault();diff --git a/frontend/src/layouts/DashboardLayout.vue b/frontend/src/layouts/DashboardLayout.vueindex 1f6510beac..ef33633d6e 100644--- a/frontend/src/layouts/DashboardLayout.vue+++ b/frontend/src/layouts/DashboardLayout.vue@@ -1,18 +1,33 @@<template>- <div class="relative h-screen overflow-hidden flex flex-col">+ <ReactPageMount+ page="DashboardFrameShell"+ :page-props="{ onReady: handleReady }"+ />++ <teleport v-if="targets.banner" :to="targets.banner"><BannersWrapper />- <!-- Suspense is experimental, be aware of the potential change -->- <Suspense>- <template #default>- <ProvideDashboardContext>- <router-view name="body" />- </ProvideDashboardContext>- </template>- </Suspense>- </div>+ </teleport>++ <ProvideDashboardContext>+ <teleport v-if="targets.body" :to="targets.body">+ <router-view name="body" />+ </teleport>+ </ProvideDashboardContext></template><script lang="ts" setup>+import { shallowRef } from "vue";import BannersWrapper from "@/components/BannersWrapper.vue";import ProvideDashboardContext from "@/components/ProvideDashboardContext.vue";+import type { DashboardFrameShellTargets } from "@/react/dashboard-shell";+import ReactPageMount from "@/react/ReactPageMount.vue";++const targets = shallowRef<DashboardFrameShellTargets>({+ banner: null,+ body: null,+});++const handleReady = (nextTargets: DashboardFrameShellTargets) => {+ targets.value = nextTargets;+};</script>diff --git a/frontend/src/layouts/IssuesLayout.vue b/frontend/src/layouts/IssuesLayout.vueindex 6f40dc2054..b00b3781c8 100644--- a/frontend/src/layouts/IssuesLayout.vue+++ b/frontend/src/layouts/IssuesLayout.vue@@ -1,44 +1,48 @@<template>- <div class="h-full flex flex-col overflow-hidden">- <div class="flex-1 flex overflow-hidden">- <div- class="flex flex-col min-w-0 flex-1 border-x border-block-border"- data-label="bb-main-body-wrapper"- >- <nav- class="bg-white border-b border-block-border"- data-label="bb-dashboard-header"- >- <div class="max-w-full mx-auto">- <DashboardHeader :show-logo="true" />- </div>- </nav>+ <ReactPageMount+ page="DashboardBodyShell"+ :page-props="{+ variant: 'issues',+ routeKey: route.fullPath,+ onReady: handleReady,+ }"+ />- <!-- This area may scroll -->- <div- id="bb-layout-main"- ref="mainContainerRef"- class="min-w-0 flex-1 overflow-y-auto"- >- <!-- Start main area-->- <router-view name="content" />- <!-- End main area -->- </div>- </div>- </div>+ <teleport v-if="contentTarget" :to="contentTarget">+ <router-view name="content" />+ </teleport>+ <teleport v-if="quickstartTarget" :to="quickstartTarget"><Quickstart />- </div>+ </teleport></template><script lang="ts" setup>-import { ref } from "vue";-import DashboardHeader from "@/views/DashboardHeader.vue";-import Quickstart from "../components/Quickstart.vue";+import { computed, ref, shallowRef } from "vue";+import { useRoute } from "vue-router";+import Quickstart from "@/components/Quickstart.vue";+import type { DashboardShellTargets } from "@/react/dashboard-shell";+import ReactPageMount from "@/react/ReactPageMount.vue";import { provideBodyLayoutContext } from "./common";+const route = useRoute();+const shellTargets = shallowRef<DashboardShellTargets>({+ desktopSidebar: null,+ mobileSidebar: null,+ content: null,+ quickstart: null,+ mainContainer: null,+});const mainContainerRef = ref<HTMLDivElement>();+const contentTarget = computed(() => shellTargets.value.content);+const quickstartTarget = computed(() => shellTargets.value.quickstart);++const handleReady = (targets: DashboardShellTargets) => {+ shellTargets.value = targets;+ mainContainerRef.value = targets.mainContainer ?? undefined;+};+provideBodyLayoutContext({mainContainerRef,});diff --git a/frontend/src/layouts/layout-bridge.test.ts b/frontend/src/layouts/layout-bridge.test.tsnew file mode 100644index 0000000000..80217042ac--- /dev/null+++ b/frontend/src/layouts/layout-bridge.test.ts@@ -0,0 +1,328 @@+import { mount } from "@vue/test-utils";+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";+import { defineComponent, h, nextTick } from "vue";+import { createMemoryHistory, createRouter, RouterView } from "vue-router";+import { useBodyLayoutContext } from "./common";++const mocks = vi.hoisted(() => ({+ width: { value: 1024 },+ pushNotification: vi.fn(),+ tryToRemindRelease: vi.fn(async () => false),+ tryToRemindRefresh: vi.fn(async () => false),+}));++vi.mock("@vueuse/core", () => ({+ useWindowSize: () => ({+ width: mocks.width,+ }),+}));++vi.mock("@/react/ReactPageMount.vue", async () => {+ const { defineComponent, h, onMounted, ref } = await import("vue");++ return {+ default: defineComponent({+ name: "MockReactPageMount",+ props: {+ page: {+ type: String,+ required: true,+ },+ pageProps: {+ type: Object,+ default: undefined,+ },+ },+ setup(props) {+ const desktopSidebar = ref<HTMLDivElement | null>(null);+ const mobileSidebar = ref<HTMLDivElement | null>(null);+ const content = ref<HTMLDivElement | null>(null);+ const quickstart = ref<HTMLDivElement | null>(null);+ const mainContainer = ref<HTMLDivElement | null>(null);++ onMounted(() => {+ if (props.page === "DashboardFrameShell") {+ return;+ }++ props.pageProps?.onReady?.({+ desktopSidebar:+ props.pageProps.variant === "workspace"+ ? desktopSidebar.value+ : null,+ mobileSidebar:+ props.pageProps.variant === "workspace"+ ? mobileSidebar.value+ : null,+ content: content.value,+ quickstart: quickstart.value,+ mainContainer: mainContainer.value,+ });+ });++ return () =>+ h("div", { "data-testid": "mock-shell" }, [+ h("div", {+ ref: desktopSidebar,+ "data-testid": "shell-desktop-sidebar",+ }),+ h("div", {+ ref: mobileSidebar,+ "data-testid": "shell-mobile-sidebar",+ }),+ h(+ "div",+ {+ id: "bb-layout-main",+ ref: mainContainer,+ },+ [+ h("div", {+ ref: content,+ "data-testid": "shell-content",+ }),+ ]+ ),+ h("div", {+ ref: quickstart,+ "data-testid": "shell-quickstart",+ }),+ ]);+ },+ }),+ };+});++vi.mock("@/components/Permission/RoutePermissionGuard.vue", async () => {+ const { defineComponent, h } = await import("vue");+ return {+ default: defineComponent({+ name: "MockRoutePermissionGuard",+ setup(_, { slots, attrs }) {+ return () =>+ h(+ "div",+ {+ "data-testid": "permission-guard",+ class: attrs.class,+ },+ slots.default?.()+ );+ },+ }),+ };+});++vi.mock("@/components/Quickstart.vue", async () => {+ const { defineComponent, h } = await import("vue");+ return {+ default: defineComponent({+ name: "MockQuickstart",+ setup() {+ return () => h("div", { "data-testid": "quickstart" }, "quickstart");+ },+ }),+ };+});++vi.mock("@/components/AgentWindowMount.vue", async () => {+ const { defineComponent, h } = await import("vue");+ return {+ default: defineComponent({+ name: "MockAgentWindowMount",+ setup() {+ return () => h("div", { "data-testid": "agent-window" });+ },+ }),+ };+});++vi.mock("@/components/ReleaseRemindModal.vue", async () => {+ const { defineComponent, h } = await import("vue");+ return {+ default: defineComponent({+ name: "MockReleaseRemindModal",+ emits: ["cancel"],+ setup() {+ return () => h("div", { "data-testid": "release-remind-modal" });+ },+ }),+ };+});++vi.mock("@/plugins/i18n", () => ({+ t: (key: string) => key,+}));++vi.mock("@/router/dashboard/environmentV1", () => ({+ default: [],+}));++vi.mock("@/router/dashboard/instance", () => ({+ default: [],+}));++vi.mock("@/router/dashboard/workspace", () => ({+ default: [],+}));++vi.mock("@/router/dashboard/workspaceSetting", () => ({+ default: [],+}));++vi.mock("@/router/dashboard/workspaceRoutes", () => ({+ WORKSPACE_ROOT_MODULE: "workspace.root",+}));++vi.mock("@/store", () => ({+ pushNotification: mocks.pushNotification,+ useActuatorV1Store: () => ({+ tryToRemindRelease: mocks.tryToRemindRelease,+ tryToRemindRefresh: mocks.tryToRemindRefresh,+ }),+ usePermissionStore: () => ({+ currentRolesInWorkspace: new Set<string>(),+ }),+ useSubscriptionV1Store: () => ({+ currentPlan: 0,+ }),+}));++vi.mock("@/types", () => ({+ PresetRoleType: {+ WORKSPACE_ADMIN: "WORKSPACE_ADMIN",+ },+}));++vi.mock("@/types/proto-es/v1/subscription_service_pb", () => ({+ PlanType: {+ ENTERPRISE: 1,+ },+}));++import BodyLayout from "./BodyLayout.vue";+import IssuesLayout from "./IssuesLayout.vue";++const SidebarView = defineComponent({+ name: "SidebarView",+ setup() {+ return () => h("div", { "data-testid": "sidebar-view" }, "sidebar");+ },+});++const ContentView = defineComponent({+ name: "ContentView",+ setup() {+ const context = useBodyLayoutContext();+ return () =>+ h("div", { "data-testid": "content-view" }, [+ "content:",+ context.mainContainerRef.value ===+ document.getElementById("bb-layout-main")+ ? "connected"+ : "missing",+ ]);+ },+});++async function mountRouteTree(+ routes: Parameters<typeof createRouter>[0]["routes"]+) {+ const router = createRouter({+ history: createMemoryHistory(),+ routes,+ });+ await router.push("/target");+ await router.isReady();++ const wrapper = mount(RouterView, {+ attachTo: document.body,+ global: {+ plugins: [router],+ },+ });+ await nextTick();+ return wrapper;+}++beforeEach(() => {+ mocks.width.value = 1024;+ mocks.pushNotification.mockClear();+ mocks.tryToRemindRefresh.mockClear();+ mocks.tryToRemindRelease.mockClear();+});++afterEach(() => {+ document.body.innerHTML = "";+});++describe("layout bridges", () => {+ test("BodyLayout teleports sidebar, content, and quickstart into the shell", async () => {+ const wrapper = await mountRouteTree([+ {+ path: "/",+ component: BodyLayout,+ children: [+ {+ path: "target",+ name: "workspace.projects",+ components: {+ leftSidebar: SidebarView,+ content: ContentView,+ },+ },+ ],+ },+ ]);++ expect(+ document.querySelector(+ '[data-testid="shell-desktop-sidebar"] [data-testid="sidebar-view"]'+ )+ ).not.toBeNull();+ expect(+ document.querySelector(+ '[data-testid="shell-content"] [data-testid="permission-guard"] [data-testid="content-view"]'+ )?.textContent+ ).toContain("connected");+ expect(+ document.querySelector(+ '[data-testid="shell-quickstart"] [data-testid="quickstart"]'+ )+ ).not.toBeNull();++ wrapper.unmount();+ });++ test("IssuesLayout reuses the shell without teleporting sidebar content", async () => {+ const wrapper = await mountRouteTree([+ {+ path: "/",+ component: IssuesLayout,+ children: [+ {+ path: "target",+ name: "issues.target",+ components: {+ leftSidebar: SidebarView,+ content: ContentView,+ },+ },+ ],+ },+ ]);++ expect(+ document.querySelector(+ '[data-testid="shell-desktop-sidebar"] [data-testid="sidebar-view"]'+ )+ ).toBeNull();+ expect(+ document.querySelector(+ '[data-testid="shell-content"] [data-testid="content-view"]'+ )?.textContent+ ).toContain("connected");++ wrapper.unmount();+ });+});diff --git a/frontend/src/locales/en-US.json b/frontend/src/locales/en-US.jsonindex ea991de01a..eb533a0fc5 100644--- a/frontend/src/locales/en-US.json+++ b/frontend/src/locales/en-US.json@@ -1725,7 +1725,6 @@"create-project": "Create Project","from-projects": "From other projects","from-unassigned-databases": "Unassigned databases",- "new-project": "New Project","request-export-data": "Request Export","transfer-in-db-title": "Transfer in database","unassigned-db-hint": "Newly synced databases start unassigned and must be moved to a project for use."diff --git a/frontend/src/locales/es-ES.json b/frontend/src/locales/es-ES.jsonindex 7fafe2f50d..3b315ea285 100644--- a/frontend/src/locales/es-ES.json+++ b/frontend/src/locales/es-ES.json@@ -1725,7 +1725,6 @@"create-project": "Crear Proyecto","from-projects": "De otro proyecto","from-unassigned-databases": "Bases de datos no asignadas",- "new-project": "Nuevo Proyecto","request-export-data": "Solicitar exportación","transfer-in-db-title": "Transferir base de datos","unassigned-db-hint": "Las bases de datos recién sincronizadas comienzan sin asignar y deben ser asignadas a un proyecto para su uso."diff --git a/frontend/src/locales/ja-JP.json b/frontend/src/locales/ja-JP.jsonindex ae8eab4554..01309b5447 100644--- a/frontend/src/locales/ja-JP.json+++ b/frontend/src/locales/ja-JP.json@@ -1725,7 +1725,6 @@"create-project": "作成するプロジェクト","from-projects": "他のプロジェクトから","from-unassigned-databases": "割り当てられていないデータベース",- "new-project": "作成するプロジェクト","request-export-data": "データ出力を申請する","transfer-in-db-title": "データベースへの転送","unassigned-db-hint": "新しく同期されたデータベースは最初は割り当てられていないため、使用するにはプロジェクトに移動する必要があります。"diff --git a/frontend/src/locales/vi-VN.json b/frontend/src/locales/vi-VN.jsonindex 67aab99b0b..91ba44162e 100644--- a/frontend/src/locales/vi-VN.json+++ b/frontend/src/locales/vi-VN.json@@ -1725,7 +1725,6 @@"create-project": "Tạo Dự án","from-projects": "Từ các dự án khác","from-unassigned-databases": "Cơ sở dữ liệu chưa được gán",- "new-project": "Mới Dự án","request-export-data": "Yêu cầu Xuất","transfer-in-db-title": "Chuyển vào cơ sở dữ liệu","unassigned-db-hint": "Các cơ sở dữ liệu mới được đồng bộ hóa bắt đầu chưa được gán và phải được chuyển đến một dự án để sử dụng."diff --git a/frontend/src/locales/zh-CN.json b/frontend/src/locales/zh-CN.jsonindex 5bb3012d5e..442b9cc32b 100644--- a/frontend/src/locales/zh-CN.json+++ b/frontend/src/locales/zh-CN.json@@ -1725,7 +1725,6 @@"create-project": "创建项目","from-projects": "从其他项目","from-unassigned-databases": "未分配的数据库",- "new-project": "创建项目","request-export-data": "申请导出数据","transfer-in-db-title": "转进数据库","unassigned-db-hint": "新同步的数据库起先是未分配的状态,必须移至一个项目以供使用。"diff --git a/frontend/src/react/LandingPageMount.vue b/frontend/src/react/LandingPageMount.vueindex e44d3bae64..86d038acba 100644--- a/frontend/src/react/LandingPageMount.vue+++ b/frontend/src/react/LandingPageMount.vue@@ -1,21 +1,7 @@<template>- <ReactPageMount page="LandingPage" v-bind="pageProps" />- <ProjectSwitchModal- :show="showProjectModal"- @dismiss="showProjectModal = false"- />+ <ReactPageMount page="LandingPage" /></template><script lang="ts" setup>-import { ref } from "vue";-import ProjectSwitchModal from "@/components/Project/ProjectSwitch/ProjectSwitchModal.vue";import ReactPageMount from "./ReactPageMount.vue";--const showProjectModal = ref(false);--const pageProps = {- onOpenProjectSwitch: () => {- showProjectModal.value = true;- },-};</script>diff --git a/frontend/src/react/ReactPageMount.vue b/frontend/src/react/ReactPageMount.vueindex 54e771f937..9f2783a2f5 100644--- a/frontend/src/react/ReactPageMount.vue+++ b/frontend/src/react/ReactPageMount.vue@@ -10,6 +10,7 @@ import { useI18n } from "vue-i18n";const props = defineProps<{page: string;+ pageProps?: Record<string, unknown>;}>();const attrs = useAttrs();@@ -20,7 +21,13 @@ let root: any = null; // eslint-disable-line @typescript-eslint/no-explicit-anyconst pageProps = computed(() => {const a = attrs as Record<string, unknown>;- return Object.keys(a).length > 0 ? { ...a } : undefined;+ if (props.pageProps || Object.keys(a).length > 0) {+ return {+ ...props.pageProps,+ ...a,+ };+ }+ return undefined;});let currentPage = "";diff --git a/frontend/src/react/components/BytebaseLogo.test.tsx b/frontend/src/react/components/BytebaseLogo.test.tsxindex cebe84dbad..0c19b50737 100644--- a/frontend/src/react/components/BytebaseLogo.test.tsx+++ b/frontend/src/react/components/BytebaseLogo.test.tsx@@ -9,16 +9,41 @@ import { beforeEach, describe, expect, test, vi } from "vitest";const mocks = vi.hoisted(() => ({useVueState: vi.fn<(getter: () => unknown) => unknown>(),+ record: vi.fn(),+ push: vi.fn(),+ resolve: vi.fn(() => ({ fullPath: "/landing" })),}));vi.mock("@/react/hooks/useVueState", () => ({useVueState: mocks.useVueState,}));+vi.mock("react-i18next", () => ({+ useTranslation: () => ({+ t: (key: string) =>+ ({+ "settings.general.workspace.logo": "Logo",+ })[key] ?? key,+ }),+}));+vi.mock("@/store", () => ({useWorkspaceV1Store: vi.fn(),}));+vi.mock("@/router", () => ({+ router: {+ push: mocks.push,+ resolve: mocks.resolve,+ },+}));++vi.mock("@/router/useRecentVisit", () => ({+ useRecentVisit: () => ({+ record: mocks.record,+ }),+}));+vi.mock("@/assets/logo-full.svg", () => ({default: "/assets/logo-full.svg",}));@@ -57,7 +82,7 @@ describe("BytebaseLogo", () => {const img = container.querySelector("img");expect(img).not.toBeNull();expect(img?.getAttribute("src")).toBe("https://example.com/logo.png");- expect(img?.getAttribute("alt")).toBe("branding logo");+ expect(img?.getAttribute("alt")).toBe("Logo");unmount();});@@ -73,4 +98,23 @@ describe("BytebaseLogo", () => {expect(img?.getAttribute("alt")).toBe("Bytebase");unmount();});++ test("records and navigates when a redirect is provided", () => {+ mocks.useVueState.mockReturnValue("");+ const { container, render, unmount } = renderIntoContainer(+ <BytebaseLogo redirect="workspace.landing" />+ );+ render();++ const button = container.querySelector("button");+ expect(button).not.toBeNull();+ act(() => {+ button?.dispatchEvent(new MouseEvent("click", { bubbles: true }));+ });++ expect(mocks.resolve).toHaveBeenCalledWith({ name: "workspace.landing" });+ expect(mocks.record).toHaveBeenCalledWith("/landing");+ expect(mocks.push).toHaveBeenCalled();+ unmount();+ });});diff --git a/frontend/src/react/components/BytebaseLogo.tsx b/frontend/src/react/components/BytebaseLogo.tsxindex 37b3fdf466..c73977507a 100644--- a/frontend/src/react/components/BytebaseLogo.tsx+++ b/frontend/src/react/components/BytebaseLogo.tsx@@ -1,6 +1,9 @@+import { useTranslation } from "react-i18next";import logoFull from "@/assets/logo-full.svg";import { useVueState } from "@/react/hooks/useVueState";import { cn } from "@/react/lib/utils";+import { router } from "@/router";+import { useRecentVisit } from "@/router/useRecentVisit";import { useWorkspaceV1Store } from "@/store";type Props = {@@ -13,16 +16,33 @@ type Props = {* Replaces frontend/src/components/BytebaseLogo.vue. Shows the workspace's* custom logo when set, otherwise the bundled Bytebase fallback SVG.*- * The `redirect` prop is supported for future callers. It is not used by- * the SQL Editor Welcome screen. Router-link behavior will be added when- * the first React caller needs it.*/-export function BytebaseLogo({ className }: Props) {+export function BytebaseLogo({ className, redirect }: Props) {+ const { t } = useTranslation();const workspaceStore = useWorkspaceV1Store();+ const { record } = useRecentVisit();const customLogo = useVueState(() => workspaceStore.currentWorkspace?.logo ?? "");+ const content = (+ <span className="h-full w-full select-none flex flex-row justify-center items-center">+ {customLogo ? (+ <img+ src={customLogo}+ alt={t("settings.general.workspace.logo")}+ className="h-full object-contain"+ />+ ) : (+ <img+ src={logoFull}+ alt="Bytebase"+ className="h-8 md:h-10 w-auto object-contain"+ />+ )}+ </span>+ );+return (<divclassName={cn(@@ -30,21 +50,21 @@ export function BytebaseLogo({ className }: Props) {className)}>- <span className="h-full w-full select-none flex flex-row justify-center items-center">- {customLogo ? (- <img- src={customLogo}- alt="branding logo"- className="h-full object-contain"- />- ) : (- <img- src={logoFull}- alt="Bytebase"- className="h-8 md:h-10 w-auto object-contain"- />- )}- </span>+ {redirect ? (+ <button+ type="button"+ className="h-full w-full cursor-pointer"+ onClick={() => {+ const route = router.resolve({ name: redirect });+ record(route.fullPath);+ void router.push(route);+ }}+ >+ {content}+ </button>+ ) : (+ content+ )}</div>);}diff --git a/frontend/src/react/components/DashboardBodyShell.test.tsx b/frontend/src/react/components/DashboardBodyShell.test.tsxnew file mode 100644index 0000000000..531b8e3526--- /dev/null+++ b/frontend/src/react/components/DashboardBodyShell.test.tsx@@ -0,0 +1,251 @@+import { act } from "react";+import { createRoot, type Root } from "react-dom/client";+import { afterEach, describe, expect, test, vi } from "vitest";+import type {+ DashboardBodyShellProps,+ DashboardShellTargets,+} from "@/react/dashboard-shell";+import { DashboardBodyShell } from "./DashboardBodyShell";++(+ globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }+).IS_REACT_ACT_ENVIRONMENT = true;++vi.mock("@/react/components/header/DashboardHeader", () => ({+ DashboardHeader: ({+ showLogo,+ showMobileSidebarToggle,+ onOpenMobileSidebar,+ }: {+ showLogo: boolean;+ showMobileSidebarToggle?: boolean;+ onOpenMobileSidebar?: () => void;+ }) => (+ <button+ type="button"+ data-testid="dashboard-header"+ data-show-logo={String(showLogo)}+ data-show-mobile-toggle={String(showMobileSidebarToggle)}+ onClick={onOpenMobileSidebar}+ />+ ),+}));++function setWindowWidth(width: number) {+ act(() => {+ Object.defineProperty(window, "innerWidth", {+ configurable: true,+ writable: true,+ value: width,+ });+ window.dispatchEvent(new Event("resize"));+ });+}++function createShellHarness(+ props: Partial<DashboardBodyShellProps> = {},+ onReady = vi.fn<(targets: DashboardShellTargets) => void>()+) {+ const container = document.createElement("div");+ document.body.appendChild(container);+ const root = createRoot(container);++ const render = (nextProps: Partial<DashboardBodyShellProps> = {}) => {+ act(() => {+ root.render(+ <DashboardBodyShell+ variant="workspace"+ routeKey="/"+ onReady={onReady}+ {...props}+ {...nextProps}+ />+ );+ });+ };++ const unmount = () => {+ act(() => {+ root.unmount();+ });+ container.remove();+ };++ return {+ container,+ onReady,+ render,+ unmount,+ };+}++function getLastTargets(mock: ReturnType<typeof vi.fn>) {+ const targets = mock.mock.lastCall?.[0] as DashboardShellTargets | undefined;+ expect(targets).toBeDefined();+ if (!targets) {+ throw new Error("Expected onReady to receive shell targets");+ }+ return targets;+}++afterEach(() => {+ document.body.innerHTML = "";+ setWindowWidth(1024);+});++describe("DashboardBodyShell", () => {+ test("keeps stable shell selectors and reports targets", () => {+ setWindowWidth(1024);+ const harness = createShellHarness();+ harness.render();++ const targets = getLastTargets(harness.onReady);+ expect(targets.desktopSidebar).toBeInstanceOf(HTMLDivElement);+ expect(targets.mobileSidebar).toBeInstanceOf(HTMLDivElement);+ expect(targets.content).toBeInstanceOf(HTMLDivElement);+ expect(targets.quickstart).toBeInstanceOf(HTMLDivElement);+ expect(targets.mainContainer?.id).toBe("bb-layout-main");+ expect(+ harness.container.querySelector('[data-label="bb-main-body-wrapper"]')+ ).not.toBeNull();+ expect(+ harness.container.querySelector('[data-label="bb-dashboard-header"]')+ ).not.toBeNull();+ expect(+ harness.container.querySelector(+ '[data-testid="dashboard-header"][data-show-logo="false"][data-show-mobile-toggle="true"]'+ )+ ).not.toBeNull();+ expect(+ harness.container.querySelector(+ '[data-label="bb-dashboard-static-sidebar"]'+ )+ ).not.toBeNull();++ harness.unmount();+ });++ test("switches sidebar visibility between desktop and mobile layouts", () => {+ setWindowWidth(500);+ const harness = createShellHarness();+ harness.render();++ const targets = getLastTargets(harness.onReady);+ const desktopAside = harness.container.querySelector(+ '[data-label="bb-dashboard-static-sidebar"]'+ );+ expect(desktopAside?.className).toContain("hidden");+ expect(targets.mobileSidebar?.parentElement?.className).toContain(+ "-translate-x-full"+ );++ setWindowWidth(1024);+ harness.render();+ expect(desktopAside?.className).toContain("flex");+ expect(targets.mobileSidebar?.parentElement?.className).toContain(+ "-translate-x-full"+ );++ harness.unmount();+ });++ test("opens the mobile sidebar when the header toggle is clicked", () => {+ setWindowWidth(500);+ const harness = createShellHarness();+ harness.render();++ let targets = getLastTargets(harness.onReady);+ expect(targets.mobileSidebar?.parentElement?.className).toContain(+ "-translate-x-full"+ );++ const headerButton = harness.container.querySelector(+ '[data-testid="dashboard-header"]'+ ) as HTMLButtonElement | null;+ expect(headerButton).not.toBeNull();+ act(() => {+ headerButton?.click();+ });+ targets = getLastTargets(harness.onReady);+ expect(targets.mobileSidebar?.parentElement?.className).toContain(+ "translate-x-0"+ );++ harness.unmount();+ });++ test("closes the mobile sidebar when the route key changes", () => {+ setWindowWidth(500);+ const harness = createShellHarness();+ harness.render({ routeKey: "/a" });++ const headerButton = harness.container.querySelector(+ '[data-testid="dashboard-header"]'+ ) as HTMLButtonElement | null;+ act(() => {+ headerButton?.click();+ });++ let targets = getLastTargets(harness.onReady);+ expect(targets.mobileSidebar?.parentElement?.className).toContain(+ "translate-x-0"+ );++ harness.render({ routeKey: "/b" });+ targets = getLastTargets(harness.onReady);+ expect(targets.mobileSidebar?.parentElement?.className).toContain(+ "-translate-x-full"+ );++ harness.unmount();+ });++ test("returns null sidebar and header targets for workspace root", () => {+ const harness = createShellHarness({ isRootPath: true });+ harness.render();++ const targets = getLastTargets(harness.onReady);+ expect(targets.desktopSidebar).toBeNull();+ expect(targets.mobileSidebar).toBeNull();+ expect(targets.content).toBeInstanceOf(HTMLDivElement);+ expect(+ harness.container.querySelector('[data-testid="dashboard-header"]')+ ).toBeNull();++ harness.unmount();+ });++ test("uses the issues variant without sidebar targets", () => {+ const container = document.createElement("div");+ document.body.appendChild(container);+ const root: Root = createRoot(container);+ const onReady = vi.fn<(targets: DashboardShellTargets) => void>();++ act(() => {+ root.render(+ <DashboardBodyShell+ variant="issues"+ routeKey="/issues"+ onReady={onReady}+ />+ );+ });++ const targets = getLastTargets(onReady);+ expect(targets.desktopSidebar).toBeNull();+ expect(targets.mobileSidebar).toBeNull();+ expect(+ container.querySelector('[data-label="bb-main-body-wrapper"]')?.className+ ).toContain("border-x");+ expect(+ container.querySelector(+ '[data-testid="dashboard-header"][data-show-logo="true"][data-show-mobile-toggle="false"]'+ )+ ).not.toBeNull();++ act(() => {+ root.unmount();+ });+ container.remove();+ });+});diff --git a/frontend/src/react/components/DashboardBodyShell.tsx b/frontend/src/react/components/DashboardBodyShell.tsxnew file mode 100644index 0000000000..24a19b2f61--- /dev/null+++ b/frontend/src/react/components/DashboardBodyShell.tsx@@ -0,0 +1,155 @@+import { useEffect, useRef, useState, useSyncExternalStore } from "react";+import { useTranslation } from "react-i18next";+import { DashboardHeader } from "@/react/components/header/DashboardHeader";+import type {+ DashboardBodyShellProps,+ DashboardShellTargets,+} from "@/react/dashboard-shell";+import { cn } from "@/react/lib/utils";++function subscribeToViewport(onStoreChange: () => void) {+ window.addEventListener("resize", onStoreChange);+ return () => window.removeEventListener("resize", onStoreChange);+}++function getDesktopSnapshot() {+ return window.innerWidth >= 768;+}++function getServerDesktopSnapshot() {+ return true;+}++function useDesktopViewport() {+ return useSyncExternalStore(+ subscribeToViewport,+ getDesktopSnapshot,+ getServerDesktopSnapshot+ );+}++export function DashboardBodyShell({+ variant,+ isRootPath = false,+ routeKey = "",+ onReady,+}: DashboardBodyShellProps) {+ const { t } = useTranslation();+ const desktopSidebarRef = useRef<HTMLDivElement>(null);+ const mobileSidebarRef = useRef<HTMLDivElement>(null);+ const contentRef = useRef<HTMLDivElement>(null);+ const quickstartRef = useRef<HTMLDivElement>(null);+ const mainContainerRef = useRef<HTMLDivElement>(null);+ const isDesktop = useDesktopViewport();+ const [isMobileSidebarOpen, setIsMobileSidebarOpen] = useState(false);++ const showWorkspaceChrome = variant === "workspace" && !isRootPath;+ const showHeader = variant === "issues" || showWorkspaceChrome;++ useEffect(() => {+ setIsMobileSidebarOpen(false);+ }, [routeKey]);++ useEffect(() => {+ if (isDesktop) {+ setIsMobileSidebarOpen(false);+ }+ }, [isDesktop]);++ useEffect(() => {+ const targets: DashboardShellTargets = {+ desktopSidebar: showWorkspaceChrome ? desktopSidebarRef.current : null,+ mobileSidebar: showWorkspaceChrome ? mobileSidebarRef.current : null,+ content: contentRef.current,+ quickstart: quickstartRef.current,+ mainContainer: mainContainerRef.current,+ };+ onReady?.(targets);+ }, [isDesktop, onReady, showHeader, showWorkspaceChrome, variant]);++ return (+ <div className="flex h-full flex-col overflow-hidden">+ <div className="flex flex-1 overflow-hidden">+ {showWorkspaceChrome ? (+ <>+ <div+ className={cn(+ "fixed inset-0 z-40 md:hidden",+ isMobileSidebarOpen ? "" : "pointer-events-none"+ )}+ >+ <button+ aria-label={t("common.close-mobile-sidebar")}+ className={cn(+ "absolute inset-0 bg-black/20 transition-opacity",+ isMobileSidebarOpen ? "opacity-100" : "opacity-0"+ )}+ type="button"+ onClick={() => setIsMobileSidebarOpen(false)}+ />+ <div+ className={cn(+ "absolute inset-y-0 left-0 w-52 bg-control-bg transition-transform",+ isMobileSidebarOpen ? "translate-x-0" : "-translate-x-full"+ )}+ >+ <div+ ref={mobileSidebarRef}+ className="h-full overflow-y-auto bg-control-bg"+ />+ </div>+ </div>++ <aside+ className={cn("shrink-0", isDesktop ? "flex" : "hidden")}+ data-label="bb-dashboard-static-sidebar"+ >+ <div className="flex w-52 flex-col bg-control-bg">+ <div+ ref={desktopSidebarRef}+ className="flex flex-1 flex-col overflow-y-auto py-0"+ />+ </div>+ </aside>+ </>+ ) : null}++ <div+ className={cn(+ "flex min-w-0 flex-1 flex-col",+ variant === "issues" ? "border-x border-block-border" : ""+ )}+ data-label="bb-main-body-wrapper"+ >+ {showHeader ? (+ <nav+ className="border-b border-block-border bg-white"+ data-label="bb-dashboard-header"+ >+ <div className="mx-auto max-w-full">+ <DashboardHeader+ showLogo={variant === "issues"}+ showMobileSidebarToggle={showWorkspaceChrome}+ onOpenMobileSidebar={() => setIsMobileSidebarOpen(true)}+ />+ </div>+ </nav>+ ) : null}++ <div+ id="bb-layout-main"+ ref={mainContainerRef}+ className={cn(+ "flex-1 overflow-y-auto",+ variant === "workspace" ? "md:min-w-0" : "min-w-0"+ )}+ >+ <div ref={contentRef} />+ </div>+ </div>+ </div>++ <div ref={quickstartRef} />+ </div>+ );+}diff --git a/frontend/src/react/components/DashboardFrameShell.test.tsx b/frontend/src/react/components/DashboardFrameShell.test.tsxnew file mode 100644index 0000000000..71ddd8e940--- /dev/null+++ b/frontend/src/react/components/DashboardFrameShell.test.tsx@@ -0,0 +1,32 @@+import { act } from "react";+import { createRoot } from "react-dom/client";+import { describe, expect, test, vi } from "vitest";+import { DashboardFrameShell } from "./DashboardFrameShell";++(+ globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }+).IS_REACT_ACT_ENVIRONMENT = true;++describe("DashboardFrameShell", () => {+ test("reports stable banner and body targets", () => {+ const container = document.createElement("div");+ document.body.appendChild(container);+ const root = createRoot(container);+ const onReady = vi.fn();++ act(() => {+ root.render(<DashboardFrameShell onReady={onReady} />);+ });++ expect(onReady).toHaveBeenCalled();+ const targets = onReady.mock.lastCall?.[0];+ expect(targets.banner).toBeInstanceOf(HTMLDivElement);+ expect(targets.body).toBeInstanceOf(HTMLDivElement);+ expect(container.querySelector(".h-screen")).not.toBeNull();++ act(() => {+ root.unmount();+ });+ container.remove();+ });+});diff --git a/frontend/src/react/components/DashboardFrameShell.tsx b/frontend/src/react/components/DashboardFrameShell.tsxnew file mode 100644index 0000000000..f188eb1252--- /dev/null+++ b/frontend/src/react/components/DashboardFrameShell.tsx@@ -0,0 +1,21 @@+import { useEffect, useRef } from "react";+import type { DashboardFrameShellProps } from "@/react/dashboard-shell";++export function DashboardFrameShell({ onReady }: DashboardFrameShellProps) {+ const bannerRef = useRef<HTMLDivElement>(null);+ const bodyRef = useRef<HTMLDivElement>(null);++ useEffect(() => {+ onReady?.({+ banner: bannerRef.current,+ body: bodyRef.current,+ });+ }, [onReady]);++ return (+ <div className="relative flex h-screen flex-col overflow-hidden">+ <div ref={bannerRef} />+ <div ref={bodyRef} className="min-h-0 flex-1" />+ </div>+ );+}diff --git a/frontend/src/react/components/HeaderProfileMenuMount.tsx b/frontend/src/react/components/HeaderProfileMenuMount.tsxnew file mode 100644index 0000000000..a9aa8a73d2--- /dev/null+++ b/frontend/src/react/components/HeaderProfileMenuMount.tsx@@ -0,0 +1,9 @@+import { ProfileMenuTrigger } from "@/react/components/header/ProfileMenuTrigger";++export function HeaderProfileMenuMount({+ size = "small",+}: {+ size?: "small" | "medium";+}) {+ return <ProfileMenuTrigger size={size} link />;+}diff --git a/frontend/src/react/components/header/DashboardHeader.test.tsx b/frontend/src/react/components/header/DashboardHeader.test.tsxnew file mode 100644index 0000000000..14668cf303--- /dev/null+++ b/frontend/src/react/components/header/DashboardHeader.test.tsx@@ -0,0 +1,216 @@+import type { ReactElement } from "react";+import { act } from "react";+import { createRoot } from "react-dom/client";+import { beforeEach, describe, expect, test, vi } from "vitest";+import { WORKSPACE_ROUTE_MY_ISSUES } from "@/router/dashboard/workspaceRoutes";+import { SQL_EDITOR_DATABASE_MODULE } from "@/router/sqlEditor";+import { PlanType } from "@/types/proto-es/v1/subscription_service_pb";++(+ globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }+).IS_REACT_ACT_ENVIRONMENT = true;++const mocks = vi.hoisted(() => ({+ record: vi.fn(),+ toggleAgent: vi.fn(),+ resolve: vi.fn(({ name }: { name: string }) => ({+ href: `/${name}`,+ fullPath: `/${name}`,+ })),+ push: vi.fn(),+ currentPlan: 0,+ currentRoute: {+ value: {+ params: {+ projectId: "sample-project",+ instanceId: "prod",+ databaseName: "db",+ },+ },+ },+}));++vi.mock("react-i18next", () => ({+ useTranslation: () => ({+ t: (key: string) =>+ ({+ "agent.self": "Agent",+ "common.want-help": "Want help",+ "sql-editor.self": "SQL Editor",+ "issue.my-issues": "My Issues",+ })[key] ?? key,+ }),+}));++vi.mock("@/react/hooks/useVueState", () => ({+ useVueState: (getter: () => unknown) => getter(),+}));++vi.mock("@/react/components/BytebaseLogo", () => ({+ BytebaseLogo: ({ redirect }: { redirect?: string }) => (+ <div data-testid="bytebase-logo" data-redirect={redirect} />+ ),+}));++vi.mock("@/react/components/header/ProjectSwitchPopover", () => ({+ ProjectSwitchPopover: () => <div data-testid="project-switch-popover" />,+}));++vi.mock("@/react/components/header/ProfileMenuTrigger", () => ({+ ProfileMenuTrigger: () => <div data-testid="profile-menu-trigger" />,+}));++vi.mock("@/router", () => ({+ router: {+ currentRoute: mocks.currentRoute,+ resolve: mocks.resolve,+ push: mocks.push,+ },+}));++vi.mock("@/router/dashboard/workspaceRoutes", () => ({+ WORKSPACE_ROUTE_LANDING: "workspace.landing",+ WORKSPACE_ROUTE_MY_ISSUES: "workspace.my-issues",+}));++vi.mock("@/router/sqlEditor", () => ({+ SQL_EDITOR_HOME_MODULE: "sql-editor.home",+ SQL_EDITOR_PROJECT_MODULE: "sql-editor.project",+ SQL_EDITOR_DATABASE_MODULE: "sql-editor.database",+}));++vi.mock("@/router/useRecentVisit", () => ({+ useRecentVisit: () => ({+ record: mocks.record,+ }),+}));++vi.mock("@/utils", () => ({+ STORAGE_KEY_MY_ISSUES_TAB: "bb.components.MY_ISSUES.id",+}));++vi.mock("@/store", () => ({+ useSubscriptionV1Store: () => ({+ currentPlan: mocks.currentPlan,+ }),+}));++vi.mock("@/react/plugins/agent/store/agent", () => ({+ useAgentStore: {+ getState: () => ({+ toggle: mocks.toggleAgent,+ }),+ },+}));++let DashboardHeader: typeof import("./DashboardHeader").DashboardHeader;++const renderIntoContainer = (element: ReactElement) => {+ const container = document.createElement("div");+ document.body.appendChild(container);+ const root = createRoot(container);+ return {+ container,+ render: () => {+ act(() => {+ root.render(element);+ });+ },+ unmount: () =>+ act(() => {+ root.unmount();+ container.remove();+ }),+ };+};++beforeEach(async () => {+ vi.clearAllMocks();+ Object.defineProperty(window, "innerWidth", {+ configurable: true,+ writable: true,+ value: 1024,+ });+ window.open = vi.fn();+ mocks.currentPlan = PlanType.FREE;+ mocks.currentRoute.value = {+ params: {+ projectId: "sample-project",+ instanceId: "prod",+ databaseName: "db",+ },+ };+ ({ DashboardHeader } = await import("./DashboardHeader"));+});++describe("DashboardHeader", () => {+ test("renders logo, toggle, and shared entrypoints", () => {+ const onOpenMobileSidebar = vi.fn();+ const { container, render, unmount } = renderIntoContainer(+ <DashboardHeader+ showLogo+ showMobileSidebarToggle+ onOpenMobileSidebar={onOpenMobileSidebar}+ />+ );++ render();++ expect(+ container.querySelector('[data-testid="bytebase-logo"]')+ ).not.toBeNull();+ expect(+ container.querySelector('[data-testid="project-switch-popover"]')+ ).not.toBeNull();+ expect(+ container.querySelector('[data-testid="profile-menu-trigger"]')+ ).not.toBeNull();++ const toggleButton = container.querySelector(+ ".md\\:hidden"+ ) as HTMLButtonElement | null;+ expect(toggleButton).not.toBeNull();+ act(() => {+ toggleButton?.click();+ });+ expect(onOpenMobileSidebar).toHaveBeenCalledTimes(1);++ unmount();+ });++ test("routes sql editor and my issues actions correctly", () => {+ const { container, render, unmount } = renderIntoContainer(+ <DashboardHeader showLogo={false} />+ );++ render();++ const sqlEditorButton = Array.from(+ container.querySelectorAll("button")+ ).find((button) => button.textContent?.includes("SQL Editor"));+ expect(sqlEditorButton).not.toBeUndefined();+ act(() => {+ sqlEditorButton?.click();+ });+ expect(window.open).toHaveBeenCalledWith(+ `/${SQL_EDITOR_DATABASE_MODULE}`,+ "_blank",+ "noopener,noreferrer"+ );++ const myIssuesButton = Array.from(+ container.querySelectorAll("button")+ ).find((button) => button.textContent?.includes("My Issues"));+ expect(myIssuesButton).not.toBeUndefined();+ act(() => {+ myIssuesButton?.click();+ });+ expect(mocks.record).toHaveBeenCalledWith(`/${WORKSPACE_ROUTE_MY_ISSUES}`);+ expect(mocks.push).toHaveBeenCalledWith({+ name: WORKSPACE_ROUTE_MY_ISSUES,+ });+ expect(localStorage.getItem("bb.components.MY_ISSUES.id")).not.toBeNull();++ unmount();+ });+});diff --git a/frontend/src/react/components/header/DashboardHeader.tsx b/frontend/src/react/components/header/DashboardHeader.tsxnew file mode 100644index 0000000000..a71aceb5c4--- /dev/null+++ b/frontend/src/react/components/header/DashboardHeader.tsx@@ -0,0 +1,187 @@+import {+ Bot,+ CircleDot,+ Menu,+ MessagesSquare,+ SquareTerminal,+} from "lucide-react";+import { useMemo, useSyncExternalStore } from "react";+import { useTranslation } from "react-i18next";+import { v4 as uuidv4 } from "uuid";+import { BytebaseLogo } from "@/react/components/BytebaseLogo";+import { Button } from "@/react/components/ui/button";+import { useVueState } from "@/react/hooks/useVueState";+import { router } from "@/router";+import {+ WORKSPACE_ROUTE_LANDING,+ WORKSPACE_ROUTE_MY_ISSUES,+} from "@/router/dashboard/workspaceRoutes";+import {+ SQL_EDITOR_DATABASE_MODULE,+ SQL_EDITOR_HOME_MODULE,+ SQL_EDITOR_PROJECT_MODULE,+} from "@/router/sqlEditor";+import { useRecentVisit } from "@/router/useRecentVisit";+import { useSubscriptionV1Store } from "@/store";+import { PlanType } from "@/types/proto-es/v1/subscription_service_pb";+import { STORAGE_KEY_MY_ISSUES_TAB } from "@/utils";+import { ProfileMenuTrigger } from "./ProfileMenuTrigger";+import { ProjectSwitchPopover } from "./ProjectSwitchPopover";++export interface DashboardHeaderProps {+ showLogo: boolean;+ showMobileSidebarToggle?: boolean;+ onOpenMobileSidebar?: () => void;+}++function subscribeToViewport(onStoreChange: () => void) {+ window.addEventListener("resize", onStoreChange);+ return () => window.removeEventListener("resize", onStoreChange);+}++function getWindowWidth() {+ return window.innerWidth;+}++export function DashboardHeader({+ showLogo,+ showMobileSidebarToggle = false,+ onOpenMobileSidebar,+}: DashboardHeaderProps) {+ const { t } = useTranslation();+ const { record } = useRecentVisit();+ const subscriptionStore = useSubscriptionV1Store();++ const currentPlan = useVueState(() => subscriptionStore.currentPlan);+ const route = useVueState(() => router.currentRoute.value);+ const windowWidth = useSyncExternalStore(+ subscribeToViewport,+ getWindowWidth,+ () => 1024+ );+ const isDesktopLabelVisible = windowWidth >= 640;+ const isLargeLabelVisible = windowWidth >= 1024;++ const sqlEditorHref = useMemo(() => {+ const projectId = route.params.projectId as string | undefined;+ const instanceId = route.params.instanceId as string | undefined;+ const databaseName = route.params.databaseName as string | undefined;++ if (projectId) {+ if (instanceId && databaseName) {+ return router.resolve({+ name: SQL_EDITOR_DATABASE_MODULE,+ params: {+ project: projectId,+ instance: instanceId,+ database: databaseName,+ },+ }).href;+ }+ return router.resolve({+ name: SQL_EDITOR_PROJECT_MODULE,+ params: {+ project: projectId,+ },+ }).href;+ }++ return router.resolve({+ name: SQL_EDITOR_HOME_MODULE,+ }).href;+ }, [+ route.params.databaseName,+ route.params.instanceId,+ route.params.projectId,+ ]);++ const myIssueHref = useMemo(+ () =>+ router.resolve({+ name: WORKSPACE_ROUTE_MY_ISSUES,+ }).href,+ []+ );++ return (+ <div className="my-1 flex h-10 items-center justify-between gap-x-1 px-3 sm:gap-x-3 sm:px-4">+ {showLogo ? (+ <BytebaseLogo className="h-10" redirect={WORKSPACE_ROUTE_LANDING} />+ ) : null}++ {showMobileSidebarToggle ? (+ <button+ type="button"+ className="p-1 text-gray-500 hover:text-gray-900 md:hidden"+ onClick={onOpenMobileSidebar}+ >+ <Menu className="h-4 w-4" />+ </button>+ ) : null}++ <ProjectSwitchPopover />++ <div className="flex flex-1 items-center justify-end gap-x-2">+ <Button+ size="sm"+ variant="outline"+ onClick={() => {+ void import("@/react/plugins/agent/store/agent").then(+ ({ useAgentStore }) => {+ useAgentStore.getState().toggle();+ }+ );+ }}+ >+ <Bot className="h-4 w-4" />+ {isDesktopLabelVisible ? <span>{t("agent.self")}</span> : null}+ </Button>++ {currentPlan === PlanType.FREE ? (+ <Button+ size="sm"+ variant="outline"+ className="border-success text-success hover:bg-success/10"+ onClick={() => {+ window.open(+ "https://docs.bytebase.com/faq#how-to-reach-us",+ "_blank"+ );+ }}+ >+ <MessagesSquare className="h-4 w-4" />+ {isLargeLabelVisible ? <span>{t("common.want-help")}</span> : null}+ </Button>+ ) : null}++ <Button+ size="sm"+ variant="outline"+ onClick={() => {+ window.open(sqlEditorHref, "_blank", "noopener,noreferrer");+ }}+ >+ <SquareTerminal className="h-4 w-4" />+ {isDesktopLabelVisible ? (+ <span className="whitespace-nowrap">{t("sql-editor.self")}</span>+ ) : null}+ </Button>++ <Button+ size="sm"+ variant="outline"+ onClick={() => {+ record(myIssueHref);+ localStorage.setItem(STORAGE_KEY_MY_ISSUES_TAB, uuidv4());+ void router.push({ name: WORKSPACE_ROUTE_MY_ISSUES });+ }}+ >+ <CircleDot className="h-4 w-4" />+ {isDesktopLabelVisible ? <span>{t("issue.my-issues")}</span> : null}+ </Button>++ <ProfileMenuTrigger size="medium" link />+ </div>+ </div>+ );+}diff --git a/frontend/src/react/components/header/ProfileMenuTrigger.test.tsx b/frontend/src/react/components/header/ProfileMenuTrigger.test.tsxnew file mode 100644index 0000000000..fe0813822c--- /dev/null+++ b/frontend/src/react/components/header/ProfileMenuTrigger.test.tsx@@ -0,0 +1,220 @@+import type { ReactElement } from "react";+import { act } from "react";+import { createRoot } from "react-dom/client";+import { beforeEach, describe, expect, test, vi } from "vitest";+import { WORKSPACE_ROUTE_LANDING } from "@/router/dashboard/workspaceRoutes";++(+ globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }+).IS_REACT_ACT_ENVIRONMENT = true;++const mocks = vi.hoisted(() => ({+ logout: vi.fn(),+ uploadLicense: vi.fn(),+ emitStorageChangedEvent: vi.fn(),+ push: vi.fn(),+ resolve: vi.fn(({ name }: { name: string }) => ({ fullPath: `/${name}` })),+ currentRoute: {+ value: {+ name: "sql-editor.home",+ },+ },+}));++vi.mock("react-i18next", () => ({+ useTranslation: () => ({+ t: (key: string) =>+ ({+ "common.language": "Language",+ "common.license": "License",+ "quick-start.self": "Quick Start",+ "common.logout": "Logout",+ "settings.general.workspace.default-landing-page.go-to-workspace":+ "Go to workspace",+ "settings.general.workspace.default-landing-page.go-to-sql-editor":+ "Go to SQL Editor",+ "subscription.plan.free.title": "Free",+ "subscription.plan.team.title": "Team",+ "subscription.plan.enterprise.title": "Enterprise",+ })[key] ?? key,+ }),+}));++vi.mock("@/plugins/i18n", () => ({+ default: {+ global: {+ locale: {+ value: "en-US",+ },+ },+ },+}));++vi.mock("@/react/hooks/useVueState", () => ({+ useVueState: (getter: () => unknown) => getter(),+}));++vi.mock("@/react/components/UserAvatar", () => ({+ UserAvatar: () => <div data-testid="user-avatar" />,+}));++vi.mock("@/react/components/ui/dropdown-menu", () => ({+ DropdownMenu: ({ children }: { children: ReactElement[] }) => (+ <div>{children}</div>+ ),+ DropdownMenuTrigger: ({ children }: { children: ReactElement }) => (+ <div>{children}</div>+ ),+ DropdownMenuContent: ({ children }: { children: ReactElement[] }) => (+ <div>{children}</div>+ ),+ DropdownMenuItem: ({+ children,+ onClick,+ }: {+ children: ReactElement | string;+ onClick?: () => void;+ }) => <button onClick={onClick}>{children}</button>,+ DropdownMenuSeparator: () => <div />,+ DropdownMenuSubmenu: ({ children }: { children: ReactElement[] }) => (+ <div>{children}</div>+ ),+ DropdownMenuSubmenuTrigger: ({+ children,+ }: {+ children: ReactElement | ReactElement[] | string;+ }) => <div>{children}</div>,+ DropdownMenuSubmenuContent: ({ children }: { children: ReactElement[] }) => (+ <div>{children}</div>+ ),+}));++vi.mock("@/react/components/header/VersionMenuItem", () => ({+ VersionMenuItem: () => <div data-testid="version-item" />,+}));++vi.mock("./common", () => ({+ HEADER_LANGUAGE_OPTIONS: [{ label: "English", value: "en-US" }],+ resetQuickstartProgress: vi.fn(),+ setAppLocale: mocks.emitStorageChangedEvent,+}));++vi.mock("@/router", () => ({+ router: {+ currentRoute: mocks.currentRoute,+ push: mocks.push,+ resolve: mocks.resolve,+ },+}));++vi.mock("@/router/dashboard/workspaceRoutes", () => ({+ WORKSPACE_ROUTE_LANDING: "workspace.landing",+ WORKSPACE_ROUTE_MY_ISSUES: "workspace.my-issues",+}));++vi.mock("@/router/dashboard/workspaceSetting", () => ({+ SETTING_ROUTE_PROFILE: "setting.profile",+}));++vi.mock("@/router/sqlEditor", () => ({+ SQL_EDITOR_HOME_MODULE: "sql-editor.home",+}));++vi.mock("@/store", () => ({+ useActuatorV1Store: () => ({+ quickStartEnabled: true,+ }),+ useAuthStore: () => ({+ logout: mocks.logout,+ }),+ useCurrentUserV1: () => ({+ value: {+ title: "Alice",+ email: "[email protected]",+ },+ }),+ useSubscriptionV1Store: () => ({+ currentPlan: 0,+ uploadLicense: mocks.uploadLicense,+ }),+ useUIStateStore: () => ({+ saveIntroStateByKey: vi.fn(),+ }),+ useWorkspaceV1Store: () => ({+ currentWorkspace: {+ logo: "",+ },+ }),+}));++vi.mock("@/utils", () => ({+ isDev: () => false,+ isSQLEditorRoute: () => true,+}));++let ProfileMenuTrigger: typeof import("./ProfileMenuTrigger").ProfileMenuTrigger;++const renderIntoContainer = (element: ReactElement) => {+ const container = document.createElement("div");+ document.body.appendChild(container);+ const root = createRoot(container);+ return {+ container,+ render: () => {+ act(() => {+ root.render(element);+ });+ },+ unmount: () =>+ act(() => {+ root.unmount();+ container.remove();+ }),+ };+};++beforeEach(async () => {+ vi.clearAllMocks();+ window.open = vi.fn();+ ({ ProfileMenuTrigger } = await import("./ProfileMenuTrigger"));+});++describe("ProfileMenuTrigger", () => {+ test("supports locale changes, workspace toggle, and logout", () => {+ const { container, render, unmount } = renderIntoContainer(+ <ProfileMenuTrigger size="medium" link />+ );++ render();++ const englishButton = Array.from(container.querySelectorAll("button")).find(+ (button) => button.textContent?.includes("English")+ );+ act(() => {+ englishButton?.click();+ });+ expect(mocks.emitStorageChangedEvent).toHaveBeenCalled();++ const workspaceButton = Array.from(+ container.querySelectorAll("button")+ ).find((button) => button.textContent?.includes("Go to workspace"));+ act(() => {+ workspaceButton?.click();+ });+ expect(window.open).toHaveBeenCalledWith(+ `/${WORKSPACE_ROUTE_LANDING}`,+ "_blank",+ "noopener,noreferrer"+ );++ const logoutButton = Array.from(container.querySelectorAll("button")).find(+ (button) => button.textContent?.includes("Logout")+ );+ act(() => {+ logoutButton?.click();+ });+ expect(mocks.logout).toHaveBeenCalled();++ unmount();+ });+});diff --git a/frontend/src/react/components/header/ProfileMenuTrigger.tsx b/frontend/src/react/components/header/ProfileMenuTrigger.tsxnew file mode 100644index 0000000000..0d3547c0be--- /dev/null+++ b/frontend/src/react/components/header/ProfileMenuTrigger.tsx@@ -0,0 +1,250 @@+import { ChevronRight } from "lucide-react";+import { useMemo, useState } from "react";+import { useTranslation } from "react-i18next";+import i18n from "@/plugins/i18n";+import { UserAvatar } from "@/react/components/UserAvatar";+import {+ DropdownMenu,+ DropdownMenuContent,+ DropdownMenuItem,+ DropdownMenuSeparator,+ DropdownMenuSubmenu,+ DropdownMenuSubmenuContent,+ DropdownMenuSubmenuTrigger,+ DropdownMenuTrigger,+} from "@/react/components/ui/dropdown-menu";+import { useVueState } from "@/react/hooks/useVueState";+import { router } from "@/router";+import { WORKSPACE_ROUTE_LANDING } from "@/router/dashboard/workspaceRoutes";+import { SETTING_ROUTE_PROFILE } from "@/router/dashboard/workspaceSetting";+import { SQL_EDITOR_HOME_MODULE } from "@/router/sqlEditor";+import {+ useActuatorV1Store,+ useAuthStore,+ useCurrentUserV1,+ useSubscriptionV1Store,+ useUIStateStore,+ useWorkspaceV1Store,+} from "@/store";+import { PlanType } from "@/types/proto-es/v1/subscription_service_pb";+import { isDev, isSQLEditorRoute } from "@/utils";+import {+ HEADER_LANGUAGE_OPTIONS,+ resetQuickstartProgress,+ setAppLocale,+} from "./common";+import { VersionMenuItem } from "./VersionMenuItem";++export interface ProfileMenuProps {+ size?: "small" | "medium";+ link?: boolean;+}++export function ProfileMenuTrigger({+ size = "medium",+ link = true,+}: ProfileMenuProps) {+ const { t } = useTranslation();+ const actuatorStore = useActuatorV1Store();+ const authStore = useAuthStore();+ const subscriptionStore = useSubscriptionV1Store();+ const uiStateStore = useUIStateStore();+ const workspaceStore = useWorkspaceV1Store();++ const currentUser = useVueState(() => useCurrentUserV1().value);+ const currentLocale = useVueState(() => i18n.global.locale.value as string);+ const currentRouteName = useVueState(+ () => router.currentRoute.value.name?.toString() ?? ""+ );+ const currentPlan = useVueState(() => subscriptionStore.currentPlan);+ const quickStartEnabled = useVueState(() => actuatorStore.quickStartEnabled);+ const customLogo = useVueState(+ () => workspaceStore.currentWorkspace?.logo ?? ""+ );+ const [open, setOpen] = useState(false);++ const wrapperClass = useMemo(() => {+ if (!customLogo) {+ return "flex items-center justify-center rounded-3xl bg-gray-100";+ }+ return size === "small"+ ? "flex items-center justify-center rounded-3xl bg-gray-100 md:px-1 md:py-0.5"+ : "flex items-center justify-center rounded-3xl bg-gray-100 md:px-2 md:py-1.5";+ }, [customLogo, size]);++ const logoClass = size === "small" ? "mr-2" : "mr-4";++ const sqlEditorMenuLabel = currentRouteName.startsWith("sql-editor")+ ? t("settings.general.workspace.default-landing-page.go-to-workspace")+ : t("settings.general.workspace.default-landing-page.go-to-sql-editor");++ const handleProfileNavigate = () => {+ if (!link) return;+ setOpen(false);+ void router.push({ name: SETTING_ROUTE_PROFILE });+ };++ const handleWorkspaceToggle = () => {+ const target = router.resolve({+ name: isSQLEditorRoute(router)+ ? WORKSPACE_ROUTE_LANDING+ : SQL_EDITOR_HOME_MODULE,+ });+ setOpen(false);+ window.open(target.fullPath, "_blank", "noopener,noreferrer");+ };++ const switchPlan = (license: string) => {+ void subscriptionStore.uploadLicense(license);+ setOpen(false);+ };++ return (+ <div className={wrapperClass}>+ {customLogo ? (+ <img+ src={customLogo}+ alt={t("settings.general.workspace.logo")}+ className={`ml-1 hidden h-6 bg-center bg-no-repeat object-contain md:block ${logoClass}`}+ />+ ) : null}++ <DropdownMenu open={open} onOpenChange={setOpen}>+ <DropdownMenuTrigger+ render={+ <button type="button" className="cursor-pointer rounded-full" />+ }+ >+ <UserAvatar+ size="sm"+ className="cursor-pointer"+ title={currentUser.title || currentUser.email}+ />+ </DropdownMenuTrigger>++ <DropdownMenuContent className="w-56 p-0">+ <DropdownMenuItem+ className="block w-full px-4 py-3"+ onClick={handleProfileNavigate}+ >+ <div className="text-left">+ <p className="flex justify-between gap-x-2 text-sm">+ <span className="truncate font-medium text-main">+ {currentUser.title}+ </span>+ </p>+ <p className="truncate text-sm text-control">+ {currentUser.email}+ </p>+ </div>+ </DropdownMenuItem>++ <DropdownMenuSeparator className="mx-0" />++ <DropdownMenuSubmenu>+ <DropdownMenuSubmenuTrigger className="justify-between">+ {t("common.language")}+ <ChevronRight className="h-4 w-4 text-control-light" />+ </DropdownMenuSubmenuTrigger>+ <DropdownMenuSubmenuContent className="w-48">+ {HEADER_LANGUAGE_OPTIONS.map((item) => (+ <DropdownMenuItem+ key={item.value}+ className={+ item.value === currentLocale ? "bg-control-bg" : ""+ }+ onClick={() => {+ setAppLocale(item.value);+ setOpen(false);+ }}+ >+ <span className="mr-2">+ <input+ type="radio"+ readOnly+ checked={item.value === currentLocale}+ />+ </span>+ {item.label}+ </DropdownMenuItem>+ ))}+ </DropdownMenuSubmenuContent>+ </DropdownMenuSubmenu>++ {isDev() ? (+ <DropdownMenuSubmenu>+ <DropdownMenuSubmenuTrigger className="justify-between">+ {t("common.license")}+ <ChevronRight className="h-4 w-4 text-control-light" />+ </DropdownMenuSubmenuTrigger>+ <DropdownMenuSubmenuContent className="w-48">+ {[+ {+ label: t("subscription.plan.free.title"),+ value: "",+ plan: PlanType.FREE,+ },+ {+ label: t("subscription.plan.team.title"),+ value: import.meta.env.BB_DEV_TEAM_LICENSE as string,+ plan: PlanType.TEAM,+ },+ {+ label: t("subscription.plan.enterprise.title"),+ value: import.meta.env.BB_DEV_ENTERPRISE_LICENSE as string,+ plan: PlanType.ENTERPRISE,+ },+ ].map((item) => (+ <DropdownMenuItem+ key={item.plan}+ className={item.plan === currentPlan ? "bg-control-bg" : ""}+ onClick={() => switchPlan(item.value)}+ >+ <span className="mr-2">+ <input+ type="radio"+ readOnly+ checked={item.plan === currentPlan}+ />+ </span>+ {item.label}+ </DropdownMenuItem>+ ))}+ </DropdownMenuSubmenuContent>+ </DropdownMenuSubmenu>+ ) : null}++ {quickStartEnabled ? (+ <DropdownMenuItem+ onClick={() => {+ resetQuickstartProgress(uiStateStore);+ setOpen(false);+ }}+ >+ {t("quick-start.self")}+ </DropdownMenuItem>+ ) : null}++ <DropdownMenuItem onClick={handleWorkspaceToggle}>+ {sqlEditorMenuLabel}+ </DropdownMenuItem>++ <DropdownMenuSeparator className="mx-0" />++ <VersionMenuItem onCloseMenu={() => setOpen(false)} />++ <DropdownMenuSeparator className="mx-0" />++ <DropdownMenuItem+ onClick={() => {+ setOpen(false);+ authStore.logout();+ }}+ >+ {t("common.logout")}+ </DropdownMenuItem>+ </DropdownMenuContent>+ </DropdownMenu>+ </div>+ );+}diff --git a/frontend/src/react/components/header/ProjectCreateDialog.tsx b/frontend/src/react/components/header/ProjectCreateDialog.tsxnew file mode 100644index 0000000000..922f630080--- /dev/null+++ b/frontend/src/react/components/header/ProjectCreateDialog.tsx@@ -0,0 +1,185 @@+import { Code, ConnectError } from "@connectrpc/connect";+import { useCallback, useEffect, useMemo, useRef, useState } from "react";+import { useTranslation } from "react-i18next";+import {+ ResourceIdField,+ type ResourceIdFieldRef,+} from "@/react/components/ResourceIdField";+import { Button } from "@/react/components/ui/button";+import { Input } from "@/react/components/ui/input";+import {+ Sheet,+ SheetBody,+ SheetContent,+ SheetFooter,+ SheetHeader,+ SheetTitle,+} from "@/react/components/ui/sheet";+import { router } from "@/router";+import { pushNotification, useProjectV1Store, useUIStateStore } from "@/store";+import { projectNamePrefix } from "@/store/modules/v1/common";+import { unknownProject } from "@/types";+import type { Project } from "@/types/proto-es/v1/project_service_pb";+import { hasWorkspacePermissionV2 } from "@/utils";++export interface ProjectCreateDialogProps {+ open: boolean;+ onClose: () => void;+ onCreated?: (project: Project) => void;+}++export function ProjectCreateDialog({+ open,+ onClose,+ onCreated,+}: ProjectCreateDialogProps) {+ const { t } = useTranslation();+ const projectStore = useProjectV1Store();+ const uiStateStore = useUIStateStore();+ const defaultProjectTitle = t("quick-action.new-project");+ const [title, setTitle] = useState(defaultProjectTitle);+ const [resourceId, setResourceId] = useState("");+ const [isCreating, setIsCreating] = useState(false);+ const [isResourceIdValid, setIsResourceIdValid] = useState(false);+ const resourceIdFieldRef = useRef<ResourceIdFieldRef>(null);++ useEffect(() => {+ if (!open) return;+ setTitle(defaultProjectTitle);+ setResourceId("");+ setIsCreating(false);+ setIsResourceIdValid(false);+ }, [defaultProjectTitle, open]);++ const allowCreate = useMemo(() => {+ if (!title.trim()) return false;+ if (!isResourceIdValid) return false;+ if (!hasWorkspacePermissionV2("bb.projects.create")) return false;+ return true;+ }, [isResourceIdValid, title]);++ const validate = useCallback(+ async (id: string) => {+ try {+ await projectStore.getOrFetchProjectByName(+ `${projectNamePrefix}${id}`,+ true+ );+ return [+ {+ type: "error" as const,+ message: t("resource-id.validation.duplicated", {+ resource: t("common.project"),+ }),+ },+ ];+ } catch {+ return [];+ }+ },+ [projectStore, t]+ );++ const handleCreate = useCallback(async () => {+ if (!allowCreate || isCreating) return;++ try {+ setIsCreating(true);+ const createdProject = await projectStore.createProject(+ { ...unknownProject(), title },+ resourceId+ );++ pushNotification({+ module: "bytebase",+ style: "SUCCESS",+ title: t("project.create-modal.success-prompt", {+ name: createdProject.title,+ }),+ });++ if (onCreated) {+ onCreated(createdProject);+ } else {+ void uiStateStore.saveIntroStateByKey({+ key: "project.visit",+ newState: true,+ });+ void router.push({ path: `/${createdProject.name}` });+ }++ onClose();+ } catch (error) {+ if (error instanceof ConnectError && error.code === Code.AlreadyExists) {+ resourceIdFieldRef.current?.addValidationError(error.message);+ } else {+ throw error;+ }+ } finally {+ setIsCreating(false);+ }+ }, [+ allowCreate,+ isCreating,+ onClose,+ onCreated,+ projectStore,+ resourceId,+ t,+ title,+ uiStateStore,+ ]);++ return (+ <Sheet open={open} onOpenChange={(next) => !next && onClose()}>+ <SheetContent width="standard">+ <SheetHeader>+ <SheetTitle>{t("quick-action.create-project")}</SheetTitle>+ </SheetHeader>++ <SheetBody>+ <div className="flex flex-col gap-y-6">+ <div>+ <label className="text-base leading-6 font-medium text-control">+ {t("project.create-modal.project-name")}+ <span className="ml-0.5 text-error">*</span>+ </label>+ <Input+ className="mt-2 mb-1"+ value={title}+ maxLength={200}+ placeholder={t("project.create-modal.project-name")}+ onChange={(e) => setTitle(e.target.value)}+ />+ <ResourceIdField+ ref={resourceIdFieldRef}+ value={resourceId}+ resourceType="project"+ resourceName={title}+ resourceTitle={title}+ validate={validate}+ onChange={setResourceId}+ onValidationChange={setIsResourceIdValid}+ />+ </div>+ </div>++ {isCreating && (+ <div className="absolute inset-0 flex items-center justify-center bg-background/50">+ <div className="size-6 animate-spin rounded-full border-2 border-accent border-t-transparent" />+ </div>+ )}+ </SheetBody>++ <SheetFooter>+ <Button variant="ghost" onClick={onClose}>+ {t("common.cancel")}+ </Button>+ <Button disabled={!allowCreate} onClick={handleCreate}>+ {t("common.create")}+ </Button>+ </SheetFooter>+ </SheetContent>+ </Sheet>+ );+}diff --git a/frontend/src/react/components/header/ProjectSwitchDialog.tsx b/frontend/src/react/components/header/ProjectSwitchDialog.tsxnew file mode 100644index 0000000000..00386f81a4--- /dev/null+++ b/frontend/src/react/components/header/ProjectSwitchDialog.tsx@@ -0,0 +1,41 @@+import { useState } from "react";+import { useTranslation } from "react-i18next";+import {+ Dialog,+ DialogContent,+ DialogTitle,+} from "@/react/components/ui/dialog";+import { ProjectCreateDialog } from "./ProjectCreateDialog";+import { ProjectSwitchPanel } from "./ProjectSwitchPanel";++export interface ProjectSwitchDialogProps {+ open: boolean;+ onClose: () => void;+}++export function ProjectSwitchDialog({+ open,+ onClose,+}: ProjectSwitchDialogProps) {+ const { t } = useTranslation();+ const [createOpen, setCreateOpen] = useState(false);++ return (+ <>+ <Dialog open={open} onOpenChange={(next) => !next && onClose()}>+ <DialogContent className="w-[min(90vw,48rem)] p-6">+ <DialogTitle className="mb-4">{t("project.select")}</DialogTitle>+ <ProjectSwitchPanel+ onClose={onClose}+ onRequestCreate={() => setCreateOpen(true)}+ />+ </DialogContent>+ </Dialog>++ <ProjectCreateDialog+ open={createOpen}+ onClose={() => setCreateOpen(false)}+ />+ </>+ );+}diff --git a/frontend/src/react/components/header/ProjectSwitchPanel.test.tsx b/frontend/src/react/components/header/ProjectSwitchPanel.test.tsxnew file mode 100644index 0000000000..fbde5736cf--- /dev/null+++ b/frontend/src/react/components/header/ProjectSwitchPanel.test.tsx@@ -0,0 +1,217 @@+import type { ReactElement } from "react";+import { act } from "react";+import { createRoot } from "react-dom/client";+import { beforeEach, describe, expect, test, vi } from "vitest";+import { PROJECT_V1_ROUTE_DETAIL } from "@/router/dashboard/projectV1";++(+ globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }+).IS_REACT_ACT_ENVIRONMENT = true;++const recentProject = {+ name: "projects/recent-project",+ title: "Recent Project",+ labels: {},+};++const allProject = {+ name: "projects/all-project",+ title: "All Project",+ labels: {},+};++const mocks = vi.hoisted(() => ({+ record: vi.fn(),+ push: vi.fn(),+ resolve: vi.fn(({ params }: { params: { projectId: string } }) => ({+ fullPath: `/projects/${params.projectId}`,+ })),+ currentRoute: {+ value: {+ params: {+ projectId: "recent-project",+ },+ },+ },+ requestCreate: vi.fn(),+ close: vi.fn(),+}));++vi.mock("react-i18next", () => ({+ useTranslation: () => ({+ t: (key: string) =>+ ({+ "common.recent": "Recent",+ "common.all": "All",+ "common.filter-by-name": "Filter by name",+ "common.back-to-workspace": "Back to workspace",+ "common.create": "Create",+ "common.no-data": "No data",+ "common.loading": "Loading",+ "common.rows-per-page": "Rows per page",+ "common.load-more": "Load more",+ })[key] ?? key,+ }),+}));++vi.mock("@/react/hooks/useVueState", () => ({+ useVueState: (getter: () => unknown) => getter(),+}));++vi.mock("@/components/Project/useRecentProjects", () => ({+ useRecentProjects: () => ({+ recentViewProjects: { value: [recentProject] },+ }),+}));++vi.mock("@/react/hooks/usePagedData", () => ({+ usePagedData: () => ({+ dataList: [allProject],+ isLoading: false,+ isFetchingMore: false,+ hasMore: false,+ loadMore: vi.fn(),+ pageSize: 50,+ pageSizeOptions: [50],+ onPageSizeChange: vi.fn(),+ }),+ PagedTableFooter: () => <div data-testid="paged-footer" />,+}));++vi.mock("@/router", () => ({+ router: {+ currentRoute: mocks.currentRoute,+ resolve: mocks.resolve,+ push: mocks.push,+ },+}));++vi.mock("@/router/useRecentVisit", () => ({+ useRecentVisit: () => ({+ record: mocks.record,+ }),+}));++vi.mock("@/store", () => ({+ useProjectV1Store: () => ({+ getProjectByName: (name: string) =>+ name === "projects/recent-project" ? recentProject : allProject,+ }),+}));++vi.mock("@/types", () => ({+ isDefaultProject: () => false,+ isValidProjectName: () => true,+}));++vi.mock("@/utils", () => ({+ filterProjectV1ListByKeyword: (+ list: (typeof recentProject)[],+ keyword: string+ ) =>+ list.filter((project) =>+ project.title.toLowerCase().includes(keyword.toLowerCase())+ ),+ hasWorkspacePermissionV2: () => true,+ isDev: () => false,+}));++vi.mock("@/react/components/ui/tabs", () => ({+ Tabs: ({ children }: { children: ReactElement[] }) => <div>{children}</div>,+ TabsList: ({ children }: { children: ReactElement[] }) => (+ <div>{children}</div>+ ),+ TabsTrigger: ({+ children,+ value,+ onClick,+ }: {+ children: ReactElement | string;+ value: string;+ onClick?: () => void;+ }) => (+ <button data-testid={`tab-${value}`} onClick={onClick}>+ {children}+ </button>+ ),+ TabsPanel: ({ children }: { children: ReactElement | ReactElement[] }) => (+ <div>{children}</div>+ ),+}));++let ProjectSwitchPanel: typeof import("./ProjectSwitchPanel").ProjectSwitchPanel;++const renderIntoContainer = (element: ReactElement) => {+ const container = document.createElement("div");+ document.body.appendChild(container);+ const root = createRoot(container);+ return {+ container,+ render: () => {+ act(() => {+ root.render(element);+ });+ },+ unmount: () =>+ act(() => {+ root.unmount();+ container.remove();+ }),+ };+};++beforeEach(async () => {+ vi.clearAllMocks();+ ({ ProjectSwitchPanel } = await import("./ProjectSwitchPanel"));+});++describe("ProjectSwitchPanel", () => {+ test("records and navigates when selecting a project", () => {+ const { container, render, unmount } = renderIntoContainer(+ <ProjectSwitchPanel+ onClose={mocks.close}+ onRequestCreate={mocks.requestCreate}+ />+ );++ render();++ const row = Array.from(container.querySelectorAll("button")).find(+ (button) => button.textContent?.includes("Recent Project")+ );+ expect(row).not.toBeUndefined();+ act(() => {+ row?.click();+ });++ expect(mocks.resolve).toHaveBeenCalledWith({+ name: PROJECT_V1_ROUTE_DETAIL,+ params: { projectId: "recent-project" },+ });+ expect(mocks.record).toHaveBeenCalledWith("/projects/recent-project");+ expect(mocks.push).toHaveBeenCalled();+ expect(mocks.close).toHaveBeenCalled();+ unmount();+ });++ test("opens the create flow from the header action", () => {+ const { container, render, unmount } = renderIntoContainer(+ <ProjectSwitchPanel+ onClose={mocks.close}+ onRequestCreate={mocks.requestCreate}+ />+ );++ render();++ const createButton = Array.from(container.querySelectorAll("button")).find(+ (button) => button.textContent === ""+ );+ expect(createButton).not.toBeUndefined();+ act(() => {+ createButton?.click();+ });+ expect(mocks.requestCreate).toHaveBeenCalled();+ unmount();+ });+});diff --git a/frontend/src/react/components/header/ProjectSwitchPanel.tsx b/frontend/src/react/components/header/ProjectSwitchPanel.tsxnew file mode 100644index 0000000000..afd665d074--- /dev/null+++ b/frontend/src/react/components/header/ProjectSwitchPanel.tsx@@ -0,0 +1,327 @@+import { Check, ChevronLeft, Plus } from "lucide-react";+import {+ type MouseEvent as ReactMouseEvent,+ useCallback,+ useEffect,+ useMemo,+ useState,+} from "react";+import { useTranslation } from "react-i18next";+import { useRecentProjects } from "@/components/Project/useRecentProjects";+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 { PagedTableFooter, usePagedData } from "@/react/hooks/usePagedData";+import { useVueState } from "@/react/hooks/useVueState";+import { router } from "@/router";+import { PROJECT_V1_ROUTE_DETAIL } from "@/router/dashboard/projectV1";+import { WORKSPACE_ROUTE_LANDING } from "@/router/dashboard/workspaceRoutes";+import { useRecentVisit } from "@/router/useRecentVisit";+import { useProjectV1Store } from "@/store";+import { getProjectName, projectNamePrefix } from "@/store/modules/v1/common";+import { isDefaultProject, isValidProjectName } from "@/types";+import { State } from "@/types/proto-es/v1/common_pb";+import type { Project } from "@/types/proto-es/v1/project_service_pb";+import {+ filterProjectV1ListByKeyword,+ hasWorkspacePermissionV2,+} from "@/utils";++export interface ProjectSwitchPanelProps {+ onClose: () => void;+ onRequestCreate: () => void;+}++type ProjectSwitchTab = "recent" | "all";++function ProjectRow({+ project,+ currentProjectName,+ keyword,+ onSelect,+}: {+ project: Project;+ currentProjectName?: string;+ keyword: string;+ onSelect: (+ project: Project,+ event: ReactMouseEvent<HTMLButtonElement>+ ) => void;+}) {+ const resourceId = getProjectName(project.name);+ const labels = Object.entries(project.labels ?? {}).slice(0, 3);+ const isCurrent = project.name === currentProjectName;++ return (+ <button+ type="button"+ className="flex w-full items-start gap-x-2.5 rounded-sm px-2 py-1.5 text-left hover:bg-control-bg"+ onClick={(event) => onSelect(project, event)}+ >+ <span className="mt-0.5 h-4 w-4 shrink-0">+ {isCurrent ? <Check className="h-4 w-4 text-accent" /> : null}+ </span>+ <span className="min-w-0 flex-1">+ <span className="block truncate font-medium text-control">+ {project.title || resourceId}+ </span>+ <span className="block truncate text-xs text-control-light">+ {resourceId}+ </span>+ {labels.length > 0 ? (+ <span className="mt-1 flex flex-wrap gap-1">+ {labels.map(([key, value]) => (+ <span+ key={`${key}:${value}`}+ className="rounded-full bg-control-bg px-2 py-0.5 text-[11px] text-control-light"+ >+ {key}:{value}+ </span>+ ))}+ </span>+ ) : null}+ {keyword.trim().length > 0 &&+ !project.title.toLowerCase().includes(keyword.toLowerCase()) &&+ !resourceId.toLowerCase().includes(keyword.toLowerCase()) ? (+ <span className="sr-only">{keyword}</span>+ ) : null}+ </span>+ </button>+ );+}++export function ProjectSwitchPanel({+ onClose,+ onRequestCreate,+}: ProjectSwitchPanelProps) {+ const { t } = useTranslation();+ const projectStore = useProjectV1Store();+ const { record } = useRecentVisit();+ const { recentViewProjects } = useRecentProjects();+ const [searchText, setSearchText] = useState("");+ const [selectedTab, setSelectedTab] = useState<ProjectSwitchTab>("all");+ const currentProjectName = useVueState(() => {+ const projectId = router.currentRoute.value.params.projectId as+ | string+ | undefined;+ return projectId ? `${projectNamePrefix}${projectId}` : "";+ });+ const currentProject = useVueState(() =>+ projectStore.getProjectByName(currentProjectName)+ );+ const recentProjectList = useVueState(() => recentViewProjects.value ?? []);+ const allowToCreateProject = hasWorkspacePermissionV2("bb.projects.create");++ useEffect(() => {+ if (recentProjectList.length > 0) {+ setSelectedTab((previous) => (previous === "all" ? "recent" : previous));+ }+ }, [recentProjectList.length]);++ const filteredRecentProjectList = useMemo(() => {+ return filterProjectV1ListByKeyword(+ recentProjectList.filter((project) => !isDefaultProject(project.name)),+ searchText+ );+ }, [recentProjectList, searchText]);++ const actualSelectedTab = useMemo<ProjectSwitchTab>(() => {+ if (+ selectedTab === "recent" &&+ searchText.trim().length > 0 &&+ filteredRecentProjectList.length === 0+ ) {+ return "all";+ }+ return selectedTab;+ }, [filteredRecentProjectList.length, searchText, selectedTab]);++ const {+ dataList: allProjects,+ isLoading,+ isFetchingMore,+ hasMore,+ loadMore,+ pageSize,+ pageSizeOptions,+ onPageSizeChange,+ } = usePagedData<Project>({+ sessionKey: "bb.project-switch",+ fetchList: useCallback(+ async ({ pageSize, pageToken }) => {+ const { projects, nextPageToken } = await projectStore.fetchProjectList(+ {+ pageSize,+ pageToken,+ filter: {+ query: searchText,+ excludeDefault: true,+ state: State.ACTIVE,+ },+ orderBy: "title",+ cache: true,+ }+ );+ return {+ list: projects,+ nextPageToken,+ };+ },+ [projectStore, searchText]+ ),+ });++ const handleProjectSelect = useCallback(+ (project: Project, event: ReactMouseEvent<HTMLButtonElement>) => {+ const route = router.resolve({+ name: PROJECT_V1_ROUTE_DETAIL,+ params: {+ projectId: getProjectName(project.name),+ },+ });+ record(route.fullPath);++ if (event.ctrlKey || event.metaKey) {+ window.open(route.fullPath, "_blank");+ } else {+ void router.push(route);+ }++ onClose();+ },+ [onClose, record]+ );++ const handleGotoWorkspace = useCallback(+ (event: ReactMouseEvent<HTMLButtonElement>) => {+ const route = router.resolve({+ name: WORKSPACE_ROUTE_LANDING,+ });+ record(route.fullPath);++ if (event.ctrlKey || event.metaKey) {+ window.open(route.fullPath, "_blank");+ } else {+ void router.push(route.fullPath);+ }++ onClose();+ },+ [onClose, record]+ );++ return (+ <div className="flex w-full max-h-[calc(100vh-10rem)] flex-col">+ {isValidProjectName(currentProject.name) ? (+ <Button+ variant="ghost"+ size="sm"+ className="mb-2 h-7 w-fit px-0 text-control-light hover:bg-transparent hover:text-control"+ onClick={handleGotoWorkspace}+ >+ <ChevronLeft className="h-4 w-4 opacity-80" />+ {t("common.back-to-workspace")}+ </Button>+ ) : null}++ <Tabs+ value={actualSelectedTab}+ onValueChange={(value) => setSelectedTab(value as ProjectSwitchTab)}+ >+ <div className="mb-2 flex items-center justify-between gap-x-3">+ <TabsList className="gap-x-5">+ <TabsTrigger className="pb-1.5" value="recent">+ {t("common.recent")}+ </TabsTrigger>+ <TabsTrigger className="pb-1.5" value="all">+ {t("common.all")}+ </TabsTrigger>+ </TabsList>++ <div className="flex items-center gap-x-1.5">+ <Input+ size="sm"+ className="w-36"+ value={searchText}+ placeholder={t("common.filter-by-name")}+ onChange={(event) => setSearchText(event.target.value)}+ />+ {allowToCreateProject ? (+ <Button+ size="sm"+ variant="outline"+ aria-label={t("quick-action.new-project")}+ className="h-8 w-8 px-0"+ onClick={onRequestCreate}+ >+ <Plus className="h-4 w-4" />+ </Button>+ ) : null}+ </div>+ </div>++ <TabsPanel value="recent" className="mt-0">+ <div className="flex max-h-[26rem] flex-col overflow-auto">+ {filteredRecentProjectList.length === 0 ? (+ <div className="px-3 py-8 text-center text-sm text-control-light">+ {searchText.trim().length > 0+ ? t("common.no-data")+ : t("common.no-data")}+ </div>+ ) : (+ filteredRecentProjectList.map((project) => (+ <ProjectRow+ key={project.name}+ project={project}+ currentProjectName={currentProjectName}+ keyword={searchText}+ onSelect={handleProjectSelect}+ />+ ))+ )}+ </div>+ </TabsPanel>++ <TabsPanel value="all" className="mt-0">+ <div className="flex max-h-[26rem] flex-col overflow-auto">+ {isLoading && allProjects.length === 0 ? (+ <div className="px-3 py-8 text-center text-sm text-control-light">+ {t("common.loading")}+ </div>+ ) : allProjects.length === 0 ? (+ <div className="px-3 py-8 text-center text-sm text-control-light">+ {t("common.no-data")}+ </div>+ ) : (+ allProjects.map((project) => (+ <ProjectRow+ key={project.name}+ project={project}+ currentProjectName={currentProjectName}+ keyword={searchText}+ onSelect={handleProjectSelect}+ />+ ))+ )}+ </div>++ <div className="mt-2 border-t border-control-border pt-2">+ <PagedTableFooter+ pageSize={pageSize}+ pageSizeOptions={pageSizeOptions}+ onPageSizeChange={onPageSizeChange}+ hasMore={hasMore}+ isFetchingMore={isFetchingMore}+ onLoadMore={loadMore}+ />+ </div>+ </TabsPanel>+ </Tabs>+ </div>+ );+}diff --git a/frontend/src/react/components/header/ProjectSwitchPopover.tsx b/frontend/src/react/components/header/ProjectSwitchPopover.tsxnew file mode 100644index 0000000000..f1401b7bb1--- /dev/null+++ b/frontend/src/react/components/header/ProjectSwitchPopover.tsx@@ -0,0 +1,80 @@+import { ChevronDown } from "lucide-react";+import { useEffect, useState } from "react";+import { useTranslation } from "react-i18next";+import {+ Popover,+ PopoverContent,+ PopoverTrigger,+} from "@/react/components/ui/popover";+import { useVueState } from "@/react/hooks/useVueState";+import { router } from "@/router";+import { useProjectV1Store } from "@/store";+import { projectNamePrefix } from "@/store/modules/v1/common";+import { isValidProjectName } from "@/types";+import { ProjectCreateDialog } from "./ProjectCreateDialog";+import { ProjectSwitchPanel } from "./ProjectSwitchPanel";++export function ProjectSwitchPopover() {+ const { t } = useTranslation();+ const projectStore = useProjectV1Store();+ const [open, setOpen] = useState(false);+ const [createOpen, setCreateOpen] = useState(false);+ const routeKey = useVueState(() => router.currentRoute.value.fullPath);+ const currentProject = useVueState(() => {+ const projectId = router.currentRoute.value.params.projectId as+ | string+ | undefined;+ const projectName = projectId ? `${projectNamePrefix}${projectId}` : "";+ return projectStore.getProjectByName(projectName);+ });++ useEffect(() => {+ setOpen(false);+ }, [routeKey]);++ return (+ <>+ <Popover open={open} onOpenChange={setOpen}>+ <PopoverTrigger+ render={+ <button+ type="button"+ className="hidden h-8 items-center gap-x-2 rounded-xs border border-control-border bg-background px-3 text-xs hover:bg-control-bg sm:inline-flex"+ />+ }+ >+ <div className="min-w-32 text-left">+ {isValidProjectName(currentProject.name) ? (+ <span className="block truncate text-sm font-medium text-control">+ {currentProject.title}+ </span>+ ) : (+ <span className="text-sm text-control-placeholder">+ {t("project.select")}+ </span>+ )}+ </div>+ <ChevronDown className="h-4 w-4 opacity-80" />+ </PopoverTrigger>+ <PopoverContent+ align="start"+ sideOffset={6}+ className="w-[24rem] max-w-[calc(100vw-2rem)] p-3"+ >+ <ProjectSwitchPanel+ onClose={() => setOpen(false)}+ onRequestCreate={() => {+ setOpen(false);+ setCreateOpen(true);+ }}+ />+ </PopoverContent>+ </Popover>++ <ProjectCreateDialog+ open={createOpen}+ onClose={() => setCreateOpen(false)}+ />+ </>+ );+}diff --git a/frontend/src/react/components/header/VersionMenuItem.tsx b/frontend/src/react/components/header/VersionMenuItem.tsxnew file mode 100644index 0000000000..c91fc9024a--- /dev/null+++ b/frontend/src/react/components/header/VersionMenuItem.tsx@@ -0,0 +1,144 @@+import { Volume2 } from "lucide-react";+import { useMemo, useState } from "react";+import { useTranslation } from "react-i18next";+import { Badge } from "@/react/components/ui/badge";+import { Button } from "@/react/components/ui/button";+import {+ Dialog,+ DialogContent,+ DialogDescription,+ DialogTitle,+} from "@/react/components/ui/dialog";+import { useVueState } from "@/react/hooks/useVueState";+import { router } from "@/router";+import { SETTING_ROUTE_WORKSPACE_SUBSCRIPTION } from "@/router/dashboard/workspaceSetting";+import { useActuatorV1Store, useSubscriptionV1Store } from "@/store";+import { PlanType } from "@/types/proto-es/v1/subscription_service_pb";+import { hasWorkspacePermissionV2 } from "@/utils";++export function VersionMenuItem({ onCloseMenu }: { onCloseMenu: () => void }) {+ const { t } = useTranslation();+ const actuatorStore = useActuatorV1Store();+ const subscriptionStore = useSubscriptionV1Store();+ const [dialogOpen, setDialogOpen] = useState(false);++ const isDemo = useVueState(() => actuatorStore.isDemo);+ const isSaaSMode = useVueState(() => actuatorStore.isSaaSMode);+ const version = useVueState(() => actuatorStore.version);+ const gitCommitBE = useVueState(() => actuatorStore.gitCommitBE);+ const gitCommitFE = useVueState(() => actuatorStore.gitCommitFE);+ const hasNewRelease = useVueState(() => actuatorStore.hasNewRelease);+ const releaseLatest = useVueState(() => actuatorStore.releaseInfo.latest);+ const currentPlan = useVueState(() => subscriptionStore.currentPlan);+ const purchaseLicenseUrl = useVueState(+ () => subscriptionStore.purchaseLicenseUrl+ );+ const isSelfHostLicense = useVueState(+ () => subscriptionStore.isSelfHostLicense+ );++ const planLabel = useMemo(() => {+ switch (currentPlan) {+ case PlanType.TEAM:+ return t("subscription.plan.team.title");+ case PlanType.ENTERPRISE:+ return t("subscription.plan.enterprise.title");+ default:+ return t("subscription.plan.free.title");+ }+ }, [currentPlan, t]);++ const formattedVersion = useMemo(() => {+ if (version && version.split(".").length === 3) {+ return `v${version}`;+ }+ return version || "unknown";+ }, [version]);++ const releaseLink = isSelfHostLicense+ ? "https://docs.bytebase.com/get-started/self-host-vs-cloud"+ : purchaseLicenseUrl;++ return (+ <>+ <div className="px-3 py-2">+ <div className="mb-2 flex items-center gap-x-2">+ {isDemo ? (+ <Badge variant="secondary">{t("common.demo-mode")}</Badge>+ ) : hasWorkspacePermissionV2("bb.settings.set") ? (+ <button+ type="button"+ className="cursor-pointer text-sm text-accent hover:underline"+ onClick={() => {+ void router.push({+ name: SETTING_ROUTE_WORKSPACE_SUBSCRIPTION,+ });+ onCloseMenu();+ }}+ >+ {planLabel}+ </button>+ ) : (+ <span className="text-sm text-control-light">{planLabel}</span>+ )}+ </div>++ <button+ type="button"+ className="flex w-full items-center justify-between gap-x-2 rounded-sm px-0 py-1 text-left text-sm text-control hover:text-accent"+ onClick={() => {+ if (hasNewRelease) {+ onCloseMenu();+ setDialogOpen(true);+ }+ }}+ >+ <span className="flex items-center gap-x-2">+ {hasNewRelease ? (+ <Volume2 className="h-4 w-4 text-success" />+ ) : null}+ {formattedVersion}+ </span>+ </button>++ {!isSaaSMode ? (+ <div className="mt-1 text-xs text-control-light">+ <div>BE Git hash: {gitCommitBE.slice(0, 7)}</div>+ <div>FE Git hash: {gitCommitFE.slice(0, 7)}</div>+ </div>+ ) : null}+ </div>++ <Dialog+ open={dialogOpen}+ onOpenChange={(next) => {+ setDialogOpen(next);+ }}+ >+ <DialogContent className="max-w-lg p-6">+ <DialogTitle>+ {t("remind.release.new-version-available-with-tag", {+ tag: releaseLatest?.tag_name ?? "",+ })}+ </DialogTitle>+ <DialogDescription className="mt-2">+ {releaseLatest?.html_url ?? releaseLink}+ </DialogDescription>+ <div className="mt-6 flex justify-end gap-x-2">+ <Button variant="ghost" onClick={() => setDialogOpen(false)}>+ {t("common.dismiss")}+ </Button>+ <Button+ onClick={() => {+ window.open(releaseLatest?.html_url ?? releaseLink, "_blank");+ setDialogOpen(false);+ }}+ >+ {t("common.learn-more")}+ </Button>+ </div>+ </DialogContent>+ </Dialog>+ </>+ );+}diff --git a/frontend/src/react/components/header/common.ts b/frontend/src/react/components/header/common.tsnew file mode 100644index 0000000000..3950ec7245--- /dev/null+++ b/frontend/src/react/components/header/common.ts@@ -0,0 +1,51 @@+import i18n from "@/plugins/i18n";+import { router } from "@/router";+import type { useUIStateStore } from "@/store";+import { emitStorageChangedEvent, setDocumentTitle } from "@/utils";+import { STORAGE_KEY_LANGUAGE } from "@/utils/storage-keys";++export type HeaderLocaleOption = {+ label: string;+ value: string;+};++export const HEADER_LANGUAGE_OPTIONS: HeaderLocaleOption[] = [+ { label: "English", value: "en-US" },+ { label: "简体中文", value: "zh-CN" },+ { label: "Español", value: "es-ES" },+ { label: "日本語", value: "ja-JP" },+ { label: "Tiếng việt", value: "vi-VN" },+];++export function setAppLocale(lang: string) {+ i18n.global.locale.value = lang;+ localStorage.setItem(STORAGE_KEY_LANGUAGE, JSON.stringify(lang));+ emitStorageChangedEvent();++ const route = router.currentRoute.value;+ if (route.meta.title) {+ setDocumentTitle(route.meta.title(route));+ }+}++export function resetQuickstartProgress(+ uiStateStore: ReturnType<typeof useUIStateStore>+) {+ const keys = [+ "hidden",+ "issue.visit",+ "project.visit",+ "environment.visit",+ "instance.visit",+ "database.visit",+ "member.visit",+ "data.query",+ ];++ for (const key of keys) {+ void uiStateStore.saveIntroStateByKey({+ key,+ newState: false,+ });+ }+}diff --git a/frontend/src/react/components/sql-editor/Welcome.test.tsx b/frontend/src/react/components/sql-editor/Welcome.test.tsxindex 3e2b1b95bf..3871d6f642 100644--- a/frontend/src/react/components/sql-editor/Welcome.test.tsx+++ b/frontend/src/react/components/sql-editor/Welcome.test.tsx@@ -28,6 +28,10 @@ vi.mock("@/react/components/PermissionGuard", () => ({usePermissionCheck: mocks.usePermissionCheck,}));+vi.mock("@/react/components/BytebaseLogo", () => ({+ BytebaseLogo: () => null,+}));+vi.mock("@/react/hooks/useVueState", () => ({useVueState: mocks.useVueState,}));@@ -38,6 +42,7 @@ vi.mock("@/router", () => ({vi.mock("@/router/dashboard/workspaceRoutes", () => ({INSTANCE_ROUTE_DASHBOARD: "workspace.instance",+ PROJECT_V1_ROUTE_DASHBOARD: "workspace.project",}));vi.mock("@/store", () => ({diff --git a/frontend/src/react/components/ui/dropdown-menu.tsx b/frontend/src/react/components/ui/dropdown-menu.tsxindex c2404efb68..3d09f91bb5 100644--- a/frontend/src/react/components/ui/dropdown-menu.tsx+++ b/frontend/src/react/components/ui/dropdown-menu.tsx@@ -18,6 +18,7 @@ function DropdownMenu({// Re-exported as-is so callers pass their own className/children. Base UI// renders it as a <button> element by default.const DropdownMenuTrigger = BaseMenu.Trigger;+const DropdownMenuSubmenu = BaseMenu.SubmenuRoot;// ---- Portal + Positioner + Popup ----function DropdownMenuContent({@@ -54,6 +55,41 @@ function DropdownMenuContent({);}+function DropdownMenuSubmenuContent({+ className,+ children,+ sideOffset = 4,+ align = "start",+ ref,+ ...props+}: ComponentProps<typeof BaseMenu.Popup> & {+ sideOffset?: ComponentProps<typeof BaseMenu.Positioner>["sideOffset"];+ align?: ComponentProps<typeof BaseMenu.Positioner>["align"];+}) {+ return (+ <BaseMenu.Portal container={getLayerRoot("overlay")}>+ <BaseMenu.Positioner+ side="right"+ sideOffset={sideOffset}+ align={align}+ className={LAYER_SURFACE_CLASS}+ >+ <BaseMenu.Popup+ ref={ref}+ className={cn(+ "min-w-[10rem] overflow-hidden rounded-sm border border-control-border bg-background py-1 shadow-md",+ "focus:outline-hidden",+ className+ )}+ {...props}+ >+ {children}+ </BaseMenu.Popup>+ </BaseMenu.Positioner>+ </BaseMenu.Portal>+ );+}+// ---- Item ----function DropdownMenuItem({className,@@ -78,6 +114,29 @@ function DropdownMenuItem({);}+function DropdownMenuSubmenuTrigger({+ className,+ children,+ ref,+ ...props+}: ComponentProps<typeof BaseMenu.SubmenuTrigger>) {+ return (+ <BaseMenu.SubmenuTrigger+ ref={ref}+ className={cn(+ "relative flex items-center gap-x-2 px-3 py-2 text-sm cursor-pointer select-none",+ "hover:bg-control-bg focus:bg-control-bg outline-hidden",+ "data-highlighted:bg-control-bg",+ "data-disabled:pointer-events-none data-disabled:opacity-50",+ className+ )}+ {...props}+ >+ {children}+ </BaseMenu.SubmenuTrigger>+ );+}+// ---- Separator ----function DropdownMenuSeparator({className,@@ -96,6 +155,9 @@ function DropdownMenuSeparator({export {DropdownMenu,DropdownMenuTrigger,+ DropdownMenuSubmenu,+ DropdownMenuSubmenuContent,+ DropdownMenuSubmenuTrigger,DropdownMenuContent,DropdownMenuItem,DropdownMenuSeparator,diff --git a/frontend/src/react/dashboard-shell.ts b/frontend/src/react/dashboard-shell.tsnew file mode 100644index 0000000000..cb38faeaa6--- /dev/null+++ b/frontend/src/react/dashboard-shell.ts@@ -0,0 +1,25 @@+export type DashboardFrameShellTargets = {+ banner: HTMLDivElement | null;+ body: HTMLDivElement | null;+};++export type DashboardShellTargets = {+ desktopSidebar: HTMLDivElement | null;+ mobileSidebar: HTMLDivElement | null;+ content: HTMLDivElement | null;+ quickstart: HTMLDivElement | null;+ mainContainer: HTMLDivElement | null;+};++export type DashboardBodyShellVariant = "workspace" | "issues";++export type DashboardFrameShellProps = {+ onReady?: (targets: DashboardFrameShellTargets) => void;+};++export type DashboardBodyShellProps = {+ variant: DashboardBodyShellVariant;+ isRootPath?: boolean;+ routeKey?: string;+ onReady?: (targets: DashboardShellTargets) => void;+};diff --git a/frontend/src/react/locales/en-US.json b/frontend/src/react/locales/en-US.jsonindex bcaaf39a60..2dd1b26752 100644--- a/frontend/src/react/locales/en-US.json+++ b/frontend/src/react/locales/en-US.json@@ -52,6 +52,7 @@"reply": "Reply","result": "Result","retry-last-chat-turn": "Retry",+ "self": "Agent","send": "Send","stop": "Stop","tool-answer": "Answer",@@ -69,6 +70,7 @@"unarchive-all-chats": "Unarchive all chats","unarchive-chat": "Unarchive chat"},+ "agent.self": "Agent","audit-log": {"advanced-search": {"scope": {@@ -210,6 +212,7 @@"archive-resource": "Archive {{type}}","archived": "Archived","back": "Back",+ "back-to-workspace": "Back to workspace","bypassed": "Bypassed","cancel": "Cancel","cannot-undo-this-action": "You cannot undo this action",@@ -247,6 +250,7 @@"delete-resource": "Delete {{type}}","delete-resource-description": "Once you delete \"{{name}}\", there is no going back. Please be certain.","deleted": "Deleted",+ "demo-mode": "Demo","deny": "Deny","description": "Description","deselect-all": "Deselect all",@@ -294,8 +298,10 @@"items": "items","key": "Key","labels": "Labels",+ "language": "Language","learn-more": "Learn more","leave-without-saving": "Leave without saving?",+ "license": "License","load-more": "Load more","loading": "Loading","logout": "Logout",@@ -327,6 +333,7 @@"projects": "Projects","read-only": "Read-only","reason": "Reason",+ "recent": "Recent","refresh": "Refresh","regenerate": "Regenerate","reject": "Reject",@@ -404,6 +411,7 @@"version": "Version","view": "View","view-details": "View Details",+ "want-help": "Want help","warning": "Warning","webhooks": "Webhooks","write-only": "write only",@@ -416,11 +424,13 @@"common.and": "and","common.archive": "Archive","common.archived": "Archived",+ "common.back-to-workspace": "Back to workspace","common.cancel": "Cancel","common.canceled": "Canceled","common.cannot-undo-this-action": "You cannot undo this action","common.catalog": "Catalog","common.close": "Close",+ "common.close-mobile-sidebar": "Close mobile sidebar","common.collapse": "Collapse","common.column": "Column","common.comment": "Comment",@@ -437,6 +447,7 @@"common.delete": "Delete","common.delete-resource": "Delete {{type}}","common.deleted": "Deleted",+ "common.demo-mode": "Demo","common.deploying": "Deploying","common.detail": "Detail","common.detailed-guide": "detailed guide",@@ -449,7 +460,9 @@"common.issue": "Issue","common.key": "Key","common.labels": "Labels",+ "common.language": "Language","common.learn-more": "Learn more",+ "common.license": "License","common.line": "Line","common.load-more": "Load more","common.loading": "Loading",@@ -467,6 +480,7 @@"common.password": "Password","common.project": "Project","common.read-only": "Read-only",+ "common.recent": "Recent","common.remaining": "remaining","common.remove": "Remove","common.removed": "Removed",@@ -492,6 +506,7 @@"common.value": "Value","common.version": "Version","common.view-doc": "View doc",+ "common.want-help": "Want help","common.warning": "Warning","common.write-only": "write only","create-db": {@@ -1320,6 +1335,7 @@},"labels": "Issue Labels","leave-a-comment": "Leave a comment...",+ "my-issues": "My Issues","review": {"approve-description": "Submit feedback and approve this issue","comment-description": "Submit general feedback without approval",@@ -1389,6 +1405,7 @@"issue.data-export.limits": "Limits","issue.data-export.options": "Options","issue.issue-name": "Issue name",+ "issue.my-issues": "My Issues","issue.no-description-provided": "No description provided","issue.options-disabled-due-to-oversize": "Options are disabled because the SQL is oversized.","issue.overwrite-current-statement": "Overwrite current SQL statement",@@ -1622,6 +1639,7 @@},"revoke-role-from-member": "Revoke '{{role}}' from '{{member}}'?"},+ "select": "Select project","settings": {"confirm-archive-project": "Archiving \"{{name}}\" will make it read-only and hide it from active project lists. All issues, databases, and settings will be preserved. You can restore it later from the archived projects list.","confirm-delete-project": "Deleting \"{{name}}\" will permanently remove the project and all associated data including issues, configurations, and history. All databases in this project will be moved to the default project. This action cannot be undone.",@@ -1727,10 +1745,19 @@"webhook-url": "Webhook URL"}},+ "project.select": "Select project","quick-action": {"create-db": "Create database",+ "create-project": "Create project",+ "new-project": "New Project","request-export-data": "Request Export"},+ "quick-action.create-project": "Create project",+ "quick-action.new-project": "New Project",+ "quick-start": {+ "self": "Quick Start"+ },+ "quick-start.self": "Quick Start","release": {"and-n-more-files": "and {{count}} more files","change-tip": "This change is linked to a release artifact.",@@ -1973,6 +2000,7 @@"default-landing-page": {"default-view-changed-to-sql-editor": "The workspace's default view has been changed to SQL Editor.","go-to-sql-editor": "Go to SQL Editor",+ "go-to-workspace": "Go to workspace","self": "Default landing page","sql-editor": {"description": "Use SQL Editor to execute database changes directly, suitable for single-person use or environments that do not require supervision.",@@ -2401,6 +2429,7 @@}}},+ "settings.general.workspace.default-landing-page.go-to-workspace": "Go to workspace","setup": {"basic-info": "Basic info","data": {diff --git a/frontend/src/react/locales/es-ES.json b/frontend/src/react/locales/es-ES.jsonindex e59bb40034..5a485f12f8 100644--- a/frontend/src/react/locales/es-ES.json+++ b/frontend/src/react/locales/es-ES.json@@ -69,6 +69,7 @@"unarchive-all-chats": "Desarchivar todos los chats","unarchive-chat": "Desarchivar chat"},+ "agent.self": "Agent","audit-log": {"advanced-search": {"scope": {@@ -416,11 +417,13 @@"common.and": "y","common.archive": "Archivo","common.archived": "Archivada",+ "common.back-to-workspace": "Back to workspace","common.cancel": "Cancelar","common.canceled": "Cancelado","common.cannot-undo-this-action": "No se puede deshacer esta acción","common.catalog": "Catálogo","common.close": "Cerrar",+ "common.close-mobile-sidebar": "Close mobile sidebar","common.collapse": "Contraer","common.column": "Columna","common.comment": "Comment",@@ -437,6 +440,7 @@"common.delete": "Eliminar","common.delete-resource": "Delete {{type}}","common.deleted": "Eliminado",+ "common.demo-mode": "Demo","common.deploying": "Desplegando","common.detail": "Detail","common.detailed-guide": "guía detallada",@@ -449,7 +453,9 @@"common.issue": "Issue","common.key": "Clave","common.labels": "Etiquetas",+ "common.language": "Language","common.learn-more": "Aprender más",+ "common.license": "License","common.line": "Línea","common.load-more": "Cargar más","common.loading": "Cargando",@@ -467,6 +473,7 @@"common.password": "Contraseña","common.project": "Proyecto","common.read-only": "Solo lectura",+ "common.recent": "Recent","common.remaining": "restantes","common.remove": "Eliminar","common.removed": "Eliminado",@@ -492,6 +499,7 @@"common.value": "Valor","common.version": "Versión","common.view-doc": "Ver doc",+ "common.want-help": "Want help","common.warning": "Advertencia","common.write-only": "solo escritura","create-db": {@@ -1389,6 +1397,7 @@"issue.data-export.limits": "Límites","issue.data-export.options": "Opciones","issue.issue-name": "Issue name",+ "issue.my-issues": "My Issues","issue.no-description-provided": "No description provided","issue.options-disabled-due-to-oversize": "Las opciones están deshabilitadas porque el SQL es demasiado grande.","issue.overwrite-current-statement": "Sobrescribir la declaración SQL actual",@@ -1727,10 +1736,15 @@"webhook-url": "URL del webhook"}},+ "project.select": "Select project","quick-action": {"create-db": "Crear base de datos",+ "new-project": "Nuevo Proyecto","request-export-data": "Solicitar exportación"},+ "quick-action.create-project": "Create project",+ "quick-action.new-project": "Nuevo Proyecto",+ "quick-start.self": "Quick Start","release": {"and-n-more-files": "and {{count}} more files","change-tip": "This change is linked to a release artifact.",@@ -2401,6 +2415,7 @@}}},+ "settings.general.workspace.default-landing-page.go-to-workspace": "Go to workspace","setup": {"basic-info": "Información básica","data": {diff --git a/frontend/src/react/locales/ja-JP.json b/frontend/src/react/locales/ja-JP.jsonindex 5361701144..2cea857b4b 100644--- a/frontend/src/react/locales/ja-JP.json+++ b/frontend/src/react/locales/ja-JP.json@@ -69,6 +69,7 @@"unarchive-all-chats": "すべてのチャットのアーカイブを解除","unarchive-chat": "アーカイブ解除"},+ "agent.self": "Agent","audit-log": {"advanced-search": {"scope": {@@ -416,11 +417,13 @@"common.and": "と","common.archive": "アーカイブ","common.archived": "アーカイブ済み",+ "common.back-to-workspace": "Back to workspace","common.cancel": "キャンセル","common.canceled": "キャンセル","common.cannot-undo-this-action": "この操作は元に戻せません","common.catalog": "カタログ","common.close": "閉じる",+ "common.close-mobile-sidebar": "Close mobile sidebar","common.collapse": "折りたたむ","common.column": "列","common.comment": "Comment",@@ -437,6 +440,7 @@"common.delete": "消去","common.delete-resource": "Delete {{type}}","common.deleted": "削除されました",+ "common.demo-mode": "Demo","common.deploying": "デプロイ中","common.detail": "Detail","common.detailed-guide": "詳細ガイド",@@ -449,7 +453,9 @@"common.issue": "Issue","common.key": "キー","common.labels": "ラベル",+ "common.language": "Language","common.learn-more": "もっと詳しく知る",+ "common.license": "License","common.line": "行","common.load-more": "さらに読み込む","common.loading": "読み込み中",@@ -467,6 +473,7 @@"common.password": "パスワード","common.project": "プロジェクト","common.read-only": "読み取り専用",+ "common.recent": "Recent","common.remaining": "残り","common.remove": "削除","common.removed": "削除されました",@@ -492,6 +499,7 @@"common.value": "値","common.version": "バージョン","common.view-doc": "ドキュメントを見る",+ "common.want-help": "Want help","common.warning": "警告する","common.write-only": "書き込み専用","create-db": {@@ -1389,6 +1397,7 @@"issue.data-export.limits": "制限","issue.data-export.options": "オプション","issue.issue-name": "Issue name",+ "issue.my-issues": "My Issues","issue.no-description-provided": "No description provided","issue.options-disabled-due-to-oversize": "SQL が大きすぎるため、オプションは無効になっています。","issue.overwrite-current-statement": "現在の SQL ステートメントを上書きする",@@ -1727,10 +1736,15 @@"webhook-url": "Webhook URL"}},+ "project.select": "Select project","quick-action": {"create-db": "データベースの作成",+ "new-project": "作成するプロジェクト","request-export-data": "データ出力を申請する"},+ "quick-action.create-project": "Create project",+ "quick-action.new-project": "作成するプロジェクト",+ "quick-start.self": "Quick Start","release": {"and-n-more-files": "and {{count}} more files","change-tip": "This change is linked to a release artifact.",@@ -2401,6 +2415,7 @@}}},+ "settings.general.workspace.default-landing-page.go-to-workspace": "Go to workspace","setup": {"basic-info": "基本情報","data": {diff --git a/frontend/src/react/locales/vi-VN.json b/frontend/src/react/locales/vi-VN.jsonindex 4a5eea94d0..2c55a4d753 100644--- a/frontend/src/react/locales/vi-VN.json+++ b/frontend/src/react/locales/vi-VN.json@@ -69,6 +69,7 @@"unarchive-all-chats": "Bỏ lưu trữ tất cả cuộc trò chuyện","unarchive-chat": "Bỏ lưu trữ"},+ "agent.self": "Agent","audit-log": {"advanced-search": {"scope": {@@ -416,11 +417,13 @@"common.and": "và","common.archive": "Lưu trữ","common.archived": "Đã lưu trữ",+ "common.back-to-workspace": "Back to workspace","common.cancel": "Hủy","common.canceled": "Đã hủy","common.cannot-undo-this-action": "Bạn không thể hoàn tác hành động này.","common.catalog": "Danh mục","common.close": "Đóng",+ "common.close-mobile-sidebar": "Close mobile sidebar","common.collapse": "Thu gọn","common.column": "Cột","common.comment": "Comment",@@ -437,6 +440,7 @@"common.delete": "Xóa","common.delete-resource": "Delete {{type}}","common.deleted": "Đã xóa",+ "common.demo-mode": "Demo","common.deploying": "Đang triển khai","common.detail": "Detail","common.detailed-guide": "Hướng dẫn chi tiết",@@ -449,7 +453,9 @@"common.issue": "Issue","common.key": "Khóa","common.labels": "Nhãn",+ "common.language": "Language","common.learn-more": "Tìm hiểu thêm",+ "common.license": "License","common.line": "Dòng","common.load-more": "Tải thêm","common.loading": "Đang tải",@@ -467,6 +473,7 @@"common.password": "Mật khẩu","common.project": "Dự án","common.read-only": "Chỉ đọc",+ "common.recent": "Recent","common.remaining": "còn lại","common.remove": "Xóa","common.removed": "LOẠI BỎ",@@ -492,6 +499,7 @@"common.value": "Giá trị","common.version": "Phiên bản","common.view-doc": "Xem tài liệu",+ "common.want-help": "Want help","common.warning": "Cảnh báo","common.write-only": "chỉ ghi","create-db": {@@ -1389,6 +1397,7 @@"issue.data-export.limits": "Giới hạn","issue.data-export.options": "Tùy chọn","issue.issue-name": "Issue name",+ "issue.my-issues": "My Issues","issue.no-description-provided": "No description provided","issue.options-disabled-due-to-oversize": "Các tùy chọn bị vô hiệu hóa vì SQL quá lớn.","issue.overwrite-current-statement": "Ghi đè câu lệnh SQL hiện tại",@@ -1727,10 +1736,15 @@"webhook-url": "URL Webhook"}},+ "project.select": "Select project","quick-action": {"create-db": "Tạo cơ sở dữ liệu",+ "new-project": "Mới Dự án","request-export-data": "Yêu cầu Xuất"},+ "quick-action.create-project": "Create project",+ "quick-action.new-project": "Mới Dự án",+ "quick-start.self": "Quick Start","release": {"and-n-more-files": "and {{count}} more files","change-tip": "This change is linked to a release artifact.",@@ -2401,6 +2415,7 @@}}},+ "settings.general.workspace.default-landing-page.go-to-workspace": "Go to workspace","setup": {"basic-info": "Thông tin cơ bản","data": {diff --git a/frontend/src/react/locales/zh-CN.json b/frontend/src/react/locales/zh-CN.jsonindex 70899cb5e1..648006e846 100644--- a/frontend/src/react/locales/zh-CN.json+++ b/frontend/src/react/locales/zh-CN.json@@ -69,6 +69,7 @@"unarchive-all-chats": "取消归档所有对话","unarchive-chat": "取消归档"},+ "agent.self": "Agent","audit-log": {"advanced-search": {"scope": {@@ -416,11 +417,13 @@"common.and": "和","common.archive": "归档","common.archived": "已归档",+ "common.back-to-workspace": "Back to workspace","common.cancel": "取消","common.canceled": "已取消","common.cannot-undo-this-action": "这个操作无法撤销","common.catalog": "Catalog","common.close": "关闭",+ "common.close-mobile-sidebar": "关闭移动端侧边栏","common.collapse": "收起","common.column": "列","common.comment": "Comment",@@ -437,6 +440,7 @@"common.delete": "删除","common.delete-resource": "删除{{type}}","common.deleted": "已删除",+ "common.demo-mode": "Demo","common.deploying": "部署中","common.detail": "Detail","common.detailed-guide": "详细指南",@@ -449,7 +453,9 @@"common.issue": "工单","common.key": "键","common.labels": "标签",+ "common.language": "Language","common.learn-more": "了解更多",+ "common.license": "License","common.line": "行","common.load-more": "加载更多","common.loading": "加载中",@@ -467,6 +473,7 @@"common.password": "密码","common.project": "项目","common.read-only": "只读",+ "common.recent": "Recent","common.remaining": "剩余","common.remove": "删除","common.removed": "已移除",@@ -492,6 +499,7 @@"common.value": "值","common.version": "版本","common.view-doc": "查看文档",+ "common.want-help": "Want help","common.warning": "警告","common.write-only": "仅写入","create-db": {@@ -1389,6 +1397,7 @@"issue.data-export.limits": "限制","issue.data-export.options": "选项","issue.issue-name": "Issue name",+ "issue.my-issues": "My Issues","issue.no-description-provided": "No description provided","issue.options-disabled-due-to-oversize": "由于 SQL 文件过大,选项已禁用。","issue.overwrite-current-statement": "覆盖当前的 SQL 语句",@@ -1727,10 +1736,15 @@"webhook-url": "Webhook URL"}},+ "project.select": "Select project","quick-action": {"create-db": "创建数据库",+ "new-project": "创建项目","request-export-data": "申请导出数据"},+ "quick-action.create-project": "Create project",+ "quick-action.new-project": "创建项目",+ "quick-start.self": "Quick Start","release": {"and-n-more-files": "以及另外 {{count}} 个文件","change-tip": "该变更关联到了一个发布包。",@@ -2401,6 +2415,7 @@}}},+ "settings.general.workspace.default-landing-page.go-to-workspace": "Go to workspace","setup": {"basic-info": "基本信息","data": {diff --git a/frontend/src/react/mount.ts b/frontend/src/react/mount.tsindex 1d77831b9e..3b8b8e9580 100644--- a/frontend/src/react/mount.ts+++ b/frontend/src/react/mount.ts@@ -14,9 +14,10 @@ const authComponentLoaders = import.meta.glob([const sqlEditorComponentLoaders = import.meta.glob("./components/sql-editor/*.tsx");-const sharedComponentLoaders = import.meta.glob(- "./components/ClassificationTree.tsx"-);+const sharedComponentLoaders = import.meta.glob([+ "./components/*.tsx",+ "!./components/*.test.tsx",+]);const pageLoaders = {...settingsPageLoaders,...projectPageLoaders,diff --git a/frontend/src/react/pages/settings/LandingPage.tsx b/frontend/src/react/pages/settings/LandingPage.tsxindex 2a5ecbe4f5..04f7546e2c 100644--- a/frontend/src/react/pages/settings/LandingPage.tsx+++ b/frontend/src/react/pages/settings/LandingPage.tsx@@ -22,6 +22,7 @@ import {useState,} from "react";import { useTranslation } from "react-i18next";+import { ProjectSwitchDialog } from "@/react/components/header/ProjectSwitchDialog";import {Sheet,SheetBody,@@ -430,13 +431,10 @@ function ConfigSheet({// LandingPage// ----------------------------------------------------------------------------export function LandingPage({- onOpenProjectSwitch,-}: {- onOpenProjectSwitch?: () => void;-} = {}) {+export function LandingPage(_: Record<string, never> = {}) {const { t } = useTranslation();const [showConfigDrawer, setShowConfigDrawer] = useState(false);+ const [showProjectSwitchDialog, setShowProjectSwitchDialog] = useState(false);const email = useVueState(() => useCurrentUserV1().value.email);const version = useVueState(() => useActuatorV1Store().version);@@ -459,27 +457,20 @@ export function LandingPage({[config, fullList]);- const handleClick = useCallback(- (link: QuickLinkDef) => {- if (link.route) {- router.push({ name: link.route });- return;- }- switch (link.id) {- case "visit-projects":- if (onOpenProjectSwitch) {- onOpenProjectSwitch();- } else {- router.push({ name: PROJECT_V1_ROUTE_DASHBOARD });- }- break;- case "visit-issues":- router.push({ name: WORKSPACE_ROUTE_MY_ISSUES });- break;- }- },- [onOpenProjectSwitch]- );+ const handleClick = useCallback((link: QuickLinkDef) => {+ if (link.route) {+ router.push({ name: link.route });+ return;+ }+ switch (link.id) {+ case "visit-projects":+ setShowProjectSwitchDialog(true);+ break;+ case "visit-issues":+ router.push({ name: WORKSPACE_ROUTE_MY_ISSUES });+ break;+ }+ }, []);return (<>@@ -572,6 +563,11 @@ export function LandingPage({config={config}setConfig={setConfig}/>++ <ProjectSwitchDialog+ open={showProjectSwitchDialog}+ onClose={() => setShowProjectSwitchDialog(false)}+ /></>);}diff --git a/frontend/src/react/pages/settings/ProjectsPage.tsx b/frontend/src/react/pages/settings/ProjectsPage.tsxindex 5ce2d1bd2b..dde2a51bbc 100644--- a/frontend/src/react/pages/settings/ProjectsPage.tsx+++ b/frontend/src/react/pages/settings/ProjectsPage.tsx@@ -1,4 +1,3 @@-import { Code, ConnectError } from "@connectrpc/connect";import { sortBy, uniq } from "lodash-es";import {Archive,@@ -16,11 +15,8 @@ import {type ScopeOption,type SearchParams,} from "@/react/components/AdvancedSearch";+import { ProjectCreateDialog } from "@/react/components/header/ProjectCreateDialog";import { PermissionGuard } from "@/react/components/PermissionGuard";-import {- ResourceIdField,- type ResourceIdFieldRef,-} from "@/react/components/ResourceIdField";import { Badge } from "@/react/components/ui/badge";import { Button } from "@/react/components/ui/button";import {@@ -29,15 +25,6 @@ import {DropdownMenuItem,DropdownMenuTrigger,} from "@/react/components/ui/dropdown-menu";-import { Input } from "@/react/components/ui/input";-import {- Sheet,- SheetBody,- SheetContent,- SheetFooter,- SheetHeader,- SheetTitle,-} from "@/react/components/ui/sheet";import { PagedTableFooter } from "@/react/hooks/usePagedData";import { useVueState } from "@/react/hooks/useVueState";import { cn } from "@/react/lib/utils";@@ -50,8 +37,7 @@ import {useProjectV1Store,useUIStateStore,} from "@/store";-import { getProjectName, projectNamePrefix } from "@/store/modules/v1/common";-import { unknownProject } from "@/types";+import { getProjectName } from "@/store/modules/v1/common";import { State } from "@/types/proto-es/v1/common_pb";import type { Project } from "@/types/proto-es/v1/project_service_pb";import {@@ -211,158 +197,6 @@ function ConfirmDialog({);}-// ============================================================-// CreateProjectSheet-// ============================================================--function CreateProjectSheet({- open,- onClose,- onCreated,-}: {- open: boolean;- onClose: () => void;- onCreated: (project: Project) => void;-}) {- const { t } = useTranslation();- const projectStore = useProjectV1Store();- const [title, setTitle] = useState("");- const [resourceId, setResourceId] = useState("");- const [isCreating, setIsCreating] = useState(false);- const [isResourceIdValid, setIsResourceIdValid] = useState(false);- const resourceIdFieldRef = useRef<ResourceIdFieldRef>(null);-- // Reset form state whenever the Sheet is (re)opened. Sheet is always- // mounted so useState initializers only run on first mount.- useEffect(() => {- if (!open) return;- setTitle("");- setResourceId("");- setIsCreating(false);- }, [open]);-- const allowCreate = useMemo(() => {- if (!title.trim()) return false;- if (!isResourceIdValid) return false;- if (!hasWorkspacePermissionV2("bb.projects.create")) return false;- return true;- }, [title, isResourceIdValid]);-- const handleCreate = useCallback(async () => {- if (!allowCreate || isCreating) return;- try {- setIsCreating(true);- const project = { ...unknownProject(), title };- const created = await projectStore.createProject(project, resourceId);-- pushNotification({- module: "bytebase",- style: "SUCCESS",- title: t("project.create-modal.success-prompt", {- name: created.title,- }),- });-- onCreated(created);- onClose();- } catch (error) {- if (error instanceof ConnectError && error.code === Code.AlreadyExists) {- resourceIdFieldRef.current?.addValidationError(- (error as ConnectError).message- );- } else {- throw error;- }- } finally {- setIsCreating(false);- }- }, [- allowCreate,- isCreating,- title,- resourceId,- projectStore,- t,- onCreated,- onClose,- ]);-- const validate = useCallback(- async (id: string) => {- try {- await projectStore.getOrFetchProjectByName(- `${projectNamePrefix}${id}`,- true- );- return [- {- type: "error" as const,- message: t("resource-id.validation.duplicated", {- resource: "project",- }),- },- ];- } catch {- return [];- }- },- [projectStore, t]- );-- return (- <Sheet open={open} onOpenChange={(next) => !next && onClose()}>- <SheetContent width="standard">- <SheetHeader>- <SheetTitle>{t("common.project")}</SheetTitle>- </SheetHeader>-- <SheetBody>- <div className="flex flex-col gap-y-6">- <div>- <label className="text-base leading-6 font-medium text-control">- {t("project.create-modal.project-name")}- <span className="text-error ml-0.5">*</span>- </label>- <Input- className="mt-2 mb-1"- value={title}- maxLength={200}- placeholder={t("project.create-modal.project-name")}- onChange={(e) => setTitle(e.target.value)}- />- <ResourceIdField- ref={resourceIdFieldRef}- value={resourceId}- resourceType="project"- resourceName={title}- resourceTitle={title}- validate={validate}- onChange={setResourceId}- onValidationChange={setIsResourceIdValid}- />- </div>- </div>-- {isCreating && (- <div className="absolute inset-0 bg-background/50 flex justify-center items-center">- <div className="animate-spin size-6 border-2 border-accent border-t-transparent rounded-full" />- </div>- )}- </SheetBody>-- <SheetFooter>- <Button variant="ghost" onClick={onClose}>- {t("common.cancel")}- </Button>- <Button disabled={!allowCreate} onClick={handleCreate}>- {t("common.create")}- </Button>- </SheetFooter>- </SheetContent>- </Sheet>- );-}-// ============================================================// BatchOperationsBar// ============================================================@@ -1194,7 +1028,7 @@ export function ProjectsPage() {</div>{/* Create drawer */}- <CreateProjectSheet+ <ProjectCreateDialogopen={showCreateDrawer}onClose={() => setShowCreateDrawer(false)}onCreated={handleCreated}diff --git a/frontend/src/views/DashboardHeader.vue b/frontend/src/views/DashboardHeader.vuedeleted file mode 100644index c9df78a524..0000000000--- a/frontend/src/views/DashboardHeader.vue+++ /dev/null@@ -1,203 +0,0 @@-<template>- <div class="flex items-center justify-between h-10 px-3 sm:px-4 my-1 gap-x-1 sm:gap-x-3">- <BytebaseLogo- v-if="showLogo"- class="h-10"- :redirect="WORKSPACE_ROUTE_LANDING"- />- <button- v-if="showMobileSidebarToggle"- type="button"- class="md:hidden p-1 text-gray-500 hover:text-gray-900"- @click="$emit('toggle-mobile-sidebar')"- >- <MenuIcon class="w-4 h-4" />- </button>- <ProjectSwitchPopover />-- <div class="flex-1 flex justify-end items-center gap-x-2">- <NButton size="small" @click="agentStore.toggle()">- <template #icon>- <BotIcon class="w-4 h-4" />- </template>- <span v-if="windowWidth >= 640">{{ $t("agent.self") }}</span>- </NButton>-- <NButton- v-if="currentPlan === PlanType.FREE"- size="small"- type="success"- @click="handleWantHelp"- >- <template #icon>- <MessagesSquareIcon class="w-4 h-4" />- </template>- <span class="hidden lg:block">{{ $t("common.want-help") }}</span>- </NButton>-- <router-link- :to="sqlEditorLink"- class="flex"- exact-active-class=""- target="_blank"- >- <NButton size="small">- <template #icon>- <SquareTerminalIcon class="w-4 h-auto" />- </template>- <span v-if="windowWidth >= 640" class="whitespace-nowrap">{{- $t("sql-editor.self")- }}</span>- </NButton>- </router-link>-- <router-link :to="myIssueLink" class="flex">- <NButton size="small" @click="goToMyIssues">- <template #icon>- <CircleDotIcon class="w-4" />- </template>- <span v-if="windowWidth >= 640">{{ $t("issue.my-issues") }}</span>- </NButton>- </router-link>-- <ProfileBrandingLogo size="medium">- <ProfileDropdown :link="true" />- </ProfileBrandingLogo>- </div>- </div>-</template>--<script lang="ts" setup>-import { computedAsync, useLocalStorage, useWindowSize } from "@vueuse/core";-import {- BotIcon,- CircleDotIcon,- MenuIcon,- MessagesSquareIcon,- SquareTerminalIcon,-} from "lucide-vue-next";-import { NButton } from "naive-ui";-import { storeToRefs } from "pinia";-import { v4 as uuidv4 } from "uuid";-import { computed } from "vue";-import { useRoute, useRouter } from "vue-router";-import ProjectSwitchPopover from "@/components/Project/ProjectSwitch/ProjectSwitchPopover.vue";-import { useAgentStore } from "@/react/plugins/agent/store/agent";-import {- WORKSPACE_ROUTE_LANDING,- WORKSPACE_ROUTE_MY_ISSUES,-} from "@/router/dashboard/workspaceRoutes";-import {- SQL_EDITOR_DATABASE_MODULE,- SQL_EDITOR_HOME_MODULE,- SQL_EDITOR_PROJECT_MODULE,-} from "@/router/sqlEditor";-import { useRecentVisit } from "@/router/useRecentVisit";-import {- databaseNamePrefix,- instanceNamePrefix,- useCurrentProjectV1,- useDatabaseV1Store,- useSubscriptionV1Store,-} from "@/store";-import { PlanType } from "@/types/proto-es/v1/subscription_service_pb";-import {- extractDatabaseResourceName,- extractProjectResourceName,- STORAGE_KEY_MY_ISSUES_TAB,-} from "@/utils";-import BytebaseLogo from "../components/BytebaseLogo.vue";-import ProfileBrandingLogo from "../components/ProfileBrandingLogo.vue";-import ProfileDropdown from "../components/ProfileDropdown.vue";-import {- isValidDatabaseName,- isValidProjectName,- unknownDatabase,-} from "../types";--defineProps<{- showLogo: boolean;- showMobileSidebarToggle?: boolean;-}>();--defineEmits<{- "toggle-mobile-sidebar": [];-}>();--const agentStore = { toggle: () => useAgentStore.getState().toggle() };-const subscriptionStore = useSubscriptionV1Store();-const route = useRoute();-const router = useRouter();-const { record } = useRecentVisit();-const { width: windowWidth } = useWindowSize();--const params = computed(() => {- return {- projectId: route.params.projectId as string | undefined,- instanceId: route.params.instanceId as string | undefined,- databaseName: route.params.databaseName as string | undefined,- changelogId: route.params.changelogId as string | undefined,- };-});--const { project } = useCurrentProjectV1();--const database = computedAsync(async () => {- if (params.value.changelogId) {- const parent = `${instanceNamePrefix}${route.params.instanceId}/${databaseNamePrefix}${route.params.databaseName}`;- return await useDatabaseV1Store().getOrFetchDatabaseByName(parent);- } else if (params.value.databaseName) {- return await useDatabaseV1Store().getOrFetchDatabaseByName(- `${instanceNamePrefix}${- params.value.instanceId- }/${databaseNamePrefix}${params.value.databaseName}`- );- }- return unknownDatabase();-}, unknownDatabase());--const { currentPlan } = storeToRefs(subscriptionStore);--const sqlEditorLink = computed(() => {- if (isValidProjectName(project.value.name)) {- if (isValidDatabaseName(database.value.name)) {- const { instanceName, databaseName } = extractDatabaseResourceName(- database.value.name- );- return router.resolve({- name: SQL_EDITOR_DATABASE_MODULE,- params: {- project: extractProjectResourceName(project.value.name),- instance: instanceName,- database: databaseName,- },- });- }- return router.resolve({- name: SQL_EDITOR_PROJECT_MODULE,- params: {- project: extractProjectResourceName(project.value.name),- },- });- }- return router.resolve({- name: SQL_EDITOR_HOME_MODULE,- });-});--const myIssueLink = computed(() => {- return router.resolve({- name: WORKSPACE_ROUTE_MY_ISSUES,- });-});--const goToMyIssues = () => {- record(myIssueLink.value.fullPath);- // Trigger page reload manually.- useLocalStorage<string>(STORAGE_KEY_MY_ISSUES_TAB, "").value = uuidv4();-};--const handleWantHelp = () => {- window.open("https://docs.bytebase.com/faq#how-to-reach-us", "_blank");-};-</script>diff --git a/frontend/src/views/sql-editor/TabList/TabList.vue b/frontend/src/views/sql-editor/TabList/TabList.vueindex af9c1b4fc4..6568faeff6 100644--- a/frontend/src/views/sql-editor/TabList/TabList.vue+++ b/frontend/src/views/sql-editor/TabList/TabList.vue@@ -49,12 +49,10 @@</div></NScrollbar>- <ProfileBrandingLogo- size="small"- :logo-url="workspaceStore.currentWorkspace?.logo"- >- <ProfileDropdown :link="true" />- </ProfileBrandingLogo>+ <ReactPageMount+ page="HeaderProfileMenuMount"+ :page-props="{ size: 'small' }"+ /><ContextMenu ref="contextMenuRef" /></div>@@ -68,10 +66,9 @@ import scrollIntoView from "scroll-into-view-if-needed";import { computed, nextTick, onMounted, reactive, ref, watch } from "vue";import { VueDraggable } from "vue-draggable-plus";import { useI18n } from "vue-i18n";-import ProfileBrandingLogo from "@/components/ProfileBrandingLogo.vue";-import ProfileDropdown from "@/components/ProfileDropdown.vue";import { useEmitteryEventListener } from "@/composables/useEmitteryEventListener";-import { useSQLEditorTabStore, useWorkspaceV1Store } from "@/store";+import ReactPageMount from "@/react/ReactPageMount.vue";+import { useSQLEditorTabStore } from "@/store";import type { SQLEditorTab } from "@/types";import { defer, usePreventBackAndForward } from "@/utils";import { useSQLEditorContext } from "../context";@@ -87,7 +84,6 @@ type LocalState = {const tabStore = useSQLEditorTabStore();const editorContext = useSQLEditorContext();const context = useTabListContext();-const workspaceStore = useWorkspaceV1Store();const { t } = useI18n();const dialog = useDialog();