feat(orchestrator): add ability to re-trigger workflow in error state (…

…#1624) * Add ability to retrigger workflow in error state * fix unnecessary assertion issue
janus-idp · May 9, 2024 · 8709a37 · 8709a37
1 parent d30c141
commit 8709a37
Show file tree

Hide file tree

Showing 3 changed files with 66 additions and 14 deletions.
diff --git a/plugins/orchestrator-common/src/QueryParams.ts b/plugins/orchestrator-common/src/QueryParams.ts
@@ -1,5 +1,6 @@
 export const QUERY_PARAM_BUSINESS_KEY = 'businessKey' as const;
 export const QUERY_PARAM_INSTANCE_ID = 'instanceId' as const;
+export const QUERY_PARAM_INSTANCE_STATE = 'state';
 export const QUERY_PARAM_INCLUDE_ASSESSMENT = 'includeAssessment' as const;
 export const QUERY_PARAM_ASSESSMENT_INSTANCE_ID =
   'assessmentInstanceId' as const;
diff --git a/plugins/orchestrator/src/components/ExecuteWorkflowPage/ExecuteWorkflowPage.tsx b/plugins/orchestrator/src/components/ExecuteWorkflowPage/ExecuteWorkflowPage.tsx
@@ -20,6 +20,7 @@ import { Grid } from '@material-ui/core';
 import {
   QUERY_PARAM_ASSESSMENT_INSTANCE_ID,
   QUERY_PARAM_INSTANCE_ID,
+  QUERY_PARAM_INSTANCE_STATE,
   WorkflowInputSchemaResponse,
 } from '@janus-idp/backstage-plugin-orchestrator-common';
 
@@ -42,6 +43,9 @@ export const ExecuteWorkflowPage = () => {
   const [assessmentInstanceId] = useQueryParamState<string>(
     QUERY_PARAM_ASSESSMENT_INSTANCE_ID,
   );
+  const [instanceState] = useQueryParamState<string>(
+    QUERY_PARAM_INSTANCE_STATE,
+  );
   const navigate = useNavigate();
   const instanceLink = useRouteRef(workflowInstanceRouteRef);
   const {
@@ -85,6 +89,39 @@ export const ExecuteWorkflowPage = () => {
     [orchestratorApi, workflowId, navigate, instanceLink, assessmentInstanceId],
   );
 
+  const isErrorState = React.useMemo(
+    () => instanceState === 'ERROR',
+    [instanceState],
+  );
+
+  const handleRetrigger = useCallback(
+    async (getParameters: () => JsonObject) => {
+      setUpdateError(undefined);
+      let parameters: JsonObject = {};
+      try {
+        parameters = getParameters();
+      } catch (err) {
+        setUpdateError(getErrorObject(err));
+        return;
+      }
+      if (instanceId) {
+        try {
+          setIsExecuting(true);
+          const response = await orchestratorApi.retriggerInstanceInError({
+            instanceId,
+            inputData: parameters,
+          });
+          navigate(instanceLink({ instanceId: response.id }));
+        } catch (err) {
+          setUpdateError(getErrorObject(err));
+        } finally {
+          setIsExecuting(false);
+        }
+      }
+    },
+    [orchestratorApi, instanceId, navigate, instanceLink],
+  );
+
   const onReset = useCallback(() => {
     setUpdateError(undefined);
   }, [setUpdateError]);
@@ -128,13 +165,13 @@ export const ExecuteWorkflowPage = () => {
               <StepperForm
                 steps={schemaResponse.schemaSteps}
                 isComposedSchema={schemaResponse.isComposedSchema}
-                handleExecute={handleExecute}
+                handleExecute={isErrorState ? handleRetrigger : handleExecute}
                 isExecuting={isExecuting}
                 onReset={onReset}
               />
             ) : (
               <JsonTextAreaForm
-                handleExecute={handleExecute}
+                handleExecute={isErrorState ? handleRetrigger : handleExecute}
                 isExecuting={isExecuting}
               />
             )}

diff --git a/plugins/orchestrator/src/components/WorkflowInstancePage.tsx b/plugins/orchestrator/src/components/WorkflowInstancePage.tsx
@@ -18,6 +18,7 @@ import {
   AssessedProcessInstance,
   QUERY_PARAM_ASSESSMENT_INSTANCE_ID,
   QUERY_PARAM_INSTANCE_ID,
+  QUERY_PARAM_INSTANCE_STATE,
 } from '@janus-idp/backstage-plugin-orchestrator-common';
 
 import { orchestratorApiRef } from '../api';
@@ -154,6 +155,7 @@ export const WorkflowInstancePage = ({
     const urlToNavigate = buildUrl(routeUrl, {
       [QUERY_PARAM_INSTANCE_ID]: value.instance.id,
       [QUERY_PARAM_ASSESSMENT_INSTANCE_ID]: value.assessedBy?.id,
+      [QUERY_PARAM_INSTANCE_STATE]: value.instance.state,
     });
     navigate(urlToNavigate);
   }, [value, navigate, executeWorkflowLink]);
@@ -196,18 +198,30 @@ export const WorkflowInstancePage = ({
             />
             <Grid container item justifyContent="flex-end" spacing={1}>
               {!canRerun && (
-                <Grid item>
-                  <Button
-                    variant="contained"
-                    color="secondary"
-                    disabled={!canAbort}
-                    onClick={
-                      canAbort ? toggleAbortConfirmationDialog : undefined
-                    }
-                  >
-                    Abort
-                  </Button>
-                </Grid>
+                <>
+                  <Grid item>
+                    <Button
+                      variant="contained"
+                      color="primary"
+                      disabled={!canAbort}
+                      onClick={canAbort ? handleRerun : undefined}
+                    >
+                      Retrigger
+                    </Button>
+                  </Grid>
+                  <Grid item>
+                    <Button
+                      variant="contained"
+                      color="secondary"
+                      disabled={!canAbort}
+                      onClick={
+                        canAbort ? toggleAbortConfirmationDialog : undefined
+                      }
+                    >
+                      Abort
+                    </Button>
+                  </Grid>
+                </>
               )}
               {!canAbort && (
                 <Grid item>