#12 fix(web): round the list cursor frame at the card corners

state: merged · cc7ba64 · merge commit
branch: fix/list-cursor-corners → main
opened: bnema · 2d ago
updated: 2d ago

The row cursor in .list tables was drawn with an outline on the . A row takes no border-radius, so its square frame showed inside the rounded card.

The frame and background now sit on the cells (inset box-shadow). The cells round only where the cursor row meets a corner of the card (first or last row), with the radius of the card minus its border; middle rows stay square. The divider above the cursor row is hidden so it does not cross the frame.

Checked with Playwright on the dev server: inbox with 4 rows (first, middle, last) and a single-row MR list.

Commit	Subject	Author	Date	Signature	Status
74b956d	fix(web): round the list cursor frame at the card corners	brice	2d ago	GPG Verified

Checks 4

Image success
Lint success
Protobuf and generated code success
Test success

5 files · +21 -160

4/4

M gen/ermite/storage/ci.pb.go +1 -2 generated file: collapsed

load diff

M internal/adapters/kvstore/ci.go +6 -43


@@ -26,7 +26,6 @@ import (
26	26		// run/<repo>/<id:020d> CIRun
27	27		// runsrc/<id:020d> CIRunSource
28	28		// job/<run:020d>/<attempt:010d>/<id> CIJob
29		-	// jobctx/<run:020d>/<attempt:010d>/<id> contexts JSON
30	29		// check/<repo>/<sha>/<check id> CICheck
31	30		// runseq Sequence: last run id
32	31		// runnum/<repo>/<workflow path> Sequence: last run number

@@ -47,7 +46,6 @@ const (
47	46		runPrefix = "run/"
48	47		runSrcPrefix = "runsrc/"
49	48		jobPrefix = "job/"
50		-	jobCtxPrefix = "jobctx/"
51	49		checkPrefix = "check/"
52	50		runSeqKey = "runseq"
53	51		runNumPrefix = "runnum/"

@@ -87,10 +85,6 @@ func jobRef(runID int64, attempt int32, id string) string {
87	85		return jobAttemptPrefix(runID, attempt) + id
88	86		}
89	87		func jobKey(runID int64, attempt int32, id string) []byte { return []byte(jobRef(runID, attempt, id)) }
90		-	func jobContextsKey(runID int64, attempt int32, id string) []byte {
91		-	return []byte(jobCtxPrefix + strings.TrimPrefix(jobRef(runID, attempt, id), jobPrefix))
92		-	}
93		-
94	88		func checksPrefix(repo domain.RepoName, sha string) string {
95	89		return checkPrefix + repo.String() + "/" + sha + "/"
96	90		}

@@ -341,7 +335,7 @@ func encodeJob(j domain.CIJob) ([]byte, error) {
341	335		Labels: j.Labels, Needs: j.Needs, RunnerId: j.RunnerID, RunnerName: j.RunnerName,
342	336		Isolation: encodeIsolation(j.Isolation), Steps: steps,
343	337		CreatedAt: encodeTime(j.CreatedAt), StartedAt: encodeTime(j.StartedAt), CompletedAt: encodeTime(j.CompletedAt),
344		-	Index: int32(j.Index), Combo: int32(j.Combo), MatrixJson: j.MatrixJSON, ComboTotal: int32(j.ComboTotal), //nolint:gosec // bounded by the 256 job limit
	338	+	Index: int32(j.Index), Combo: int32(j.Combo), MatrixJson: j.MatrixJSON, ContextsJson: j.ContextsJSON, ComboTotal: int32(j.ComboTotal), //nolint:gosec // bounded by the 256 job limit
345	339		TimeoutMinutes: j.TimeoutMinutes, FailFast: j.FailFast, ContinueOnError: j.ContinueOnError, MaxParallel: int32(j.MaxParallel), //nolint:gosec // validated at planning
346	340		Outputs: j.Outputs, ReadyAt: encodeTime(j.ReadyAt), AssignedAt: encodeTime(j.AssignedAt),
347	341		AckedAt: encodeTime(j.AckedAt), AssignCancels: int32(j.AssignCancels), //nolint:gosec // at most 3

@@ -391,19 +385,6 @@ func decodeJob(item kv.Item) (domain.CIJob, error) {
391	385		return j, nil
392	386		}
393	387
394		-	// decodeJobWithContexts reads both parts from the same snapshot. The inline
395		-	// field is retained only as a fallback for records written before the split.
396		-	func decodeJobWithContexts(ctx context.Context, snap *kv.Snapshot, item kv.Item) (domain.CIJob, error) {
397		-	j, err := decodeJob(item)
398		-	if err != nil {
399		-	return domain.CIJob{}, err
400		-	}
401		-	if contexts, ok := snap.Get(ctx, jobContextsKey(j.RunID, j.RunAttempt, j.ID)); ok {
402		-	j.ContextsJSON = string(contexts.Value)
403		-	}
404		-	return j, nil
405		-	}
406		-
407	388		func encodeCheck(c domain.CICheck) []byte {
408	389		return mustMarshal(&storagepb.CICheck{
409	390		Id: c.ID, Repo: c.Repo.String(), Sha: c.Sha, Name: c.Name, Status: encodeStatus(c.Status),

@@ -534,12 +515,6 @@ func (c CI) stageRecords(ctx context.Context, b kv.Batch, w ports.CIWrite) (gu
534	515		old = &o
535	516		}
536	517		}
537		-	// Compare the separate value, not the legacy inline field: an old
538		-	// record must materialize contexts before encodeJob drops that field.
539		-	contextsKey := jobContextsKey(j.RunID, j.RunAttempt, j.ID)
540		-	if contexts, ok := c.db.Get(ctx, contextsKey); !ok \|\| string(contexts.Value) != j.ContextsJSON {
541		-	b.Put(contextsKey, []byte(j.ContextsJSON))
542		-	}
543	518		stage(b, key, val, j.Version)
544	519		c.jobIndexes(b, j, old)
545	520		if j.Version == 0 {

@@ -771,21 +746,19 @@ func (c *CI) ListOpenRuns(ctx context.Context) ([]domain.CIRun, error) {
771	746
772	747		// GetJob reads one job record.
773	748		func (c *CI) GetJob(ctx context.Context, runID int64, runAttempt int32, jobID string) (domain.CIJob, error) {
774		-	snap := c.db.Snapshot(ctx)
775		-	item, ok := snap.Get(ctx, jobKey(runID, runAttempt, jobID))
	749	+	item, ok := c.db.Get(ctx, jobKey(runID, runAttempt, jobID))
776	750		if !ok {
777	751		return domain.CIJob{}, domain.ErrNotFound
778	752		}
779		-	return decodeJobWithContexts(ctx, snap, item)
	753	+	return decodeJob(item)
780	754		}
781	755
782	756		// ListJobs returns the jobs of a run at an attempt, ordered by index then
783	757		// combination.
784	758		func (c *CI) ListJobs(ctx context.Context, runID int64, runAttempt int32) ([]domain.CIJob, error) {
785	759		var out []domain.CIJob
786		-	snap := c.db.Snapshot(ctx)
787		-	for key, item := range snap.Prefix(ctx, []byte(jobAttemptPrefix(runID, runAttempt))) {
788		-	j, err := decodeJobWithContexts(ctx, snap, item)
	760	+	for key, item := range c.db.Snapshot(ctx).Prefix(ctx, []byte(jobAttemptPrefix(runID, runAttempt))) {
	761	+	j, err := decodeJob(item)
789	762		if err != nil {
790	763		return nil, fmt.Errorf("decode %s: %w", key, err)
791	764		}

@@ -805,7 +778,7 @@ func (c CI) jobByRef(snap kv.Snapshot, ctx context.Context, ref string) (domai
805	778		if !ok {
806	779		return domain.CIJob{}, domain.ErrNotFound
807	780		}
808		-	return decodeJobWithContexts(ctx, snap, item)
	781	+	return decodeJob(item)
809	782		}
810	783
811	784		// FindJobByToken resolves the token index, then reads the job.

@@ -889,21 +862,11 @@ func (c *CI) ListChecks(ctx context.Context, repo domain.RepoName, sha string, l
889	862
890	863		// --- retention and deletion ---
891	864
892		-	// jobCtxKeys lists the contexts keys of every attempt of a run.
893		-	func jobCtxKeys(ctx context.Context, snap *kv.Snapshot, runID int64) [][]byte {
894		-	var keys [][]byte
895		-	for key := range snap.Prefix(ctx, []byte(jobCtxPrefix+fmt.Sprintf(idFormat, runID)+"/")) {
896		-	keys = append(keys, slices.Clone(key))
897		-	}
898		-	return keys
899		-	}
900		-
901	865		// runKeys lists every key of a run except its record: source, jobs, indexes.
902	866		func (c CI) runKeys(ctx context.Context, snap kv.Snapshot, repo domain.RepoName, runID int64) [][]byte {
903	867		keys := [][]byte{runKey(repo, runID), runSrcKey(runID), openKey(runID)}
904	868		keys = append(keys, repoTokenKeys(ctx, snap, runID)...)
905	869		keys = append(keys, annotationKeys(ctx, snap, runID)...)
906		-	keys = append(keys, jobCtxKeys(ctx, snap, runID)...)
907	870		for key, item := range snap.Prefix(ctx, []byte(jobsPrefix(runID))) {
908	871		keys = append(keys, slices.Clone(key))
909	872		if j, err := decodeJob(item); err == nil {

 //	run/<repo>/<id:020d>                 CIRun
 //	runsrc/<id:020d>                     CIRunSource
 //	job/<run:020d>/<attempt:010d>/<id>   CIJob
-//	jobctx/<run:020d>/<attempt:010d>/<id> contexts JSON
 //	check/<repo>/<sha>/<check id>        CICheck
 //	runseq                               Sequence: last run id
 //	runnum/<repo>/<workflow path>        Sequence: last run number
 	runPrefix     = "run/"
 	runSrcPrefix  = "runsrc/"
 	jobPrefix     = "job/"
-	jobCtxPrefix  = "jobctx/"
 	checkPrefix   = "check/"
 	runSeqKey     = "runseq"
 	runNumPrefix  = "runnum/"
 	return jobAttemptPrefix(runID, attempt) + id
 }
 func jobKey(runID int64, attempt int32, id string) []byte { return []byte(jobRef(runID, attempt, id)) }
-func jobContextsKey(runID int64, attempt int32, id string) []byte {
-	return []byte(jobCtxPrefix + strings.TrimPrefix(jobRef(runID, attempt, id), jobPrefix))
-}
 func checksPrefix(repo domain.RepoName, sha string) string {
 	return checkPrefix + repo.String() + "/" + sha + "/"
 }
 		Labels: j.Labels, Needs: j.Needs, RunnerId: j.RunnerID, RunnerName: j.RunnerName,
 		Isolation: encodeIsolation(j.Isolation), Steps: steps,
 		CreatedAt: encodeTime(j.CreatedAt), StartedAt: encodeTime(j.StartedAt), CompletedAt: encodeTime(j.CompletedAt),
-		Index: int32(j.Index), Combo: int32(j.Combo), MatrixJson: j.MatrixJSON, ComboTotal: int32(j.ComboTotal), //nolint:gosec // bounded by the 256 job limit
+		Index: int32(j.Index), Combo: int32(j.Combo), MatrixJson: j.MatrixJSON, ContextsJson: j.ContextsJSON, ComboTotal: int32(j.ComboTotal), //nolint:gosec // bounded by the 256 job limit
 		TimeoutMinutes: j.TimeoutMinutes, FailFast: j.FailFast, ContinueOnError: j.ContinueOnError, MaxParallel: int32(j.MaxParallel), //nolint:gosec // validated at planning
 		Outputs: j.Outputs, ReadyAt: encodeTime(j.ReadyAt), AssignedAt: encodeTime(j.AssignedAt),
 		AckedAt: encodeTime(j.AckedAt), AssignCancels: int32(j.AssignCancels), //nolint:gosec // at most 3
 	return j, nil
 }
-// decodeJobWithContexts reads both parts from the same snapshot. The inline
-// field is retained only as a fallback for records written before the split.
-func decodeJobWithContexts(ctx context.Context, snap *kv.Snapshot, item kv.Item) (domain.CIJob, error) {
-	j, err := decodeJob(item)
-	if err != nil {
-		return domain.CIJob{}, err
-	}
-	if contexts, ok := snap.Get(ctx, jobContextsKey(j.RunID, j.RunAttempt, j.ID)); ok {
-		j.ContextsJSON = string(contexts.Value)
-	}
-	return j, nil
-}
 func encodeCheck(c domain.CICheck) []byte {
 	return mustMarshal(&storagepb.CICheck{
 		Id: c.ID, Repo: c.Repo.String(), Sha: c.Sha, Name: c.Name, Status: encodeStatus(c.Status),
 				old = &o
 			}
 		}
-		// Compare the separate value, not the legacy inline field: an old
-		// record must materialize contexts before encodeJob drops that field.
-		contextsKey := jobContextsKey(j.RunID, j.RunAttempt, j.ID)
-		if contexts, ok := c.db.Get(ctx, contextsKey); !ok || string(contexts.Value) != j.ContextsJSON {
-			b.Put(contextsKey, []byte(j.ContextsJSON))
-		}
 		stage(b, key, val, j.Version)
 		c.jobIndexes(b, j, old)
 		if j.Version == 0 {
 // GetJob reads one job record.
 func (c *CI) GetJob(ctx context.Context, runID int64, runAttempt int32, jobID string) (domain.CIJob, error) {
-	snap := c.db.Snapshot(ctx)
+	item, ok := c.db.Get(ctx, jobKey(runID, runAttempt, jobID))
-	item, ok := snap.Get(ctx, jobKey(runID, runAttempt, jobID))
 	if !ok {
 		return domain.CIJob{}, domain.ErrNotFound
 	}
-	return decodeJobWithContexts(ctx, snap, item)
+	return decodeJob(item)
 }
 // ListJobs returns the jobs of a run at an attempt, ordered by index then
 // combination.
 func (c *CI) ListJobs(ctx context.Context, runID int64, runAttempt int32) ([]domain.CIJob, error) {
 	var out []domain.CIJob
-	snap := c.db.Snapshot(ctx)
+	for key, item := range c.db.Snapshot(ctx).Prefix(ctx, []byte(jobAttemptPrefix(runID, runAttempt))) {
-	for key, item := range snap.Prefix(ctx, []byte(jobAttemptPrefix(runID, runAttempt))) {
+		j, err := decodeJob(item)
-		j, err := decodeJobWithContexts(ctx, snap, item)
 		if err != nil {
 			return nil, fmt.Errorf("decode %s: %w", key, err)
 		}
 	if !ok {
 		return domain.CIJob{}, domain.ErrNotFound
 	}
-	return decodeJobWithContexts(ctx, snap, item)
+	return decodeJob(item)
 }
 // FindJobByToken resolves the token index, then reads the job.
 // --- retention and deletion ---
-// jobCtxKeys lists the contexts keys of every attempt of a run.
-func jobCtxKeys(ctx context.Context, snap *kv.Snapshot, runID int64) [][]byte {
-	var keys [][]byte
-	for key := range snap.Prefix(ctx, []byte(jobCtxPrefix+fmt.Sprintf(idFormat, runID)+"/")) {
-		keys = append(keys, slices.Clone(key))
-	}
-	return keys
-}
 // runKeys lists every key of a run except its record: source, jobs, indexes.
 func (c *CI) runKeys(ctx context.Context, snap *kv.Snapshot, repo domain.RepoName, runID int64) [][]byte {
 	keys := [][]byte{runKey(repo, runID), runSrcKey(runID), openKey(runID)}
 	keys = append(keys, repoTokenKeys(ctx, snap, runID)...)
 	keys = append(keys, annotationKeys(ctx, snap, runID)...)
-	keys = append(keys, jobCtxKeys(ctx, snap, runID)...)
 	for key, item := range snap.Prefix(ctx, []byte(jobsPrefix(runID))) {
 		keys = append(keys, slices.Clone(key))
 		if j, err := decodeJob(item); err == nil {

D internal/adapters/kvstore/ci_contexts_test.go +0 -111

@@ -1,111 +0,0 @@
1	-	// SPDX-License-Identifier: AGPL-3.0-or-later
2	-
3	-	package kvstore
4	-
5	-	import (
6	-	"context"
7	-	"strings"
8	-	"testing"
9	-	"time"
10	-
11	-	kv "bnema.dev/ermite-kv"
12	-	storagepb "bnema.dev/ermite/gen/ermite/storage"
13	-	"bnema.dev/ermite/internal/domain"
14	-	"bnema.dev/ermite/internal/ports"
15	-	"github.com/stretchr/testify/require"
16	-	"google.golang.org/protobuf/proto"
17	-	)
18	-
19	-	func TestCIJobContextsStorage(t *testing.T) {
20	-	ctx := context.Background()
21	-	s, err := Open(ctx, t.TempDir())
22	-	require.NoError(t, err)
23	-	t.Cleanup(func() { require.NoError(t, s.Close(ctx)) })
24	-	repo, err := domain.ParseRepoName("proj")
25	-	require.NoError(t, err)
26	-	require.NoError(t, s.Create(ctx, domain.Repo{Name: repo, Visibility: domain.VisibilityPrivate}))
27	-	ci := s.CI()
28	-	payload := `{"event":"` + strings.Repeat("payload", 3500) + `"}`
29	-	j := domain.CIJob{ID: "build", Repo: repo, RunID: 1, RunAttempt: 1, Attempt: 1, Phase: domain.CIPhaseReady, ContextsJSON: payload}
30	-	save := func() {
31	-	v, err := ci.Apply(ctx, ports.CIWrite{Jobs: []domain.CIJob{j}})
32	-	require.NoError(t, err)
33	-	j.Version = v
34	-	}
35	-	save()
36	-	contextsKey := jobContextsKey(1, 1, j.ID)
37	-	initial, ok := ci.db.Get(ctx, contextsKey)
38	-	require.True(t, ok)
39	-	for i := range 5 {
40	-	j.Steps = []domain.CIStep{{Number: int32(i + 1), Name: "step", State: domain.CIStepInProgress}}
41	-	save()
42	-	stored, ok := ci.db.Get(ctx, jobKey(1, 1, j.ID))
43	-	require.True(t, ok)
44	-	require.NotContains(t, string(stored.Value), payload)
45	-	var pb storagepb.CIJob
46	-	require.NoError(t, proto.Unmarshal(stored.Value, &pb))
47	-	require.Empty(t, pb.GetContextsJson())
48	-	contexts, ok := ci.db.Get(ctx, contextsKey)
49	-	require.True(t, ok)
50	-	require.Equal(t, initial.Version, contexts.Version, "unchanged contexts must not be rewritten")
51	-	got, err := ci.GetJob(ctx, 1, 1, j.ID)
52	-	require.NoError(t, err)
53	-	require.Equal(t, payload, got.ContextsJSON)
54	-	jobs, err := ci.ListJobs(ctx, 1, 1)
55	-	require.NoError(t, err)
56	-	require.Equal(t, payload, jobs[0].ContextsJSON)
57	-	ready, err := ci.ListReadyJobs(ctx, 0)
58	-	require.NoError(t, err)
59	-	require.Equal(t, payload, ready[0].ContextsJSON)
60	-	}
61	-	// A kept job in a re-run gets an independent contexts key.
62	-	j.RunAttempt = 2
63	-	j.Version = 0
64	-	save()
65	-	copied, ok := ci.db.Get(ctx, jobContextsKey(1, 2, j.ID))
66	-	require.True(t, ok)
67	-	require.Equal(t, payload, string(copied.Value))
68	-	j.ContextsJSON = ""
69	-	save()
70	-	got, err := ci.GetJob(ctx, 1, 2, j.ID)
71	-	require.NoError(t, err)
72	-	require.Empty(t, got.ContextsJSON)
73	-	// Sweep must remove contexts from every attempt as well as job records.
74	-	_, err = ci.Apply(ctx, ports.CIWrite{Runs: []domain.CIRun{{Repo: repo, ID: 1, Status: domain.CICompleted, CompletedAt: time.Now().Add(-time.Hour)}}})
75	-	require.NoError(t, err)
76	-	ids, err := ci.Sweep(ctx, time.Now())
77	-	require.NoError(t, err)
78	-	require.Equal(t, []int64{1}, ids)
79	-	for range ci.db.Snapshot(ctx).Prefix(ctx, []byte(jobCtxPrefix)) {
80	-	t.Fatal("orphan contexts key")
81	-	}
82	-	}
83	-
84	-	func TestCIJobLegacyContexts(t *testing.T) {
85	-	ctx := context.Background()
86	-	s, err := Open(ctx, t.TempDir())
87	-	require.NoError(t, err)
88	-	t.Cleanup(func() { require.NoError(t, s.Close(ctx)) })
89	-	ci := s.CI()
90	-	var b kv.Batch
91	-	b.Put(jobKey(1, 1, "build"), mustMarshal(&storagepb.CIJob{Id: "build", Repo: "proj", RunId: 1, RunAttempt: 1, ContextsJson: `{"legacy":true}`}))
92	-	_, err = ci.db.Apply(ctx, &b)
93	-	require.NoError(t, err)
94	-	j, err := ci.GetJob(ctx, 1, 1, "build")
95	-	require.NoError(t, err)
96	-	require.Equal(t, `{"legacy":true}`, j.ContextsJSON)
97	-	jobs, err := ci.ListJobs(ctx, 1, 1)
98	-	require.NoError(t, err)
99	-	require.Equal(t, j.ContextsJSON, jobs[0].ContextsJSON)
100	-	// Updating the legacy job moves its contexts out of the protobuf.
101	-	_, err = ci.Apply(ctx, ports.CIWrite{Jobs: []domain.CIJob{j}})
102	-	require.NoError(t, err)
103	-	got, err := ci.GetJob(ctx, 1, 1, "build")
104	-	require.NoError(t, err)
105	-	require.Equal(t, j.ContextsJSON, got.ContextsJSON)
106	-	item, ok := ci.db.Get(ctx, jobKey(1, 1, "build"))
107	-	require.True(t, ok)
108	-	pbJob, err := decodeJob(item)
109	-	require.NoError(t, err)
110	-	require.Empty(t, pbJob.ContextsJSON)
111	-	}

@@ -1,111 +0,0 @@
1	-	// SPDX-License-Identifier: AGPL-3.0-or-later
2	-
3	-	package kvstore
4	-
5	-	import (
6	-	"context"
7	-	"strings"
8	-	"testing"
9	-	"time"
10	-
11	-	kv "bnema.dev/ermite-kv"
12	-	storagepb "bnema.dev/ermite/gen/ermite/storage"
13	-	"bnema.dev/ermite/internal/domain"
14	-	"bnema.dev/ermite/internal/ports"
15	-	"github.com/stretchr/testify/require"
16	-	"google.golang.org/protobuf/proto"
17	-	)
18	-
19	-	func TestCIJobContextsStorage(t *testing.T) {
20	-	ctx := context.Background()
21	-	s, err := Open(ctx, t.TempDir())
22	-	require.NoError(t, err)
23	-	t.Cleanup(func() { require.NoError(t, s.Close(ctx)) })
24	-	repo, err := domain.ParseRepoName("proj")
25	-	require.NoError(t, err)
26	-	require.NoError(t, s.Create(ctx, domain.Repo{Name: repo, Visibility: domain.VisibilityPrivate}))
27	-	ci := s.CI()
28	-	payload := `{"event":"` + strings.Repeat("payload", 3500) + `"}`
29	-	j := domain.CIJob{ID: "build", Repo: repo, RunID: 1, RunAttempt: 1, Attempt: 1, Phase: domain.CIPhaseReady, ContextsJSON: payload}
30	-	save := func() {
31	-	v, err := ci.Apply(ctx, ports.CIWrite{Jobs: []domain.CIJob{j}})
32	-	require.NoError(t, err)
33	-	j.Version = v
34	-	}
35	-	save()
36	-	contextsKey := jobContextsKey(1, 1, j.ID)
37	-	initial, ok := ci.db.Get(ctx, contextsKey)
38	-	require.True(t, ok)
39	-	for i := range 5 {
40	-	j.Steps = []domain.CIStep{{Number: int32(i + 1), Name: "step", State: domain.CIStepInProgress}}
41	-	save()
42	-	stored, ok := ci.db.Get(ctx, jobKey(1, 1, j.ID))
43	-	require.True(t, ok)
44	-	require.NotContains(t, string(stored.Value), payload)
45	-	var pb storagepb.CIJob
46	-	require.NoError(t, proto.Unmarshal(stored.Value, &pb))
47	-	require.Empty(t, pb.GetContextsJson())
48	-	contexts, ok := ci.db.Get(ctx, contextsKey)
49	-	require.True(t, ok)
50	-	require.Equal(t, initial.Version, contexts.Version, "unchanged contexts must not be rewritten")
51	-	got, err := ci.GetJob(ctx, 1, 1, j.ID)
52	-	require.NoError(t, err)
53	-	require.Equal(t, payload, got.ContextsJSON)
54	-	jobs, err := ci.ListJobs(ctx, 1, 1)
55	-	require.NoError(t, err)
56	-	require.Equal(t, payload, jobs[0].ContextsJSON)
57	-	ready, err := ci.ListReadyJobs(ctx, 0)
58	-	require.NoError(t, err)
59	-	require.Equal(t, payload, ready[0].ContextsJSON)
60	-	}
61	-	// A kept job in a re-run gets an independent contexts key.
62	-	j.RunAttempt = 2
63	-	j.Version = 0
64	-	save()
65	-	copied, ok := ci.db.Get(ctx, jobContextsKey(1, 2, j.ID))
66	-	require.True(t, ok)
67	-	require.Equal(t, payload, string(copied.Value))
68	-	j.ContextsJSON = ""
69	-	save()
70	-	got, err := ci.GetJob(ctx, 1, 2, j.ID)
71	-	require.NoError(t, err)
72	-	require.Empty(t, got.ContextsJSON)
73	-	// Sweep must remove contexts from every attempt as well as job records.
74	-	_, err = ci.Apply(ctx, ports.CIWrite{Runs: []domain.CIRun{{Repo: repo, ID: 1, Status: domain.CICompleted, CompletedAt: time.Now().Add(-time.Hour)}}})
75	-	require.NoError(t, err)
76	-	ids, err := ci.Sweep(ctx, time.Now())
77	-	require.NoError(t, err)
78	-	require.Equal(t, []int64{1}, ids)
79	-	for range ci.db.Snapshot(ctx).Prefix(ctx, []byte(jobCtxPrefix)) {
80	-	t.Fatal("orphan contexts key")
81	-	}
82	-	}
83	-
84	-	func TestCIJobLegacyContexts(t *testing.T) {
85	-	ctx := context.Background()
86	-	s, err := Open(ctx, t.TempDir())
87	-	require.NoError(t, err)
88	-	t.Cleanup(func() { require.NoError(t, s.Close(ctx)) })
89	-	ci := s.CI()
90	-	var b kv.Batch
91	-	b.Put(jobKey(1, 1, "build"), mustMarshal(&storagepb.CIJob{Id: "build", Repo: "proj", RunId: 1, RunAttempt: 1, ContextsJson: `{"legacy":true}`}))
92	-	_, err = ci.db.Apply(ctx, &b)
93	-	require.NoError(t, err)
94	-	j, err := ci.GetJob(ctx, 1, 1, "build")
95	-	require.NoError(t, err)
96	-	require.Equal(t, `{"legacy":true}`, j.ContextsJSON)
97	-	jobs, err := ci.ListJobs(ctx, 1, 1)
98	-	require.NoError(t, err)
99	-	require.Equal(t, j.ContextsJSON, jobs[0].ContextsJSON)
100	-	// Updating the legacy job moves its contexts out of the protobuf.
101	-	_, err = ci.Apply(ctx, ports.CIWrite{Jobs: []domain.CIJob{j}})
102	-	require.NoError(t, err)
103	-	got, err := ci.GetJob(ctx, 1, 1, "build")
104	-	require.NoError(t, err)
105	-	require.Equal(t, j.ContextsJSON, got.ContextsJSON)
106	-	item, ok := ci.db.Get(ctx, jobKey(1, 1, "build"))
107	-	require.True(t, ok)
108	-	pbJob, err := decodeJob(item)
109	-	require.NoError(t, err)
110	-	require.Empty(t, pbJob.ContextsJSON)
111	-	}

M internal/adapters/web/static/css/30-list.css +13 -2


@@ -15,8 +15,19 @@
15	15		& td { height: 40px; padding: 0 var(--s3); overflow: hidden; text-overflow: ellipsis; white-space: nowrap; border-top: 1px solid var(--border); }
16	16		& tbody tr:first-child td { border-top: 0; }
17	17		& tbody tr:hover { background: var(--bg-raised); }
18		-	/* the cursor: the row raised, framed by one even line */
19		-	& tbody tr[data-cursor] { background: var(--bg-raised); outline: 1px solid var(--accent); outline-offset: -1px; }
	18	+	/* the cursor: the row raised, framed by one even line. The frame is drawn
	19	+	on the cells (a row takes no radius), so it can follow the card's
	20	+	curve when the row sits at a corner. */
	21	+	& tbody tr[data-cursor] > td {
	22	+	background: var(--bg-raised); border-top-color: transparent;
	23	+	box-shadow: inset 0 1px var(--accent), inset 0 -1px var(--accent);
	24	+	}
	25	+	& tbody tr[data-cursor] > td:first-child { box-shadow: inset 1px 0 var(--accent), inset 0 1px var(--accent), inset 0 -1px var(--accent); }
	26	+	& tbody tr[data-cursor] > td:last-child { box-shadow: inset -1px 0 var(--accent), inset 0 1px var(--accent), inset 0 -1px var(--accent); }
	27	+	& > tbody:first-child > tr[data-cursor]:first-child > td:first-child { border-top-left-radius: calc(var(--r) - 1px); }
	28	+	& > tbody:first-child > tr[data-cursor]:first-child > td:last-child { border-top-right-radius: calc(var(--r) - 1px); }
	29	+	& > tbody:last-child > tr[data-cursor]:last-child > td:first-child { border-bottom-left-radius: calc(var(--r) - 1px); }
	30	+	& > tbody:last-child > tr[data-cursor]:last-child > td:last-child { border-bottom-right-radius: calc(var(--r) - 1px); }
20	31		& tbody tr[hidden] { display: none; }
21	32		& td > a { text-decoration: none; }
22	33		& td > a:first-child { color: var(--ink-hi); }


@@ -15,8 +15,19 @@
15		& td { height: 40px; padding: 0 var(--s3); overflow: hidden; text-overflow: ellipsis; white-space: nowrap; border-top: 1px solid var(--border); }	15		& td { height: 40px; padding: 0 var(--s3); overflow: hidden; text-overflow: ellipsis; white-space: nowrap; border-top: 1px solid var(--border); }
16		& tbody tr:first-child td { border-top: 0; }	16		& tbody tr:first-child td { border-top: 0; }
17		& tbody tr:hover { background: var(--bg-raised); }	17		& tbody tr:hover { background: var(--bg-raised); }
18	-	/* the cursor: the row raised, framed by one even line */	18	+	/* the cursor: the row raised, framed by one even line. The frame is drawn
19	-	& tbody tr[data-cursor] { background: var(--bg-raised); outline: 1px solid var(--accent); outline-offset: -1px; }	19	+	on the cells (a row takes no radius), so it can follow the card's
			20	+	curve when the row sits at a corner. */
			21	+	& tbody tr[data-cursor] > td {
			22	+	background: var(--bg-raised); border-top-color: transparent;
			23	+	box-shadow: inset 0 1px var(--accent), inset 0 -1px var(--accent);
			24	+	}
			25	+	& tbody tr[data-cursor] > td:first-child { box-shadow: inset 1px 0 var(--accent), inset 0 1px var(--accent), inset 0 -1px var(--accent); }
			26	+	& tbody tr[data-cursor] > td:last-child { box-shadow: inset -1px 0 var(--accent), inset 0 1px var(--accent), inset 0 -1px var(--accent); }
			27	+	& > tbody:first-child > tr[data-cursor]:first-child > td:first-child { border-top-left-radius: calc(var(--r) - 1px); }
			28	+	& > tbody:first-child > tr[data-cursor]:first-child > td:last-child { border-top-right-radius: calc(var(--r) - 1px); }
			29	+	& > tbody:last-child > tr[data-cursor]:last-child > td:first-child { border-bottom-left-radius: calc(var(--r) - 1px); }
			30	+	& > tbody:last-child > tr[data-cursor]:last-child > td:last-child { border-bottom-right-radius: calc(var(--r) - 1px); }
20		& tbody tr[hidden] { display: none; }	31		& tbody tr[hidden] { display: none; }
21		& td > a { text-decoration: none; }	32		& td > a { text-decoration: none; }
22		& td > a:first-child { color: var(--ink-hi); }	33		& td > a:first-child { color: var(--ink-hi); }

M proto/ermite/storage/ci.proto +1 -2


@@ -203,8 +203,7 @@ message CIJob {
203	203		// keeps its own attempt.
204	204		int32 run_attempt = 38;
205	205		// The contexts JSON given to the runner, computed when the job is planned
206		-	// (needs outputs are final then). No longer written: stored under jobctx/
207		-	// instead. Retained as a read fallback for legacy records.
	206	+	// (needs outputs are final then).
208	207		string contexts_json = 39;
209	208		// The job's continue-on-error, evaluated when the job is planned: a failure
210	209		// of the job does not fail the run, does not cancel the siblings of its

   // keeps its own attempt.
   int32 run_attempt = 38;
   // The contexts JSON given to the runner, computed when the job is planned
-  // (needs outputs are final then). No longer written: stored under jobctx/
+  // (needs outputs are final then).
-  // instead. Retained as a read fallback for legacy records.
   string contexts_json = 39;
   // The job's continue-on-error, evaluated when the job is planned: a failure
   // of the job does not fail the run, does not cancel the siblings of its

Comments0 open / 0

no comments yet.

Merge settings

Comments0 open / 0