feat: ability to view previous logs for Actions runs that have been retried (#9017)
Adds a new dropdown to the job logs, visible only when a job has been retried at least once:  When an older run attempt from the dropdown is selected, displays the older run's logs:  Context on implementation & design decisions: - It is important that when a URL from an Action's log is shared, the person on the other side sees the exact same logs that were being viewed. For this reason, all log views are automatically redirected to a fully-qualified URL (including the *run*, *job*, and *attempt*), so that when they are shared there is a guarantee of stability in the viewed logs. - Individual jobs can be rerun any number of times independent of other jobs in the same workflow. This means there isn't a "set" of related jobs that were executed at the same time, and this led me to remove the display of current status of jobs on the left-hand side of the view. There isn't a logical set of job statuses to display here. Fixes #1043. Based upon @gmem's original work in #1416. ## Checklist The [contributor guide](https://forgejo.org/docs/next/contributor/) contains information that will be helpful to first time contributors. There also are a few [conditions for merging Pull Requests in Forgejo repositories](https://codeberg.org/forgejo/governance/src/branch/main/PullRequestsAgreement.md). You are also welcome to join the [Forgejo development chatroom](https://matrix.to/#/#forgejo-development:matrix.org). ### Tests - I added test coverage for Go changes... - [x] in their respective `*_test.go` for unit tests. - [ ] in the `tests/integration` directory if it involves interactions with a live Forgejo server. - I added test coverage for JavaScript changes... - [x] in `web_src/js/*.test.js` if it can be unit tested. - [ ] in `tests/e2e/*.test.e2e.js` if it requires interactions with a live Forgejo server (see also the [developer guide for JavaScript testing](https://codeberg.org/forgejo/forgejo/src/branch/forgejo/tests/e2e/README.md#end-to-end-tests)). ### Documentation - [ ] I created a pull request [to the documentation](https://codeberg.org/forgejo/docs) to explain to Forgejo users how to use this change. - [x] I did not document these changes and I do not expect someone else to do it. ### Release notes - [ ] I do not want this change to show in the release notes. - [x] I want the title to show in the release notes with a link to this pull request. - [ ] I want the content of the `release-notes/<pull request number>.md` to be be used for the release notes instead of the title. <!--start release-notes-assistant--> ## Release notes <!--URL:https://codeberg.org/forgejo/forgejo--> - User Interface features - [PR](https://codeberg.org/forgejo/forgejo/pulls/9017): <!--number 9017 --><!--line 0 --><!--description YWJpbGl0eSB0byB2aWV3IHByZXZpb3VzIGxvZ3MgZm9yIEFjdGlvbnMgcnVucyB0aGF0IGhhdmUgYmVlbiByZXRyaWVk-->ability to view previous logs for Actions runs that have been retried<!--description--> <!--end release-notes-assistant--> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/9017 Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org> Co-authored-by: Mathieu Fenniak <mathieu@fenniak.net> Co-committed-by: Mathieu Fenniak <mathieu@fenniak.net>
This commit is contained in:
Mathieu Fenniak
Earl Warren
parent
b8906423df
commit
8e813902c5
18 changed files with 765 additions and 38 deletions
4
Makefile
4
Makefile
|
|
@ -527,7 +527,7 @@ test: test-frontend test-backend
|
|||
.PHONY: test-backend
|
||||
test-backend:
|
||||
@echo "Running go test with $(GOTESTFLAGS) -tags '$(TEST_TAGS)'..."
|
||||
@$(GOTEST) $(GOTESTFLAGS) -tags='$(TEST_TAGS)' $(GO_TEST_PACKAGES)
|
||||
@TZ=UTC $(GOTEST) $(GOTESTFLAGS) -tags='$(TEST_TAGS)' $(GO_TEST_PACKAGES)
|
||||
|
||||
.PHONY: test-remote-cacher
|
||||
test-remote-cacher:
|
||||
|
|
@ -557,7 +557,7 @@ test-check:
|
|||
.PHONY: test\#%
|
||||
test\#%:
|
||||
@echo "Running go test with $(GOTESTFLAGS) -tags '$(TEST_TAGS)'..."
|
||||
@$(GOTEST) $(GOTESTFLAGS) -tags='$(TEST_TAGS)' -run $(subst .,/,$*) $(GO_TEST_PACKAGES)
|
||||
@TZ=UTC $(GOTEST) $(GOTESTFLAGS) -tags='$(TEST_TAGS)' -run $(subst .,/,$*) $(GO_TEST_PACKAGES)
|
||||
|
||||
coverage-merge:
|
||||
rm -fr coverage/merged ; mkdir -p coverage/merged
|
||||
|
|
|
|||
|
|
@ -15,6 +15,10 @@ func TestMain(m *testing.M) {
|
|||
"action_runner.yml",
|
||||
"repository.yml",
|
||||
"action_runner_token.yml",
|
||||
"user.yml",
|
||||
"action_run.yml",
|
||||
"action_run_job.yml",
|
||||
"action_task.yml",
|
||||
},
|
||||
})
|
||||
}
|
||||
|
|
|
|||
|
|
@ -44,6 +44,31 @@ func init() {
|
|||
db.RegisterModel(new(ActionRunJob))
|
||||
}
|
||||
|
||||
func (job *ActionRunJob) HTMLURL(ctx context.Context) (string, error) {
|
||||
if job.Run == nil || job.Run.Repo == nil {
|
||||
return "", fmt.Errorf("action_run_job: load run and repo before accessing HTMLURL")
|
||||
}
|
||||
|
||||
// Find the "index" of the currently selected job... kinda ugly that the URL uses the index rather than some other
|
||||
// unique identifier of the job which could actually be stored upon it. But hard to change that now.
|
||||
allJobs, err := GetRunJobsByRunID(ctx, job.RunID)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
jobIndex := -1
|
||||
for i, otherJob := range allJobs {
|
||||
if job.ID == otherJob.ID {
|
||||
jobIndex = i
|
||||
break
|
||||
}
|
||||
}
|
||||
if jobIndex == -1 {
|
||||
return "", fmt.Errorf("action_run_job: unable to find job on run: %d", job.ID)
|
||||
}
|
||||
|
||||
return fmt.Sprintf("%s/actions/runs/%d/jobs/%d/attempt/%d", job.Run.Repo.HTMLURL(), job.Run.Index, jobIndex, job.Attempt), nil
|
||||
}
|
||||
|
||||
func (job *ActionRunJob) Duration() time.Duration {
|
||||
return calculateDuration(job.Started, job.Stopped, job.Status)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,9 +3,14 @@
|
|||
package actions
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"testing"
|
||||
|
||||
"forgejo.org/models/db"
|
||||
"forgejo.org/models/unittest"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
func TestActionRunJob_ItRunsOn(t *testing.T) {
|
||||
|
|
@ -27,3 +32,41 @@ func TestActionRunJob_ItRunsOn(t *testing.T) {
|
|||
|
||||
assert.False(t, actionJob.ItRunsOn(agentLabels))
|
||||
}
|
||||
|
||||
func TestActionRunJob_HTMLURL(t *testing.T) {
|
||||
require.NoError(t, unittest.PrepareTestDatabase())
|
||||
|
||||
tests := []struct {
|
||||
id int64
|
||||
expected string
|
||||
}{
|
||||
{
|
||||
id: 192,
|
||||
expected: "https://try.gitea.io/user5/repo4/actions/runs/187/jobs/0/attempt/1",
|
||||
},
|
||||
{
|
||||
id: 393,
|
||||
expected: "https://try.gitea.io/user2/repo1/actions/runs/187/jobs/1/attempt/1",
|
||||
},
|
||||
{
|
||||
id: 394,
|
||||
expected: "https://try.gitea.io/user2/repo1/actions/runs/187/jobs/2/attempt/2",
|
||||
},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
t.Run(fmt.Sprintf("id=%d", tt.id), func(t *testing.T) {
|
||||
var job ActionRunJob
|
||||
has, err := db.GetEngine(t.Context()).Where("id=?", tt.id).Get(&job)
|
||||
require.NoError(t, err)
|
||||
require.True(t, has, "load ActionRunJob from fixture")
|
||||
|
||||
err = job.LoadAttributes(t.Context())
|
||||
require.NoError(t, err)
|
||||
|
||||
url, err := job.HTMLURL(t.Context())
|
||||
require.NoError(t, err)
|
||||
assert.Equal(t, tt.expected, url)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -148,6 +148,21 @@ func (task *ActionTask) GenerateToken() (err error) {
|
|||
return err
|
||||
}
|
||||
|
||||
// Retrieve all the attempts from the same job as the target `ActionTask`. Limited fields are queried to avoid loading
|
||||
// the LogIndexes blob when not needed.
|
||||
func (task *ActionTask) GetAllAttempts(ctx context.Context) ([]*ActionTask, error) {
|
||||
var attempts []*ActionTask
|
||||
err := db.GetEngine(ctx).
|
||||
Cols("id", "attempt", "status", "started").
|
||||
Where("job_id=?", task.JobID).
|
||||
Desc("attempt").
|
||||
Find(&attempts)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return attempts, nil
|
||||
}
|
||||
|
||||
func GetTaskByID(ctx context.Context, id int64) (*ActionTask, error) {
|
||||
var task ActionTask
|
||||
has, err := db.GetEngine(ctx).Where("id=?", id).Get(&task)
|
||||
|
|
@ -160,6 +175,18 @@ func GetTaskByID(ctx context.Context, id int64) (*ActionTask, error) {
|
|||
return &task, nil
|
||||
}
|
||||
|
||||
func GetTaskByJobAttempt(ctx context.Context, jobID, attempt int64) (*ActionTask, error) {
|
||||
var task ActionTask
|
||||
has, err := db.GetEngine(ctx).Where("job_id=?", jobID).Where("attempt=?", attempt).Get(&task)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
} else if !has {
|
||||
return nil, fmt.Errorf("task with job_id %d and attempt %d: %w", jobID, attempt, util.ErrNotExist)
|
||||
}
|
||||
|
||||
return &task, nil
|
||||
}
|
||||
|
||||
func GetRunningTaskByToken(ctx context.Context, token string) (*ActionTask, error) {
|
||||
errNotExist := fmt.Errorf("task with token %q: %w", token, util.ErrNotExist)
|
||||
if token == "" {
|
||||
|
|
|
|||
48
models/actions/task_test.go
Normal file
48
models/actions/task_test.go
Normal file
|
|
@ -0,0 +1,48 @@
|
|||
// Copyright 2025 The Forgejo Authors. All rights reserved.
|
||||
// SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
package actions
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"forgejo.org/models/db"
|
||||
"forgejo.org/models/unittest"
|
||||
"forgejo.org/modules/timeutil"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
func TestActionTask_GetAllAttempts(t *testing.T) {
|
||||
require.NoError(t, unittest.PrepareTestDatabase())
|
||||
|
||||
var task ActionTask
|
||||
has, err := db.GetEngine(t.Context()).Where("id=?", 47).Get(&task)
|
||||
require.NoError(t, err)
|
||||
require.True(t, has, "load ActionTask from fixture")
|
||||
|
||||
allAttempts, err := task.GetAllAttempts(t.Context())
|
||||
require.NoError(t, err)
|
||||
require.Len(t, allAttempts, 3)
|
||||
assert.EqualValues(t, 47, allAttempts[0].ID, "ordered by attempt, 1")
|
||||
assert.EqualValues(t, 53, allAttempts[1].ID, "ordered by attempt, 2")
|
||||
assert.EqualValues(t, 52, allAttempts[2].ID, "ordered by attempt, 3")
|
||||
|
||||
// GetAllAttempts doesn't populate all fields; so check expected fields from one of the records
|
||||
assert.EqualValues(t, 3, allAttempts[0].Attempt, "read Attempt field")
|
||||
assert.Equal(t, StatusRunning, allAttempts[0].Status, "read Status field")
|
||||
assert.Equal(t, timeutil.TimeStamp(1683636528), allAttempts[0].Started, "read Started field")
|
||||
}
|
||||
|
||||
func TestActionTask_GetTaskByJobAttempt(t *testing.T) {
|
||||
require.NoError(t, unittest.PrepareTestDatabase())
|
||||
|
||||
task, err := GetTaskByJobAttempt(t.Context(), 192, 2)
|
||||
require.NoError(t, err)
|
||||
assert.EqualValues(t, 192, task.JobID)
|
||||
assert.EqualValues(t, 2, task.Attempt)
|
||||
|
||||
_, err = GetTaskByJobAttempt(t.Context(), 192, 100)
|
||||
assert.ErrorContains(t, err, "task with job_id 192 and attempt 100: resource does not exist")
|
||||
}
|
||||
|
|
@ -106,7 +106,7 @@
|
|||
commit_sha: 985f0301dba5e7b34be866819cd15ad3d8f508ee
|
||||
is_fork_pull_request: 0
|
||||
name: job_2
|
||||
attempt: 1
|
||||
attempt: 2
|
||||
job_id: job_2
|
||||
task_id: 47
|
||||
status: 5
|
||||
|
|
|
|||
|
|
@ -117,3 +117,43 @@
|
|||
log_length: 707
|
||||
log_size: 90179
|
||||
log_expired: 0
|
||||
-
|
||||
id: 52
|
||||
job_id: 192
|
||||
attempt: 1
|
||||
runner_id: 1
|
||||
status: 1 # success
|
||||
started: 1683636528
|
||||
stopped: 1683636626
|
||||
repo_id: 4
|
||||
owner_id: 1
|
||||
commit_sha: c2d72f548424103f01ee1dc02889c1e2bff816b0
|
||||
is_fork_pull_request: 0
|
||||
token_hash: b8d3962425466b6709b9ac51446f93260c54afe8e7b6d3686e34f991fb8a8953822b0deed86fe41a103f34bc48dbc4784223
|
||||
token_salt: ffffffffff
|
||||
token_last_eight: ffffffff
|
||||
log_filename: artifact-test2/2f/47.log
|
||||
log_in_storage: 1
|
||||
log_length: 707
|
||||
log_size: 90179
|
||||
log_expired: 0
|
||||
-
|
||||
id: 53
|
||||
job_id: 192
|
||||
attempt: 2
|
||||
runner_id: 1
|
||||
status: 1 # success
|
||||
started: 1683636528
|
||||
stopped: 1683636626
|
||||
repo_id: 4
|
||||
owner_id: 1
|
||||
commit_sha: c2d72f548424103f01ee1dc02889c1e2bff816b0
|
||||
is_fork_pull_request: 0
|
||||
token_hash: b8d3962425466b6709b9ac51446f93260c54afe8e7b6d3686e34f991fb8a8953822b0deed86fe41a103f34bc48dbc4784224
|
||||
token_salt: ffffffffff
|
||||
token_last_eight: ffffffff
|
||||
log_filename: artifact-test2/2f/47.log
|
||||
log_in_storage: 1
|
||||
log_length: 707
|
||||
log_size: 90179
|
||||
log_expired: 0
|
||||
|
|
|
|||
|
|
@ -145,5 +145,8 @@
|
|||
"migrate.pagure.token_label": "Token",
|
||||
"migrate.pagure.token_body_a": "Provide a Pagure API token with access to the private issues to create a repository with just the private issues in it",
|
||||
"migrate.pagure.token_body_b": "Be sure to set the private repo flag above if you want this repo to be private",
|
||||
"actions.runs.run_attempt_label": "Run attempt #%[1]s (%[2]s)",
|
||||
"actions.runs.viewing_out_of_date_run": "You are viewing an out-of-date run of this job that was executed %[1]s.",
|
||||
"actions.runs.view_most_recent_run": "View most recent run",
|
||||
"meta.last_line": "Thank you for translating Forgejo! This line isn't seen by the users but it serves other purposes in the translation management. You can place a fun fact in the translation instead of translating it."
|
||||
}
|
||||
|
|
|
|||
|
|
@ -40,10 +40,31 @@ import (
|
|||
"xorm.io/builder"
|
||||
)
|
||||
|
||||
func RedirectToLatestAttempt(ctx *context_module.Context) {
|
||||
runIndex := ctx.ParamsInt64("run")
|
||||
jobIndex := ctx.ParamsInt64("job")
|
||||
|
||||
job, _ := getRunJobs(ctx, runIndex, jobIndex)
|
||||
if ctx.Written() {
|
||||
return
|
||||
}
|
||||
|
||||
jobURL, err := job.HTMLURL(ctx)
|
||||
if err != nil {
|
||||
ctx.Error(http.StatusInternalServerError, err.Error())
|
||||
return
|
||||
}
|
||||
|
||||
ctx.Redirect(jobURL, http.StatusTemporaryRedirect)
|
||||
}
|
||||
|
||||
func View(ctx *context_module.Context) {
|
||||
ctx.Data["PageIsActions"] = true
|
||||
runIndex := ctx.ParamsInt64("run")
|
||||
jobIndex := ctx.ParamsInt64("job")
|
||||
// note: this is `attemptNumber` not `attemptIndex` since this value has to matches the ActionTask's Attempt field
|
||||
// which uses 1-based numbering... would be confusing as "Index" if it later can't be used to index an slice/array.
|
||||
attemptNumber := ctx.ParamsInt64("attempt")
|
||||
|
||||
job, _ := getRunJobs(ctx, runIndex, jobIndex)
|
||||
if ctx.Written() {
|
||||
|
|
@ -56,6 +77,7 @@ func View(ctx *context_module.Context) {
|
|||
ctx.Data["RunID"] = job.Run.ID
|
||||
ctx.Data["JobIndex"] = jobIndex
|
||||
ctx.Data["ActionsURL"] = ctx.Repo.RepoLink + "/actions"
|
||||
ctx.Data["AttemptNumber"] = attemptNumber
|
||||
ctx.Data["WorkflowName"] = workflowName
|
||||
ctx.Data["WorkflowURL"] = ctx.Repo.RepoLink + "/actions?workflow=" + workflowName
|
||||
|
||||
|
|
@ -136,9 +158,10 @@ type ViewRunInfo struct {
|
|||
}
|
||||
|
||||
type ViewCurrentJob struct {
|
||||
Title string `json:"title"`
|
||||
Detail string `json:"detail"`
|
||||
Steps []*ViewJobStep `json:"steps"`
|
||||
Title string `json:"title"`
|
||||
Detail string `json:"detail"`
|
||||
Steps []*ViewJobStep `json:"steps"`
|
||||
AllAttempts []*TaskAttempt `json:"allAttempts"`
|
||||
}
|
||||
|
||||
type ViewLogs struct {
|
||||
|
|
@ -193,10 +216,19 @@ type ViewStepLogLine struct {
|
|||
Timestamp float64 `json:"timestamp"`
|
||||
}
|
||||
|
||||
type TaskAttempt struct {
|
||||
Number int64 `json:"number"`
|
||||
Started template.HTML `json:"time_since_started_html"`
|
||||
Status string `json:"status"`
|
||||
}
|
||||
|
||||
func ViewPost(ctx *context_module.Context) {
|
||||
req := web.GetForm(ctx).(*ViewRequest)
|
||||
runIndex := ctx.ParamsInt64("run")
|
||||
jobIndex := ctx.ParamsInt64("job")
|
||||
// note: this is `attemptNumber` not `attemptIndex` since this value has to matches the ActionTask's Attempt field
|
||||
// which uses 1-based numbering... would be confusing as "Index" if it later can't be used to index an slice/array.
|
||||
attemptNumber := ctx.ParamsInt64("attempt")
|
||||
|
||||
current, jobs := getRunJobs(ctx, runIndex, jobIndex)
|
||||
if ctx.Written() {
|
||||
|
|
@ -274,7 +306,7 @@ func ViewPost(ctx *context_module.Context) {
|
|||
var task *actions_model.ActionTask
|
||||
if current.TaskID > 0 {
|
||||
var err error
|
||||
task, err = actions_model.GetTaskByID(ctx, current.TaskID)
|
||||
task, err = actions_model.GetTaskByJobAttempt(ctx, current.ID, attemptNumber)
|
||||
if err != nil {
|
||||
ctx.Error(http.StatusInternalServerError, err.Error())
|
||||
return
|
||||
|
|
@ -294,8 +326,22 @@ func ViewPost(ctx *context_module.Context) {
|
|||
resp.State.CurrentJob.Steps = make([]*ViewJobStep, 0) // marshal to '[]' instead of 'null' in json
|
||||
resp.Logs.StepsLog = make([]*ViewStepLog, 0) // marshal to '[]' instead of 'null' in json
|
||||
if task != nil {
|
||||
steps := actions.FullSteps(task)
|
||||
taskAttempts, err := task.GetAllAttempts(ctx)
|
||||
if err != nil {
|
||||
ctx.Error(http.StatusInternalServerError, err.Error())
|
||||
return
|
||||
}
|
||||
allAttempts := make([]*TaskAttempt, len(taskAttempts))
|
||||
for i, actionTask := range taskAttempts {
|
||||
allAttempts[i] = &TaskAttempt{
|
||||
Number: actionTask.Attempt,
|
||||
Started: templates.TimeSince(actionTask.Started),
|
||||
Status: actionTask.Status.String(),
|
||||
}
|
||||
}
|
||||
resp.State.CurrentJob.AllAttempts = allAttempts
|
||||
|
||||
steps := actions.FullSteps(task)
|
||||
for _, v := range steps {
|
||||
resp.State.CurrentJob.Steps = append(resp.State.CurrentJob.Steps, &ViewJobStep{
|
||||
Summary: v.Name,
|
||||
|
|
|
|||
|
|
@ -141,7 +141,7 @@ func Test_artifactsFindByNameOrID(t *testing.T) {
|
|||
}
|
||||
}
|
||||
|
||||
func baseExpectedResponse() *ViewResponse {
|
||||
func baseExpectedViewResponse() *ViewResponse {
|
||||
return &ViewResponse{
|
||||
State: ViewState{
|
||||
Run: ViewRunInfo{
|
||||
|
|
@ -193,6 +193,23 @@ func baseExpectedResponse() *ViewResponse {
|
|||
Status: "waiting",
|
||||
},
|
||||
},
|
||||
AllAttempts: []*TaskAttempt{
|
||||
{
|
||||
Number: 3,
|
||||
Started: template.HTML("<relative-time prefix=\"\" tense=\"past\" datetime=\"2023-05-09T12:48:48Z\" data-tooltip-content data-tooltip-interactive=\"true\">2023-05-09 12:48:48 +00:00</relative-time>"),
|
||||
Status: "running",
|
||||
},
|
||||
{
|
||||
Number: 2,
|
||||
Started: template.HTML("<relative-time prefix=\"\" tense=\"past\" datetime=\"2023-05-09T12:48:48Z\" data-tooltip-content data-tooltip-interactive=\"true\">2023-05-09 12:48:48 +00:00</relative-time>"),
|
||||
Status: "success",
|
||||
},
|
||||
{
|
||||
Number: 1,
|
||||
Started: template.HTML("<relative-time prefix=\"\" tense=\"past\" datetime=\"2023-05-09T12:48:48Z\" data-tooltip-content data-tooltip-interactive=\"true\">2023-05-09 12:48:48 +00:00</relative-time>"),
|
||||
Status: "success",
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
Logs: ViewLogs{
|
||||
|
|
@ -208,22 +225,27 @@ func TestActionsViewViewPost(t *testing.T) {
|
|||
name string
|
||||
runIndex int64
|
||||
jobIndex int64
|
||||
attemptNumber int64
|
||||
expected *ViewResponse
|
||||
expectedTweaks func(*ViewResponse)
|
||||
}{
|
||||
{
|
||||
name: "base case",
|
||||
runIndex: 187,
|
||||
jobIndex: 0,
|
||||
expected: baseExpectedResponse(),
|
||||
name: "base case",
|
||||
runIndex: 187,
|
||||
jobIndex: 0,
|
||||
attemptNumber: 1,
|
||||
expected: baseExpectedViewResponse(),
|
||||
expectedTweaks: func(resp *ViewResponse) {
|
||||
resp.State.CurrentJob.Steps[0].Status = "success"
|
||||
resp.State.CurrentJob.Steps[1].Status = "success"
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "run with waiting jobs",
|
||||
runIndex: 189,
|
||||
jobIndex: 0,
|
||||
expected: baseExpectedResponse(),
|
||||
name: "run with waiting jobs",
|
||||
runIndex: 189,
|
||||
jobIndex: 0,
|
||||
attemptNumber: 1,
|
||||
expected: baseExpectedViewResponse(),
|
||||
expectedTweaks: func(resp *ViewResponse) {
|
||||
// Variations from runIndex 187 -> runIndex 189 that are not the subject of this test...
|
||||
resp.State.Run.Link = "/user5/repo4/actions/runs/189"
|
||||
|
|
@ -257,6 +279,13 @@ func TestActionsViewViewPost(t *testing.T) {
|
|||
Status: "success",
|
||||
},
|
||||
}
|
||||
resp.State.CurrentJob.AllAttempts = []*TaskAttempt{
|
||||
{
|
||||
Number: 1,
|
||||
Started: template.HTML("<relative-time prefix=\"\" tense=\"past\" datetime=\"2023-05-09T12:48:48Z\" data-tooltip-content data-tooltip-interactive=\"true\">2023-05-09 12:48:48 +00:00</relative-time>"),
|
||||
Status: "success",
|
||||
},
|
||||
}
|
||||
|
||||
// Under test in this case: verify that Done is set to false; in the fixture data, job.ID=195 is status
|
||||
// Success, but job.ID=196 is status Waiting, and so we expect to signal Done=false to indicate to the
|
||||
|
|
@ -264,6 +293,17 @@ func TestActionsViewViewPost(t *testing.T) {
|
|||
resp.State.Run.Done = false
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "attempt 3",
|
||||
runIndex: 187,
|
||||
jobIndex: 0,
|
||||
attemptNumber: 3,
|
||||
expected: baseExpectedViewResponse(),
|
||||
expectedTweaks: func(resp *ViewResponse) {
|
||||
resp.State.CurrentJob.Steps[0].Status = "running"
|
||||
resp.State.CurrentJob.Steps[1].Status = "waiting"
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
|
|
@ -273,10 +313,11 @@ func TestActionsViewViewPost(t *testing.T) {
|
|||
contexttest.LoadRepo(t, ctx, 4)
|
||||
ctx.SetParams(":run", fmt.Sprintf("%d", tt.runIndex))
|
||||
ctx.SetParams(":job", fmt.Sprintf("%d", tt.jobIndex))
|
||||
ctx.SetParams(":attempt", fmt.Sprintf("%d", tt.attemptNumber))
|
||||
web.SetForm(ctx, &ViewRequest{})
|
||||
|
||||
ViewPost(ctx)
|
||||
require.Equal(t, http.StatusOK, resp.Result().StatusCode)
|
||||
require.Equal(t, http.StatusOK, resp.Result().StatusCode, "failure in ViewPost(): %q", resp.Body.String())
|
||||
|
||||
var actual ViewResponse
|
||||
err := json.Unmarshal(resp.Body.Bytes(), &actual)
|
||||
|
|
@ -301,3 +342,71 @@ func TestActionsViewViewPost(t *testing.T) {
|
|||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestActionsViewRedirectToLatestAttempt(t *testing.T) {
|
||||
unittest.PrepareTestEnv(t)
|
||||
|
||||
tests := []struct {
|
||||
name string
|
||||
runIndex int64
|
||||
jobIndex int64
|
||||
expectedCode int
|
||||
expectedURL string
|
||||
}{
|
||||
{
|
||||
name: "no job index",
|
||||
runIndex: 187,
|
||||
jobIndex: -1,
|
||||
expectedURL: "https://try.gitea.io/user2/repo1/actions/runs/187/jobs/0/attempt/1",
|
||||
},
|
||||
{
|
||||
name: "job w/ 1 attempt",
|
||||
runIndex: 187,
|
||||
jobIndex: 0,
|
||||
expectedURL: "https://try.gitea.io/user2/repo1/actions/runs/187/jobs/0/attempt/1",
|
||||
},
|
||||
{
|
||||
name: "job w/ multiple attempts",
|
||||
runIndex: 187,
|
||||
jobIndex: 2,
|
||||
expectedURL: "https://try.gitea.io/user2/repo1/actions/runs/187/jobs/2/attempt/2",
|
||||
},
|
||||
{
|
||||
name: "run out-of-range",
|
||||
runIndex: 5000,
|
||||
jobIndex: -1,
|
||||
expectedCode: http.StatusNotFound,
|
||||
},
|
||||
// Odd behavior with an out-of-bound jobIndex -- defaults to the first job. This is existing behavior
|
||||
// documented in the getRunJobs internal helper which... seems not perfect for the redirect... but it's high
|
||||
// risk to change and it's an OK user outcome to be redirected to something valid in the requested run.
|
||||
{
|
||||
name: "job out-of-range",
|
||||
runIndex: 187,
|
||||
jobIndex: 500,
|
||||
expectedURL: "https://try.gitea.io/user2/repo1/actions/runs/187/jobs/0/attempt/1",
|
||||
},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
ctx, resp := contexttest.MockContext(t, "user2/repo1/actions/runs/0")
|
||||
contexttest.LoadUser(t, ctx, 2)
|
||||
contexttest.LoadRepo(t, ctx, 1)
|
||||
ctx.SetParams(":run", fmt.Sprintf("%d", tt.runIndex))
|
||||
if tt.jobIndex != -1 {
|
||||
ctx.SetParams(":job", fmt.Sprintf("%d", tt.jobIndex))
|
||||
}
|
||||
|
||||
RedirectToLatestAttempt(ctx)
|
||||
if tt.expectedCode == 0 {
|
||||
assert.Equal(t, http.StatusTemporaryRedirect, resp.Code)
|
||||
url, err := resp.Result().Location()
|
||||
require.NoError(t, err)
|
||||
assert.Equal(t, tt.expectedURL, url.String())
|
||||
} else {
|
||||
assert.Equal(t, tt.expectedCode, resp.Code)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1444,14 +1444,17 @@ func registerRoutes(m *web.Route) {
|
|||
m.Get("/latest", actions.ViewLatest)
|
||||
m.Group("/{run}", func() {
|
||||
m.Combo("").
|
||||
Get(actions.View).
|
||||
Get(actions.RedirectToLatestAttempt).
|
||||
Post(web.Bind(actions.ViewRequest{}), actions.ViewPost)
|
||||
m.Group("/jobs/{job}", func() {
|
||||
m.Combo("").
|
||||
Get(actions.View).
|
||||
Get(actions.RedirectToLatestAttempt).
|
||||
Post(web.Bind(actions.ViewRequest{}), actions.ViewPost)
|
||||
m.Post("/rerun", reqRepoActionsWriter, actions.Rerun)
|
||||
m.Get("/logs", actions.Logs)
|
||||
m.Combo("/attempt/{attempt}").
|
||||
Get(actions.View).
|
||||
Post(web.Bind(actions.ViewRequest{}), actions.ViewPost)
|
||||
})
|
||||
m.Post("/cancel", reqRepoActionsWriter, actions.Cancel)
|
||||
m.Post("/approve", reqRepoActionsWriter, actions.Approve)
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
data-run-index="{{.RunIndex}}"
|
||||
data-run-id="{{.RunID}}"
|
||||
data-job-index="{{.JobIndex}}"
|
||||
data-attempt-number="{{.AttemptNumber}}"
|
||||
data-actions-url="{{.ActionsURL}}"
|
||||
data-workflow-name="{{.WorkflowName}}"
|
||||
data-workflow-url="{{.WorkflowURL}}"
|
||||
|
|
@ -27,6 +28,9 @@
|
|||
data-locale-show-log-seconds="{{ctx.Locale.Tr "show_log_seconds"}}"
|
||||
data-locale-show-full-screen="{{ctx.Locale.Tr "show_full_screen"}}"
|
||||
data-locale-download-logs="{{ctx.Locale.Tr "download_logs"}}"
|
||||
data-locale-run-attempt-label="{{ctx.Locale.Tr "actions.runs.run_attempt_label"}}"
|
||||
data-locale-viewing-out-of-date-run="{{ctx.Locale.Tr "actions.runs.viewing_out_of_date_run"}}"
|
||||
data-locale-view-most-recent-run="{{ctx.Locale.Tr "actions.runs.view_most_recent_run"}}"
|
||||
>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -90,7 +90,12 @@ func TestActionsWebRouteLatestWorkflowRun(t *testing.T) {
|
|||
// Fetch the page that shows information about the run initiated by "workflow-1.yml".
|
||||
// routers/web/repo/actions/view.go: data-workflow-url is constructed using data-workflow-name.
|
||||
req := NewRequest(t, "GET", workflowOneURI)
|
||||
intermediateRedirect := MakeRequest(t, req, http.StatusTemporaryRedirect)
|
||||
|
||||
finalURL := intermediateRedirect.Result().Header.Get("Location")
|
||||
req = NewRequest(t, "GET", finalURL)
|
||||
resp := MakeRequest(t, req, http.StatusOK)
|
||||
|
||||
htmlDoc := NewHTMLParser(t, resp.Body)
|
||||
|
||||
// Verify that URL of the workflow is shown correctly.
|
||||
|
|
|
|||
|
|
@ -49,6 +49,10 @@ func TestActionsViewArtifactDeletion(t *testing.T) {
|
|||
|
||||
// Visit it's web view
|
||||
req := NewRequest(t, "GET", run.HTMLURL())
|
||||
intermediateRedirect := MakeRequest(t, req, http.StatusTemporaryRedirect)
|
||||
|
||||
finalURL := intermediateRedirect.Result().Header.Get("Location")
|
||||
req = NewRequest(t, "GET", finalURL)
|
||||
resp := MakeRequest(t, req, http.StatusOK)
|
||||
htmlDoc := NewHTMLParser(t, resp.Body)
|
||||
|
||||
|
|
@ -78,6 +82,10 @@ func TestActionViewsArtifactDownload(t *testing.T) {
|
|||
assert.JSONEq(t, `{"artifacts":[{"name":"multi-file-download","size":2048,"status":"completed"}]}`, strings.TrimSuffix(resp.Body.String(), "\n"))
|
||||
|
||||
req = NewRequest(t, "GET", fmt.Sprintf("/user5/repo4/actions/runs/%d", runIndex))
|
||||
intermediateRedirect := MakeRequest(t, req, http.StatusTemporaryRedirect)
|
||||
|
||||
finalURL := intermediateRedirect.Result().Header.Get("Location")
|
||||
req = NewRequest(t, "GET", finalURL)
|
||||
resp = MakeRequest(t, req, http.StatusOK)
|
||||
assertDataAttrs(t, resp.Body, runID)
|
||||
|
||||
|
|
@ -95,6 +103,10 @@ func TestActionViewsArtifactDownload(t *testing.T) {
|
|||
assert.JSONEq(t, `{"artifacts":[{"name":"artifact-v4-download","size":1024,"status":"completed"}]}`, strings.TrimSuffix(resp.Body.String(), "\n"))
|
||||
|
||||
req = NewRequest(t, "GET", fmt.Sprintf("/user5/repo4/actions/runs/%d", runIndex))
|
||||
intermediateRedirect := MakeRequest(t, req, http.StatusTemporaryRedirect)
|
||||
|
||||
finalURL := intermediateRedirect.Result().Header.Get("Location")
|
||||
req = NewRequest(t, "GET", finalURL)
|
||||
resp = MakeRequest(t, req, http.StatusOK)
|
||||
assertDataAttrs(t, resp.Body, runID)
|
||||
|
||||
|
|
@ -112,3 +124,21 @@ func TestActionViewsArtifactDownload(t *testing.T) {
|
|||
assert.Equal(t, strings.Repeat("D", 100), resp.Body.String())
|
||||
})
|
||||
}
|
||||
|
||||
func TestActionViewsView(t *testing.T) {
|
||||
defer tests.PrepareTestEnv(t)()
|
||||
|
||||
req := NewRequest(t, "GET", "/user2/repo1/actions/runs/187")
|
||||
intermediateRedirect := MakeRequest(t, req, http.StatusTemporaryRedirect)
|
||||
|
||||
finalURL := intermediateRedirect.Result().Header.Get("Location")
|
||||
req = NewRequest(t, "GET", finalURL)
|
||||
resp := MakeRequest(t, req, http.StatusOK)
|
||||
|
||||
htmlDoc := NewHTMLParser(t, resp.Body)
|
||||
selector := "#repo-action-view"
|
||||
// Verify key properties going into the `repo-action-view` to initialize the Vue component.
|
||||
htmlDoc.AssertAttrEqual(t, selector, "data-run-index", "187")
|
||||
htmlDoc.AssertAttrEqual(t, selector, "data-job-index", "0")
|
||||
htmlDoc.AssertAttrEqual(t, selector, "data-attempt-number", "1")
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,11 +24,20 @@ export default {
|
|||
type: String,
|
||||
default: '',
|
||||
},
|
||||
inline: {
|
||||
type: Boolean,
|
||||
default: false,
|
||||
},
|
||||
},
|
||||
computed: {
|
||||
containerClasses() {
|
||||
return this.inline ? 'tw-inline' : 'tw-flex tw-items-center';
|
||||
},
|
||||
},
|
||||
};
|
||||
</script>
|
||||
<template>
|
||||
<span class="tw-flex tw-items-center" :data-tooltip-content="localeStatus ?? status" v-if="status">
|
||||
<span :class="containerClasses" :data-tooltip-content="localeStatus ?? status" v-if="status">
|
||||
<SvgIcon name="octicon-check-circle-fill" class="text green" :size="size" :class="className" v-if="status === 'success'"/>
|
||||
<SvgIcon name="octicon-skip" class="text grey" :size="size" :class="className" v-else-if="status === 'skipped'"/>
|
||||
<SvgIcon name="octicon-stop" class="text yellow" :size="size" :class="className" v-else-if="status === 'cancelled'"/>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
import {mount, flushPromises} from '@vue/test-utils';
|
||||
import {toAbsoluteUrl} from '../utils.js';
|
||||
import RepoActionView from './RepoActionView.vue';
|
||||
|
||||
test('processes ##[group] and ##[endgroup]', async () => {
|
||||
|
|
@ -35,6 +36,7 @@ test('processes ##[group] and ##[endgroup]', async () => {
|
|||
status: 'success',
|
||||
},
|
||||
],
|
||||
allAttempts: [{number: 1, time_since_started_html: '', status: 'success'}],
|
||||
},
|
||||
},
|
||||
logs: {
|
||||
|
|
@ -53,6 +55,7 @@ test('processes ##[group] and ##[endgroup]', async () => {
|
|||
const wrapper = mount(RepoActionView, {
|
||||
props: {
|
||||
jobIndex: '1',
|
||||
attemptNumber: '1',
|
||||
locale: {
|
||||
approve: '',
|
||||
cancel: '',
|
||||
|
|
@ -65,6 +68,9 @@ test('processes ##[group] and ##[endgroup]', async () => {
|
|||
showLogSeconds: '',
|
||||
showFullScreen: '',
|
||||
downloadLogs: '',
|
||||
runAttemptLabel: '',
|
||||
viewingOutOfDateRun: '',
|
||||
viewMostRecentRun: '',
|
||||
status: {
|
||||
unknown: '',
|
||||
waiting: '',
|
||||
|
|
@ -156,6 +162,7 @@ test('load multiple steps on a finished action', async () => {
|
|||
status: 'success',
|
||||
},
|
||||
],
|
||||
allAttempts: [{number: 1, time_since_started_html: '', status: 'success'}],
|
||||
},
|
||||
},
|
||||
logs: {
|
||||
|
|
@ -176,6 +183,7 @@ test('load multiple steps on a finished action', async () => {
|
|||
actionsURL: 'https://example.com/example-org/example-repo/actions',
|
||||
runIndex: '1',
|
||||
jobIndex: '2',
|
||||
attemptNumber: '1',
|
||||
locale: {
|
||||
approve: '',
|
||||
cancel: '',
|
||||
|
|
@ -188,6 +196,9 @@ test('load multiple steps on a finished action', async () => {
|
|||
showLogSeconds: '',
|
||||
showFullScreen: '',
|
||||
downloadLogs: '',
|
||||
runAttemptLabel: '',
|
||||
viewingOutOfDateRun: '',
|
||||
viewMostRecentRun: '',
|
||||
status: {
|
||||
unknown: '',
|
||||
waiting: '',
|
||||
|
|
@ -216,6 +227,194 @@ test('load multiple steps on a finished action', async () => {
|
|||
expect(wrapper.get('.job-step-section:nth-of-type(2) .job-log-line:nth-of-type(3) .log-msg').text()).toEqual('Step #2 Log #3');
|
||||
});
|
||||
|
||||
function configureForMultipleAttemptTests({viewHistorical}) {
|
||||
Object.defineProperty(document.documentElement, 'lang', {value: 'en'});
|
||||
vi.spyOn(global, 'fetch').mockImplementation((url, opts) => {
|
||||
const artifacts_value = {
|
||||
artifacts: [],
|
||||
};
|
||||
const stepsLog_value = [
|
||||
{
|
||||
step: 0,
|
||||
cursor: 0,
|
||||
lines: [],
|
||||
},
|
||||
];
|
||||
const jobs_value = {
|
||||
state: {
|
||||
run: {
|
||||
canApprove: true,
|
||||
canCancel: true,
|
||||
canRerun: true,
|
||||
status: 'success',
|
||||
commit: {
|
||||
pusher: {},
|
||||
},
|
||||
},
|
||||
currentJob: {
|
||||
steps: [
|
||||
{
|
||||
summary: 'Test Job',
|
||||
duration: '1s',
|
||||
status: 'success',
|
||||
},
|
||||
],
|
||||
allAttempts: [
|
||||
{number: 2, time_since_started_html: 'yesterday', status: 'success'},
|
||||
{number: 1, time_since_started_html: 'two days ago', status: 'failure'},
|
||||
],
|
||||
},
|
||||
},
|
||||
logs: {
|
||||
stepsLog: opts.body?.includes('"cursor":null') ? stepsLog_value : [],
|
||||
},
|
||||
};
|
||||
|
||||
return Promise.resolve({
|
||||
ok: true,
|
||||
json: vi.fn().mockResolvedValue(
|
||||
url.endsWith('/artifacts') ? artifacts_value : jobs_value,
|
||||
),
|
||||
});
|
||||
});
|
||||
|
||||
const wrapper = mount(RepoActionView, {
|
||||
props: {
|
||||
runIndex: '123',
|
||||
jobIndex: '1',
|
||||
attemptNumber: viewHistorical ? '1' : '2',
|
||||
actionsURL: toAbsoluteUrl('/user1/repo2/actions'),
|
||||
locale: {
|
||||
approve: 'Locale Approve',
|
||||
cancel: 'Locale Cancel',
|
||||
rerun: 'Locale Re-run',
|
||||
artifactsTitle: '',
|
||||
areYouSure: '',
|
||||
confirmDeleteArtifact: '',
|
||||
rerun_all: '',
|
||||
showTimeStamps: '',
|
||||
showLogSeconds: '',
|
||||
showFullScreen: '',
|
||||
downloadLogs: '',
|
||||
runAttemptLabel: 'Run attempt %[1]s %[2]s',
|
||||
viewingOutOfDateRun: 'oh no, out of date since %[1]s give or take or so',
|
||||
viewMostRecentRun: '',
|
||||
status: {
|
||||
unknown: '',
|
||||
waiting: '',
|
||||
running: '',
|
||||
success: '',
|
||||
failure: '',
|
||||
cancelled: '',
|
||||
skipped: '',
|
||||
blocked: '',
|
||||
},
|
||||
},
|
||||
},
|
||||
});
|
||||
return wrapper;
|
||||
}
|
||||
|
||||
test('display baseline with most-recent attempt', async () => {
|
||||
const wrapper = configureForMultipleAttemptTests({viewHistorical: false});
|
||||
await flushPromises();
|
||||
|
||||
// Warning dialog for viewing an out-of-date attempt...
|
||||
expect(wrapper.findAll('.job-out-of-date-warning').length).toEqual(0);
|
||||
|
||||
// Approve button should be visible; can't have all three at once but at least this verifies the inverse of the
|
||||
// historical attempt test below.
|
||||
expect(wrapper.findAll('button').filter((button) => button.text() === 'Locale Approve').length).toEqual(1);
|
||||
|
||||
// Job list will be visible...
|
||||
expect(wrapper.findAll('.job-group-section').length).toEqual(1);
|
||||
|
||||
// Attempt selector dropdown...
|
||||
expect(wrapper.findAll('.job-attempt-dropdown').length).toEqual(1);
|
||||
expect(wrapper.findAll('.job-attempt-dropdown .svg.octicon-check-circle-fill.text.green').length).toEqual(1);
|
||||
expect(wrapper.get('.job-attempt-dropdown .ui.dropdown').text()).toEqual('Run attempt 2 yesterday');
|
||||
});
|
||||
|
||||
test('display reconfigured for historical attempt', async () => {
|
||||
const wrapper = configureForMultipleAttemptTests({viewHistorical: true});
|
||||
await flushPromises();
|
||||
|
||||
// Warning dialog for viewing an out-of-date attempt...
|
||||
expect(wrapper.findAll('.job-out-of-date-warning').length).toEqual(1);
|
||||
expect(wrapper.get('.job-out-of-date-warning').text()).toEqual('oh no, out of date since two days ago give or take or so');
|
||||
await wrapper.get('.job-out-of-date-warning button').trigger('click');
|
||||
expect(window.location.href).toEqual(toAbsoluteUrl('/user1/repo2/actions/runs/123/jobs/1'));
|
||||
// eslint-disable-next-line no-restricted-globals
|
||||
history.back();
|
||||
await flushPromises();
|
||||
|
||||
// Approve, Cancel, Re-run all buttons should all be suppressed...
|
||||
expect(wrapper.findAll('button').filter((button) => button.text() === 'Locale Approve').length).toEqual(0);
|
||||
expect(wrapper.findAll('button').filter((button) => button.text() === 'Locale Cancel').length).toEqual(0);
|
||||
expect(wrapper.findAll('button').filter((button) => button.text() === 'Locale Re-run').length).toEqual(0);
|
||||
|
||||
// Job list will be suppressed...
|
||||
expect(wrapper.findAll('.job-group-section').length).toEqual(0);
|
||||
|
||||
// Attempt selector dropdown...
|
||||
expect(wrapper.findAll('.job-attempt-dropdown').length).toEqual(1);
|
||||
expect(wrapper.findAll('.job-attempt-dropdown .svg.octicon-x-circle-fill.text.red').length).toEqual(1);
|
||||
expect(wrapper.get('.job-attempt-dropdown .ui.dropdown').text()).toEqual('Run attempt 1 two days ago');
|
||||
});
|
||||
|
||||
test('historical attempt dropdown interactions', async () => {
|
||||
const wrapper = configureForMultipleAttemptTests({viewHistorical: true});
|
||||
await flushPromises();
|
||||
|
||||
// Check dropdown exists, but isn't expanded.
|
||||
const attemptsNotExpanded = () => {
|
||||
expect(wrapper.findAll('.job-attempt-dropdown').length).toEqual(1);
|
||||
expect(wrapper.findAll('.job-attempt-dropdown .action-job-menu').length).toEqual(0, 'dropdown content not yet visible');
|
||||
};
|
||||
attemptsNotExpanded();
|
||||
|
||||
// Click on attempt dropdown
|
||||
wrapper.get('.job-attempt-dropdown .ui.dropdown').trigger('click');
|
||||
await flushPromises();
|
||||
|
||||
// Check dropdown is expanded and both options are displayed
|
||||
const attemptsExpanded = () => {
|
||||
expect(wrapper.findAll('.job-attempt-dropdown .action-job-menu').length).toEqual(1);
|
||||
expect(wrapper.get('.job-attempt-dropdown .action-job-menu').isVisible()).toBe(true);
|
||||
expect(wrapper.findAll('.job-attempt-dropdown .action-job-menu a').filter((a) => a.text() === 'Run attempt 2 yesterday').length).toEqual(1);
|
||||
expect(wrapper.findAll('.job-attempt-dropdown .action-job-menu a').filter((a) => a.text() === 'Run attempt 1 two days ago').length).toEqual(1);
|
||||
};
|
||||
attemptsExpanded();
|
||||
|
||||
// Normally dismiss occurs on a body click event; simulate that by calling `closeDropdown()`
|
||||
wrapper.vm.closeDropdown();
|
||||
await flushPromises();
|
||||
|
||||
// Should return to not expanded.
|
||||
attemptsNotExpanded();
|
||||
|
||||
// Click on the gear dropdown
|
||||
wrapper.get('.job-gear-dropdown').trigger('click');
|
||||
await flushPromises();
|
||||
|
||||
// Check that gear's menu is expanded, and attempt dropdown isn't.
|
||||
expect(wrapper.findAll('.job-gear-dropdown .action-job-menu').length).toEqual(1);
|
||||
expect(wrapper.get('.job-gear-dropdown .action-job-menu').isVisible()).toBe(true);
|
||||
attemptsNotExpanded();
|
||||
|
||||
// Click on attempt dropdown
|
||||
wrapper.get('.job-attempt-dropdown .ui.dropdown').trigger('click');
|
||||
await flushPromises();
|
||||
|
||||
// Check that attempt dropdown expanded again, gear dropdown disappeared (mutually exclusive)
|
||||
expect(wrapper.findAll('.job-gear-dropdown .action-job-menu').length).toEqual(0);
|
||||
attemptsExpanded();
|
||||
|
||||
// Click on the other option in the dropdown to verify it navigates to the target attempt
|
||||
wrapper.findAll('.job-attempt-dropdown .action-job-menu a').find((a) => a.text() === 'Run attempt 2 yesterday').trigger('click');
|
||||
expect(window.location.href).toEqual(toAbsoluteUrl('/user1/repo2/actions/runs/123/jobs/1/attempt/2'));
|
||||
});
|
||||
|
||||
test('artifacts download links', async () => {
|
||||
Object.defineProperty(document.documentElement, 'lang', {value: 'en'});
|
||||
vi.spyOn(global, 'fetch').mockImplementation((url, opts) => {
|
||||
|
|
@ -264,6 +463,7 @@ test('artifacts download links', async () => {
|
|||
status: 'success',
|
||||
},
|
||||
],
|
||||
allAttempts: [{number: 1, time_since_started_html: '', status: 'success'}],
|
||||
},
|
||||
},
|
||||
logs: {
|
||||
|
|
@ -285,6 +485,7 @@ test('artifacts download links', async () => {
|
|||
runIndex: '10',
|
||||
runID: '1001',
|
||||
jobIndex: '2',
|
||||
attemptNumber: '1',
|
||||
locale: {
|
||||
approve: '',
|
||||
cancel: '',
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@ const sfc = {
|
|||
runIndex: String,
|
||||
runID: String,
|
||||
jobIndex: String,
|
||||
attemptNumber: String,
|
||||
actionsURL: String,
|
||||
workflowName: String,
|
||||
workflowURL: String,
|
||||
|
|
@ -27,11 +28,12 @@ const sfc = {
|
|||
return {
|
||||
// internal state
|
||||
loading: false,
|
||||
initialLoadComplete: false,
|
||||
needLoadingWithLogCursors: null,
|
||||
intervalID: null,
|
||||
currentJobStepsStates: [],
|
||||
artifacts: [],
|
||||
menuVisible: false,
|
||||
menuVisible: undefined,
|
||||
isFullScreen: false,
|
||||
timeVisible: {
|
||||
'log-time-stamp': false,
|
||||
|
|
@ -83,6 +85,12 @@ const sfc = {
|
|||
// status: '',
|
||||
// }
|
||||
],
|
||||
// All available attempts for the job we're currently viewing.
|
||||
//
|
||||
// initial value here is configured so that currentingViewingMostRecentAttempt() -> true on the default `data()`, so that the
|
||||
// initial render (before `loadJob`'s first execution is complete) doesn't display "You are viewing an
|
||||
// out-of-date run..."
|
||||
allAttempts: new Array(parseInt(this.attemptNumber)).fill({index: 0, time_since_started_html: '', status: 'success'}),
|
||||
},
|
||||
};
|
||||
},
|
||||
|
|
@ -111,6 +119,61 @@ const sfc = {
|
|||
}
|
||||
},
|
||||
|
||||
computed: {
|
||||
shouldShowAttemptDropdown() {
|
||||
return this.initialLoadComplete && this.currentJob.allAttempts && this.currentJob.allAttempts.length > 1;
|
||||
},
|
||||
|
||||
displayOtherJobs() {
|
||||
return this.currentingViewingMostRecentAttempt;
|
||||
},
|
||||
|
||||
canApprove() {
|
||||
return this.currentingViewingMostRecentAttempt && this.run.canApprove;
|
||||
},
|
||||
|
||||
canCancel() {
|
||||
return this.currentingViewingMostRecentAttempt && this.run.canCancel;
|
||||
},
|
||||
|
||||
canRerun() {
|
||||
return this.currentingViewingMostRecentAttempt && this.run.canRerun;
|
||||
},
|
||||
|
||||
viewingAttemptNumber() {
|
||||
return parseInt(this.attemptNumber);
|
||||
},
|
||||
|
||||
viewingAttempt() {
|
||||
const fallback = {index: 0, time_since_started_html: '', status: 'success'};
|
||||
if (!this.currentJob.allAttempts) {
|
||||
return fallback;
|
||||
}
|
||||
const attempt = this.currentJob.allAttempts.find((attempt) => attempt.number === this.viewingAttemptNumber);
|
||||
return attempt || fallback;
|
||||
},
|
||||
|
||||
currentingViewingMostRecentAttempt() {
|
||||
if (!this.currentJob.allAttempts) {
|
||||
return true;
|
||||
}
|
||||
return this.viewingAttemptNumber === this.currentJob.allAttempts.length;
|
||||
},
|
||||
|
||||
displayGearDropdown() {
|
||||
return this.menuVisible === 'gear';
|
||||
},
|
||||
|
||||
displayAttemptDropdown() {
|
||||
return this.menuVisible === 'attempt';
|
||||
},
|
||||
|
||||
viewingOutOfDateRunLabel() {
|
||||
return this.locale.viewingOutOfDateRun
|
||||
.replace('%[1]s', this.viewingAttempt.time_since_started_html);
|
||||
},
|
||||
},
|
||||
|
||||
methods: {
|
||||
// show/hide the step logs for a step
|
||||
toggleStepLogs(idx) {
|
||||
|
|
@ -242,9 +305,10 @@ const sfc = {
|
|||
},
|
||||
|
||||
async fetchJob(logCursors) {
|
||||
const resp = await POST(`${this.actionsURL}/runs/${this.runIndex}/jobs/${this.jobIndex}`, {
|
||||
data: {logCursors},
|
||||
});
|
||||
const resp = await POST(
|
||||
`${this.actionsURL}/runs/${this.runIndex}/jobs/${this.jobIndex}/attempt/${this.attemptNumber}`,
|
||||
{data: {logCursors}},
|
||||
);
|
||||
return await resp.json();
|
||||
},
|
||||
|
||||
|
|
@ -316,9 +380,20 @@ const sfc = {
|
|||
}
|
||||
} finally {
|
||||
this.loading = false;
|
||||
this.initialLoadComplete = true;
|
||||
}
|
||||
},
|
||||
|
||||
navigateToAttempt(attempt) {
|
||||
const url = `${this.actionsURL}/runs/${this.runIndex}/jobs/${this.jobIndex}/attempt/${attempt.number}`;
|
||||
window.location.href = url;
|
||||
},
|
||||
|
||||
navigateToMostRecentAttempt() {
|
||||
const url = `${this.actionsURL}/runs/${this.runIndex}/jobs/${this.jobIndex}`;
|
||||
window.location.href = url;
|
||||
},
|
||||
|
||||
isDone(status) {
|
||||
return ['success', 'skipped', 'failure', 'cancelled'].includes(status);
|
||||
},
|
||||
|
|
@ -327,8 +402,24 @@ const sfc = {
|
|||
return ['success', 'running', 'failure', 'cancelled'].includes(status);
|
||||
},
|
||||
|
||||
toggleAttemptDropdown() {
|
||||
if (this.menuVisible === 'attempt') {
|
||||
this.menuVisible = undefined;
|
||||
} else {
|
||||
this.menuVisible = 'attempt';
|
||||
}
|
||||
},
|
||||
|
||||
toggleGearDropdown() {
|
||||
if (this.menuVisible === 'gear') {
|
||||
this.menuVisible = undefined;
|
||||
} else {
|
||||
this.menuVisible = 'gear';
|
||||
}
|
||||
},
|
||||
|
||||
closeDropdown() {
|
||||
if (this.menuVisible) this.menuVisible = false;
|
||||
this.menuVisible = undefined;
|
||||
},
|
||||
|
||||
toggleTimeDisplay(type) {
|
||||
|
|
@ -371,6 +462,15 @@ const sfc = {
|
|||
if (!logLine) return;
|
||||
logLine.querySelector('.line-num').click();
|
||||
},
|
||||
|
||||
runAttemptLabel(attempt) {
|
||||
if (!attempt) {
|
||||
return '';
|
||||
}
|
||||
return this.locale.runAttemptLabel
|
||||
.replace('%[1]s', attempt.number)
|
||||
.replace('%[2]s', attempt.time_since_started_html);
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
|
|
@ -389,6 +489,7 @@ export function initRepositoryActionView() {
|
|||
runIndex: el.getAttribute('data-run-index'),
|
||||
runID: el.getAttribute('data-run-id'),
|
||||
jobIndex: el.getAttribute('data-job-index'),
|
||||
attemptNumber: el.getAttribute('data-attempt-number'),
|
||||
actionsURL: el.getAttribute('data-actions-url'),
|
||||
workflowName: el.getAttribute('data-workflow-name'),
|
||||
workflowURL: el.getAttribute('data-workflow-url'),
|
||||
|
|
@ -404,6 +505,9 @@ export function initRepositoryActionView() {
|
|||
showLogSeconds: el.getAttribute('data-locale-show-log-seconds'),
|
||||
showFullScreen: el.getAttribute('data-locale-show-full-screen'),
|
||||
downloadLogs: el.getAttribute('data-locale-download-logs'),
|
||||
runAttemptLabel: el.getAttribute('data-locale-run-attempt-label'),
|
||||
viewingOutOfDateRun: el.getAttribute('data-locale-viewing-out-of-date-run'),
|
||||
viewMostRecentRun: el.getAttribute('data-locale-view-most-recent-run'),
|
||||
status: {
|
||||
unknown: el.getAttribute('data-locale-status-unknown'),
|
||||
waiting: el.getAttribute('data-locale-status-waiting'),
|
||||
|
|
@ -421,6 +525,15 @@ export function initRepositoryActionView() {
|
|||
</script>
|
||||
<template>
|
||||
<div class="ui container fluid padded action-view-container">
|
||||
<div class="action-view-header job-out-of-date-warning" v-if="!currentingViewingMostRecentAttempt">
|
||||
<div class="ui warning message">
|
||||
<!-- eslint-disable-next-line vue/no-v-html -->
|
||||
<span v-html="viewingOutOfDateRunLabel"/>
|
||||
<button class="tw-ml-8 ui basic small compact button" @click="navigateToMostRecentAttempt()">
|
||||
{{ locale.viewMostRecentRun }}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="action-view-header">
|
||||
<div class="action-info-summary">
|
||||
<div class="action-info-summary-title">
|
||||
|
|
@ -428,13 +541,13 @@ export function initRepositoryActionView() {
|
|||
<!-- eslint-disable-next-line vue/no-v-html -->
|
||||
<h2 class="action-info-summary-title-text" v-html="run.titleHTML"/>
|
||||
</div>
|
||||
<button class="ui basic small compact button primary" @click="approveRun()" v-if="run.canApprove">
|
||||
<button class="ui basic small compact button primary" @click="approveRun()" v-if="canApprove">
|
||||
{{ locale.approve }}
|
||||
</button>
|
||||
<button class="ui basic small compact button red" @click="cancelRun()" v-else-if="run.canCancel">
|
||||
<button class="ui basic small compact button red" @click="cancelRun()" v-else-if="canCancel">
|
||||
{{ locale.cancel }}
|
||||
</button>
|
||||
<button class="ui basic small compact button tw-mr-0 tw-whitespace-nowrap link-action" :data-url="`${run.link}/rerun`" v-else-if="run.canRerun">
|
||||
<button class="ui basic small compact button tw-mr-0 tw-whitespace-nowrap link-action" :data-url="`${run.link}/rerun`" v-else-if="canRerun">
|
||||
{{ locale.rerun_all }}
|
||||
</button>
|
||||
</div>
|
||||
|
|
@ -454,7 +567,7 @@ export function initRepositoryActionView() {
|
|||
</div>
|
||||
</div>
|
||||
<div class="action-view-body">
|
||||
<div class="action-view-left">
|
||||
<div class="action-view-left" v-if="displayOtherJobs">
|
||||
<div class="job-group-section">
|
||||
<div class="job-brief-list">
|
||||
<a class="job-brief-item" :href="run.link+'/jobs/'+index" :class="parseInt(jobIndex) === index ? 'selected' : ''" v-for="(job, index) in run.jobs" :key="job.id">
|
||||
|
|
@ -496,12 +609,29 @@ export function initRepositoryActionView() {
|
|||
{{ currentJob.detail }}
|
||||
</p>
|
||||
</div>
|
||||
<div class="job-info-header-right job-attempt-dropdown tw-mr-8" v-if="shouldShowAttemptDropdown" v-cloak>
|
||||
<div class="ui dropdown selection" @click.stop="toggleAttemptDropdown()">
|
||||
<SvgIcon name="octicon-triangle-down" class="dropdown icon"/>
|
||||
<div class="default text">
|
||||
<ActionRunStatus :locale-status="locale.status[viewingAttempt.status]" :status="viewingAttempt.status" :inline="true"/>
|
||||
<!-- eslint-disable-next-line vue/no-v-html -->
|
||||
<span class="tw-ml-2" v-html="runAttemptLabel(viewingAttempt)"/>
|
||||
</div>
|
||||
<div class="menu transition action-job-menu" :class="{visible: displayAttemptDropdown}" v-if="displayAttemptDropdown" v-cloak>
|
||||
<a tabindex="0" :class="{ item: true, selected: attempt.number === viewingAttemptNumber }" v-for="attempt in currentJob.allAttempts" :key="attempt.number" @click="navigateToAttempt(attempt)">
|
||||
<ActionRunStatus :locale-status="locale.status[attempt.status]" :status="attempt.status" :inline="true"/>
|
||||
<!-- eslint-disable-next-line vue/no-v-html -->
|
||||
<span class="tw-ml-2" v-html="runAttemptLabel(attempt)"/>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="job-info-header-right">
|
||||
<div class="ui top right pointing dropdown custom jump item" @click.stop="menuVisible = !menuVisible">
|
||||
<div class="ui top right pointing dropdown dark-dropdown custom jump item job-gear-dropdown" @click.stop="toggleGearDropdown()">
|
||||
<button class="btn gt-interact-bg tw-p-2">
|
||||
<SvgIcon name="octicon-gear" :size="18"/>
|
||||
</button>
|
||||
<div class="menu transition action-job-menu" :class="{visible: menuVisible}" v-if="menuVisible" v-cloak>
|
||||
<div class="menu transition action-job-menu" :class="{visible: displayGearDropdown}" v-if="displayGearDropdown" v-cloak>
|
||||
<a class="item" tabindex="0" @click="toggleTimeDisplay('seconds')" @keyup.space="toggleTimeDisplay('seconds')" @keyup.enter="toggleTimeDisplay('seconds')">
|
||||
<i class="icon"><SvgIcon :name="timeVisible['log-time-seconds'] ? 'octicon-check' : 'gitea-empty-checkbox'"/></i>
|
||||
{{ locale.showLogSeconds }}
|
||||
|
|
@ -736,30 +866,30 @@ export function initRepositoryActionView() {
|
|||
|
||||
/* begin fomantic dropdown menu overrides */
|
||||
|
||||
.action-view-right .ui.dropdown .menu {
|
||||
.action-view-right .ui.dropdown.dark-dropdown .menu {
|
||||
background: var(--color-console-menu-bg);
|
||||
border-color: var(--color-console-menu-border);
|
||||
}
|
||||
|
||||
.action-view-right .ui.dropdown .menu > .item {
|
||||
.action-view-right .ui.dropdown.dark-dropdown .menu > .item {
|
||||
color: var(--color-console-fg);
|
||||
}
|
||||
|
||||
.action-view-right .ui.dropdown .menu > .item:hover {
|
||||
.action-view-right .ui.dropdown.dark-dropdown .menu > .item:hover {
|
||||
color: var(--color-console-fg);
|
||||
background: var(--color-console-hover-bg);
|
||||
}
|
||||
|
||||
.action-view-right .ui.dropdown .menu > .item:active {
|
||||
.action-view-right .ui.dropdown.dark-dropdown .menu > .item:active {
|
||||
color: var(--color-console-fg);
|
||||
background: var(--color-console-active-bg);
|
||||
}
|
||||
|
||||
.action-view-right .ui.dropdown .menu > .divider {
|
||||
.action-view-right .ui.dropdown.dark-dropdown .menu > .divider {
|
||||
border-top-color: var(--color-console-menu-border);
|
||||
}
|
||||
|
||||
.action-view-right .ui.pointing.dropdown > .menu:not(.hidden)::after {
|
||||
.action-view-right .ui.pointing.dropdown.dark-dropdown > .menu:not(.hidden)::after {
|
||||
background: var(--color-console-menu-bg);
|
||||
box-shadow: -1px -1px 0 0 var(--color-console-menu-border);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue