feat(jobs): Show hostname of worker assigned to the job

server/core/job.go

@@ -19,6 +19,7 @@ type (
 		Build     *Build     `gorm:"preload:false" json:"build,omitempty"`
 		BuildID   uint       `json:"buildID"`
 		Timestamp
+		AssignedWorker string `json:"assignedWorker"`
 	}
 
 	// JobStore defines operations for working with jobs database table.

server/scheduler/scheduler.go

@@ -75,6 +75,7 @@ func (s *scheduler) Next(job *core.Job) error {
 	job.Log = ""
 	job.StartTime = nil
 	job.EndTime = nil
+	job.AssignedWorker = ""
 	if err := s.saveJob(job); err != nil {
 		s.logger.Errorf("error saving job %d: %v", job.ID, err.Error())
 	}
@@ -282,6 +283,7 @@ func (s *scheduler) startJob(job *core.Job, worker *core.Worker) {
 	job.Log = ""
 	job.StartTime = lib.TimeNow()
 	job.EndTime = nil
+	job.AssignedWorker = worker.Host.Hostname
 	if err := s.saveJob(job); err != nil {
 		s.logger.Errorf("error saving job %d: %v", job.ID, err.Error())
 	}

server/store/job/job.go

@@ -53,10 +53,11 @@ func (s jobStore) Update(job *core.Job) error {
 	log := []byte(job.Log)
 
 	err := s.db.Model(job).Updates(map[string]interface{}{
-		"status":     job.Status,
-		"start_time": job.StartTime,
-		"end_time":   job.EndTime,
-		"log":        job.Log,
+		"status":         job.Status,
+		"start_time":     job.StartTime,
+		"end_time":       job.EndTime,
+		"log":            job.Log,
+		"assignedWorker": job.AssignedWorker,
 	}).Error
 
 	if err == nil {

web/abstruse/src/app/builds/job/job.component.html

@@ -15,6 +15,7 @@ <h2 class="is-link" [routerLink]="['/builds', job?.build?.id]">
         <h2>Job #{{ job?.id }}</h2>
       </div>
       <div class="subheader-right">
+        <h2>Worker: {{ job?.assignedWorker }}</h2>
         <button
           type="button"
           class="button"

web/abstruse/src/app/builds/job/job.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnInit, OnDestroy } from '@angular/core';
+import { Component, OnInit, OnDestroy, ChangeDetectorRef } from '@angular/core';
 import { SocketEvent } from 'src/app/shared/models/socket.model';
 import { Job } from '../shared/build.model';
 import { ActivatedRoute } from '@angular/router';
@@ -36,7 +36,8 @@ export class JobComponent implements OnInit, OnDestroy {
     private route: ActivatedRoute,
     private buildsService: BuildsService,
     private dataService: DataService,
-    private authService: AuthService
+    private authService: AuthService,
+    private changeDetector: ChangeDetectorRef
   ) {
     if (!localStorage.getItem(THEME_KEY)) {
       localStorage.setItem(THEME_KEY, 'light');
@@ -93,7 +94,7 @@ export class JobComponent implements OnInit, OnDestroy {
     this.buildsService
       .restartJob(this.job.id)
       .pipe(
-        finalize(() => (this.job.processing = false)),
+        finalize(() => { this.findJob(); this.changeDetector.detectChanges(); this.job.processing = false; }),
         untilDestroyed(this)
       )
       .subscribe(

web/abstruse/src/app/builds/shared/build.model.ts

@@ -125,7 +125,8 @@ export class Job {
     public createdAt: Date | null,
     public updatedAt: Date | null,
     public buildId: number,
-    public build: Build | null
+    public build: Build | null,
+    public assignedWorker: string,
   ) {
     this.time = new TimeService();
     this.runningTime = new BehaviorSubject<string>(this.getTimeRunning.time);
@@ -197,6 +198,7 @@ export function generateJobModel(data: any): Job {
     data.createdAt ? new Date(data.createdAt) : null,
     data.updatedAt ? new Date(data.updatedAt) : null,
     Number(data.buildID),
-    data.build ? generateBuildModel(data.build) : null
+    data.build ? generateBuildModel(data.build) : null,
+    data.assignedWorker
   );
 }

web/abstruse/src/styles/subheader.sass

@@ -90,6 +90,17 @@ $subheader-height: 70px
 
     .subheader-right
 
+      h2
+        color: $heading-light
+        text-transform: none
+        margin-right: 15px
+        padding-right: 15px
+        font-weight: $weight-medium
+        border-right: 1px solid $border-default
+        display: inline-flex
+        align-items: center
+        font-size: 13px
+
       .link
         +unselectable
         padding: 10px 0