Skip to content

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

fix(frontend): properly restore AdvancedSearch cache without merging (#18293)

p0ny328b7b5094cf
diff --git a/frontend/src/components/AdvancedSearch/AdvancedSearch.vue b/frontend/src/components/AdvancedSearch/AdvancedSearch.vue
index b8739af42a..e2ce7e1ecd 100644
--- a/frontend/src/components/AdvancedSearch/AdvancedSearch.vue
+++ b/frontend/src/components/AdvancedSearch/AdvancedSearch.vue
@@ -100,7 +100,6 @@ import {
emptySearchParams,
getValueFromSearchParams,
getValuesFromSearchParams,
- mergeSearchParams,
minmax,
upsertScope,
useDynamicLocalStorage,
@@ -117,12 +116,17 @@ const props = withDefaults(
placeholder?: string | undefined;
autofocus?: boolean;
overrideRouteQuery?: boolean;
+ // Fallback params when no URL params and no cache.
+ // Precedence: URL params > cache > defaultParams.
+ // Readonly scopes from props.params are always preserved.
+ defaultParams?: SearchParams;
}>(),
{
scopeOptions: () => [],
autofocus: false,
placeholder: undefined,
overrideRouteQuery: true,
+ defaultParams: undefined,
}
);
@@ -623,33 +627,54 @@ const scrollScopeTagIntoViewIfNeeded = (id: SearchScopeId) => {
});
};
+// Check if params has meaningful content (non-empty, excluding readonly scopes)
+const hasParams = (params: SearchParams): boolean => {
+ if (params.query.trim().length > 0) return true;
+ // Readonly scopes don't count as "URL params" - they're set by parent
+ return params.scopes.some((s) => !s.readonly);
+};
+
onMounted(() => {
if (props.autofocus) {
inputRef.value?.inputElRef?.focus();
}
+
+ // Precedence: URL params > cache > defaultParams
+ // Parent passes non-empty params only when URL has ?q=...
+ if (hasParams(props.params)) {
+ // URL had params - use as-is
+ return;
+ }
+
+ // Preserve readonly scopes from props.params (e.g., project=xx in ProjectDatabasesPanel)
+ const readonlyScopes = props.params.scopes.filter((s) => s.readonly);
+
+ // No URL params - check cache
const qs = cachedQuery.value;
if (qs.length > 0) {
+ // Cache exists: restore from cache
const params = buildSearchParamsBySearchText(qs);
- const existedScopes = props.params.scopes.reduce((map, scope) => {
- map.set(scope.id, scope.readonly ?? false);
- return map;
- }, new Map<SearchScopeId, boolean>());
- params.scopes = params.scopes
- .filter((scope) => {
- const option = props.scopeOptions.find((op) => op.id === scope.id);
- if (!option) {
- return false;
- }
- if (existedScopes.has(option.id)) {
- return option.allowMultiple ?? false;
- }
- return true;
- })
- .map((scope) => ({
- ...scope,
- readonly: existedScopes.get(scope.id),
- }));
- emit("update:params", mergeSearchParams(cloneDeep(props.params), params));
+ // Filter to only include scopes that are valid for this search context
+ // and not already covered by readonly scopes
+ const readonlyScopeIds = new Set(readonlyScopes.map((s) => s.id));
+ params.scopes = params.scopes.filter((scope) => {
+ if (readonlyScopeIds.has(scope.id)) return false;
+ return props.scopeOptions.find((op) => op.id === scope.id);
+ });
+ // Prepend readonly scopes
+ params.scopes = [...readonlyScopes, ...params.scopes];
+ emit("update:params", params);
+ return;
+ }
+
+ // No cache: use defaults if provided
+ if (props.defaultParams) {
+ const params = cloneDeep(props.defaultParams);
+ // Prepend readonly scopes
+ const readonlyScopeIds = new Set(readonlyScopes.map((s) => s.id));
+ params.scopes = params.scopes.filter((s) => !readonlyScopeIds.has(s.id));
+ params.scopes = [...readonlyScopes, ...params.scopes];
+ emit("update:params", params);
}
});
diff --git a/frontend/src/components/IssueV1/components/IssueSearch/IssueSearch.vue b/frontend/src/components/IssueV1/components/IssueSearch/IssueSearch.vue
index aee4cef5f5..d2998ad03e 100644
--- a/frontend/src/components/IssueV1/components/IssueSearch/IssueSearch.vue
+++ b/frontend/src/components/IssueV1/components/IssueSearch/IssueSearch.vue
@@ -6,6 +6,7 @@
class="flex-1"
:params="params"
:scope-options="scopeOptions"
+ :default-params="defaultParams"
@update:params="$emit('update:params', $event)"
/>
<TimeRange
@@ -59,11 +60,13 @@ const props = withDefaults(
autofocus?: boolean;
components?: SearchComponent[];
componentProps?: Partial<Record<SearchComponent, any>>;
+ defaultParams?: SearchParams;
}>(),
{
overrideScopeIdList: () => [],
components: () => ["searchbox", "time-range", "presets", "status"],
componentProps: undefined,
+ defaultParams: undefined,
}
);
diff --git a/frontend/src/views/MyIssues.vue b/frontend/src/views/MyIssues.vue
index b149ae1bed..956e42d59d 100644
--- a/frontend/src/views/MyIssues.vue
+++ b/frontend/src/views/MyIssues.vue
@@ -3,6 +3,7 @@
<IssueSearch
v-model:params="state.params"
:components="['searchbox', 'time-range', 'presets', 'status']"
+ :default-params="computedDefaultParams"
class="px-4 pb-2"
/>
@@ -84,10 +85,14 @@ const defaultSearchParams = (): SearchParams => {
};
};
+// Initialize with empty params - AdvancedSearch will set from cache or defaults
const state = reactive<LocalState>({
- params: defaultSearchParams(),
+ params: { query: "", scopes: [] },
});
+// Always provide defaultParams for AdvancedSearch to use as fallback
+const computedDefaultParams = computed(() => defaultSearchParams());
+
const mergedIssueFilter = computed(() => {
return buildIssueFilterBySearchParams(state.params);
});