From 1b6bed73a61e399371e3230988477ebe88eef68c Mon Sep 17 00:00:00 2001 From: Thomas Scholtes Date: Thu, 20 Jul 2023 13:02:28 +0200 Subject: [PATCH] Lift branch/peer selector data into main views We prepare the data for `PeerSelector` and `BranchSelector` in the `History` and `Browser` instead of `SourceBrowsingHeader`. This makes the component APIs overall simpler and allows us to remove `LoadedSourceBrowsingView`. Signed-off-by: Thomas Scholtes --- src/views/projects/Browser.svelte | 32 ++++++-- src/views/projects/History.svelte | 32 ++++++-- .../projects/SourceBrowsingHeader.svelte | 76 ++----------------- src/views/projects/View.svelte | 6 +- src/views/projects/router.ts | 20 +++-- 5 files changed, 71 insertions(+), 95 deletions(-) diff --git a/src/views/projects/Browser.svelte b/src/views/projects/Browser.svelte index 19dedd60a..c0d2c4d1b 100644 --- a/src/views/projects/Browser.svelte +++ b/src/views/projects/Browser.svelte @@ -1,7 +1,7 @@
- {#if peersWithRoute.length > 0} - + {#if peers.length > 0} + {/if} - + - + {commitCount} {pluralize("commit", commitCount)} diff --git a/src/views/projects/View.svelte b/src/views/projects/View.svelte index c3d16326d..942e97e3d 100644 --- a/src/views/projects/View.svelte +++ b/src/views/projects/View.svelte @@ -73,8 +73,7 @@ {baseUrl} {peer} {project} - revision={view.revision} - {view} /> + revision={view.revision} /> {:else if view.resource === "history"} + revision={view.revision} /> {:else if view.resource === "commit"} {:else if view.resource === "issues"} diff --git a/src/views/projects/router.ts b/src/views/projects/router.ts index c64402f3f..08b2df891 100644 --- a/src/views/projects/router.ts +++ b/src/views/projects/router.ts @@ -100,7 +100,8 @@ export interface ProjectLoadedParams { project: Project; view: ProjectLoadedView; } -export type LoadedSourceBrowsingView = + +export type ProjectLoadedView = | { resource: "tree"; peer: string | undefined; @@ -116,16 +117,7 @@ export type LoadedSourceBrowsingView = params: LoadedSourceBrowsingParams; commitHeaders: CommitHeader[]; totalCommitCount: number; - }; - -interface LoadedSourceBrowsingParams { - loadedBranches: Record | undefined; - loadedPeers: Remote[]; - loadedTree: Tree; -} - -export type ProjectLoadedView = - | LoadedSourceBrowsingView + } | { resource: "commit"; commit: Commit; @@ -136,6 +128,12 @@ export type ProjectLoadedView = | { resource: "patches"; search: string } | PatchView; +interface LoadedSourceBrowsingParams { + loadedBranches: Record | undefined; + loadedPeers: Remote[]; + loadedTree: Tree; +} + export type BlobResult = | { ok: true; blob: Blob; highlighted: Syntax.Root | undefined } | { ok: false; error: { message: string; path: string } };