Merge pull request #1027 from anwesha-palit-redhat/fix/SRVKP-10037

SRVKP-10037: Fixed task node status in pipeline run topology which was not updating in real time

Author: openshift-merge-bot[bot]

src/components/hooks/useTektonResults.ts

@@ -15,9 +15,6 @@ export const useTRRuns = <Kind extends K8sResourceCommon>(
   isTektonResultEnabled?: boolean,
   skipFetch?: boolean,
 ): [Kind[], boolean, Error | undefined] => {
-  if (!isTektonResultEnabled) {
-    return [[] as Kind[], true, undefined];
-  }
   const isDevConsoleProxyAvailable = useFlag(FLAGS.DEVCONSOLE_PROXY);
   const fetchedRef = useRef(false);
   const [results, setResults] = useState<[Kind[], boolean, Error | undefined]>([
@@ -52,7 +49,7 @@ export const useTRRuns = <Kind extends K8sResourceCommon>(
         }
       }
     };
-    !skipFetch && fetchResults();
+    !skipFetch && isTektonResultEnabled && fetchResults();
     return () => {
       fetchedRef.current = false;
     };
@@ -62,7 +59,10 @@ export const useTRRuns = <Kind extends K8sResourceCommon>(
     isDevConsoleProxyAvailable,
     stableOptions,
     skipFetch,
+    isTektonResultEnabled,
   ]);
-
+  if (!isTektonResultEnabled) {
+    return [[], true, undefined];
+  }
   return results;
 };

src/components/pipeline-topology/PipelineTaskNode.tsx

@@ -1,5 +1,5 @@
 import type { FunctionComponent } from 'react';
-import { useRef, useMemo, memo } from 'react';
+import { useRef, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Tooltip } from '@patternfly/react-core';
 import {
@@ -15,9 +15,9 @@ import {
   WhenDecorator,
   WithContextMenuProps,
   WithSelectionProps,
+  observer,
 } from '@patternfly/react-topology';
 import classNames from 'classnames';
-import { observer } from 'mobx-react';
 import { Link } from 'react-router';
 import { NodeType } from './const';
 import { PipelineRunModel, TaskModel } from '../../models';
@@ -223,4 +223,4 @@ const PipelineTaskNode: FunctionComponent<PipelineTaskNodeProps> = ({
   );
 };
 
-export default memo(observer(PipelineTaskNode));
+export default observer(PipelineTaskNode);

src/components/utils/__tests__/pipeline-utils.spec.ts

@@ -320,7 +320,7 @@ describe('pipeline-utils ', () => {
     const testTaskRuns = Object.keys(
       pipelineRunWithoutStatus.status.taskRuns,
     ).map((trName) => ({
-      apiVersion: 'v1alpha1',
+      apiVersion: 'v1',
       kind: 'TaskRun',
       metadata: {
         labels: {
@@ -332,15 +332,12 @@ describe('pipeline-utils ', () => {
       spec: {},
       pipelineTaskName:
         pipelineRunWithoutStatus.status.taskRuns[trName].pipelineTaskName,
-      status: pipelineRunWithoutStatus.status.taskRuns[trName].status,
+      status: _.omit(pipelineRunWithoutStatus.status.taskRuns[trName].status, [
+        'conditions',
+        'startTime',
+        'completionTime',
+      ]),
     }));
-    _.forIn(pipelineRunWithoutStatus.status.taskRuns, (taskRun, name) => {
-      pipelineRunWithoutStatus.status.taskRuns[name] = _.omit(taskRun, [
-        'status.conditions',
-        'status.startTime',
-        'status.completionTime',
-      ]);
-    });
     const taskList = appendPipelineRunStatus(
       pipeline,
       pipelineRunWithoutStatus,

src/components/utils/pipeline-utils.ts

@@ -150,14 +150,17 @@ export const appendPipelineRunStatus = (
       if (
         pipelineRun.spec.status === SucceedConditionReason.PipelineRunCancelled
       ) {
-        return _.merge(task, { status: { reason: ComputedStatus.Cancelled } });
+        return { ...task, status: { reason: ComputedStatus.Cancelled } };
       }
       if (
         pipelineRun.spec.status === SucceedConditionReason.PipelineRunPending
       ) {
-        return _.merge(task, { status: { reason: ComputedStatus.Idle } });
+        return { ...task, status: { reason: ComputedStatus.Idle } };
       }
-      return _.merge(task, { status: { reason: ComputedStatus.Failed } });
+      if (pipelineRunStatus(pipelineRun) === ComputedStatus.Failed) {
+        return { ...task, status: { reason: ComputedStatus.Failed } };
+      }
+      return { ...task, status: { reason: ComputedStatus.Pending } };
     }
 
     const taskRun = _.find(
@@ -167,16 +170,10 @@ export const appendPipelineRunStatus = (
     );
     const taskStatus: TaskRunStatus = taskRun?.status;
 
-    const mTask = _.merge(task, {
-      status: pipelineRun?.status?.taskRuns
-        ? _.get(
-            _.find(pipelineRun.status.taskRuns, {
-              pipelineTaskName: task.name,
-            }),
-            'status',
-          )
-        : taskStatus,
-    });
+    const mTask = {
+      ...task,
+      status: taskStatus ? { ...taskStatus } : undefined,
+    };
     // append task duration
     if (mTask.status && mTask.status.completionTime && mTask.status.startTime) {
       const date =
@@ -187,9 +184,9 @@ export const appendPipelineRunStatus = (
     // append task status
     if (!mTask.status) {
       mTask.status = { reason: ComputedStatus.Pending };
-    } else if (mTask.status && mTask.status.conditions) {
+    } else if (mTask.status.conditions) {
       mTask.status.reason = pipelineRunStatus(mTask) || ComputedStatus.Pending;
-    } else if (mTask.status && !mTask.status.reason) {
+    } else if (!mTask.status.reason) {
       mTask.status.reason = ComputedStatus.Pending;
     }
     return mTask;