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: remove limit for doris (#18222)
ecmadao87c6ec69443c
diff --git a/frontend/src/components/AuditLog/AuditLogSearch/utils.ts b/frontend/src/components/AuditLog/AuditLogSearch/utils.tsindex 682c0d1fde..0d0c81d972 100644--- a/frontend/src/components/AuditLog/AuditLogSearch/utils.ts+++ b/frontend/src/components/AuditLog/AuditLogSearch/utils.ts@@ -1,31 +1,31 @@import { projectNamePrefix } from "@/store/modules/v1/common";import type { SearchAuditLogsParams } from "@/types";import { AuditLog_Severity } from "@/types/proto-es/v1/audit_log_service_pb";-import { getTsRangeFromSearchParams, type SearchParams } from "@/utils";+import {+ getTsRangeFromSearchParams,+ getValueFromSearchParams,+ type SearchParams,+} from "@/utils";export const buildSearchAuditLogParams = (searchParams: SearchParams): SearchAuditLogsParams => {- const { scopes } = searchParams;- const projectScope = scopes.find((s) => s.id === "project");- const levelScope = scopes.find((s) => s.id === "level");- const methodScope = scopes.find((s) => s.id === "method");- const actorScope = scopes.find((s) => s.id === "actor");+ const levelScope = getValueFromSearchParams(searchParams, "level");const createdTsRange = getTsRangeFromSearchParams(searchParams, "created");- const params: SearchAuditLogsParams = {};- if (projectScope) {- params.parent = `${projectNamePrefix}${projectScope.value}`;- }+ const params: SearchAuditLogsParams = {+ parent: getValueFromSearchParams(+ searchParams,+ "project",+ projectNamePrefix+ ),+ method: getValueFromSearchParams(searchParams, "method"),+ userEmail: getValueFromSearchParams(searchParams, "actor"),+ };+if (levelScope) {params.level =- AuditLog_Severity[levelScope.value as keyof typeof AuditLog_Severity];- }- if (methodScope) {- params.method = methodScope.value;- }- if (actorScope) {- params.userEmail = actorScope.value;+ AuditLog_Severity[levelScope as keyof typeof AuditLog_Severity];}if (createdTsRange) {params.createdTsAfter = createdTsRange[0];diff --git a/frontend/src/components/DatabaseAndGroupSelector/DatabaseAndGroupSelector.vue b/frontend/src/components/DatabaseAndGroupSelector/DatabaseAndGroupSelector.vueindex cce1f3cc1c..31e16639b8 100644--- a/frontend/src/components/DatabaseAndGroupSelector/DatabaseAndGroupSelector.vue+++ b/frontend/src/components/DatabaseAndGroupSelector/DatabaseAndGroupSelector.vue@@ -60,6 +60,7 @@ import type { Project } from "@/types/proto-es/v1/project_service_pb";import {CommonFilterScopeIdList,extractProjectResourceName,+ getValueFromSearchParams,type SearchParams,type SearchScope,} from "@/utils";@@ -99,23 +100,19 @@ const databaseSelectState = reactive<DatabaseSelectState>(const { dbGroupList } = useDBGroupListByProject(props.project.name);const selectedInstance = computed(() => {- const instanceId = searchParams.value.scopes.find(- (scope) => scope.id === "instance"- )?.value;- if (!instanceId) {- return;- }- return `${instanceNamePrefix}${instanceId}`;+ return getValueFromSearchParams(+ searchParams.value,+ "instance",+ instanceNamePrefix+ );});const selectedEnvironment = computed(() => {- const environmentId = searchParams.value.scopes.find(- (scope) => scope.id === "environment"- )?.value;- if (!environmentId) {- return;- }- return `${environmentNamePrefix}${environmentId}`;+ return getValueFromSearchParams(+ searchParams.value,+ "environment",+ environmentNamePrefix+ );});const filter = computed(() => ({diff --git a/frontend/src/components/GrantRequestPanel/DatabaseResourceForm/DatabaseResourceSelector.vue b/frontend/src/components/GrantRequestPanel/DatabaseResourceForm/DatabaseResourceSelector.vueindex 5ff5beccd1..2ac836ec92 100644--- a/frontend/src/components/GrantRequestPanel/DatabaseResourceForm/DatabaseResourceSelector.vue+++ b/frontend/src/components/GrantRequestPanel/DatabaseResourceForm/DatabaseResourceSelector.vue@@ -50,13 +50,15 @@ import {type DatabaseResource,DEBOUNCE_SEARCH_DELAY,} from "@/types";+import { Engine } from "@/types/proto-es/v1/common_pb";import {CommonFilterScopeIdList,extractProjectResourceName,getDefaultPagination,+ getValueFromSearchParams,+ getValuesFromSearchParams,type SearchParams,} from "@/utils";-import { convertScopeValueToEngine } from "@/utils/v1/common-conversions";import type { DatabaseTreeOption } from "./common";import {flattenTreeOptions,@@ -167,27 +169,19 @@ const cascadeLoopTreeNode = (};const selectedInstance = computed(() => {- const instanceId = params.value.scopes.find(- (scope) => scope.id === "instance"- )?.value;- if (!instanceId) {- return;- }- return `${instanceNamePrefix}${instanceId}`;+ return getValueFromSearchParams(params.value, "instance", instanceNamePrefix);});const selectedEnvironment = computed(() => {- const environmentId = params.value.scopes.find(- (scope) => scope.id === "environment"- )?.value;- if (!environmentId) {- return;- }- return `${environmentNamePrefix}${environmentId}`;+ return getValueFromSearchParams(+ params.value,+ "environment",+ environmentNamePrefix+ );});const selectedTable = computed(() => {- return params.value.scopes.find((scope) => scope.id === "table")?.value;+ return getValueFromSearchParams(params.value, "table");});const collectExpandedKeys = async ({@@ -225,15 +219,13 @@ const filterTableList = computed(() => {});const selectedLabels = computed(() => {- return params.value.scopes- .filter((scope) => scope.id === "label")- .map((scope) => scope.value);+ return getValuesFromSearchParams(params.value, "label");});const selectedEngines = computed(() => {- return params.value.scopes- .filter((scope) => scope.id === "engine")- .map((scope) => convertScopeValueToEngine(scope.value));+ return getValuesFromSearchParams(params.value, "engine").map(+ (engine) => Engine[engine as keyof typeof Engine]+ );});const databaseFilter = computed(diff --git a/frontend/src/components/InstanceForm/constants.ts b/frontend/src/components/InstanceForm/constants.tsindex 1103400067..6c7a0e5b76 100644--- a/frontend/src/components/InstanceForm/constants.ts+++ b/frontend/src/components/InstanceForm/constants.ts@@ -1,58 +1,58 @@import { computed } from "vue";-import { Engine as OldEngine } from "@/types/proto-es/v1/common_pb";+import { Engine } from "@/types/proto-es/v1/common_pb";import { supportedEngineV1List } from "@/utils";-export const defaultPortForEngine = (engine: OldEngine) => {+export const defaultPortForEngine = (engine: Engine) => {switch (engine) {- case OldEngine.CLICKHOUSE:+ case Engine.CLICKHOUSE:return "9000";- case OldEngine.MYSQL:+ case Engine.MYSQL:return "3306";- case OldEngine.POSTGRES:+ case Engine.POSTGRES:return "5432";- case OldEngine.SNOWFLAKE:+ case Engine.SNOWFLAKE:return "";- case OldEngine.SQLITE:+ case Engine.SQLITE:return "";- case OldEngine.TIDB:+ case Engine.TIDB:return "4000";- case OldEngine.MONGODB:+ case Engine.MONGODB:return "27017";- case OldEngine.REDIS:+ case Engine.REDIS:return "6379";- case OldEngine.ORACLE:+ case Engine.ORACLE:return "1521";- case OldEngine.SPANNER:+ case Engine.SPANNER:return "";- case OldEngine.MSSQL:+ case Engine.MSSQL:return "1433";- case OldEngine.REDSHIFT:+ case Engine.REDSHIFT:return "5439";- case OldEngine.MARIADB:+ case Engine.MARIADB:return "3306";- case OldEngine.OCEANBASE:+ case Engine.OCEANBASE:return "2883";- case OldEngine.STARROCKS:+ case Engine.STARROCKS:return "9030";- case OldEngine.DORIS:+ case Engine.DORIS:return "9030";- case OldEngine.HIVE:+ case Engine.HIVE:return "10000";- case OldEngine.ELASTICSEARCH:+ case Engine.ELASTICSEARCH:return "9200";- case OldEngine.BIGQUERY:+ case Engine.BIGQUERY:return "";- case OldEngine.DYNAMODB:+ case Engine.DYNAMODB:return "";- case OldEngine.DATABRICKS:+ case Engine.DATABRICKS:return "";- case OldEngine.COCKROACHDB:+ case Engine.COCKROACHDB:return "26257";- case OldEngine.COSMOSDB:+ case Engine.COSMOSDB:return "";- case OldEngine.CASSANDRA:+ case Engine.CASSANDRA:return "9042";- case OldEngine.TRINO:+ case Engine.TRINO:return "8080";}throw new Error("engine port unknown");@@ -63,49 +63,42 @@ export const EngineList = computed(() => {});export const EngineIconPath: Record<string, string> = {- [OldEngine.MYSQL]: new URL("@/assets/db/mysql.png", import.meta.url).href,- [OldEngine.POSTGRES]: new URL("@/assets/db/postgres.png", import.meta.url)+ [Engine.MYSQL]: new URL("@/assets/db/mysql.png", import.meta.url).href,+ [Engine.POSTGRES]: new URL("@/assets/db/postgres.png", import.meta.url).href,+ [Engine.TIDB]: new URL("@/assets/db/tidb.png", import.meta.url).href,+ [Engine.SNOWFLAKE]: new URL("@/assets/db/snowflake.png", import.meta.url).href,- [OldEngine.TIDB]: new URL("@/assets/db/tidb.png", import.meta.url).href,- [OldEngine.SNOWFLAKE]: new URL("@/assets/db/snowflake.png", import.meta.url)+ [Engine.CLICKHOUSE]: new URL("@/assets/db/clickhouse.png", import.meta.url).href,- [OldEngine.CLICKHOUSE]: new URL("@/assets/db/clickhouse.png", import.meta.url)- .href,- [OldEngine.MONGODB]: new URL("@/assets/db/mongodb.png", import.meta.url).href,- [OldEngine.SPANNER]: new URL("@/assets/db/spanner.png", import.meta.url).href,- [OldEngine.REDIS]: new URL("@/assets/db/redis.png", import.meta.url).href,- [OldEngine.ORACLE]: new URL("@/assets/db/oracle.svg", import.meta.url).href,- [OldEngine.MSSQL]: new URL("@/assets/db/mssql.svg", import.meta.url).href,- [OldEngine.REDSHIFT]: new URL("@/assets/db/redshift.svg", import.meta.url)- .href,- [OldEngine.MARIADB]: new URL("@/assets/db/mariadb.png", import.meta.url).href,- [OldEngine.OCEANBASE]: new URL(+ [Engine.MONGODB]: new URL("@/assets/db/mongodb.png", import.meta.url).href,+ [Engine.SPANNER]: new URL("@/assets/db/spanner.png", import.meta.url).href,+ [Engine.REDIS]: new URL("@/assets/db/redis.png", import.meta.url).href,+ [Engine.ORACLE]: new URL("@/assets/db/oracle.svg", import.meta.url).href,+ [Engine.MSSQL]: new URL("@/assets/db/mssql.svg", import.meta.url).href,+ [Engine.REDSHIFT]: new URL("@/assets/db/redshift.svg", import.meta.url).href,+ [Engine.MARIADB]: new URL("@/assets/db/mariadb.png", import.meta.url).href,+ [Engine.OCEANBASE]: new URL("@/assets/db/oceanbase-mysql.svg",import.meta.url).href,- [OldEngine.STARROCKS]: new URL("@/assets/db/starrocks.png", import.meta.url)+ [Engine.STARROCKS]: new URL("@/assets/db/starrocks.png", import.meta.url).href,- [OldEngine.DORIS]: new URL("@/assets/db/doris.png", import.meta.url).href,- [OldEngine.HIVE]: new URL("@/assets/db/hive.svg", import.meta.url).href,- [OldEngine.ELASTICSEARCH]: new URL(+ [Engine.DORIS]: new URL("@/assets/db/doris.png", import.meta.url).href,+ [Engine.HIVE]: new URL("@/assets/db/hive.svg", import.meta.url).href,+ [Engine.ELASTICSEARCH]: new URL("@/assets/db/elasticsearch.svg",import.meta.url).href,- [OldEngine.BIGQUERY]: new URL("@/assets/db/bigquery.svg", import.meta.url)- .href,- [OldEngine.DYNAMODB]: new URL("@/assets/db/dynamodb.svg", import.meta.url)+ [Engine.BIGQUERY]: new URL("@/assets/db/bigquery.svg", import.meta.url).href,+ [Engine.DYNAMODB]: new URL("@/assets/db/dynamodb.svg", import.meta.url).href,+ [Engine.DATABRICKS]: new URL("@/assets/db/databricks.svg", import.meta.url).href,- [OldEngine.DATABRICKS]: new URL("@/assets/db/databricks.svg", import.meta.url)- .href,- [OldEngine.COCKROACHDB]: new URL(- "@/assets/db/cockroachdb.png",- import.meta.url- ).href,- [OldEngine.COSMOSDB]: new URL("@/assets/db/cosmosdb.svg", import.meta.url)+ [Engine.COCKROACHDB]: new URL("@/assets/db/cockroachdb.png", import.meta.url).href,- [OldEngine.CASSANDRA]: new URL("@/assets/db/cassandra.svg", import.meta.url)+ [Engine.COSMOSDB]: new URL("@/assets/db/cosmosdb.svg", import.meta.url).href,+ [Engine.CASSANDRA]: new URL("@/assets/db/cassandra.svg", import.meta.url).href,- [OldEngine.TRINO]: new URL("@/assets/db/trino.svg", import.meta.url).href,+ [Engine.TRINO]: new URL("@/assets/db/trino.svg", import.meta.url).href,};export const MongoDBConnectionStringSchemaList = [diff --git a/frontend/src/components/Plan/components/ExportOption/ExportFormatSelector.vue b/frontend/src/components/Plan/components/ExportOption/ExportFormatSelector.vueindex 26ed17efcd..a85f1bdb46 100644--- a/frontend/src/components/Plan/components/ExportOption/ExportFormatSelector.vue+++ b/frontend/src/components/Plan/components/ExportOption/ExportFormatSelector.vue@@ -4,12 +4,12 @@v-for="formatItem in availableExportFormats":key="formatItem":value="formatItem"- :label="exportFormatToString(formatItem)"+ :label="ExportFormat[formatItem]"/></NRadioGroup><template v-else><span class="text-sm font-medium leading-6">{{- exportFormatToString(format)+ ExportFormat[format]}}</span></template></template>@@ -18,7 +18,6 @@import { NRadio, NRadioGroup } from "naive-ui";import { computed, onMounted } from "vue";import { ExportFormat } from "@/types/proto-es/v1/common_pb";-import { exportFormatToString } from "@/utils/v1/common-conversions";const props = defineProps<{format: ExportFormat;diff --git a/frontend/src/components/ProjectDatabasesPanel.vue b/frontend/src/components/ProjectDatabasesPanel.vueindex 7a4184a7a4..9bb54cd398 100644--- a/frontend/src/components/ProjectDatabasesPanel.vue+++ b/frontend/src/components/ProjectDatabasesPanel.vue@@ -65,6 +65,8 @@ import type { SearchParams, SearchScope } from "@/utils";import {CommonFilterScopeIdList,extractProjectResourceName,+ getValueFromSearchParams,+ getValuesFromSearchParams,hasProjectPermissionV2,hasWorkspacePermissionV2,} from "@/utils";@@ -129,50 +131,29 @@ const scopeOptions = useCommonSearchScopeOptions([]);const selectedInstance = computed(() => {- const instanceId = state.params.scopes.find(- (scope) => scope.id === "instance"- )?.value;- if (!instanceId) {- return;- }- return `${instanceNamePrefix}${instanceId}`;+ return getValueFromSearchParams(state.params, "instance", instanceNamePrefix);});const selectedEnvironment = computed(() => {- const environmentId = state.params.scopes.find(- (scope) => scope.id === "environment"- )?.value;- if (!environmentId) {- return;- }- return `${environmentNamePrefix}${environmentId}`;+ return getValueFromSearchParams(+ state.params,+ "environment",+ environmentNamePrefix+ );});const selectedLabels = computed(() => {- return state.params.scopes- .filter((scope) => scope.id === "label")- .map((scope) => scope.value);+ return getValuesFromSearchParams(state.params, "label");});const selectedEngines = computed(() => {- return state.params.scopes- .filter((scope) => scope.id === "engine")- .map((scope) => {- // Convert string engine name to Engine enum- const engineKey = scope.value.toUpperCase();- return (- Engine[engineKey as keyof typeof Engine] ?? Engine.ENGINE_UNSPECIFIED- );- });+ return getValuesFromSearchParams(state.params, "engine").map(+ (engine) => Engine[engine as keyof typeof Engine]+ );});const selectedDriftedValue = computed(() => {- const driftedValue = state.params.scopes.find(- (scope) => scope.id === "drifted"- )?.value;- if (driftedValue === undefined) {- return undefined;- }+ const driftedValue = getValueFromSearchParams(state.params, "drifted");return driftedValue === "true" ? true : false;});diff --git a/frontend/src/components/SyncDatabaseSchemaV1/TargetDatabasesSelectPanel.vue b/frontend/src/components/SyncDatabaseSchemaV1/TargetDatabasesSelectPanel.vueindex 206a1cec33..75fe6a7f2e 100644--- a/frontend/src/components/SyncDatabaseSchemaV1/TargetDatabasesSelectPanel.vue+++ b/frontend/src/components/SyncDatabaseSchemaV1/TargetDatabasesSelectPanel.vue@@ -76,7 +76,11 @@ import {} from "@/store/modules/v1/common";import type { Engine } from "@/types/proto-es/v1/common_pb";import type { SearchParams, SearchScope } from "@/utils";-import { CommonFilterScopeIdList, extractProjectResourceName } from "@/utils";+import {+ CommonFilterScopeIdList,+ extractProjectResourceName,+ getValueFromSearchParams,+} from "@/utils";import AdvancedSearch from "../AdvancedSearch";import { useCommonSearchScopeOptions } from "../AdvancedSearch/useCommonSearchScopeOptions";import { PagedDatabaseTable } from "../v2/Model/DatabaseV1Table";@@ -135,23 +139,15 @@ const selectedDatabaseList = computed(() =>);const selectedInstance = computed(() => {- const instanceId = state.params.scopes.find(- (scope) => scope.id === "instance"- )?.value;- if (!instanceId) {- return;- }- return `${instanceNamePrefix}${instanceId}`;+ return getValueFromSearchParams(state.params, "instance", instanceNamePrefix);});const selectedEnvironment = computed(() => {- const environmentId = state.params.scopes.find(- (scope) => scope.id === "environment"- )?.value;- if (!environmentId) {- return;- }- return `${environmentNamePrefix}${environmentId}`;+ return getValueFromSearchParams(+ state.params,+ "environment",+ environmentNamePrefix+ );});const filter = computed(() => ({diff --git a/frontend/src/store/modules/rollout.ts b/frontend/src/store/modules/rollout.tsindex 9245fba089..cc3bb5e1fd 100644--- a/frontend/src/store/modules/rollout.ts+++ b/frontend/src/store/modules/rollout.ts@@ -59,14 +59,12 @@ export const buildRolloutFindBySearchParams = (params: SearchParams,defaultFind?: Partial<RolloutFind>) => {- const { scopes } = params;- const projectScope = scopes.find((s) => s.id === "project");-+ const projectScope = getValueFromSearchParams(params, "project");const updatedTsRange = getTsRangeFromSearchParams(params, "updated");const filter: RolloutFind = {...defaultFind,- project: `projects/${projectScope?.value ?? "-"}`,+ project: `projects/${projectScope || "-"}`,query: params.query,updatedTsAfter: updatedTsRange?.[0],updatedTsBefore: updatedTsRange?.[1],diff --git a/frontend/src/store/modules/v1/instance.ts b/frontend/src/store/modules/v1/instance.tsindex 9819917618..fba39d1bd7 100644--- a/frontend/src/store/modules/v1/instance.ts+++ b/frontend/src/store/modules/v1/instance.ts@@ -34,6 +34,7 @@ import {UpdateInstanceRequestSchema,} from "@/types/proto-es/v1/instance_service_pb";import { extractInstanceResourceName, hasWorkspacePermissionV2 } from "@/utils";+import { getLabelFilter } from "./database";export interface InstanceFilter {environment?: string;@@ -43,7 +44,7 @@ export interface InstanceFilter {query?: string;engines?: Engine[];state?: State;- labels?: { key: string; value: string }[];+ labels?: string[];}const getListInstanceFilter = (params: InstanceFilter) => {@@ -78,10 +79,8 @@ const getListInstanceFilter = (params: InstanceFilter) => {if (params.state === State.DELETED) {list.push(`state == "${State[params.state]}"`);}- if (params.labels && params.labels.length > 0) {- params.labels.forEach(({ key, value }) => {- list.push(`labels.${key} == "${value}"`);- });+ if (params.labels) {+ list.push(...getLabelFilter(params.labels));}return list.join(" && ");};diff --git a/frontend/src/store/modules/v1/plan.ts b/frontend/src/store/modules/v1/plan.tsindex d806df3e44..fc85b04e1a 100644--- a/frontend/src/store/modules/v1/plan.ts+++ b/frontend/src/store/modules/v1/plan.ts@@ -65,8 +65,7 @@ export const buildPlanFindBySearchParams = (params: SearchParams,defaultFind?: Partial<PlanFind>) => {- const { scopes } = params;- const projectScope = scopes.find((s) => s.id === "project");+ const projectScope = getValueFromSearchParams(params, "project");const createdTsRange = getTsRangeFromSearchParams(params, "created");const state = getValueFromSearchParams(params, "state", "" /* prefix='' */, [@@ -76,7 +75,7 @@ export const buildPlanFindBySearchParams = (const filter: PlanFind = {...defaultFind,- project: `projects/${projectScope?.value ?? "-"}`,+ project: `projects/${projectScope || "-"}`,query: params.query,createdTsAfter: createdTsRange?.[0],createdTsBefore: createdTsRange?.[1],diff --git a/frontend/src/types/sqlReview.ts b/frontend/src/types/sqlReview.tsindex 36e8480beb..d6fbf654b9 100644--- a/frontend/src/types/sqlReview.ts+++ b/frontend/src/types/sqlReview.ts@@ -1,7 +1,6 @@import { t, te } from "@/plugins/i18n";import { Engine } from "@/types/proto-es/v1/common_pb";import { SQLReviewRuleLevel } from "@/types/proto-es/v1/org_policy_service_pb";-import { engineToString } from "@/utils/v1/common-conversions";import sqlReviewDevTemplate from "./sql-review.dev.yaml";import sqlReviewProdTemplate from "./sql-review.prod.yaml";import sqlReviewSampleTemplate from "./sql-review.sample.yaml";@@ -794,7 +793,7 @@ export const getRuleLocalization = (let description = t(`sql-review.rule.${key}.description`);if (engine) {- const engineSpecificKey = `${key}.${engineToString(engine).toLowerCase()}`;+ const engineSpecificKey = `${key}.${Engine[engine].toLowerCase()}`;if (te(`sql-review.rule.${engineSpecificKey}.title`)) {title = t(`sql-review.rule.${engineSpecificKey}.title`);}diff --git a/frontend/src/utils/v1/common-conversions.ts b/frontend/src/utils/v1/common-conversions.tsdeleted file mode 100644index f258649656..0000000000--- a/frontend/src/utils/v1/common-conversions.ts+++ /dev/null@@ -1,117 +0,0 @@-/**- * Common type conversions between old proto and proto-es for common types.- *- * This file provides conversion functions for types in common.proto that are shared- * across multiple services during the migration from old proto to proto-es.- */-import {- Engine as NewEngine,- ExportFormat as NewExportFormat,-} from "@/types/proto-es/v1/common_pb";--/**- * Convert proto-es Engine to string for display/logging- */-export const engineToString = (engine: NewEngine): string => {- return NewEngine[engine] || "ENGINE_UNSPECIFIED";-};--/**- * Convert proto-es ExportFormat to string for display/logging- */-export const exportFormatToString = (format: NewExportFormat): string => {- return NewExportFormat[format] || "FORMAT_UNSPECIFIED";-};--/**- * Convert scope value (string or number) to proto-es Engine- * Handles both string names and numeric enum values from scope.value- */-export const convertScopeValueToEngine = (- value: string | number-): NewEngine => {- switch (value) {- case 0:- case "ENGINE_UNSPECIFIED":- return NewEngine.ENGINE_UNSPECIFIED;- case 1:- case "CLICKHOUSE":- return NewEngine.CLICKHOUSE;- case 2:- case "MYSQL":- return NewEngine.MYSQL;- case 3:- case "POSTGRES":- return NewEngine.POSTGRES;- case 4:- case "SNOWFLAKE":- return NewEngine.SNOWFLAKE;- case 5:- case "SQLITE":- return NewEngine.SQLITE;- case 6:- case "TIDB":- return NewEngine.TIDB;- case 7:- case "MONGODB":- return NewEngine.MONGODB;- case 8:- case "REDIS":- return NewEngine.REDIS;- case 9:- case "ORACLE":- return NewEngine.ORACLE;- case 10:- case "SPANNER":- return NewEngine.SPANNER;- case 11:- case "MSSQL":- return NewEngine.MSSQL;- case 12:- case "REDSHIFT":- return NewEngine.REDSHIFT;- case 13:- case "MARIADB":- return NewEngine.MARIADB;- case 14:- case "OCEANBASE":- return NewEngine.OCEANBASE;- case 18:- case "STARROCKS":- return NewEngine.STARROCKS;- case 19:- case "DORIS":- return NewEngine.DORIS;- case 20:- case "HIVE":- return NewEngine.HIVE;- case 21:- case "ELASTICSEARCH":- return NewEngine.ELASTICSEARCH;- case 22:- case "BIGQUERY":- return NewEngine.BIGQUERY;- case 23:- case "DYNAMODB":- return NewEngine.DYNAMODB;- case 24:- case "DATABRICKS":- return NewEngine.DATABRICKS;- case 25:- case "COCKROACHDB":- return NewEngine.COCKROACHDB;- case 26:- case "COSMOSDB":- return NewEngine.COSMOSDB;- case 27:- case "TRINO":- return NewEngine.TRINO;- case 28:- case "CASSANDRA":- return NewEngine.CASSANDRA;- case -1:- case "UNRECOGNIZED":- default:- return NewEngine.ENGINE_UNSPECIFIED;- }-};diff --git a/frontend/src/utils/v1/instance.ts b/frontend/src/utils/v1/instance.tsindex 04bfb07b0d..71308f704d 100644--- a/frontend/src/utils/v1/instance.ts+++ b/frontend/src/utils/v1/instance.ts@@ -1,5 +1,5 @@import { computed, unref } from "vue";-import { locale, t } from "@/plugins/i18n";+import { t } from "@/plugins/i18n";import { useSubscriptionV1Store } from "@/store";import type { MaybeRef } from "@/types";import {@@ -97,10 +97,8 @@ export const supportedEngineV1List = () => {Engine.COSMOSDB,Engine.CASSANDRA,Engine.TRINO,+ Engine.DORIS,];- if (locale.value === "zh-CN") {- engines.push(Engine.DORIS);- }return engines;};diff --git a/frontend/src/views/DatabaseDashboard.vue b/frontend/src/views/DatabaseDashboard.vueindex c267b829b3..39e559dc41 100644--- a/frontend/src/views/DatabaseDashboard.vue+++ b/frontend/src/views/DatabaseDashboard.vue@@ -75,6 +75,8 @@ import type { SearchParams } from "@/utils";import {CommonFilterScopeIdList,extractProjectResourceName,+ getValueFromSearchParams,+ getValuesFromSearchParams,hasWorkspacePermissionV2,} from "@/utils";@@ -127,52 +129,29 @@ const scopeOptions = useCommonSearchScopeOptions([]);const selectedLabels = computed(() => {- return state.params.scopes- .filter((scope) => scope.id === "label")- .map((scope) => scope.value);+ return getValuesFromSearchParams(state.params, "label");});const selectedProject = computed(() => {- const projectId = state.params.scopes.find(- (scope) => scope.id === "project"- )?.value;- if (!projectId) {- return;- }- return `${projectNamePrefix}${projectId}`;+ return getValueFromSearchParams(state.params, "project", projectNamePrefix);});const selectedInstance = computed(() => {- const instanceId = state.params.scopes.find(- (scope) => scope.id === "instance"- )?.value;- if (!instanceId) {- return;- }- return `${instanceNamePrefix}${instanceId}`;+ return getValueFromSearchParams(state.params, "instance", instanceNamePrefix);});const selectedEnvironment = computed(() => {- const environmentId = state.params.scopes.find(- (scope) => scope.id === "environment"- )?.value;- if (!environmentId) {- return;- }- return `${environmentNamePrefix}${environmentId}`;+ return getValueFromSearchParams(+ state.params,+ "environment",+ environmentNamePrefix+ );});const selectedEngines = computed(() => {- return state.params.scopes- .filter((scope) => scope.id === "engine")- .map((scope) => {- // Convert string scope value to Engine enum- const engineKey = scope.value.toUpperCase();- const engineValue = Engine[engineKey as keyof typeof Engine];- return typeof engineValue === "number"- ? engineValue- : Engine.ENGINE_UNSPECIFIED;- });+ return getValuesFromSearchParams(state.params, "engine").map(+ (engine) => Engine[engine as keyof typeof Engine]+ );});const filter = computed(() => ({diff --git a/frontend/src/views/InstanceDashboard.vue b/frontend/src/views/InstanceDashboard.vueindex dda3b2d91b..eca4f3b5ce 100644--- a/frontend/src/views/InstanceDashboard.vue+++ b/frontend/src/views/InstanceDashboard.vue@@ -98,7 +98,12 @@ import { environmentNamePrefix } from "@/store/modules/v1/common";import { isValidInstanceName } from "@/types";import { Engine } from "@/types/proto-es/v1/common_pb";import type { Instance } from "@/types/proto-es/v1/instance_service_pb";-import { hasWorkspacePermissionV2, type SearchParams } from "@/utils";+import {+ getValueFromSearchParams,+ getValuesFromSearchParams,+ hasWorkspacePermissionV2,+ type SearchParams,+} from "@/utils";interface LocalState {params: SearchParams;@@ -138,44 +143,29 @@ const onInstanceCreated = (instance: Instance) => {};const selectedEnvironment = computed(() => {- const environmentId = state.params.scopes.find(- (scope) => scope.id === "environment"- )?.value;- if (!environmentId) {- return;- }- return `${environmentNamePrefix}${environmentId}`;+ return getValueFromSearchParams(+ state.params,+ "environment",+ environmentNamePrefix+ );});const selectedHost = computed(() => {- return state.params.scopes.find((scope) => scope.id === "host")?.value ?? "";+ return getValueFromSearchParams(state.params, "host");});const selectedPort = computed(() => {- return state.params.scopes.find((scope) => scope.id === "port")?.value ?? "";+ return getValueFromSearchParams(state.params, "port");});const selectedEngines = computed(() => {- return state.params.scopes- .filter((scope) => scope.id === "engine")- .map((scope) => {- // Convert string scope value to Engine enum- const engineKey = scope.value.toUpperCase();- const engineValue = Engine[engineKey as keyof typeof Engine];- return typeof engineValue === "number"- ? engineValue- : Engine.ENGINE_UNSPECIFIED;- });+ return getValuesFromSearchParams(state.params, "engine").map(+ (engine) => Engine[engine as keyof typeof Engine]+ );});const selectedLabels = computed(() => {- return state.params.scopes- .filter((scope) => scope.id === "label")- .map((scope) => {- // Parse label value format "key:value"- const [key, ...valueParts] = scope.value.split(":");- return { key, value: valueParts.join(":") };- });+ return getValuesFromSearchParams(state.params, "label");});const filter = computed(() => ({diff --git a/frontend/src/views/InstanceDetail.vue b/frontend/src/views/InstanceDetail.vueindex f53691c49d..92dfc1677e 100644--- a/frontend/src/views/InstanceDetail.vue+++ b/frontend/src/views/InstanceDetail.vue@@ -137,6 +137,8 @@ import { State } from "@/types/proto-es/v1/common_pb";import type { SearchParams, SearchScope } from "@/utils";import {CommonFilterScopeIdList,+ getValueFromSearchParams,+ getValuesFromSearchParams,instanceV1HasCreateDatabase,instanceV1Name,} from "@/utils";@@ -247,29 +249,19 @@ const environment = computed(() => {});const selectedEnvironment = computed(() => {- const environmentId = state.params.scopes.find(- (scope) => scope.id === "environment"- )?.value;- if (!environmentId) {- return;- }- return `${environmentNamePrefix}${environmentId}`;+ return getValueFromSearchParams(+ state.params,+ "environment",+ environmentNamePrefix+ );});const selectedProject = computed(() => {- const projectId = state.params.scopes.find(- (scope) => scope.id === "project"- )?.value;- if (!projectId) {- return;- }- return `${projectNamePrefix}${projectId}`;+ return getValueFromSearchParams(state.params, "project", projectNamePrefix);});const selectedLabels = computed(() => {- return state.params.scopes- .filter((scope) => scope.id === "label")- .map((scope) => scope.value);+ return getValuesFromSearchParams(state.params, "label");});const filter = computed(() => ({diff --git a/frontend/src/views/ProjectDashboard.vue b/frontend/src/views/ProjectDashboard.vueindex f2d45a5932..644efa92a1 100644--- a/frontend/src/views/ProjectDashboard.vue+++ b/frontend/src/views/ProjectDashboard.vue@@ -65,7 +65,11 @@ import { Drawer, PagedProjectTable } from "@/components/v2";import ProjectOperations from "@/components/v2/Model/Project/ProjectOperations.vue";import { useProjectV1Store, useUIStateStore } from "@/store";import type { Project } from "@/types/proto-es/v1/project_service_pb";-import { hasWorkspacePermissionV2, type SearchParams } from "@/utils";+import {+ getValuesFromSearchParams,+ hasWorkspacePermissionV2,+ type SearchParams,+} from "@/utils";interface LocalState {params: SearchParams;@@ -96,9 +100,7 @@ const scopeOptions = useCommonSearchScopeOptions(["label"]);// Extract labels from the search scopesconst selectedLabels = computed(() => {- return state.params.scopes- .filter((scope) => scope.id === "label")- .map((scope) => scope.value);+ return getValuesFromSearchParams(state.params, "label");});const filter = computed(() => ({diff --git a/frontend/src/views/sql-editor/ConnectionPanel/ConnectionPane/ConnectionPane.vue b/frontend/src/views/sql-editor/ConnectionPanel/ConnectionPane/ConnectionPane.vueindex 367d6df368..c2aea512da 100644--- a/frontend/src/views/sql-editor/ConnectionPanel/ConnectionPane/ConnectionPane.vue+++ b/frontend/src/views/sql-editor/ConnectionPanel/ConnectionPane/ConnectionPane.vue@@ -238,6 +238,8 @@ import {emptySQLEditorConnection,extractProjectResourceName,findAncestor,+ getValueFromSearchParams,+ getValuesFromSearchParams,isDatabaseV1Queryable,isDescendantOf,tryConnectToCoreSQLEditorTab,@@ -615,31 +617,17 @@ useEmitteryEventListener(editorEvents, "tree-ready", async () => {});const selectedLabels = computed(() => {- return state.params.scopes- .filter((scope) => scope.id === "label")- .map((scope) => scope.value);+ return getValuesFromSearchParams(state.params, "label");});const selectedInstance = computed(() => {- const instanceId = state.params.scopes.find(- (scope) => scope.id === "instance"- )?.value;- if (!instanceId) {- return;- }- return `${instanceNamePrefix}${instanceId}`;+ return getValueFromSearchParams(state.params, "instance", instanceNamePrefix);});const selectedEngines = computed(() => {- return state.params.scopes- .filter((scope) => scope.id === "engine")- .map((scope) => {- // Convert from string engine name to proto-es enum value- const engineName = scope.value.toUpperCase();- return (- Engine[engineName as keyof typeof Engine] ?? Engine.ENGINE_UNSPECIFIED- );- });+ return getValuesFromSearchParams(state.params, "engine").map(+ (engine) => Engine[engine as keyof typeof Engine]+ );});const filter = computed(diff --git a/frontend/src/views/sql-editor/EditorCommon/ResultView/SingleResultViewV1.vue b/frontend/src/views/sql-editor/EditorCommon/ResultView/SingleResultViewV1.vueindex 0bc6620545..1cfeaf57a2 100644--- a/frontend/src/views/sql-editor/EditorCommon/ResultView/SingleResultViewV1.vue+++ b/frontend/src/views/sql-editor/EditorCommon/ResultView/SingleResultViewV1.vue@@ -253,8 +253,6 @@ import ErrorView from "./ErrorView";import SelectionCopyTooltips from "./SelectionCopyTooltips.vue";import VirtualDataBlock from "./VirtualDataBlock.vue";-// Using conversion function from common-conversions.ts-type LocalState = {search: string;vertical: boolean;