feat(orchestrator): use assessment process id as bk for next workflows (

janus-idp#70)
jkilzi · Jan 16, 2024 · ceb13e0 · ceb13e0
1 parent f7acf2f
commit ceb13e0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 12 deletions.
diff --git a/plugins/orchestrator/src/components/ExecuteWorkflowPage/ExecuteWorkflowPage.tsx b/plugins/orchestrator/src/components/ExecuteWorkflowPage/ExecuteWorkflowPage.tsx
@@ -15,9 +15,7 @@ import validator from '@rjsf/validator-ajv8';
 import { JSONSchema7 } from 'json-schema';
 
 import {
-  getWorkflowCategory,
   WORKFLOW_TITLE,
-  WorkflowCategory,
   WorkflowDataInputSchemaResponse,
 } from '@janus-idp/backstage-plugin-orchestrator-common';
 
@@ -78,13 +76,8 @@ export const ExecuteWorkflowPage = (props: ExecuteWorkflowPageProps) => {
     }
 
     setLoading(true);
-    const workflowCategory = getWorkflowCategory(
-      schemaResponse?.workflowItem.definition,
-    );
-    if (workflowCategory === WorkflowCategory.ASSESSMENT) {
-      Object.assign(parameters, { businessKey: crypto.randomUUID() });
-    } else {
-      Object.assign(parameters, { businessKey: businessKey ?? '' });
+    if (businessKey !== undefined) {
+      Object.assign(parameters, { businessKey: businessKey });
     }
     const response = await orchestratorApi.executeWorkflow({
       workflowId,

diff --git a/plugins/orchestrator/src/components/WorkflownstancesViewerPage/AssessmentResultViewer.tsx b/plugins/orchestrator/src/components/WorkflownstancesViewerPage/AssessmentResultViewer.tsx
@@ -62,7 +62,7 @@ export const AssessmentResultViewer = (props: AssessmentResultViewerProps) => {
           <Link
             href={executeWorkflowLink({
               workflowId: workflowOption.id,
-              businessKey: selectedInstance?.businessKey ?? '',
+              businessKey: selectedInstance?.id ?? '',
             })}
           >
             {workflowOption.name}
@@ -79,7 +79,7 @@ export const AssessmentResultViewer = (props: AssessmentResultViewerProps) => {
           <Link
             href={executeWorkflowLink({
               workflowId: workflowOption.id,
-              businessKey: selectedInstance?.businessKey ?? '',
+              businessKey: selectedInstance?.id ?? '',
             })}
           >
             {workflowOption.name}

diff --git a/plugins/orchestrator/src/components/WorkflownstancesViewerPage/ProcessInstancesTable.tsx b/plugins/orchestrator/src/components/WorkflownstancesViewerPage/ProcessInstancesTable.tsx
@@ -74,7 +74,7 @@ export const ProcessInstancesTable = (props: ProcessInstancesTableProps) => {
           return {
             pid: pi.id,
             name: pi.processId,
-            businessKey: pi.businessKey?.substring(0, 8),
+            businessKey: pi.businessKey?.substring(0, 8) ?? '-',
             state: pi.state,
           };
         })