Skip to content

Commit

Permalink
fix(ui): fix style glitches, remove job and build history option from UI
Browse files Browse the repository at this point in the history
  • Loading branch information
jkuri committed Aug 20, 2017
1 parent a8fbc45 commit 53a1768
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 70 deletions.
6 changes: 3 additions & 3 deletions src/api/process-manager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ export function stopBuild(buildId: number): Promise<any> {
const abstruseUrl = `${config.url}/build/${buildId}`;
return setGitHubStatusFailure(gitUrl, abstruseUrl, buildData.repository.access_token);
}
}).catch(err => console.error(err));
}).catch(err => logger.error(err));
}

export function restartJob(jobId: number): Promise<void> {
Expand Down Expand Up @@ -490,7 +490,7 @@ export function restartJob(jobId: number): Promise<void> {
} else {
return Promise.resolve();
}
}).catch(err => console.error(err));
}).catch(err => logger.error(err));
}

export function restartJobWithSshAndVnc(jobId: number): Promise<void> {
Expand Down Expand Up @@ -568,7 +568,7 @@ export function queueSetupDockerImage(name: string): Observable<any> {
});
}
}, err => {
console.error(err);
logger.error(err);
}, () => {
observer.complete();
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,39 +70,6 @@ <h2 *ngIf="!build?.data?.pull_request">{{ build?.data?.commits[0]?.message }}</h
<span>{{ totalTime }}</span>
</p>
</div>

<div *ngIf="build.runs && build.runs.length > 1" class="column is-12">
<hr/>
<div class="columns">
<div class="column is-12">
<div class="build-history-btn-container">
<span *ngIf="!showBuildHistory" (click)="showBuildHistory = true" class="build-history-btn">
Show build history
</span>
<span *ngIf="showBuildHistory" (click)="showBuildHistory = false" class="build-history-btn hide">
Hide build history
</span>
</div>
<div *ngIf="showBuildHistory" class="mtop-20">
<div class="columns list-item list-item-mini"
*ngFor="let run of build.runs; let i = index;"
[ngClass]="{ 'is-queued': run.status === 'queued', 'is-success': run.status === 'success', 'is-running': run.status === 'running', 'is-errored': run.status === 'failed' || !run.status }"
>
<div class="column is-4">
<span>{{ run.start_time | date:'dd.MM.yyyy hh:mm:ss' }}</span>
</div>
<div class="column is-4">
<span *ngIf="run.end_time">{{ run.end_time | date:'dd.MM.yyyy hh:mm:ss' }}</span>
</div>
<div class="column is-4">
<span *ngIf="run.status">{{ run.status.charAt(0).toUpperCase() + run.status.slice(1) }}</span>
<span *ngIf="!run.status">Cancelled</span>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
Expand Down
33 changes: 0 additions & 33 deletions src/app/components/app-job/app-job.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -89,39 +89,6 @@ <h2 *ngIf="!job?.build?.data?.pull_request">{{ job?.build?.data?.commits[0]?.mes
</div>
</div>

<div *ngIf="job.runs && job.runs.length > 1" class="column is-12">
<hr/>
<div class="columns">
<div class="column is-12">
<div class="build-history-btn-container">
<span *ngIf="!showBuildHistory" (click)="showBuildHistory = true" class="build-history-btn">
Show build history
</span>
<span *ngIf="showBuildHistory" (click)="showBuildHistory = false" class="build-history-btn hide">
Hide build history
</span>
</div>
<div *ngIf="showBuildHistory" class="mtop-20">
<div class="columns list-item list-item-mini"
*ngFor="let run of job.runs; let i = index;"
[ngClass]="{ 'is-queued': run.status === 'queued', 'is-success': run.status === 'success', 'is-running': run.status === 'running', 'is-errored': run.status === 'failed' || !run.status }"
>
<div class="column is-4">
<span>{{ run.start_time | date:'dd.MM.yyyy hh:mm:ss' }}</span>
</div>
<div class="column is-4">
<span *ngIf="run.end_time">{{ run.end_time | date:'dd.MM.yyyy hh:mm:ss' }}</span>
</div>
<div class="column is-4">
<span *ngIf="run?.status">{{ run.status.charAt(0).toUpperCase() + run.status.slice(1) }}</span>
<span *ngIf="!run.status">Cancelled</span>
</div>
</div>
</div>
</div>
</div>
</div>

</div>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="window-terminal-container batman-ansi-theme">
<div class="window-terminal-container material-dark-ansi-theme">
<div class="terminal" *ngFor="let cmd of commands; let i = index;" [id]="i">
<div class="command-line" (click)="toogleCommand(i)">
<span class="icon">
Expand Down

0 comments on commit 53a1768

Please sign in to comment.