From b11e4840f9db188d97b5e1f6450d3682e606aa37 Mon Sep 17 00:00:00 2001 From: Thomas Scholtes Date: Fri, 30 Jun 2023 10:10:57 +0200 Subject: [PATCH] Eliminate top-level search parameter from project route Signed-off-by: Thomas Scholtes --- src/App/Header/Search.svelte | 1 - src/lib/router.ts | 12 +++++++--- src/views/projects/Cob/Revision.svelte | 17 ++++++++++--- src/views/projects/Commit/CommitTeaser.svelte | 1 - src/views/projects/Header.svelte | 2 -- src/views/projects/Issues.svelte | 8 ++++++- src/views/projects/Patch.svelte | 24 +++++++++++++++---- src/views/projects/Patches.svelte | 8 ++++++- .../projects/SourceBrowser/FileDiff.svelte | 1 - .../SourceBrowser/FileLocationChange.svelte | 1 - .../projects/SourceBrowsingHeader.svelte | 1 - src/views/projects/View.svelte | 7 +++--- src/views/projects/router.ts | 10 -------- src/views/seeds/View.svelte | 3 --- 14 files changed, 60 insertions(+), 36 deletions(-) diff --git a/src/App/Header/Search.svelte b/src/App/Header/Search.svelte index f15047216..0abe56c10 100644 --- a/src/App/Header/Search.svelte +++ b/src/App/Header/Search.svelte @@ -56,7 +56,6 @@ peer: undefined, baseUrl, hash: undefined, - search: undefined, }, }); } else { diff --git a/src/lib/router.ts b/src/lib/router.ts index d502ec546..bc8b81ca7 100644 --- a/src/lib/router.ts +++ b/src/lib/router.ts @@ -264,9 +264,6 @@ export function routeToPath(route: Route): string { } } - if (route.params.search) { - suffix += `?${route.params.search}`; - } if (route.params.hash) { suffix += `#${route.params.hash}`; } @@ -286,12 +283,21 @@ export function routeToPath(route: Route): string { ) { return `${seed}/${route.params.id}${peer}/issues/new${suffix}`; } else if (route.params.view.resource === "issues") { + if (route.params.view.params.search) { + suffix += `?${route.params.view.params.search}`; + } return `${seed}/${route.params.id}${peer}/issues${suffix}`; } else if (route.params.view.resource === "issue") { return `${seed}/${route.params.id}${peer}/issues/${route.params.view.params.issue}`; } else if (route.params.view.resource === "patches") { + if (route.params.view.params.search) { + suffix += `?${route.params.view.params.search}`; + } return `${seed}/${route.params.id}${peer}/patches${suffix}`; } else if (route.params.view.resource === "patch") { + if (route.params.view.params.search) { + suffix += `?${route.params.view.params.search}`; + } if (route.params.view.params.revision) { return `${seed}/${route.params.id}${peer}/patches/${route.params.view.params.patch}/${route.params.view.params.revision}${suffix}`; } diff --git a/src/views/projects/Cob/Revision.svelte b/src/views/projects/Cob/Revision.svelte index cb74c900d..0cfaa133f 100644 --- a/src/views/projects/Cob/Revision.svelte +++ b/src/views/projects/Cob/Revision.svelte @@ -212,7 +212,13 @@ previousRevOid, )}..{utils.formatObjectId(revisionOid)}" projectParams={{ - search: `diff=${previousRevOid}..${revisionOid}`, + view: { + resource: "patch", + params: { + patch: patchId, + search: `diff=${previousRevOid}..${revisionOid}`, + }, + }, }}> @@ -230,7 +236,13 @@ {#if item === projectHead} @@ -292,7 +304,6 @@ projectParams={{ view: { resource: "commits" }, revision: commit.id, - search: undefined, }}>
diff --git a/src/views/projects/Header.svelte b/src/views/projects/Header.svelte index f3364014e..afb1bb6a9 100644 --- a/src/views/projects/Header.svelte +++ b/src/views/projects/Header.svelte @@ -68,7 +68,6 @@ params: { view: { resource: "list" } }, }, peer: undefined, - search: undefined, revision: undefined, path: undefined, }}> @@ -90,7 +89,6 @@ params: { view: { resource: "list" } }, }, peer: undefined, - search: undefined, revision: undefined, path: undefined, }}> diff --git a/src/views/projects/Issues.svelte b/src/views/projects/Issues.svelte index 33cac64e0..cc0789e20 100644 --- a/src/views/projects/Issues.svelte +++ b/src/views/projects/Issues.svelte @@ -120,7 +120,13 @@ {#if !option.disabled} Diff {diff.substr(0, 6)}..{diff.split("..")[1].substr(0, 6)} @@ -388,9 +401,12 @@ projectParams={{ view: { resource: "patch", - params: { patch: patch.id, revision: item.id }, + params: { + patch: patch.id, + revision: item.id, + search: `tab=${currentTab}`, + }, }, - search: `tab=${currentTab}`, }}> diff --git a/src/views/projects/SourceBrowser/FileLocationChange.svelte b/src/views/projects/SourceBrowser/FileLocationChange.svelte index 849404035..c846151a6 100644 --- a/src/views/projects/SourceBrowser/FileLocationChange.svelte +++ b/src/views/projects/SourceBrowser/FileLocationChange.svelte @@ -54,7 +54,6 @@ view: { resource: "tree" }, path: file.newPath, revision, - search: undefined, }}> diff --git a/src/views/projects/SourceBrowsingHeader.svelte b/src/views/projects/SourceBrowsingHeader.svelte index a73efd538..f01bed057 100644 --- a/src/views/projects/SourceBrowsingHeader.svelte +++ b/src/views/projects/SourceBrowsingHeader.svelte @@ -61,7 +61,6 @@ resource: "history", }, revision, - search: undefined, }}> diff --git a/src/views/projects/View.svelte b/src/views/projects/View.svelte index a79875aea..e96a2bbd7 100644 --- a/src/views/projects/View.svelte +++ b/src/views/projects/View.svelte @@ -25,7 +25,6 @@ export let hash: string | undefined = undefined; export let peer: string | undefined = undefined; export let revision: string | undefined = undefined; - export let search: string | undefined = undefined;