Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
refactor: change database flow (#18276)
ecmadao7ab71e5d8102
diff --git a/frontend/src/components/ColumnDataTable/ClassificationCell.vue b/frontend/src/components/ColumnDataTable/ClassificationCell.vueindex bac19c9259..56a20f26db 100644--- a/frontend/src/components/ColumnDataTable/ClassificationCell.vue+++ b/frontend/src/components/ColumnDataTable/ClassificationCell.vue@@ -7,7 +7,7 @@<template v-if="!readonly && !disabled"><NPopconfirm v-if="classification" @positive-click="removeClassification"><template #trigger>- <MiniActionButton>+ <MiniActionButton @click.stop=""><XIcon class="w-3 h-3" /></MiniActionButton></template>diff --git a/frontend/src/components/Plan/components/AddSpecDrawer.vue b/frontend/src/components/Plan/components/AddSpecDrawer.vueindex 02867bfd47..3bade7c238 100644--- a/frontend/src/components/Plan/components/AddSpecDrawer.vue+++ b/frontend/src/components/Plan/components/AddSpecDrawer.vue@@ -44,23 +44,18 @@<script setup lang="ts">import { create as createProto } from "@bufbuild/protobuf";-import { NButton, useDialog } from "naive-ui";+import { NButton } from "naive-ui";import { v4 as uuidv4 } from "uuid";import { computed, reactive, ref, watch } from "vue";import { useI18n } from "vue-i18n";-import type { LocationQueryRaw } from "vue-router";-import { useRouter } from "vue-router";import type { DatabaseSelectState } from "@/components/DatabaseAndGroupSelector";import DatabaseAndGroupSelector from "@/components/DatabaseAndGroupSelector";import { getLocalSheetByName, getNextLocalSheetUID } from "@/components/Plan";import { Drawer, DrawerContent } from "@/components/v2";-import { PROJECT_V1_ROUTE_ISSUE_DETAIL } from "@/router/dashboard/projectV1";import {batchGetOrFetchDatabases,pushNotification,useCurrentProjectV1,- useDatabaseV1Store,- useDBGroupStore,} from "@/store";import type { ComposedDatabase } from "@/types";import { DatabaseChangeType } from "@/types/proto-es/v1/common_pb";@@ -69,14 +64,11 @@ import {type Plan_Spec,Plan_SpecSchema,} from "@/types/proto-es/v1/plan_service_pb";-import { extractProjectResourceName, generateIssueTitle } from "@/utils";const props = defineProps<{title?: string;preSelectedDatabases?: ComposedDatabase[];preSelectedDatabaseGroup?: string;- projectName?: string;- useLegacyIssueFlow?: boolean;}>();const emit = defineEmits<{@@ -85,10 +77,6 @@ const emit = defineEmits<{const { project } = useCurrentProjectV1();const { t } = useI18n();-const router = useRouter();-const dialog = useDialog();-const databaseStore = useDatabaseV1Store();-const dbGroupStore = useDBGroupStore();const show = defineModel<boolean>("show", { default: false });const isCreating = ref(false);@@ -98,17 +86,7 @@ const databaseSelectState = reactive<DatabaseSelectState>({selectedDatabaseNameList: [],});-const hasPreSelectedDatabases = computed(() => {- return (- (props.preSelectedDatabases?.length ?? 0) > 0 ||- !!props.preSelectedDatabaseGroup- );-});-const hasSelection = computed(() => {- if (hasPreSelectedDatabases.value) {- return true;- }if (databaseSelectState.changeSource === "DATABASE") {return databaseSelectState.selectedDatabaseNameList.length > 0;} else {@@ -131,7 +109,9 @@ watch(show, (newVal) => {props.preSelectedDatabaseGroup;} else {databaseSelectState.changeSource = "DATABASE";- databaseSelectState.selectedDatabaseNameList = [];+ databaseSelectState.selectedDatabaseNameList = (+ props.preSelectedDatabases ?? []+ ).map((db) => db.name);databaseSelectState.selectedDatabaseGroup = undefined;}@@ -139,25 +119,6 @@ watch(show, (newVal) => {}});-const showDatabaseDriftedWarningDialog = () => {- return new Promise((resolve) => {- dialog.create({- type: "warning",- positiveText: t("common.confirm"),- negativeText: t("common.cancel"),- title: t("issue.schema-drift-detected.self"),- content: t("issue.schema-drift-detected.description"),- autoFocus: false,- onNegativeClick: () => {- resolve(false);- },- onPositiveClick: () => {- resolve(true);- },- });- });-};-const handleUpdateSelection = async (newState: DatabaseSelectState) => {Object.assign(databaseSelectState, newState);@@ -181,73 +142,12 @@ const handleConfirm = async () => {try {// Get targetsconst targets: string[] = [];- if (props.preSelectedDatabaseGroup) {- targets.push(props.preSelectedDatabaseGroup);- } else if (props.preSelectedDatabases) {- targets.push(...(props.preSelectedDatabases.map((db) => db.name) ?? []));- } else if (databaseSelectState.changeSource === "DATABASE") {+ if (databaseSelectState.changeSource === "DATABASE") {targets.push(...databaseSelectState.selectedDatabaseNameList);} else if (databaseSelectState.selectedDatabaseGroup) {targets.push(databaseSelectState.selectedDatabaseGroup);}- // Check for database drift if using legacy issue flow- if (props.useLegacyIssueFlow && hasPreSelectedDatabases.value) {- if (props.preSelectedDatabases?.some((d) => d.drifted)) {- const confirmed = await showDatabaseDriftedWarningDialog();- if (!confirmed) {- isCreating.value = false;- return;- }- }- }-- // If using legacy issue flow (from database dashboard), navigate to issue creation- if (props.useLegacyIssueFlow) {- const type = "bb.issue.database.schema.update";-- let databaseNames: string[] = [];- // For database groups, use the group title for the issue title- if (props.preSelectedDatabaseGroup) {- const dbGroup = await dbGroupStore.getOrFetchDBGroupByName(- props.preSelectedDatabaseGroup- );- databaseNames = [dbGroup.title];- } else if (props.preSelectedDatabases) {- // Pre-selected individual databases- databaseNames = props.preSelectedDatabases.map((db) => db.databaseName);- } else {- // Fetch database names from targets- databaseNames = await Promise.all(- targets.map(async (target) => {- const db = await databaseStore.getOrFetchDatabaseByName(target);- return db.databaseName;- })- );- }-- const query: LocationQueryRaw = {- template: type,- name: generateIssueTitle(type, databaseNames),- databaseList: targets.join(","),- };-- router.push({- name: PROJECT_V1_ROUTE_ISSUE_DETAIL,- params: {- projectId: extractProjectResourceName(- props.projectName ?? project.value.name- ),- issueSlug: "create",- },- query,- });-- show.value = false;- isCreating.value = false;- return;- }-// Otherwise, create spec for plan flowconst sheetUID = getNextLocalSheetUID();const localSheet = getLocalSheetByName(diff --git a/frontend/src/components/Plan/logic/issue.ts b/frontend/src/components/Plan/logic/issue.tsnew file mode 100644index 0000000000..7b09a0750b--- /dev/null+++ b/frontend/src/components/Plan/logic/issue.ts@@ -0,0 +1,72 @@+import { createDiscreteApi } from "naive-ui";+import type { LocationQueryRaw } from "vue-router";+import { t } from "@/plugins/i18n";+import { router } from "@/router";+import { PROJECT_V1_ROUTE_ISSUE_DETAIL } from "@/router/dashboard/projectV1";+import { useDatabaseV1Store, useDBGroupStore } from "@/store";+import { isValidDatabaseGroupName, isValidDatabaseName } from "@/types";+import { extractProjectResourceName, generateIssueTitle } from "@/utils";++const showDatabaseDriftedWarningDialog = () => {+ const { dialog } = createDiscreteApi(["dialog"]);++ return new Promise((resolve) => {+ dialog.create({+ type: "warning",+ positiveText: t("common.confirm"),+ negativeText: t("common.cancel"),+ title: t("issue.schema-drift-detected.self"),+ content: t("issue.schema-drift-detected.description"),+ autoFocus: false,+ onNegativeClick: () => {+ resolve(false);+ },+ onPositiveClick: () => {+ resolve(true);+ },+ });+ });+};++export const preCreateIssue = async (project: string, targets: string[]) => {+ const type = "bb.issue.database.schema.update";+ const databaseStore = useDatabaseV1Store();+ const dbGroupStore = useDBGroupStore();++ const databaseNames: string[] = [];+ let hasDraft = false;+ for (const target of targets) {+ if (isValidDatabaseGroupName(target)) {+ const dbGroup = dbGroupStore.getDBGroupByName(target);+ databaseNames.push(dbGroup.title);+ } else if (isValidDatabaseName(target)) {+ const db = databaseStore.getDatabaseByName(target);+ if (db.drifted) {+ hasDraft = true;+ }+ databaseNames.push(db.databaseName);+ }+ }++ if (hasDraft) {+ const confirmed = await showDatabaseDriftedWarningDialog();+ if (!confirmed) {+ return;+ }+ }++ const query: LocationQueryRaw = {+ template: type,+ name: generateIssueTitle(type, databaseNames),+ databaseList: targets.join(","),+ };++ router.push({+ name: PROJECT_V1_ROUTE_ISSUE_DETAIL,+ params: {+ projectId: extractProjectResourceName(project),+ issueSlug: "create",+ },+ query,+ });+};diff --git a/frontend/src/components/v2/Model/DatabaseV1Table/DatabaseOperations.vue b/frontend/src/components/v2/Model/DatabaseV1Table/DatabaseOperations.vueindex db742ea246..d3d4815db4 100644--- a/frontend/src/components/v2/Model/DatabaseV1Table/DatabaseOperations.vue+++ b/frontend/src/components/v2/Model/DatabaseV1Table/DatabaseOperations.vue@@ -90,14 +90,6 @@"@cancel="state.showUnassignAlert = false"/>-- <AddSpecDrawer- v-model:show="state.showChangeDatabaseDrawer"- :title="$t('database.change-database')"- :pre-selected-databases="databases"- :project-name="selectedProjectName"- :use-legacy-issue-flow="true"- /></template><script lang="ts" setup>@@ -123,7 +115,7 @@ import { useRouter } from "vue-router";import { BBAlert } from "@/bbkit";import EditEnvironmentDrawer from "@/components/EditEnvironmentDrawer.vue";import LabelEditorDrawer from "@/components/LabelEditorDrawer.vue";-import { AddSpecDrawer } from "@/components/Plan";+import { preCreateIssue } from "@/components/Plan/logic/issue";import { TransferDatabaseForm } from "@/components/TransferDatabaseForm";import TransferOutDatabaseForm from "@/components/TransferOutDatabaseForm";import { Drawer } from "@/components/v2";@@ -166,7 +158,6 @@ interface LocalState {showUnassignAlert: boolean;showLabelEditorDrawer: boolean;showEditEnvironmentDrawer: boolean;- showChangeDatabaseDrawer: boolean;transferOutDatabaseType?: "TRANSFER-IN" | "TRANSFER-OUT";}@@ -183,7 +174,6 @@ const state = reactive<LocalState>({showUnassignAlert: false,showLabelEditorDrawer: false,showEditEnvironmentDrawer: false,- showChangeDatabaseDrawer: false,transferOutDatabaseType: undefined,});@@ -434,9 +424,14 @@ const actions = computed((): DatabaseAction[] => {disabled:!allowChangeDatabase.value ||!selectedProjectName.value ||- props.databases.length < 1 ||+ selectedDatabaseNameList.value.length < 1 ||selectedProjectNames.value.has(DEFAULT_PROJECT_NAME),- click: () => (state.showChangeDatabaseDrawer = true),+ click: () => {+ preCreateIssue(+ selectedProjectName.value,+ selectedDatabaseNameList.value+ );+ },tooltip: (action) => {if (!allowChangeDatabase.value) {return t("database.batch-action-permission-denied", {diff --git a/frontend/src/views/DatabaseDetail/DatabaseDetail.vue b/frontend/src/views/DatabaseDetail/DatabaseDetail.vueindex bcc1383a75..6991384107 100644--- a/frontend/src/views/DatabaseDetail/DatabaseDetail.vue+++ b/frontend/src/views/DatabaseDetail/DatabaseDetail.vue@@ -117,7 +117,9 @@</NButton><NButtonv-if="allowChangeDatabase"- @click="state.showChangeDatabaseDrawer = true"+ @click="() => {+ preCreateIssue(database.project, [database.name])+ }"><span>{{ $t("database.change-database") }}</span></NButton>@@ -187,15 +189,6 @@@dismiss="state.showTransferDatabaseModal = false"/></Drawer>-- <!-- TODO(ed): the pre-selected-databases not work -->- <AddSpecDrawer- v-model:show="state.showChangeDatabaseDrawer"- :title="$t('database.change-database')"- :pre-selected-databases="[database]"- :project-name="database.project"- :use-legacy-issue-flow="true"- /></template><script lang="ts" setup>@@ -219,7 +212,7 @@ import DriftedDatabaseAlert from "@/components/DatabaseDetail/DriftedDatabaseAleimport ExportSchemaButton from "@/components/DatabaseDetail/ExportSchemaButton.vue";import SyncDatabaseButton from "@/components/DatabaseDetail/SyncDatabaseButton.vue";import EllipsisText from "@/components/EllipsisText.vue";-import { AddSpecDrawer } from "@/components/Plan";+import { preCreateIssue } from "@/components/Plan/logic/issue";import TransferOutDatabaseForm from "@/components/TransferOutDatabaseForm";import {CopyButton,@@ -234,7 +227,6 @@ import {databaseNamePrefix,instanceNamePrefix,} from "@/store/modules/v1/common";-import { UNKNOWN_PROJECT_NAME } from "@/types";import {extractProjectResourceName,instanceV1HasAlterSchema,@@ -255,8 +247,6 @@ const isDatabaseHash = (x: any): x is DatabaseHash =>interface LocalState {showTransferDatabaseModal: boolean;showIncorrectProjectModal: boolean;- showChangeDatabaseDrawer: boolean;- currentProjectName: string;selectedIndex: number;selectedTab: DatabaseHash;}@@ -272,8 +262,6 @@ const router = useRouter();const state = reactive<LocalState>({showTransferDatabaseModal: false,showIncorrectProjectModal: false,- showChangeDatabaseDrawer: false,- currentProjectName: UNKNOWN_PROJECT_NAME,selectedIndex: 0,selectedTab: "overview",});@@ -350,12 +338,10 @@ const allowQuery = computed(() => {});const tryTransferProject = () => {- state.currentProjectName = project.value.name;state.showTransferDatabaseModal = true;};const handleGotoSQLEditorFailed = () => {- state.currentProjectName = database.value.project;state.showIncorrectProjectModal = true;};diff --git a/frontend/src/views/project/ProjectDatabaseGroupDetail.vue b/frontend/src/views/project/ProjectDatabaseGroupDetail.vueindex b07b534c5b..fe8b74c5d7 100644--- a/frontend/src/views/project/ProjectDatabaseGroupDetail.vue+++ b/frontend/src/views/project/ProjectDatabaseGroupDetail.vue@@ -20,7 +20,9 @@<template #trigger><NButton:disabled="!hasMatchedDatabases"- @click="state.showChangeDatabaseDrawer = true"+ @click="() => {+ preCreateIssue(project.name, [databaseGroupResourceName])+ }">{{ $t("database.change-database") }}</NButton>@@ -41,15 +43,6 @@:database-group="databaseGroup"@dismiss="state.editing = false"/>-- <AddSpecDrawer- v-if="databaseGroup"- v-model:show="state.showChangeDatabaseDrawer"- :title="$t('database.change-database')"- :project-name="project.name"- :pre-selected-database-group="databaseGroupResourceName"- :use-legacy-issue-flow="true"- /></div></template>@@ -59,7 +52,7 @@ import { NButton, NTooltip } from "naive-ui";import { computed, reactive, watchEffect } from "vue";import DatabaseGroupForm from "@/components/DatabaseGroup/DatabaseGroupForm.vue";import FeatureAttention from "@/components/FeatureGuard/FeatureAttention.vue";-import { AddSpecDrawer } from "@/components/Plan";+import { preCreateIssue } from "@/components/Plan/logic/issue";import { useBodyLayoutContext } from "@/layouts/common";import { featureToRef, useDBGroupStore, useProjectByName } from "@/store";import {@@ -72,7 +65,6 @@ import { hasPermissionToCreateChangeDatabaseIssueInProject } from "@/utils";interface LocalState {editing: boolean;- showChangeDatabaseDrawer: boolean;}const props = defineProps<{@@ -87,7 +79,6 @@ const { project } = useProjectByName();const state = reactive<LocalState>({editing: false,- showChangeDatabaseDrawer: false,});const databaseGroupResourceName = computed(() => {