diff --git a/.prettierrc b/.prettierrc index 517656ff8..38c9560eb 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,5 +1,5 @@ { - "printWidth": 120, + "printWidth": 100, "singleQuote": true, "useTabs": false, "tabWidth": 2, diff --git a/web/abstruse/package.json b/web/abstruse/package.json index 643368e1f..4ea18be61 100644 --- a/web/abstruse/package.json +++ b/web/abstruse/package.json @@ -51,6 +51,7 @@ "ngx-monaco-editor": "9.0.0", "ngx-uploader": "^11.0.0", "parse-duration": "^0.4.4", + "prettier": "^2.2.1", "protractor": "~7.0.0", "purgecss-webpack-plugin": "^3.1.3", "ts-node": "~8.3.0", diff --git a/web/abstruse/src/app/app.component.html b/web/abstruse/src/app/app.component.html index 46728f53c..16ac60fa1 100644 --- a/web/abstruse/src/app/app.component.html +++ b/web/abstruse/src/app/app.component.html @@ -1,4 +1,4 @@ -
+
diff --git a/web/abstruse/src/app/auth/login/login.component.html b/web/abstruse/src/app/auth/login/login.component.html index 7a772965a..c15924e9a 100644 --- a/web/abstruse/src/app/auth/login/login.component.html +++ b/web/abstruse/src/app/auth/login/login.component.html @@ -15,17 +15,32 @@
- + Email is required.
- - + + Password is required. diff --git a/web/abstruse/src/app/builds/build/build.component.html b/web/abstruse/src/app/builds/build/build.component.html index 6dd25f41a..b11ab71d6 100644 --- a/web/abstruse/src/app/builds/build/build.component.html +++ b/web/abstruse/src/app/builds/build/build.component.html @@ -1,26 +1,48 @@

Build

-

{{ build?.repository?.fullName }}

+

+ {{ build?.repository?.fullName }} +

Build #{{ build?.id }}

{{ title }}

- - @@ -47,12 +69,15 @@

{{ title }}

- + @@ -65,21 +90,32 @@

{{ title }}

- -
- - + +
+ +
- {{ build?.committerName || build?.committerLogin }} - authored and - commited - {{ - build?.committerName || build?.committerLogin }} - authored and commited - {{ - build?.authorName || build?.authorLogin }} - authored with {{ build?.committerName || build?.committerLogin }} + {{ build?.committerName || build?.committerLogin }} authored and commited + {{ build?.committerName || build?.committerLogin }} authored and commited + {{ build?.authorName || build?.authorLogin }} authored with + {{ build?.committerName || build?.committerLogin }}
@@ -117,13 +153,21 @@

{{ title }}

- +
- +
diff --git a/web/abstruse/src/app/builds/build/build.component.ts b/web/abstruse/src/app/builds/build/build.component.ts index b2750edf2..b831e4c21 100644 --- a/web/abstruse/src/app/builds/build/build.component.ts +++ b/web/abstruse/src/app/builds/build/build.component.ts @@ -62,7 +62,10 @@ export class BuildComponent implements OnInit, OnDestroy { finalize(() => (this.loading = false)), untilDestroyed(this) ) - .subscribe(resp => (this.build = resp), err => this.error = err.message); + .subscribe( + resp => (this.build = resp), + err => (this.error = err.message) + ); } restartBuild(): void { @@ -73,7 +76,10 @@ export class BuildComponent implements OnInit, OnDestroy { finalize(() => (this.processing = false)), untilDestroyed(this) ) - .subscribe(() => {}, err => this.error = err.message); + .subscribe( + () => {}, + err => (this.error = err.message) + ); } stopBuild(): void { @@ -84,7 +90,10 @@ export class BuildComponent implements OnInit, OnDestroy { finalize(() => (this.processing = false)), untilDestroyed(this) ) - .subscribe(() => {}, err => this.error = err.message); + .subscribe( + () => {}, + err => (this.error = err.message) + ); } isLinkActive(url: string): boolean { diff --git a/web/abstruse/src/app/builds/common/build-list-item/build-list-item.component.html b/web/abstruse/src/app/builds/common/build-list-item/build-list-item.component.html index 7288d5ed0..f6f9f7d42 100644 --- a/web/abstruse/src/app/builds/common/build-list-item/build-list-item.component.html +++ b/web/abstruse/src/app/builds/common/build-list-item/build-list-item.component.html @@ -1,13 +1,20 @@ -
+
- + }" + > #{{ build?.id }} PR #{{ build?.pr }}
@@ -16,7 +23,7 @@
{{ build?.repository?.fullName - }} + }}
{{ build?.commitMessage }} @@ -25,12 +32,19 @@
- -
- - + *ngIf="build?.pr === 0 || build?.committerLogin === build?.authorLogin" + /> +
+ +
@@ -46,17 +60,21 @@
- {{ build?.createdAtWords! | async - }} + {{ + build?.createdAtWords! | async + }}
- + @@ -72,13 +90,25 @@
- - diff --git a/web/abstruse/src/app/builds/index/index.component.html b/web/abstruse/src/app/builds/index/index.component.html index f40cbe628..ac3c2ce69 100644 --- a/web/abstruse/src/app/builds/index/index.component.html +++ b/web/abstruse/src/app/builds/index/index.component.html @@ -6,7 +6,11 @@ Commits - + Pull Requests diff --git a/web/abstruse/src/app/builds/job-list-item/job-list-item.component.html b/web/abstruse/src/app/builds/job-list-item/job-list-item.component.html index 396a76116..661725853 100644 --- a/web/abstruse/src/app/builds/job-list-item/job-list-item.component.html +++ b/web/abstruse/src/app/builds/job-list-item/job-list-item.component.html @@ -2,12 +2,15 @@
- + }" + > #{{ job?.buildId }}.{{ job?.id }}
@@ -24,12 +27,15 @@
- + }" + > @@ -45,14 +51,25 @@
- - diff --git a/web/abstruse/src/app/builds/job/job.component.html b/web/abstruse/src/app/builds/job/job.component.html index 8bde4fb31..eaba39c2f 100644 --- a/web/abstruse/src/app/builds/job/job.component.html +++ b/web/abstruse/src/app/builds/job/job.component.html @@ -6,19 +6,34 @@

Job

-

{{ job?.build?.repository?.fullName }} +

+ {{ job?.build?.repository?.fullName }} +

+

+ Build #{{ job?.build?.id }}

-

Build #{{ job?.build?.id }}

Job #{{ job?.id }}

- - @@ -45,12 +60,15 @@

Job #{{ job?.id }}

- + @@ -63,24 +81,42 @@

Job #{{ job?.id }}

