From 73b07c4253358edd38feb5c2cb5daaa14ae028ad Mon Sep 17 00:00:00 2001
From: Eric Amodio <eamodio@gmail.com>
Date: Wed, 14 Jun 2023 02:09:46 -0400
Subject: [PATCH] Fixes lack of remote button from breaking layout Adds
 protection for undefined rows (seen in logs)

---
 src/plus/webviews/graph/graphWebview.ts       | 2 +-
 src/webviews/apps/plus/graph/GraphWrapper.tsx | 6 +++++-
 src/webviews/apps/plus/graph/graph.scss       | 4 ++++
 src/webviews/apps/plus/graph/graph.tsx        | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/plus/webviews/graph/graphWebview.ts b/src/plus/webviews/graph/graphWebview.ts
index 7799b97..1d4b0d5 100644
--- a/src/plus/webviews/graph/graphWebview.ts
+++ b/src/plus/webviews/graph/graphWebview.ts
@@ -1385,7 +1385,7 @@ export class GraphWebviewProvider implements WebviewProvider<State> {
 		);
 	}
 
-	@debug()
+	@debug({ args: false })
 	private async notifyDidChangeRowsStats(graph: GitGraph) {
 		if (graph.rowsStats == null) return;
 
diff --git a/src/webviews/apps/plus/graph/GraphWrapper.tsx b/src/webviews/apps/plus/graph/GraphWrapper.tsx
index 285bed0..7c61001 100644
--- a/src/webviews/apps/plus/graph/GraphWrapper.tsx
+++ b/src/webviews/apps/plus/graph/GraphWrapper.tsx
@@ -1048,7 +1048,11 @@ export function GraphWrapper({
 	return (
 		<>
 			<header className="titlebar graph-app__header">
-				<div className={`titlebar__row titlebar__row--wrap${allowed ? '' : ' disallowed'}`}>
+				<div
+					className={`titlebar__row titlebar__row--wrap${
+						!allowed ? ' disallowed' : repo && branchState?.provider?.url ? '' : ' no-remote-provider'
+					}`}
+				>
 					{repo && branchState?.provider?.url && (
 						<a
 							href={branchState.provider.url}
diff --git a/src/webviews/apps/plus/graph/graph.scss b/src/webviews/apps/plus/graph/graph.scss
index 6da30b6..03b7063 100644
--- a/src/webviews/apps/plus/graph/graph.scss
+++ b/src/webviews/apps/plus/graph/graph.scss
@@ -820,6 +820,10 @@ button:not([disabled]),
 			justify-content: start;
 			grid-template-columns: repeat(5, min-content) minmax(min-content, 1fr);
 
+			&.no-remote-provider {
+				grid-template-columns: repeat(4, min-content) minmax(min-content, 1fr);
+			}
+
 			&.disallowed {
 				grid-template-columns: repeat(1, min-content) minmax(min-content, 1fr);
 			}
diff --git a/src/webviews/apps/plus/graph/graph.tsx b/src/webviews/apps/plus/graph/graph.tsx
index 468a4d7..40b1832 100644
--- a/src/webviews/apps/plus/graph/graph.tsx
+++ b/src/webviews/apps/plus/graph/graph.tsx
@@ -682,7 +682,7 @@ export class GraphApp extends App<State> {
 	}
 
 	private onSelectionChanged(rows: GraphRow[]) {
-		const selection = rows.map(r => ({ id: r.sha, type: r.type as GitGraphRowType }));
+		const selection = rows.filter(r => r != null).map(r => ({ id: r.sha, type: r.type as GitGraphRowType }));
 		this.sendCommand(UpdateSelectionCommandType, {
 			selection: selection,
 		});