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

Commit8a0a73f

Browse files
committed
Simplify FC defs
1 parent6676cb3 commit8a0a73f

File tree

28 files changed

+67
-66
lines changed

28 files changed

+67
-66
lines changed

‎site/src/AppRouter.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import{useSelector}from"@xstate/react"
22
import{SetupPage}from"pages/SetupPage/SetupPage"
3-
import{FC,lazy,Suspense,useContext}from"react"
3+
import{FC,lazy,ReactNode,Suspense,useContext}from"react"
44
import{Navigate,Route,Routes}from"react-router-dom"
55
import{selectPermissions}from"xServices/auth/authSelectors"
66
import{XServiceContext}from"xServices/StateContext"
@@ -31,7 +31,7 @@ const WorkspacesPage = lazy(() => import("./pages/WorkspacesPage/WorkspacesPage"
3131
constCreateWorkspacePage=lazy(()=>import("./pages/CreateWorkspacePage/CreateWorkspacePage"))
3232
constAuditPage=lazy(()=>import("./pages/AuditPage/AuditPage"))
3333

34-
exportconstAppRouter:FC<React.PropsWithChildren<unknown>>=()=>{
34+
exportconstAppRouter:FC<{children:ReactNode}>=({ children})=>{
3535
constxServices=useContext(XServiceContext)
3636
constpermissions=useSelector(xServices.authXService,selectPermissions)
3737
return(
@@ -46,7 +46,7 @@ export const AppRouter: FC<React.PropsWithChildren<unknown>> = () => {
4646
}
4747
/>
4848

49-
<Routepath="login"element={<LoginPage/>}/>
49+
<Routepath="login"element={<LoginPage>{children}</LoginPage>}/>
5050
<Routepath="setup"element={<SetupPage/>}/>
5151
<Routepath="healthz"element={<HealthzPage/>}/>
5252
<Route

‎site/src/components/DropdownArrows/DropdownArrows.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ const useStyles = makeStyles((theme: Theme) => ({
1515
},
1616
}))
1717

18-
exportconstOpenDropdown:FC<React.PropsWithChildren<unknown>>=()=>{
18+
exportconstOpenDropdown:FC=()=>{
1919
conststyles=useStyles()
2020
return<KeyboardArrowDownclassName={styles.arrowIcon}/>
2121
}
2222

23-
exportconstCloseDropdown:FC<React.PropsWithChildren<unknown>>=()=>{
23+
exportconstCloseDropdown:FC=()=>{
2424
conststyles=useStyles()
2525
return<KeyboardArrowUpclassName={`${styles.arrowIcon}${styles.arrowIconUp}`}/>
2626
}

‎site/src/components/GlobalSnackbar/GlobalSnackbar.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ const variantFromMsgType = (type: MsgType) => {
2525
}
2626
}
2727

28-
exportconstGlobalSnackbar:React.FC<React.PropsWithChildren<unknown>>=()=>{
28+
exportconstGlobalSnackbar:React.FC=()=>{
2929
conststyles=useStyles()
3030
const[open,setOpen]=useState<boolean>(false)
3131
const[notification,setNotification]=useState<NotificationMsg>()

‎site/src/components/Loader/FullScreenLoader.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export const useStyles = makeStyles((theme) => ({
1616
},
1717
}))
1818

19-
exportconstFullScreenLoader:FC<React.PropsWithChildren<unknown>>=()=>{
19+
exportconstFullScreenLoader:FC=()=>{
2020
conststyles=useStyles()
2121

2222
return(

‎site/src/components/Navbar/Navbar.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import React, { useContext } from "react"
33
import{XServiceContext}from"../../xServices/StateContext"
44
import{NavbarView}from"../NavbarView/NavbarView"
55

6-
exportconstNavbar:React.FC<React.PropsWithChildren<unknown>>=()=>{
6+
exportconstNavbar:React.FC=()=>{
77
constxServices=useContext(XServiceContext)
88
const[authState,authSend]=useActor(xServices.authXService)
99
const{ me, permissions}=authState.context

‎site/src/components/SettingsLayout/SettingsLayout.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const menuItems = [
2020
{label:Language.sshKeysLabel,path:"/settings/ssh-keys"},
2121
]
2222

23-
exportconstSettingsLayout:FC<React.PropsWithChildren<unknown>>=()=>{
23+
exportconstSettingsLayout:FC=()=>{
2424
return(
2525
<AuthAndFrame>
2626
<Boxdisplay="flex"flexDirection="column">

‎site/src/components/SettingsSecurityForm/SettingsSecurityForm.tsx

Lines changed: 33 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -68,42 +68,40 @@ export const SecurityForm: React.FC<React.PropsWithChildren<SecurityFormProps>>
6868
<>
6969
<formonSubmit={form.handleSubmit}>
7070
<Stack>
71-
<>
72-
{updateSecurityError&&<ErrorSummaryerror={updateSecurityError}/>}
73-
<TextField
74-
{...getFieldHelpers("old_password")}
75-
onChange={onChangeTrimmed(form)}
76-
autoComplete="old_password"
77-
fullWidth
78-
label={Language.oldPasswordLabel}
79-
variant="outlined"
80-
type="password"
81-
/>
82-
<TextField
83-
{...getFieldHelpers("password")}
84-
onChange={onChangeTrimmed(form)}
85-
autoComplete="password"
86-
fullWidth
87-
label={Language.newPasswordLabel}
88-
variant="outlined"
89-
type="password"
90-
/>
91-
<TextField
92-
{...getFieldHelpers("confirm_password")}
93-
onChange={onChangeTrimmed(form)}
94-
autoComplete="confirm_password"
95-
fullWidth
96-
label={Language.confirmPasswordLabel}
97-
variant="outlined"
98-
type="password"
99-
/>
71+
{updateSecurityError ?<ErrorSummaryerror={updateSecurityError}/> :<></>}
72+
<TextField
73+
{...getFieldHelpers("old_password")}
74+
onChange={onChangeTrimmed(form)}
75+
autoComplete="old_password"
76+
fullWidth
77+
label={Language.oldPasswordLabel}
78+
variant="outlined"
79+
type="password"
80+
/>
81+
<TextField
82+
{...getFieldHelpers("password")}
83+
onChange={onChangeTrimmed(form)}
84+
autoComplete="password"
85+
fullWidth
86+
label={Language.newPasswordLabel}
87+
variant="outlined"
88+
type="password"
89+
/>
90+
<TextField
91+
{...getFieldHelpers("confirm_password")}
92+
onChange={onChangeTrimmed(form)}
93+
autoComplete="confirm_password"
94+
fullWidth
95+
label={Language.confirmPasswordLabel}
96+
variant="outlined"
97+
type="password"
98+
/>
10099

101-
<div>
102-
<LoadingButtonloading={isLoading}type="submit"variant="contained">
103-
{isLoading ?"" :Language.updatePassword}
104-
</LoadingButton>
105-
</div>
106-
</>
100+
<div>
101+
<LoadingButtonloading={isLoading}type="submit"variant="contained">
102+
{isLoading ?"" :Language.updatePassword}
103+
</LoadingButton>
104+
</div>
107105
</Stack>
108106
</form>
109107
</>

‎site/src/components/SplitButton/SplitButton.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ export const SplitButton = <T,>({
4949
options,
5050
startIcon,
5151
textTransform,
52-
}:SplitButtonProps<T>):ReturnType<React.FC<React.PropsWithChildren<unknown>>>=>{
52+
}:SplitButtonProps<T>):ReturnType<React.FC>=>{
5353
const[isPopperOpen,setIsPopperOpen]=useState<boolean>(false)
5454

5555
constanchorRef=useRef<HTMLDivElement>(null)

‎site/src/components/TableLoader/TableLoader.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import TableRow from "@material-ui/core/TableRow"
44
import{FC}from"react"
55
import{Loader}from"../Loader/Loader"
66

7-
exportconstTableLoader:FC<React.PropsWithChildren<unknown>>=()=>{
7+
exportconstTableLoader:FC=()=>{
88
conststyles=useStyles()
99

1010
return(

‎site/src/components/Tooltips/AgentHelpTooltip.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ export const Language = {
66
"The Coder agent runs inside your resource and gives you direct access to the shell via the UI or CLI.",
77
}
88

9-
exportconstAgentHelpTooltip:React.FC<React.PropsWithChildren<unknown>>=()=>{
9+
exportconstAgentHelpTooltip:React.FC=()=>{
1010
return(
1111
<HelpTooltipsize="small">
1212
<HelpTooltipTitle>{Language.agentTooltipTitle}</HelpTooltipTitle>

‎site/src/components/Tooltips/ResourcesHelpTooltip.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export const Language = {
1313
resourceTooltipLink:"Persistent and ephemeral resources",
1414
}
1515

16-
exportconstResourcesHelpTooltip:React.FC<React.PropsWithChildren<unknown>>=()=>{
16+
exportconstResourcesHelpTooltip:React.FC=()=>{
1717
return(
1818
<HelpTooltipsize="small">
1919
<HelpTooltipTitle>{Language.resourceTooltipTitle}</HelpTooltipTitle>

‎site/src/components/Tooltips/WorkspaceHelpTooltip.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ const Language = {
1616
workspaceTooltipLink3:"Editors and IDEs",
1717
}
1818

19-
exportconstWorkspaceHelpTooltip:FC<React.PropsWithChildren<unknown>>=()=>{
19+
exportconstWorkspaceHelpTooltip:FC=()=>{
2020
return(
2121
<HelpTooltip>
2222
<HelpTooltipTitle>{Language.workspaceTooltipTitle}</HelpTooltipTitle>

‎site/src/components/WorkspaceStatusBadge/WorkspaceStatusBadge.tsx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ const StatusLanguage = {
2323
queued:"Queued",
2424
}
2525

26-
constLoadingIcon:React.FC<React.PropsWithChildren<unknown>>=()=>{
26+
constLoadingIcon:React.FC=()=>{
2727
return<CircularProgresssize={10}style={{color:"#FFF"}}/>
2828
}
2929

@@ -124,7 +124,10 @@ export type WorkspaceStatusBadgeProps = {
124124
className?:string
125125
}
126126

127-
exportconstWorkspaceStatusBadge:React.FC<React.PropsWithChildren<WorkspaceStatusBadgeProps>>=({ build, className})=>{
127+
exportconstWorkspaceStatusBadge:React.FC<React.PropsWithChildren<WorkspaceStatusBadgeProps>>=({
128+
build,
129+
className,
130+
})=>{
128131
conststyles=useStyles()
129132
consttheme=useTheme()
130133
const{ text, icon, ...colorStyles}=getStatus(theme,build)

‎site/src/pages/404Page/404Page.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { makeStyles } from "@material-ui/core/styles"
22
importTypographyfrom"@material-ui/core/Typography"
33
import{FC}from"react"
44

5-
exportconstNotFoundPage:FC<React.PropsWithChildren<unknown>>=()=>{
5+
exportconstNotFoundPage:FC=()=>{
66
conststyles=useStyles()
77

88
return(

‎site/src/pages/CreateWorkspacePage/CreateWorkspacePage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { pageTitle } from "../../util/page"
77
import{createWorkspaceMachine}from"../../xServices/createWorkspace/createWorkspaceXService"
88
import{CreateWorkspaceErrors,CreateWorkspacePageView}from"./CreateWorkspacePageView"
99

10-
constCreateWorkspacePage:FC<React.PropsWithChildren<unknown>>=()=>{
10+
constCreateWorkspacePage:FC=()=>{
1111
constorganizationId=useOrganizationId()
1212
const{ template}=useParams()
1313
consttemplateName=template ?template :""

‎site/src/pages/HealthzPage/HealthzPage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ import { FC } from "react"
55
* for reporting whether or not the Dashboard is online. It should be
66
* accessible by humans and services.
77
*/
8-
exportconstHealthzPage:FC<React.PropsWithChildren<unknown>>=()=><div>ok</div>
8+
exportconstHealthzPage:FC=()=><div>ok</div>

‎site/src/pages/TemplatesPage/TemplatesPage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { XServiceContext } from "../../xServices/StateContext"
66
import{templatesMachine}from"../../xServices/templates/templatesXService"
77
import{TemplatesPageView}from"./TemplatesPageView"
88

9-
constTemplatesPage:React.FC<React.PropsWithChildren<unknown>>=()=>{
9+
constTemplatesPage:React.FC=()=>{
1010
constxServices=useContext(XServiceContext)
1111
const[authState]=useActor(xServices.authXService)
1212
const[templatesState]=useMachine(templatesMachine)

‎site/src/pages/TemplatesPage/TemplatesPageView.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ export const Language = {
5757
createdByLabel:"Created by",
5858
}
5959

60-
constTemplateHelpTooltip:React.FC<React.PropsWithChildren<unknown>>=()=>{
60+
constTemplateHelpTooltip:React.FC=()=>{
6161
return(
6262
<HelpTooltip>
6363
<HelpTooltipTitle>{Language.templateTooltipTitle}</HelpTooltipTitle>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export const Language = {
88
title:"Account",
99
}
1010

11-
exportconstAccountPage:React.FC<React.PropsWithChildren<unknown>>=()=>{
11+
exportconstAccountPage:React.FC=()=>{
1212
constxServices=useContext(XServiceContext)
1313
const[authState,authSend]=useActor(xServices.authXService)
1414
const{ me, updateProfileError}=authState.context

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export const Language = {
88
title:"Security",
99
}
1010

11-
exportconstSecurityPage:React.FC<React.PropsWithChildren<unknown>>=()=>{
11+
exportconstSecurityPage:React.FC=()=>{
1212
constxServices=useContext(XServiceContext)
1313
const[authState,authSend]=useActor(xServices.authXService)
1414
const{ me, updateSecurityError}=authState.context

‎site/src/pages/UsersPage/CreateUserPage/CreateUserPage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export const Language = {
1313
unknownError:"Oops, an unknown error occurred.",
1414
}
1515

16-
exportconstCreateUserPage:React.FC<React.PropsWithChildren<unknown>>=()=>{
16+
exportconstCreateUserPage:React.FC=()=>{
1717
constxServices=useContext(XServiceContext)
1818
constmyOrgId=useSelector(xServices.authXService,selectOrgId)
1919
const[usersState,usersSend]=useActor(xServices.usersXService)

‎site/src/pages/UsersPage/UsersPage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export const Language = {
1919
activateDialogMessagePrefix:"Do you want to activate the user",
2020
}
2121

22-
exportconstUsersPage:React.FC<React.PropsWithChildren<unknown>>=()=>{
22+
exportconstUsersPage:React.FC=()=>{
2323
constxServices=useContext(XServiceContext)
2424
const[usersState,usersSend]=useActor(xServices.usersXService)
2525
const{

‎site/src/pages/WorkspaceAppErrorPage/WorkspaceAppErrorPage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { FC, useMemo } from "react"
22
import{useParams}from"react-router-dom"
33
import{WorkspaceAppErrorPageView}from"./WorkspaceAppErrorPageView"
44

5-
constWorkspaceAppErrorView:FC<React.PropsWithChildren<unknown>>=()=>{
5+
constWorkspaceAppErrorView:FC=()=>{
66
const{ app}=useParams()
77
constmessage=useMemo(()=>{
88
consttag=document.getElementById("api-response")

‎site/src/pages/WorkspaceBuildPage/WorkspaceBuildPage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { pageTitle } from "../../util/page"
66
import{workspaceBuildMachine}from"../../xServices/workspaceBuild/workspaceBuildXService"
77
import{WorkspaceBuildPageView}from"./WorkspaceBuildPageView"
88

9-
exportconstWorkspaceBuildPage:FC<React.PropsWithChildren<unknown>>=()=>{
9+
exportconstWorkspaceBuildPage:FC=()=>{
1010
const{ username,workspace:workspaceName, buildNumber}=useParams()
1111
const[buildState]=useMachine(workspaceBuildMachine,{
1212
context:{ username, workspaceName, buildNumber,timeCursor:newDate()},

‎site/src/pages/WorkspaceBuildPage/WorkspaceBuildPageView.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export interface WorkspaceBuildPageViewProps {
1818
build:WorkspaceBuild|undefined
1919
}
2020

21-
exportconstWorkspaceBuildPageView:FC<React.PropsWithChildren<WorkspaceBuildPageViewProps>>=({ logs, build})=>{
21+
exportconstWorkspaceBuildPageView:FC<WorkspaceBuildPageViewProps>=({ logs, build})=>{
2222
return(
2323
<Margins>
2424
<PageHeader>

‎site/src/pages/WorkspacePage/WorkspacePage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import { workspaceScheduleBannerMachine } from "../../xServices/workspaceSchedul
1919

2020
dayjs.extend(minMax)
2121

22-
exportconstWorkspacePage:React.FC<React.PropsWithChildren<unknown>>=()=>{
22+
exportconstWorkspacePage:React.FC=()=>{
2323
const{username:usernameQueryParam,workspace:workspaceQueryParam}=useParams()
2424
constusername=firstOrItem(usernameQueryParam,null)
2525
constworkspaceName=firstOrItem(workspaceQueryParam,null)

‎site/src/pages/WorkspacesPage/WorkspacesPage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { pageTitle } from "util/page"
77
import{workspacesMachine}from"xServices/workspaces/workspacesXService"
88
import{WorkspacesPageView}from"./WorkspacesPageView"
99

10-
constWorkspacesPage:FC<React.PropsWithChildren<unknown>>=()=>{
10+
constWorkspacesPage:FC=()=>{
1111
const[workspacesState,send]=useMachine(workspacesMachine)
1212
const[searchParams,setSearchParams]=useSearchParams()
1313
const{ workspaceRefs}=workspacesState.context

‎site/src/pages/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import{FC}from"react"
22
import{Navigate}from"react-router-dom"
33

4-
exportconstIndexPage:FC<React.PropsWithChildren<unknown>>=()=>{
4+
exportconstIndexPage:FC=()=>{
55
return<Navigateto="/workspaces"replace/>
66
}

0 commit comments

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