Skip to content

Database governance built for humans and agents — controlling changes and access across every major database.

fix: simply fetch the databases (#18474)

ecmadao558dbd1c6a31
diff --git a/frontend/src/views/sql-editor/ConnectionPanel/ConnectionPane/tree.ts b/frontend/src/views/sql-editor/ConnectionPanel/ConnectionPane/tree.ts
index d0815c8fc9..6ec4e6dfc5 100644
--- a/frontend/src/views/sql-editor/ConnectionPanel/ConnectionPane/tree.ts
+++ b/frontend/src/views/sql-editor/ConnectionPanel/ConnectionPane/tree.ts
@@ -18,7 +18,7 @@ import type {
StatefulSQLEditorTreeFactor as StatefulFactor,
SQLEditorTreeNode as TreeNode,
} from "@/types";
-import { DEBOUNCE_SEARCH_DELAY, unknownEnvironment } from "@/types";
+import { DEBOUNCE_SEARCH_DELAY } from "@/types";
import {
getDefaultPagination,
isDatabaseV1Queryable,
@@ -53,7 +53,6 @@ export const useSQLEditorTreeByEnvironment = (
const { project } = storeToRefs(useSQLEditorStore());
const currentUser = useCurrentUserV1();
const environmentStore = useEnvironmentV1Store();
- const unknownEnv = unknownEnvironment();
const tree = ref<TreeNode[]>([]);
const showMissingQueryDatabases = ref<boolean>(false);
@@ -85,19 +84,11 @@ export const useSQLEditorTreeByEnvironment = (
{ deep: true }
);
- // fetchMultiPageDatabases will fetch databases with multi-pages (maximum 5).
- // The filteredDatabaseList will filter databases by the permission,
- // so we may need to fetch database for multi-pages to avoid empty databases in the UI.
- const fetchMultiPageDatabases = async (filter?: DatabaseFilter) => {
- let pageToken = fetchDataState.value.nextPageToken;
- const response: ComposedDatabase[] = [];
-
- // Try to fetch 5 pages.
- // TODO: support list databases with specific permissions via the API.
- let i = 5;
- while (i > 0) {
- i--;
+ const fetchDatabases = useDebounceFn(async (filter?: DatabaseFilter) => {
+ fetchDataState.value.loading = true;
+ const pageToken = fetchDataState.value.nextPageToken;
+ try {
const { databases, nextPageToken } = await databaseStore.fetchDatabases({
parent: project.value,
pageToken,
@@ -107,38 +98,6 @@ export const useSQLEditorTreeByEnvironment = (
environment,
},
});
- response.push(
- ...databases.filter((db) => {
- const dbEnv = db.effectiveEnvironment || unknownEnv.name;
- return dbEnv === environment;
- })
- );
- pageToken = nextPageToken;
-
- if (!pageToken) {
- break;
- }
- if (showMissingQueryDatabases.value) {
- break;
- }
- if (databases.some((db) => isDatabaseV1Queryable(db))) {
- break;
- }
- }
-
- return {
- nextPageToken: pageToken,
- databases: response,
- };
- };
-
- const fetchDatabases = useDebounceFn(async (filter?: DatabaseFilter) => {
- fetchDataState.value.loading = true;
- const pageToken = fetchDataState.value.nextPageToken;
-
- try {
- const { databases, nextPageToken } =
- await fetchMultiPageDatabases(filter);
if (pageToken) {
databaseList.value.push(...databases);
} else {