merged in main and resolved conflicts w/ burnettk

spiffworkflow-backend/src/spiffworkflow_backend/services/task_service.py

@@ -21,6 +21,7 @@ from spiffworkflow_backend.models.bpmn_process import BpmnProcessModel
 from spiffworkflow_backend.models.bpmn_process import BpmnProcessNotFoundError
 from spiffworkflow_backend.models.bpmn_process_definition import BpmnProcessDefinitionModel
 from spiffworkflow_backend.models.db import db
+from spiffworkflow_backend.models.human_task import HumanTaskModel
 from spiffworkflow_backend.models.json_data import JsonDataDict
 from spiffworkflow_backend.models.json_data import JsonDataModel
 from spiffworkflow_backend.models.process_instance import ProcessInstanceModel
@@ -454,15 +455,14 @@ class TaskService:
             self.task_models[task_model.guid] = task_model
 
     def update_all_tasks_from_spiff_tasks(
-        self,
-        spiff_tasks: list[SpiffTask],
-        deleted_spiff_tasks: list[SpiffTask],
-        start_time: float
+        self, spiff_tasks: list[SpiffTask], deleted_spiff_tasks: list[SpiffTask], start_time: float
     ) -> None:
         # Remove all the deleted/pruned tasks from the database.
         deleted_task_ids = list(map(lambda t: str(t.id), deleted_spiff_tasks))
         tasks_to_clear = TaskModel.query.filter(TaskModel.guid.in_(deleted_task_ids)).all()  # type: ignore
-        human_tasks_to_clear = HumanTaskModel.query.filter(HumanTaskModel.task_id.in_(deleted_task_ids)).all()  # type: ignore
+        human_tasks_to_clear = HumanTaskModel.query.filter(
+            HumanTaskModel.task_id.in_(deleted_task_ids)  # type: ignore
+        ).all()
         for task in tasks_to_clear + human_tasks_to_clear:
             db.session.delete(task)
 

spiffworkflow-frontend/src/routes/TaskShow.tsx

@@ -176,8 +176,10 @@ export default function TaskShow() {
     if (disabled) {
       return;
     }
-    if (!formObject) {
+    const dataToSubmit = formObject?.formData;
+    if (!dataToSubmit) {
       navigate(`/tasks`);
+      return;
     }
     let queryParams = '';
     if (submitType === FormSubmitType.Draft) {
@@ -185,7 +187,6 @@ export default function TaskShow() {
     }
     setDisabled(true);
     removeError();
-    const dataToSubmit = formObject.formData;
     delete dataToSubmit.isManualTask;
     HttpService.makeCallToBackend({
       path: `/tasks/${params.process_instance_id}/${params.task_id}${queryParams}`,