Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Error handling on start & invalid page entry handling #34

Merged
merged 1 commit into from
Sep 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Client/src/components/Form/Dropdown/Dropdown.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ export function Dropdown(props: DropdownProps): React.ReactElement {
className="dropdown-root"
onChange={handleDropdownChanged}
name={props.name}
value={props.value}
>
{props.options.map((option) => (
<option
key={option.value}
value={option.value}
selected={option.value === props.value}
>
{option.label}
</option>
Expand Down
15 changes: 15 additions & 0 deletions Client/src/components/Form/ErrorAlert/ErrorAlert.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
@import "../../../variables.scss";

.error-alert-root {
background-color: $error-color;
color: white;
padding: 10px;
border-radius: 5px;
margin-top: 20px;
margin-bottom: 20px;
text-align: center;
}

.error-alert-bold {
font-weight: 500;
}
22 changes: 22 additions & 0 deletions Client/src/components/Form/ErrorAlert/ErrorAlert.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import React from 'react';
import "./ErrorAlert.scss";

export type ErrorAlertProps = {
message?: string | null;
}

export function ErrorAlert(props: ErrorAlertProps): React.ReactElement | null {
const ref = React.useRef<HTMLDivElement>(null);

React.useEffect(() => {
ref.current?.focus();
}, [props.message])

if (!props.message) {
return null;
}

return <div className="error-alert-root focusable" tabIndex={-1} ref={ref}>
<span className="error-alert-bold">Error! </span>
{props.message}</div>
}
1 change: 1 addition & 0 deletions Client/src/components/Form/ErrorAlert/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './ErrorAlert';
5 changes: 4 additions & 1 deletion Client/src/hooks/useCareerGame.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,17 @@ export function useCareerGame() {
);

if (response.ok && response.data) {
if (response.data.round?.options?.length === 0)
throw new Error("InvalidCareerChoice");

setGameId(response.data.conversationId)
addRound({
...response.data.round,
optionSelected: null,
});
}
} catch (error: any) {
console.log(error)
throw new Error("FailedToStartGame")
} finally {
setLoading(false);
}
Expand Down
1 change: 1 addition & 0 deletions Client/src/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ button,
input,
select,
textarea,
.focusable,
#main {
&:focus {
outline: 2px dashed $background-dark;
Expand Down
10 changes: 8 additions & 2 deletions Client/src/screens/GameScreen/GameScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,17 @@ export function GameScreen(): React.ReactElement {
} = React.useContext<IAppContext>(AppContext);
const round = rounds[selectedRound];

React.useEffect(() => {
if (!isLoading && !gameId) {
navigate("/");
}
}, [gameId, navigate, isLoading]);

const handlePreviousRoundButtonClicked = () => {
selectRound(selectedRound - 1);
};

const handleNextRoundbuttonClicked = () => {
const handleNextRoundButtonClicked = () => {
selectRound(selectedRound + 1);
};

Expand Down Expand Up @@ -86,7 +92,7 @@ export function GameScreen(): React.ReactElement {

{isRoundCompleted && (
<DefaultButton
onClick={handleNextRoundbuttonClicked}
onClick={handleNextRoundButtonClicked}
title="Go to next round"
label="Next round"
/>
Expand Down
12 changes: 10 additions & 2 deletions Client/src/screens/StartScreen/StartScreen.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React from "react";
import { ErrorAlert } from "../../components/Form/ErrorAlert";
import { useCareerGame } from "../../hooks/useCareerGame";
import { IAppContext } from "../../models/IAppContext";
import { AppContext } from "../../context/AppContext";
Expand All @@ -18,10 +19,15 @@ export function StartScreen(): React.ReactElement {
React.useContext<IAppContext>(AppContext);
const [title, setTitle] = React.useState<string>("");
const navigate = useNavigate();
const [error, setError] = React.useState<string | null>(null);

const handleStartButtonClicked = async (): Promise<void> => {
await startGame(title);
navigate(`/career-game`);
try {
await startGame(title);
navigate(`/career-game`);
} catch {
setError("Please try again with a valid career choice.");
}
};

React.useEffect(() => {
Expand All @@ -38,6 +44,8 @@ export function StartScreen(): React.ReactElement {
<H1>Welcome!</H1>
<H1>What career would you like to explore?</H1>

<ErrorAlert message={error} />

<TextField
label="Career"
name="title"
Expand Down
1 change: 1 addition & 0 deletions Client/src/variables.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Primary colors
$primary-color: #1F76A7;
$default-color: white;
$error-color: #d32f2f;

// Light theme colors
$background-light: white;
Expand Down
Loading