Use step name and task id to identify active task (#136)

Netflix · Mar 5, 2024 · 67589f3 · 67589f3
1 parent c1defd2
commit 67589f3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/pages/Task/components/TaskList.tsx b/src/pages/Task/components/TaskList.tsx
@@ -21,7 +21,7 @@ type Props = {
   rows: Row[];
   rowDataDispatch: (action: RowDataAction) => void;
   taskStatus: AsyncStatus;
-  activeTaskId: string;
+  activeTask: string;
   results: SearchResultModel;
   grouped: boolean;
   paramsString?: string;
@@ -31,7 +31,7 @@ const TaskList: React.FC<Props> = ({
   rows,
   rowDataDispatch,
   taskStatus,
-  activeTaskId,
+  activeTask,
   results,
   grouped,
   paramsString,
@@ -76,12 +76,12 @@ const TaskList: React.FC<Props> = ({
               ? () => (item.data ? rowDataDispatch({ type: 'toggle', id: item.data.step_name }) : null)
               : undefined
           }
-          active={item.type === 'task' && getTaskId(item.data[0]) === activeTaskId}
+          active={item.type === 'task' && item.data[0].step_name + '/' + getTaskId(item.data[0]) === activeTask}
           isOpen={item.type === 'step' && item.rowObject.isOpen}
         />
       );
     },
-    [activeTaskId, grouped, paramsString, rowDataDispatch, rows],
+    [activeTask, grouped, paramsString, rowDataDispatch, rows],
   );
 
   return (

diff --git a/src/pages/Task/index.tsx b/src/pages/Task/index.tsx
@@ -296,7 +296,7 @@ const Task: React.FC<TaskViewProps> = ({
           rows={rows}
           rowDataDispatch={rowDataDispatch}
           taskStatus={taskStatus}
-          activeTaskId={taskId}
+          activeTask={stepName + '/' + taskId}
           results={searchField.results}
           grouped={settings.group}
           paramsString={paramsString}