workflow_dispatch use workflow from trigger branch

* htmx updates the input form on branch switch

Author: ChristopherHX

routers/web/repo/actions/actions.go

@@ -32,8 +32,9 @@ import (
 )
 
 const (
-	tplListActions templates.TplName = "repo/actions/list"
-	tplViewActions templates.TplName = "repo/actions/view"
+	tplListActions           templates.TplName = "repo/actions/list"
+	tplDispatchInputsActions templates.TplName = "repo/actions/workflow_dispatch_inputs"
+	tplViewActions           templates.TplName = "repo/actions/view"
 )
 
 type Workflow struct {

routers/web/repo/actions/view.go

@@ -5,6 +5,7 @@ package actions
 
 import (
 	"archive/zip"
+	"bytes"
 	"compress/gzip"
 	"context"
 	"errors"
@@ -812,13 +813,8 @@ func Run(ctx *context_module.Context) {
 		return
 	}
 
-	// get workflow entry from default branch commit
-	defaultBranchCommit, err := ctx.Repo.GitRepo.GetBranchCommit(ctx.Repo.Repository.DefaultBranch)
-	if err != nil {
-		ctx.Error(http.StatusInternalServerError, err.Error())
-		return
-	}
-	entries, err := actions.ListWorkflows(defaultBranchCommit)
+	// get workflow entry from runTargetCommit
+	entries, err := actions.ListWorkflows(runTargetCommit)
 	if err != nil {
 		ctx.Error(http.StatusInternalServerError, err.Error())
 		return
@@ -928,3 +924,73 @@ func Run(ctx *context_module.Context) {
 	ctx.Flash.Success(ctx.Tr("actions.workflow.run_success", workflowID))
 	ctx.Redirect(redirectURL)
 }
+
+func DispatchInputs(ctx *context_module.Context) {
+	workflowID := ctx.FormString("workflow")
+	if len(workflowID) == 0 {
+		ctx.ServerError("workflow", nil)
+		return
+	}
+
+	ref := ctx.FormString("ref")
+	if len(ref) == 0 {
+		ctx.ServerError("ref", nil)
+		return
+	}
+
+	// get target commit of run from specified ref
+	refName := git.RefName(ref)
+	var runTargetCommit *git.Commit
+	var err error
+	if refName.IsTag() {
+		runTargetCommit, err = ctx.Repo.GitRepo.GetTagCommit(refName.TagName())
+	} else if refName.IsBranch() {
+		runTargetCommit, err = ctx.Repo.GitRepo.GetBranchCommit(refName.BranchName())
+	} else {
+		ctx.Flash.Error(ctx.Tr("form.git_ref_name_error", ref))
+		return
+	}
+	if err != nil {
+		ctx.Flash.Error(ctx.Tr("form.target_ref_not_exist", ref))
+		return
+	}
+
+	// get workflow entry from runTargetCommit
+	entries, err := actions.ListWorkflows(runTargetCommit)
+	if err != nil {
+		ctx.Error(http.StatusInternalServerError, err.Error())
+		return
+	}
+
+	var curWorkflow *model.Workflow
+
+	// find workflow from commit
+	for _, entry := range entries {
+		if entry.Name() == workflowID {
+			content, err := actions.GetContentFromEntry(entry)
+			if err != nil {
+				ctx.Error(http.StatusInternalServerError, err.Error())
+				return
+			}
+			curWorkflow, err = model.ReadWorkflow(bytes.NewReader(content))
+			if err != nil {
+				ctx.ServerError("workflow", err)
+				return
+			}
+			break
+		}
+	}
+
+	if curWorkflow == nil {
+		ctx.Flash.Error(ctx.Tr("actions.workflow.not_found", workflowID))
+		return
+	}
+
+	workflowDispatchConfig := workflowDispatchConfig(curWorkflow)
+	if workflowDispatchConfig == nil {
+		return
+	}
+	ctx.Data["WorkflowDispatchConfig"] = workflowDispatchConfig
+
+	ctx.HTML(http.StatusOK, tplDispatchInputsActions)
+}

routers/web/web.go

@@ -1412,6 +1412,7 @@ func registerRoutes(m *web.Router) {
 		m.Post("/disable", reqRepoAdmin, actions.DisableWorkflowFile)
 		m.Post("/enable", reqRepoAdmin, actions.EnableWorkflowFile)
 		m.Post("/run", reqRepoActionsWriter, actions.Run)
+		m.Get("/dispatch-inputs", reqRepoActionsWriter, actions.DispatchInputs)
 
 		m.Group("/runs/{run}", func() {
 			m.Combo("").

templates/repo/actions/workflow_dispatch.tmpl

@@ -11,7 +11,7 @@
 					<label>{{ctx.Locale.Tr "actions.workflow.from_ref"}}:</label>
 				</span>
 				<div class="ui inline field dropdown button select-branch branch-selector-dropdown ellipsis-items-nowrap">
-					<input type="hidden" name="ref" value="refs/heads/{{index .Branches 0}}">
+					<input type="hidden" name="ref" hx-sync="this:replace" hx-target="#runWorkflowDispatchModalInputs" hx-swap="innerHTML" hx-get="{{$.Link}}/dispatch-inputs?workflow={{$.CurWorkflow}}&actor={{$.CurActor}}&status={{.Status}}" hx-trigger="change" value="refs/heads/{{index .Branches 0}}">
 					{{svg "octicon-git-branch" 14}}
 					<div class="default text">{{index .Branches 0}}</div>
 					{{svg "octicon-triangle-down" 14 "dropdown icon"}}
@@ -49,29 +49,10 @@
 
 			<div class="divider"></div>
 
-			{{range $item := .WorkflowDispatchConfig.Inputs}}
-			<div class="ui field {{if .Required}}required{{end}}">
-				{{if eq .Type "choice"}}
-					<label>{{.Description}}:</label>
-					<select class="ui selection type dropdown" name="{{.Name}}">
-						{{range .Options}}
-						<option value="{{.}}" {{if eq $item.Default .}}selected{{end}} >{{.}}</option>
-						{{end}}
-					</select>
-				{{else if eq .Type "boolean"}}
-					<div class="ui inline checkbox">
-						<label>{{.Description}}</label>
-						<input type="checkbox" name="{{.Name}}" {{if eq .Default "true"}}checked{{end}}>
-					</div>
-				{{else if eq .Type "number"}}
-					<label>{{.Description}}:</label>
-					<input name="{{.Name}}" value="{{.Default}}" {{if .Required}}required{{end}}>
-				{{else}}
-					<label>{{.Description}}:</label>
-					<input name="{{.Name}}" value="{{.Default}}" {{if .Required}}required{{end}}>
-				{{end}}
+			<div id="runWorkflowDispatchModalInputs">
+				{{template "repo/actions/workflow_dispatch_inputs" .}}
 			</div>
-			{{end}}
+
 			<button class="ui tiny primary button" type="submit">Submit</button>
 		</form>
 	</div>

templates/repo/actions/workflow_dispatch_inputs.tmpl

@@ -0,0 +1,23 @@
+{{range $item := .WorkflowDispatchConfig.Inputs}}
+<div class="ui field {{if .Required}}required{{end}}">
+	{{if eq .Type "choice"}}
+		<label>{{.Description}}:</label>
+		<select class="ui selection type dropdown" name="{{.Name}}">
+			{{range .Options}}
+			<option value="{{.}}" {{if eq $item.Default .}}selected{{end}} >{{.}}</option>
+			{{end}}
+		</select>
+	{{else if eq .Type "boolean"}}
+		<div class="ui inline checkbox">
+			<label>{{.Description}}</label>
+			<input type="checkbox" name="{{.Name}}" {{if eq .Default "true"}}checked{{end}}>
+		</div>
+	{{else if eq .Type "number"}}
+		<label>{{.Description}}:</label>
+		<input name="{{.Name}}" value="{{.Default}}" {{if .Required}}required{{end}}>
+	{{else}}
+		<label>{{.Description}}:</label>
+		<input name="{{.Name}}" value="{{.Default}}" {{if .Required}}required{{end}}>
+	{{end}}
+</div>
+{{end}}