From 40dd9048fc5da3808b9a93daa77411effcdb5f7b Mon Sep 17 00:00:00 2001 From: BrunoQuaresma Date: Mon, 22 Jan 2024 17:21:20 +0000 Subject: [PATCH 1/2] refactor(site): cosmetic changes + do not use ExternalAuth on settings page --- .../ExternalAuthPage/ExternalAuthPageView.tsx | 96 ++++++++++--------- site/src/pages/UserSettingsPage/Sidebar.tsx | 6 +- 2 files changed, 52 insertions(+), 50 deletions(-) diff --git a/site/src/pages/UserSettingsPage/ExternalAuthPage/ExternalAuthPageView.tsx b/site/src/pages/UserSettingsPage/ExternalAuthPage/ExternalAuthPageView.tsx index 98f6400ea78eb..a470f89ae5083 100644 --- a/site/src/pages/UserSettingsPage/ExternalAuthPage/ExternalAuthPageView.tsx +++ b/site/src/pages/UserSettingsPage/ExternalAuthPage/ExternalAuthPageView.tsx @@ -24,8 +24,8 @@ import { MoreMenuTrigger, ThreeDotsButton, } from "components/MoreMenu/MoreMenu"; -import { ExternalAuth } from "pages/CreateWorkspacePage/ExternalAuth"; import { ExternalAuthPollingState } from "pages/CreateWorkspacePage/CreateWorkspacePage"; +import LoadingButton from "@mui/lab/LoadingButton"; export type ExternalAuthPageViewProps = { isLoading: boolean; @@ -60,7 +60,7 @@ export const ExternalAuthPageView: FC = ({ Application - Link + @@ -133,57 +133,59 @@ const ExternalAuthRow: FC = ({ title={name} avatar={ app.display_icon && ( - + ) } /> - - + + { + window.open(authURL, "_blank", "width=900,height=600"); + startPollingExternalAuth(); + }} + > + {authenticated ? "Authenticated" : "Click to Login"} + - {(link || externalAuth?.authenticated) && ( - - - - - - { - onValidateExternalAuth(); - // This is kinda jank. It does a refetch of the thing - // it just validated... But we need to refetch to update the - // login button. And the 'onValidateExternalAuth' does the - // message display. - await refetch(); - }} - > - Test Validate… - - - { - onUnlinkExternalAuth(); - await refetch(); - }} - > - Unlink… - - - - )} + + + + + + { + onValidateExternalAuth(); + // This is kinda jank. It does a refetch of the thing + // it just validated... But we need to refetch to update the + // login button. And the 'onValidateExternalAuth' does the + // message display. + await refetch(); + }} + > + Test Validate… + + + { + onUnlinkExternalAuth(); + await refetch(); + }} + > + Unlink… + + + ); diff --git a/site/src/pages/UserSettingsPage/Sidebar.tsx b/site/src/pages/UserSettingsPage/Sidebar.tsx index a67d7b2bed171..aac09221e1cf8 100644 --- a/site/src/pages/UserSettingsPage/Sidebar.tsx +++ b/site/src/pages/UserSettingsPage/Sidebar.tsx @@ -39,6 +39,9 @@ export const Sidebar: FC = ({ user }) => { Appearance + + External Authentication + {showSchedulePage && ( Schedule @@ -50,9 +53,6 @@ export const Sidebar: FC = ({ user }) => { SSH Keys - - External Authentication - Tokens From 0d10b07a6d007ffe23558155fa3ca79e912e5402 Mon Sep 17 00:00:00 2001 From: BrunoQuaresma Date: Mon, 22 Jan 2024 18:30:10 +0000 Subject: [PATCH 2/2] Fix accessibility --- .../ExternalAuthPage/ExternalAuthPageView.tsx | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/site/src/pages/UserSettingsPage/ExternalAuthPage/ExternalAuthPageView.tsx b/site/src/pages/UserSettingsPage/ExternalAuthPage/ExternalAuthPageView.tsx index a470f89ae5083..a009d56c01522 100644 --- a/site/src/pages/UserSettingsPage/ExternalAuthPage/ExternalAuthPageView.tsx +++ b/site/src/pages/UserSettingsPage/ExternalAuthPage/ExternalAuthPageView.tsx @@ -26,6 +26,7 @@ import { } from "components/MoreMenu/MoreMenu"; import { ExternalAuthPollingState } from "pages/CreateWorkspacePage/CreateWorkspacePage"; import LoadingButton from "@mui/lab/LoadingButton"; +import visuallyHidden from "@mui/utils/visuallyHidden"; export type ExternalAuthPageViewProps = { isLoading: boolean; @@ -60,8 +61,12 @@ export const ExternalAuthPageView: FC = ({ Application - - + + + Link to connect + + +