coder · mtojek · Oct 22, 2025 · Oct 16, 2025 · Oct 16, 2025 · Oct 16, 2025
diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go
diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json
diff --git a/codersdk/deployment.go b/codersdk/deployment.go
@@ -983,9 +983,10 @@ func DefaultSupportLinks(docsURL string) []LinkConfig {
 			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:     "Join the Coder Discord",
+			Target:   "https://discord.gg/coder",
+			Icon:     "chat",
+			Location: "navbar",
 		},
 		{
 			Name:   "Star the Repo",
@@ -3325,7 +3326,9 @@ type SupportConfig struct {
 type LinkConfig struct {
 	Name   string `json:"name" yaml:"name"`
 	Target string `json:"target" yaml:"target"`
-	Icon   string `json:"icon" yaml:"icon" enums:"bug,chat,docs"`
+	Icon   string `json:"icon" yaml:"icon" enums:"bug,chat,docs,star"`
+
+	Location string `json:"location,omitempty" yaml:"location,omitempty" enums:"navbar,dropdown"`
 }
 
 // Validate checks cross-field constraints for deployment values.

diff --git a/docs/reference/api/enterprise.md b/docs/reference/api/enterprise.md
diff --git a/docs/reference/api/general.md b/docs/reference/api/general.md
diff --git a/docs/reference/api/schemas.md b/docs/reference/api/schemas.md
diff --git a/enterprise/coderd/appearance_test.go b/enterprise/coderd/appearance_test.go
@@ -201,6 +201,17 @@ func TestCustomSupportLinks(t *testing.T) {
 			Target: "http://second-link-2",
 			Icon:   "bug",
 		},
+		{
+			Name:     "First button",
+			Target:   "http://first-button-1",
+			Icon:     "bug",
+			Location: "navbar",
+		},
+		{
+			Name:   "Third link",
+			Target: "http://third-link-3",
+			Icon:   "star",
+		},
 	}
 	cfg := coderdtest.DeploymentValues(t)
 	cfg.Support.Links = serpent.Struct[[]codersdk.LinkConfig]{

diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts
diff --git a/site/src/modules/dashboard/Navbar/Navbar.tsx b/site/src/modules/dashboard/Navbar/Navbar.tsx
@@ -1,4 +1,5 @@
 import { buildInfo } from "api/queries/buildInfo";
+import type { LinkConfig } from "api/typesGenerated";
 import { useProxy } from "contexts/ProxyContext";
 import { useAuthenticated } from "hooks";
 import { useEmbeddedMetadata } from "hooks/useEmbeddedMetadata";
@@ -25,12 +26,18 @@ export const Navbar: FC = () => {
 	const canViewConnectionLog =
 		featureVisibility.connection_log && permissions.viewAnyConnectionLog;
 
+	const uniqueLinks = new Map<string, LinkConfig>();
+	for (const link of appearance.support_links ?? []) {
+		if (!uniqueLinks.has(link.name)) {
+			uniqueLinks.set(link.name, link);
+		}
+	}
 	return (
 		<NavbarView
 			user={me}
 			logo_url={appearance.logo_url}
 			buildInfo={buildInfoQuery.data}
-			supportLinks={appearance.support_links}
+			supportLinks={Array.from(uniqueLinks.values())}
 			onSignOut={signOut}
 			canViewDeployment={canViewDeployment}
 			canViewOrganizations={canViewOrganizations}

diff --git a/site/src/modules/dashboard/Navbar/NavbarView.stories.tsx b/site/src/modules/dashboard/Navbar/NavbarView.stories.tsx
@@ -33,6 +33,7 @@ const meta: Meta<typeof NavbarView> = {
 		canViewDeployment: true,
 		canViewHealth: true,
 		canViewOrganizations: true,
+		supportLinks: [],
 	},
 	decorators: [withDashboardProvider],
 };
@@ -129,3 +130,64 @@ export const IdleTasks: Story = {
 		],
 	},
 };
+
+export const SupportLinks: Story = {
+	args: {
+		user: MockUserMember,
+		canViewAuditLog: false,
+		canViewDeployment: false,
+		canViewHealth: false,
+		canViewOrganizations: false,
+		supportLinks: [
+			{
+				name: "This is a bug",
+				icon: "bug",
+				target: "#",
+			},
+			{
+				name: "This is a star",
+				icon: "star",
+				target: "#",
+				location: "navbar",
+			},
+			{
+				name: "This is a chat",
+				icon: "chat",
+				target: "#",
+				location: "navbar",
+			},
+			{
+				name: "No icon here",
+				icon: "",
+				target: "#",
+				location: "navbar",
+			},
+			{
+				name: "No icon here too",
+				icon: "",
+				target: "#",
+			},
+		],
+	},
+};
+
+export const DefaultSupportLinks: Story = {
+	args: {
+		user: MockUserMember,
+		canViewAuditLog: false,
+		canViewDeployment: false,
+		canViewHealth: false,
+		canViewOrganizations: false,
+		supportLinks: [
+			{ icon: "docs", name: "Documentation", target: "" },
+			{ icon: "bug", name: "Report a bug", target: "" },
+			{
+				icon: "chat",
+				name: "Join the Coder Discord",
+				target: "",
+				location: "navbar",
+			},
+			{ icon: "star", name: "Star the Repo", target: "" },
+		],
+	},
+};
diff --git a/site/src/modules/dashboard/Navbar/NavbarView.test.tsx b/site/src/modules/dashboard/Navbar/NavbarView.test.tsx
@@ -34,6 +34,7 @@ describe("NavbarView", () => {
 				canViewHealth
 				canViewAuditLog
 				canViewConnectionLog
+				supportLinks={[]}
 			/>,
 		);
 		const workspacesLink =
@@ -52,6 +53,7 @@ describe("NavbarView", () => {
 				canViewHealth
 				canViewAuditLog
 				canViewConnectionLog
+				supportLinks={[]}
 			/>,
 		);
 		const templatesLink =
@@ -70,6 +72,7 @@ describe("NavbarView", () => {
 				canViewHealth
 				canViewAuditLog
 				canViewConnectionLog
+				supportLinks={[]}
 			/>,
 		);
 		const deploymentMenu = await screen.findByText("Admin settings");
@@ -89,6 +92,7 @@ describe("NavbarView", () => {
 				canViewHealth
 				canViewAuditLog
 				canViewConnectionLog
+				supportLinks={[]}
 			/>,
 		);
 		const deploymentMenu = await screen.findByText("Admin settings");

diff --git a/site/src/modules/dashboard/Navbar/NavbarView.tsx b/site/src/modules/dashboard/Navbar/NavbarView.tsx
@@ -21,13 +21,14 @@ import { cn } from "utils/cn";
 import { DeploymentDropdown } from "./DeploymentDropdown";
 import { MobileMenu } from "./MobileMenu";
 import { ProxyMenu } from "./ProxyMenu";
+import { SupportIcon } from "./SupportIcon";
 import { UserDropdown } from "./UserDropdown/UserDropdown";
 
 interface NavbarViewProps {
 	logo_url?: string;
 	user: TypesGen.User;
 	buildInfo?: TypesGen.BuildInfoResponse;
-	supportLinks?: readonly TypesGen.LinkConfig[];
+	supportLinks: readonly TypesGen.LinkConfig[];
 	onSignOut: () => void;
 	canViewDeployment: boolean;
 	canViewOrganizations: boolean;
@@ -71,6 +72,16 @@ export const NavbarView: FC<NavbarViewProps> = ({
 			<NavItems className="ml-4" user={user} />
 
 			<div className="flex items-center gap-3 ml-auto">
+				{supportLinks.filter(isNavbarLink).map((link) => (
+					<div key={link.name} className="hidden md:block">
+						<SupportButton
+							name={link.name}
+							target={link.target}
+							icon={link.icon}
+						/>
+					</div>
+				))}
+
 				{proxyContextValue && (
 					<div className="hidden md:block">
 						<ProxyMenu proxyContextValue={proxyContextValue} />
@@ -121,7 +132,7 @@ export const NavbarView: FC<NavbarViewProps> = ({
 					<UserDropdown
 						user={user}
 						buildInfo={buildInfo}
-						supportLinks={supportLinks}
+						supportLinks={supportLinks?.filter((link) => !isNavbarLink(link))}
 						onSignOut={onSignOut}
 					/>
 				</div>
@@ -240,3 +251,36 @@ const TasksNavItem: FC<TasksNavItemProps> = ({ user }) => {
 function idleTasksLabel(count: number) {
 	return `You have ${count} ${count === 1 ? "task" : "tasks"} waiting for input`;
 }
+
+function isNavbarLink(link: TypesGen.LinkConfig): boolean {
+	return link.location === "navbar";
+}
+
+interface SupportButtonProps {
+	name: string;
+	target: string;
+	icon: string;
+	location?: string;
+}
+
+const SupportButton: FC<SupportButtonProps> = ({ name, target, icon }) => {
+	return (
+		<Button asChild variant="outline">
+			<a
+				href={target}
+				target="_blank"
+				rel="noreferrer"
+				className="inline-block"
+			>
+				{icon && (
+					<SupportIcon
+						icon={icon}
+						className={"size-5 text-content-secondary"}
+					/>
+				)}
+				{name}
+				<span className="sr-only"> (link opens in new tab)</span>
+			</a>
+		</Button>
+	);
+};