Skip to content

Commit 3f989e5

Browse files
authored
Merge pull request #564 from keymanapp/change/separate-epic-prs-in-status-view
change: separate epic PRs in status view
2 parents f4aed2d + 2ae5480 commit 3f989e5

File tree

3 files changed

+10
-1
lines changed

3 files changed

+10
-1
lines changed

public/src/app/box-pr-status/box-pr-status.component.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
<tr *ngFor="let pullStatus of pullsByStatus | keyvalue">
33
<td>
44
<a *ngIf="pullStatus.key == 'draft'" target="_blank" href="https://github.com/keymanapp/keyman/pulls?q=is%3Apr+is%3Aopen+is%3Adraft">{{pullStatusName[pullStatus.key]}}</a>
5+
<a *ngIf="pullStatus.key == 'epics'" target="_blank" href="https://github.com/keymanapp/keyman/pulls?q=is%3Apr+is%3Aopen+head%3Aepic%2F">{{pullStatusName[pullStatus.key]}}</a>
56
<a *ngIf="pullStatus.key == 'waitingTest'" target="_blank" href="https://github.com/keymanapp/keyman/pulls?q=is%3Apr+is%3Aopen+label%3Auser-test-required">{{pullStatusName[pullStatus.key]}}</a>
67
<a *ngIf="pullStatus.key == 'waitingReview'" target="_blank" href="https://github.com/keymanapp/keyman/pulls?q=is%3Apr+is%3Aopen+review%3Arequired+-is%3Adraft">{{pullStatusName[pullStatus.key]}}</a>
7-
<span *ngIf="pullStatus.key != 'waitingReview' && pullStatus.key != 'draft' && pullStatus.key != 'waitingTest'">{{pullStatusName[pullStatus.key]}}</span>
8+
<span *ngIf="pullStatus.key != 'waitingReview' && pullStatus.key != 'draft' && pullStatus.key != 'epics' && pullStatus.key != 'waitingTest'">{{pullStatusName[pullStatus.key]}}</span>
89
</td>
910
<td>
1011
<span *ngFor="let pull of pullStatus.value">

public/src/app/data/data.model.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ export class DataModel {
4747
};
4848

4949
pullsByStatus = {
50+
epics: [],
5051
draft: [],
5152
waitingReview: [],
5253
waitingResponse: [],
@@ -55,6 +56,7 @@ export class DataModel {
5556
readyToMerge: []
5657
};
5758
pullStatusName = {
59+
epics: 'Epics',
5860
draft: 'Draft',
5961
waitingReview: 'Waiting for review',
6062
waitingResponse: 'Changes requested',
@@ -492,6 +494,7 @@ export class DataModel {
492494
this.pullsByAuthor = {};
493495
this.pullsByProject = {};
494496
this.pullsByBase = {'master':[]}; // always show 'master' base
497+
this.pullsByStatus.epics = [];
495498
this.pullsByStatus.draft = [];
496499
this.pullsByStatus.readyToMerge = [];
497500
this.pullsByStatus.waitingGoodBuild = [];
@@ -519,6 +522,9 @@ export class DataModel {
519522
let buildState = pullBuildState(pd);
520523

521524
switch(status) {
525+
case 'status-epic':
526+
this.pullsByStatus.epics.push(pd);
527+
continue; // We don't add epic PRs to other categories
522528
case 'status-draft':
523529
this.pullsByStatus.draft.push(pd);
524530
continue; // We don't add draft PRs to other categories

public/src/app/utility/pullStatus.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ export function pullStatus(pull) {
33
let authors = {};
44
let pr = pull.pull.node;
55

6+
if(pr.headRefName.startsWith('epic/')) return 'status-epic';
7+
68
if(pr.isDraft) return 'status-draft';
79

810
if(pr.labels.edges.find(node => node.node.name == 'work-in-progress') !== undefined) return 'status-draft';

0 commit comments

Comments
 (0)