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

Commit8c3a4f2

Browse files
authored
chore: move some components into pages/ (#11536)
1 parente3ad958 commit8c3a4f2

File tree

33 files changed

+167
-105
lines changed

33 files changed

+167
-105
lines changed

‎site/src/AppRouter.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
import{FC,lazy,Suspense}from"react";
1+
import{typeFC,lazy,Suspense}from"react";
22
import{
33
Route,
44
Routes,
55
BrowserRouterasRouter,
66
Navigate,
77
}from"react-router-dom";
88
import{DashboardLayout}from"./components/Dashboard/DashboardLayout";
9-
import{DeploySettingsLayout}from"./components/DeploySettingsLayout/DeploySettingsLayout";
9+
import{DeploySettingsLayout}from"./pages/DeploySettingsPage/DeploySettingsLayout";
1010
import{FullScreenLoader}from"./components/Loader/FullScreenLoader";
1111
import{RequireAuth}from"./components/RequireAuth/RequireAuth";
12-
import{UsersLayout}from"./components/UsersLayout/UsersLayout";
12+
import{UsersLayout}from"./pages/UsersPage/UsersLayout";
1313
importAuditPagefrom"./pages/AuditPage/AuditPage";
1414
importLoginPagefrom"./pages/LoginPage/LoginPage";
1515
import{SetupPage}from"./pages/SetupPage/SetupPage";
Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
importtype{Meta,StoryObj}from"@storybook/react";
2+
importdayjsfrom"dayjs";
3+
import{LastSeen}from"./LastSeen";
4+
5+
constmeta:Meta<typeofLastSeen>={
6+
title:"components/LastSeen",
7+
component:LastSeen,
8+
args:{
9+
// We typically want this component to be excluded from Chromatic's snapshots,
10+
// because it creates a lot of noise when a static dates roles over from eg.
11+
// "2 months ago" to "3 months ago", but these stories use relative dates,
12+
// and test specific cases that we want to be validated.
13+
"data-chromatic":"",
14+
},
15+
};
16+
17+
exportdefaultmeta;
18+
typeStory=StoryObj<typeofLastSeen>;
19+
20+
exportconstNow:Story={
21+
args:{
22+
at:dayjs(),
23+
},
24+
};
25+
26+
exportconstOneDayAgo:Story={
27+
args:{
28+
at:dayjs().subtract(1,"day"),
29+
},
30+
};
31+
32+
exportconstOneWeekAgo:Story={
33+
args:{
34+
at:dayjs().subtract(1,"week"),
35+
},
36+
};
37+
38+
exportconstOneMonthAgo:Story={
39+
args:{
40+
at:dayjs().subtract(1,"month"),
41+
},
42+
};
43+
44+
exportconstOneYearAgo:Story={
45+
args:{
46+
at:dayjs().subtract(1,"year"),
47+
},
48+
};
49+
50+
exportconstNever:Story={
51+
args:{
52+
at:dayjs().subtract(101,"year"),
53+
},
54+
};

‎site/src/components/LastSeen/LastSeen.tsx

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,35 @@
11
import{useTheme}from"@emotion/react";
22
importdayjsfrom"dayjs";
3+
importrelativeTimefrom"dayjs/plugin/relativeTime";
34
import{typeFC,typeHTMLAttributes}from"react";
45

5-
interfaceLastSeenPropsextendsHTMLAttributes<HTMLSpanElement>{
6-
value:string;
6+
dayjs.extend(relativeTime);
7+
8+
interfaceLastSeenProps
9+
extendsOmit<HTMLAttributes<HTMLSpanElement>,"children">{
10+
at:dayjs.ConfigType;
11+
"data-chromatic"?:string;// prevents a type error in the stories
712
}
813

9-
exportconstLastSeen:FC<LastSeenProps>=({value, ...attrs})=>{
14+
exportconstLastSeen:FC<LastSeenProps>=({at, ...attrs})=>{
1015
consttheme=useTheme();
11-
constt=dayjs(value);
16+
constt=dayjs(at);
1217
constnow=dayjs();
1318

1419
letmessage=t.fromNow();
1520
letcolor=theme.palette.text.secondary;
1621

1722
if(t.isAfter(now.subtract(1,"hour"))){
18-
color=theme.palette.success.light;
1923
// Since the agent reports on a 10m interval,
2024
// the last_used_at can be inaccurate when recent.
2125
message="Now";
26+
color=theme.experimental.roles.success.fill;
2227
}elseif(t.isAfter(now.subtract(3,"day"))){
23-
color=theme.palette.text.secondary;
28+
color=theme.experimental.l2.text;
2429
}elseif(t.isAfter(now.subtract(1,"month"))){
25-
color=theme.palette.warning.light;
30+
color=theme.experimental.roles.warning.fill;
2631
}elseif(t.isAfter(now.subtract(100,"year"))){
27-
color=theme.palette.error.light;
32+
color=theme.experimental.roles.error.fill;
2833
}else{
2934
message="Never";
3035
}

‎site/src/pages/DeploySettingsPage/AppearanceSettingsPage/AppearanceSettingsPageView.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@ import { type FC, useState } from "react";
99
import{BlockPicker}from"react-color";
1010
import{useFormik}from"formik";
1111
importtype{UpdateAppearanceConfig}from"api/typesGenerated";
12-
import{Header}from"components/DeploySettingsLayout/Header";
1312
import{
1413
Badges,
1514
DisabledBadge,
1615
EnterpriseBadge,
1716
EntitledBadge,
1817
}from"components/Badges/Badges";
19-
import{Fieldset}from"components/DeploySettingsLayout/Fieldset";
2018
import{Stack}from"components/Stack/Stack";
2119
import{getFormHelpers}from"utils/formUtils";
2220
importcolorsfrom"theme/tailwindColors";
21+
import{Header}from"../Header";
22+
import{Fieldset}from"../Fieldset";
2323

2424
exporttypeAppearanceSettingsPageViewProps={
2525
appearance:UpdateAppearanceConfig;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import{useDeploySettings}from"components/DeploySettingsLayout/DeploySettingsLayout";
2-
import{FC}from"react";
1+
import{typeFC}from"react";
32
import{Helmet}from"react-helmet-async";
43
import{pageTitle}from"utils/page";
4+
import{useDeploySettings}from"../DeploySettingsLayout";
55
import{ExternalAuthSettingsPageView}from"./ExternalAuthSettingsPageView";
66

77
constExternalAuthSettingsPage:FC=()=>{

‎site/src/pages/DeploySettingsPage/ExternalAuthSettingsPage/ExternalAuthSettingsPageView.tsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import{css}from"@emotion/react";
2+
import{typeFC}from"react";
23
importTablefrom"@mui/material/Table";
34
importTableBodyfrom"@mui/material/TableBody";
45
importTableCellfrom"@mui/material/TableCell";
@@ -8,16 +9,16 @@ import TableRow from "@mui/material/TableRow";
89
importtype{DeploymentValues,ExternalAuthConfig}from"api/typesGenerated";
910
import{Alert}from"components/Alert/Alert";
1011
import{EnterpriseBadge}from"components/Badges/Badges";
11-
import{Header}from"components/DeploySettingsLayout/Header";
12+
import{Header}from"../Header";
1213
import{docs}from"utils/docs";
1314

1415
exporttypeExternalAuthSettingsPageViewProps={
1516
config:DeploymentValues;
1617
};
1718

18-
exportconstExternalAuthSettingsPageView=({
19-
config,
20-
}:ExternalAuthSettingsPageViewProps):JSX.Element=>{
19+
exportconstExternalAuthSettingsPageView:FC<
20+
ExternalAuthSettingsPageViewProps
21+
>=({ config})=>{
2122
return(
2223
<>
2324
<Header

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { pageTitle } from "utils/page";
55
import{deploymentDAUs}from"api/queries/deployment";
66
import{entitlements}from"api/queries/entitlements";
77
import{availableExperiments}from"api/queries/experiments";
8-
import{useDeploySettings}from"components/DeploySettingsLayout/DeploySettingsLayout";
8+
import{useDeploySettings}from"../DeploySettingsLayout";
99
import{GeneralSettingsPageView}from"./GeneralSettingsPageView";
1010

1111
constGeneralSettingsPage:FC=()=>{

‎site/src/pages/DeploySettingsPage/GeneralSettingsPage/GeneralSettingsPageView.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import {
1010
ActiveUserChart,
1111
ActiveUsersTitle,
1212
}from"components/ActiveUserChart/ActiveUserChart";
13-
import{Header}from"components/DeploySettingsLayout/Header";
14-
importOptionsTablefrom"components/DeploySettingsLayout/OptionsTable";
1513
import{Stack}from"components/Stack/Stack";
14+
import{Header}from"../Header";
15+
importOptionsTablefrom"../OptionsTable";
1616
import{ChartSection}from"./ChartSection";
1717
import{useDeploymentOptions}from"utils/deployOptions";
1818
import{docs}from"utils/docs";

‎site/src/pages/DeploySettingsPage/LicensesSettingsPage/AddNewLicensePageView.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ import TextField from "@mui/material/TextField";
33
importKeyboardArrowLeftfrom"@mui/icons-material/KeyboardArrowLeft";
44
import{typeFC}from"react";
55
import{LinkasRouterLink}from"react-router-dom";
6-
import{Fieldset}from"components/DeploySettingsLayout/Fieldset";
7-
import{Header}from"components/DeploySettingsLayout/Header";
86
import{FileUpload}from"components/FileUpload/FileUpload";
97
import{displayError}from"components/GlobalSnackbar/utils";
108
import{Stack}from"components/Stack/Stack";
119
import{ErrorAlert}from"components/Alert/ErrorAlert";
12-
import{DividerWithText}from"pages/DeploySettingsPage/LicensesSettingsPage/DividerWithText";
10+
import{DividerWithText}from"./DividerWithText";
11+
import{Fieldset}from"../Fieldset";
12+
import{Header}from"../Header";
1313

1414
typeAddNewLicenseProps={
1515
onSaveLicenseKey:(license:string)=>void;

‎site/src/pages/DeploySettingsPage/LicensesSettingsPage/LicensesSettingsPageView.tsx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@ import Button from "@mui/material/Button";
33
importSkeletonfrom"@mui/material/Skeleton";
44
importAddIconfrom"@mui/icons-material/AddOutlined";
55
importRefreshIconfrom"@mui/icons-material/Refresh";
6-
importtype{GetLicensesResponse}from"api/api";
7-
import{Header}from"components/DeploySettingsLayout/Header";
8-
import{LicenseCard}from"./LicenseCard";
9-
import{Stack}from"components/Stack/Stack";
6+
importMuiLinkfrom"@mui/material/Link";
7+
importTooltipfrom"@mui/material/Tooltip";
8+
importLoadingButtonfrom"@mui/lab/LoadingButton";
109
import{typeFC}from"react";
1110
importConfettifrom"react-confetti";
1211
import{Link}from"react-router-dom";
1312
importuseWindowSizefrom"react-use/lib/useWindowSize";
14-
importMuiLinkfrom"@mui/material/Link";
15-
importTooltipfrom"@mui/material/Tooltip";
16-
importLoadingButtonfrom"@mui/lab/LoadingButton";
13+
importtype{GetLicensesResponse}from"api/api";
14+
import{Stack}from"components/Stack/Stack";
15+
import{LicenseCard}from"./LicenseCard";
16+
import{Header}from"../Header";
1717

1818
typeProps={
1919
showConfetti:boolean;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import{useDeploySettings}from"components/DeploySettingsLayout/DeploySettingsLayout";
2-
import{FC}from"react";
1+
import{typeFC}from"react";
32
import{Helmet}from"react-helmet-async";
43
import{pageTitle}from"utils/page";
4+
import{useDeploySettings}from"../DeploySettingsLayout";
55
import{NetworkSettingsPageView}from"./NetworkSettingsPageView";
66

77
constNetworkSettingsPage:FC=()=>{

‎site/src/pages/DeploySettingsPage/NetworkSettingsPage/NetworkSettingsPageView.tsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
1+
import{typeFC}from"react";
12
importtype{ClibaseOption}from"api/typesGenerated";
23
import{Badges,EnabledBadge,DisabledBadge}from"components/Badges/Badges";
3-
import{Header}from"components/DeploySettingsLayout/Header";
4-
importOptionsTablefrom"components/DeploySettingsLayout/OptionsTable";
54
import{Stack}from"components/Stack/Stack";
65
import{
76
deploymentGroupHasParent,
87
useDeploymentOptions,
98
}from"utils/deployOptions";
109
import{docs}from"utils/docs";
10+
import{Header}from"../Header";
11+
importOptionsTablefrom"../OptionsTable";
1112

1213
exporttypeNetworkSettingsPageViewProps={
1314
options:ClibaseOption[];
1415
};
1516

16-
exportconstNetworkSettingsPageView=({
17+
exportconstNetworkSettingsPageView:FC<NetworkSettingsPageViewProps>=({
1718
options:options,
18-
}:NetworkSettingsPageViewProps):JSX.Element=>(
19+
})=>(
1920
<Stackdirection="column"spacing={6}>
2021
<div>
2122
<Header

‎site/src/pages/DeploySettingsPage/OAuth2AppsSettingsPage/CreateOAuth2AppPageView.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import { type FC } from "react";
44
import{Link}from"react-router-dom";
55
importtype*asTypesGenfrom"api/typesGenerated";
66
import{ErrorAlert}from"components/Alert/ErrorAlert";
7-
import{Header}from"components/DeploySettingsLayout/Header";
87
import{Stack}from"components/Stack/Stack";
98
import{OAuth2AppForm}from"./OAuth2AppForm";
9+
import{Header}from"../Header";
1010

1111
typeCreateOAuth2AppProps={
1212
isUpdating:boolean;

‎site/src/pages/DeploySettingsPage/OAuth2AppsSettingsPage/EditOAuth2AppPageView.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ import { Alert } from "components/Alert/Alert";
1717
import{ErrorAlert}from"components/Alert/ErrorAlert";
1818
import{CodeExample}from"components/CodeExample/CodeExample";
1919
import{CopyableValue}from"components/CopyableValue/CopyableValue";
20-
import{Header}from"components/DeploySettingsLayout/Header";
2120
import{ConfirmDialog}from"components/Dialogs/ConfirmDialog/ConfirmDialog";
2221
import{DeleteDialog}from"components/Dialogs/DeleteDialog/DeleteDialog";
2322
import{Loader}from"components/Loader/Loader";
2423
import{Stack}from"components/Stack/Stack";
2524
import{TableLoader}from"components/TableLoader/TableLoader";
2625
import{createDayString}from"utils/createDayString";
2726
import{OAuth2AppForm}from"./OAuth2AppForm";
27+
import{Header}from"../Header";
2828

2929
exporttypeMutatingResource={
3030
updateApp:boolean;

‎site/src/pages/DeploySettingsPage/OAuth2AppsSettingsPage/OAuth2AppsSettingsPageView.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ import {
1919
EnterpriseBadge,
2020
EntitledBadge,
2121
}from"components/Badges/Badges";
22-
import{Header}from"components/DeploySettingsLayout/Header";
2322
import{TableLoader}from"components/TableLoader/TableLoader";
2423
import{Stack}from"components/Stack/Stack";
2524
import{useClickableTableRow}from"hooks/useClickableTableRow";
25+
import{Header}from"../Header";
2626

2727
typeOAuth2AppsSettingsProps={
2828
apps?:TypesGen.OAuth2ProviderApp[];

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import{useDashboard}from"components/Dashboard/DashboardProvider";
2-
import{useDeploySettings}from"components/DeploySettingsLayout/DeploySettingsLayout";
3-
import{FC}from"react";
1+
import{typeFC}from"react";
42
import{Helmet}from"react-helmet-async";
53
import{pageTitle}from"utils/page";
4+
import{useDashboard}from"components/Dashboard/DashboardProvider";
5+
import{useDeploySettings}from"../DeploySettingsLayout";
66
import{ObservabilitySettingsPageView}from"./ObservabilitySettingsPageView";
77

88
constObservabilitySettingsPage:FC=()=>{

‎site/src/pages/DeploySettingsPage/ObservabilitySettingsPage/ObservabilitySettingsPageView.tsx

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,25 @@
1+
import{typeFC}from"react";
12
importtype{ClibaseOption}from"api/typesGenerated";
3+
import{deploymentGroupHasParent}from"utils/deployOptions";
4+
import{docs}from"utils/docs";
25
import{
36
Badges,
47
DisabledBadge,
58
EnabledBadge,
69
EnterpriseBadge,
710
}from"components/Badges/Badges";
8-
import{Header}from"components/DeploySettingsLayout/Header";
9-
importOptionsTablefrom"components/DeploySettingsLayout/OptionsTable";
1011
import{Stack}from"components/Stack/Stack";
11-
import{deploymentGroupHasParent}from"utils/deployOptions";
12-
import{docs}from"utils/docs";
12+
import{Header}from"../Header";
13+
importOptionsTablefrom"../OptionsTable";
1314

1415
exporttypeObservabilitySettingsPageViewProps={
1516
options:ClibaseOption[];
1617
featureAuditLogEnabled:boolean;
1718
};
18-
exportconstObservabilitySettingsPageView=({
19-
options:options,
20-
featureAuditLogEnabled,
21-
}:ObservabilitySettingsPageViewProps):JSX.Element=>{
19+
20+
exportconstObservabilitySettingsPageView:FC<
21+
ObservabilitySettingsPageViewProps
22+
>=({options:options, featureAuditLogEnabled})=>{
2223
return(
2324
<>
2425
<Stackdirection="column"spacing={6}>

‎site/src/components/DeploySettingsLayout/Option.tsxrenamed to‎site/src/pages/DeploySettingsPage/Option.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import CheckCircleOutlined from "@mui/icons-material/CheckCircleOutlined";
22
import{css,useTheme}from"@emotion/react";
33
import{typeHTMLAttributes,typePropsWithChildren,typeFC}from"react";
44
import{MONOSPACE_FONT_FAMILY}from"theme/constants";
5-
import{DisabledBadge,EnabledBadge}from"../Badges/Badges";
5+
import{DisabledBadge,EnabledBadge}from"components/Badges/Badges";
66

77
exportconstOptionName:FC<PropsWithChildren>=({ children})=>{
88
return<spancss={{display:"block"}}>{children}</span>;

‎site/src/components/DeploySettingsLayout/OptionsTable.tsxrenamed to‎site/src/pages/DeploySettingsPage/OptionsTable.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {
1313
OptionDescription,
1414
OptionName,
1515
OptionValue,
16-
}from"components/DeploySettingsLayout/Option";
16+
}from"./Option";
1717
import{optionValue}from"./optionValue";
1818

1919
interfaceOptionsTableProps{

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import{useDashboard}from"components/Dashboard/DashboardProvider";
2-
import{useDeploySettings}from"components/DeploySettingsLayout/DeploySettingsLayout";
3-
import{FC}from"react";
1+
import{typeFC}from"react";
42
import{Helmet}from"react-helmet-async";
53
import{pageTitle}from"utils/page";
4+
import{useDashboard}from"components/Dashboard/DashboardProvider";
65
import{SecuritySettingsPageView}from"./SecuritySettingsPageView";
6+
import{useDeploySettings}from"../DeploySettingsLayout";
77

88
constSecuritySettingsPage:FC=()=>{
99
const{deploymentValues:deploymentValues}=useDeploySettings();

0 commit comments

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