Skip to content

Commit

Permalink
3.0.0-alpha.3
Browse files Browse the repository at this point in the history
  • Loading branch information
Ephigenia committed Jun 14, 2018
1 parent a32628d commit 8c093f1
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 9 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
<a name="3.0.0-alpha.3"></a>
# [3.0.0-alpha.3](https://github.com/ephigenia/circleboard2/compare/v3.0.0-alpha.2...v3.0.0-alpha.3) (2018-06-14)


### Features

* adds multiple gitlab projects support ([471f277](https://github.com/ephigenia/circleboard2/commit/471f277))
* dockerized repo ([aa389c0](https://github.com/ephigenia/circleboard2/commit/aa389c0))



<a name="3.0.0-alpha.2"></a>
# [3.0.0-alpha.2](https://github.com/ephigenia/circleboard2/compare/v3.0.0-alpha.1...v3.0.0-alpha.2) (2018-05-11)

Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "circleboard",
"version": "3.0.0-alpha.2",
"version": "3.0.0-alpha.3",
"description": "tabular display of the latest builds on CircleCi",
"keywords": [
"board",
Expand Down
2 changes: 1 addition & 1 deletion src/app/board-config.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export class BoardConfig {
name: csvRow[0],
token: csvRow[1],
baseUrl: csvRow[2] || null
}
};
});
}

Expand Down
5 changes: 4 additions & 1 deletion src/app/board-config/board-config.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,14 @@ import { GitLabProjectListItem } from './../gitlab-ci.service';
export class BoardConfigComponent {

public config: BoardConfig;
// url shown in the config help messages
public baseUrl: string;

public constructor(
private configService: BoardConfigService
) {
this.config = this.configService.read();
this.baseUrl = `${window.location.origin}`;
}

public submit() {
Expand All @@ -24,7 +27,7 @@ export class BoardConfigComponent {
public addEmptyGitlabProject() {
let template = <GitLabProjectListItem>{
name: '',
token:'',
token: '',
baseUrl: ''
};
if (this.config.gitlabProjects.length) {
Expand Down
9 changes: 5 additions & 4 deletions src/app/gitlab-ci.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import { Observable } from 'rxjs';
import { map } from 'rxjs/operators';

export interface GitLabProjectListItem {
name: string,
token: string,
baseUrl: string|null,
name: string;
token: string;
baseUrl: string|null;
}

@Injectable()
Expand Down Expand Up @@ -37,7 +37,8 @@ export class GitlabCiService {
return this.http.get(url, options).pipe(
map((builds: any[]) => {
return builds.map((build) => this.transformBuild(build, project, baseUrl));
}));
})
);
}

public transformBuild(build, project, baseUrl) {
Expand Down
2 changes: 1 addition & 1 deletion src/app/recent-builds/recent-builds.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ export class RecentBuildsComponent implements OnInit, OnDestroy {
requestList.push(
this.gitlabci.getProjectBuilds(project.name, project.token, project.baseUrl)
);
})
});

return combineLatest(requestList);
}),
Expand Down

0 comments on commit 8c093f1

Please sign in to comment.