src-advisory/SRCmail
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: drop ghost sub-results from account and language search

Browse Source
This commit is contained in:
Linus Rath
2026-05-06 19:06:59 +02:00
parent 70c1ddd48c
commit 802a30508a
1 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/[locale]/settings/page.tsx
+24 -5
View File
@@ -148,8 +148,16 @@ const tabGroupOrder: TabGroup[] = ['general', 'appearance', 'mail', 'privacy', '
// are attributed to the correct tab. Tabs with their own namespace just point // are attributed to the correct tab. Tabs with their own namespace just point
// at the namespace root. // at the namespace root.
const tabSearchPaths: Record<Tab, string[]> = { const tabSearchPaths: Record<Tab, string[]> = {
account: ['settings.account'], account: [
language: ['settings.appearance.language', 'settings.language_region'], 'settings.account.name_label',
'settings.account.username_label',
'settings.account.account_type_label',
'settings.account.auth_method_label',
'settings.account.email',
'settings.account.server',
'settings.account.storage',
],
language: ['settings.appearance.language'],
notifications: ['settings.notifications'], notifications: ['settings.notifications'],
appearance: [ appearance: [
'settings.appearance.theme', 'settings.appearance.theme',
@@ -258,10 +266,16 @@ interface SubResult {
description?: string; description?: string;
} }
// Walk a translation subtree and emit one sub-result per object that has a // Walk a translation subtree and emit sub-results for renderable settings.
// `label` (or, at the root, a `title`) string. Each emitted setting is then // Picks up:
// shown as a clickable sub-row under its tab in the search results. // - bare string leaves (when a tab path points directly at a flat label)
// - objects with a `label` or `title` field (the standard pattern)
// - flat `*_label` string keys at any object level (e.g. `name_label`)
function collectSubResults(node: unknown, sink: SubResult[]): void { function collectSubResults(node: unknown, sink: SubResult[]): void {
if (typeof node === 'string') {
sink.push({ label: node });
return;
}
if (!node || typeof node !== 'object' || Array.isArray(node)) return; if (!node || typeof node !== 'object' || Array.isArray(node)) return;
const obj = node as Record<string, unknown>; const obj = node as Record<string, unknown>;
const label = typeof obj.label === 'string' ? obj.label : (typeof obj.title === 'string' ? obj.title : undefined); const label = typeof obj.label === 'string' ? obj.label : (typeof obj.title === 'string' ? obj.title : undefined);
@@ -271,6 +285,11 @@ function collectSubResults(node: unknown, sink: SubResult[]): void {
description: typeof obj.description === 'string' ? obj.description : undefined, description: typeof obj.description === 'string' ? obj.description : undefined,
}); });
} }
for (const [key, value] of Object.entries(obj)) {
if (typeof value === 'string' && key !== 'label' && key !== 'title' && key.endsWith('_label')) {
sink.push({ label: value });
}
}
for (const value of Object.values(obj)) { for (const value of Object.values(obj)) {
if (value && typeof value === 'object' && !Array.isArray(value)) { if (value && typeof value === 'object' && !Array.isArray(value)) {
collectSubResults(value, sink); collectSubResults(value, sink);