From d413650ebcb450f87972396b7da9706ae1888725 Mon Sep 17 00:00:00 2001 From: Sebastian Martinez Date: Mon, 22 Apr 2024 15:36:00 +0200 Subject: [PATCH] Filter peers without branches in the router This way we make sure the remote count is the same and the behavior between files tab and commit tab is the same --- src/views/projects/Source.svelte | 28 +++++++++++++--------------- src/views/projects/router.ts | 4 ++-- 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/src/views/projects/Source.svelte b/src/views/projects/Source.svelte index 750a2fd21..33a580129 100644 --- a/src/views/projects/Source.svelte +++ b/src/views/projects/Source.svelte @@ -45,21 +45,19 @@ }); }; - $: peersWithRoute = peers - .filter(remote => Object.keys(remote.heads).length > 0) - .map(remote => ({ - remote, - selected: remote.id === peer, - route: { - resource: "project.source", - node: baseUrl, - project: project.id, - peer: remote.id, - revision: remote.heads[project.defaultBranch] - ? undefined - : Object.keys(remote.heads)[0], - } as Route, - })); + $: peersWithRoute = peers.map(remote => ({ + remote, + selected: remote.id === peer, + route: { + resource: "project.source", + node: baseUrl, + project: project.id, + peer: remote.id, + revision: remote.heads[project.defaultBranch] + ? undefined + : Object.keys(remote.heads)[0], + } as Route, + })); $: branchesWithRoute = branches.map(name => ({ name, diff --git a/src/views/projects/router.ts b/src/views/projects/router.ts index 1912d34c9..5dd6055da 100644 --- a/src/views/projects/router.ts +++ b/src/views/projects/router.ts @@ -454,7 +454,7 @@ async function loadTreeView( params: { baseUrl: route.node, project, - peers, + peers: peers.filter(remote => Object.keys(remote.heads).length > 0), peer: route.peer, branches: Object.keys(branchMap), rawPath, @@ -548,7 +548,7 @@ async function loadHistoryView( params: { baseUrl: route.node, project, - peers, + peers: peers.filter(remote => Object.keys(remote.heads).length > 0), peer: route.peer, branches: Object.keys(branchMap || {}), revision: route.revision,