Skip to content

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

fix: use pre-fetched matched databases on database group detail page (#18962)

boojackc6d492ae2555
diff --git a/frontend/src/components/DatabaseGroup/DatabaseGroupForm.vue b/frontend/src/components/DatabaseGroup/DatabaseGroupForm.vue
index e02706ce8d..dfa2db68ac 100644
--- a/frontend/src/components/DatabaseGroup/DatabaseGroupForm.vue
+++ b/frontend/src/components/DatabaseGroup/DatabaseGroupForm.vue
@@ -40,7 +40,11 @@
/>
</div>
<div class="col-span-2">
- <MatchedDatabaseView :project="project.name" :expr="state.expr" />
+ <MatchedDatabaseView
+ :project="project.name"
+ :expr="state.expr"
+ :matched-database-names="readonly ? matchedDatabaseNames : undefined"
+ />
</div>
</div>
</div>
@@ -124,6 +128,10 @@ const resourceIdField = ref<InstanceType<typeof ResourceIdField>>();
const isCreating = computed(() => props.databaseGroup === undefined);
+const matchedDatabaseNames = computed(() => {
+ return props.databaseGroup?.matchedDatabases.map((db) => db.name) ?? [];
+});
+
watchEffect(async () => {
const databaseGroup = props.databaseGroup;
if (!databaseGroup || !isValidDatabaseGroupName(databaseGroup.name)) {
diff --git a/frontend/src/components/DatabaseGroup/MatchedDatabaseView.vue b/frontend/src/components/DatabaseGroup/MatchedDatabaseView.vue
index a845f82bc8..8a861bc4e4 100644
--- a/frontend/src/components/DatabaseGroup/MatchedDatabaseView.vue
+++ b/frontend/src/components/DatabaseGroup/MatchedDatabaseView.vue
@@ -109,6 +109,9 @@ interface LocalState {
const props = defineProps<{
project: string;
expr: ConditionGroupExpr;
+ // When provided (in readonly mode), skip the validateOnly API call
+ // and use these pre-fetched matched database names directly
+ matchedDatabaseNames?: string[];
}>();
const { t } = useI18n();
@@ -234,10 +237,14 @@ const updateDatabaseMatchingState = useDebounceFn(async () => {
state.loading = true;
try {
- const matchedDatabaseList = await dbGroupStore.fetchDatabaseGroupMatchList({
- projectName: props.project,
- expr: props.expr,
- });
+ // When matchedDatabaseNames is provided (readonly mode), use it directly
+ // instead of calling createDatabaseGroup with validateOnly
+ const matchedDatabaseList = props.matchedDatabaseNames
+ ? props.matchedDatabaseNames
+ : await dbGroupStore.fetchDatabaseGroupMatchList({
+ projectName: props.project,
+ expr: props.expr,
+ });
state.matchingError = undefined;
state.databaseMatchLists = getInitialState();
@@ -251,7 +258,7 @@ const updateDatabaseMatchingState = useDebounceFn(async () => {
}, DEBOUNCE_SEARCH_DELAY);
watch(
- [() => props.project, () => props.expr],
+ [() => props.project, () => props.expr, () => props.matchedDatabaseNames],
() => updateDatabaseMatchingState(),
{ deep: true, immediate: true }
);