Skip to content

Commit

Permalink
Merge pull request #430 from Appelsiini1/bug-421
Browse files Browse the repository at this point in the history
Prevent navigation to main menu if theres an error in assignment input
  • Loading branch information
RSaarivuoriLUT authored Jan 10, 2025
2 parents c874fac + d6007d4 commit b77f446
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
6 changes: 3 additions & 3 deletions src/mainHelpers/fileOperations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -503,9 +503,9 @@ async function _handleAddOrUpdateAssignmentFS(
if (!oldAssignment) {
// if saving new assignment, throw error if
// identically named one exists
if (await assignmentExistsDB(assignment?.title, coursePath)) {
throw new Error("ui_assignment_error_duplicate_title");
}
// if (await assignmentExistsDB(assignment?.title, coursePath)) {
// throw new Error("ui_assignment_error_duplicate_title");
// }

_createAssignmentFolderFS(assignment, assignmentDataPath, assignmentHash);
hashFolderPath = path.join(assignmentDataPath, assignmentHash);
Expand Down
6 changes: 5 additions & 1 deletion src/routes/AssignmentInput.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,10 @@ export default function AssignmentInput() {
if (assignment.level === null && activeCourse?.levels !== null) {
assignmentToSave.level = 0;
}
if (!assignment.title) {
handleSnackbar({ error: parseUICode("ui_add_assignment_title") });
return;
}

if (checkSpecial(assignment.title)) {
handleSnackbar({ error: parseUICode("error_special_in_title") });
Expand All @@ -193,7 +197,7 @@ export default function AssignmentInput() {
snackbarSeverity = "error";
}
handleSnackbar({ [snackbarSeverity]: parseUICode(snackbarText) });
navigate(-1);
if (snackbarSeverity !== "error") navigate(-1);
}
}

Expand Down

0 comments on commit b77f446

Please sign in to comment.