feat: add flag 'allow parallel tasks' for template (#3151)

* feat: add flag 'allow parallel tasks' for template

* chore(ui): add translation

* feat(ui): add new label for parallel tasks checkbox

Author: fiftin

db/Migration.go

@@ -30,6 +30,7 @@ func GetMigrations(dialect string) []Migration {
 			{Version: "2.15.3"},
 			{Version: "2.15.4"},
 			{Version: "2.16.0"},
+			{Version: "2.16.1"},
 		}
 	}
 
@@ -109,6 +110,7 @@ func GetMigrations(dialect string) []Migration {
 		{Version: "2.15.3"},
 		{Version: "2.15.4"},
 		{Version: "2.16.0"},
+		{Version: "2.16.1"},
 	}
 }
 

db/Template.go

@@ -157,6 +157,7 @@ type Template struct {
 	RunnerTag *string `db:"runner_tag" json:"runner_tag,omitempty"`
 
 	AllowOverrideBranchInTask bool `db:"allow_override_branch_in_task" json:"allow_override_branch_in_task,omitempty"`
+	AllowParallelTasks        bool `db:"allow_parallel_tasks" json:"allow_parallel_tasks,omitempty"`
 }
 
 func (tpl *Template) FillParams(target any) error {

db/sql/migrations/v2.16.1.err.sql

@@ -0,0 +1 @@
+alter table project__template drop column allow_parallel_tasks;

db/sql/migrations/v2.16.1.sql

@@ -0,0 +1 @@
+alter table project__template add allow_parallel_tasks boolean not null default false;

db/sql/template.go

@@ -21,13 +21,13 @@ func (d *SqlDb) CreateTemplate(template db.Template) (newTemplate db.Template, e
 			"playbook, arguments, allow_override_args_in_task, description, `type`, "+
 			"start_version, build_template_id, view_id, autorun, survey_vars, "+
 			"suppress_success_alerts, app, git_branch, runner_tag, task_params, "+
-			"allow_override_branch_in_task)"+
+			"allow_override_branch_in_task, allow_parallel_tasks)"+
 			"values ("+
 			"?, ?, ?, ?, ?, "+
 			"?, ?, ?, ?, ?, "+
 			"?, ?, ?, ?, ?, "+
 			"?, ?, ?, ?, ?,"+
-			"?)",
+			"?, ?)",
 		template.ProjectID,
 		template.InventoryID,
 		template.RepositoryID,
@@ -53,6 +53,7 @@ func (d *SqlDb) CreateTemplate(template db.Template) (newTemplate db.Template, e
 		template.TaskParams,
 
 		template.AllowOverrideBranchInTask,
+		template.AllowParallelTasks,
 	)
 
 	if err != nil {
@@ -103,7 +104,8 @@ func (d *SqlDb) UpdateTemplate(template db.Template) error {
 		"`git_branch`=?, "+
 		"task_params=?, "+
 		"runner_tag=?, "+
-		"allow_override_branch_in_task=? "+
+		"allow_override_branch_in_task=?, "+
+		"allow_parallel_tasks=? "+
 		"where id=? and project_id=?",
 		template.InventoryID,
 		template.RepositoryID,
@@ -125,6 +127,7 @@ func (d *SqlDb) UpdateTemplate(template db.Template) error {
 		template.TaskParams,
 		template.RunnerTag,
 		template.AllowOverrideBranchInTask,
+		template.AllowParallelTasks,
 
 		template.ID,
 		template.ProjectID,
@@ -186,6 +189,7 @@ func (d *SqlDb) GetTemplates(projectID int, filter db.TemplateFilter, params db.
 		"pt.runner_tag",
 		"pt.task_params",
 		"pt.allow_override_branch_in_task",
+		"pt.allow_parallel_tasks",
 		"(SELECT `id` FROM `task` WHERE template_id = pt.id ORDER BY `id` DESC LIMIT 1) last_task_id").
 		From("project__template pt")
 

services/tasks/TaskPool.go

@@ -290,7 +290,7 @@ func (p *TaskPool) blocks(t *TaskRunner) bool {
 		if r.Task.Status.IsFinished() {
 			continue
 		}
-		if r.Template.ID == t.Task.TemplateID {
+		if r.Template.ID == t.Task.TemplateID && !r.Template.AllowParallelTasks {
 			return true
 		}
 	}

web/src/components/TemplateForm.vue

@@ -292,6 +292,16 @@
             @change="setSurveyVars"
           />
 
+          <v-checkbox
+            class="mt-0"
+            v-model="item.allow_parallel_tasks"
+          >
+            <template v-slot:label>
+              {{ $t('allow_parallel_tasks') }}
+              <v-chip class="ml-2" small color="error">New</v-chip>
+            </template>
+          </v-checkbox>
+
           <v-checkbox
             class="mt-0"
             :label="$t('iWantToRunATaskByTheCronOnlyForForNewCommitsOfSome')"

web/src/lang/en.js

@@ -341,6 +341,7 @@ export default {
   limit: 'Limit',
 
   runner_tag: 'Runner tag',
+  allow_parallel_tasks: 'Allow parallel tasks',
   task_prompts: 'Prompts',
   template_advanced: 'Advanced options',
   template_app_options: '{app} options',