- -
- - + +
+ +
- {{ job?.build?.committerName || - job?.build?.committerLogin }} authored and - commited - {{ - job?.build?.committerName || job?.build?.committerLogin }} - authored and commited - {{ - job?.build?.authorName || job?.build?.authorLogin }} - authored with {{ job?.build?.committerName || job?.build?.committerLogin }} + {{ job?.build?.committerName || job?.build?.committerLogin }} authored and + commited + {{ job?.build?.committerName || job?.build?.committerLogin }} authored and + commited + {{ job?.build?.authorName || job?.build?.authorLogin }} authored with + {{ job?.build?.committerName || job?.build?.committerLogin }}
diff --git a/web/abstruse/src/app/builds/job/job.component.ts b/web/abstruse/src/app/builds/job/job.component.ts index 007de598f..42dab43e1 100644 --- a/web/abstruse/src/app/builds/job/job.component.ts +++ b/web/abstruse/src/app/builds/job/job.component.ts @@ -23,14 +23,24 @@ export class JobComponent implements OnInit, OnDestroy { sub: Subscription = new Subscription(); error: string | null = null; - constructor(private route: ActivatedRoute, private buildsService: BuildsService, private dataService: DataService) {} + constructor( + private route: ActivatedRoute, + private buildsService: BuildsService, + private dataService: DataService + ) {} ngOnInit(): void { this.jobID = Number(this.route.snapshot.paramMap.get('jobid')); this.buildID = Number(this.route.snapshot.paramMap.get('buildid')); this.findJob(); - this.sub.add(this.buildsService.jobEvents().subscribe((ev: SocketEvent) => this.updateJobFromEvent(ev))); - this.sub.add(this.buildsService.jobLogEvents().subscribe((ev: SocketEvent) => this.updateJobLogFromEvent(ev))); + this.sub.add( + this.buildsService.jobEvents().subscribe((ev: SocketEvent) => this.updateJobFromEvent(ev)) + ); + this.sub.add( + this.buildsService + .jobLogEvents() + .subscribe((ev: SocketEvent) => this.updateJobLogFromEvent(ev)) + ); this.buildsService.subscribeToJobEvents(); this.buildsService.subscribeToJobLogEvents(this.jobID); } @@ -48,9 +58,12 @@ export class JobComponent implements OnInit, OnDestroy { finalize(() => (this.fetching = false)), untilDestroyed(this) ) - .subscribe(resp => { - this.job = resp; - }, err => this.error = err.message); + .subscribe( + resp => { + this.job = resp; + }, + err => (this.error = err.message) + ); } restartJob(): void { @@ -62,7 +75,10 @@ export class JobComponent implements OnInit, OnDestroy { finalize(() => (this.job.processing = false)), untilDestroyed(this) ) - .subscribe(() => {}, err => this.error = err.message); + .subscribe( + () => {}, + err => (this.error = err.message) + ); } stopJob(): void { @@ -73,7 +89,10 @@ export class JobComponent implements OnInit, OnDestroy { finalize(() => (this.job.processing = false)), untilDestroyed(this) ) - .subscribe(() => {}, err => this.error = err.message); + .subscribe( + () => {}, + err => (this.error = err.message) + ); } private updateJobFromEvent(ev: SocketEvent): void { diff --git a/web/abstruse/src/app/builds/shared/build.model.ts b/web/abstruse/src/app/builds/shared/build.model.ts index 487427308..d875ea5bb 100644 --- a/web/abstruse/src/app/builds/shared/build.model.ts +++ b/web/abstruse/src/app/builds/shared/build.model.ts @@ -38,7 +38,9 @@ export class Build { this.status = this.getBuildStatus; this.buildStatus = new BehaviorSubject(this.status); this.runningTime = new BehaviorSubject(this.getTimeRunning); - this.createdAtWords = new BehaviorSubject(formatDistanceToNow(this.createdAt as Date) + ' ago'); + this.createdAtWords = new BehaviorSubject( + formatDistanceToNow(this.createdAt as Date) + ' ago' + ); this.time.getCurrentTime().subscribe(() => { this.status = this.getBuildStatus; @@ -67,7 +69,10 @@ export class Build { return 'running'; } - if (this.jobs.find(job => job.status === 'failing') && !this.jobs.find(job => job.status === 'queued')) { + if ( + this.jobs.find(job => job.status === 'failing') && + !this.jobs.find(job => job.status === 'queued') + ) { return 'failing'; } @@ -85,7 +90,9 @@ export class Build { if (!this.startTime) { this.startTime = new Date( - Math.min(...this.jobs.map(job => (job.startTime ? job.startTime.getTime() : new Date().getTime()))) + Math.min( + ...this.jobs.map(job => (job.startTime ? job.startTime.getTime() : new Date().getTime())) + ) ); } @@ -93,7 +100,10 @@ export class Build { this.endTime = new Date(Math.max(...this.jobs.map(job => (job.endTime as Date).getTime()))); } - const millis = differenceInMilliseconds(this.endTime ? this.endTime : new Date(), this.startTime); + const millis = differenceInMilliseconds( + this.endTime ? this.endTime : new Date(), + this.startTime + ); return format(new Date(millis), millis >= 3600000 ? 'hh:mm:ss' : 'mm:ss'); } } @@ -130,7 +140,9 @@ export class Job { return { millis: 0, time: '00:00' }; } - const millis = Number(differenceInMilliseconds(this.endTime ? this.endTime : new Date(), this.startTime)); + const millis = Number( + differenceInMilliseconds(this.endTime ? this.endTime : new Date(), this.startTime) + ); return { millis, time: format(new Date(millis), millis >= 3600000 ? 'hh:mm:ss' : 'mm:ss') }; } } diff --git a/web/abstruse/src/app/builds/shared/builds.service.ts b/web/abstruse/src/app/builds/shared/builds.service.ts index e8345d637..d9f4667b4 100644 --- a/web/abstruse/src/app/builds/shared/builds.service.ts +++ b/web/abstruse/src/app/builds/shared/builds.service.ts @@ -86,7 +86,9 @@ export class BuildsService { } jobLogEvents(): Observable { - return this.dataService.socketOutput.pipe(filter(ev => ev.type.startsWith(buildsSubJobLogEvent))); + return this.dataService.socketOutput.pipe( + filter(ev => ev.type.startsWith(buildsSubJobLogEvent)) + ); } subscribeToBuildsEvents(): void { diff --git a/web/abstruse/src/app/core/core.module.ts b/web/abstruse/src/app/core/core.module.ts index 06750cddc..cd601baa4 100644 --- a/web/abstruse/src/app/core/core.module.ts +++ b/web/abstruse/src/app/core/core.module.ts @@ -19,7 +19,9 @@ import { NotFoundComponent } from './not-found/not-found.component'; export class CoreModule { constructor(@Optional() @SkipSelf() parentModule: CoreModule) { if (parentModule) { - throw new Error(`${parentModule} has already been loaded. Import Core modules in the AppModule only.`); + throw new Error( + `${parentModule} has already been loaded. Import Core modules in the AppModule only.` + ); } } } diff --git a/web/abstruse/src/app/core/gateway-timeout/gateway-timeout.component.html b/web/abstruse/src/app/core/gateway-timeout/gateway-timeout.component.html index 674c9e53a..6d3ae50a4 100644 --- a/web/abstruse/src/app/core/gateway-timeout/gateway-timeout.component.html +++ b/web/abstruse/src/app/core/gateway-timeout/gateway-timeout.component.html @@ -1,4 +1,4 @@ -
+
@@ -40,7 +40,9 @@

Gateway Timeout

-

Looks like the API is not available, please check on that, then return back. +

+ Looks like the API is not available, please check on that, then return + back.

diff --git a/web/abstruse/src/app/core/interceptors/api.interceptor.ts b/web/abstruse/src/app/core/interceptors/api.interceptor.ts index 5ea82f415..345307359 100644 --- a/web/abstruse/src/app/core/interceptors/api.interceptor.ts +++ b/web/abstruse/src/app/core/interceptors/api.interceptor.ts @@ -1,5 +1,11 @@ import { Injectable, Provider } from '@angular/core'; -import { HttpEvent, HttpInterceptor, HttpHandler, HttpRequest, HTTP_INTERCEPTORS } from '@angular/common/http'; +import { + HttpEvent, + HttpInterceptor, + HttpHandler, + HttpRequest, + HTTP_INTERCEPTORS +} from '@angular/common/http'; import { Observable } from 'rxjs'; import { environment } from 'src/environments/environment'; import { AuthService } from 'src/app/auth/shared/auth.service'; diff --git a/web/abstruse/src/app/core/not-found/not-found.component.html b/web/abstruse/src/app/core/not-found/not-found.component.html index b65fe5e4e..b54c44eee 100644 --- a/web/abstruse/src/app/core/not-found/not-found.component.html +++ b/web/abstruse/src/app/core/not-found/not-found.component.html @@ -1,4 +1,4 @@ -
+
diff --git a/web/abstruse/src/app/dashboard/dashboard.module.ts b/web/abstruse/src/app/dashboard/dashboard.module.ts index 87cd1ecc8..b36deac6f 100644 --- a/web/abstruse/src/app/dashboard/dashboard.module.ts +++ b/web/abstruse/src/app/dashboard/dashboard.module.ts @@ -7,6 +7,12 @@ import { IndexComponent } from './index/index.component'; @NgModule({ declarations: [IndexComponent], - imports: [CommonModule, DashboardRoutingModule, SharedModule, BarChartModule, RealtimeCanvasChartModule] + imports: [ + CommonModule, + DashboardRoutingModule, + SharedModule, + BarChartModule, + RealtimeCanvasChartModule + ] }) export class DashboardModule {} diff --git a/web/abstruse/src/app/dashboard/index/index.component.html b/web/abstruse/src/app/dashboard/index/index.component.html index 6780d8ca2..dc24e5563 100644 --- a/web/abstruse/src/app/dashboard/index/index.component.html +++ b/web/abstruse/src/app/dashboard/index/index.component.html @@ -9,16 +9,29 @@

Dashboard

Abstruse CI Stats

- - -
- +
- -
- +
@@ -15,29 +19,55 @@

Git SCM Provider Integration

- +
- +
- + Host URL is URL where SCM provider can access Abstruse to trigger webhooks.
- + Personal access token is mandatory for access to your repositories. - Create access token. + *ngIf="form.controls.name.value === 'github'" + >Create access token.
@@ -47,18 +77,28 @@

Git SCM Provider Integration

Generate Secret - Secret is used for authentication when provider triggers webhook. + Secret is used for authentication when provider triggers webhook.
-
- +
diff --git a/web/abstruse/src/app/repos/repo/repo.component.html b/web/abstruse/src/app/repos/repo/repo.component.html index 02d22bb2f..fd295d0a9 100644 --- a/web/abstruse/src/app/repos/repo/repo.component.html +++ b/web/abstruse/src/app/repos/repo/repo.component.html @@ -3,8 +3,12 @@ Builds Branches Pull Requests - Settings + Settings
diff --git a/web/abstruse/src/app/repos/repo/repo.component.ts b/web/abstruse/src/app/repos/repo/repo.component.ts index 098044557..5f7b93a51 100644 --- a/web/abstruse/src/app/repos/repo/repo.component.ts +++ b/web/abstruse/src/app/repos/repo/repo.component.ts @@ -14,7 +14,11 @@ export class RepoComponent implements OnInit { id!: number; title!: string; - constructor(public reposService: ReposService, private route: ActivatedRoute, private router: Router) {} + constructor( + public reposService: ReposService, + private route: ActivatedRoute, + private router: Router + ) {} ngOnInit(): void { this.id = Number(this.route.snapshot.paramMap.get('id')); diff --git a/web/abstruse/src/app/repos/repos/repos.component.html b/web/abstruse/src/app/repos/repos/repos.component.html index 062292f25..563eefc26 100644 --- a/web/abstruse/src/app/repos/repos/repos.component.html +++ b/web/abstruse/src/app/repos/repos/repos.component.html @@ -10,8 +10,13 @@

My Repositories

- +
@@ -49,7 +54,13 @@

My Repositories

diff --git a/web/abstruse/src/app/repos/settings/settings.component.html b/web/abstruse/src/app/repos/settings/settings.component.html index f8044c312..80172c14a 100644 --- a/web/abstruse/src/app/repos/settings/settings.component.html +++ b/web/abstruse/src/app/repos/settings/settings.component.html @@ -12,21 +12,32 @@

General

- + Run builds on branches that are not explicitly excluded in config.
- + Run builds on new or updated pull requests.
- + Run builds on new tags. @@ -39,10 +50,10 @@

Auto Cancellation

- Auto Cancellation allows you to only run builds for the latest commits in the queue.
- When new commits are pushed to same branch or pull request and jobs for previous commits are still - running, - they will be auto-cancelled if this options are on. + Auto Cancellation allows you to only run builds for the latest commits in the + queue.
+ When new commits are pushed to same branch or pull request and jobs for previous + commits are still running, they will be auto-cancelled if this options are on.

@@ -65,14 +76,18 @@

Config

- The .abstruse.yml file at the root of the repo configures how Abstruse CI is building, - testing and deploying your code. - This document will list the different attributes abstruse understand and you can use to configure your - builds. + The .abstruse.yml file at the root of the repo configures how Abstruse + CI is building, testing and deploying your code. This document will list the + different attributes abstruse understand and you can use to configure your builds.

-
- +
@@ -95,8 +114,12 @@

Config

Build has been successfully triggered.

-
diff --git a/web/abstruse/src/app/repos/settings/settings.component.ts b/web/abstruse/src/app/repos/settings/settings.component.ts index 53f28d1ad..ffd8d2bd6 100644 --- a/web/abstruse/src/app/repos/settings/settings.component.ts +++ b/web/abstruse/src/app/repos/settings/settings.component.ts @@ -44,7 +44,11 @@ export class SettingsComponent implements OnInit { return `[![Build Status](${badge})](${url})`; } - constructor(public reposService: ReposService, private buildsService: BuildsService, private route: ActivatedRoute) {} + constructor( + public reposService: ReposService, + private buildsService: BuildsService, + private route: ActivatedRoute + ) {} ngOnInit(): void { this.id = Number(this.route.parent?.snapshot.paramMap.get('id')); @@ -115,9 +119,12 @@ export class SettingsComponent implements OnInit { finalize(() => (this.triggeringBuild = false)), untilDestroyed(this) ) - .subscribe(() => { - this.buildTriggered = true; - }, err => this.triggerError = err.message); + .subscribe( + () => { + this.buildTriggered = true; + }, + err => (this.triggerError = err.message) + ); } fetchConfig(): void { diff --git a/web/abstruse/src/app/repos/shared/hook.model.ts b/web/abstruse/src/app/repos/shared/hook.model.ts index 28b16a91e..a718bd8e0 100644 --- a/web/abstruse/src/app/repos/shared/hook.model.ts +++ b/web/abstruse/src/app/repos/shared/hook.model.ts @@ -17,5 +17,12 @@ export interface HookData { } export const generateHook = (data: any): Hook => { - return new Hook(Number(data.ID), Boolean(data.Active), data.Name, data.Target, Boolean(data.SkipVerify), data.Events); + return new Hook( + Number(data.ID), + Boolean(data.Active), + data.Name, + data.Target, + Boolean(data.SkipVerify), + data.Events + ); }; diff --git a/web/abstruse/src/app/repos/shared/repos.service.ts b/web/abstruse/src/app/repos/shared/repos.service.ts index 2aa5fdce5..43a610cb7 100644 --- a/web/abstruse/src/app/repos/shared/repos.service.ts +++ b/web/abstruse/src/app/repos/shared/repos.service.ts @@ -25,7 +25,11 @@ export class ReposService { constructor(private http: HttpClient) {} - find(limit: number = 10, offset: number = 0, keyword: string = ''): Observable<{ count: number; data: Repo[] }> { + find( + limit: number = 10, + offset: number = 0, + keyword: string = '' + ): Observable<{ count: number; data: Repo[] }> { let params = new HttpParams(); params = params.append('limit', String(limit)); params = params.append('offset', String(offset)); diff --git a/web/abstruse/src/app/setup/shared/admin.model.ts b/web/abstruse/src/app/setup/shared/admin.model.ts index 07cd4e383..9def67329 100644 --- a/web/abstruse/src/app/setup/shared/admin.model.ts +++ b/web/abstruse/src/app/setup/shared/admin.model.ts @@ -2,7 +2,12 @@ export class Admin { readonly role: string = 'admin'; readonly active: boolean = true; - constructor(public email: string, public name: string, public avatar: string, public password: string) {} + constructor( + public email: string, + public name: string, + public avatar: string, + public password: string + ) {} } export const generateAdminModel = (data: any): Admin => { diff --git a/web/abstruse/src/app/setup/user/user.component.html b/web/abstruse/src/app/setup/user/user.component.html index e5190d554..6e18a2893 100644 --- a/web/abstruse/src/app/setup/user/user.component.html +++ b/web/abstruse/src/app/setup/user/user.component.html @@ -18,14 +18,22 @@

Create Admin

@@ -34,27 +42,48 @@

Create Admin

- +
- +
- - + +
diff --git a/web/abstruse/src/app/shared/components/modal/content-ref.class.ts b/web/abstruse/src/app/shared/components/modal/content-ref.class.ts index d4764779b..b1950ee9b 100644 --- a/web/abstruse/src/app/shared/components/modal/content-ref.class.ts +++ b/web/abstruse/src/app/shared/components/modal/content-ref.class.ts @@ -10,7 +10,11 @@ import { } from '@angular/core'; export class ContentRef { - constructor(public nodes: any[], public viewRef?: ViewRef, public componentRef?: ComponentRef) {} + constructor( + public nodes: any[], + public viewRef?: ViewRef, + public componentRef?: ComponentRef + ) {} } export class PopupService { diff --git a/web/abstruse/src/app/shared/components/modal/modal-ref.class.ts b/web/abstruse/src/app/shared/components/modal/modal-ref.class.ts index 0bb8945bd..e884e876e 100644 --- a/web/abstruse/src/app/shared/components/modal/modal-ref.class.ts +++ b/web/abstruse/src/app/shared/components/modal/modal-ref.class.ts @@ -26,7 +26,9 @@ export class ModalRef { private beforeDismiss?: () => boolean | Promise ) { this.windowComponentRef?.instance.dismissEvent.subscribe((reason: any) => this.dismiss(reason)); - this.result = new Promise((resolve, reject) => ([this.resolve, this.reject] = [resolve, reject])); + this.result = new Promise( + (resolve, reject) => ([this.resolve, this.reject] = [resolve, reject]) + ); this.result.then(null, () => {}); this.body = document.querySelector('body') as HTMLBodyElement; } diff --git a/web/abstruse/src/app/shared/components/modal/modal-stack.class.ts b/web/abstruse/src/app/shared/components/modal/modal-stack.class.ts index 07bf93079..cb22fe289 100644 --- a/web/abstruse/src/app/shared/components/modal/modal-stack.class.ts +++ b/web/abstruse/src/app/shared/components/modal/modal-stack.class.ts @@ -50,9 +50,13 @@ export class ModalStack { options: ModalOptions ): ModalRef { const containerEl = - options && options.container ? this.document.querySelector(options.container) : this.document.body; + options && options.container + ? this.document.querySelector(options.container) + : this.document.body; if (!containerEl) { - throw new Error(`The specified modal container "${options.container || 'body'}" was not found in the DOM.`); + throw new Error( + `The specified modal container "${options.container || 'body'}" was not found in the DOM.` + ); } const activeModal = new ActiveModal(); @@ -107,7 +111,12 @@ export class ModalStack { } else if (typeof content === 'string') { return this.createFromString(content); } else { - return this.createFromComponent(moduleComponentFactoryResolver, contentInjector, content, activeModal); + return this.createFromComponent( + moduleComponentFactoryResolver, + contentInjector, + content, + activeModal + ); } } diff --git a/web/abstruse/src/app/shared/components/modal/modal.component.html b/web/abstruse/src/app/shared/components/modal/modal.component.html index 329c48c0a..207ad7b27 100644 --- a/web/abstruse/src/app/shared/components/modal/modal.component.html +++ b/web/abstruse/src/app/shared/components/modal/modal.component.html @@ -1,9 +1,12 @@
-
+ }" + >
diff --git a/web/abstruse/src/app/shared/components/modal/modal.service.ts b/web/abstruse/src/app/shared/components/modal/modal.service.ts index 9220f5f64..6f0e740d8 100644 --- a/web/abstruse/src/app/shared/components/modal/modal.service.ts +++ b/web/abstruse/src/app/shared/components/modal/modal.service.ts @@ -14,7 +14,12 @@ export class ModalService { open(content: T, options: ModalOptions = {}): ModalRef { const combinedOptions = Object.assign({}, this.config, options); - return this.modalStack.open(this.moduleComponentFactoryResolver, this.injector, content, combinedOptions); + return this.modalStack.open( + this.moduleComponentFactoryResolver, + this.injector, + content, + combinedOptions + ); } dismissAll(reason?: any): void { diff --git a/web/abstruse/src/app/shared/components/progress-wizard/progress-wizard.component.html b/web/abstruse/src/app/shared/components/progress-wizard/progress-wizard.component.html index d73335c44..e805fbbd9 100644 --- a/web/abstruse/src/app/shared/components/progress-wizard/progress-wizard.component.html +++ b/web/abstruse/src/app/shared/components/progress-wizard/progress-wizard.component.html @@ -8,11 +8,19 @@
{{ i + 1 }} - + + fill="#ffffff" + fill-rule="nonzero" + />
diff --git a/web/abstruse/src/app/shared/components/terminal/terminal.component.ts b/web/abstruse/src/app/shared/components/terminal/terminal.component.ts index d8c82a370..fcd929162 100644 --- a/web/abstruse/src/app/shared/components/terminal/terminal.component.ts +++ b/web/abstruse/src/app/shared/components/terminal/terminal.component.ts @@ -1,4 +1,12 @@ -import { Component, OnInit, OnDestroy, Input, ElementRef, OnChanges, ViewEncapsulation } from '@angular/core'; +import { + Component, + OnInit, + OnDestroy, + Input, + ElementRef, + OnChanges, + ViewEncapsulation +} from '@angular/core'; import { ITheme, Terminal } from 'xterm'; import { FitAddon } from 'xterm-addon-fit'; @@ -75,7 +83,10 @@ export class TerminalComponent implements OnInit, OnDestroy, OnChanges { ngOnInit(): void { this.terminal.open(this.elementRef.nativeElement.querySelector('.terminal-container')); - this.terminal.setOption('fontFamily', 'Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace'); + this.terminal.setOption( + 'fontFamily', + 'Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace' + ); this.terminal.setOption('fontSize', 13); this.terminal.setOption('fontWeight', 400); this.terminal.setOption('fontWeightBold', 400); diff --git a/web/abstruse/src/app/shared/directives/tooltip.directive.ts b/web/abstruse/src/app/shared/directives/tooltip.directive.ts index a2f22df19..6feb1c22f 100644 --- a/web/abstruse/src/app/shared/directives/tooltip.directive.ts +++ b/web/abstruse/src/app/shared/directives/tooltip.directive.ts @@ -1,4 +1,12 @@ -import { Directive, Input, ViewContainerRef, Renderer2, OnDestroy, HostListener, OnChanges } from '@angular/core'; +import { + Directive, + Input, + ViewContainerRef, + Renderer2, + OnDestroy, + HostListener, + OnChanges +} from '@angular/core'; @Directive({ selector: '[appTooltip]' diff --git a/web/abstruse/src/app/shared/widgets/avatar-picker/avatar-picker.component.html b/web/abstruse/src/app/shared/widgets/avatar-picker/avatar-picker.component.html index 16b77e9bf..e17dd8d09 100644 --- a/web/abstruse/src/app/shared/widgets/avatar-picker/avatar-picker.component.html +++ b/web/abstruse/src/app/shared/widgets/avatar-picker/avatar-picker.component.html @@ -1,9 +1,14 @@
- +
- +
diff --git a/web/abstruse/src/app/shared/widgets/avatar-picker/avatar-picker.component.spec.ts b/web/abstruse/src/app/shared/widgets/avatar-picker/avatar-picker.component.spec.ts index 9c34067c4..171304156 100644 --- a/web/abstruse/src/app/shared/widgets/avatar-picker/avatar-picker.component.spec.ts +++ b/web/abstruse/src/app/shared/widgets/avatar-picker/avatar-picker.component.spec.ts @@ -75,7 +75,9 @@ describe('AvatarPickerComponent', () => { fixture.whenStable().then(() => { fixture.detectChanges(); - const icon = fixture.debugElement.nativeElement.querySelector('.avatars-picker .close-icon'); + const icon = fixture.debugElement.nativeElement.querySelector( + '.avatars-picker .close-icon' + ); icon.click(); fixture.whenStable().then(() => { @@ -146,8 +148,12 @@ describe('AvatarPickerComponent', () => { fixture.whenStable().then(() => { fixture.detectChanges(); - expect(component.avatarPickerComponent.value).toEqual('/assets/images/icons/spinner-green.svg'); - expect(component.avatarPickerComponent.innerValue).toEqual('/assets/images/icons/spinner-green.svg'); + expect(component.avatarPickerComponent.value).toEqual( + '/assets/images/icons/spinner-green.svg' + ); + expect(component.avatarPickerComponent.innerValue).toEqual( + '/assets/images/icons/spinner-green.svg' + ); }); }); }) diff --git a/web/abstruse/src/app/shared/widgets/avatar-picker/avatar-picker.component.ts b/web/abstruse/src/app/shared/widgets/avatar-picker/avatar-picker.component.ts index d464ebf87..1cfd13073 100644 --- a/web/abstruse/src/app/shared/widgets/avatar-picker/avatar-picker.component.ts +++ b/web/abstruse/src/app/shared/widgets/avatar-picker/avatar-picker.component.ts @@ -6,7 +6,13 @@ import { randomInt } from '../../common/random-int'; selector: 'app-avatar-picker', templateUrl: './avatar-picker.component.html', styleUrls: ['./avatar-picker.component.sass'], - providers: [{ provide: NG_VALUE_ACCESSOR, useExisting: forwardRef(() => AvatarPickerComponent), multi: true }] + providers: [ + { + provide: NG_VALUE_ACCESSOR, + useExisting: forwardRef(() => AvatarPickerComponent), + multi: true + } + ] }) export class AvatarPickerComponent implements ControlValueAccessor, OnInit { @Input() values: string[] = [...new Array(30)].map((_, i: number) => { diff --git a/web/abstruse/src/app/shared/widgets/checkbox/checkbox.component.html b/web/abstruse/src/app/shared/widgets/checkbox/checkbox.component.html index 3307e2fa3..0849094ea 100644 --- a/web/abstruse/src/app/shared/widgets/checkbox/checkbox.component.html +++ b/web/abstruse/src/app/shared/widgets/checkbox/checkbox.component.html @@ -1,5 +1,11 @@
- +
diff --git a/web/abstruse/src/app/shared/widgets/checkbox/checkbox.component.spec.ts b/web/abstruse/src/app/shared/widgets/checkbox/checkbox.component.spec.ts index 892d67c7d..1f75f30a0 100644 --- a/web/abstruse/src/app/shared/widgets/checkbox/checkbox.component.spec.ts +++ b/web/abstruse/src/app/shared/widgets/checkbox/checkbox.component.spec.ts @@ -37,7 +37,8 @@ describe('CheckboxComponent', () => { }); it('should change value on .checkbox-label click', () => { - const label: HTMLLabelElement = fixture.debugElement.query(By.css('.checkbox-label')).nativeElement; + const label: HTMLLabelElement = fixture.debugElement.query(By.css('.checkbox-label')) + .nativeElement; expect(input.checked).toBeFalsy(); label.click(); fixture.detectChanges(); @@ -83,12 +84,14 @@ describe('CheckboxComponent under TestHostComponent', () => { }); it('should display label text', () => { - const label: HTMLLabelElement = testHostFixture.debugElement.query(By.css('.label')).nativeElement; + const label: HTMLLabelElement = testHostFixture.debugElement.query(By.css('.label')) + .nativeElement; expect(label.innerText).toEqual('Enabled'); }); it('should display different label text when changed', () => { - const label: HTMLLabelElement = testHostFixture.debugElement.query(By.css('.label')).nativeElement; + const label: HTMLLabelElement = testHostFixture.debugElement.query(By.css('.label')) + .nativeElement; expect(label.innerText).toEqual('Enabled'); testHostComponent.label = 'Disabled'; testHostFixture.detectChanges(); diff --git a/web/abstruse/src/app/shared/widgets/color-picker/color-picker.component.html b/web/abstruse/src/app/shared/widgets/color-picker/color-picker.component.html index d271a8a74..d769025fb 100644 --- a/web/abstruse/src/app/shared/widgets/color-picker/color-picker.component.html +++ b/web/abstruse/src/app/shared/widgets/color-picker/color-picker.component.html @@ -1,4 +1,9 @@
- +
diff --git a/web/abstruse/src/app/shared/widgets/color-picker/color-picker.component.ts b/web/abstruse/src/app/shared/widgets/color-picker/color-picker.component.ts index b822abc3f..48ffea6d3 100644 --- a/web/abstruse/src/app/shared/widgets/color-picker/color-picker.component.ts +++ b/web/abstruse/src/app/shared/widgets/color-picker/color-picker.component.ts @@ -6,7 +6,9 @@ import { randomInt } from '../../common/random-int'; selector: 'app-color-picker', templateUrl: './color-picker.component.html', styleUrls: ['./color-picker.component.sass'], - providers: [{ provide: NG_VALUE_ACCESSOR, useExisting: forwardRef(() => ColorPickerComponent), multi: true }] + providers: [ + { provide: NG_VALUE_ACCESSOR, useExisting: forwardRef(() => ColorPickerComponent), multi: true } + ] }) export class ColorPickerComponent implements OnInit { @Input() colors: string[] = [ diff --git a/web/abstruse/src/app/shared/widgets/progress-bar/progress-bar.component.spec.ts b/web/abstruse/src/app/shared/widgets/progress-bar/progress-bar.component.spec.ts index 0c3d3e4d2..09a87241e 100644 --- a/web/abstruse/src/app/shared/widgets/progress-bar/progress-bar.component.spec.ts +++ b/web/abstruse/src/app/shared/widgets/progress-bar/progress-bar.component.spec.ts @@ -33,7 +33,8 @@ describe('ProgressBarComponent', () => { it('should have default style class defined', () => { const options: ProgressBarSettings = defaultProgressBarSettings; const defaultClass = `is-${options.color}`; - const container: HTMLElement = fixture.debugElement.query(By.css('.progress-bar-container')).nativeElement; + const container: HTMLElement = fixture.debugElement.query(By.css('.progress-bar-container')) + .nativeElement; expect(container.classList.contains(defaultClass)).toBeTruthy(); }); diff --git a/web/abstruse/src/app/shared/widgets/progress-bar/progress-bar.component.ts b/web/abstruse/src/app/shared/widgets/progress-bar/progress-bar.component.ts index b66738bca..67c1a47dc 100644 --- a/web/abstruse/src/app/shared/widgets/progress-bar/progress-bar.component.ts +++ b/web/abstruse/src/app/shared/widgets/progress-bar/progress-bar.component.ts @@ -1,4 +1,12 @@ -import { Component, OnInit, Input, OnChanges, SimpleChanges, ElementRef, Renderer2 } from '@angular/core'; +import { + Component, + OnInit, + Input, + OnChanges, + SimpleChanges, + ElementRef, + Renderer2 +} from '@angular/core'; import { ProgressBarSettings, defaultProgressBarSettings, style } from './progress-bar.interface'; @Component({ @@ -37,7 +45,9 @@ export class ProgressBarComponent implements OnInit, OnChanges { constructor(public elementRef: ElementRef, public renderer: Renderer2) {} ngOnInit(): void { - this.container = this.elementRef.nativeElement.querySelector('.progress-bar-container') as HTMLElement; + this.container = this.elementRef.nativeElement.querySelector( + '.progress-bar-container' + ) as HTMLElement; this.bar = this.container.querySelector('.progress-bar') as HTMLElement; this.initSettings(); } @@ -63,7 +73,11 @@ export class ProgressBarComponent implements OnInit, OnChanges { this.renderer.setStyle(this.container, 'width', this.options.width); this.renderer.setStyle(this.container, 'height', this.options.height); if (this.options.transition) { - this.renderer.setStyle(this.bar, 'transition', `width ${this.options.transitionDuration}ms ease-in-out`); + this.renderer.setStyle( + this.bar, + 'transition', + `width ${this.options.transitionDuration}ms ease-in-out` + ); } else { this.renderer.setStyle(this.bar, 'transition', `none`); } diff --git a/web/abstruse/src/app/shared/widgets/progress-bar/progress-bar.interface.ts b/web/abstruse/src/app/shared/widgets/progress-bar/progress-bar.interface.ts index 3031fc225..4d8d9c5ed 100644 --- a/web/abstruse/src/app/shared/widgets/progress-bar/progress-bar.interface.ts +++ b/web/abstruse/src/app/shared/widgets/progress-bar/progress-bar.interface.ts @@ -1,4 +1,14 @@ -export type style = 'red' | 'orange' | 'yellow' | 'green' | 'teal' | 'blue' | 'indigo' | 'purple' | 'pink' | 'gray'; +export type style = + | 'red' + | 'orange' + | 'yellow' + | 'green' + | 'teal' + | 'blue' + | 'indigo' + | 'purple' + | 'pink' + | 'gray'; export interface ProgressBarSettings { color?: style; diff --git a/web/abstruse/src/app/shared/widgets/selectbox/selectbox.component.html b/web/abstruse/src/app/shared/widgets/selectbox/selectbox.component.html index 287c9ab67..73da18f56 100644 --- a/web/abstruse/src/app/shared/widgets/selectbox/selectbox.component.html +++ b/web/abstruse/src/app/shared/widgets/selectbox/selectbox.component.html @@ -6,8 +6,12 @@
-
+
{{ val.placeholder }}
diff --git a/web/abstruse/src/app/shared/widgets/selectbox/selectbox.component.spec.ts b/web/abstruse/src/app/shared/widgets/selectbox/selectbox.component.spec.ts index 2155ce700..7e75dc5e0 100644 --- a/web/abstruse/src/app/shared/widgets/selectbox/selectbox.component.spec.ts +++ b/web/abstruse/src/app/shared/widgets/selectbox/selectbox.component.spec.ts @@ -53,17 +53,17 @@ describe('SelectboxComponent', () => { fixture.detectChanges(); expect(component.placeholder).toEqual('Raspberry'); - expect(fixture.debugElement.query(By.css('.selectbox-value > span')).nativeElement.textContent).toEqual( - 'Raspberry' - ); + expect( + fixture.debugElement.query(By.css('.selectbox-value > span')).nativeElement.textContent + ).toEqual('Raspberry'); component.value = 'ice-cream'; fixture.detectChanges(); expect(component.placeholder).toEqual('Ice cream'); - expect(fixture.debugElement.query(By.css('.selectbox-value > span')).nativeElement.textContent).toEqual( - 'Ice cream' - ); + expect( + fixture.debugElement.query(By.css('.selectbox-value > span')).nativeElement.textContent + ).toEqual('Ice cream'); }); it('should throw an error when setting value when values are not initialized', () => { diff --git a/web/abstruse/src/app/shared/widgets/selectbox/selectbox.component.ts b/web/abstruse/src/app/shared/widgets/selectbox/selectbox.component.ts index 0e12da3f3..472366850 100644 --- a/web/abstruse/src/app/shared/widgets/selectbox/selectbox.component.ts +++ b/web/abstruse/src/app/shared/widgets/selectbox/selectbox.component.ts @@ -5,7 +5,9 @@ import { NG_VALUE_ACCESSOR, ControlValueAccessor } from '@angular/forms'; selector: 'app-selectbox', templateUrl: './selectbox.component.html', styleUrls: ['./selectbox.component.sass'], - providers: [{ provide: NG_VALUE_ACCESSOR, useExisting: forwardRef(() => SelectboxComponent), multi: true }] + providers: [ + { provide: NG_VALUE_ACCESSOR, useExisting: forwardRef(() => SelectboxComponent), multi: true } + ] }) export class SelectboxComponent implements ControlValueAccessor, OnInit { @Input() values!: { value: any; placeholder: string }[]; diff --git a/web/abstruse/src/app/teams/shared/teams.service.ts b/web/abstruse/src/app/teams/shared/teams.service.ts index f328f4223..45a9a251e 100644 --- a/web/abstruse/src/app/teams/shared/teams.service.ts +++ b/web/abstruse/src/app/teams/shared/teams.service.ts @@ -15,7 +15,9 @@ export class TeamsService { } list(): Observable { - return this.http.get('/teams').pipe(map((resp: any) => (resp && resp.length ? resp.map(generateTeam) : []))); + return this.http + .get('/teams') + .pipe(map((resp: any) => (resp && resp.length ? resp.map(generateTeam) : []))); } create(data: any): Observable { diff --git a/web/abstruse/src/app/teams/shared/users.service.ts b/web/abstruse/src/app/teams/shared/users.service.ts index 6b02f128a..014dc3ccb 100644 --- a/web/abstruse/src/app/teams/shared/users.service.ts +++ b/web/abstruse/src/app/teams/shared/users.service.ts @@ -12,7 +12,9 @@ export class UsersService { constructor(private http: HttpClient) {} list(): Observable { - return this.http.get('/users').pipe(map((resp: any) => (resp && resp.length ? resp.map(generateUser) : []))); + return this.http + .get('/users') + .pipe(map((resp: any) => (resp && resp.length ? resp.map(generateUser) : []))); } create(data: any): Observable { diff --git a/web/abstruse/src/app/teams/team-item/team-item.component.html b/web/abstruse/src/app/teams/team-item/team-item.component.html index b0a58be89..f22a7784d 100644 --- a/web/abstruse/src/app/teams/team-item/team-item.component.html +++ b/web/abstruse/src/app/teams/team-item/team-item.component.html @@ -12,7 +12,12 @@

{{ team?.name }}

{{ team?.reposCount }}
- diff --git a/web/abstruse/src/app/teams/team-modal/team-modal.component.html b/web/abstruse/src/app/teams/team-modal/team-modal.component.html index 2d52af5dc..7aaac7dbf 100644 --- a/web/abstruse/src/app/teams/team-modal/team-modal.component.html +++ b/web/abstruse/src/app/teams/team-modal/team-modal.component.html @@ -4,14 +4,20 @@

Team

Create New Team

Edit Team

- +
General Members - Manage Access + Manage Access
@@ -21,11 +27,24 @@

Edit Team

- +
- +
@@ -75,7 +94,7 @@

Edit Team

-
+
@@ -145,13 +164,25 @@

Edit Team

{{ r.repoFullName }}
- +
- +
- +
+
- -
diff --git a/web/abstruse/src/app/teams/teams-list/teams-list.component.ts b/web/abstruse/src/app/teams/teams-list/teams-list.component.ts index cc8c86890..ab0ce2506 100644 --- a/web/abstruse/src/app/teams/teams-list/teams-list.component.ts +++ b/web/abstruse/src/app/teams/teams-list/teams-list.component.ts @@ -23,7 +23,11 @@ export class TeamsListComponent implements OnInit, AfterViewInit { fetchingTeams = false; error: string | null = null; - constructor(private teamsService: TeamsService, public modal: ModalService, public auth: AuthService) {} + constructor( + private teamsService: TeamsService, + public modal: ModalService, + public auth: AuthService + ) {} ngOnInit(): void { this.list(); diff --git a/web/abstruse/src/app/teams/user-list-item/user-list-item.component.html b/web/abstruse/src/app/teams/user-list-item/user-list-item.component.html index f826fe309..21b810693 100644 --- a/web/abstruse/src/app/teams/user-list-item/user-list-item.component.html +++ b/web/abstruse/src/app/teams/user-list-item/user-list-item.component.html @@ -31,7 +31,12 @@
- diff --git a/web/abstruse/src/app/teams/user-modal/user-modal.component.html b/web/abstruse/src/app/teams/user-modal/user-modal.component.html index fa47625d4..2e69f9224 100644 --- a/web/abstruse/src/app/teams/user-modal/user-modal.component.html +++ b/web/abstruse/src/app/teams/user-modal/user-modal.component.html @@ -4,7 +4,11 @@

User

Create New User

Edit User

- +
@@ -22,8 +26,13 @@

Edit User

@@ -31,27 +40,55 @@

Edit User

- +
- +
- +
- +
- +
@@ -59,7 +96,9 @@

Edit User

- +
- -
@@ -49,7 +60,11 @@

User Management

- +
diff --git a/web/abstruse/src/app/teams/users/users.component.ts b/web/abstruse/src/app/teams/users/users.component.ts index 94276ad59..37a7263c9 100644 --- a/web/abstruse/src/app/teams/users/users.component.ts +++ b/web/abstruse/src/app/teams/users/users.component.ts @@ -23,7 +23,11 @@ export class UsersComponent implements OnInit, AfterViewInit { fetchingUsers = false; error: string | null = null; - constructor(private usersService: UsersService, public auth: AuthService, public modal: ModalService) {} + constructor( + private usersService: UsersService, + public auth: AuthService, + public modal: ModalService + ) {} ngOnInit(): void { this.list(); diff --git a/web/abstruse/src/app/workers/shared/worker.model.ts b/web/abstruse/src/app/workers/shared/worker.model.ts index 0e13cfc69..fdae3dc0f 100644 --- a/web/abstruse/src/app/workers/shared/worker.model.ts +++ b/web/abstruse/src/app/workers/shared/worker.model.ts @@ -68,8 +68,18 @@ export class Worker { private initUsage(): void { try { - this.cpu = [this.usage.map((u, i) => ({ date: subSeconds(new Date(), this.usage.length - i), value: u.cpu }))]; - this.memory = [this.usage.map((u, i) => ({ date: subSeconds(new Date(), this.usage.length - i), value: u.mem }))]; + this.cpu = [ + this.usage.map((u, i) => ({ + date: subSeconds(new Date(), this.usage.length - i), + value: u.cpu + })) + ]; + this.memory = [ + this.usage.map((u, i) => ({ + date: subSeconds(new Date(), this.usage.length - i), + value: u.mem + })) + ]; this.currentCPU = this.usage[this.usage.length - 1].cpu; this.currentMem = this.usage[this.usage.length - 1].mem; this.jobsMax = this.usage[this.usage.length - 1].jobsMax; diff --git a/web/abstruse/src/app/workers/worker-modal/worker-modal.component.ts b/web/abstruse/src/app/workers/worker-modal/worker-modal.component.ts index a567cac9d..fcda6df3e 100644 --- a/web/abstruse/src/app/workers/worker-modal/worker-modal.component.ts +++ b/web/abstruse/src/app/workers/worker-modal/worker-modal.component.ts @@ -15,7 +15,13 @@ export class WorkerModalComponent implements OnInit { height: 150, margin: { top: 10, right: 0, bottom: 25, left: 30 }, xGrid: { tickPadding: 10, tickNumber: 5 }, - yGrid: { min: 0, max: 100, tickNumber: 5, tickFormat: (v: string | number) => `${v}%`, tickPadding: 15 }, + yGrid: { + min: 0, + max: 100, + tickNumber: 5, + tickFormat: (v: string | number) => `${v}%`, + tickPadding: 15 + }, timeSlots: 120 }; realtimeCpuChartOptions: RealtimeCanvasChartOptions = { diff --git a/web/abstruse/src/app/workers/worker-table-item/worker-table-item.component.html b/web/abstruse/src/app/workers/worker-table-item/worker-table-item.component.html index 9801a2061..6cf182a9e 100644 --- a/web/abstruse/src/app/workers/worker-table-item/worker-table-item.component.html +++ b/web/abstruse/src/app/workers/worker-table-item/worker-table-item.component.html @@ -18,7 +18,9 @@
{{ worker.os }} {{ worker.platformVersion }} - {{ worker.platform }} {{ worker.kernelArch }} {{ worker.kernelVersion }} + {{ worker.platform }} {{ worker.kernelArch }} {{ worker.kernelVersion }}
@@ -29,19 +31,28 @@
- +
- +
- +
diff --git a/web/abstruse/src/app/workers/workers/workers.component.html b/web/abstruse/src/app/workers/workers/workers.component.html index 763e45f39..f91d3e883 100644 --- a/web/abstruse/src/app/workers/workers/workers.component.html +++ b/web/abstruse/src/app/workers/workers/workers.component.html @@ -30,7 +30,8 @@

Workers Nodes

- There are no workers currently online. In order to run builds you need at least one worker node connected. + There are no workers currently online. In order to run builds you need at least one worker + node connected.

diff --git a/web/abstruse/src/app/workers/workers/workers.component.ts b/web/abstruse/src/app/workers/workers/workers.component.ts index c6809c642..0ed102dc7 100644 --- a/web/abstruse/src/app/workers/workers/workers.component.ts +++ b/web/abstruse/src/app/workers/workers/workers.component.ts @@ -61,9 +61,12 @@ export class WorkersComponent implements OnInit, OnDestroy { finalize(() => (this.loading = false)), untilDestroyed(this) ) - .subscribe(resp => { - this.workers = resp; - }, err => this.error = err.message); + .subscribe( + resp => { + this.workers = resp; + }, + err => (this.error = err.message) + ); } private subscribeToWorkersEvents(): void { diff --git a/web/abstruse/src/index.html b/web/abstruse/src/index.html index 5227652c0..091140c08 100644 --- a/web/abstruse/src/index.html +++ b/web/abstruse/src/index.html @@ -1,19 +1,17 @@ - + + + + Abstruse CI + + + + + + - - - Abstruse CI - - - - - - - - - - - - + + + + diff --git a/web/abstruse/src/main.ts b/web/abstruse/src/main.ts index c7b673cf4..fa4e0aef3 100644 --- a/web/abstruse/src/main.ts +++ b/web/abstruse/src/main.ts @@ -8,5 +8,6 @@ if (environment.production) { enableProdMode(); } -platformBrowserDynamic().bootstrapModule(AppModule) +platformBrowserDynamic() + .bootstrapModule(AppModule) .catch(err => console.error(err)); diff --git a/web/abstruse/src/polyfills.ts b/web/abstruse/src/polyfills.ts index 9b8f300ef..c5f27446d 100644 --- a/web/abstruse/src/polyfills.ts +++ b/web/abstruse/src/polyfills.ts @@ -55,8 +55,7 @@ /*************************************************************************************************** * Zone JS is required by default for Angular itself. */ -import 'zone.js/dist/zone'; // Included with Angular CLI. - +import 'zone.js/dist/zone'; // Included with Angular CLI. /*************************************************************************************************** * APPLICATION IMPORTS diff --git a/web/abstruse/src/test.ts b/web/abstruse/src/test.ts index 50193eb0f..1f88d9590 100644 --- a/web/abstruse/src/test.ts +++ b/web/abstruse/src/test.ts @@ -8,17 +8,18 @@ import { } from '@angular/platform-browser-dynamic/testing'; declare const require: { - context(path: string, deep?: boolean, filter?: RegExp): { + context( + path: string, + deep?: boolean, + filter?: RegExp + ): { keys(): string[]; (id: string): T; }; }; // First, initialize the Angular testing environment. -getTestBed().initTestEnvironment( - BrowserDynamicTestingModule, - platformBrowserDynamicTesting() -); +getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting()); // Then we find all the tests. const context = require.context('./', true, /\.spec\.ts$/); // And load the modules. diff --git a/web/abstruse/yarn.lock b/web/abstruse/yarn.lock index 8158fef5f..acded5a01 100644 --- a/web/abstruse/yarn.lock +++ b/web/abstruse/yarn.lock @@ -7761,6 +7761,11 @@ postcss@^8.2.1: nanoid "^3.1.20" source-map "^0.6.1" +prettier@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.2.1.tgz#795a1a78dd52f073da0cd42b21f9c91381923ff5" + integrity sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q== + process-nextick-args@~2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"