From d6007d448029767a811994a1432172537046ada2 Mon Sep 17 00:00:00 2001 From: RSaarivuoriLUT <167883444+RSaarivuoriLUT@users.noreply.github.com> Date: Fri, 10 Jan 2025 14:32:30 +0200 Subject: [PATCH] Prevent nav to main if error in assig input --- src/mainHelpers/fileOperations.ts | 6 +++--- src/routes/AssignmentInput.tsx | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/mainHelpers/fileOperations.ts b/src/mainHelpers/fileOperations.ts index c05c9a6..517bc63 100644 --- a/src/mainHelpers/fileOperations.ts +++ b/src/mainHelpers/fileOperations.ts @@ -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); diff --git a/src/routes/AssignmentInput.tsx b/src/routes/AssignmentInput.tsx index 0650a90..367fbc1 100644 --- a/src/routes/AssignmentInput.tsx +++ b/src/routes/AssignmentInput.tsx @@ -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") }); @@ -193,7 +197,7 @@ export default function AssignmentInput() { snackbarSeverity = "error"; } handleSnackbar({ [snackbarSeverity]: parseUICode(snackbarText) }); - navigate(-1); + if (snackbarSeverity !== "error") navigate(-1); } }