diff --git a/spiffworkflow-frontend/src/routes/AdminRoutes.tsx b/spiffworkflow-frontend/src/routes/AdminRoutes.tsx index 6291ef37..96293ee7 100644 --- a/spiffworkflow-frontend/src/routes/AdminRoutes.tsx +++ b/spiffworkflow-frontend/src/routes/AdminRoutes.tsx @@ -65,7 +65,7 @@ export default function AdminRoutes() { element={} /> } /> } /> } /> } /> } /> } /> diff --git a/spiffworkflow-frontend/src/routes/ProcessInstanceLogList.tsx b/spiffworkflow-frontend/src/routes/ProcessInstanceLogList.tsx index ad43ee5b..fe8f4453 100644 --- a/spiffworkflow-frontend/src/routes/ProcessInstanceLogList.tsx +++ b/spiffworkflow-frontend/src/routes/ProcessInstanceLogList.tsx @@ -27,7 +27,7 @@ export default function ProcessInstanceLogList() { }; const { page, perPage } = getPageInfoFromSearchParams(searchParams); HttpService.makeCallToBackend({ - path: `/process-models/${modifiedProcessModelId}/process-instances/${params.process_instance_id}/logs?per_page=${perPage}&page=${page}`, + path: `/process-instances/${params.process_instance_id}/logs?per_page=${perPage}&page=${page}`, successCallback: setProcessInstanceLogListFromResult, }); }, [searchParams, params]); @@ -36,6 +36,7 @@ export default function ProcessInstanceLogList() { // return null; const rows = processInstanceLogs.map((row) => { const rowToUse = row as any; + console.log(`rowToUse: ${rowToUse}`); return ( {rowToUse.bpmn_process_identifier} @@ -87,7 +88,7 @@ export default function ProcessInstanceLogList() { perPage={perPage} pagination={pagination} tableToDisplay={buildTable()} - path={`/admin/process-models/${modifiedProcessModelId}/process-instances/${params.process_instance_id}/logs`} + path={`/admin/process-instances/${params.process_instance_id}/logs`} /> ); diff --git a/spiffworkflow-frontend/src/routes/ProcessInstanceShow.tsx b/spiffworkflow-frontend/src/routes/ProcessInstanceShow.tsx index 815f5723..e0a9682e 100644 --- a/spiffworkflow-frontend/src/routes/ProcessInstanceShow.tsx +++ b/spiffworkflow-frontend/src/routes/ProcessInstanceShow.tsx @@ -26,13 +26,17 @@ export default function ProcessInstanceShow() { const setErrorMessage = (useContext as any)(ErrorContext)[1]; - const modifiedProcessModelId = modifyProcessModelPath( + const unModifiedProcessModelId = unModifyProcessModelPath( `${params.process_model_id}` ); + const modifiedProcessModelId = params.process_model_id + + console.log(`params.process_model_id: ${params.process_model_id}`); + console.log(`modifiedProcessModelId: ${modifiedProcessModelId}`); const navigateToProcessInstances = (_result: any) => { navigate( - `/admin/process-instances?process_group_identifier=${params.process_group_id}&process_model_identifier=${params.process_model_id}` + `/admin/process-instances?process_model_identifier=${unModifiedProcessModelId}` ); }; @@ -55,7 +59,7 @@ export default function ProcessInstanceShow() { const deleteProcessInstance = () => { HttpService.makeCallToBackend({ - path: `/process-models/${modifiedProcessModelId}/process-instances/${params.process_instance_id}`, + path: `/process-instances/${params.process_instance_id}`, successCallback: navigateToProcessInstances, httpMethod: 'DELETE', }); @@ -68,7 +72,7 @@ export default function ProcessInstanceShow() { const terminateProcessInstance = () => { HttpService.makeCallToBackend({ - path: `/process-models/${modifiedProcessModelId}/process-instances/${params.process_instance_id}/terminate`, + path: `/process-instances/${params.process_instance_id}/terminate`, successCallback: refreshPage, httpMethod: 'POST', }); @@ -76,7 +80,7 @@ export default function ProcessInstanceShow() { const suspendProcessInstance = () => { HttpService.makeCallToBackend({ - path: `/process-models/${modifiedProcessModelId}/process-instances/${params.process_instance_id}/suspend`, + path: `/process-instances/${params.process_instance_id}/suspend`, successCallback: refreshPage, httpMethod: 'POST', }); @@ -84,7 +88,7 @@ export default function ProcessInstanceShow() { const resumeProcessInstance = () => { HttpService.makeCallToBackend({ - path: `/process-models/${modifiedProcessModelId}/process-instances/${params.process_instance_id}/resume`, + path: `/process-instances/${params.process_instance_id}/resume`, successCallback: refreshPage, httpMethod: 'POST', }); @@ -133,7 +137,7 @@ export default function ProcessInstanceShow() { Messages