BlueGit

timfa bluegit

fix: filter de joblijst op de gekozen stage

display:flex op de zijlijst won van het hidden-attribuut, dus de
stagekiezer leek niets te doen. De gekozen stage blijft staan terwijl
de log live wordt bijgewerkt.

Co-authored-by: tim <tim@timfalken.com>

timfa project_87923614_bot_3aff574f6f98414b945a8799374f9092 · pushed by timfa

Authored 2026-10-23 · 3 weeks ago

Hash
bf7be5d2931eee5f5566e19203bfc42ff3adb107
Parent
9787ad7b
Pipeline
Passed
3 files changed +36 −4
internal/server/pipeline_page_test.go +26 −0
@@ -7,6 +7,7 @@ import (
7 7 "net/http/cookiejar"
8 8 "net/http/httptest"
9 9 "net/url"
10 "os"
10 11 "path/filepath"
11 12 "strconv"
12 13 "strings"
@@ -35,6 +36,27 @@ func TestParseLogSections(t *testing.T) {
35 36 }
36 37 }
37 38
39 func TestJobStageFilterStays(t *testing.T) {
40 css, err := os.ReadFile("static/style.css")
41 if err != nil {
42 t.Fatal(err)
43 }
44 if !strings.Contains(string(css), ".related li[hidden] { display: none !important; }") {
45 t.Fatal("display:flex op .related li wint van het hidden-attribuut")
46 }
47 js, err := os.ReadFile("static/pipeline.js")
48 if err != nil {
49 t.Fatal(err)
50 }
51 src := string(js)
52 if !strings.Contains(src, "applyStage(stageSelect.value)") {
53 t.Fatal("de live-poll moet de gekozen stage opnieuw toepassen")
54 }
55 if strings.Contains(src, "stageSelect.value =") {
56 t.Fatal("de poll mag de gekozen stage niet overschrijven")
57 }
58 }
59
38 60 func TestPipelinePages(t *testing.T) {
39 61 storage := t.TempDir()
40 62 st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
@@ -181,12 +203,16 @@ func TestPipelinePages(t *testing.T) {
181 203 `class="ansi-bold ansi-fg-red"`, ">rood<",
182 204 "Running on Steve", "Log timestamps in UTC.", "Related jobs", ">Steve<", "Push",
183 205 `data-stage="deploy" hidden`, `value="test" selected`,
206 `data-stage-select`, `/assets/pipeline.js`,
184 207 "for", "v0.0.26",
185 208 } {
186 209 if !strings.Contains(jobPage, want) {
187 210 t.Errorf("jobpagina mist %q", want)
188 211 }
189 212 }
213 if strings.Contains(jobPage, `data-stage="test" hidden`) {
214 t.Fatal("de stage van de huidige job hoort zichtbaar te zijn")
215 }
190 216
191 217 res, err = client.Get(jobURL + "/log?raw=1")
192 218 if err != nil {
@@ -7,6 +7,7 @@ import (
7 "net/http/cookiejar"
7 "net/http/cookiejar"
8 "net/http/httptest"
8 "net/http/httptest"
9 "net/url"
9 "net/url"
10 "os"
10 "path/filepath"
11 "path/filepath"
11 "strconv"
12 "strconv"
12 "strings"
13 "strings"
@@ -35,6 +36,27 @@ func TestParseLogSections(t *testing.T) {
35 }
36 }
36}
37}
37
38
39func TestJobStageFilterStays(t *testing.T) {
40 css, err := os.ReadFile("static/style.css")
41 if err != nil {
42 t.Fatal(err)
43 }
44 if !strings.Contains(string(css), ".related li[hidden] { display: none !important; }") {
45 t.Fatal("display:flex op .related li wint van het hidden-attribuut")
46 }
47 js, err := os.ReadFile("static/pipeline.js")
48 if err != nil {
49 t.Fatal(err)
50 }
51 src := string(js)
52 if !strings.Contains(src, "applyStage(stageSelect.value)") {
53 t.Fatal("de live-poll moet de gekozen stage opnieuw toepassen")
54 }
55 if strings.Contains(src, "stageSelect.value =") {
56 t.Fatal("de poll mag de gekozen stage niet overschrijven")
57 }
58}
59
38func TestPipelinePages(t *testing.T) {
60func TestPipelinePages(t *testing.T) {
39 storage := t.TempDir()
61 storage := t.TempDir()
40 st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
62 st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
@@ -181,12 +203,16 @@ func TestPipelinePages(t *testing.T) {
181 `class="ansi-bold ansi-fg-red"`, ">rood<",
203 `class="ansi-bold ansi-fg-red"`, ">rood<",
182 "Running on Steve", "Log timestamps in UTC.", "Related jobs", ">Steve<", "Push",
204 "Running on Steve", "Log timestamps in UTC.", "Related jobs", ">Steve<", "Push",
183 `data-stage="deploy" hidden`, `value="test" selected`,
205 `data-stage="deploy" hidden`, `value="test" selected`,
206 `data-stage-select`, `/assets/pipeline.js`,
184 "for", "v0.0.26",
207 "for", "v0.0.26",
185 } {
208 } {
186 if !strings.Contains(jobPage, want) {
209 if !strings.Contains(jobPage, want) {
187 t.Errorf("jobpagina mist %q", want)
210 t.Errorf("jobpagina mist %q", want)
188 }
211 }
189 }
212 }
213 if strings.Contains(jobPage, `data-stage="test" hidden`) {
214 t.Fatal("de stage van de huidige job hoort zichtbaar te zijn")
215 }
190
216
191 res, err = client.Get(jobURL + "/log?raw=1")
217 res, err = client.Get(jobURL + "/log?raw=1")
192 if err != nil {
218 if err != nil {
internal/server/static/pipeline.js +9 −4
@@ -100,12 +100,14 @@
100 100 }
101 101
102 102 var stageSelect = document.querySelector("[data-stage-select]");
103 function applyStage(want) {
104 document.querySelectorAll(".related li").forEach(function (li) {
105 li.hidden = li.getAttribute("data-stage") !== want;
106 });
107 }
103 108 if (stageSelect) {
104 109 stageSelect.addEventListener("change", function () {
105 var want = stageSelect.value;
106 document.querySelectorAll(".related li").forEach(function (li) {
107 li.hidden = li.getAttribute("data-stage") !== want;
108 });
110 applyStage(stageSelect.value);
109 111 });
110 112 }
111 113
@@ -624,6 +626,9 @@
624 626 qEl.textContent = data.queue || "";
625 627 qEl.hidden = !data.queue;
626 628 }
629 if (stageSelect) {
630 applyStage(stageSelect.value);
631 }
627 632 if (data.status === "running" || data.status === "queued") {
628 633 setTimeout(poll, 1500);
629 634 return;
@@ -100,12 +100,14 @@
100 }
100 }
101
101
102 var stageSelect = document.querySelector("[data-stage-select]");
102 var stageSelect = document.querySelector("[data-stage-select]");
103 function applyStage(want) {
104 document.querySelectorAll(".related li").forEach(function (li) {
105 li.hidden = li.getAttribute("data-stage") !== want;
106 });
107 }
103 if (stageSelect) {
108 if (stageSelect) {
104 stageSelect.addEventListener("change", function () {
109 stageSelect.addEventListener("change", function () {
105 var want = stageSelect.value;
110 applyStage(stageSelect.value);
106 document.querySelectorAll(".related li").forEach(function (li) {
107 li.hidden = li.getAttribute("data-stage") !== want;
108 });
109 });
111 });
110 }
112 }
111
113
@@ -624,6 +626,9 @@
624 qEl.textContent = data.queue || "";
626 qEl.textContent = data.queue || "";
625 qEl.hidden = !data.queue;
627 qEl.hidden = !data.queue;
626 }
628 }
629 if (stageSelect) {
630 applyStage(stageSelect.value);
631 }
627 if (data.status === "running" || data.status === "queued") {
632 if (data.status === "running" || data.status === "queued") {
628 setTimeout(poll, 1500);
633 setTimeout(poll, 1500);
629 return;
634 return;
internal/server/static/style.css +1 −0
@@ -801,6 +801,7 @@ button.section-toggle {
801 801 .jobside h2 { font-size: 0.95rem; margin: 0.9rem 0 0.3rem; }
802 802 .related { list-style: none; margin: 0; padding: 0; }
803 803 .related li { display: flex; align-items: center; gap: 0.3rem; }
804 .related li[hidden] { display: none !important; }
804 805 .related .arrow { width: 1rem; color: var(--muted); }
805 806 .editorhead { display: flex; justify-content: space-between; align-items: center; gap: 1rem; margin-bottom: 0.7rem; }
806 807 .editorhead h2 { margin: 0; font-size: 1.15rem; }
@@ -801,6 +801,7 @@ button.section-toggle {
801.jobside h2 { font-size: 0.95rem; margin: 0.9rem 0 0.3rem; }
801.jobside h2 { font-size: 0.95rem; margin: 0.9rem 0 0.3rem; }
802.related { list-style: none; margin: 0; padding: 0; }
802.related { list-style: none; margin: 0; padding: 0; }
803.related li { display: flex; align-items: center; gap: 0.3rem; }
803.related li { display: flex; align-items: center; gap: 0.3rem; }
804.related li[hidden] { display: none !important; }
804.related .arrow { width: 1rem; color: var(--muted); }
805.related .arrow { width: 1rem; color: var(--muted); }
805.editorhead { display: flex; justify-content: space-between; align-items: center; gap: 1rem; margin-bottom: 0.7rem; }
806.editorhead { display: flex; justify-content: space-between; align-items: center; gap: 1rem; margin-bottom: 0.7rem; }
806.editorhead h2 { margin: 0; font-size: 1.15rem; }
807.editorhead h2 { margin: 0; font-size: 1.15rem; }