-
-
-
-
+
+
- | Last activity |
- Change subject |
- Project |
- Branch |
- Gerrit |
- Status |
+ Owner |
+ Last activity |
+ Change subject |
+ Project |
+ Branch |
+ Gerrit |
+ Status |
- | {{commit.gerrit_time}} |
- {{commit.gerrit_change_subject}} |
- {{commit.gerrit_project}} |
- {{commit.branch}} |
- {{commit.gerrit_change_number}} |
-
- {{CommitStatus.Verified}}
- {{CommitStatus.CodeReview}}
- {{CommitStatus.CommitFeedbackLoop}}
- {{CommitStatus.ShortFeedbackLoop}}
- {{CommitStatus.NightlyFeedbackLoop}}
- |
+ {{commit.owner}} |
+ {{commit.gerrit_time}} |
+ {{commit.gerrit_change_subject}} |
+ {{commit.gerrit_project}} |
+ {{commit.branch}} |
+ {{commit.gerrit_change_number}} |
+
+ {{CommitStatus.Verified}}
+
+ {{CommitStatus.CodeReview}}
+
+ {{CommitStatus.CommitFeedbackLoop}}
+
+ {{CommitStatus.ShortFeedbackLoop}}
+
+ {{CommitStatus.NightlyFeedbackLoop}}
+
+ |
-
-
\ No newline at end of file
diff --git a/src/app/display/commit-tracker/commit-tracker.component.ts b/src/app/display/commit-tracker/commit-tracker.component.ts
index 9882651..8a25fad 100644
--- a/src/app/display/commit-tracker/commit-tracker.component.ts
+++ b/src/app/display/commit-tracker/commit-tracker.component.ts
@@ -6,6 +6,7 @@ import { CommitTrackerService } from '../../shared/service/commit-tracker.servic
import { Commit } from '../../shared/commit';
import { CommitStatus } from '../../shared/commit-status.enum';
import { Result } from '../../shared/result.enum';
+import { Build } from '../../shared/build';
@Component({
selector: 'app-commit-tracker',
@@ -18,11 +19,12 @@ export class CommitTrackerComponent implements OnInit {
constructor(private commitTrackerService: CommitTrackerService,
private titleService: Title,
- private route: ActivatedRoute) {}
+ private route: ActivatedRoute) {
+ }
ngOnInit() {
this.titleService.setTitle('Commit-tracker : MTAStv');
- this.route.data.subscribe((data: {commits: Array
}) => this.commits = data.commits);
+ this.route.data.subscribe((data: { commits: Array }) => this.commits = data.commits);
}
get commits(): Array {
@@ -44,41 +46,77 @@ export class CommitTrackerComponent implements OnInit {
switch (commitStatus) {
case CommitStatus.Verified:
return Object.assign(classes, {
- green: commit.gerrit_verified === 2,
- yellow: commit.gerrit_verified === 0,
- red: commit.gerrit_verified === -2,
+ green: commit.gerrit_verified === 1,
+ red: commit.gerrit_verified === -1,
});
case CommitStatus.CodeReview:
return Object.assign(classes, {
- green: commit.gerrit_code_review === 1,
- yellow: commit.gerrit_code_review === 0,
- red: commit.gerrit_code_review === -1,
+ green: commit.gerrit_code_review === 2,
+ yellow: commit.gerrit_code_review === 1 || commit.gerrit_code_review === -1,
+ red: commit.gerrit_code_review === -2,
});
case CommitStatus.CommitFeedbackLoop:
return Object.assign(classes, {
+ 'blue inprogress': commit.cfl_result === Result.Building,
+ 'blue-yellow inprogress': commit.cfl_result === Result.Building
+ && this.hasSubbuildWithCode(commit.cfl_sub_builds, Result.Unstable),
+ 'blue-red inprogress': commit.cfl_result === Result.Building
+ && this.hasSubbuildWithCode(commit.cfl_sub_builds, Result.Failure),
green: commit.cfl_result === Result.Success,
- yellow: commit.cfl_result === Result.Aborted,
- orange: commit.cfl_result === Result.Unstable,
+ grey: commit.cfl_result === Result.Aborted,
+ yellow: commit.cfl_result === Result.Unstable,
red: commit.cfl_result === Result.Failure,
brown: commit.cfl_result === Result.NotBuilt,
});
case CommitStatus.ShortFeedbackLoop:
return Object.assign(classes, {
+ 'blue inprogress': commit.sfl_result === Result.Building,
+ 'blue-yellow inprogress': commit.sfl_result === Result.Building
+ && this.hasSubbuildWithCode(commit.sfl_sub_builds, Result.Unstable),
+ 'blue-red inprogress': commit.sfl_result === Result.Building
+ && this.hasSubbuildWithCode(commit.sfl_sub_builds, Result.Failure),
green: commit.sfl_result === Result.Success,
- yellow: commit.sfl_result === Result.Aborted,
- orange: commit.sfl_result === Result.Unstable,
+ grey: commit.sfl_result === Result.Aborted,
+ yellow: commit.sfl_result === Result.Unstable,
red: commit.sfl_result === Result.Failure,
brown: commit.sfl_result === Result.NotBuilt,
});
case CommitStatus.NightlyFeedbackLoop:
return Object.assign(classes, {
+ 'blue inprogress': commit.nfl_result === Result.Building,
+ 'blue-yellow inprogress': commit.nfl_result === Result.Building
+ && this.hasSubbuildWithCode(commit.nfl_sub_builds, Result.Unstable),
+ 'blue-red inprogress': commit.nfl_result === Result.Building
+ && this.hasSubbuildWithCode(commit.nfl_sub_builds, Result.Failure),
green: commit.nfl_result === Result.Success,
- yellow: commit.nfl_result === Result.Aborted,
+ grey: commit.nfl_result === Result.Aborted,
+ yellow: commit.nfl_result === Result.Unstable,
red: commit.nfl_result === Result.Failure,
+ brown: commit.nfl_result === Result.NotBuilt,
});
+ default:
+ return classes;
+ }
+ }
+
+ private hasSubbuildWithCode(build: Build, status: Result): boolean {
+ if (build === null) {
+ return false;
}
- return classes;
+ try {
+ return build.build.subBuild.some(subBuild => {
+ let thing = false;
+ if (subBuild.build.subBuild) {
+ thing = subBuild.build.subBuild.some(subSubBuild => this.hasSubbuildWithCode(
+ subSubBuild, status
+ ));
+ }
+ return subBuild.result === status || thing;
+ });
+ } catch (e) {
+ return false;
+ }
}
public rowClasses(commit: Commit) {
diff --git a/src/app/shared/member.ts b/src/app/shared/member.ts
index 4682662..3a572b6 100644
--- a/src/app/shared/member.ts
+++ b/src/app/shared/member.ts
@@ -1,4 +1,4 @@
export class Member {
- signum: String;
- name: String;
+ signum: String = '';
+ name: String = '';
}
diff --git a/src/app/shared/result.enum.ts b/src/app/shared/result.enum.ts
index 7e70c8d..a580427 100644
--- a/src/app/shared/result.enum.ts
+++ b/src/app/shared/result.enum.ts
@@ -1,5 +1,6 @@
export enum Result {
Aborted = 'ABORTED',
+ Building = 'BUILDING',
Failure = 'FAILURE',
NotBuilt = 'NOT_BUILT',
Success = 'SUCCESS',
diff --git a/src/app/shared/service/commit-tracker.service.ts b/src/app/shared/service/commit-tracker.service.ts
index bd04278..dd1511d 100644
--- a/src/app/shared/service/commit-tracker.service.ts
+++ b/src/app/shared/service/commit-tracker.service.ts
@@ -1,5 +1,5 @@
import { Injectable } from '@angular/core';
-import { HttpClient } from '@angular/common/http';
+import { HttpClient, HttpParams, HttpHeaders } from '@angular/common/http';
import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
import { Observable } from 'rxjs/Observable';
@@ -21,9 +21,8 @@ export class CommitTrackerService implements Resolve> {
}
public getTeamCommits(signums: Array): Observable> {
- return this.httpClient.post>(this.apiEndPoint, {
- json_signums: signums
- });
+ const params = new HttpParams().set('json_signums', JSON.stringify(signums));
+ return this.httpClient.get>(this.apiEndPoint, {params});
}
get commits(): Array {
diff --git a/src/app/shared/team.ts b/src/app/shared/team.ts
index 2127d6d..1d14aa0 100644
--- a/src/app/shared/team.ts
+++ b/src/app/shared/team.ts
@@ -1,10 +1,10 @@
import { Member } from './member';
export class Team {
- id: Number;
- name: String;
- members: Array;
- isActive: boolean;
- createdAt: String;
- updatedAt: String;
+ id: Number = null;
+ name: String = '';
+ members: Array = [];
+ isActive = false;
+ createdAt: String = null;
+ updatedAt: String = null;
}
diff --git a/src/styles.css b/src/styles.css
index 009c911..7377efb 100644
--- a/src/styles.css
+++ b/src/styles.css
@@ -1,6 +1,10 @@
/* You can add global styles to this file, and also import other style files */
.main.container {
- margin-top: 5em;
+ margin-top: 2em;
+}
+
+.main.wide-container {
+ margin: 2em 2em 0 2em;
}
.ui.checkbox > label[for] {