diff --git a/models/project/workflows.go b/models/project/workflows.go index a98c5d68f6..0bdb21c334 100644 --- a/models/project/workflows.go +++ b/models/project/workflows.go @@ -39,7 +39,7 @@ type WorkflowAction struct { ActionValue string } -type ProjectWorkflowEvent struct { +type ProjectWorkflow struct { ID int64 ProjectID int64 `xorm:"unique(s)"` WorkflowEvent WorkflowEvent `xorm:"unique(s)"` @@ -48,24 +48,52 @@ type ProjectWorkflowEvent struct { UpdatedUnix timeutil.TimeStamp `xorm:"updated"` } -func init() { - db.RegisterModel(new(ProjectWorkflowEvent)) +func (p *ProjectWorkflow) Link() string { + return "" } -func FindWorkflowEvents(ctx context.Context, projectID int64) (map[WorkflowEvent]ProjectWorkflowEvent, error) { - events := make(map[WorkflowEvent]ProjectWorkflowEvent) +func newDefaultWorkflows() []*ProjectWorkflow { + return []*ProjectWorkflow{ + { + WorkflowEvent: WorkflowEventItemAddedToProject, + WorkflowActions: []WorkflowAction{{ActionType: WorkflowActionTypeScope, ActionValue: "issue"}}, + }, + { + ProjectID: 0, + WorkflowEvent: WorkflowEventItemReopened, + WorkflowActions: []WorkflowAction{{ActionType: WorkflowActionTypeScope, ActionValue: "issue"}}, + }, + } +} + +func GetWorkflowDefaultValue(workflowIDStr string) *ProjectWorkflow { + workflows := newDefaultWorkflows() + for _, workflow := range workflows { + if workflow.WorkflowEvent == WorkflowEvent(workflowIDStr) { + return workflow + } + } + return &ProjectWorkflow{} +} + +func init() { + db.RegisterModel(new(ProjectWorkflow)) +} + +func FindWorkflowEvents(ctx context.Context, projectID int64) (map[WorkflowEvent]ProjectWorkflow, error) { + events := make(map[WorkflowEvent]ProjectWorkflow) if err := db.GetEngine(ctx).Where("project_id=?", projectID).Find(&events); err != nil { return nil, err } - res := make(map[WorkflowEvent]ProjectWorkflowEvent, len(events)) + res := make(map[WorkflowEvent]ProjectWorkflow, len(events)) for _, event := range events { res[event.WorkflowEvent] = event } return res, nil } -func GetWorkflowEventByID(ctx context.Context, id int64) (*ProjectWorkflowEvent, error) { - p, exist, err := db.GetByID[ProjectWorkflowEvent](ctx, id) +func GetWorkflowByID(ctx context.Context, id int64) (*ProjectWorkflow, error) { + p, exist, err := db.GetByID[ProjectWorkflow](ctx, id) if err != nil { return nil, err } @@ -74,3 +102,19 @@ func GetWorkflowEventByID(ctx context.Context, id int64) (*ProjectWorkflowEvent, } return p, nil } + +func GetWorkflows(ctx context.Context, projectID int64) ([]*ProjectWorkflow, error) { + events := make([]*ProjectWorkflow, 0, 10) + if err := db.GetEngine(ctx).Where("project_id=?", projectID).Find(&events); err != nil { + return nil, err + } + workflows := newDefaultWorkflows() + for i, defaultWorkflow := range workflows { + for _, workflow := range events { + if workflow.WorkflowEvent == defaultWorkflow.WorkflowEvent { + workflows[i] = workflow + } + } + } + return workflows, nil +} diff --git a/routers/web/projects/workflows.go b/routers/web/projects/workflows.go index afebda7d1f..60a9e09952 100644 --- a/routers/web/projects/workflows.go +++ b/routers/web/projects/workflows.go @@ -3,12 +3,71 @@ package projects -import "code.gitea.io/gitea/services/context" +import ( + "strconv" -var tmplWorkflows = "projects/workflows" + project_model "code.gitea.io/gitea/models/project" + "code.gitea.io/gitea/modules/templates" + "code.gitea.io/gitea/services/context" +) + +var tmplWorkflows = templates.TplName("projects/workflows") func Workflows(ctx *context.Context) { -} + projectID := ctx.PathParamInt64("id") + p, err := project_model.GetProjectByID(ctx, projectID) + if err != nil { + if project_model.IsErrProjectNotExist(err) { + ctx.NotFound(nil) + } else { + ctx.ServerError("GetProjectByID", err) + } + return + } + if p.RepoID != ctx.Repo.Repository.ID { + ctx.NotFound(nil) + return + } -func WorkflowEdit(ctx *context.Context) { + ctx.Data["Title"] = ctx.Tr("projects.workflows") + ctx.Data["PageIsWorkflows"] = true + ctx.Data["PageIsProjects"] = true + ctx.Data["PageIsProjectsWorkflows"] = true + + workflows, err := project_model.GetWorkflows(ctx, projectID) + if err != nil { + ctx.ServerError("GetWorkflows", err) + return + } + ctx.Data["Workflows"] = workflows + + workflowIDStr := ctx.PathParam("workflow_id") + var workflow *project_model.ProjectWorkflow + if workflowIDStr == "" { // get first value workflow or the first workflow + for _, wf := range workflows { + if wf.ID > 0 { + workflow = wf + break + } + } + if workflow.ID == 0 { + workflow = workflows[0] + } + } else { + workflowID, _ := strconv.ParseInt(workflowIDStr, 10, 64) + if workflowID > 0 { + var err error + workflow, err = project_model.GetWorkflowByID(ctx, workflowID) + if err != nil { + ctx.ServerError("GetWorkflowByID", err) + return + } + ctx.Data["CurWorkflow"] = workflow + } else { + workflow = project_model.GetWorkflowDefaultValue(workflowIDStr) + } + } + ctx.Data["CurWorkflow"] = workflow + + ctx.HTML(200, tmplWorkflows) } diff --git a/routers/web/web.go b/routers/web/web.go index e1405b2f91..99092d285d 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -1404,7 +1404,7 @@ func registerRoutes(m *web.Router) { m.Get("/{id}", repo.ViewProject) m.Group("/{id}/workflows", func() { m.Get("", projects.Workflows) - m.Get("/{workflow_id}", projects.WorkflowEdit) + m.Get("/{workflow_id}", projects.Workflows) }) m.Group("", func() { //nolint:dupl m.Get("/new", repo.RenderNewProject) diff --git a/templates/projects/workflows.tmpl b/templates/projects/workflows.tmpl new file mode 100644 index 0000000000..b7799316ff --- /dev/null +++ b/templates/projects/workflows.tmpl @@ -0,0 +1,11 @@ +
+
+
+ +
+
+