enrich support links from backend

bcpeinhardt · bcpeinhardt · commit a756f3acc7b8 · 2024-08-09T15:12:34.000Z
diff --git a/coderd/appearance/appearance.go b/coderd/appearance/appearance.go
@@ -2,7 +2,10 @@ package appearance
 
 import (
 	"context"
+	"fmt"
+	"strings"
 
+	"github.com/coder/coder/v2/buildinfo"
 	"github.com/coder/coder/v2/codersdk"
 )
 
@@ -11,20 +14,21 @@ type Fetcher interface {
 }
 
 func DefaultSupportLinks(docsURL string) []codersdk.LinkConfig {
+	version := buildinfo.Version()
 	if docsURL == "" {
-		docsURL = "https://coder.com/docs/{CODER_VERSION}"
+		docsURL = "https://coder.com/docs/@" + strings.Split(version, "-")[0]
 	}
+	buildInfo := fmt.Sprintf("Version: [`%s`](%s)", version, buildinfo.ExternalURL())
 
-	docsLink := codersdk.LinkConfig{
-		Name:   "Documentation",
-		Target: docsURL,
-		Icon:   "docs",
-	}
-
-	defaultSupportLinks := []codersdk.LinkConfig{
+	return []codersdk.LinkConfig{
+		{
+			Name:   "Documentation",
+			Target: docsURL,
+			Icon:   "docs",
+		},
 		{
 			Name:   "Report a bug",
-			Target: "https://github.com/coder/coder/issues/new?labels=needs+grooming&body={CODER_BUILD_INFO}",
+			Target: "https://github.com/coder/coder/issues/new?labels=needs+grooming&body=" + buildInfo,
 			Icon:   "bug",
 		},
 		{
@@ -38,8 +42,6 @@ func DefaultSupportLinks(docsURL string) []codersdk.LinkConfig {
 			Icon:   "star",
 		},
 	}
-
-	return append([]codersdk.LinkConfig{docsLink}, defaultSupportLinks...)
 }
 
 type AGPLFetcher struct {
diff --git a/site/src/modules/dashboard/Navbar/UserDropdown/UserDropdownContent.tsx b/site/src/modules/dashboard/Navbar/UserDropdown/UserDropdownContent.tsx
@@ -93,7 +93,7 @@ export const UserDropdownContent: FC<UserDropdownContentProps> = ({
           <Divider />
           {supportLinks.map((link) => (
             <a
-              href={includeBuildInfo(link.target, buildInfo)}
+              href={link.target}
               key={link.name}
               target="_blank"
               rel="noreferrer"
@@ -177,26 +177,6 @@ export const GithubStar: FC<SvgIconProps> = (props) => (
   </svg>
 );
 
-const includeBuildInfo = (
-  href: string,
-  buildInfo?: TypesGen.BuildInfoResponse,
-): string => {
-  let version = encodeURIComponent((buildInfo?.version ?? "").split("-")[0]);
-  if (version) {
-    // Not encoding the @ because it makes the link look a bit weird.
-    version = `@${version}`;
-  }
-
-  return href
-    .replace(
-      "{CODER_BUILD_INFO}",
-      `${encodeURIComponent(
-        `Version: [\`${buildInfo?.version}\`](${buildInfo?.external_url})`,
-      )}`,
-    )
-    .replace("{CODER_VERSION}", version);
-};
-
 const styles = {
   info: (theme) => [
     theme.typography.body2 as CSSObject,
