Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
fix(frontend): restore database detail UI/UX parity after React migration (#19930)
Danny Xu76afab8aeefd
diff --git a/frontend/src/components/ColumnDataTable/index.vue b/frontend/src/components/ColumnDataTable/index.vueindex 421c73ce22..afacd66b48 100644--- a/frontend/src/components/ColumnDataTable/index.vue+++ b/frontend/src/components/ColumnDataTable/index.vue@@ -132,7 +132,8 @@ const columns = computed(() => {title: t("settings.sensitive-data.semantic-types.table.semantic-type"),hide: !showSensitiveColumn.value,resizable: true,- width: 140,+ width: 180,+ minWidth: 140,render: (column) => {const columnCatalog = getColumnCatalog(databaseCatalog.value,@@ -152,7 +153,8 @@ const columns = computed(() => {key: "classification",title: t("database.classification.self"),hide: !showClassificationColumn.value,- width: 140,+ width: 200,+ minWidth: 140,resizable: true,render: (column) => {const columnCatalog = getColumnCatalog(diff --git a/frontend/src/components/Database/DatabaseChangelogPanel.vue b/frontend/src/components/Database/DatabaseChangelogPanel.vuedeleted file mode 100644index 54bca11cf5..0000000000--- a/frontend/src/components/Database/DatabaseChangelogPanel.vue+++ /dev/null@@ -1,58 +0,0 @@-<template>- <div class="flex flex-col gap-y-4" v-bind="$attrs">- <PagedTable- ref="changedlogPagedTable"- :session-key="`bb.paged-changelog-table.${database.name}`"- :fetch-list="fetchChangelogList"- >- <template #table="{ list, loading }">- <ChangelogDataTable- :key="`changelog-table.${database.name}`"- :loading="loading"- :changelogs="list"- :show-selection="false"- />- </template>- </PagedTable>- </div>-</template>--<script lang="ts" setup>-import { ref } from "vue";-import type { ComponentExposed } from "vue-component-type-helpers";-import { ChangelogDataTable } from "@/components/Changelog";-import PagedTable from "@/components/v2/Model/PagedTable.vue";-import { useChangelogStore } from "@/store";-import type {- Changelog,- Database,-} from "@/types/proto-es/v1/database_service_pb";--const props = defineProps<{- database: Database;-}>();--const changelogStore = useChangelogStore();-const changedlogPagedTable =- ref<ComponentExposed<typeof PagedTable<Changelog>>>();--const fetchChangelogList = async ({- pageToken,- pageSize,-}: {- pageToken: string;- pageSize: number;-}) => {- const { nextPageToken, changelogs } = await changelogStore.fetchChangelogList(- {- parent: props.database.name,- pageSize,- pageToken,- }- );- return {- nextPageToken,- list: changelogs,- };-};-</script>diff --git a/frontend/src/components/Database/DatabaseOverviewPanel.vue b/frontend/src/components/Database/DatabaseOverviewPanel.vuedeleted file mode 100644index 03ad8833f0..0000000000--- a/frontend/src/components/Database/DatabaseOverviewPanel.vue+++ /dev/null@@ -1,362 +0,0 @@-<template>- <div>- <!-- Description list -->- <div class="border border-block-border rounded-lg px-5 py-4">- <DatabaseOverviewInfo :database="database" />- </div>-- <ComponentPermissionGuard- :project="getDatabaseProject(database)"- :permissions="['bb.databases.getSchema']"- >- <div class="pt-6">- <div- v-if="hasSchemaPropertyV1"- class="flex flex-row justify-start items-center mb-4"- >- <span class="text-lg leading-6 font-medium text-main mr-2">Schema</span>- <NSelect- v-model:value="state.selectedSchemaName"- :options="schemaNameOptions"- :disabled="state.loading"- :placeholder="$t('database.schema.select')"- class="w-auto! min-w-48"- />- </div>-- <template v-if="databaseEngine !== Engine.REDIS">- <div class="mb-4 w-full flex flex-row justify-between items-center">- <div class="text-lg leading-6 font-medium text-main">- <span v-if="databaseEngine === Engine.MONGODB">- {{ $t("db.collections") }}- </span>- <span v-else>{{ $t("db.tables") }}</span>- </div>- <SearchBox- v-model:value="state.tableNameSearchKeyword"- :placeholder="$t('common.filter-by-name')"- :disabled="state.loading"- />- </div>-- <TableDataTable- :database="database"- :schema-name="state.selectedSchemaName"- :table-list="tableList"- :search="state.tableNameSearchKeyword.trim().toLowerCase()"- :loading="state.loading"- />-- <div class="mt-6 text-lg leading-6 font-medium text-main mb-4">- {{ $t("db.views") }}- </div>- <ViewDataTable- :database="database"- :schema-name="state.selectedSchemaName"- :view-list="viewList"- :loading="state.loading"- />-- <template- v-if="- databaseEngine === Engine.POSTGRES || databaseEngine === Engine.HIVE- "- >- <div- class="mt-6 w-full flex flex-row justify-between items-center mb-4"- >- <div class="text-lg leading-6 font-medium text-main">- {{ $t("db.external-tables") }}- </div>- <SearchBox- v-model:value="state.externalTableNameSearchKeyword"- :placeholder="$t('common.filter-by-name')"- :disabled="state.loading"- />- </div>- <ExternalTableDataTable- :database="database"- :schema-name="state.selectedSchemaName"- :external-table-list="externalTableList"- :search="state.externalTableNameSearchKeyword.trim().toLowerCase()"- :loading="state.loading"- />- </template>-- <template v-if="databaseEngine === Engine.POSTGRES">- <div class="mt-6 text-lg leading-6 font-medium text-main mb-4">- {{ $t("db.extensions") }}- </div>- <DBExtensionDataTable- :db-extension-list="dbExtensionList"- :loading="state.loading"- />- </template>-- <template- v-if="- databaseEngine === Engine.POSTGRES ||- databaseEngine === Engine.MSSQL- "- >- <div class="mt-6 text-lg leading-6 font-medium text-main mb-4">- {{ $t("db.functions") }}- </div>- <FunctionDataTable- :database="database"- :schema-name="state.selectedSchemaName"- :function-list="functionList"- :loading="state.loading"- />- </template>-- <template v-if="instanceV1SupportsSequence(databaseEngine)">- <div class="mt-6 text-lg leading-6 font-medium text-main mb-4">- {{ $t("db.sequences") }}- </div>- <SequenceDataTable- :database="database"- :schema-name="state.selectedSchemaName"- :sequence-list="sequenceList"- :loading="state.loading"- />- </template>-- <template v-if="databaseEngine === Engine.SNOWFLAKE">- <div class="mt-6 text-lg leading-6 font-medium text-main mb-4">- {{ $t("db.streams") }}- </div>- <StreamTable- :database="database"- :schema-name="state.selectedSchemaName"- :stream-list="streamList"- :loading="state.loading"- />-- <div class="mt-6 text-lg leading-6 font-medium text-main mb-4">- {{ $t("db.tasks") }}- </div>- <TaskTable- :database="database"- :schema-name="state.selectedSchemaName"- :task-list="taskList"- :loading="state.loading"- />- </template>-- <template v-if="instanceV1SupportsPackage(databaseEngine)">- <div class="mt-6 text-lg leading-6 font-medium text-main mb-4">- {{ $t("db.packages") }}- </div>- <PackageDataTable- :database="database"- :schema-name="state.selectedSchemaName"- :package-list="packageList"- :loading="state.loading"- />- </template>- </template>- </div>- </ComponentPermissionGuard>- </div>-</template>--<script lang="ts" setup>-import { head } from "lodash-es";-import { NSelect } from "naive-ui";-import { computed, reactive, watch } from "vue";-import { useI18n } from "vue-i18n";-import { useRoute, useRouter } from "vue-router";-import DBExtensionDataTable from "@/components/DBExtensionDataTable.vue";-import ExternalTableDataTable from "@/components/ExternalTableDataTable.vue";-import FunctionDataTable from "@/components/FunctionDataTable.vue";-import ComponentPermissionGuard from "@/components/Permission/ComponentPermissionGuard.vue";-import StreamTable from "@/components/StreamTable.vue";-import TableDataTable from "@/components/TableDataTable.vue";-import TaskTable from "@/components/TaskTable.vue";-import ViewDataTable from "@/components/ViewDataTable.vue";-import { useDBSchemaV1Store } from "@/store";-import { Engine } from "@/types/proto-es/v1/common_pb";-import type { Database } from "@/types/proto-es/v1/database_service_pb";-import {- getDatabaseEngine,- getDatabaseProject,- hasSchemaProperty,- instanceV1SupportsPackage,- instanceV1SupportsSequence,-} from "@/utils";-import PackageDataTable from "../PackageDataTable.vue";-import SequenceDataTable from "../SequenceDataTable.vue";-import { SearchBox } from "../v2";-import DatabaseOverviewInfo from "./DatabaseOverviewInfo.vue";--interface LocalState {- loading: boolean;- selectedSchemaName?: string;- tableNameSearchKeyword: string;- externalTableNameSearchKeyword: string;-}--const props = defineProps<{- database: Database;-}>();--const { t } = useI18n();-const route = useRoute();-const router = useRouter();-const state = reactive<LocalState>({- loading: true,- selectedSchemaName: "",- tableNameSearchKeyword: "",- externalTableNameSearchKeyword: "",-});--const dbSchemaStore = useDBSchemaV1Store();--const databaseEngine = computed(() => {- return getDatabaseEngine(props.database);-});--const hasSchemaPropertyV1 = computed(() => {- return hasSchemaProperty(databaseEngine.value);-});--const schemaList = computed(() => {- return dbSchemaStore.getSchemaList(props.database.name);-});--watch(- [() => props.database.name, schemaList],- async () => {- state.loading = true;- if (schemaList.value.length > 0) {- const schemaInQuery = route.query.schema as string;- if (- schemaInQuery &&- schemaList.value.find((schema) => schema.name === schemaInQuery)- ) {- state.selectedSchemaName = schemaInQuery;- } else {- const publicSchema = schemaList.value.find(- (schema) => schema.name.toLowerCase() === "public"- );- if (publicSchema) {- state.selectedSchemaName = publicSchema.name;- } else {- state.selectedSchemaName = head(schemaList.value)?.name || "";- }- }- } else {- state.selectedSchemaName = undefined;- }- state.loading = false;- },- { immediate: true }-);--const schemaNameOptions = computed(() => {- return schemaList.value.map((schema) => ({- value: schema.name,- label: schema.name || t("db.schema.default"),- }));-});--const tableList = computed(() => {- return dbSchemaStore.getTableList({- database: props.database.name,- schema: state.selectedSchemaName,- });-});--const viewList = computed(() => {- return dbSchemaStore.getViewList({- database: props.database.name,- schema: state.selectedSchemaName,- });-});--const dbExtensionList = computed(() => {- return dbSchemaStore.getExtensionList(props.database.name);-});--const externalTableList = computed(() => {- return dbSchemaStore.getExternalTableList({- database: props.database.name,- schema: state.selectedSchemaName,- });-});--const functionList = computed(() => {- return dbSchemaStore.getFunctionList({- database: props.database.name,- schema: state.selectedSchemaName,- });-});--const streamList = computed(() => {- if (hasSchemaPropertyV1.value) {- return (- schemaList.value.find(- (schema) => schema.name === state.selectedSchemaName- )?.streams || []- );- }- return dbSchemaStore- .getDatabaseMetadata(props.database.name)- .schemas.map((schema) => schema.streams)- .flat();-});--const taskList = computed(() => {- if (hasSchemaPropertyV1.value) {- return (- schemaList.value.find(- (schema) => schema.name === state.selectedSchemaName- )?.tasks || []- );- }- return dbSchemaStore- .getDatabaseMetadata(props.database.name)- .schemas.map((schema) => schema.tasks)- .flat();-});--const packageList = computed(() => {- if (hasSchemaPropertyV1.value) {- return (- schemaList.value.find(- (schema) => schema.name === state.selectedSchemaName- )?.packages || []- );- }- return dbSchemaStore- .getDatabaseMetadata(props.database.name)- .schemas.map((schema) => schema.packages)- .flat();-});--const sequenceList = computed(() => {- if (hasSchemaPropertyV1.value) {- return (- schemaList.value.find(- (schema) => schema.name === state.selectedSchemaName- )?.sequences || []- );- }- return dbSchemaStore- .getDatabaseMetadata(props.database.name)- .schemas.map((schema) => schema.sequences)- .flat();-});--watch(- () => state.selectedSchemaName,- (schema) => {- router.replace({- query: {- schema: schema ? schema : undefined,- },- });- }-);-</script>diff --git a/frontend/src/components/Database/DatabaseRevisionPanel.vue b/frontend/src/components/Database/DatabaseRevisionPanel.vuedeleted file mode 100644index a9ea1a0f14..0000000000--- a/frontend/src/components/Database/DatabaseRevisionPanel.vue+++ /dev/null@@ -1,82 +0,0 @@-<template>- <div class="flex flex-col gap-y-2" v-bind="$attrs">- <div class="flex justify-between items-center">- <div></div>- <NButton type="primary" @click="showCreateRevisionDrawer = true">- {{ $t("common.import") }}- </NButton>- </div>- <PagedTable- ref="revisionPagedTable"- :session-key="`bb.paged-revision-table.${database.name}`"- :fetch-list="fetchRevisionList"- >- <template #table="{ list, loading }">- <RevisionDataTable- :key="`revision-table.${database.name}`"- :loading="loading"- :revisions="list"- :show-selection="true"- @delete="refreshList"- />- </template>- </PagedTable>- </div>-- <!-- Create Revision Drawer -->- <CreateRevisionDrawer- v-model:show="showCreateRevisionDrawer"- :database="database.name"- @created="handleRevisionCreated"- />-</template>--<script lang="ts" setup>-import { create } from "@bufbuild/protobuf";-import { NButton } from "naive-ui";-import { ref } from "vue";-import type { ComponentExposed } from "vue-component-type-helpers";-import { RevisionDataTable } from "@/components/Revision";-import CreateRevisionDrawer from "@/components/Revision/CreateRevisionDrawer.vue";-import PagedTable from "@/components/v2/Model/PagedTable.vue";-import { revisionServiceClientConnect } from "@/connect";-import type { Database } from "@/types/proto-es/v1/database_service_pb";-import type { Revision } from "@/types/proto-es/v1/revision_service_pb";-import { ListRevisionsRequestSchema } from "@/types/proto-es/v1/revision_service_pb";--const props = defineProps<{- database: Database;-}>();--const revisionPagedTable = ref<ComponentExposed<typeof PagedTable<Revision>>>();-const showCreateRevisionDrawer = ref(false);--const fetchRevisionList = async ({- pageToken,- pageSize,-}: {- pageToken: string;- pageSize: number;-}) => {- const request = create(ListRevisionsRequestSchema, {- parent: props.database.name,- pageSize,- pageToken,- });- const { nextPageToken, revisions } =- await revisionServiceClientConnect.listRevisions(request);- return {- nextPageToken,- list: revisions,- };-};--const handleRevisionCreated = () => {- showCreateRevisionDrawer.value = false;- revisionPagedTable.value?.refresh();-};--const refreshList = () => {- revisionPagedTable.value?.refresh();-};-</script>diff --git a/frontend/src/components/Database/context.ts b/frontend/src/components/Database/context.tsdeleted file mode 100644index 884b89b482..0000000000--- a/frontend/src/components/Database/context.ts+++ /dev/null@@ -1,54 +0,0 @@-import type { InjectionKey, Ref } from "vue";-import { computed, inject, provide } from "vue";-import { useDatabaseV1ByName } from "@/store";-import {- databaseNamePrefix,- instanceNamePrefix,-} from "@/store/modules/v1/common";-import { isDefaultProject } from "@/types";-import type { Database } from "@/types/proto-es/v1/database_service_pb";-import { getInstanceResource, instanceV1HasAlterSchema } from "@/utils";--export type DatabaseDetailContext = {- database: Ref<Database>;- allowAlterSchema: Ref<boolean>;- isDefaultProject: Ref<boolean>;-};--export const KEY = Symbol(- "bb.database.detail"-) as InjectionKey<DatabaseDetailContext>;--export const useDatabaseDetailContext = () => {- return inject(KEY)!;-};--export const provideDatabaseDetailContext = (- instanceId: Ref<string>,- databaseName: Ref<string>-) => {- const { database } = useDatabaseV1ByName(- computed(- () =>- `${instanceNamePrefix}${instanceId.value}/${databaseNamePrefix}${databaseName.value}`- )- );-- const isDefaultProjectRef = computed(() =>- isDefaultProject(database.value.project)- );-- const allowAlterSchema = computed(() => {- return instanceV1HasAlterSchema(getInstanceResource(database.value));- });-- const context: DatabaseDetailContext = {- database,- allowAlterSchema,- isDefaultProject: isDefaultProjectRef,- };-- provide(KEY, context);-- return context;-};diff --git a/frontend/src/components/SensitiveData/components/ClassificationLevelBadge.vue b/frontend/src/components/SensitiveData/components/ClassificationLevelBadge.vueindex 7a824592ce..591eedbee8 100644--- a/frontend/src/components/SensitiveData/components/ClassificationLevelBadge.vue+++ b/frontend/src/components/SensitiveData/components/ClassificationLevelBadge.vue@@ -7,7 +7,7 @@{{ placeholder }}</span></NPerformantEllipsis>- <span v-if="level" :class="['ml-1 px-1 py-0.5 rounded text-xs', levelColor]">+ <span v-if="level" :class="['ml-1 px-1 py-0.5 rounded text-xs whitespace-nowrap', levelColor]">{{ level.title }}</span></template>diff --git a/frontend/src/react/locales/en-US.json b/frontend/src/react/locales/en-US.jsonindex c4d67c0781..02a0491b3c 100644--- a/frontend/src/react/locales/en-US.json+++ b/frontend/src/react/locales/en-US.json@@ -340,15 +340,12 @@"common.members": "Members","common.minutes": "Minutes","common.no-data": "No data",- "common.operation": "Operation","common.optional": "Optional","common.or": "or","common.overview": "Overview","common.password": "Password","common.project": "Project","common.read-only": "Read-only",- "common.remove": "Remove",- "common.removed": "Removed","common.restore": "Restore","common.rollout": "Rollout","common.sensitive-placeholder": "Sensitive - write only",@@ -520,14 +517,11 @@"expression": "Expression","filter-database": "Filter database","index-size": "Index size",- "indexes": "Indexes","last-sync": "Last sync","mixed-label-values": "mixed values","mixed-label-values-warning": "Some of the selected resources have mixed values for the same key. Only edit these key-value pairs if you intend to change them.",- "nullable": "Nullable","partitioned": "Partitioned","row-count-est": "Row count est.",- "row-count-estimate": "Row count estimate","select": "Select database","selected-n-databases": "{{n}} database(s) selected","successfully-transferred-databases": "Successfully transferred databases",@@ -560,9 +554,7 @@"transfer-project": "Transfer Project","unassign": "Unassign","unassign-alert-description": "The selected databases will be removed from the project",- "unassign-alert-title": "Unassign databases",- "unique": "Unique",- "visible": "Visible"+ "unassign-alert-title": "Unassign databases"},"database-group": {"condition": {@@ -575,7 +567,6 @@"unmatched-database": "Unmatched database"},"database.classification.self": "Classification",- "database.column": "Column","database.engine": "Engine","database.export-schema": "Export Schema","database.export-schema-multi-file": "Multi-File (ZIP)",@@ -1375,7 +1366,6 @@"self_other": "Stages"}},- "schema-diagram.self": "Schema Diagram","schema-editor": {"raw-sql": "Raw SQL"},@@ -1762,9 +1752,7 @@},"re-order": "Re-order"},- "grant-access": "Grant Access","never-expires": "Never expires",- "remove-sensitive-column-tips": "Remove the masking configuration from this sensitive column?","semantic-types": {"label": "Columns having the same semantic type will use the same masking algorithms.","select": "Select semantic type",diff --git a/frontend/src/react/locales/es-ES.json b/frontend/src/react/locales/es-ES.jsonindex 971a01304d..2b1c405537 100644--- a/frontend/src/react/locales/es-ES.json+++ b/frontend/src/react/locales/es-ES.json@@ -340,15 +340,12 @@"common.members": "Miembros","common.minutes": "Minutos","common.no-data": "Sin datos",- "common.operation": "Operación","common.optional": "Opcional","common.or": "o","common.overview": "Resumen","common.password": "Contraseña","common.project": "Proyecto","common.read-only": "Solo lectura",- "common.remove": "Eliminar",- "common.removed": "Eliminado","common.restore": "Restaurar","common.rollout": "Implementar","common.sensitive-placeholder": "Sensible - solo escritura",@@ -520,14 +517,11 @@"expression": "Expression","filter-database": "Filtrar base de datos","index-size": "Tamaño del índice",- "indexes": "Índices","last-sync": "Última sincronización","mixed-label-values": "valores mixtos","mixed-label-values-warning": "Algunos de los recursos seleccionados tienen valores mixtos para la misma clave. Solo edite estos pares clave-valor si tiene la intención de cambiarlos.",- "nullable": "Anulable","partitioned": "Particionado","row-count-est": "Conteo estimado de filas",- "row-count-estimate": "Estimación de la cantidad de filas","select": "Seleccionar base de datos","selected-n-databases": "{{n}} base(s) de datos seleccionada(s)","successfully-transferred-databases": "Bases de datos transferidas exitosamente",@@ -560,9 +554,7 @@"transfer-project": "Transferir proyecto","unassign": "Desasignar","unassign-alert-description": "Las bases de datos seleccionadas serán eliminadas del proyecto",- "unassign-alert-title": "Desasignar bases de datos",- "unique": "Único",- "visible": "Visible"+ "unassign-alert-title": "Desasignar bases de datos"},"database-group": {"condition": {@@ -575,7 +567,6 @@"unmatched-database": "Unmatched database"},"database.classification.self": "Clasificación",- "database.column": "Columna","database.engine": "Motor","database.export-schema": "Exportar esquema","database.export-schema-multi-file": "Multi-archivo (ZIP)",@@ -1375,7 +1366,6 @@"self_other": "Etapas"}},- "schema-diagram.self": "Diagrama de Esquema","schema-editor": {"raw-sql": "Raw SQL"},@@ -1762,9 +1752,7 @@},"re-order": "Reordenar"},- "grant-access": "Autorizará el acceso","never-expires": "Nunca expira",- "remove-sensitive-column-tips": "¿Eliminar la configuración de enmascaramiento de esta columna sensible?","semantic-types": {"label": "Las columnas que tengan el mismo tipo semántico utilizarán los mismos algoritmos de enmascaramiento.","select": "Seleccionar tipo semántico",diff --git a/frontend/src/react/locales/ja-JP.json b/frontend/src/react/locales/ja-JP.jsonindex f895f0580d..d2886a0bf8 100644--- a/frontend/src/react/locales/ja-JP.json+++ b/frontend/src/react/locales/ja-JP.json@@ -340,15 +340,12 @@"common.members": "メンバー","common.minutes": "分","common.no-data": "データなし",- "common.operation": "操作","common.optional": "オプション","common.or": "または","common.overview": "概要","common.password": "パスワード","common.project": "プロジェクト","common.read-only": "読み取り専用",- "common.remove": "削除",- "common.removed": "削除しました","common.restore": "復元する","common.rollout": "リリース","common.sensitive-placeholder": "機密データ - 書き込みのみ",@@ -520,14 +517,11 @@"expression": "Expression","filter-database": "データベースをフィルター","index-size": "インデックスサイズ",- "indexes": "索引","last-sync": "最後の同期","mixed-label-values": "混合値","mixed-label-values-warning": "選択されたリソースの一部は、同じキーに対して異なる値を持っています。これらのキーと値のペアを変更する場合にのみ編集してください。",- "nullable": "null も可能","partitioned": "パーティション","row-count-est": "推定行数",- "row-count-estimate": "推定行数","select": "データベースの選択","selected-n-databases": "{{n}} 個のデータベースが選択されました","successfully-transferred-databases": "データベースの転送に成功しました",@@ -560,9 +554,7 @@"transfer-project": "プロジェクトの転送","unassign": "割り当てを解除する","unassign-alert-description": "選択したデータベースがプロジェクトから削除されます",- "unassign-alert-title": "データベースの割り当てを解除する",- "unique": "唯一",- "visible": "見える"+ "unassign-alert-title": "データベースの割り当てを解除する"},"database-group": {"condition": {@@ -575,7 +567,6 @@"unmatched-database": "Unmatched database"},"database.classification.self": "分類",- "database.column": "列","database.engine": "エンジン","database.export-schema": "スキーマをエクスポート","database.export-schema-multi-file": "複数ファイル (ZIP)",@@ -1375,7 +1366,6 @@"self_other": "ステージ"}},- "schema-diagram.self": "スキーマ図","schema-editor": {"raw-sql": "Raw SQL"},@@ -1762,9 +1752,7 @@},"re-order": "並び替え"},- "grant-access": "許可されたアクセス","never-expires": "有効期限なし",- "remove-sensitive-column-tips": "この機密列からマスキング設定を削除しますか?","semantic-types": {"label": "同じセマンティック タイプの列は、同じマスキング アルゴリズムを使用します。","select": "セマンティックタイプの選択",diff --git a/frontend/src/react/locales/vi-VN.json b/frontend/src/react/locales/vi-VN.jsonindex edaa87930e..524e4d5faa 100644--- a/frontend/src/react/locales/vi-VN.json+++ b/frontend/src/react/locales/vi-VN.json@@ -340,15 +340,12 @@"common.members": "Thành viên","common.minutes": "Phút","common.no-data": "Không có dữ liệu",- "common.operation": "Thao tác","common.optional": "Tùy chọn","common.or": "hoặc","common.overview": "Tổng quan","common.password": "Mật khẩu","common.project": "Dự án","common.read-only": "Chỉ đọc",- "common.remove": "Xóa",- "common.removed": "Đã xóa","common.restore": "Khôi phục","common.rollout": "Triển khai","common.sensitive-placeholder": "Nhạy cảm - Chỉ ghi",@@ -520,14 +517,11 @@"expression": "Expression","filter-database": "Lọc cơ sở dữ liệu","index-size": "Kích thước chỉ mục",- "indexes": "Chỉ mục","last-sync": "Lần đồng bộ cuối cùng","mixed-label-values": "giá trị hỗn hợp","mixed-label-values-warning": "Một số tài nguyên đã chọn có các giá trị khác nhau cho cùng một khóa. Chỉ chỉnh sửa các cặp khóa-giá trị này nếu bạn muốn thay đổi chúng.",- "nullable": "Có thể null","partitioned": "Đã phân vùng","row-count-est": "Ước tính số hàng",- "row-count-estimate": "Ước tính số hàng","select": "Chọn cơ sở dữ liệu","selected-n-databases": "Đã chọn {{n}} cơ sở dữ liệu","successfully-transferred-databases": "Chuyển cơ sở dữ liệu thành công",@@ -560,9 +554,7 @@"transfer-project": "Chuyển dự án","unassign": "Hủy gán","unassign-alert-description": "Các cơ sở dữ liệu đã chọn sẽ bị xóa khỏi dự án",- "unassign-alert-title": "Hủy gán cơ sở dữ liệu",- "unique": "Duy nhất",- "visible": "Hiển thị"+ "unassign-alert-title": "Hủy gán cơ sở dữ liệu"},"database-group": {"condition": {@@ -575,7 +567,6 @@"unmatched-database": "Unmatched database"},"database.classification.self": "Phân loại",- "database.column": "Cột","database.engine": "Engine","database.export-schema": "Xuất schema","database.export-schema-multi-file": "Nhiều tệp (ZIP)",@@ -1375,7 +1366,6 @@"self_other": "Các giai đoạn"}},- "schema-diagram.self": "Sơ đồ Lược đồ","schema-editor": {"raw-sql": "Raw SQL"},@@ -1762,9 +1752,7 @@},"re-order": "Sắp xếp lại"},- "grant-access": "Cấp quyền truy cập","never-expires": "Không bao giờ hết hạn",- "remove-sensitive-column-tips": "Xóa cấu hình che dữ liệu khỏi cột nhạy cảm này?","semantic-types": {"label": "Các cột có cùng loại ngữ nghĩa sẽ sử dụng cùng một thuật toán che.","select": "Chọn loại ngữ nghĩa",diff --git a/frontend/src/react/locales/zh-CN.json b/frontend/src/react/locales/zh-CN.jsonindex a452b3e42a..0c12a583ab 100644--- a/frontend/src/react/locales/zh-CN.json+++ b/frontend/src/react/locales/zh-CN.json@@ -340,15 +340,12 @@"common.members": "成员","common.minutes": "分钟","common.no-data": "无数据",- "common.operation": "操作","common.optional": "可选","common.or": "或者","common.overview": "概览","common.password": "密码","common.project": "项目","common.read-only": "只读",- "common.remove": "移除",- "common.removed": "已移除","common.restore": "恢复","common.rollout": "发布","common.sensitive-placeholder": "敏感数据 - 仅写入",@@ -520,14 +517,11 @@"expression": "Expression","filter-database": "筛选数据库","index-size": "索引大小",- "indexes": "索引","last-sync": "最后一次同步","mixed-label-values": "混合值","mixed-label-values-warning": "部分标签拥有不同的值,编辑标签将会批量应用。仅在您打算更改时再编辑这些键值对。",- "nullable": "可为空","partitioned": "分区","row-count-est": "估算行数",- "row-count-estimate": "估计行数","select": "选择数据库","selected-n-databases": "已选择 {{n}} 个数据库","successfully-transferred-databases": "成功转移数据库",@@ -560,9 +554,7 @@"transfer-project": "转移项目","unassign": "取消分配","unassign-alert-description": "选定的数据库将从项目中移除",- "unassign-alert-title": "取消分配数据库",- "unique": "唯一",- "visible": "Visible"+ "unassign-alert-title": "取消分配数据库"},"database-group": {"condition": {@@ -575,7 +567,6 @@"unmatched-database": "Unmatched database"},"database.classification.self": "分类",- "database.column": "列","database.engine": "引擎","database.export-schema": "导出 Schema","database.export-schema-multi-file": "多文件 (ZIP)",@@ -1375,7 +1366,6 @@"self_other": "阶段"}},- "schema-diagram.self": "Schema 关系图","schema-editor": {"raw-sql": "SQL 语句"},@@ -1762,9 +1752,7 @@},"re-order": "排序"},- "grant-access": "授权访问","never-expires": "无过期时间",- "remove-sensitive-column-tips": "要移除此敏感列上的脱敏配置吗?","semantic-types": {"label": "具有相同语义类型的列会使用相同的脱敏算法。","select": "选择语义类型",diff --git a/frontend/src/react/pages/project/ProjectDatabaseDetailPage.tsx b/frontend/src/react/pages/project/ProjectDatabaseDetailPage.tsxindex 5162825445..d7d225441c 100644--- a/frontend/src/react/pages/project/ProjectDatabaseDetailPage.tsx+++ b/frontend/src/react/pages/project/ProjectDatabaseDetailPage.tsx@@ -201,10 +201,9 @@ export function ProjectDatabaseDetailPage({</Alert>)}- <div className="flex flex-col items-start gap-4 xl:flex-row xl:items-start xl:justify-between">+ <div className="flex flex-col items-start gap-y-2 xl:flex-row xl:items-center xl:justify-between xl:gap-x-2"><DatabaseDetailHeaderdatabase={detail.database}- allowAlterSchema={detail.allowAlterSchema}onSQLEditorFailed={handleSQLEditorFailed}/><DatabaseDetailActionsdiff --git a/frontend/src/react/pages/project/database-detail/DatabaseDetailHeader.tsx b/frontend/src/react/pages/project/database-detail/DatabaseDetailHeader.tsxindex 8e61b1b626..b191c8e110 100644--- a/frontend/src/react/pages/project/database-detail/DatabaseDetailHeader.tsx+++ b/frontend/src/react/pages/project/database-detail/DatabaseDetailHeader.tsx@@ -1,11 +1,27 @@-import { Check, Copy } from "lucide-react";+import { Check, Copy, ShieldAlert } from "lucide-react";import { useCallback, useMemo, useState } from "react";import { useTranslation } from "react-i18next";-import { Button } from "@/react/components/ui/button";+import { EngineIconPath } from "@/components/InstanceForm/constants";+import { useVueState } from "@/react/hooks/useVueState";+import { router } from "@/router";+import { INSTANCE_ROUTE_DETAIL } from "@/router/dashboard/instance";+import { featureToRef, useEnvironmentV1Store } from "@/store";import type { Database } from "@/types/proto-es/v1/database_service_pb";+import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";+import {+ formatEnvironmentName,+ isValidEnvironmentName,+ UNKNOWN_ENVIRONMENT_NAME,+} from "@/types/v1/environment";+import {+ extractInstanceResourceName,+ getInstanceResource,+ hasWorkspacePermissionV2,+ hexToRgb,+ instanceV1Name,+} from "@/utils";import { extractReleaseUID } from "@/utils/v1/release";import { DatabaseSQLEditorButton } from "./DatabaseSQLEditorButton";-import { SchemaBrowserButton } from "./schema-browser/SchemaBrowserButton";const extractDatabaseParts = (resource: string) => {const matches = resource.match(@@ -31,23 +47,69 @@ async function copyToClipboard(text: string): Promise<boolean> {export function DatabaseDetailHeader({database,- allowAlterSchema,onSQLEditorFailed,}: {database: Database;- allowAlterSchema: boolean;onSQLEditorFailed?: (database: Database) => void;}) {const { t } = useTranslation();const [copied, setCopied] = useState(false);+ const environmentStore = useEnvironmentV1Store();const { databaseName } = useMemo(() => extractDatabaseParts(database.name),[database.name]);- const instanceLabel =- database.instanceResource?.title ||- database.instanceResource?.name ||- `instances/${extractDatabaseParts(database.name).instanceName}`;++ const instanceResource = getInstanceResource(database);+ const instanceLabel = instanceV1Name(instanceResource);+ const instanceId = extractInstanceResourceName(instanceResource.name);+ const canViewInstance = hasWorkspacePermissionV2("bb.instances.get");+ const engineIconSrc = EngineIconPath[String(instanceResource.engine)];++ const environment = useVueState(() =>+ environmentStore.getEnvironmentByName(database.effectiveEnvironment ?? "")+ );++ const hasEnvironmentTierFeature = useVueState(+ () => featureToRef(PlanFeature.FEATURE_ENVIRONMENT_TIERS).value+ );++ const isValidEnv =+ !!environment &&+ isValidEnvironmentName(environment.name) &&+ environment.name !== UNKNOWN_ENVIRONMENT_NAME;++ const environmentTitle = useMemo(() => {+ if (!isValidEnv) {+ return t("common.unassigned");+ }+ return environment.title || environment.id;+ }, [environment, isValidEnv, t]);++ const isProductionEnv =+ isValidEnv &&+ hasEnvironmentTierFeature &&+ environment.tags?.protected === "protected";++ const environmentColorRgb = useMemo(() => {+ if (!isValidEnv || !environment.color) {+ return "";+ }+ return hexToRgb(environment.color).join(", ");+ }, [environment, isValidEnv]);++ const environmentBadgeStyle: React.CSSProperties | undefined = useMemo(() => {+ if (!environmentColorRgb) {+ return undefined;+ }+ return {+ backgroundColor: `rgba(${environmentColorRgb}, 0.1)`,+ borderTopColor: `rgb(${environmentColorRgb})`,+ color: `rgb(${environmentColorRgb})`,+ padding: "0 6px",+ borderRadius: "4px",+ };+ }, [environmentColorRgb]);const handleCopy = useCallback(async () => {const success = await copyToClipboard(database.name);@@ -57,47 +119,113 @@ export function DatabaseDetailHeader({}}, [database.name]);+ const handleEnvironmentClick = useCallback(+ (e: React.MouseEvent) => {+ e.stopPropagation();+ if (isValidEnv) {+ void router.push({+ path: `/${formatEnvironmentName(environment.id)}`,+ });+ }+ },+ [environment, isValidEnv]+ );++ const handleInstanceClick = useCallback(+ (e: React.MouseEvent) => {+ e.stopPropagation();+ if (canViewInstance && instanceId) {+ void router.push({+ name: INSTANCE_ROUTE_DETAIL,+ params: { instanceId },+ });+ }+ },+ [canViewInstance, instanceId]+ );+return (- <div className="flex min-w-0 flex-1 flex-col gap-y-3">- <div className="min-w-0">- <div className="truncate text-xl font-bold text-main">+ <div className="flex min-w-0 flex-1 shrink-0 flex-col gap-y-2">+ <div className="flex w-full min-w-0 flex-col">+ <div className="flex items-center gap-x-2 truncate text-xl font-bold text-main">{databaseName}</div>- <div className="mt-1 flex min-w-0 items-center gap-x-2 text-sm text-control-light">+ <div className="mt-1 flex w-full min-w-0 items-center gap-x-1 text-sm text-control-light"><span className="truncate">{database.name}</span>- <Button variant="ghost" size="icon" onClick={() => void handleCopy()}>+ <button+ type="button"+ className="inline-flex shrink-0 items-center p-0.5 text-control-light hover:text-main"+ onClick={() => void handleCopy()}+ >{copied ? (- <Check className="h-4 w-4" />+ <Check className="h-3.5 w-3.5" />) : (- <Copy className="h-4 w-4" />+ <Copy className="h-3.5 w-3.5" />)}- </Button>+ </button></div></div>- <dl className="flex flex-col gap-2 text-sm md:flex-row md:flex-wrap">- <div className="flex items-center gap-x-1">- <dt className="text-control-light">{t("common.environment")}</dt>- <dd>{database.effectiveEnvironment || t("common.unassigned")}</dd>+ <div+ className="flex flex-col gap-y-1 text-sm md:flex-row md:flex-wrap md:items-center md:gap-x-4"+ data-label="bb-database-detail-info-block"+ >+ <div className="flex items-center gap-x-1.5">+ <span className="text-control-light">{t("common.environment")}</span>+ {isValidEnv ? (+ <a+ className="inline-flex cursor-pointer items-center gap-x-1 hover:underline"+ style={environmentBadgeStyle}+ onClick={handleEnvironmentClick}+ >+ <span>{environmentTitle}</span>+ {isProductionEnv && <ShieldAlert className="h-4 w-4 shrink-0" />}+ </a>+ ) : (+ <span className="italic text-control-light">+ {environmentTitle}+ </span>+ )}</div>- <div className="flex items-center gap-x-1">- <dt className="text-control-light">{t("common.instance")}</dt>- <dd>{instanceLabel}</dd>+ <div className="flex items-center gap-x-1.5">+ <span className="text-control-light">{t("common.instance")}</span>+ {canViewInstance && instanceId ? (+ <a+ className="inline-flex cursor-pointer items-center gap-x-1 hover:underline"+ onClick={handleInstanceClick}+ >+ {engineIconSrc && (+ <img+ src={engineIconSrc}+ className="h-4 w-4 shrink-0 object-contain"+ alt=""+ />+ )}+ {instanceLabel}+ </a>+ ) : (+ <span className="inline-flex items-center gap-x-1">+ {engineIconSrc && (+ <img+ src={engineIconSrc}+ className="h-4 w-4 shrink-0 object-contain"+ alt=""+ />+ )}+ {instanceLabel}+ </span>+ )}</div>{database.release && (- <div className="flex items-center gap-x-1">- <dt className="text-control-light">{t("common.release")}</dt>- <dd>{extractReleaseUID(database.release)}</dd>+ <div className="flex items-center gap-x-1.5">+ <span className="text-control-light">{t("common.release")}</span>+ <span>{extractReleaseUID(database.release)}</span></div>)}- </dl>-- <div className="flex flex-wrap items-center gap-x-2 gap-y-2"><DatabaseSQLEditorButtondatabase={database}onFailed={onSQLEditorFailed}/>- {allowAlterSchema && <SchemaBrowserButton database={database} />}</div></div>);diff --git a/frontend/src/react/pages/project/database-detail/DatabaseExportSchemaButton.tsx b/frontend/src/react/pages/project/database-detail/DatabaseExportSchemaButton.tsxindex 13dfe1520d..572d8ea810 100644--- a/frontend/src/react/pages/project/database-detail/DatabaseExportSchemaButton.tsx+++ b/frontend/src/react/pages/project/database-detail/DatabaseExportSchemaButton.tsx@@ -106,6 +106,7 @@ export function DatabaseExportSchemaButton({return (<div className="relative" ref={containerRef}><Button+ variant="outline"disabled={disabled || exporting}onClick={() => setOpen((value) => !value)}>diff --git a/frontend/src/react/pages/project/database-detail/DatabaseSQLEditorButton.tsx b/frontend/src/react/pages/project/database-detail/DatabaseSQLEditorButton.tsxindex e82fbc25c0..8be020223b 100644--- a/frontend/src/react/pages/project/database-detail/DatabaseSQLEditorButton.tsx+++ b/frontend/src/react/pages/project/database-detail/DatabaseSQLEditorButton.tsx@@ -1,7 +1,6 @@import { Terminal } from "lucide-react";import { useCallback } from "react";import { useTranslation } from "react-i18next";-import { Button } from "@/react/components/ui/button";import { router } from "@/router";import { SQL_EDITOR_DATABASE_MODULE } from "@/router/sqlEditor";import { usePermissionStore } from "@/store";@@ -71,9 +70,12 @@ export function DatabaseSQLEditorButton({}, [database, disabled, onFailed, permissionStore]);return (- <Button variant="ghost" size="sm" disabled={disabled} onClick={handleClick}>- <Terminal className="h-4 w-4" />+ <dd+ className="flex cursor-pointer items-center text-sm textlabel hover:text-accent md:mr-4"+ onClick={handleClick}+ >+ <Terminal className="mr-1 h-4 w-4" />{t("sql-editor.self")}- </Button>+ </dd>);}diff --git a/frontend/src/react/pages/project/database-detail/DatabaseSyncButton.tsx b/frontend/src/react/pages/project/database-detail/DatabaseSyncButton.tsxindex 0c4a969b13..d967a1b2c6 100644--- a/frontend/src/react/pages/project/database-detail/DatabaseSyncButton.tsx+++ b/frontend/src/react/pages/project/database-detail/DatabaseSyncButton.tsx@@ -64,7 +64,11 @@ export function DatabaseSyncButton({}, [database, databaseStore, dbSchemaStore, t]);return (- <Button disabled={disabled || syncing} onClick={() => void handleClick()}>+ <Button+ variant="outline"+ disabled={disabled || syncing}+ onClick={() => void handleClick()}+ ><RefreshCw className="h-4 w-4" />{t("database.sync-database")}</Button>diff --git a/frontend/src/react/pages/project/database-detail/catalog/GrantAccessDialog.tsx b/frontend/src/react/pages/project/database-detail/catalog/GrantAccessDialog.tsxdeleted file mode 100644index f7496ea924..0000000000--- a/frontend/src/react/pages/project/database-detail/catalog/GrantAccessDialog.tsx+++ /dev/null@@ -1,238 +0,0 @@-import { create } from "@bufbuild/protobuf";-import dayjs from "dayjs";-import { useMemo, useState } from "react";-import { useTranslation } from "react-i18next";-import { rewriteResourceDatabase } from "@/components/SensitiveData/exemptionDataUtils";-import type { SensitiveColumn } from "@/components/SensitiveData/types";-import {- convertSensitiveColumnToDatabaseResource,- getExpressionsForDatabaseResource,-} from "@/components/SensitiveData/utils";-import { AccountMultiSelect } from "@/react/components/AccountMultiSelect";-import { Button } from "@/react/components/ui/button";-import {- Dialog,- DialogContent,- DialogTitle,-} from "@/react/components/ui/dialog";-import { ExpirationPicker } from "@/react/components/ui/expiration-picker";-import { Input } from "@/react/components/ui/input";-import { pushNotification, usePolicyV1Store } from "@/store";-import type { DatabaseResource } from "@/types";-import { ExprSchema } from "@/types/proto-es/google/type/expr_pb";-import {- MaskingExemptionPolicy_ExemptionSchema,- MaskingExemptionPolicySchema,- PolicyResourceType,- PolicyType,-} from "@/types/proto-es/v1/org_policy_service_pb";--export interface GrantAccessDialogProps {- columnList: SensitiveColumn[];- open: boolean;- projectName: string;- onDismiss: () => void;-}--export function GrantAccessDialog({- columnList,- open,- projectName,- onDismiss,-}: GrantAccessDialogProps) {- const { t } = useTranslation();- const policyStore = usePolicyV1Store();-- const databaseResources = useMemo<DatabaseResource[]>(- () => columnList.map(convertSensitiveColumnToDatabaseResource),- [columnList]- );- const [description, setDescription] = useState("");- const [expirationTimestamp, setExpirationTimestamp] = useState<- string | undefined- >();- const [memberList, setMemberList] = useState<string[]>([]);- const [processing, setProcessing] = useState(false);-- const minDatetime = useMemo(- () => dayjs().startOf("day").format("YYYY-MM-DDTHH:mm"),- []- );- const submitDisabled =- memberList.length === 0 || databaseResources.length === 0;-- const handleOpenChange = (nextOpen: boolean) => {- if (!nextOpen) {- onDismiss();- }- };-- const handleSubmit = async () => {- if (submitDisabled || processing) {- return;- }- setProcessing(true);-- try {- const extraExpressions: string[] = [];- if (expirationTimestamp) {- extraExpressions.push(- `request.time < timestamp("${new Date(expirationTimestamp).toISOString()}")`- );- }-- const resourceExpressions = databaseResources- .map(getExpressionsForDatabaseResource)- .map((parts) => parts.filter((part) => part).join(" && "));- const nonEmptyResourceExpressions = resourceExpressions.filter(- (expression) => expression- );-- let resourceCondition = "";- if (nonEmptyResourceExpressions.length === 1) {- resourceCondition = nonEmptyResourceExpressions[0];- } else if (nonEmptyResourceExpressions.length > 1) {- resourceCondition = nonEmptyResourceExpressions- .map((expression) => `(${expression})`)- .join(" || ");- }-- const expression = rewriteResourceDatabase(- [resourceCondition, ...extraExpressions]- .filter((part) => part)- .join(" && ")- );-- const policy = await policyStore.getOrFetchPolicyByParentAndType({- parentPath: projectName,- policyType: PolicyType.MASKING_EXEMPTION,- });- const existed =- policy?.policy?.case === "maskingExemptionPolicy"- ? policy.policy.value.exemptions- : [];-- await policyStore.upsertPolicy({- parentPath: projectName,- policy: {- name: policy?.name,- type: PolicyType.MASKING_EXEMPTION,- resourceType: PolicyResourceType.PROJECT,- policy: {- case: "maskingExemptionPolicy",- value: create(MaskingExemptionPolicySchema, {- exemptions: [- ...existed,- create(MaskingExemptionPolicy_ExemptionSchema, {- members: memberList,- condition: create(ExprSchema, {- description,- expression,- }),- }),- ],- }),- },- },- });-- pushNotification({- module: "bytebase",- style: "SUCCESS",- title: t("common.created"),- });- onDismiss();- } catch (error) {- pushNotification({- module: "bytebase",- style: "CRITICAL",- title: `${error}`,- });- } finally {- setProcessing(false);- }- };-- return (- <Dialog open={open} onOpenChange={handleOpenChange}>- <DialogContent className="max-w-4xl p-6">- <DialogTitle>{t("settings.sensitive-data.grant-access")}</DialogTitle>- <div className="mt-4 flex flex-col gap-y-6">- <div className="flex flex-col gap-y-2">- <span className="text-sm font-medium text-main">- {t("common.resources")}- </span>- <div className="max-h-60 overflow-y-auto rounded-sm border border-control-border">- {databaseResources.map((resource) => (- <div- key={[- resource.databaseFullName,- resource.schema ?? "",- resource.table ?? "",- (resource.columns ?? []).join(","),- ].join("/")}- className="border-b border-control-border px-3 py-2 text-sm last:border-b-0"- >- {[- resource.databaseFullName.split("/").pop(),- resource.schema,- resource.table,- ...(resource.columns ?? []),- ]- .filter(Boolean)- .join(".")}- </div>- ))}- </div>- </div>-- <div className="flex flex-col gap-y-2">- <span className="text-sm font-medium text-main">- {t("common.reason")}- </span>- <Input- value={description}- placeholder={t("common.description")}- onChange={(event) => setDescription(event.target.value)}- />- </div>-- <div className="flex flex-col gap-y-2">- <span className="text-sm font-medium text-main">- {t("common.expiration")}- </span>- <ExpirationPicker- value={expirationTimestamp}- minDate={minDatetime}- onChange={setExpirationTimestamp}- />- {!expirationTimestamp && (- <span className="text-sm text-control-light">- {t("settings.sensitive-data.never-expires")}- </span>- )}- </div>-- <div className="flex flex-col gap-y-2">- <span className="text-sm font-medium text-main">- {t("common.members")}- </span>- <AccountMultiSelect value={memberList} onChange={setMemberList} />- </div>- </div>-- <div className="mt-6 flex justify-end gap-x-2">- <Button variant="outline" onClick={onDismiss}>- {t("common.cancel")}- </Button>- <Button- disabled={submitDisabled || processing}- onClick={() => void handleSubmit()}- >- {t("common.confirm")}- </Button>- </div>- </DialogContent>- </Dialog>- );-}diff --git a/frontend/src/react/pages/project/database-detail/catalog/SensitiveColumnTable.tsx b/frontend/src/react/pages/project/database-detail/catalog/SensitiveColumnTable.tsxdeleted file mode 100644index 7dbc4f0db7..0000000000--- a/frontend/src/react/pages/project/database-detail/catalog/SensitiveColumnTable.tsx+++ /dev/null@@ -1,203 +0,0 @@-import { Trash2 } from "lucide-react";-import { useTranslation } from "react-i18next";-import type { MaskData } from "@/components/SensitiveData/types";-import { getMaskDataIdentifier } from "@/components/SensitiveData/utils";-import { Button } from "@/react/components/ui/button";-import {- Select,- SelectContent,- SelectItem,- SelectTrigger,- SelectValue,-} from "@/react/components/ui/select";--interface Option {- label: string;- value: string;-}--export interface SensitiveColumnTableProps {- checkedColumnList: MaskData[];- columnList: MaskData[];- classificationOptions: Option[];- rowSelectable: boolean;- semanticTypeOptions: Option[];- showOperation: boolean;- onClassificationChange: (item: MaskData, classificationId: string) => void;- onCheckedColumnListChange: (list: MaskData[]) => void;- onDelete: (item: MaskData) => void | Promise<void>;- onSemanticTypeChange: (item: MaskData, semanticTypeId: string) => void;-}--export function SensitiveColumnTable({- checkedColumnList,- columnList,- classificationOptions,- rowSelectable,- semanticTypeOptions,- showOperation,- onClassificationChange,- onCheckedColumnListChange,- onDelete,- onSemanticTypeChange,-}: SensitiveColumnTableProps) {- const { t } = useTranslation();- const checkedSet = new Set(checkedColumnList.map(getMaskDataIdentifier));-- const toggleChecked = (item: MaskData, checked: boolean) => {- const key = getMaskDataIdentifier(item);- if (checked) {- onCheckedColumnListChange(- checkedColumnList.some((row) => getMaskDataIdentifier(row) === key)- ? checkedColumnList- : [...checkedColumnList, item]- );- return;- }- onCheckedColumnListChange(- checkedColumnList.filter((row) => getMaskDataIdentifier(row) !== key)- );- };-- const handleDelete = async (item: MaskData) => {- if (- typeof window !== "undefined" &&- typeof window.confirm === "function" &&- !window.confirm(t("settings.sensitive-data.remove-sensitive-column-tips"))- ) {- return;- }- await onDelete(item);- };-- return (- <div className="overflow-x-auto rounded-sm border border-control-border">- <table className="w-full min-w-[720px] text-sm">- <thead>- <tr className="border-b border-control-border bg-gray-50 text-left">- {rowSelectable && <th className="w-12 px-4 py-2" />}- <th className="px-4 py-2 font-medium">{t("common.table")}</th>- <th className="px-4 py-2 font-medium">{t("database.column")}</th>- <th className="px-4 py-2 font-medium">- {t("settings.sensitive-data.semantic-types.table.semantic-type")}- </th>- <th className="px-4 py-2 font-medium">- {t("database.classification.self")}- </th>- {showOperation && (- <th className="w-20 px-4 py-2 font-medium">- {t("common.operation")}- </th>- )}- </tr>- </thead>- <tbody>- {columnList.map((item) => {- const key = getMaskDataIdentifier(item);- const tableName = item.schema- ? `${item.schema}.${item.table}`- : item.table;- return (- <tr- key={key}- className="border-b border-control-border last:border-0"- >- {rowSelectable && (- <td className="px-4 py-3">- <input- type="checkbox"- checked={checkedSet.has(key)}- onChange={(event) =>- toggleChecked(item, event.target.checked)- }- />- </td>- )}- <td className="px-4 py-3">{tableName}</td>- <td className="px-4 py-3">{item.column || "-"}</td>- <td className="px-4 py-3">- {showOperation && !item.disableSemanticType ? (- <Select- value={item.semanticTypeId}- onValueChange={(value) =>- onSemanticTypeChange(item, value ?? "")- }- >- <SelectTrigger className="w-full min-w-40">- <SelectValue placeholder={t("common.empty")} />- </SelectTrigger>- <SelectContent>- <SelectItem value="">{t("common.empty")}</SelectItem>- {semanticTypeOptions.map((option) => (- <SelectItem key={option.value} value={option.value}>- {option.label}- </SelectItem>- ))}- </SelectContent>- </Select>- ) : (- item.semanticTypeId || "-"- )}- </td>- <td className="px-4 py-3">- {showOperation && !item.disableClassification ? (- <Select- value={item.classificationId}- onValueChange={(value) =>- onClassificationChange(item, value ?? "")- }- >- <SelectTrigger className="w-full min-w-40">- <SelectValue placeholder={t("common.empty")} />- </SelectTrigger>- <SelectContent>- <SelectItem value="">{t("common.empty")}</SelectItem>- {classificationOptions.map((option) => (- <SelectItem key={option.value} value={option.value}>- {option.label}- </SelectItem>- ))}- </SelectContent>- </Select>- ) : (- item.classificationId || "-"- )}- </td>- {showOperation && (- <td className="px-4 py-3">- <Button- variant="ghost"- size="icon"- aria-label={t("common.remove")}- onClick={() => void handleDelete(item)}- >- <Trash2 className="h-4 w-4" />- </Button>- </td>- )}- </tr>- );- })}- {columnList.length === 0 && (- <tr>- <td- className="px-4 py-6 text-center text-control-light"- colSpan={- rowSelectable- ? showOperation- ? 6- : 5- : showOperation- ? 5- : 4- }- >- {t("common.no-data")}- </td>- </tr>- )}- </tbody>- </table>- </div>- );-}diff --git a/frontend/src/react/pages/project/database-detail/changelog/DatabaseChangelogTable.tsx b/frontend/src/react/pages/project/database-detail/changelog/DatabaseChangelogTable.tsxindex e18d5548a6..5b6195b097 100644--- a/frontend/src/react/pages/project/database-detail/changelog/DatabaseChangelogTable.tsx+++ b/frontend/src/react/pages/project/database-detail/changelog/DatabaseChangelogTable.tsx@@ -1,10 +1,45 @@+import { Check } from "lucide-react";+import { useCallback } from "react";import { useTranslation } from "react-i18next";import { router } from "@/router";import { getDateForPbTimestampProtoEs } from "@/types";-import type { Changelog } from "@/types/proto-es/v1/database_service_pb";+import {+ type Changelog,+ Changelog_Status,+} from "@/types/proto-es/v1/database_service_pb";import { humanizeDate } from "@/utils";import { changelogLink } from "@/utils/v1/changelog";+function ChangelogStatusIcon({ status }: { status: Changelog_Status }) {+ if (status === Changelog_Status.PENDING) {+ return (+ <span className="flex h-5 w-5 items-center justify-center rounded-full border-2 border-info bg-white text-info">+ <span+ className="h-2 w-2 rounded-full bg-info"+ style={{+ animation: "pulse 2.5s cubic-bezier(0.4, 0, 0.6, 1) infinite",+ }}+ />+ </span>+ );+ }+ if (status === Changelog_Status.DONE) {+ return (+ <span className="flex h-5 w-5 items-center justify-center rounded-full bg-success text-white">+ <Check className="h-4 w-4" />+ </span>+ );+ }+ if (status === Changelog_Status.FAILED) {+ return (+ <span className="flex h-5 w-5 items-center justify-center rounded-full bg-error text-white">+ <span className="text-base font-normal">!</span>+ </span>+ );+ }+ return null;+}+export function DatabaseChangelogTable({changelogs,loading,@@ -14,6 +49,18 @@ export function DatabaseChangelogTable({}) {const { t } = useTranslation();+ const handleRowClick = useCallback(+ (changelog: Changelog, e: React.MouseEvent) => {+ const url = changelogLink(changelog);+ if (e.ctrlKey || e.metaKey) {+ window.open(url, "_blank");+ } else {+ void router.push(url);+ }+ },+ []+ );+if (loading) {return (<div className="text-sm text-control-light">{t("common.loading")}</div>@@ -25,35 +72,47 @@ export function DatabaseChangelogTable({<table className="min-w-full divide-y divide-block-border"><thead className="bg-control-bg"><tr className="text-left text-sm text-control-light">- <th className="px-4 py-2 font-medium">{t("common.name")}</th>- <th className="px-4 py-2 font-medium">{t("common.created-at")}</th>- <th className="px-4 py-2 font-medium">{t("common.rollout")}</th>+ <th className="w-12 px-4 py-2" />+ <th className="w-[180px] px-4 py-2 font-medium">+ {t("common.created-at")}+ </th>+ <th className="min-w-[200px] px-4 py-2 font-medium">+ {t("common.rollout")}+ </th></tr></thead><tbody className="divide-y divide-block-border bg-white">{changelogs.map((changelog) => (- <tr key={changelog.name}>- <td className="px-4 py-3 text-sm text-main">- <button- className="cursor-pointer text-left hover:text-accent"- type="button"- onClick={() => void router.push(changelogLink(changelog))}- >- {changelog.name}- </button>+ <tr+ key={changelog.name}+ className="cursor-pointer hover:bg-gray-50"+ onClick={(e) => handleRowClick(changelog, e)}+ >+ <td className="px-4 py-3 text-center">+ <ChangelogStatusIcon status={changelog.status} /></td>- <td className="px-4 py-3 text-sm text-control">+ <td className="px-4 py-3 text-sm text-main">{getDateForPbTimestampProtoEs(changelog.createTime)? humanizeDate(getDateForPbTimestampProtoEs(changelog.createTime) as Date): "-"}</td>- <td className="px-4 py-3 text-sm text-control">+ <td className="truncate px-4 py-3 text-sm text-main">{changelog.planTitle || "-"}</td></tr>))}+ {changelogs.length === 0 && (+ <tr>+ <td+ className="px-4 py-6 text-center text-sm text-control-light"+ colSpan={3}+ >+ {t("common.no-data")}+ </td>+ </tr>+ )}</tbody></table></div>diff --git a/frontend/src/react/pages/project/database-detail/overview/DatabaseObjectExplorer.test.tsx b/frontend/src/react/pages/project/database-detail/overview/DatabaseObjectExplorer.test.tsxdeleted file mode 100644index 4204e9a3d2..0000000000--- a/frontend/src/react/pages/project/database-detail/overview/DatabaseObjectExplorer.test.tsx+++ /dev/null@@ -1,270 +0,0 @@-import { act, createElement } from "react";-import { createRoot } from "react-dom/client";-import { beforeEach, describe, expect, test, vi } from "vitest";-import { Engine } from "@/types/proto-es/v1/common_pb";-import type { Database } from "@/types/proto-es/v1/database_service_pb";--(- globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }-).IS_REACT_ACT_ENVIRONMENT = true;--const mocks = vi.hoisted(() => {- const currentRoute = {- value: {- query: {},- },- };-- return {- currentRoute,- routerReplace: vi.fn(() => Promise.resolve()),- useVueState: vi.fn(),- useDatabaseCatalog: vi.fn(),- getColumnCatalog: vi.fn(() => ({- semanticType: "",- classification: "",- })),- getTableCatalog: vi.fn(),- featureToRef: vi.fn(() => ({ value: true })),- useDBSchemaV1Store: vi.fn(),- useSettingV1Store: vi.fn(),- getDatabaseProject: vi.fn((database: { project: string }) => ({- name: database.project,- dataClassificationConfigId: "classification-config",- })),- getDatabaseEngine: vi.fn(() => Engine.POSTGRES),- hasIndexSizeProperty: vi.fn(() => true),- hasSchemaProperty: vi.fn(() => true),- hasTableEngineProperty: vi.fn(() => false),- instanceV1HasCollationAndCharacterSet: vi.fn(() => true),- instanceV1SupportsColumn: vi.fn(() => true),- instanceV1SupportsIndex: vi.fn(() => true),- instanceV1SupportsPackage: vi.fn(() => false),- instanceV1SupportsSequence: vi.fn(() => false),- bytesToString: vi.fn((size: number) => `${size} B`),- dialogProps: [] as unknown[],- useTranslation: vi.fn(() => ({- t: (key: string) => key,- })),- };-});--let DatabaseObjectExplorer: typeof import("./DatabaseObjectExplorer").DatabaseObjectExplorer;--vi.mock("react-i18next", () => ({- useTranslation: mocks.useTranslation,-}));--vi.mock("@/react/hooks/useVueState", () => ({- useVueState: mocks.useVueState,-}));--vi.mock("@/router", () => ({- router: {- replace: mocks.routerReplace,- currentRoute: mocks.currentRoute,- },-}));--vi.mock("@/store", () => ({- useDBSchemaV1Store: mocks.useDBSchemaV1Store,- useDatabaseCatalog: mocks.useDatabaseCatalog,- getColumnCatalog: mocks.getColumnCatalog,- getTableCatalog: mocks.getTableCatalog,- featureToRef: mocks.featureToRef,- useSettingV1Store: mocks.useSettingV1Store,-}));--vi.mock("@/utils", () => ({- bytesToString: mocks.bytesToString,- getDatabaseEngine: mocks.getDatabaseEngine,- getDatabaseProject: mocks.getDatabaseProject,- hasIndexSizeProperty: mocks.hasIndexSizeProperty,- hasSchemaProperty: mocks.hasSchemaProperty,- hasTableEngineProperty: mocks.hasTableEngineProperty,- instanceV1HasCollationAndCharacterSet:- mocks.instanceV1HasCollationAndCharacterSet,- instanceV1SupportsColumn: mocks.instanceV1SupportsColumn,- instanceV1SupportsIndex: mocks.instanceV1SupportsIndex,- instanceV1SupportsPackage: mocks.instanceV1SupportsPackage,- instanceV1SupportsSequence: mocks.instanceV1SupportsSequence,-}));--vi.mock("@/react/components/ui/input", () => ({- Input: (props: React.InputHTMLAttributes<HTMLInputElement>) => (- <input {...props} />- ),-}));--vi.mock("./TableDetailDialog", () => ({- TableDetailDialog: (props: unknown) => {- mocks.dialogProps.push(props);- return null;- },-}));--const renderIntoContainer = (element: ReturnType<typeof createElement>) => {- const container = document.createElement("div");- const root = createRoot(container);-- return {- container,- render: () => {- act(() => {- root.render(element);- });- },- unmount: () =>- act(() => {- root.unmount();- }),- };-};--const flush = async () => {- await act(async () => {- await Promise.resolve();- await Promise.resolve();- });-};--const clickElement = (element: Element) => {- act(() => {- element.dispatchEvent(new MouseEvent("click", { bubbles: true }));- });-};--const makeDatabase = (): Database =>- ({- name: "instances/inst1/databases/db",- project: "projects/proj1",- instanceResource: {- name: "instances/inst1",- engine: Engine.POSTGRES,- },- }) as Database;--const makeTable = (name: string) =>- ({- name,- rowCount: 7,- dataSize: 64n,- indexSize: 32n,- comment: `${name} comment`,- columns: [- {- name: "id",- type: "INT",- comment: "",- },- ],- }) as never;--beforeEach(async () => {- mocks.currentRoute.value.query = {};- mocks.routerReplace.mockReset();- mocks.useTranslation.mockReset();- mocks.useTranslation.mockReturnValue({- t: (key: string) => key,- });- mocks.getDatabaseEngine.mockReset();- mocks.getDatabaseEngine.mockReturnValue(Engine.POSTGRES);- mocks.hasSchemaProperty.mockReset();- mocks.hasSchemaProperty.mockReturnValue(true);- mocks.instanceV1SupportsPackage.mockReset();- mocks.instanceV1SupportsPackage.mockReturnValue(false);- mocks.instanceV1SupportsSequence.mockReset();- mocks.instanceV1SupportsSequence.mockReturnValue(false);- mocks.bytesToString.mockReset();- mocks.bytesToString.mockImplementation((size: number) => `${size} B`);- mocks.useDBSchemaV1Store.mockReset();- mocks.useDBSchemaV1Store.mockReturnValue({- getSchemaList: vi.fn(() => [{ name: "public" }]),- getTableList: vi.fn(() => [makeTable("orders")]),- getViewList: vi.fn(() => []),- getExtensionList: vi.fn(() => []),- getExternalTableList: vi.fn(() => []),- getFunctionList: vi.fn(() => []),- getDatabaseMetadata: vi.fn(() => ({- schemas: [],- })),- });- mocks.useDatabaseCatalog.mockReset();- mocks.useDatabaseCatalog.mockReturnValue({- value: {- schemas: [],- },- });- mocks.getColumnCatalog.mockReset();- mocks.getColumnCatalog.mockReturnValue({- semanticType: "",- classification: "",- });- mocks.getTableCatalog.mockReset();- mocks.getTableCatalog.mockReturnValue({- classification: "",- });- mocks.featureToRef.mockReset();- mocks.featureToRef.mockReturnValue({ value: true });- mocks.useSettingV1Store.mockReset();- mocks.useSettingV1Store.mockReturnValue({- getOrFetchSettingByName: vi.fn(),- getProjectClassification: vi.fn(() => undefined),- });- mocks.getDatabaseProject.mockReset();- mocks.getDatabaseProject.mockImplementation(- (database: { project: string }) => ({- name: database.project,- dataClassificationConfigId: "classification-config",- })- );- mocks.hasIndexSizeProperty.mockReset();- mocks.hasIndexSizeProperty.mockReturnValue(true);- mocks.useVueState.mockReset();- mocks.useVueState.mockImplementation((getter: () => unknown) => getter());- mocks.hasTableEngineProperty.mockReset();- mocks.hasTableEngineProperty.mockReturnValue(false);- mocks.instanceV1HasCollationAndCharacterSet.mockReset();- mocks.instanceV1HasCollationAndCharacterSet.mockReturnValue(true);- mocks.instanceV1SupportsColumn.mockReset();- mocks.instanceV1SupportsColumn.mockReturnValue(true);- mocks.instanceV1SupportsIndex.mockReset();- mocks.instanceV1SupportsIndex.mockReturnValue(true);- mocks.dialogProps.length = 0;-- vi.resetModules();- ({ DatabaseObjectExplorer } = await import("./DatabaseObjectExplorer"));-});--describe("DatabaseObjectExplorer", () => {- test("passes serializable detail props after selecting a table row", async () => {- const { container, render, unmount } = renderIntoContainer(- createElement(DatabaseObjectExplorer, {- database: makeDatabase(),- loading: false,- selectedSchemaName: "public",- tableSearchKeyword: "",- externalTableSearchKeyword: "",- onSelectedSchemaNameChange: vi.fn(),- onTableSearchKeywordChange: vi.fn(),- onExternalTableSearchKeywordChange: vi.fn(),- })- );-- render();- await flush();-- const ordersRow = Array.from(container.querySelectorAll("td"))- .find((cell) => cell.textContent === "orders")- ?.closest("tr");- expect(ordersRow).toBeTruthy();-- clickElement(ordersRow as HTMLTableRowElement);- await flush();-- const latestDialogProps = mocks.dialogProps.at(-1);- expect(() => JSON.stringify(latestDialogProps)).not.toThrow();-- unmount();- });-});diff --git a/frontend/src/react/pages/project/database-detail/overview/DatabaseObjectExplorer.tsx b/frontend/src/react/pages/project/database-detail/overview/DatabaseObjectExplorer.tsxindex 65f73ccfcb..dabb564dde 100644--- a/frontend/src/react/pages/project/database-detail/overview/DatabaseObjectExplorer.tsx+++ b/frontend/src/react/pages/project/database-detail/overview/DatabaseObjectExplorer.tsx@@ -1,17 +1,9 @@-import { useEffect, useState } from "react";+import { useCallback, useEffect, useState } from "react";import { useTranslation } from "react-i18next";-import { getColumnDefaultValuePlaceholder } from "@/components/SchemaEditorLite/utils/columnDefaultValue";import { Input } from "@/react/components/ui/input";import { useVueState } from "@/react/hooks/useVueState";import { router } from "@/router";-import {- featureToRef,- getColumnCatalog,- getTableCatalog,- useDatabaseCatalog,- useDBSchemaV1Store,- useSettingV1Store,-} from "@/store";+import { useDBSchemaV1Store, useSettingV1Store } from "@/store";import { Engine } from "@/types/proto-es/v1/common_pb";import type {Database,@@ -21,17 +13,10 @@ import type {TaskMetadata,} from "@/types/proto-es/v1/database_service_pb";import { Setting_SettingName } from "@/types/proto-es/v1/setting_service_pb";-import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";import {- bytesToString,getDatabaseEngine,getDatabaseProject,- hasIndexSizeProperty,hasSchemaProperty,- hasTableEngineProperty,- instanceV1HasCollationAndCharacterSet,- instanceV1SupportsColumn,- instanceV1SupportsIndex,instanceV1SupportsPackage,instanceV1SupportsSequence,} from "@/utils";@@ -39,10 +24,7 @@ import {type ObjectSectionRow,ObjectSectionTable,} from "./ObjectSectionTable";-import {- TableDetailDialog,- type TableDetailDialogData,-} from "./TableDetailDialog";+import { VueTableDetailDrawerMount } from "./TableDetailDialog";import { TableMetadataTable } from "./TableMetadataTable";function filterByKeyword(name: string, keyword: string) {@@ -110,11 +92,6 @@ export function DatabaseObjectExplorer({const databaseMetadata = useVueState(() =>dbSchemaStore.getDatabaseMetadata(database.name));- const hasSensitiveDataFeature = useVueState(- () => featureToRef(PlanFeature.FEATURE_DATA_MASKING).value- );- const databaseCatalog = useDatabaseCatalog(database.name, false);- const catalog = useVueState(() => databaseCatalog.value);const project = getDatabaseProject(database);const classificationConfig = useVueState(() =>settingStore.getProjectClassification(@@ -139,83 +116,9 @@ export function DatabaseObjectExplorer({? (selectedSchemaMetadata?.packages ?? []): databaseMetadata.schemas.flatMap((schema) => schema.packages ?? []);- const selectedTable = tableList.find(- (table) => table.name === selectedTableName- );- const selectedTableCatalog = selectedTable- ? getTableCatalog(catalog, selectedSchemaName, selectedTable.name)- : undefined;- const showSemanticTypeColumn =- hasSensitiveDataFeature &&- [- Engine.MYSQL,- Engine.TIDB,- Engine.POSTGRES,- Engine.REDSHIFT,- Engine.ORACLE,- Engine.SNOWFLAKE,- Engine.MSSQL,- Engine.BIGQUERY,- Engine.SPANNER,- Engine.CASSANDRA,- Engine.TRINO,- ].includes(databaseEngine);- const selectedTableDetail: TableDetailDialogData | undefined = selectedTable- ? {- classification: selectedTableCatalog?.classification,- classificationConfig,- collation: selectedTable.collation,- columns: selectedTable.columns.map((column) => {- const columnCatalog = getColumnCatalog(- catalog,- selectedSchemaName,- selectedTable.name,- column.name- );- return {- name: column.name,- semanticType: columnCatalog?.semanticType,- classification: columnCatalog?.classification,- type: column.type,- defaultValue: getColumnDefaultValuePlaceholder(column),- nullable: column.nullable,- characterSet: column.characterSet,- collation: column.collation,- comment: column.comment,- };- }),- dataSize: bytesToString(Number(selectedTable.dataSize)),- engine: selectedTable.engine,- indexes: (selectedTable.indexes ?? []).map((index) => ({- name: index.name,- expressions: index.expressions,- unique: index.unique,- visible: index.visible,- comment: index.comment,- })),- indexSize: bytesToString(Number(selectedTable.indexSize)),- name:- supportsSchema && selectedSchemaName- ? `"${selectedSchemaName}"."${selectedTable.name}"`- : selectedTable.name,- rowCount: String(selectedTable.rowCount),- showCharacterSet: databaseEngine !== Engine.POSTGRES,- showColumnClassification: hasSensitiveDataFeature,- showColumnCollation:- databaseEngine !== Engine.CLICKHOUSE &&- databaseEngine !== Engine.SNOWFLAKE,- showColumns: instanceV1SupportsColumn(databaseEngine),- showCollation: instanceV1HasCollationAndCharacterSet(databaseEngine),- showEngine: hasTableEngineProperty(databaseEngine),- showIndexComment: databaseEngine !== Engine.MONGODB,- showIndexes: instanceV1SupportsIndex(databaseEngine),- showIndexSize: hasIndexSizeProperty(databaseEngine),- showIndexVisible:- databaseEngine !== Engine.POSTGRES &&- databaseEngine !== Engine.MONGODB,- showSemanticType: showSemanticTypeColumn,- }- : undefined;+ const handleDismissDrawer = useCallback(() => {+ setSelectedTableName("");+ }, []);useEffect(() => {void settingStore.getOrFetchSettingByName(@@ -231,12 +134,14 @@ export function DatabaseObjectExplorer({}, [routeTable]);useEffect(() => {- if (!selectedTableName || loading || selectedTable) {+ if (!selectedTableName || loading) {return;}-- setSelectedTableName("");- }, [loading, selectedTable, selectedTableName]);+ const exists = tableList.some((t) => t.name === selectedTableName);+ if (!exists) {+ setSelectedTableName("");+ }+ }, [loading, selectedTableName, tableList]);useEffect(() => {const currentQuery = router.currentRoute.value.query;@@ -454,14 +359,13 @@ export function DatabaseObjectExplorer({</>)}- <TableDetailDialog- open={!!selectedTableName}- table={selectedTableDetail}- onOpenChange={(open) => {- if (!open) {- setSelectedTableName("");- }- }}+ <VueTableDetailDrawerMount+ show={!!selectedTableName}+ databaseName={database.name}+ schemaName={selectedSchemaName}+ tableName={selectedTableName}+ classificationConfig={classificationConfig}+ onDismiss={handleDismissDrawer}/></div>);diff --git a/frontend/src/react/pages/project/database-detail/overview/TableDetailDialog.test.tsx b/frontend/src/react/pages/project/database-detail/overview/TableDetailDialog.test.tsxdeleted file mode 100644index e77cd11eff..0000000000--- a/frontend/src/react/pages/project/database-detail/overview/TableDetailDialog.test.tsx+++ /dev/null@@ -1,165 +0,0 @@-import { act, createElement } from "react";-import { createRoot } from "react-dom/client";-import { beforeEach, describe, expect, test, vi } from "vitest";-import type { DataClassificationSetting_DataClassificationConfig } from "@/types/proto-es/v1/setting_service_pb";--(- globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }-).IS_REACT_ACT_ENVIRONMENT = true;--const mocks = vi.hoisted(() => ({- useTranslation: vi.fn(() => ({- t: (key: string) => key,- })),-}));--let TableDetailDialog: typeof import("./TableDetailDialog").TableDetailDialog;--vi.mock("react-i18next", () => ({- useTranslation: mocks.useTranslation,-}));--vi.mock("@/react/components/ui/dialog", () => ({- Dialog: ({ open, children }: { open: boolean; children: React.ReactNode }) =>- open ? <div data-testid="dialog-root">{children}</div> : null,- DialogContent: ({ children }: { children: React.ReactNode }) => (- <div>{children}</div>- ),- DialogTitle: ({ children }: { children: React.ReactNode }) => (- <h1>{children}</h1>- ),-}));--vi.mock("@/react/components/ui/input", () => ({- Input: (props: React.InputHTMLAttributes<HTMLInputElement>) => (- <input {...props} />- ),-}));--const renderIntoContainer = (element: ReturnType<typeof createElement>) => {- const container = document.createElement("div");- const root = createRoot(container);-- return {- container,- render: () => {- act(() => {- root.render(element);- });- },- unmount: () =>- act(() => {- root.unmount();- }),- };-};--const flush = async () => {- await act(async () => {- await Promise.resolve();- await Promise.resolve();- });-};--beforeEach(async () => {- mocks.useTranslation.mockReset();- mocks.useTranslation.mockReturnValue({- t: (key: string) => key,- });-- vi.resetModules();- ({ TableDetailDialog } = await import("./TableDetailDialog"));-});--describe("TableDetailDialog", () => {- test("restores the legacy table detail sections for columns and indexes", async () => {- const classificationConfig = {- id: "classification-config",- levels: [{ level: 1, title: "L1" }],- classification: {- PII: {- id: "PII",- title: "PII",- level: 1,- },- },- } as unknown as DataClassificationSetting_DataClassificationConfig;-- const { container, render, unmount } = renderIntoContainer(- createElement(TableDetailDialog, {- open: true,- onOpenChange: vi.fn(),- table: {- name: '"public"."audit"',- classification: "PII",- classificationConfig,- columns: [- {- name: "id",- semanticType: "",- classification: "",- type: "integer",- defaultValue: "nextval('public.audit_id_seq'::regclass)",- nullable: false,- collation: "",- comment: "",- },- {- name: "query",- semanticType: "SQL",- classification: "PII",- type: "text",- defaultValue: "No default",- nullable: true,- collation: "en_US",- comment: "query text",- },- ],- rowCount: "0",- dataSize: "8 KB",- indexSize: "32 KB",- collation: "en_US",- indexes: [- {- name: "audit_pkey",- expressions: ["id"],- unique: true,- visible: true,- comment: "",- },- ],- showColumnClassification: true,- showColumnCollation: true,- showCollation: true,- showIndexComment: true,- showIndexes: true,- showIndexSize: true,- showIndexVisible: false,- showSemanticType: true,- },- })- );-- render();- await flush();-- expect(container.textContent).toContain("database.classification.self");- expect(container.textContent).toContain("PII");- expect(container.textContent).toContain(- "settings.sensitive-data.semantic-types.table.semantic-type"- );- expect(container.textContent).toContain("common.default");- expect(container.textContent).toContain("database.nullable");- expect(container.textContent).toContain("db.collation");- expect(container.textContent).toContain("database.indexes");- expect(container.textContent).toContain("audit_pkey");- expect(container.textContent).toContain("database.expression");- expect(container.textContent).toContain("database.unique");- expect(container.textContent).toContain(- "nextval('public.audit_id_seq'::regclass)"- );- expect(container.textContent).toContain("query text");-- unmount();- });-});diff --git a/frontend/src/react/pages/project/database-detail/overview/TableDetailDialog.tsx b/frontend/src/react/pages/project/database-detail/overview/TableDetailDialog.tsxindex 151f156a19..590cbaf5a6 100644--- a/frontend/src/react/pages/project/database-detail/overview/TableDetailDialog.tsx+++ b/frontend/src/react/pages/project/database-detail/overview/TableDetailDialog.tsx@@ -1,356 +1,97 @@-import { useEffect, useMemo, useState } from "react";-import { useTranslation } from "react-i18next";-import {- Dialog,- DialogContent,- DialogTitle,-} from "@/react/components/ui/dialog";-import { Input } from "@/react/components/ui/input";+import { useEffect, useRef } from "react";+import { createApp, h, reactive } from "vue";+import { updateTableCatalog } from "@/components/ColumnDataTable/utils";+import OverlayStackManager from "@/components/misc/OverlayStackManager.vue";+import TableDetailDrawer from "@/components/TableDetailDrawer.vue";+import i18n from "@/plugins/i18n";+import NaiveUI from "@/plugins/naive-ui";+import { router } from "@/router";+import { pinia } from "@/store";import type { DataClassificationSetting_DataClassificationConfig } from "@/types/proto-es/v1/setting_service_pb";-export interface TableDetailDialogData {- classification?: string;+export interface VueTableDetailDrawerProps {+ show: boolean;+ databaseName: string;+ schemaName: string;+ tableName: string;classificationConfig?: DataClassificationSetting_DataClassificationConfig;- columns: {- characterSet?: string;- classification?: string;- collation?: string;- comment?: string;- defaultValue: string;- name: string;- nullable: boolean;- semanticType?: string;- type: string;- }[];- collation?: string;- dataSize: string;- engine?: string;- indexes: {- comment?: string;- expressions: string[];- name: string;- unique: boolean;- visible?: boolean;- }[];- indexSize: string;- name: string;- rowCount: string;- showCharacterSet?: boolean;- showColumnClassification?: boolean;- showColumnCollation?: boolean;- showColumns?: boolean;- showCollation?: boolean;- showEngine?: boolean;- showIndexComment?: boolean;- showIndexes?: boolean;- showIndexSize?: boolean;- showIndexVisible?: boolean;- showSemanticType?: boolean;+ onDismiss: () => void;}-function getClassificationTitle(- classification: string | undefined,- classificationConfig:- | DataClassificationSetting_DataClassificationConfig- | undefined-) {- if (!classification || !classificationConfig) {- return "-";- }-- return (- classificationConfig.classification[classification]?.title || classification+export function VueTableDetailDrawerMount({+ show,+ databaseName,+ schemaName,+ tableName,+ classificationConfig,+ onDismiss,+}: VueTableDetailDrawerProps) {+ const containerRef = useRef<HTMLDivElement>(null);+ const bridgeStateRef = useRef(+ reactive({+ show,+ databaseName,+ schemaName,+ tableName,+ classificationConfig,+ onDismiss,+ }));-}--export function TableDetailDialog({- table,- open,- onOpenChange,-}: {- table?: TableDetailDialogData;- open: boolean;- onOpenChange: (open: boolean) => void;-}) {- const { t } = useTranslation();- const [columnSearchKeyword, setColumnSearchKeyword] = useState("");-- const filteredColumns = useMemo(() => {- if (!table) {- return [];- }-- const keyword = columnSearchKeyword.trim().toLowerCase();- if (!keyword) {- return table.columns;- }-- return table.columns.filter((column) =>- column.name.toLowerCase().includes(keyword)- );- }, [columnSearchKeyword, table?.columns]);useEffect(() => {- setColumnSearchKeyword("");- }, [table?.name]);+ const state = bridgeStateRef.current;+ state.show = show;+ state.databaseName = databaseName;+ state.schemaName = schemaName;+ state.tableName = tableName;+ state.classificationConfig = classificationConfig;+ state.onDismiss = onDismiss;+ }, [+ show,+ databaseName,+ schemaName,+ tableName,+ classificationConfig,+ onDismiss,+ ]);- if (!table) {- return null;- }+ useEffect(() => {+ if (!containerRef.current) {+ return;+ }- const showCharacterSetColumn = table.showCharacterSet;- const showColumnClassification = table.showColumnClassification;- const showColumnCollation = table.showColumnCollation;- const showColumns = table.showColumns ?? true;- const showIndexCommentColumn = table.showIndexComment;- const showIndexVisibleColumn = table.showIndexVisible;- const showSemanticTypeColumn = table.showSemanticType;- const showSummaryCollation = table.showCollation;+ const bridgeState = bridgeStateRef.current;- return (- <Dialog open={open} onOpenChange={onOpenChange}>- <DialogContent className="max-w-6xl p-6">- <DialogTitle>{table.name}</DialogTitle>- <div className="mt-4 grid gap-4 sm:grid-cols-3">- <div>- <div className="text-sm font-medium text-control-light">- {t("database.classification.self")}- </div>- <div className="mt-1 text-sm text-main">- {getClassificationTitle(- table.classification,- table.classificationConfig- )}- </div>- </div>- {table.showEngine && (- <div>- <div className="text-sm font-medium text-control-light">- {t("database.engine")}- </div>- <div className="mt-1 text-sm text-main">- {table.engine || "-"}- </div>- </div>- )}- <div>- <div className="text-sm font-medium text-control-light">- {t("database.row-count-estimate")}- </div>- <div className="mt-1 text-sm text-main">{table.rowCount}</div>- </div>- <div>- <div className="text-sm font-medium text-control-light">- {t("database.data-size")}- </div>- <div className="mt-1 text-sm text-main">{table.dataSize}</div>- </div>- {table.showIndexSize && (- <div>- <div className="text-sm font-medium text-control-light">- {t("database.index-size")}- </div>- <div className="mt-1 text-sm text-main">{table.indexSize}</div>- </div>- )}- {showSummaryCollation && (- <div>- <div className="text-sm font-medium text-control-light">- {t("db.collation")}- </div>- <div className="mt-1 text-sm text-main">- {table.collation || "-"}- </div>- </div>- )}- </div>+ const app = createApp({+ render() {+ return h(OverlayStackManager as never, null, {+ default: () =>+ h(TableDetailDrawer as never, {+ show: bridgeState.show,+ databaseName: bridgeState.databaseName,+ schemaName: bridgeState.schemaName,+ tableName: bridgeState.tableName,+ classificationConfig: bridgeState.classificationConfig,+ onDismiss: bridgeState.onDismiss,+ onApplyClassification: (table: string, id: string) => {+ void updateTableCatalog({+ database: bridgeState.databaseName,+ schema: bridgeState.schemaName,+ table,+ tableCatalog: { classification: id },+ });+ },+ }),+ });+ },+ });+ app.use(router).use(pinia).use(i18n).use(NaiveUI);+ app.mount(containerRef.current);- {showColumns && (- <div className="mt-6 flex flex-col gap-y-4">- <div className="flex items-center justify-between gap-3">- <div className="text-sm font-medium text-control-light">- {t("database.columns")}- </div>- <Input- className="w-full max-w-sm"- placeholder={t("common.filter-by-name")}- value={columnSearchKeyword}- onChange={(event) => setColumnSearchKeyword(event.target.value)}- />- </div>- <div className="rounded-lg border border-block-border">- <table className="min-w-full divide-y divide-block-border text-sm">- <thead className="bg-control-bg">- <tr className="text-left text-sm text-control-light">- <th className="px-4 py-2 font-medium">- {t("common.name")}- </th>- {showSemanticTypeColumn && (- <th className="px-4 py-2 font-medium">- {t(- "settings.sensitive-data.semantic-types.table.semantic-type"- )}- </th>- )}- {showColumnClassification && (- <th className="px-4 py-2 font-medium">- {t("database.classification.self")}- </th>- )}- <th className="px-4 py-2 font-medium">- {t("common.type")}- </th>- <th className="px-4 py-2 font-medium">- {t("common.default")}- </th>- <th className="px-4 py-2 font-medium">- {t("database.nullable")}- </th>- {showCharacterSetColumn && (- <th className="px-4 py-2 font-medium">- {t("db.character-set")}- </th>- )}- {showColumnCollation && (- <th className="px-4 py-2 font-medium">- {t("db.collation")}- </th>- )}- <th className="px-4 py-2 font-medium">- {t("common.comment")}- </th>- </tr>- </thead>- <tbody className="divide-y divide-block-border bg-white">- {filteredColumns.map((column) => (- <tr key={column.name}>- <td className="px-4 py-3 text-sm text-main">- {column.name}- </td>- {showSemanticTypeColumn && (- <td className="px-4 py-3 text-sm text-control">- {column.semanticType || "-"}- </td>- )}- {showColumnClassification && (- <td className="px-4 py-3 text-sm text-control">- {getClassificationTitle(- column.classification,- table.classificationConfig- )}- </td>- )}- <td className="px-4 py-3 text-sm text-control">- {column.type}- </td>- <td className="px-4 py-3 text-sm text-control">- {column.defaultValue}- </td>- <td className="px-4 py-3 text-sm text-control">- <input- checked={column.nullable}- disabled- readOnly- type="checkbox"- />- </td>- {showCharacterSetColumn && (- <td className="px-4 py-3 text-sm text-control">- {column.characterSet || "-"}- </td>- )}- {showColumnCollation && (- <td className="px-4 py-3 text-sm text-control">- {column.collation || "-"}- </td>- )}- <td className="px-4 py-3 text-sm text-control">- {column.comment || "-"}- </td>- </tr>- ))}- {filteredColumns.length === 0 && (- <tr>- <td- className="px-4 py-6 text-center text-sm text-control-light"- colSpan={- 5 +- (showSemanticTypeColumn ? 1 : 0) +- (showColumnClassification ? 1 : 0) +- (showCharacterSetColumn ? 1 : 0) +- (showColumnCollation ? 1 : 0)- }- >- {t("common.no-data")}- </td>- </tr>- )}- </tbody>- </table>- </div>- </div>- )}+ return () => {+ app.unmount();+ };+ }, [databaseName]);- {table.showIndexes && table.indexes.length > 0 && (- <div className="mt-6 flex flex-col gap-y-4">- <div className="text-sm font-medium text-control-light">- {t("database.indexes")}- </div>- {table.indexes.map((index) => (- <div- key={index.name}- className="rounded-lg border border-block-border"- >- <div className="border-b border-block-border px-4 py-3 text-base font-medium text-main">- {index.name}- </div>- <table className="min-w-full divide-y divide-block-border text-sm">- <thead className="bg-control-bg">- <tr className="text-left text-sm text-control-light">- <th className="px-4 py-2 font-medium">- {t("database.expression")}- </th>- <th className="px-4 py-2 font-medium">- {t("database.unique")}- </th>- {showIndexVisibleColumn && (- <th className="px-4 py-2 font-medium">- {t("database.visible")}- </th>- )}- {showIndexCommentColumn && (- <th className="px-4 py-2 font-medium">- {t("common.comment")}- </th>- )}- </tr>- </thead>- <tbody className="divide-y divide-block-border bg-white">- <tr>- <td className="px-4 py-3 text-sm text-control">- {index.expressions.join(", ") || "-"}- </td>- <td className="px-4 py-3 text-sm text-control">- {String(index.unique)}- </td>- {showIndexVisibleColumn && (- <td className="px-4 py-3 text-sm text-control">- {String(index.visible)}- </td>- )}- {showIndexCommentColumn && (- <td className="px-4 py-3 text-sm text-control">- {index.comment || "-"}- </td>- )}- </tr>- </tbody>- </table>- </div>- ))}- </div>- )}- </DialogContent>- </Dialog>- );+ return <div ref={containerRef} />;}diff --git a/frontend/src/react/pages/project/database-detail/overview/TableMetadataTable.tsx b/frontend/src/react/pages/project/database-detail/overview/TableMetadataTable.tsxindex d84a4ae2ba..5b6d3f92ab 100644--- a/frontend/src/react/pages/project/database-detail/overview/TableMetadataTable.tsx+++ b/frontend/src/react/pages/project/database-detail/overview/TableMetadataTable.tsx@@ -1,14 +1,65 @@import { useMemo } from "react";import { useTranslation } from "react-i18next";import { useVueState } from "@/react/hooks/useVueState";-import { featureToRef, getTableCatalog, useDatabaseCatalog } from "@/store";+import {+ featureToRef,+ getTableCatalog,+ useDatabaseCatalog,+ useSettingV1Store,+} from "@/store";import { Engine } from "@/types/proto-es/v1/common_pb";import type {Database,TableMetadata,} from "@/types/proto-es/v1/database_service_pb";+import type { DataClassificationSetting_DataClassificationConfig } from "@/types/proto-es/v1/setting_service_pb";import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";-import { bytesToString, getDatabaseEngine, hasSchemaProperty } from "@/utils";+import {+ bytesToString,+ getDatabaseEngine,+ getDatabaseProject,+ hasSchemaProperty,+} from "@/utils";++const BG_COLORS = [+ "bg-green-200",+ "bg-yellow-200",+ "bg-orange-300",+ "bg-amber-500",+ "bg-red-500",+];++function ClassificationBadge({+ classificationId,+ classificationConfig,+}: {+ classificationId: string | undefined;+ classificationConfig:+ | DataClassificationSetting_DataClassificationConfig+ | undefined;+}) {+ if (!classificationId || !classificationConfig) {+ return <span>-</span>;+ }+ const entry = classificationConfig.classification[classificationId];+ if (!entry) {+ return <span>{classificationId}</span>;+ }+ const level = (classificationConfig.levels ?? []).find(+ (l) => l.level === entry.level+ );+ const levelColor = BG_COLORS[(entry.level ?? 0) - 1] ?? "bg-gray-200";+ return (+ <span className="inline-flex items-center gap-x-1">+ <span className="truncate">{entry.title}</span>+ {level && (+ <span className={`shrink-0 rounded px-1 py-0.5 text-xs ${levelColor}`}>+ {level.title}+ </span>+ )}+ </span>+ );+}export function TableMetadataTable({database,@@ -24,6 +75,7 @@ export function TableMetadataTable({onRowClick?: (table: TableMetadata) => void;}) {const { t } = useTranslation();+ const settingStore = useSettingV1Store();const databaseEngine = getDatabaseEngine(database);const showSchemaColumn = hasSchemaProperty(databaseEngine);const showClassificationColumn = useVueState(@@ -31,6 +83,12 @@ export function TableMetadataTable({);const databaseCatalog = useDatabaseCatalog(database.name, false);const catalog = useVueState(() => databaseCatalog.value);+ const project = getDatabaseProject(database);+ const classificationConfig = useVueState(() =>+ settingStore.getProjectClassification(+ project.dataClassificationConfigId ?? ""+ )+ );const showEngineColumn = databaseEngine !== Engine.POSTGRES;const showPartitionedColumn = databaseEngine === Engine.POSTGRES;@@ -137,7 +195,10 @@ export function TableMetadataTable({<td className="px-4 py-3 text-sm text-main">{table.name}</td>{showClassificationColumn && (<td className="px-4 py-3 text-sm text-control">- {classification || "-"}+ <ClassificationBadge+ classificationId={classification}+ classificationConfig={classificationConfig}+ /></td>)}{showEngineColumn && (diff --git a/frontend/src/react/pages/project/database-detail/panels/DatabaseCatalogPanel.test.tsx b/frontend/src/react/pages/project/database-detail/panels/DatabaseCatalogPanel.test.tsxdeleted file mode 100644index 4d037e3f9a..0000000000--- a/frontend/src/react/pages/project/database-detail/panels/DatabaseCatalogPanel.test.tsx+++ /dev/null@@ -1,661 +0,0 @@-import { act, createElement } from "react";-import { createRoot } from "react-dom/client";-import { beforeEach, describe, expect, test, vi } from "vitest";-import type { Database } from "@/types/proto-es/v1/database_service_pb";-import { Setting_SettingName } from "@/types/proto-es/v1/setting_service_pb";--(- globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }-).IS_REACT_ACT_ENVIRONMENT = true;--const mocks = vi.hoisted(() => ({- confirm: vi.fn(() => true),- localStorage: {- clear: vi.fn(),- getItem: vi.fn(() => null),- removeItem: vi.fn(),- setItem: vi.fn(),- },- useTranslation: vi.fn(() => ({- t: (key: string) => key,- })),- useVueState: vi.fn((getter: () => unknown) => getter()),- featureToRef: vi.fn(() => ({ value: true })),- useDatabaseCatalog: vi.fn(() => ({- value: {- schemas: [- {- name: "public",- tables: [- {- name: "book",- kind: {- case: "columns",- value: {- columns: [- {- name: "email",- semanticType: "EMAIL",- classification: "",- },- ],- },- },- classification: "",- },- ],- },- ],- } as unknown,- })),- usePolicyV1Store: vi.fn(() => ({- getOrFetchPolicyByParentAndType: vi.fn(),- upsertPolicy: vi.fn(),- })),- useDatabaseCatalogV1Store: vi.fn(() => ({- updateDatabaseCatalog: vi.fn(),- })),- useSettingV1Store: vi.fn(() => ({- getOrFetchSettingByName: vi.fn(),- getProjectClassification: vi.fn(() => ({- id: "classification-config",- classification: {- PII: {- id: "PII",- title: "PII",- },- },- })),- getSettingByName: vi.fn(() => ({- value: {- value: {- case: "semanticType",- value: {- types: [- {- id: "EMAIL",- title: "Email",- },- {- id: "PHONE",- title: "Phone",- },- ],- },- },- },- })),- })),- pushNotification: vi.fn(),- hasProjectPermissionV2: vi.fn(- (_project?: unknown, _permission?: string) => true- ),- getDatabaseProject: vi.fn((database: { project: string }) => ({- name: database.project,- dataClassificationConfigId: "classification-config",- })),- getInstanceResource: vi.fn(() => ({ name: "instances/inst1", engine: 1 })),- instanceV1MaskingForNoSQL: vi.fn(() => false),- FeatureAttention: vi.fn(() => <div data-testid="feature-attention" />),- FeatureBadge: vi.fn(() => <div data-testid="feature-badge" />),- PermissionGuard: vi.fn(- ({ children }: { children: React.ReactNode }) => children- ),-}));--let DatabaseCatalogPanel: typeof import("./DatabaseCatalogPanel").DatabaseCatalogPanel;--vi.stubGlobal("confirm", mocks.confirm);--vi.mock("react-i18next", () => ({- useTranslation: mocks.useTranslation,-}));--vi.mock("@/react/hooks/useVueState", () => ({- useVueState: mocks.useVueState,-}));--vi.mock("@/store", () => ({- featureToRef: mocks.featureToRef,- pushNotification: mocks.pushNotification,- useDatabaseCatalog: mocks.useDatabaseCatalog,- useDatabaseCatalogV1Store: mocks.useDatabaseCatalogV1Store,- usePolicyV1Store: mocks.usePolicyV1Store,- useSettingV1Store: mocks.useSettingV1Store,-}));--vi.mock("@/utils", () => ({- getDatabaseProject: mocks.getDatabaseProject,- getInstanceResource: mocks.getInstanceResource,- hasProjectPermissionV2: mocks.hasProjectPermissionV2,- instanceV1MaskingForNoSQL: mocks.instanceV1MaskingForNoSQL,-}));--vi.mock("@/react/components/FeatureAttention", () => ({- FeatureAttention: mocks.FeatureAttention,-}));--vi.mock("@/react/components/FeatureBadge", () => ({- FeatureBadge: mocks.FeatureBadge,-}));--vi.mock("@/react/components/PermissionGuard", () => ({- PermissionGuard: mocks.PermissionGuard,-}));--vi.mock("@/react/components/ui/button", () => ({- Button: (props: React.ButtonHTMLAttributes<HTMLButtonElement>) => (- <button {...props} />- ),-}));--vi.mock("@/react/components/ui/input", () => ({- Input: (props: React.InputHTMLAttributes<HTMLInputElement>) => (- <input {...props} />- ),-}));--vi.mock("@/react/components/ui/select", () => ({- Select: ({- value,- onValueChange,- children,- }: {- value?: string;- onValueChange?: (value: string) => void;- children: React.ReactNode;- }) => (- <select- value={value}- onChange={(event) => onValueChange?.(event.target.value)}- >- {children}- </select>- ),- SelectTrigger: ({ children }: { children: React.ReactNode }) => children,- SelectValue: ({ placeholder }: { placeholder?: string }) => (- <option value="">{placeholder}</option>- ),- SelectContent: ({ children }: { children: React.ReactNode }) => children,- SelectItem: ({- value,- children,- }: {- value: string;- children: React.ReactNode;- }) => <option value={value}>{children}</option>,-}));--vi.mock("@/react/components/ui/dialog", () => ({- Dialog: ({ open, children }: { open: boolean; children: React.ReactNode }) =>- open ? <div data-testid="dialog-root">{children}</div> : null,- DialogContent: ({ children }: { children: React.ReactNode }) => (- <div>{children}</div>- ),- DialogTitle: ({ children }: { children: React.ReactNode }) => (- <h1>{children}</h1>- ),-}));--vi.mock("@/react/components/AccountMultiSelect", () => ({- AccountMultiSelect: ({- value,- onChange,- }: {- value: string[];- onChange: (value: string[]) => void;- }) => (- <button- type="button"- data-testid="member-select"- onClick={() => onChange([...value, "user:[email protected]"])}- >- member-select- </button>- ),-}));--vi.mock("@/react/components/DatabaseResourceSelector", () => ({- DatabaseResourceSelector: ({- value,- onChange,- }: {- value: unknown[];- onChange: (value: unknown[]) => void;- }) => (- <button- type="button"- data-testid="resource-select"- onClick={() => onChange(value)}- >- resource-select- </button>- ),-}));--vi.mock("@/react/components/ui/expiration-picker", () => ({- ExpirationPicker: ({- value,- onChange,- }: {- value: string | undefined;- onChange: (value: string | undefined) => void;- }) => (- <input- data-testid="expiration-picker"- value={value ?? ""}- onChange={(event) => onChange(event.target.value || undefined)}- />- ),-}));--const renderIntoContainer = (element: ReturnType<typeof createElement>) => {- const container = document.createElement("div");- const root = createRoot(container);- return {- container,- render: (nextElement = element) => {- act(() => {- root.render(nextElement);- });- },- unmount: () =>- act(() => {- root.unmount();- }),- };-};--const flush = async () => {- await act(async () => {- await Promise.resolve();- await Promise.resolve();- });-};--const click = (element: HTMLElement) => {- act(() => {- element.dispatchEvent(- new MouseEvent("click", { bubbles: true, cancelable: true })- );- });-};--const makeDatabase = (): Database =>- ({- name: "instances/inst1/databases/db1",- project: "projects/proj1",- }) as Database;--beforeEach(async () => {- mocks.confirm.mockReset();- mocks.confirm.mockReturnValue(true);- vi.stubGlobal("localStorage", mocks.localStorage);- mocks.useTranslation.mockReset();- mocks.useTranslation.mockReturnValue({- t: (key: string) => key,- });- mocks.useVueState.mockReset();- mocks.useVueState.mockImplementation((getter: () => unknown) => getter());- mocks.featureToRef.mockReset();- mocks.featureToRef.mockReturnValue({ value: true });- mocks.useDatabaseCatalog.mockReset();- mocks.useDatabaseCatalog.mockReturnValue({- value: {- schemas: [- {- name: "public",- tables: [- {- name: "book",- kind: {- case: "columns",- value: {- columns: [- {- name: "email",- semanticType: "EMAIL",- classification: "",- },- ],- },- },- classification: "",- },- ],- },- ],- } as unknown,- });- mocks.usePolicyV1Store.mockReset();- mocks.usePolicyV1Store.mockReturnValue({- getOrFetchPolicyByParentAndType: vi.fn(),- upsertPolicy: vi.fn(),- });- mocks.useDatabaseCatalogV1Store.mockReset();- mocks.useDatabaseCatalogV1Store.mockReturnValue({- updateDatabaseCatalog: vi.fn(),- });- mocks.useSettingV1Store.mockReset();- mocks.useSettingV1Store.mockReturnValue({- getOrFetchSettingByName: vi.fn(),- getProjectClassification: vi.fn(() => ({- id: "classification-config",- classification: {- PII: {- id: "PII",- title: "PII",- },- },- })),- getSettingByName: vi.fn(() => ({- value: {- value: {- case: "semanticType",- value: {- types: [- {- id: "EMAIL",- title: "Email",- },- {- id: "PHONE",- title: "Phone",- },- ],- },- },- },- })),- });- mocks.pushNotification.mockReset();- mocks.hasProjectPermissionV2.mockReset();- mocks.hasProjectPermissionV2.mockReturnValue(true);- mocks.getDatabaseProject.mockReset();- mocks.getDatabaseProject.mockImplementation(- (database: { project: string }) => ({- name: database.project,- dataClassificationConfigId: "classification-config",- })- );- mocks.getInstanceResource.mockReset();- mocks.getInstanceResource.mockReturnValue({- name: "instances/inst1",- engine: 1,- });- mocks.instanceV1MaskingForNoSQL.mockReset();- mocks.instanceV1MaskingForNoSQL.mockReturnValue(false);- mocks.FeatureAttention.mockClear();- mocks.FeatureBadge.mockClear();- mocks.PermissionGuard.mockClear();-- vi.resetModules();- ({ DatabaseCatalogPanel } = await import("./DatabaseCatalogPanel"));-});--describe("DatabaseCatalogPanel", () => {- test("renders catalog rows and opens the react grant-access dialog after selection", async () => {- const { container, render, unmount } = renderIntoContainer(- createElement(DatabaseCatalogPanel, {- database: makeDatabase(),- })- );- render();- await flush();-- expect(container.textContent).toContain("public.book");- expect(container.textContent).toContain("email");-- const grantAccessButton = Array.from(- container.querySelectorAll("button")- ).find(- (button) => button.textContent === "settings.sensitive-data.grant-access"- );- expect(grantAccessButton).toBeDefined();- expect(grantAccessButton?.hasAttribute("disabled")).toBe(true);-- const checkbox = container.querySelector('input[type="checkbox"]');- expect(checkbox).not.toBeNull();- click(checkbox as HTMLElement);- await flush();-- const enabledGrantAccessButton = Array.from(- container.querySelectorAll("button")- ).find(- (button) => button.textContent === "settings.sensitive-data.grant-access"- );- expect(enabledGrantAccessButton?.hasAttribute("disabled")).toBe(false);-- click(enabledGrantAccessButton as HTMLElement);- await flush();-- expect(- container.querySelector('[data-testid="dialog-root"]')- ).not.toBeNull();- expect(container.textContent).toContain(- "settings.sensitive-data.grant-access"- );-- unmount();- });-- test("opens the feature dialog instead of grant access when masking feature is missing", async () => {- mocks.featureToRef.mockReturnValue({ value: false });-- const { container, render, unmount } = renderIntoContainer(- createElement(DatabaseCatalogPanel, {- database: makeDatabase(),- })- );- render();- await flush();-- const checkbox = container.querySelector('input[type="checkbox"]');- expect(checkbox).not.toBeNull();- click(checkbox as HTMLElement);- await flush();-- const grantAccessButton = Array.from(- container.querySelectorAll("button")- ).find(- (button) => button.textContent === "settings.sensitive-data.grant-access"- );- expect(grantAccessButton?.hasAttribute("disabled")).toBe(false);-- click(grantAccessButton as HTMLElement);- await flush();-- expect(- container.querySelector('[data-testid="dialog-root"]')- ).not.toBeNull();- expect(mocks.FeatureBadge).toHaveBeenCalledWith(- expect.objectContaining({- clickable: false,- }),- undefined- );-- unmount();- });-- test("passes the project-scoped grant-access guard inputs", async () => {- const { render, unmount } = renderIntoContainer(- createElement(DatabaseCatalogPanel, {- database: makeDatabase(),- })- );- render();- await flush();-- expect(mocks.PermissionGuard).toHaveBeenCalledWith(- expect.objectContaining({- permissions: [- "bb.policies.createMaskingExemptionPolicy",- "bb.policies.updateMaskingExemptionPolicy",- "bb.databaseCatalogs.get",- ],- project: expect.objectContaining({- name: "projects/proj1",- }),- }),- undefined- );-- unmount();- });-- test("clears deleted columns from the checked selection", async () => {- const updateDatabaseCatalog = vi.fn().mockResolvedValue(undefined);- mocks.useDatabaseCatalogV1Store.mockReturnValue({- updateDatabaseCatalog,- });-- const { container, render, unmount } = renderIntoContainer(- createElement(DatabaseCatalogPanel, {- database: makeDatabase(),- })- );- render();- await flush();-- const checkbox = container.querySelector('input[type="checkbox"]');- expect(checkbox).not.toBeNull();- click(checkbox as HTMLElement);- await flush();-- const grantAccessButtonBeforeDelete = Array.from(- container.querySelectorAll("button")- ).find(- (button) => button.textContent === "settings.sensitive-data.grant-access"- );- expect(grantAccessButtonBeforeDelete?.hasAttribute("disabled")).toBe(false);-- const deleteButton = container.querySelector(- 'button[aria-label="common.remove"]'- );- expect(deleteButton).not.toBeNull();- click(deleteButton as HTMLElement);- await flush();-- expect(updateDatabaseCatalog).toHaveBeenCalledTimes(1);-- const grantAccessButtonAfterDelete = Array.from(- container.querySelectorAll("button")- ).find(- (button) => button.textContent === "settings.sensitive-data.grant-access"- );- expect(grantAccessButtonAfterDelete?.hasAttribute("disabled")).toBe(true);-- unmount();- });-- test("updates semantic type and classification inline", async () => {- const updateDatabaseCatalog = vi.fn().mockResolvedValue(undefined);- const getOrFetchSettingByName = vi.fn();- mocks.useDatabaseCatalogV1Store.mockReturnValue({- updateDatabaseCatalog,- });- mocks.useSettingV1Store.mockReturnValue({- getOrFetchSettingByName,- getProjectClassification: vi.fn(() => ({- id: "classification-config",- classification: {- PII: {- id: "PII",- title: "PII",- },- CONFIDENTIAL: {- id: "CONFIDENTIAL",- title: "Confidential",- },- },- })),- getSettingByName: vi.fn(() => ({- value: {- value: {- case: "semanticType",- value: {- types: [- {- id: "EMAIL",- title: "Email",- },- {- id: "PHONE",- title: "Phone",- },- ],- },- },- },- })),- });-- const { container, render, unmount } = renderIntoContainer(- createElement(DatabaseCatalogPanel, {- database: makeDatabase(),- })- );- render();- await flush();-- expect(getOrFetchSettingByName).toHaveBeenCalledWith(- Setting_SettingName.SEMANTIC_TYPES,- true- );- expect(getOrFetchSettingByName).toHaveBeenCalledWith(- Setting_SettingName.DATA_CLASSIFICATION,- true- );-- const selects = Array.from(container.querySelectorAll("select"));- expect(selects).toHaveLength(2);-- act(() => {- const descriptor = Object.getOwnPropertyDescriptor(- HTMLSelectElement.prototype,- "value"- );- descriptor?.set?.call(selects[0], "PHONE");- selects[0].dispatchEvent(new Event("change", { bubbles: true }));- });- await flush();-- act(() => {- const descriptor = Object.getOwnPropertyDescriptor(- HTMLSelectElement.prototype,- "value"- );- descriptor?.set?.call(selects[1], "CONFIDENTIAL");- selects[1].dispatchEvent(new Event("change", { bubbles: true }));- });- await flush();-- expect(updateDatabaseCatalog).toHaveBeenCalledTimes(2);- expect(mocks.pushNotification).toHaveBeenCalledWith(- expect.objectContaining({- style: "SUCCESS",- title: "common.updated",- })- );-- unmount();- });-- test("handles undefined catalog state before data is loaded", async () => {- mocks.useDatabaseCatalog.mockReturnValue({ value: undefined as unknown });-- const { container, render, unmount } = renderIntoContainer(- createElement(DatabaseCatalogPanel, {- database: makeDatabase(),- })- );- render();- await flush();-- expect(container.textContent).not.toContain("public.book");- expect(container.textContent).not.toContain("email");-- unmount();- });-});diff --git a/frontend/src/react/pages/project/database-detail/panels/DatabaseCatalogPanel.tsx b/frontend/src/react/pages/project/database-detail/panels/DatabaseCatalogPanel.tsxindex 51986da1c9..51aaf119d9 100644--- a/frontend/src/react/pages/project/database-detail/panels/DatabaseCatalogPanel.tsx+++ b/frontend/src/react/pages/project/database-detail/panels/DatabaseCatalogPanel.tsx@@ -1,468 +1,38 @@-import { create } from "@bufbuild/protobuf";-import { ShieldCheck } from "lucide-react";-import { useEffect, useMemo, useState } from "react";-import { useTranslation } from "react-i18next";-import type {- MaskData,- MaskDataTarget,-} from "@/components/SensitiveData/types";-import {- getMaskDataIdentifier,- isCurrentColumnException,-} from "@/components/SensitiveData/utils";-import { FeatureAttention } from "@/react/components/FeatureAttention";-import { FeatureBadge } from "@/react/components/FeatureBadge";-import { PermissionGuard } from "@/react/components/PermissionGuard";-import { Button } from "@/react/components/ui/button";-import {- Dialog,- DialogContent,- DialogTitle,-} from "@/react/components/ui/dialog";-import { Input } from "@/react/components/ui/input";-import { useVueState } from "@/react/hooks/useVueState";-import {- featureToRef,- pushNotification,- useDatabaseCatalog,- useDatabaseCatalogV1Store,- usePolicyV1Store,- useSettingV1Store,-} from "@/store";-import type { Permission } from "@/types";-import type {- ColumnCatalog,- DatabaseCatalog,- ObjectSchema,- TableCatalog,-} from "@/types/proto-es/v1/database_catalog_service_pb";-import { ObjectSchema_Type } from "@/types/proto-es/v1/database_catalog_service_pb";+import { useEffect, useRef } from "react";+import { createApp, h } from "vue";+import DatabaseSensitiveDataPanel from "@/components/Database/DatabaseSensitiveDataPanel.vue";+import OverlayStackManager from "@/components/misc/OverlayStackManager.vue";+import i18n from "@/plugins/i18n";+import NaiveUI from "@/plugins/naive-ui";+import { router } from "@/router";+import { pinia } from "@/store";import type { Database } from "@/types/proto-es/v1/database_service_pb";-import {- MaskingExemptionPolicySchema,- PolicyType,-} from "@/types/proto-es/v1/org_policy_service_pb";-import {- type SemanticTypeSetting_SemanticType,- Setting_SettingName,-} from "@/types/proto-es/v1/setting_service_pb";-import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";-import {- getDatabaseProject,- getInstanceResource,- hasProjectPermissionV2,- instanceV1MaskingForNoSQL,-} from "@/utils";-import { GrantAccessDialog } from "../catalog/GrantAccessDialog";-import { SensitiveColumnTable } from "../catalog/SensitiveColumnTable";--const GRANT_ACCESS_PERMISSIONS: Permission[] = [- "bb.policies.createMaskingExemptionPolicy",- "bb.policies.updateMaskingExemptionPolicy",- "bb.databaseCatalogs.get",-];--const flattenObjectSchema = (- parentPath: string,- objectSchema: ObjectSchema-): {- column: string;- semanticTypeId: string;- target: ObjectSchema;-}[] => {- switch (objectSchema.type) {- case ObjectSchema_Type.OBJECT: {- const result = [];- if (objectSchema.kind?.case === "structKind") {- for (const [key, schema] of Object.entries(- objectSchema.kind.value.properties ?? {}- )) {- result.push(- ...flattenObjectSchema(- [parentPath, key].filter((item) => item).join("."),- schema- )- );- }- }- return result;- }- case ObjectSchema_Type.ARRAY:- if (- objectSchema.kind?.case === "arrayKind" &&- objectSchema.kind.value.kind- ) {- return flattenObjectSchema(parentPath, objectSchema.kind.value.kind);- }- return [];- default:- return [- {- column: parentPath,- semanticTypeId: objectSchema.semanticType,- target: objectSchema,- },- ];- }-};--const flattenSensitiveColumnList = (catalog?: DatabaseCatalog): MaskData[] => {- if (!catalog) {- return [];- }-- const sensitiveList: MaskData[] = [];-- for (const schema of catalog.schemas) {- for (const table of schema.tables) {- if (table.kind?.case === "columns") {- for (const column of table.kind.value.columns ?? []) {- if (!column.semanticType && !column.classification) {- continue;- }- sensitiveList.push({- schema: schema.name,- table: table.name,- column: column.name,- semanticTypeId: column.semanticType,- classificationId: column.classification,- target: column,- });- }- }-- if (table.kind?.case === "objectSchema") {- const flattened = flattenObjectSchema("", table.kind.value);- sensitiveList.push(- ...flattened.map((item) => ({- ...item,- schema: schema.name,- table: table.name,- classificationId: "",- disableClassification: true,- }))- );- }-- if (table.classification) {- sensitiveList.push({- schema: schema.name,- table: table.name,- column: "",- semanticTypeId: "",- disableSemanticType: true,- classificationId: table.classification,- target: table,- });- }- }- }-- return sensitiveList;-};--const hasSemanticType = (- target: MaskDataTarget-): target is ColumnCatalog | ObjectSchema => {- return "semanticType" in target;-};--const hasClassificationType = (- target: MaskDataTarget-): target is ColumnCatalog | TableCatalog => {- return "classification" in target;-};export function DatabaseCatalogPanel({ database }: { database: Database }) {- const { t } = useTranslation();- const policyStore = usePolicyV1Store();- const databaseCatalogStore = useDatabaseCatalogV1Store();- const settingStore = useSettingV1Store();-- const databaseCatalog = useDatabaseCatalog(database.name, false);- const catalog = useVueState(() => databaseCatalog.value);- const semanticTypeList = useVueState(() => {- const setting = settingStore.getSettingByName(- Setting_SettingName.SEMANTIC_TYPES- );- return setting?.value?.value.case === "semanticType"- ? ((setting.value.value.value.types ??- []) as SemanticTypeSetting_SemanticType[])- : [];- });- const hasSensitiveDataFeature = useVueState(- () => featureToRef(PlanFeature.FEATURE_DATA_MASKING).value- );-- const [searchText, setSearchText] = useState("");- const [checkedColumnList, setCheckedColumnList] = useState<MaskData[]>([]);- const [showFeatureDialog, setShowFeatureDialog] = useState(false);- const [showGrantAccessDrawer, setShowGrantAccessDrawer] = useState(false);-- const instance = getInstanceResource(database);- const isMaskingForNoSQL = instanceV1MaskingForNoSQL(instance);- const project = getDatabaseProject(database);- const classificationConfig = useVueState(() =>- settingStore.getProjectClassification(- project.dataClassificationConfigId ?? ""- )- );- const hasUpdateCatalogPermission = hasProjectPermissionV2(- project,- "bb.databaseCatalogs.update"- );- const hasGrantAccessPermission = GRANT_ACCESS_PERMISSIONS.every(- (permission) => hasProjectPermissionV2(project, permission)- );-- const columnList = useMemo(- () => flattenSensitiveColumnList(catalog),- [catalog]- );- const normalizedSearchText = searchText.trim().toLowerCase();- const filteredColumnList = useMemo(() => {- if (!normalizedSearchText) {- return columnList;- }- return columnList.filter((item) => {- return (- item.schema.toLowerCase().includes(normalizedSearchText) ||- item.table.toLowerCase().includes(normalizedSearchText) ||- item.column.toLowerCase().includes(normalizedSearchText)- );- });- }, [columnList, normalizedSearchText]);-- const openGrantAccessDrawer =- showGrantAccessDrawer && checkedColumnList.length > 0;-- const semanticTypeOptions = useMemo(- () =>- semanticTypeList.map((semanticType) => ({- label: semanticType.title || semanticType.id,- value: semanticType.id,- })),- [semanticTypeList]- );- const classificationOptions = useMemo(- () =>- Object.values(classificationConfig?.classification ?? {}).map(- (classification) => ({- label: classification.title || classification.id,- value: classification.id,- })- ),- [classificationConfig]- );-- useEffect(() => {- setSearchText("");- setCheckedColumnList([]);- setShowFeatureDialog(false);- setShowGrantAccessDrawer(false);- }, [database.name]);+ const containerRef = useRef<HTMLDivElement>(null);useEffect(() => {- void settingStore.getOrFetchSettingByName(- Setting_SettingName.SEMANTIC_TYPES,- true- );- void settingStore.getOrFetchSettingByName(- Setting_SettingName.DATA_CLASSIFICATION,- true- );- }, [settingStore]);-- const removeMaskingExceptions = async (sensitiveColumn: MaskData) => {- const policy = await policyStore.getOrFetchPolicyByParentAndType({- parentPath: database.project,- policyType: PolicyType.MASKING_EXEMPTION,- });- if (!policy) {+ if (!containerRef.current) {return;}- const exemptions = (- policy.policy?.case === "maskingExemptionPolicy"- ? policy.policy.value.exemptions- : []- ).filter(- (exception) =>- !isCurrentColumnException(exception, {- database,- maskData: sensitiveColumn,- })- );-- policy.policy = {- case: "maskingExemptionPolicy",- value: create(MaskingExemptionPolicySchema, {- exemptions,- }),- };-- await policyStore.upsertPolicy({- parentPath: database.project,- policy,- });- };-- const handleDelete = async (item: MaskData) => {- const deletedColumnId = getMaskDataIdentifier(item);- setCheckedColumnList((current) =>- current.filter(- (selectedColumn) =>- getMaskDataIdentifier(selectedColumn) !== deletedColumnId- )- );- if (hasSemanticType(item.target)) {- item.target.semanticType = "";- }- if (hasClassificationType(item.target)) {- item.target.classification = "";- }- if (databaseCatalog.value) {- await databaseCatalogStore.updateDatabaseCatalog(databaseCatalog.value);- pushNotification({- module: "bytebase",- style: "SUCCESS",- title: t("common.removed"),- });- }- await removeMaskingExceptions(item);- };-- const handleSemanticTypeChange = async (- item: MaskData,- semanticTypeId: string- ) => {- if (!hasSemanticType(item.target) || !databaseCatalog.value) {- return;- }- item.target.semanticType = semanticTypeId;- item.semanticTypeId = semanticTypeId;- await databaseCatalogStore.updateDatabaseCatalog(databaseCatalog.value);- pushNotification({- module: "bytebase",- style: "SUCCESS",- title: t("common.updated"),- });- };-- const handleClassificationChange = async (- item: MaskData,- classificationId: string- ) => {- if (!hasClassificationType(item.target) || !databaseCatalog.value) {- return;- }- item.target.classification = classificationId;- item.classificationId = classificationId;- await databaseCatalogStore.updateDatabaseCatalog(databaseCatalog.value);- pushNotification({- module: "bytebase",- style: "SUCCESS",- title: t("common.updated"),+ const app = createApp({+ render() {+ return h(OverlayStackManager as never, null, {+ default: () =>+ h(DatabaseSensitiveDataPanel as never, {+ database,+ }),+ });+ },});- };-- const handleGrantAccessClick = () => {- if (!hasSensitiveDataFeature) {- setShowFeatureDialog(true);- return;- }- setShowGrantAccessDrawer(true);- };+ app.use(router).use(pinia).use(i18n).use(NaiveUI);+ app.mount(containerRef.current);- return (- <div className="w-full flex flex-col gap-y-4">- <FeatureAttention- feature={PlanFeature.FEATURE_DATA_MASKING}- instance={instance}- />-- <div className="flex flex-col gap-y-4 gap-x-2 lg:flex-row justify-between items-end lg:items-center">- <Input- value={searchText}- onChange={(event) => setSearchText(event.target.value)}- placeholder={t("common.search")}- className="w-full"- />-- {!isMaskingForNoSQL && (- <PermissionGuard- permissions={GRANT_ACCESS_PERMISSIONS}- project={project}- >- <Button- onClick={handleGrantAccessClick}- disabled={- !hasGrantAccessPermission || checkedColumnList.length === 0- }- >- {hasSensitiveDataFeature ? (- <ShieldCheck className="w-4 h-4" />- ) : (- <FeatureBadge- feature={PlanFeature.FEATURE_DATA_MASKING}- instance={instance}- clickable={false}- className="text-white"- />- )}- {t("settings.sensitive-data.grant-access")}- </Button>- </PermissionGuard>- )}- </div>-- <SensitiveColumnTable- classificationOptions={classificationOptions}- rowSelectable={!isMaskingForNoSQL}- semanticTypeOptions={semanticTypeOptions}- showOperation={hasUpdateCatalogPermission && hasSensitiveDataFeature}- columnList={filteredColumnList}- checkedColumnList={checkedColumnList}- onClassificationChange={handleClassificationChange}- onCheckedColumnListChange={setCheckedColumnList}- onDelete={handleDelete}- onSemanticTypeChange={handleSemanticTypeChange}- />-- <Dialog open={showFeatureDialog} onOpenChange={setShowFeatureDialog}>- <DialogContent className="p-6">- <DialogTitle>{t("common.warning")}</DialogTitle>- <div className="mt-3">- <FeatureAttention- feature={PlanFeature.FEATURE_DATA_MASKING}- instance={instance}- />- </div>- <div className="mt-6 flex justify-end gap-x-2">- <Button- variant="outline"- onClick={() => setShowFeatureDialog(false)}- >- {t("common.cancel")}- </Button>- </div>- </DialogContent>- </Dialog>+ return () => {+ app.unmount();+ };+ }, [database.name]);- {openGrantAccessDrawer && (- <GrantAccessDialog- open={openGrantAccessDrawer}- columnList={checkedColumnList.map((maskData) => ({- database,- maskData,- }))}- projectName={database.project}- onDismiss={() => {- setShowGrantAccessDrawer(false);- setCheckedColumnList([]);- }}- />- )}- </div>- );+ return <div ref={containerRef} />;}diff --git a/frontend/src/react/pages/project/database-detail/panels/DatabaseChangelogPanel.test.tsx b/frontend/src/react/pages/project/database-detail/panels/DatabaseChangelogPanel.test.tsxindex e657d16408..491aae75bf 100644--- a/frontend/src/react/pages/project/database-detail/panels/DatabaseChangelogPanel.test.tsx+++ b/frontend/src/react/pages/project/database-detail/panels/DatabaseChangelogPanel.test.tsx@@ -175,9 +175,7 @@ describe("DatabaseChangelogPanel", () => {pageToken: "",});expect(container.querySelector("table")).not.toBeNull();- expect(container.textContent).toContain(- "instances/inst1/databases/db1/changelogs/1"- );+ // The table shows plan title and created-at, not the raw resource nameexpect(container.textContent).toContain("Release 1");unmount();diff --git a/frontend/src/react/pages/project/database-detail/panels/DatabaseOverviewPanel.test.tsx b/frontend/src/react/pages/project/database-detail/panels/DatabaseOverviewPanel.test.tsxdeleted file mode 100644index ff14ead85f..0000000000--- a/frontend/src/react/pages/project/database-detail/panels/DatabaseOverviewPanel.test.tsx+++ /dev/null@@ -1,974 +0,0 @@-import { act, createElement } from "react";-import { createRoot } from "react-dom/client";-import { beforeEach, describe, expect, test, vi } from "vitest";-import { Engine, State } from "@/types/proto-es/v1/common_pb";-import {- type Database,- SyncStatus,-} from "@/types/proto-es/v1/database_service_pb";--(- globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }-).IS_REACT_ACT_ENVIRONMENT = true;--const mocks = vi.hoisted(() => {- const currentRoute = {- value: {- query: {},- },- };-- return {- localStorage: {- clear: vi.fn(),- getItem: vi.fn(() => null),- removeItem: vi.fn(),- setItem: vi.fn(),- },- useTranslation: vi.fn(() => ({- t: (key: string) => key,- })),- schemaList: [{ name: "public" }, { name: "sales" }],- currentRoute,- routerReplace: vi.fn(() => Promise.resolve()),- useVueState: vi.fn(),- useDBSchemaV1Store: vi.fn(),- useDatabaseCatalog: vi.fn(),- getColumnCatalog: vi.fn(() => ({- semanticType: "",- classification: "",- })),- getTableCatalog: vi.fn(),- useSettingV1Store: vi.fn(),- featureToRef: vi.fn(() => ({ value: true })),- getDatabaseProject: vi.fn((database: { project: string }) => ({- name: database.project,- dataClassificationConfigId: "classification-config",- })),- hasProjectPermissionV2: vi.fn(- (_project?: unknown, _permission?: string) => true- ),- getDatabaseEngine: vi.fn(() => Engine.POSTGRES),- hasIndexSizeProperty: vi.fn(() => true),- hasSchemaProperty: vi.fn(() => true),- hasTableEngineProperty: vi.fn(() => false),- instanceV1HasCollationAndCharacterSet: vi.fn(() => true),- instanceV1SupportsColumn: vi.fn(() => true),- instanceV1SupportsIndex: vi.fn(() => true),- instanceV1SupportsPackage: vi.fn(() => false),- instanceV1SupportsSequence: vi.fn(() => false),- bytesToString: vi.fn((size: number) => `${size} B`),- humanizeDate: vi.fn(() => "5 minutes ago"),- };-});--vi.stubGlobal("localStorage", mocks.localStorage);--let DatabaseOverviewPanel: typeof import("./DatabaseOverviewPanel").DatabaseOverviewPanel;--vi.mock("react-i18next", () => ({- useTranslation: mocks.useTranslation,-}));--vi.mock("@/react/hooks/useVueState", () => ({- useVueState: mocks.useVueState,-}));--vi.mock("@/router", () => ({- router: {- replace: mocks.routerReplace,- currentRoute: mocks.currentRoute,- },-}));--vi.mock("@/store", () => ({- useDBSchemaV1Store: mocks.useDBSchemaV1Store,- useDatabaseCatalog: mocks.useDatabaseCatalog,- getColumnCatalog: mocks.getColumnCatalog,- getTableCatalog: mocks.getTableCatalog,- useSettingV1Store: mocks.useSettingV1Store,- featureToRef: mocks.featureToRef,-}));--vi.mock("@/utils", () => ({- bytesToString: mocks.bytesToString,- getDatabaseEngine: mocks.getDatabaseEngine,- getDatabaseProject: mocks.getDatabaseProject,- humanizeDate: mocks.humanizeDate,- hasIndexSizeProperty: mocks.hasIndexSizeProperty,- hasProjectPermissionV2: mocks.hasProjectPermissionV2,- hasSchemaProperty: mocks.hasSchemaProperty,- hasTableEngineProperty: mocks.hasTableEngineProperty,- instanceV1HasCollationAndCharacterSet:- mocks.instanceV1HasCollationAndCharacterSet,- instanceV1SupportsColumn: mocks.instanceV1SupportsColumn,- instanceV1SupportsIndex: mocks.instanceV1SupportsIndex,- instanceV1SupportsPackage: mocks.instanceV1SupportsPackage,- instanceV1SupportsSequence: mocks.instanceV1SupportsSequence,-}));--vi.mock("@/react/components/ui/input", () => ({- Input: (props: React.InputHTMLAttributes<HTMLInputElement>) => (- <input {...props} />- ),-}));--vi.mock("@/react/components/ui/dialog", () => ({- Dialog: ({- open,- onOpenChange,- children,- }: {- open: boolean;- onOpenChange?: (open: boolean) => void;- children: React.ReactNode;- }) =>- open ? (- <div data-testid="dialog-root">- <button type="button" onClick={() => onOpenChange?.(false)}>- close-dialog- </button>- {children}- </div>- ) : null,- DialogContent: ({ children }: { children: React.ReactNode }) => (- <div>{children}</div>- ),- DialogTitle: ({ children }: { children: React.ReactNode }) => (- <h1>{children}</h1>- ),-}));--const renderIntoContainer = (element: ReturnType<typeof createElement>) => {- const container = document.createElement("div");- const root = createRoot(container);-- return {- container,- render: (nextElement = element) => {- act(() => {- root.render(nextElement);- });- },- unmount: () =>- act(() => {- root.unmount();- }),- };-};--const flush = async () => {- await act(async () => {- await Promise.resolve();- await Promise.resolve();- });-};--const setSelectValue = (select: HTMLSelectElement, value: string) => {- act(() => {- const descriptor = Object.getOwnPropertyDescriptor(- HTMLSelectElement.prototype,- "value"- );- descriptor?.set?.call(select, value);- select.dispatchEvent(new Event("input", { bubbles: true }));- select.dispatchEvent(new Event("change", { bubbles: true }));- });-};--const clickElement = (element: Element) => {- act(() => {- element.dispatchEvent(new MouseEvent("click", { bubbles: true }));- });-};--const makeTable = (name: string) =>- ({- name,- rowCount: 7,- dataSize: 64n,- indexSize: 32n,- comment: `${name} comment`,- columns: [- {- name: "id",- type: "INT",- comment: "",- },- ],- }) as never;--const makeDatabase = (): Database =>- ({- name: "instances/inst1/databases/db",- project: "projects/proj1",- effectiveEnvironment: "environments/prod",- state: State.ACTIVE,- syncStatus: SyncStatus.OK,- syncError: "",- successfulSyncTime: {- seconds: 1n,- nanos: 0,- },- instanceResource: {- name: "instances/inst1",- title: "Primary",- engine: Engine.POSTGRES,- },- }) as Database;--beforeEach(async () => {- mocks.schemaList = [{ name: "public" }, { name: "sales" }];- mocks.localStorage.clear.mockReset();- mocks.localStorage.getItem.mockReset();- mocks.localStorage.getItem.mockReturnValue(null);- mocks.localStorage.removeItem.mockReset();- mocks.localStorage.setItem.mockReset();- mocks.useTranslation.mockReset();- mocks.useTranslation.mockReturnValue({- t: (key: string) => key,- });- mocks.currentRoute.value.query = {};- mocks.routerReplace.mockReset();- mocks.routerReplace.mockImplementation(() => Promise.resolve());- mocks.getDatabaseProject.mockReset();- mocks.getDatabaseProject.mockImplementation(- (database: { project: string }) => ({- name: database.project,- dataClassificationConfigId: "classification-config",- })- );- mocks.hasProjectPermissionV2.mockReset();- mocks.hasProjectPermissionV2.mockReturnValue(true);- mocks.getDatabaseEngine.mockReset();- mocks.getDatabaseEngine.mockReturnValue(Engine.POSTGRES);- mocks.hasSchemaProperty.mockReset();- mocks.hasSchemaProperty.mockReturnValue(true);- mocks.instanceV1HasCollationAndCharacterSet.mockReset();- mocks.instanceV1HasCollationAndCharacterSet.mockReturnValue(true);- mocks.instanceV1SupportsColumn.mockReset();- mocks.instanceV1SupportsColumn.mockReturnValue(true);- mocks.instanceV1SupportsPackage.mockReset();- mocks.instanceV1SupportsPackage.mockReturnValue(false);- mocks.instanceV1SupportsSequence.mockReset();- mocks.instanceV1SupportsSequence.mockReturnValue(false);- mocks.bytesToString.mockReset();- mocks.bytesToString.mockImplementation((size: number) => `${size} B`);- mocks.humanizeDate.mockReset();- mocks.humanizeDate.mockReturnValue("5 minutes ago");- mocks.useDBSchemaV1Store.mockReset();- mocks.useDBSchemaV1Store.mockReturnValue({- getSchemaList: vi.fn(() => mocks.schemaList),- getTableList: vi.fn(() => [makeTable("orders")]),- getViewList: vi.fn(() => []),- getExtensionList: vi.fn(() => []),- getExternalTableList: vi.fn(() => []),- getFunctionList: vi.fn(() => []),- getDatabaseMetadata: vi.fn(() => ({- characterSet: "UTF8",- collation: "en_US.UTF-8",- schemas: [],- })),- });- mocks.useDatabaseCatalog.mockReset();- mocks.useDatabaseCatalog.mockReturnValue({- value: {- schemas: [],- },- });- mocks.getColumnCatalog.mockReset();- mocks.getColumnCatalog.mockReturnValue({- semanticType: "",- classification: "",- });- mocks.getTableCatalog.mockReset();- mocks.getTableCatalog.mockReturnValue({- classification: "",- });- mocks.useSettingV1Store.mockReset();- mocks.useSettingV1Store.mockReturnValue({- getOrFetchSettingByName: vi.fn(),- getProjectClassification: vi.fn(() => undefined),- });- mocks.featureToRef.mockReset();- mocks.featureToRef.mockReturnValue({- value: true,- });- mocks.hasIndexSizeProperty.mockReset();- mocks.hasIndexSizeProperty.mockReturnValue(true);- mocks.hasTableEngineProperty.mockReset();- mocks.hasTableEngineProperty.mockReturnValue(false);- mocks.instanceV1SupportsIndex.mockReset();- mocks.instanceV1SupportsIndex.mockReturnValue(true);- mocks.useVueState.mockReset();- mocks.useVueState.mockImplementation((getter: () => unknown) => getter());-- vi.resetModules();- ({ DatabaseOverviewPanel } = await import("./DatabaseOverviewPanel"));-});--describe("DatabaseOverviewPanel", () => {- test("renders legacy overview info fields and schema selector", async () => {- const { container, render, unmount } = renderIntoContainer(- createElement(DatabaseOverviewPanel, {- database: makeDatabase(),- hasSchemaPermission: true,- })- );-- render();- await flush();-- expect(container.textContent).toContain("db.encoding");- expect(container.textContent).toContain("UTF8");- expect(container.textContent).toContain("db.collation");- expect(container.textContent).toContain("en_US.UTF-8");- expect(container.textContent).toContain("database.sync-status");- expect(container.textContent).toContain("common.ok");- expect(container.textContent).toContain("database.last-sync");- expect(container.textContent).toContain("5 minutes ago");- expect(container.querySelector("select")).not.toBeNull();- expect(- container.querySelector('input[placeholder="common.filter-by-name"]')- ).not.toBeNull();-- unmount();- });-- test("renders the legacy tables header instead of the generic object header", async () => {- const { container, render, unmount } = renderIntoContainer(- createElement(DatabaseOverviewPanel, {- database: makeDatabase(),- hasSchemaPermission: true,- })- );-- render();- await flush();-- const tableHeaderText = Array.from(container.querySelectorAll("th")).map(- (cell) => cell.textContent- );-- expect(tableHeaderText).toEqual(- expect.arrayContaining([- "common.schema",- "common.name",- "database.classification.self",- "database.partitioned",- "database.row-count-est",- "database.data-size",- "database.index-size",- "common.comment",- ])- );- expect(tableHeaderText).not.toContain("common.definition");-- unmount();- });-- test("restores the table engine column for MySQL overview rows", async () => {- mocks.getDatabaseEngine.mockReturnValue(Engine.MYSQL);- mocks.useDBSchemaV1Store.mockReturnValue({- getSchemaList: vi.fn(() => mocks.schemaList),- getTableList: vi.fn(- () =>- [- {- name: "orders",- engine: "InnoDB",- rowCount: 7,- dataSize: 64n,- indexSize: 32n,- comment: "orders comment",- columns: [- {- name: "id",- type: "INT",- comment: "",- },- ],- },- ] as never- ),- getViewList: vi.fn(() => []),- getExtensionList: vi.fn(() => []),- getExternalTableList: vi.fn(() => []),- getFunctionList: vi.fn(() => []),- getDatabaseMetadata: vi.fn(() => ({- characterSet: "utf8mb4",- collation: "utf8mb4_0900_ai_ci",- schemas: [],- })),- });-- vi.resetModules();- ({ DatabaseOverviewPanel } = await import("./DatabaseOverviewPanel"));-- const { container, render, unmount } = renderIntoContainer(- createElement(DatabaseOverviewPanel, {- database: makeDatabase(),- hasSchemaPermission: true,- })- );-- render();- await flush();-- const tableHeaderText = Array.from(container.querySelectorAll("th")).map(- (cell) => cell.textContent- );- expect(tableHeaderText).toContain("database.engine");- expect(container.textContent).toContain("InnoDB");-- unmount();- });-- test("renders failed sync status and error from the legacy overview behavior", async () => {- const { container, render, unmount } = renderIntoContainer(- createElement(DatabaseOverviewPanel, {- database: {- ...makeDatabase(),- syncStatus: SyncStatus.FAILED,- syncError: "sync failed hard",- },- hasSchemaPermission: false,- })- );-- render();- await flush();-- expect(container.textContent).toContain("database.sync-status-failed");- expect(container.textContent).toContain("sync failed hard");-- unmount();- });-- test("renders dash for last sync when the sync timestamp is missing", async () => {- const { container, render, unmount } = renderIntoContainer(- createElement(DatabaseOverviewPanel, {- database: {- ...makeDatabase(),- successfulSyncTime: undefined,- },- hasSchemaPermission: false,- })- );-- render();- await flush();-- expect(container.textContent).toContain("database.last-sync");- expect(container.textContent).toContain("-");- expect(mocks.humanizeDate).not.toHaveBeenCalled();-- unmount();- });-- test("syncs selected schema back to the route query", async () => {- const { container, render, unmount } = renderIntoContainer(- createElement(DatabaseOverviewPanel, {- database: makeDatabase(),- hasSchemaPermission: true,- })- );-- render();- await flush();-- const select = container.querySelector(- "select"- ) as HTMLSelectElement | null;- expect(select).not.toBeNull();-- setSelectValue(select as HTMLSelectElement, "public");- await flush();-- expect(mocks.routerReplace).toHaveBeenCalledWith(- expect.objectContaining({- query: expect.objectContaining({ schema: "public" }),- })- );-- unmount();- });-- test("syncs selected table to the route query and restores it from the route", async () => {- const { router } = await import("@/router");- router.currentRoute.value.query = { schema: "public", table: "orders" };-- const { container, render, unmount } = renderIntoContainer(- createElement(DatabaseOverviewPanel, {- database: makeDatabase(),- hasSchemaPermission: true,- })- );-- render();- await flush();-- expect(container.textContent).toContain("orders");- expect(- container.querySelector('[data-testid="dialog-root"]')- ).not.toBeNull();-- const closeButton = Array.from(container.querySelectorAll("button")).find(- (button) => button.textContent === "close-dialog"- );- expect(closeButton).toBeTruthy();- clickElement(closeButton as HTMLButtonElement);- await flush();-- expect(mocks.routerReplace).toHaveBeenCalledWith(- expect.objectContaining({- query: expect.objectContaining({- schema: "public",- table: undefined,- }),- })- );- router.currentRoute.value.query = { schema: "public" };-- const ordersCell = Array.from(container.querySelectorAll("td")).find(- (cell) => cell.textContent === "orders"- );- expect(ordersCell?.closest("tr")).toBeTruthy();- clickElement(ordersCell?.closest("tr") as HTMLTableRowElement);- await flush();-- expect(mocks.routerReplace).toHaveBeenCalledWith(- expect.objectContaining({- query: expect.objectContaining({- schema: "public",- table: "orders",- }),- })- );-- unmount();- router.currentRoute.value.query = {};- });-- test("hides the schema explorer when schema permission is missing", async () => {- const { container, render, unmount } = renderIntoContainer(- createElement(DatabaseOverviewPanel, {- database: makeDatabase(),- hasSchemaPermission: false,- })- );-- render();- await flush();-- expect(container.textContent).toContain("db");- expect(container.querySelector("select")).toBeNull();-- unmount();- });-- test("treats the empty-string schema as a valid resolved selection", async () => {- mocks.schemaList = [{ name: "" }];- mocks.useDBSchemaV1Store.mockReturnValue({- getSchemaList: vi.fn(() => mocks.schemaList),- getTableList: vi.fn(() => []),- getViewList: vi.fn(() => []),- getExtensionList: vi.fn(() => []),- getExternalTableList: vi.fn(() => []),- getFunctionList: vi.fn(() => []),- getDatabaseMetadata: vi.fn(() => ({- characterSet: "UTF8",- collation: "en_US.UTF-8",- schemas: [],- })),- });-- vi.resetModules();- ({ DatabaseOverviewPanel } = await import("./DatabaseOverviewPanel"));-- const { container, render, unmount } = renderIntoContainer(- createElement(DatabaseOverviewPanel, {- database: makeDatabase(),- hasSchemaPermission: true,- })- );-- render();- await flush();-- expect(container.textContent).not.toContain("common.loading");- expect(container.querySelector("select")?.getAttribute("disabled")).toBe(- null- );-- unmount();- });-- test("clears a stale table query when the table does not exist", async () => {- const { router } = await import("@/router");- router.currentRoute.value.query = { schema: "public", table: "missing" };-- const { render, unmount } = renderIntoContainer(- createElement(DatabaseOverviewPanel, {- database: makeDatabase(),- hasSchemaPermission: true,- })- );-- render();- await flush();-- expect(mocks.routerReplace).toHaveBeenCalledWith(- expect.objectContaining({- query: expect.objectContaining({- schema: "public",- table: undefined,- }),- })- );-- unmount();- router.currentRoute.value.query = {};- });-- test("keeps an existing schema query instead of clearing it during initialization", async () => {- const { router } = await import("@/router");- router.currentRoute.value.query = { schema: "sales" };-- const { container, render, unmount } = renderIntoContainer(- createElement(DatabaseOverviewPanel, {- database: makeDatabase(),- hasSchemaPermission: true,- })- );-- render();- await flush();-- expect((container.querySelector("select") as HTMLSelectElement).value).toBe(- "sales"- );- expect(mocks.routerReplace).not.toHaveBeenCalledWith({- query: expect.objectContaining({- schema: undefined,- }),- });-- unmount();- router.currentRoute.value.query = {};- });-- test("flattens package objects across schemas when the engine has no schema property", async () => {- mocks.getDatabaseEngine.mockReturnValue(Engine.ORACLE);- mocks.hasSchemaProperty.mockReturnValue(false);- mocks.instanceV1HasCollationAndCharacterSet.mockReturnValue(true);- mocks.instanceV1SupportsPackage.mockReturnValue(true);- mocks.useDBSchemaV1Store.mockReturnValue({- getSchemaList: vi.fn(() => []),- getTableList: vi.fn(() => []),- getViewList: vi.fn(() => []),- getExtensionList: vi.fn(() => []),- getExternalTableList: vi.fn(() => []),- getFunctionList: vi.fn(() => []),- getDatabaseMetadata: vi.fn(() => ({- characterSet: "AL32UTF8",- collation: "",- schemas: [- {- name: "alpha",- packages: [{ name: "pkg_a", definition: "a" }],- sequences: [],- streams: [],- tasks: [],- },- {- name: "beta",- packages: [{ name: "pkg_b", definition: "b" }],- sequences: [],- streams: [],- tasks: [],- },- ],- })),- });-- vi.resetModules();- ({ DatabaseOverviewPanel } = await import("./DatabaseOverviewPanel"));-- const { container, render, unmount } = renderIntoContainer(- createElement(DatabaseOverviewPanel, {- database: makeDatabase(),- hasSchemaPermission: true,- })- );-- render();- await flush();-- expect(container.textContent).toContain("pkg_a");- expect(container.textContent).toContain("pkg_b");-- unmount();- });-- test("uses function signatures for overloaded function identity and display", async () => {- mocks.useDBSchemaV1Store.mockReturnValue({- getSchemaList: vi.fn(() => mocks.schemaList),- getTableList: vi.fn(() => [makeTable("orders")]),- getViewList: vi.fn(() => []),- getExtensionList: vi.fn(() => []),- getExternalTableList: vi.fn(() => []),- getFunctionList: vi.fn(() => [- { name: "compute", signature: "compute(int)", definition: "sql 1" },- { name: "compute", signature: "compute(text)", definition: "sql 2" },- ]),- getDatabaseMetadata: vi.fn(() => ({- characterSet: "UTF8",- collation: "en_US.UTF-8",- schemas: [],- })),- });-- vi.resetModules();- ({ DatabaseOverviewPanel } = await import("./DatabaseOverviewPanel"));-- const { container, render, unmount } = renderIntoContainer(- createElement(DatabaseOverviewPanel, {- database: makeDatabase(),- hasSchemaPermission: true,- })- );-- render();- await flush();-- expect(container.textContent).toContain("compute(int)");- expect(container.textContent).toContain("compute(text)");-- unmount();- });-- test("flattens sequences across schemas when schema properties are unsupported", async () => {- mocks.hasSchemaProperty.mockReturnValue(false);- mocks.instanceV1SupportsSequence.mockReturnValue(true);- mocks.useDBSchemaV1Store.mockReturnValue({- getSchemaList: vi.fn(() => []),- getTableList: vi.fn(() => []),- getViewList: vi.fn(() => []),- getExtensionList: vi.fn(() => []),- getExternalTableList: vi.fn(() => []),- getFunctionList: vi.fn(() => []),- getDatabaseMetadata: vi.fn(() => ({- characterSet: "UTF8",- collation: "",- schemas: [- { name: "alpha", sequences: [{ name: "seq_a", dataType: "BIGINT" }] },- { name: "beta", sequences: [{ name: "seq_b", dataType: "BIGINT" }] },- ],- })),- });-- vi.resetModules();- ({ DatabaseOverviewPanel } = await import("./DatabaseOverviewPanel"));-- const { container, render, unmount } = renderIntoContainer(- createElement(DatabaseOverviewPanel, {- database: makeDatabase(),- hasSchemaPermission: true,- })- );-- render();- await flush();-- expect(container.textContent).toContain("seq_a");- expect(container.textContent).toContain("seq_b");-- unmount();- });-- test("does not fall back to the first schema for schema-scoped sequences", async () => {- const { router } = await import("@/router");- router.currentRoute.value.query = { schema: "sales" };-- mocks.instanceV1SupportsSequence.mockReturnValue(true);- mocks.useDBSchemaV1Store.mockReturnValue({- getSchemaList: vi.fn(() => mocks.schemaList),- getTableList: vi.fn(() => []),- getViewList: vi.fn(() => []),- getExtensionList: vi.fn(() => []),- getExternalTableList: vi.fn(() => []),- getFunctionList: vi.fn(() => []),- getDatabaseMetadata: vi.fn(() => ({- characterSet: "UTF8",- collation: "",- schemas: [- { name: "alpha", sequences: [{ name: "seq_a", dataType: "BIGINT" }] },- ],- })),- });-- vi.resetModules();- ({ DatabaseOverviewPanel } = await import("./DatabaseOverviewPanel"));-- const { container, render, unmount } = renderIntoContainer(- createElement(DatabaseOverviewPanel, {- database: makeDatabase(),- hasSchemaPermission: true,- })- );-- render();- await flush();-- expect(container.textContent).not.toContain("seq_a");-- unmount();- router.currentRoute.value.query = {};- });-- test("flattens streams and tasks across schemas when schema properties are unsupported", async () => {- mocks.getDatabaseEngine.mockReturnValue(Engine.SNOWFLAKE);- mocks.hasSchemaProperty.mockReturnValue(false);- mocks.useDBSchemaV1Store.mockReturnValue({- getSchemaList: vi.fn(() => []),- getTableList: vi.fn(() => []),- getViewList: vi.fn(() => []),- getExtensionList: vi.fn(() => []),- getExternalTableList: vi.fn(() => []),- getFunctionList: vi.fn(() => []),- getDatabaseMetadata: vi.fn(() => ({- characterSet: "UTF8",- collation: "",- schemas: [- {- name: "alpha",- streams: [{ name: "stream_a", tableName: "orders" }],- tasks: [{ name: "task_a", schedule: "cron_a" }],- },- {- name: "beta",- streams: [{ name: "stream_b", tableName: "users" }],- tasks: [{ name: "task_b", schedule: "cron_b" }],- },- ],- })),- });-- vi.resetModules();- ({ DatabaseOverviewPanel } = await import("./DatabaseOverviewPanel"));-- const { container, render, unmount } = renderIntoContainer(- createElement(DatabaseOverviewPanel, {- database: makeDatabase(),- hasSchemaPermission: true,- })- );-- render();- await flush();-- expect(container.textContent).toContain("stream_a");- expect(container.textContent).toContain("stream_b");- expect(container.textContent).toContain("task_a");- expect(container.textContent).toContain("task_b");-- unmount();- });-- test("does not fall back to the first schema for schema-scoped streams and tasks", async () => {- const { router } = await import("@/router");- router.currentRoute.value.query = { schema: "sales" };-- mocks.getDatabaseEngine.mockReturnValue(Engine.SNOWFLAKE);- mocks.useDBSchemaV1Store.mockReturnValue({- getSchemaList: vi.fn(() => mocks.schemaList),- getTableList: vi.fn(() => []),- getViewList: vi.fn(() => []),- getExtensionList: vi.fn(() => []),- getExternalTableList: vi.fn(() => []),- getFunctionList: vi.fn(() => []),- getDatabaseMetadata: vi.fn(() => ({- characterSet: "UTF8",- collation: "",- schemas: [- {- name: "alpha",- streams: [{ name: "stream_a", tableName: "orders" }],- tasks: [{ name: "task_a", schedule: "cron_a" }],- },- ],- })),- });-- vi.resetModules();- ({ DatabaseOverviewPanel } = await import("./DatabaseOverviewPanel"));-- const { container, render, unmount } = renderIntoContainer(- createElement(DatabaseOverviewPanel, {- database: makeDatabase(),- hasSchemaPermission: true,- })- );-- render();- await flush();-- expect(container.textContent).not.toContain("stream_a");- expect(container.textContent).not.toContain("task_a");-- unmount();- router.currentRoute.value.query = {};- });-- test("does not fall back to the first schema for schema-scoped package objects", async () => {- const { router } = await import("@/router");- router.currentRoute.value.query = { schema: "sales" };-- mocks.getDatabaseEngine.mockReturnValue(Engine.ORACLE);- mocks.hasSchemaProperty.mockReturnValue(true);- mocks.instanceV1SupportsPackage.mockReturnValue(true);- mocks.useDBSchemaV1Store.mockReturnValue({- getSchemaList: vi.fn(() => mocks.schemaList),- getTableList: vi.fn(() => []),- getViewList: vi.fn(() => []),- getExtensionList: vi.fn(() => []),- getExternalTableList: vi.fn(() => []),- getFunctionList: vi.fn(() => []),- getDatabaseMetadata: vi.fn(() => ({- characterSet: "AL32UTF8",- collation: "",- schemas: [- {- name: "alpha",- packages: [{ name: "pkg_a", definition: "a" }],- sequences: [],- streams: [],- tasks: [],- },- ],- })),- });-- vi.resetModules();- ({ DatabaseOverviewPanel } = await import("./DatabaseOverviewPanel"));-- const { container, render, unmount } = renderIntoContainer(- createElement(DatabaseOverviewPanel, {- database: makeDatabase(),- hasSchemaPermission: true,- })- );-- render();- await flush();-- expect((container.querySelector("select") as HTMLSelectElement).value).toBe(- "sales"- );- expect(container.textContent).not.toContain("pkg_a");-- unmount();- router.currentRoute.value.query = {};- });-});diff --git a/frontend/src/react/pages/project/database-detail/panels/DatabaseRevisionPanel.test.tsx b/frontend/src/react/pages/project/database-detail/panels/DatabaseRevisionPanel.test.tsxindex eb486019a1..dd8ff3443a 100644--- a/frontend/src/react/pages/project/database-detail/panels/DatabaseRevisionPanel.test.tsx+++ b/frontend/src/react/pages/project/database-detail/panels/DatabaseRevisionPanel.test.tsx@@ -226,7 +226,8 @@ describe("DatabaseRevisionPanel", () => {render();await flush();- expect(mocks.createApp).toHaveBeenCalledTimes(1);+ // Vue mount is lazy — not created until the drawer first opens+ expect(mocks.createApp).toHaveBeenCalledTimes(0);const importButton = Array.from(container.querySelectorAll("button")).find((button) => button.textContent === "common.import"@@ -236,6 +237,7 @@ describe("DatabaseRevisionPanel", () => {click(importButton as HTMLButtonElement);await flush();+ // After clicking Import, the Vue drawer mount is createdexpect(mocks.createApp).toHaveBeenCalledTimes(1);const latestDrawerVNode = mocks.appRenderers.at(-1)?.();@@ -253,6 +255,7 @@ describe("DatabaseRevisionPanel", () => {await flush();expect(mocks.listRevisions).toHaveBeenCalledTimes(2);+ // Vue mount stays alive after closing (lazy-mounted, never unmounted)expect(mocks.createApp).toHaveBeenCalledTimes(1);expect(mocks.appRenderers.at(-1)?.()).toMatchObject({component: mocks.CreateRevisionDrawer,diff --git a/frontend/src/react/pages/project/database-detail/panels/DatabaseRevisionPanel.tsx b/frontend/src/react/pages/project/database-detail/panels/DatabaseRevisionPanel.tsxindex ad8aec6877..b3b23df56e 100644--- a/frontend/src/react/pages/project/database-detail/panels/DatabaseRevisionPanel.tsx+++ b/frontend/src/react/pages/project/database-detail/panels/DatabaseRevisionPanel.tsx@@ -77,6 +77,7 @@ export function DatabaseRevisionPanel({ database }: { database: Database }) {const revisionStore = useRevisionStore();const [showCreateRevisionDrawer, setShowCreateRevisionDrawer] =useState(false);+ const [drawerEverOpened, setDrawerEverOpened] = useState(false);const fetchRevisionList = useCallback(async ({pageToken,@@ -104,17 +105,17 @@ export function DatabaseRevisionPanel({ database }: { database: Database }) {fetchList: fetchRevisionList,});- const handleRevisionCreated = useCallback(- (_revisions: Revision[]) => {- setShowCreateRevisionDrawer(false);- paged.refresh();- },- [paged.refresh]- );+ const refreshRef = useRef(paged.refresh);+ refreshRef.current = paged.refresh;++ const handleRevisionCreated = useCallback((_revisions: Revision[]) => {+ setShowCreateRevisionDrawer(false);+ refreshRef.current();+ }, []);const handleRevisionDeleted = useCallback(() => {- paged.refresh();- }, [paged.refresh]);+ refreshRef.current();+ }, []);const handleDelete = useCallback(async (name: string) => {@@ -132,7 +133,12 @@ export function DatabaseRevisionPanel({ database }: { database: Database }) {<div className="flex flex-col gap-y-2"><div className="flex items-center justify-between"><div />- <Button onClick={() => setShowCreateRevisionDrawer(true)}>+ <Button+ onClick={() => {+ setDrawerEverOpened(true);+ setShowCreateRevisionDrawer(true);+ }}+ >{t("common.import")}</Button></div>@@ -150,12 +156,14 @@ export function DatabaseRevisionPanel({ database }: { database: Database }) {onLoadMore={paged.loadMore}/></div>- <VueCreateRevisionDrawerMount- databaseName={database.name}- open={showCreateRevisionDrawer}- onCreated={handleRevisionCreated}- onOpenChange={setShowCreateRevisionDrawer}- />+ {drawerEverOpened && (+ <VueCreateRevisionDrawerMount+ databaseName={database.name}+ open={showCreateRevisionDrawer}+ onCreated={handleRevisionCreated}+ onOpenChange={setShowCreateRevisionDrawer}+ />+ )}</>);}diff --git a/frontend/src/react/pages/project/database-detail/revision/DatabaseRevisionTable.tsx b/frontend/src/react/pages/project/database-detail/revision/DatabaseRevisionTable.tsxindex d48e1cef2e..360564aa58 100644--- a/frontend/src/react/pages/project/database-detail/revision/DatabaseRevisionTable.tsx+++ b/frontend/src/react/pages/project/database-detail/revision/DatabaseRevisionTable.tsx@@ -69,6 +69,16 @@ export function DatabaseRevisionTable({</td></tr>))}+ {revisions.length === 0 && (+ <tr>+ <td+ className="px-4 py-6 text-center text-sm text-control-light"+ colSpan={4}+ >+ {t("common.no-data")}+ </td>+ </tr>+ )}</tbody></table></div>diff --git a/frontend/src/react/pages/project/database-detail/schema-browser/SchemaBrowserButton.tsx b/frontend/src/react/pages/project/database-detail/schema-browser/SchemaBrowserButton.tsxdeleted file mode 100644index 0cd1a3a308..0000000000--- a/frontend/src/react/pages/project/database-detail/schema-browser/SchemaBrowserButton.tsx+++ /dev/null@@ -1,50 +0,0 @@-import { Workflow } from "lucide-react";-import { useCallback, useState } from "react";-import { useTranslation } from "react-i18next";-import { Button } from "@/react/components/ui/button";-import { useDBSchemaV1Store } from "@/store";-import type { Database } from "@/types/proto-es/v1/database_service_pb";-import { SchemaBrowserDialog } from "./SchemaBrowserDialog";--export function SchemaBrowserButton({- database,- disabled = false,-}: {- database: Database;- disabled?: boolean;-}) {- const { t } = useTranslation();- const dbSchemaStore = useDBSchemaV1Store();- const [open, setOpen] = useState(false);-- const handleOpen = useCallback(async () => {- if (disabled) {- return;- }-- await dbSchemaStore.getOrFetchDatabaseMetadata({- database: database.name,- skipCache: false,- });- setOpen(true);- }, [database.name, dbSchemaStore, disabled]);-- return (- <>- <Button- variant="ghost"- size="sm"- disabled={disabled}- onClick={() => void handleOpen()}- >- <Workflow className="h-4 w-4" />- {t("schema-diagram.self")}- </Button>- <SchemaBrowserDialog- database={database}- open={open}- onOpenChange={setOpen}- />- </>- );-}diff --git a/frontend/src/react/pages/project/database-detail/schema-browser/SchemaBrowserDialog.tsx b/frontend/src/react/pages/project/database-detail/schema-browser/SchemaBrowserDialog.tsxdeleted file mode 100644index c34fc5491a..0000000000--- a/frontend/src/react/pages/project/database-detail/schema-browser/SchemaBrowserDialog.tsx+++ /dev/null@@ -1,127 +0,0 @@-import { useMemo, useState } from "react";-import { useTranslation } from "react-i18next";-import {- Dialog,- DialogContent,- DialogTitle,-} from "@/react/components/ui/dialog";-import { Input } from "@/react/components/ui/input";-import { useVueState } from "@/react/hooks/useVueState";-import { useDBSchemaV1Store } from "@/store";-import type { Database } from "@/types/proto-es/v1/database_service_pb";--export function SchemaBrowserDialog({- database,- open,- onOpenChange,-}: {- database: Database;- open: boolean;- onOpenChange: (open: boolean) => void;-}) {- const { t } = useTranslation();- const dbSchemaStore = useDBSchemaV1Store();- const [searchText, setSearchText] = useState("");-- const schemaList = useVueState(() =>- dbSchemaStore.getSchemaList(database.name)- );- const databaseMetadata = useVueState(() =>- dbSchemaStore.getDatabaseMetadata(database.name)- );- const metadataSchemas = databaseMetadata?.schemas ?? [];-- const normalizedSearchText = searchText.trim().toLowerCase();- const schemaEntries = useMemo(() => {- const fallbackSchemas = metadataSchemas.map((schema) => ({- name: schema.name,- }));- const sourceSchemas =- schemaList.length > 0- ? schemaList- : (fallbackSchemas as typeof schemaList);-- return sourceSchemas- .map((schema) => {- const schemaName = schema.name;- const schemaLabel = schemaName || t("db.schema.default");- const tableList = dbSchemaStore.getTableList({- database: database.name,- schema: schemaName,- });- const filteredTables = tableList.filter((table) =>- table.name.toLowerCase().includes(normalizedSearchText)- );- const matchesSchema =- normalizedSearchText.length === 0 ||- schemaLabel.toLowerCase().includes(normalizedSearchText);-- if (!matchesSchema && filteredTables.length === 0) {- return undefined;- }-- return {- schemaLabel,- tables:- matchesSchema && normalizedSearchText.length === 0- ? tableList- : filteredTables,- };- })- .filter((entry) => entry !== undefined);- }, [- database.name,- metadataSchemas,- dbSchemaStore,- normalizedSearchText,- schemaList,- t,- ]);-- return (- <Dialog open={open} onOpenChange={onOpenChange}>- <DialogContent className="max-w-4xl p-6">- <DialogTitle>{t("schema-diagram.self")}</DialogTitle>- <div className="mt-4 flex flex-col gap-y-4">- <Input- value={searchText}- placeholder={t("common.search")}- onChange={(event) => setSearchText(event.target.value)}- />-- <div className="max-h-[70vh] space-y-4 overflow-y-auto pr-1">- {schemaEntries.map((entry) => (- <section- key={entry.schemaLabel}- className="rounded-sm border border-control-border"- >- <div className="border-b border-control-border bg-gray-50 px-4 py-2 text-sm font-medium text-main">- {entry.schemaLabel}- </div>- <div className="px-4 py-3">- {entry.tables.length > 0 ? (- <ul className="space-y-2 text-sm text-main">- {entry.tables.map((table) => (- <li key={table.name}>{table.name}</li>- ))}- </ul>- ) : (- <div className="text-sm text-control-light">- {t("common.no-data")}- </div>- )}- </div>- </section>- ))}-- {schemaEntries.length === 0 && (- <div className="rounded-sm border border-dashed border-control-border px-4 py-6 text-center text-sm text-control-light">- {t("common.no-data")}- </div>- )}- </div>- </div>- </DialogContent>- </Dialog>- );-}