Skip to content

Commit 5a7bbd3

Browse files
ParkreinerParkreiner
committed
chore: add beta badges to all org headers
1 parent fb4b734 commit 5a7bbd3

File tree

8 files changed

+37
-21
lines changed

8 files changed

+37
-21
lines changed

‎site/src/components/SettingsHeader/SettingsHeader.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export const SettingsHeader: FC<HeaderProps> = ({
2424
return (
2525
<Stack alignItems="baseline" direction="row" justifyContent="space-between">
2626
<div css={{ maxWidth: 420, marginBottom: 24 }}>
27-
<Stack direction="row" spacing={1} alignItems="center">
27+
<Stack direction="row" spacing={1.5} alignItems="center">
2828
<h1
2929
css={[
3030
{

‎site/src/modules/dashboard/Navbar/DeploymentDropdown.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import { type Interpolation, type Theme, css, useTheme } from "@emotion/react";
22
import Button from "@mui/material/Button";
33
import MenuItem from "@mui/material/MenuItem";
44
import { DropdownArrow } from "components/DropdownArrow/DropdownArrow";
5-
import { FeatureBadge } from "components/FeatureBadge/FeatureBadge";
65
import {
76
Popover,
87
PopoverContent,
@@ -110,7 +109,6 @@ const DeploymentDropdownContent: FC<DeploymentDropdownProps> = ({
110109
onClick={onPopoverClose}
111110
>
112111
Organizations
113-
<FeatureBadge type="beta" size="xs" variant="static" />
114112
</MenuItem>
115113
)}
116114
{canViewAllUsers && (

‎site/src/pages/ManagementSettingsPage/CustomRolesPage/CustomRolesPage.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import { Link as RouterLink, useParams } from "react-router-dom";
1717
import { pageTitle } from "utils/page";
1818
import { useOrganizationSettings } from "../ManagementSettingsLayout";
1919
import CustomRolesPageView from "./CustomRolesPageView";
20+
import { FeatureBadge } from "components/FeatureBadge/FeatureBadge";
2021

2122
export const CustomRolesPage: FC = () => {
2223
const queryClient = useQueryClient();
@@ -66,6 +67,7 @@ export const CustomRolesPage: FC = () => {
6667
<SettingsHeader
6768
title="Custom Roles"
6869
description="Manage custom roles for this organization."
70+
tooltip={<FeatureBadge type="beta" variant="interactive" size="lg" />}
6971
/>
7072
{permissions.assignOrgRole && isCustomRolesEnabled && (
7173
<Button component={RouterLink} startIcon={<AddIcon />} to="create">

‎site/src/pages/ManagementSettingsPage/GroupsPage/GroupsPage.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import { Navigate, Link as RouterLink, useParams } from "react-router-dom";
1717
import { pageTitle } from "utils/page";
1818
import { useOrganizationSettings } from "../ManagementSettingsLayout";
1919
import GroupsPageView from "./GroupsPageView";
20+
import { FeatureBadge } from "components/FeatureBadge/FeatureBadge";
2021

2122
export const GroupsPage: FC = () => {
2223
const feats = useFeatureVisibility();
@@ -80,6 +81,7 @@ export const GroupsPage: FC = () => {
8081
<SettingsHeader
8182
title="Groups"
8283
description="Manage groups for this organization."
84+
tooltip={<FeatureBadge type="beta" variant="interactive" size="lg" />}
8385
/>
8486
{permissions.createGroup && feats.template_rbac && (
8587
<Button component={RouterLink} startIcon={<GroupAdd />} to="create">

‎site/src/pages/ManagementSettingsPage/IdpSyncPage/IdpSyncPage.tsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import { docs } from "utils/docs";
1010
import { pageTitle } from "utils/page";
1111
import { IdpSyncHelpTooltip } from "./IdpSyncHelpTooltip";
1212
import IdpSyncPageView from "./IdpSyncPageView";
13+
import { FeatureBadge } from "components/FeatureBadge/FeatureBadge";
1314

1415
const mockOIDCConfig = {
1516
allow_signups: true,
@@ -72,7 +73,12 @@ export const IdpSyncPage: FC = () => {
7273
<SettingsHeader
7374
title="IdP Sync"
7475
description="Group and role sync mappings (configured outside Coder)."
75-
tooltip={<IdpSyncHelpTooltip />}
76+
tooltip={
77+
<>
78+
<IdpSyncHelpTooltip />
79+
<FeatureBadge type="beta" size="lg" variant="interactive" />
80+
</>
81+
}
7682
/>
7783
<Stack direction="row" spacing={2}>
7884
<Button

‎site/src/pages/ManagementSettingsPage/OrganizationMembersPageView.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import { UserGroupsCell } from "pages/UsersPage/UsersTable/UserGroupsCell";
3333
import { type FC, useState } from "react";
3434
import { TableColumnHelpTooltip } from "./UserTable/TableColumnHelpTooltip";
3535
import { UserRoleCell } from "./UserTable/UserRoleCell";
36+
import { FeatureBadge } from "components/FeatureBadge/FeatureBadge";
3637

3738
interface OrganizationMembersPageViewProps {
3839
allAvailableRoles: readonly SlimRole[] | undefined;
@@ -60,7 +61,10 @@ export const OrganizationMembersPageView: FC<
6061
> = (props) => {
6162
return (
6263
<div>
63-
<SettingsHeader title="Members" />
64+
<SettingsHeader
65+
title="Members"
66+
tooltip={<FeatureBadge type="beta" size="lg" variant="interactive" />}
67+
/>
6468

6569
<Stack>
6670
{Boolean(props.error) && <ErrorAlert error={props.error} />}

‎site/src/pages/ManagementSettingsPage/OrganizationProvisionersPageView.tsx

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import OpenInNewIcon from "@mui/icons-material/OpenInNew";
22
import Button from "@mui/material/Button";
33
import type { ProvisionerDaemon } from "api/typesGenerated";
4-
import { PageHeader, PageHeaderTitle } from "components/PageHeader/PageHeader";
4+
import { FeatureBadge } from "components/FeatureBadge/FeatureBadge";
5+
import { SettingsHeader } from "components/SettingsHeader/SettingsHeader";
56
import { Stack } from "components/Stack/Stack";
67
import { Provisioner } from "modules/provisioners/Provisioner";
78
import type { FC } from "react";
@@ -16,21 +17,24 @@ export const OrganizationProvisionersPageView: FC<
1617
> = ({ provisioners }) => {
1718
return (
1819
<div>
19-
<PageHeader
20-
// The deployment settings layout already has padding.
21-
css={{ paddingTop: 0 }}
22-
actions={
23-
<Button
24-
endIcon={<OpenInNewIcon />}
25-
target="_blank"
26-
href={docs("/admin/provisioners")}
27-
>
28-
Create a provisioner
29-
</Button>
30-
}
20+
<Stack
21+
alignItems="baseline"
22+
direction="row"
23+
justifyContent="space-between"
3124
>
32-
<PageHeaderTitle>Provisioners</PageHeaderTitle>
33-
</PageHeader>
25+
<SettingsHeader
26+
title="Provisioners"
27+
tooltip={<FeatureBadge type="beta" variant="interactive" size="lg" />}
28+
/>
29+
<Button
30+
endIcon={<OpenInNewIcon />}
31+
target="_blank"
32+
href={docs("/admin/provisioners")}
33+
>
34+
Create a provisioner
35+
</Button>
36+
</Stack>
37+
3438
<Stack spacing={4.5}>
3539
{provisioners.map((provisioner) => (
3640
<Provisioner key={provisioner.id} provisioner={provisioner} />

‎site/src/pages/ManagementSettingsPage/SidebarView.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ const OrganizationsSettingsNavigation: FC<
203203
}}
204204
>
205205
<h2 css={styles.sidebarHeader}>Organizations</h2>
206-
<FeatureBadge type="beta" variant="static" size="sm" />
206+
<FeatureBadge type="beta" variant="interactive" size="sm" />
207207
</header>
208208

209209
{permissions.createOrganization && (

0 commit comments

Comments
 (0)