add version through frontend

bcpeinhardt · bcpeinhardt · commit 466004de30f9 · 2024-08-06T16:05:17.000Z
diff --git a/coderd/appearance/appearance.go b/coderd/appearance/appearance.go
@@ -10,27 +10,9 @@ type Fetcher interface {
 	Fetch(ctx context.Context) (codersdk.AppearanceConfig, error)
 }
 
-var defaultSupportLinks = []codersdk.LinkConfig{
-	{
-		Name:   "Report a bug",
-		Target: "https://github.com/coder/coder/issues/new?labels=needs+grooming&body={CODER_BUILD_INFO}",
-		Icon:   "bug",
-	},
-	{
-		Name:   "Join the Coder Discord",
-		Target: "https://coder.com/chat?utm_source=coder&utm_medium=coder&utm_campaign=server-footer",
-		Icon:   "chat",
-	},
-	{
-		Name:   "Star the Repo",
-		Target: "https://github.com/coder/coder",
-		Icon:   "star",
-	},
-}
-
 func DefaultSupportLinks(docsURL string) []codersdk.LinkConfig {
 	if docsURL == "" {
-		docsURL = "https://coder.com/docs/coder-oss"
+		docsURL = "https://coder.com/docs/{CODER_VERSION}"
 	}
 
 	docsLink := codersdk.LinkConfig{
@@ -39,6 +21,24 @@ func DefaultSupportLinks(docsURL string) []codersdk.LinkConfig {
 		Icon:   "docs",
 	}
 
+	defaultSupportLinks := []codersdk.LinkConfig{
+		{
+			Name:   "Report a bug",
+			Target: "https://github.com/coder/coder/issues/new?labels=needs+grooming&body={CODER_BUILD_INFO}",
+			Icon:   "bug",
+		},
+		{
+			Name:   "Join the Coder Discord",
+			Target: "https://coder.com/chat?utm_source=coder&utm_medium=coder&utm_campaign=server-footer",
+			Icon:   "chat",
+		},
+		{
+			Name:   "Star the Repo",
+			Target: "https://github.com/coder/coder",
+			Icon:   "star",
+		},
+	}
+
 	return append([]codersdk.LinkConfig{docsLink}, defaultSupportLinks...)
 }
 
diff --git a/enterprise/coderd/appearance.go b/enterprise/coderd/appearance.go
@@ -45,13 +45,15 @@ type appearanceFetcher struct {
 	database     database.Store
 	supportLinks []codersdk.LinkConfig
 	docsURL      string
+	coderVersion string
 }
 
-func newAppearanceFetcher(store database.Store, links []codersdk.LinkConfig, docsURL string) agpl.Fetcher {
+func newAppearanceFetcher(store database.Store, links []codersdk.LinkConfig, docsURL, coderVersion string) agpl.Fetcher {
 	return &appearanceFetcher{
 		database:     store,
 		supportLinks: links,
 		docsURL:      docsURL,
+		coderVersion: coderVersion,
 	}
 }
 
diff --git a/enterprise/coderd/coderd.go b/enterprise/coderd/coderd.go
@@ -12,6 +12,7 @@ import (
 	"sync"
 	"time"
 
+	"github.com/coder/coder/v2/buildinfo"
 	"github.com/coder/coder/v2/coderd/appearance"
 	"github.com/coder/coder/v2/coderd/database"
 	agplportsharing "github.com/coder/coder/v2/coderd/portsharing"
@@ -791,6 +792,7 @@ func (api *API) updateEntitlements(ctx context.Context) error {
 				api.Database,
 				api.DeploymentValues.Support.Links.Value,
 				api.DeploymentValues.DocsURL.String(),
+				buildinfo.Version(),
 			)
 			api.AGPL.AppearanceFetcher.Store(&f)
 		} else {
diff --git a/site/src/modules/dashboard/Navbar/UserDropdown/UserDropdownContent.tsx b/site/src/modules/dashboard/Navbar/UserDropdown/UserDropdownContent.tsx
@@ -181,12 +181,20 @@ const includeBuildInfo = (
   href: string,
   buildInfo?: TypesGen.BuildInfoResponse,
 ): string => {
-  return href.replace(
-    "{CODER_BUILD_INFO}",
-    `${encodeURIComponent(
-      `Version: [\`${buildInfo?.version}\`](${buildInfo?.external_url})`,
-    )}`,
-  );
+  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 = {

Original file line number	Diff line number	Diff line change
`@@ -45,13 +45,15 @@ type appearanceFetcher struct {`
`45`	`45`	`database database.Store`
`46`	`46`	`supportLinks []codersdk.LinkConfig`
`47`	`47`	`docsURL string`
	`48`	`+ coderVersion string`
`48`	`49`	`}`
`49`	`50`
`50`		`-func newAppearanceFetcher(store database.Store, links []codersdk.LinkConfig, docsURL string) agpl.Fetcher {`
	`51`	`+func newAppearanceFetcher(store database.Store, links []codersdk.LinkConfig, docsURL, coderVersion string) agpl.Fetcher {`
`51`	`52`	`return &appearanceFetcher{`
`52`	`53`	`database: store,`
`53`	`54`	`supportLinks: links,`
`54`	`55`	`docsURL: docsURL,`
	`56`	`+ coderVersion: coderVersion,`
`55`	`57`	`}`
`56`	`58`	`}`
`57`	`59`