Fixes graph not rendering when unable to locate an icon

d13 · d13 · commit 0141523903c4 · 2025-05-20T17:17:27.000-04:00
diff --git a/package.json b/package.json
@@ -21891,7 +21891,7 @@
 		"vscode:prepublish": "pnpm run bundle"
 	},
 	"dependencies": {
-		"@gitkraken/gitkraken-components": "13.0.0-vnext.2",
+		"@gitkraken/gitkraken-components": "13.0.0-vnext.3",
 		"@gitkraken/provider-apis": "0.28.5",
 		"@gitkraken/shared-web-components": "0.1.1-rc.15",
 		"@gk-nzaytsev/fast-string-truncated-width": "1.1.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/webviews/apps/plus/graph/graph-wrapper/graph-wrapper.react.tsx b/src/webviews/apps/plus/graph/graph-wrapper/graph-wrapper.react.tsx
@@ -124,8 +124,14 @@ const createIconElements = () => {
 		'files',
 		'worktree',
 		'issue-github',
+		'issue-githubEnterprise',
 		'issue-gitlab',
+		'issue-gitlabSelfHosted',
 		'issue-jiraCloud',
+		'issue-jiraServer',
+		'issue-azureDevops',
+		'issue-bitbucket',
+		'undefined-icon',
 	];
 
 	const miniIconList = ['upstream-ahead', 'upstream-behind'];
@@ -148,7 +154,8 @@ const createIconElements = () => {
 const iconElementLibrary = createIconElements();
 
 const getIconElementLibrary: GetExternalIcon = (iconKey: string) => {
-	return iconElementLibrary[iconKey];
+	const icon = iconKey in iconElementLibrary ? iconKey : 'undefined-icon';
+	return iconElementLibrary[icon];
 };
 
 const getClientPlatform = (): GraphPlatform => {
diff --git a/src/webviews/apps/plus/graph/graph.scss b/src/webviews/apps/plus/graph/graph.scss
@@ -850,21 +850,24 @@ button:not([disabled]),
 		}
 	}
 
-	&--issue-github {
+	&--issue-github,
+	&--issue-githubEnterprise {
 		&::before {
 			font-family: codicon;
 			@include iconUtils.codicon('issues');
 		}
 	}
 
-	&--issue-gitlab {
+	&--issue-gitlab,
+	&--issue-gitlabSelfHosted {
 		&::before {
 			font-family: codicon;
 			@include iconUtils.codicon('issues');
 		}
 	}
 
-	&--issue-jiraCloud {
+	&--issue-jiraCloud,
+	&--issue-jiraServer {
 		&::before {
 			font-family: 'glicons';
 			@include iconUtils.glicon('provider-jira');
@@ -884,6 +887,13 @@ button:not([disabled]),
 			@include iconUtils.codicon('issues');
 		}
 	}
+
+	&--undefined-icon {
+		&::before {
+			font-family: codicon;
+			@include iconUtils.codicon('blank');
+		}
+	}
 }
 
 // header - move to graph.css.ts

Original file line number	Diff line number	Diff line change
`@@ -850,21 +850,24 @@ button:not([disabled]),`
`850`	`850`	`}`
`851`	`851`	`}`
`852`	`852`
`853`		`- &--issue-github {`
	`853`	`+ &--issue-github,`
	`854`	`+ &--issue-githubEnterprise {`
`854`	`855`	`&::before {`
`855`	`856`	`font-family: codicon;`
`856`	`857`	`@include iconUtils.codicon('issues');`
`857`	`858`	`}`
`858`	`859`	`}`
`859`	`860`
`860`		`- &--issue-gitlab {`
	`861`	`+ &--issue-gitlab,`
	`862`	`+ &--issue-gitlabSelfHosted {`
`861`	`863`	`&::before {`
`862`	`864`	`font-family: codicon;`
`863`	`865`	`@include iconUtils.codicon('issues');`
`864`	`866`	`}`
`865`	`867`	`}`
`866`	`868`
`867`		`- &--issue-jiraCloud {`
	`869`	`+ &--issue-jiraCloud,`
	`870`	`+ &--issue-jiraServer {`
`868`	`871`	`&::before {`
`869`	`872`	`font-family: 'glicons';`
`870`	`873`	`@include iconUtils.glicon('provider-jira');`
`@@ -884,6 +887,13 @@ button:not([disabled]),`
`884`	`887`	`@include iconUtils.codicon('issues');`
`885`	`888`	`}`
`886`	`889`	`}`
	`890`	`+`
	`891`	`+ &--undefined-icon {`
	`892`	`+ &::before {`
	`893`	`+ font-family: codicon;`
	`894`	`+ @include iconUtils.codicon('blank');`
	`895`	`+ }`
	`896`	`+ }`
`887`	`897`	`}`
`888`	`898`
`889`	`899`	`// header - move to graph.css.ts`