diff --git a/apps/spruce/src/gql/generated/types.ts b/apps/spruce/src/gql/generated/types.ts index 876d84fb9..5c8b8fbc8 100644 --- a/apps/spruce/src/gql/generated/types.ts +++ b/apps/spruce/src/gql/generated/types.ts @@ -3497,6 +3497,7 @@ export type WaterfallOptions = { export type WaterfallTask = { __typename?: "WaterfallTask"; displayName: Scalars["String"]["output"]; + execution: Scalars["Int"]["output"]; id: Scalars["String"]["output"]; status: Scalars["String"]["output"]; }; @@ -9611,6 +9612,7 @@ export type WaterfallQuery = { tasks: Array<{ __typename?: "WaterfallTask"; displayName: string; + execution: number; id: string; status: string; }>; diff --git a/apps/spruce/src/gql/queries/waterfall.graphql b/apps/spruce/src/gql/queries/waterfall.graphql index d0c4f02e9..3c9f9fb0c 100644 --- a/apps/spruce/src/gql/queries/waterfall.graphql +++ b/apps/spruce/src/gql/queries/waterfall.graphql @@ -9,6 +9,7 @@ query Waterfall($options: WaterfallOptions!) { id tasks { displayName + execution id status } diff --git a/apps/spruce/src/pages/waterfall/BuildRow.tsx b/apps/spruce/src/pages/waterfall/BuildRow.tsx index f64a29bde..a88a94555 100644 --- a/apps/spruce/src/pages/waterfall/BuildRow.tsx +++ b/apps/spruce/src/pages/waterfall/BuildRow.tsx @@ -96,7 +96,7 @@ const BuildGrid: React.FC<{ ); }} > - {build.tasks.map(({ displayName, id, status }) => { + {build.tasks.map(({ displayName, execution, id, status }) => { // If the entire build is inactive, use inactive status for all tasks const taskStatus = build.activated ? (status as TaskStatus) @@ -106,7 +106,7 @@ const BuildGrid: React.FC<{ key={id} data-tooltip={`${displayName} - ${taskStatusToCopy[taskStatus]}`} status={taskStatus} - to={getTaskRoute(id)} // TODO DEVPROD-11734: use execution in task route + to={getTaskRoute(id, { execution })} /> ); })}