Skip to content

Commit

Permalink
DEVPROD-11734: Use task execution in waterfall links (#460)
Browse files Browse the repository at this point in the history
  • Loading branch information
sophstad authored Oct 24, 2024
1 parent 123db34 commit 20ece52
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
2 changes: 2 additions & 0 deletions apps/spruce/src/gql/generated/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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"];
};
Expand Down Expand Up @@ -9611,6 +9612,7 @@ export type WaterfallQuery = {
tasks: Array<{
__typename?: "WaterfallTask";
displayName: string;
execution: number;
id: string;
status: string;
}>;
Expand Down
1 change: 1 addition & 0 deletions apps/spruce/src/gql/queries/waterfall.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ query Waterfall($options: WaterfallOptions!) {
id
tasks {
displayName
execution
id
status
}
Expand Down
4 changes: 2 additions & 2 deletions apps/spruce/src/pages/waterfall/BuildRow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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 })}
/>
);
})}
Expand Down

0 comments on commit 20ece52

Please sign in to comment.