sartography/spiff-arena
1
0
Fork 0
mirror of https://github.com/sartography/spiff-arena.git synced 2025-01-11 18:14:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #291 from sartography/feature/fix_process_instance_terminate

Browse Source 
allow not redirecting to home page at all in interstitial component a…
This commit is contained in:
Dan Funk 2023-05-31 10:31:32 -04:00 committed by GitHub
commit 5d19d7cd61
4 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
spiffworkflow-backend/src/spiffworkflow_backend/routes/tasks_controller.py
View File

@ -430,20 +430,21 @@ def _interstitial_stream(process_instance: ProcessInstanceModel) -> Generator[st
break # No more tasks to report break # No more tasks to report
spiff_task = processor.next_task() spiff_task = processor.next_task()
task = ProcessInstanceService.spiff_task_to_api_task(processor, processor.next_task()) if spiff_task is not None:
if task.id not in reported_ids: task = ProcessInstanceService.spiff_task_to_api_task(processor, spiff_task)
try: if task.id not in reported_ids:
instructions = render_instructions(spiff_task) try:
except Exception as e: instructions = render_instructions(spiff_task)
api_error = ApiError( except Exception as e:
error_code="engine_steps_error", api_error = ApiError(
message=f"Failed to complete an automated task. Error was: {str(e)}", error_code="engine_steps_error",
status_code=400, message=f"Failed to complete an automated task. Error was: {str(e)}",
) status_code=400,
yield render_data("error", api_error) )
raise e yield render_data("error", api_error)
task.properties = {"instructionsForEndUser": instructions} raise e
yield render_data("task", task) task.properties = {"instructionsForEndUser": instructions}
yield render_data("task", task)
def get_ready_engine_step_count(bpmn_process_instance: BpmnWorkflow) -> int: def get_ready_engine_step_count(bpmn_process_instance: BpmnWorkflow) -> int:

1
spiffworkflow-backend/src/spiffworkflow_backend/services/process_instance_service.py
View File

@ -514,7 +514,6 @@ class ProcessInstanceService:
add_docs_and_forms: bool = False, add_docs_and_forms: bool = False,
calling_subprocess_task_id: str | None = None, calling_subprocess_task_id: str | None = None,
) -> Task: ) -> Task:
"""Spiff_task_to_api_task."""
task_type = spiff_task.task_spec.description task_type = spiff_task.task_spec.description
props = {} props = {}

2
spiffworkflow-frontend/src/components/ProcessInstanceListTable.tsx
View File

@ -490,6 +490,7 @@ export default function ProcessInstanceListTable({
HttpService.makeCallToBackend({ HttpService.makeCallToBackend({
path: `/process-instances/report-metadata${queryParamString}`, path: `/process-instances/report-metadata${queryParamString}`,
successCallback: getProcessInstances, successCallback: getProcessInstances,
onUnauthorized: stopRefreshing,
}); });
} else { } else {
getProcessInstances(); getProcessInstances();
@ -542,6 +543,7 @@ export default function ProcessInstanceListTable({
permissionsLoaded, permissionsLoaded,
reportIdentifier, reportIdentifier,
searchParams, searchParams,
stopRefreshing,
]); ]);
const processInstanceReportSaveTag = () => { const processInstanceReportSaveTag = () => {

3
spiffworkflow-frontend/src/components/ProcessInterstitial.tsx
View File

@ -49,7 +49,6 @@ export default function ProcessInterstitial({
} }
}, },
onclose() { onclose() {
console.log('The state is closed.');
setState('CLOSED'); setState('CLOSED');
}, },
}); });
@ -161,7 +160,7 @@ export default function ProcessInterstitial({
/** In the event there is no task information and the connection closed, /** In the event there is no task information and the connection closed,
* redirect to the home page. */ * redirect to the home page. */
if (state === 'CLOSED' && lastTask === null) { if (state === 'CLOSED' && lastTask === null && allowRedirect) {
navigate(`/tasks`); navigate(`/tasks`);
} }