Pass precheck data down tree for submission

jb3 · jb3 · commit ada271cfc6b5 · 2025-08-08T23:26:59.000+01:00
diff --git 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<HTML
 }
 
 function OAuth2Button(props: OAuth2ButtonProps): JSX.Element {
-    const [disabled, setDisabled] = useState<boolean>(false);
+    const [disabled, setDisabled] = useState<boolean>(props.disabled);
     const errorDialog: React.RefObject<HTMLDivElement> = React.useRef(null);
 
     return <span>
diff --git 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 = <OAuth2Button rerender={() => setAuth(true)} scopes={props.scopes}/>;
-        } else {
-            innerElement = <button form="form" type="submit">Submit</button>;
-        }
-        submit = <div css={styles.actionButtonStyles}>{innerElement}</div>;
+    let innerElement;
+    if (!authorized) {
+        innerElement = <OAuth2Button disabled={!props.can_submit} rerender={() => setAuth(true)} scopes={props.scopes}/>;
+    } else {
+        innerElement = <button disabled={!props.can_submit} form="form" type="submit">Submit</button>;
     }
+    let submit = <div css={styles.actionButtonStyles}>{innerElement}</div>;
 
     return (
         <div css={[styles.unselectable, styles.mainTextStyles]}>

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,8 @@ import { selectable } from "../commonStyles";`
`11`	`11`
`12`	`12`	`interface OAuth2ButtonProps {`
`13`	`13`	`scopes?: OAuthScopes[],`
`14`		`- rerender?: () => void`
	`14`	`+ rerender?: () => void,`
	`15`	`+ disabled: boolean,`
`15`	`16`	`}`
`16`	`17`
`17`	`18`	const iconStyles = css`
`@@ -68,7 +69,7 @@ async function login(props: OAuth2ButtonProps, errorDialog: React.RefObject<HTML`
`68`	`69`	`}`
`69`	`70`
`70`	`71`	`function OAuth2Button(props: OAuth2ButtonProps): JSX.Element {`
`71`		`- const [disabled, setDisabled] = useState<boolean>(false);`
	`72`	`+ const [disabled, setDisabled] = useState<boolean>(props.disabled);`
`72`	`73`	`const errorDialog: React.RefObject<HTMLDivElement> = React.useRef(null);`
`73`	`74`
`74`	`75`	`return <span>`