From ada271cfc6b569d115322536555e936f5aa98aee Mon Sep 17 00:00:00 2001 From: Joe Banks Date: Fri, 8 Aug 2025 23:26:59 +0100 Subject: Pass precheck data down tree for submission --- src/components/OAuth2Button.tsx | 5 +++-- src/pages/FormPage/Navigation.tsx | 17 +++++++---------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/components/OAuth2Button.tsx b/src/components/OAuth2Button.tsx index 5e980b7..1658d42 100644 --- a/src/components/OAuth2Button.tsx +++ b/src/components/OAuth2Button.tsx @@ -11,7 +11,8 @@ import { selectable } from "../commonStyles"; interface OAuth2ButtonProps { scopes?: OAuthScopes[], - rerender?: () => void + rerender?: () => void, + disabled: boolean, } const iconStyles = css` @@ -68,7 +69,7 @@ async function login(props: OAuth2ButtonProps, errorDialog: React.RefObject(false); + const [disabled, setDisabled] = useState(props.disabled); const errorDialog: React.RefObject = React.useRef(null); return diff --git a/src/pages/FormPage/Navigation.tsx b/src/pages/FormPage/Navigation.tsx index 20c7dce..c5dfa4a 100644 --- a/src/pages/FormPage/Navigation.tsx +++ b/src/pages/FormPage/Navigation.tsx @@ -9,7 +9,7 @@ import OAuth2Button from "../../components/OAuth2Button"; interface NavigationProps { - form_state: boolean, // Whether the form is open or not + can_submit: boolean, scopes: OAuthScopes[] } @@ -18,16 +18,13 @@ export default function Navigation(props: NavigationProps): JSX.Element { props.scopes.includes(OAuthScopes.Identify) && !checkScopes(props.scopes) )); - let submit = null; - if (props.form_state) { - let innerElement; - if (!authorized) { - innerElement = setAuth(true)} scopes={props.scopes}/>; - } else { - innerElement = ; - } - submit =
{innerElement}
; + let innerElement; + if (!authorized) { + innerElement = setAuth(true)} scopes={props.scopes}/>; + } else { + innerElement = ; } + let submit =
{innerElement}
; return (
-- cgit v1.2.3