From 3473cf7cfea7cca022db6eec91fe1a30310d2e8f Mon Sep 17 00:00:00 2001 From: Dan Date: Wed, 26 Apr 2023 16:38:30 -0400 Subject: [PATCH] randome critical code that I missed during last resolve of conflicts. --- .../src/spiffworkflow_backend/routes/tasks_controller.py | 1 + .../services/workflow_execution_service.py | 5 +++-- .../src/components/ProcessInstanceListTable.tsx | 6 ++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/routes/tasks_controller.py b/spiffworkflow-backend/src/spiffworkflow_backend/routes/tasks_controller.py index 2d30d093..963064d7 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/routes/tasks_controller.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/routes/tasks_controller.py @@ -424,6 +424,7 @@ def _interstitial_stream(process_instance: ProcessInstanceModel) -> Generator[st return processor.bpmn_process_instance.refresh_waiting_tasks() ready_engine_task_count = get_ready_engine_step_count(processor.bpmn_process_instance) + tasks = get_reportable_tasks() if ready_engine_task_count == 0: break # No more tasks to report diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/services/workflow_execution_service.py b/spiffworkflow-backend/src/spiffworkflow_backend/services/workflow_execution_service.py index 3058457d..a4760b24 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/services/workflow_execution_service.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/services/workflow_execution_service.py @@ -319,7 +319,9 @@ class RunUntilUserTaskOrMessageExecutionStrategy(ExecutionStrategy): engine_steps = self.get_ready_engine_steps(bpmn_process_instance) while engine_steps and should_continue: for task in engine_steps: - if hasattr(task.task_spec, "extensions") and task.task_spec.extensions.get("instructionsForEndUser", None): + if hasattr(task.task_spec, "extensions") and task.task_spec.extensions.get( + "instructionsForEndUser", None + ): should_continue = False break self.delegate.will_complete_task(task) @@ -330,7 +332,6 @@ class RunUntilUserTaskOrMessageExecutionStrategy(ExecutionStrategy): self.delegate.after_engine_steps(bpmn_process_instance) - class OneAtATimeExecutionStrategy(ExecutionStrategy): """When you want to run only one engine step at a time.""" diff --git a/spiffworkflow-frontend/src/components/ProcessInstanceListTable.tsx b/spiffworkflow-frontend/src/components/ProcessInstanceListTable.tsx index c67f5248..778c1713 100644 --- a/spiffworkflow-frontend/src/components/ProcessInstanceListTable.tsx +++ b/spiffworkflow-frontend/src/components/ProcessInstanceListTable.tsx @@ -1449,10 +1449,12 @@ export default function ProcessInstanceListTable({ buttonElement = ( ); currentRow.push({buttonElement});