Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
chore: some code update (#18082)
ecmadao40dc4f17bfac
diff --git a/frontend/src/components/DatabaseDetail/Settings/DatabaseSettingsPanel.vue b/frontend/src/components/DatabaseDetail/Settings/DatabaseSettingsPanel.vueindex d643c8c97a..648a3cc89e 100644--- a/frontend/src/components/DatabaseDetail/Settings/DatabaseSettingsPanel.vue+++ b/frontend/src/components/DatabaseDetail/Settings/DatabaseSettingsPanel.vue@@ -9,6 +9,7 @@class="mt-1 max-w-md":environment-name="`${environmentNamePrefix}${environment.id}`":disabled="!allowUpdateDatabase"+ :clearable="!database.instanceResource.environment":render-suffix="(env: string) =>database.instanceResource.environment === envdiff --git a/frontend/src/components/InstanceForm/Buttons.vue b/frontend/src/components/InstanceForm/Buttons.vueindex f2b21b19e4..b421ee0c6e 100644--- a/frontend/src/components/InstanceForm/Buttons.vue+++ b/frontend/src/components/InstanceForm/Buttons.vue@@ -248,7 +248,7 @@ const checkRODataSourceFeature = (instance: Instance) => {// Disallowed to create any new RO data sourcesreturn false;} else {- const editing = extractDataSourceFromEdit(instance, ds);+ const editing = extractDataSourceFromEdit(instance.engine, ds);const original = instance.dataSources.find((d) => d.id === ds.id);if (original) {const updateMask = calcDataSourceUpdateMask(editing, original, ds);@@ -430,7 +430,10 @@ const doUpdate = async () => {const original = inst.dataSources.find((ds) => ds.type === DataSourceType.ADMIN);- const editing = extractDataSourceFromEdit(inst, adminDataSource.value);+ const editing = extractDataSourceFromEdit(+ inst.engine,+ adminDataSource.value+ );return await maybeQueueUpdateDataSource(editing,original,@@ -448,7 +451,7 @@ const doUpdate = async () => {// Upsert readonly data sources one by onefor (let i = 0; i < readonlyDataSourceList.value.length; i++) {const editing = readonlyDataSourceList.value[i];- const patch = extractDataSourceFromEdit(inst, editing);+ const patch = extractDataSourceFromEdit(inst.engine, editing);if (editing.pendingCreate) {const testResult = await testConnection(editing, /* silent */ true);if (!testResult.success) {diff --git a/frontend/src/components/InstanceForm/DataSourceSection/DataSourceForm.vue b/frontend/src/components/InstanceForm/DataSourceSection/DataSourceForm.vueindex 8af654b392..bac4c65908 100644--- a/frontend/src/components/InstanceForm/DataSourceSection/DataSourceForm.vue+++ b/frontend/src/components/InstanceForm/DataSourceSection/DataSourceForm.vue@@ -1129,10 +1129,10 @@ watch(// Watch SSL fields and set updateSsl flag when they changewatch(() => [- props.dataSource.verifyTlsCertificate,- props.dataSource.sslCa,- props.dataSource.sslCert,- props.dataSource.sslKey,+ () => props.dataSource.verifyTlsCertificate,+ () => props.dataSource.sslCa,+ () => props.dataSource.sslCert,+ () => props.dataSource.sslKey,],() => {if (!props.dataSource.pendingCreate) {diff --git a/frontend/src/components/InstanceForm/context.ts b/frontend/src/components/InstanceForm/context.tsindex 5520715454..2bb418f5c4 100644--- a/frontend/src/components/InstanceForm/context.ts+++ b/frontend/src/components/InstanceForm/context.ts@@ -271,7 +271,7 @@ export const provideInstanceFormContext = (baseContext: {const specs = useInstanceSpecs(basicInfo, adminDataSource, editingDataSource);const extractDataSourceFromEdit = (- instance: Instance,+ engine: Engine,edit: EditDataSource): DataSource => {const { showDatabase, showSSH, showSSL } = specs;@@ -305,11 +305,11 @@ export const provideInstanceFormContext = (baseContext: {if (!showDatabase.value) {ds.database = "";}- if (instance.engine !== Engine.ORACLE) {+ if (engine !== Engine.ORACLE) {ds.sid = "";ds.serviceName = "";}- if (instance.engine !== Engine.MONGODB) {+ if (engine !== Engine.MONGODB) {ds.srv = false;ds.authenticationDatabase = "";}@@ -339,7 +339,7 @@ export const provideInstanceFormContext = (baseContext: {});if (editingDataSource.value) {const dataSourceCreate = extractDataSourceFromEdit(- instance,+ instance.engine,adminDataSource.value);instance.dataSources = [dataSourceCreate];@@ -394,7 +394,10 @@ export const provideInstanceFormContext = (baseContext: {engineVersion: "",dataSources: [],});- const dataSourceCreate = extractDataSourceFromEdit(instance, editingDS);+ const dataSourceCreate = extractDataSourceFromEdit(+ instance.engine,+ editingDS+ );instance.dataSources = [dataSourceCreate];try {const request = create(CreateInstanceRequestSchema, {@@ -411,7 +414,7 @@ export const provideInstanceFormContext = (baseContext: {}} else {// Editing existed instance.- const ds = extractDataSourceFromEdit(instance.value!, editingDS);+ const ds = extractDataSourceFromEdit(instance.value!.engine, editingDS);if (editingDS.pendingCreate) {// When read-only data source is about to be created, use// editingDataSource + AddDataSourceRequest.validateOnly = truediff --git a/frontend/src/components/v2/Select/EnvironmentSelect.vue b/frontend/src/components/v2/Select/EnvironmentSelect.vueindex ab3177daa4..f2c2e2d681 100644--- a/frontend/src/components/v2/Select/EnvironmentSelect.vue+++ b/frontend/src/components/v2/Select/EnvironmentSelect.vue@@ -14,7 +14,7 @@</template><script lang="tsx" setup>-import { computed } from "vue";+import { computed, type VNodeChild } from "vue";import { useI18n } from "vue-i18n";import { useEnvironmentV1Store } from "@/store";import { formatEnvironmentName } from "@/types";@@ -32,7 +32,7 @@ const props = withDefaults(showProductionIcon?: boolean;multiple?: boolean;filter?: (environment: Environment, index: number) => boolean;- renderSuffix?: (environment: string) => string;+ renderSuffix?: (environment: string) => VNodeChild;}>(),{environmentName: undefined,@@ -41,7 +41,7 @@ const props = withDefaults(showProductionIcon: true,multiple: false,filter: () => true,- renderSuffix: () => "",+ renderSuffix: () => null,});@@ -80,11 +80,14 @@ const options = computed(() => {const renderLabel = (environment: Environment) => {return (- <EnvironmentV1Name- environment={environment}- showIcon={props.showProductionIcon}- link={false}- />+ <div class="flex items-center gap-x-2">+ <EnvironmentV1Name+ environment={environment}+ showIcon={props.showProductionIcon}+ link={false}+ />+ {props.renderSuffix(environment.name)}+ </div>);};</script>diff --git a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/SheetTree.vue b/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/SheetTree.vueindex b9b847c3c6..b41cbbd8a6 100644--- a/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/SheetTree.vue+++ b/frontend/src/views/sql-editor/AsidePanel/WorksheetPane/SheetList/SheetTree.vue@@ -9,6 +9,7 @@<NTreev-elseblock-line+ block-node:keyboard="false":draggable="!editingNode":data="[sheetTree]"@@ -271,7 +272,6 @@ const renderLabel = ({ option }: { option: TreeOption }) => {<NInputvalue={editingNode.value.node.label}size="small"- class="flex-1"inputProps={{// the autofocus not always work,// so we need to set the id for input and use the document.getElementById API@@ -779,7 +779,6 @@ const handleDrop = async ({ node, dragNode }: TreeDropInfo) => {}.worksheet-tree :deep(.n-tree-node-content__text) {overflow: hidden;- flex: 1;text-overflow: ellipsis;white-space: nowrap;}