Merge remote-tracking branch 'origin/main' into gamma-project

FRINXio · Oct 18, 2021 · 1e54184 · 1e54184
2 parents 3f7e2a4 + 66eb8e6
commit 1e54184
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/packages/frinx-dashboard/src/api/uniflow/uniflow-api.ts b/packages/frinx-dashboard/src/api/uniflow/uniflow-api.ts
@@ -178,7 +178,7 @@ export async function getWorkflowExecutionsHierarchical(
 
 // TODO: needs rework in uniflow-api
 // Get detail of existing instance of workflow
-export async function getWorkflowInstanceDetail(workflowId: number): Promise<unknown> {
+export async function getWorkflowInstanceDetail(workflowId: string): Promise<unknown> {
   const workflowDetails = sendGetRequest(`/id/${workflowId}`);
 
   return workflowDetails;

diff --git a/...nx-workflow-ui/src/pages/workflow-list/workflow-execution/details-modal/details-modal.tsx b/...nx-workflow-ui/src/pages/workflow-list/workflow-execution/details-modal/details-modal.tsx
@@ -127,8 +127,7 @@ const DetailsModal: FC<Props> = ({ wfId, modalHandler, onWorkflowIdClick, refres
 
   const getData = () => {
     const getWorkflowInstanceDetail = callbackUtils.getWorkflowInstanceDetailCallback();
-
-    getWorkflowInstanceDetail(+wfId).then((res: any) => {
+    getWorkflowInstanceDetail(wfId).then((res: any) => {
       const inputCaptureRegex = /workflow\.input\.([a-zA-Z0-9-_]+)\}/gim;
       const def = JSON.stringify(res);
       let match = inputCaptureRegex.exec(def);

diff --git a/packages/frinx-workflow-ui/src/utils/callback-utils.ts b/packages/frinx-workflow-ui/src/utils/callback-utils.ts
@@ -16,7 +16,7 @@ export type Callbacks = {
   deleteTaskDefinition: (name: string) => Promise<TaskDefinition>;
   registerTaskDefinition: (taskDefinition: TaskDefinition) => Promise<TaskDefinition>;
   getWorkflowExecutions: (query?: string, start?: number, size?: string) => Promise<unknown>;
-  getWorkflowInstanceDetail: (workflowId: number) => Promise<unknown>;
+  getWorkflowInstanceDetail: (workflowId: string) => Promise<unknown>;
   executeWorkflow: (workflowPayload: WorkflowPayload) => Promise<WorkflowPayload>;
   getWorkflowExecutionsHierarchical: (query?: string, start?: number, size?: string) => Promise<unknown>;
   terminateWorkflows: (workflowIds: string[]) => Promise<string[]>;
@@ -49,7 +49,7 @@ class CallbackUtils {
   private deleteTaskDefinition: ((name: string) => Promise<TaskDefinition>) | null = null;
   private registerTaskDefinition: ((taskDefinition: TaskDefinition) => Promise<TaskDefinition>) | null = null;
   private getWorkflowExecutions: ((query?: string, start?: number, size?: string) => Promise<unknown>) | null = null;
-  private getWorkflowInstanceDetail: ((workflowId: number) => Promise<unknown>) | null = null;
+  private getWorkflowInstanceDetail: ((workflowId: string) => Promise<unknown>) | null = null;
   private executeWorkflow: ((workflowPayload: WorkflowPayload) => Promise<WorkflowPayload>) | null = null;
   private getWorkflowExecutionsHierarchical:
     | ((query?: string, start?: number, size?: string) => Promise<unknown>)