Merge back changes from main

internal/repository/job.go

@@ -47,8 +47,8 @@ func GetJobRepository() *JobRepository {
 		db := GetConnection()
 
 		jobRepoInstance = &JobRepository{
-			DB:             db.DB,
-			driver:         db.Driver,
+			DB:     db.DB,
+			driver: db.Driver,
 
 			stmtCache:      sq.NewStmtCache(db.DB),
 			cache:          lrucache.New(1024 * 1024),
@@ -893,6 +893,18 @@ func (r *JobRepository) JobsStatistics(ctx context.Context,
 				stats[id.String].ShortJobs = int(shortJobs.Int64)
 			}
 		}
+
+		if col == "job.user" {
+			for id, _ := range stats {
+				emptyDash := "-"
+				name, _ := r.FindNameByUser(ctx, id)
+				if name != "" {
+					stats[id].Name = &name
+				} else {
+					stats[id].Name = &emptyDash
+				}
+			}
+		}
 	}
 
 	// Calculating the histogram data is expensive, so only do it if needed.