Merge pull request #767 from Lunatic-Labs/SKIL-520

SKIL-520
Lunatic-Labs · Nov 19, 2024 · 6bf665e · 6bf665e
2 parents c5b2f6e + 3f45828
commit 6bf665e
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/FrontEndReact/src/View/Admin/View/CompleteAssessmentTask/CompleteAssessmentTask.js b/FrontEndReact/src/View/Admin/View/CompleteAssessmentTask/CompleteAssessmentTask.js
@@ -59,14 +59,18 @@ class CompleteAssessmentTask extends Component {
 
         this.handleDone = () => {
             var navbar = this.props.navbar;
-            let chosenAssessmentTask;
+            let chosenAssessmentTask = null;
 
-            if (navbar.state.chosenCompleteAssessmentTask !== null) {   
+            if (navbar.state.chosenCompleteAssessmentTask && navbar.state.chosenCompleteAssessmentTask.assessment_task_id) {   
                 chosenAssessmentTask = navbar.state.chosenCompleteAssessmentTask;
-            } else {
+            } else if(navbar.state.chosenAssessmentTask && navbar.state.chosenAssessmentTask.assessment_task_id) {
                 chosenAssessmentTask = navbar.state.chosenAssessmentTask;
             }
 
+            if(!chosenAssessmentTask) {
+                return;
+            }
+
             genericResourceGET(
                 `/completed_assessment?assessment_task_id=${chosenAssessmentTask["assessment_task_id"]}&unit=${this.state.unitOfAssessment ? "team" : "individual"}`,
                 "completed_assessments", this, {dest: "completedAssessments"}