Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit0107ad1

Browse files
committed
Remove experiment reference & show beta badge in frontend
Signed-off-by: Danny Kopping <danny@coder.com>
1 parent7c571ae commit0107ad1

File tree

6 files changed

+38
-23
lines changed

6 files changed

+38
-23
lines changed

‎site/src/components/FeatureStageBadge/FeatureStageBadge.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { docs } from "utils/docs";
1010
* All types of feature that we are currently supporting. Defined as record to
1111
* ensure that we can't accidentally make typos when writing the badge text.
1212
*/
13-
constfeatureStageBadgeTypes={
13+
exportconstfeatureStageBadgeTypes={
1414
beta:"beta",
1515
experimental:"experimental",
1616
}asconstsatisfiesRecord<string,ReactNode>;

‎site/src/pages/DeploySettingsPage/NotificationsPage/NotificationsPage.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ export const NotificationsPage: FC = () => {
4343
title="Notifications"
4444
description="Control delivery methods for notifications on this deployment."
4545
layout="fluid"
46+
featureStage={"beta"}
4647
>
4748
<Tabsactive={tab}>
4849
<TabsList>

‎site/src/pages/DeploySettingsPage/Sidebar.tsx

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import {
1414
}from"components/Sidebar/Sidebar";
1515
import{useDashboard}from"modules/dashboard/useDashboard";
1616
importtype{FC}from"react";
17+
import{FeatureStageBadge}from"components/FeatureStageBadge/FeatureStageBadge";
1718

1819
exportconstSidebar:FC=()=>{
1920
const{ experiments}=useDashboard();
@@ -51,11 +52,9 @@ export const Sidebar: FC = () => {
5152
<SidebarNavItemhref="observability"icon={InsertChartIcon}>
5253
Observability
5354
</SidebarNavItem>
54-
{experiments.includes("notifications")&&(
55-
<SidebarNavItemhref="notifications"icon={NotificationsIcon}>
56-
Notifications
57-
</SidebarNavItem>
58-
)}
55+
<SidebarNavItemhref="notifications"icon={NotificationsIcon}>
56+
Notifications<FeatureStageBadgecontentType="beta"size="sm"/>
57+
</SidebarNavItem>
5958
</BaseSidebar>
6059
);
6160
};

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,11 +148,12 @@ const DeploymentSettingsNavigation: FC<DeploymentSettingsNavigationProps> = ({
148148
Users
149149
</SidebarNavSubItem>
150150
)}
151-
{experiments.includes("notifications")&&(
151+
<Stackdirection={"row"}alignItems={"center"}css={{gap:0}}>
152152
<SidebarNavSubItemhref="notifications">
153153
Notifications
154154
</SidebarNavSubItem>
155-
)}
155+
<FeatureStageBadgecontentType="beta"size="sm"/>
156+
</Stack>
156157
</Stack>
157158
)}
158159
</div>

‎site/src/pages/UserSettingsPage/Section.tsx

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
importtype{Interpolation,Theme}from"@emotion/react";
2+
import{
3+
FeatureStageBadge,
4+
typefeatureStageBadgeTypes,
5+
}from"components/FeatureStageBadge/FeatureStageBadge";
6+
import{Stack}from"components/Stack/Stack";
27
importtype{FC,ReactNode}from"react";
38

49
typeSectionLayout="fixed"|"fluid";
@@ -13,6 +18,7 @@ export interface SectionProps {
1318
layout?:SectionLayout;
1419
className?:string;
1520
children?:ReactNode;
21+
featureStage?:keyoftypeoffeatureStageBadgeTypes;
1622
}
1723

1824
exportconstSection:FC<SectionProps>=({
@@ -24,6 +30,7 @@ export const Section: FC<SectionProps> = ({
2430
className="",
2531
children,
2632
layout="fixed",
33+
featureStage,
2734
})=>{
2835
return(
2936
<sectionclassName={className}id={id}data-testid={id}>
@@ -32,16 +39,25 @@ export const Section: FC<SectionProps> = ({
3239
<divcss={styles.header}>
3340
<div>
3441
{title&&(
35-
<h4
36-
css={{
37-
fontSize:24,
38-
fontWeight:500,
39-
margin:0,
40-
marginBottom:8,
41-
}}
42-
>
43-
{title}
44-
</h4>
42+
<Stackdirection={"row"}alignItems="center">
43+
<h4
44+
css={{
45+
fontSize:24,
46+
fontWeight:500,
47+
margin:0,
48+
marginBottom:8,
49+
}}
50+
>
51+
{title}
52+
</h4>
53+
{featureStage&&(
54+
<FeatureStageBadge
55+
contentType={featureStage}
56+
size="lg"
57+
css={{marginBottom:"5px"}}
58+
/>
59+
)}
60+
</Stack>
4561
)}
4662
{description&&typeofdescription==="string"&&(
4763
<pcss={styles.description}>{description}</p>

‎site/src/pages/UserSettingsPage/Sidebar.tsx

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,9 @@ export const Sidebar: FC<SidebarProps> = ({ user }) => {
5757
<SidebarNavItemhref="tokens"icon={VpnKeyOutlined}>
5858
Tokens
5959
</SidebarNavItem>
60-
{experiments.includes("notifications")&&(
61-
<SidebarNavItemhref="notifications"icon={NotificationsIcon}>
62-
Notifications
63-
</SidebarNavItem>
64-
)}
60+
<SidebarNavItemhref="notifications"icon={NotificationsIcon}>
61+
Notifications
62+
</SidebarNavItem>
6563
</BaseSidebar>
6664
);
6765
};

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp