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

Commit40dd904

Browse files
committed
refactor(site): cosmetic changes + do not use ExternalAuth on settings page
1 parent5388a1b commit40dd904

File tree

2 files changed

+52
-50
lines changed

2 files changed

+52
-50
lines changed

‎site/src/pages/UserSettingsPage/ExternalAuthPage/ExternalAuthPageView.tsx

Lines changed: 49 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ import {
2424
MoreMenuTrigger,
2525
ThreeDotsButton,
2626
}from"components/MoreMenu/MoreMenu";
27-
import{ExternalAuth}from"pages/CreateWorkspacePage/ExternalAuth";
2827
import{ExternalAuthPollingState}from"pages/CreateWorkspacePage/CreateWorkspacePage";
28+
importLoadingButtonfrom"@mui/lab/LoadingButton";
2929

3030
exporttypeExternalAuthPageViewProps={
3131
isLoading:boolean;
@@ -60,7 +60,7 @@ export const ExternalAuthPageView: FC<ExternalAuthPageViewProps> = ({
6060
<TableHead>
6161
<TableRow>
6262
<TableCell>Application</TableCell>
63-
<TableCell>Link</TableCell>
63+
<TableCell/>
6464
<TableCellwidth="1%"></TableCell>
6565
</TableRow>
6666
</TableHead>
@@ -133,57 +133,59 @@ const ExternalAuthRow: FC<ExternalAuthRowProps> = ({
133133
title={name}
134134
avatar={
135135
app.display_icon&&(
136-
<Avatarsrc={app.display_icon}variant="square"fitImage/>
136+
<Avatar
137+
src={app.display_icon}
138+
variant="square"
139+
fitImage
140+
size="sm"
141+
/>
137142
)
138143
}
139144
/>
140145
</TableCell>
141-
<TableCell>
142-
<ExternalAuth
143-
displayName={name}
144-
// We could specify the user is linked, but the link is invalid.
145-
// This could indicate it expired, or was revoked on the other end.
146-
authenticated={authenticated}
147-
authenticateURL={authURL}
148-
displayIcon=""
149-
message={authenticated ?"Authenticated" :"Click to Login"}
150-
externalAuthPollingState={externalAuthPollingState}
151-
startPollingExternalAuth={startPollingExternalAuth}
152-
fullWidth={false}
153-
/>
146+
<TableCellcss={{textAlign:"right"}}>
147+
<LoadingButton
148+
disabled={authenticated}
149+
variant="contained"
150+
loading={externalAuthPollingState==="polling"}
151+
onClick={()=>{
152+
window.open(authURL,"_blank","width=900,height=600");
153+
startPollingExternalAuth();
154+
}}
155+
>
156+
{authenticated ?"Authenticated" :"Click to Login"}
157+
</LoadingButton>
154158
</TableCell>
155159
<TableCell>
156-
{(link||externalAuth?.authenticated)&&(
157-
<MoreMenu>
158-
<MoreMenuTrigger>
159-
<ThreeDotsButton/>
160-
</MoreMenuTrigger>
161-
<MoreMenuContent>
162-
<MoreMenuItem
163-
onClick={async()=>{
164-
onValidateExternalAuth();
165-
// This is kinda jank. It does a refetch of the thing
166-
// it just validated... But we need to refetch to update the
167-
// login button. And the 'onValidateExternalAuth' does the
168-
// message display.
169-
awaitrefetch();
170-
}}
171-
>
172-
Test Validate&hellip;
173-
</MoreMenuItem>
174-
<Divider/>
175-
<MoreMenuItem
176-
danger
177-
onClick={async()=>{
178-
onUnlinkExternalAuth();
179-
awaitrefetch();
180-
}}
181-
>
182-
Unlink&hellip;
183-
</MoreMenuItem>
184-
</MoreMenuContent>
185-
</MoreMenu>
186-
)}
160+
<MoreMenu>
161+
<MoreMenuTrigger>
162+
<ThreeDotsButtonsize="small"disabled={!authenticated}/>
163+
</MoreMenuTrigger>
164+
<MoreMenuContent>
165+
<MoreMenuItem
166+
onClick={async()=>{
167+
onValidateExternalAuth();
168+
// This is kinda jank. It does a refetch of the thing
169+
// it just validated... But we need to refetch to update the
170+
// login button. And the 'onValidateExternalAuth' does the
171+
// message display.
172+
awaitrefetch();
173+
}}
174+
>
175+
Test Validate&hellip;
176+
</MoreMenuItem>
177+
<Divider/>
178+
<MoreMenuItem
179+
danger
180+
onClick={async()=>{
181+
onUnlinkExternalAuth();
182+
awaitrefetch();
183+
}}
184+
>
185+
Unlink&hellip;
186+
</MoreMenuItem>
187+
</MoreMenuContent>
188+
</MoreMenu>
187189
</TableCell>
188190
</TableRow>
189191
);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ export const Sidebar: FC<SidebarProps> = ({ user }) => {
3939
<SidebarNavItemhref="appearance"icon={AppearanceIcon}>
4040
Appearance
4141
</SidebarNavItem>
42+
<SidebarNavItemhref="external-auth"icon={GitIcon}>
43+
External Authentication
44+
</SidebarNavItem>
4245
{showSchedulePage&&(
4346
<SidebarNavItemhref="schedule"icon={ScheduleIcon}>
4447
Schedule
@@ -50,9 +53,6 @@ export const Sidebar: FC<SidebarProps> = ({ user }) => {
5053
<SidebarNavItemhref="ssh-keys"icon={FingerprintOutlinedIcon}>
5154
SSH Keys
5255
</SidebarNavItem>
53-
<SidebarNavItemhref="external-auth"icon={GitIcon}>
54-
External Authentication
55-
</SidebarNavItem>
5656
<SidebarNavItemhref="tokens"icon={VpnKeyOutlined}>
5757
Tokens
5858
</SidebarNavItem>

0 commit comments

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