return the process instance when interstitial process is complete and… (#421)

* return the process instance when interstitial process is complete and favor redirecting to it on the frontend

* upgrade certifi for snyk check

---------

Co-authored-by: jasquat <jasquat@users.noreply.github.com>
This commit is contained in:
jasquat 2023-07-28 11:04:39 -04:00 committed by GitHub
parent 7fcd3030c3
commit 719901729a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 4 deletions

View File

@ -183,13 +183,13 @@ files = [
[[package]]
name = "certifi"
version = "2022.12.7"
version = "2023.7.22"
description = "Python package for providing Mozilla's CA Bundle."
optional = false
python-versions = ">=3.6"
files = [
{file = "certifi-2022.12.7-py3-none-any.whl", hash = "sha256:4ad3232f5e926d6718ec31cfc1fcadfde020920e278684144551c91769c7bc18"},
{file = "certifi-2022.12.7.tar.gz", hash = "sha256:35824b4c3a97115964b408844d64aa14db1cc518f6562e8d7261699d1350a9e3"},
{file = "certifi-2023.7.22-py3-none-any.whl", hash = "sha256:92d6037539857d8206b8f6ae472e8b77db8058fec5937a1ef3f54304089edbb9"},
{file = "certifi-2023.7.22.tar.gz", hash = "sha256:539cc1d13202e33ca466e88b2807e29f4c13049d6d87031a3c110744495cb082"},
]
[[package]]

View File

@ -490,6 +490,7 @@ def _interstitial_stream(
return
# return if process instance is now complete and let the frontend redirect to show page
if process_instance.status not in ProcessInstanceModel.active_statuses():
yield _render_data("unrunnable_instance", process_instance)
return
# path used by the interstitial page while executing tasks - ie the background processor is not executing them

View File

@ -227,7 +227,12 @@ export default function ProcessInterstitial({
/** In the event there is no task information and the connection closed,
* redirect to the home page. */
if (state === 'CLOSED' && lastTask === null && allowRedirect) {
navigate(`/tasks`);
// Favor redirecting to the process instance show page
if (processInstance) {
navigate(processInstanceShowPageUrl);
} else {
navigate(`/tasks`);
}
}
let displayableData = data;