Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(core): Stop grouping groups with only one stage #4332

Merged
merged 1 commit into from
Oct 25, 2017
Merged

fix(core): Stop grouping groups with only one stage #4332

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 26 additions & 21 deletions app/scripts/modules/core/src/delivery/service/executions.transformer.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,28 +391,33 @@ export class ExecutionsTransformerService {
return groupedStages;
}, [] as IExecutionStageSummary[]);

stageSummaries.forEach((summary) => {
if (summary.type === 'group' && summary.groupStages.length > 1) {
const subComments: string[] = [];
// Find the earliest startTime and latest endTime
summary.groupStages.forEach((subStage) => {
if (subStage.comments) { subComments.push(subStage.comments); }
});

// Assuming the last stage in the group has the "output" stages
summary.after = summary.groupStages[summary.groupStages.length - 1].after;

const currentStage = this.getCurrentStage(summary.groupStages);
summary.activeStageType = currentStage.type;
summary.status = currentStage.status;
this.styleStage(summary, currentStage);

// Set the group comment as a concatenation of all the stage summary comments
summary.comments = subComments.join(', ');
stageSummaries.forEach((summary, index) => {
if (summary.type === 'group') {
if (summary.groupStages.length === 1) {
// If there's only one stage, get rid of the group.
stageSummaries[index] = summary.groupStages[0];
} else if (summary.groupStages.length > 1) {
const subComments: string[] = [];
// Find the earliest startTime and latest endTime
summary.groupStages.forEach((subStage) => {
if (subStage.comments) { subComments.push(subStage.comments); }
});

// Assuming the last stage in the group has the "output" stages
summary.after = summary.groupStages[summary.groupStages.length - 1].after;

const currentStage = this.getCurrentStage(summary.groupStages);
summary.activeStageType = currentStage.type;
summary.status = currentStage.status;
this.styleStage(summary, currentStage);

// Set the group comment as a concatenation of all the stage summary comments
summary.comments = subComments.join(', ');

// Make sure the requisite ids that were pointing at stages within a group are now pointing at the group
summary.requisiteStageRefIds = uniq(summary.requisiteStageRefIds.map((id) => idToGroupIdMap[id] || id));
}
}

// Make sure the requisite ids that were pointing at stages within a group are now pointing at the group
summary.requisiteStageRefIds = uniq(summary.requisiteStageRefIds.map((id) => idToGroupIdMap[id] || id));
});

stageSummaries.forEach((summary, index) => this.transformStageSummary(summary, index));
Expand Down