From a65ec1a9fbf15524197eb9b29ff43077bffda868 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Fri, 12 Jan 2024 19:43:48 +0100
Subject: [PATCH] lpweb: Pipeline view improvements

---
 provider/lpweb/hapi/simpleinfo.go | 14 +++++++-------
 provider/lpweb/static/index.html  |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/provider/lpweb/hapi/simpleinfo.go b/provider/lpweb/hapi/simpleinfo.go
index c08dcee08..a898a8fd6 100644
--- a/provider/lpweb/hapi/simpleinfo.go
+++ b/provider/lpweb/hapi/simpleinfo.go
@@ -155,7 +155,7 @@ func (a *app) clusterMachineSummary(ctx context.Context) ([]machineSummary, erro
 }
 
 func (a *app) clusterTaskSummary(ctx context.Context) ([]taskSummary, error) {
-	rows, err := a.db.Query(ctx, "SELECT id, name, update_time, owner_id FROM harmony_task")
+	rows, err := a.db.Query(ctx, "SELECT id, name, update_time, owner_id FROM harmony_task order by update_time asc, owner_id")
 	if err != nil {
 		return nil, err // Handle error
 	}
@@ -229,12 +229,12 @@ func (a *app) porepPipelineSummary(ctx context.Context) ([]porepPipelineSummary,
 	rows, err := a.db.Query(ctx, `
 	SELECT 
 		sp_id,
-		COUNT(*) FILTER (WHERE after_sdr = true AND after_tree_d = false) as CountSDR,
-		COUNT(*) FILTER (WHERE (after_tree_d = true OR after_tree_c = true OR after_tree_r = true) AND after_precommit_msg = false) as CountTrees,
-		COUNT(*) FILTER (WHERE after_precommit_msg = true AND after_precommit_msg_success = false) as CountPrecommitMsg,
-		COUNT(*) FILTER (WHERE after_precommit_msg_success = true AND after_porep = false) as CountWaitSeed,
-		COUNT(*) FILTER (WHERE after_porep = true AND after_commit_msg = false) as CountPoRep,
-		COUNT(*) FILTER (WHERE after_commit_msg = true AND after_commit_msg_success = false) as CountCommitMsg,
+		COUNT(*) FILTER (WHERE after_sdr = false) as CountSDR,
+		COUNT(*) FILTER (WHERE (after_tree_d = false OR after_tree_c = false OR after_tree_r = false) AND after_sdr = true) as CountTrees,
+		COUNT(*) FILTER (WHERE after_tree_r = true and after_precommit_msg = false) as CountPrecommitMsg,
+		COUNT(*) FILTER (WHERE after_precommit_msg_success = false AND after_precommit_msg = true) as CountWaitSeed,
+		COUNT(*) FILTER (WHERE after_porep = false AND after_precommit_msg_success = true) as CountPoRep,
+		COUNT(*) FILTER (WHERE after_commit_msg_success = false AND after_porep = true) as CountCommitMsg,
 		COUNT(*) FILTER (WHERE after_commit_msg_success = true) as CountDone,
 		COUNT(*) FILTER (WHERE failed = true) as CountFailed
 	FROM 
diff --git a/provider/lpweb/static/index.html b/provider/lpweb/static/index.html
index 80680f1b5..bbbd199e4 100644
--- a/provider/lpweb/static/index.html
+++ b/provider/lpweb/static/index.html
@@ -201,7 +201,7 @@
         <table>
             <thead>
             <tr>
-                <th>Task</th>
+                <th style="min-width: 128px">Task</th>
                 <th>ID</th>
                 <th>Posted</th>
                 <th>Owner</th>