Merge branch 'semaphoreui:develop' into fix-PAASCOMMON-39

Author: FactorT

README.md

@@ -33,12 +33,12 @@ Semaphore UI allows you to:
 
 ## Key Concepts
 
-1. **Projects** is a collection of related resources, configurations, and tasks. Each project allows you to organize and manage your automation efforts in one place, defining the scope of tasks such as deploying applications, running scripts, or orchestrating cloud resources. Projects help group resources, inventories, task templates, and environments for streamlined automation workflows.
-2. **Task Templates** are reusable definitions of tasks that can be executed on demand or scheduled. A template specifies what actions should be performed, such as running Ansible playbooks, Terraform configurations, or other automation tasks. By using templates, you can standardize tasks and easily re-execute them with minimal effort, ensuring consistent results across different environments.
-3. **Task** is a specific instance of a job or operation executed by Semaphore. It refers to running a predefined action (like an Ansible playbook or a script) using a task template. Tasks can be initiated manually or automatically through schedules and are tracked to give you detailed feedback on the execution, including success, failure, and logs.
-4. **Schedules** allow you to automate task execution at specified times or intervals. This feature is useful for running periodic maintenance tasks, backups, or deployments without manual intervention. You can configure recurring schedules to ensure important automation tasks are performed regularly and on time.
-5. **Inventory** is a collection of target hosts (servers, virtual machines, containers, etc.) on which tasks will be executed. The inventory includes details about the managed nodes such as IP addresses, SSH credentials, and grouping information. It allows for dynamic control over which environments and hosts your automation will interact with.
-6. **Environment** refers to a configuration context that holds sensitive information such as environment variables and secrets used by tasks during execution. It separates sensitive data from task templates and allows you to switch between different setups while running the same task template across different environments securely.
+1. **Projects** is a collection of related resources, configurations, and tasks.
+2. **Task Templates** are reusable definitions of tasks that can be executed on demand or scheduled.
+3. **Task** is a specific instance of a job or operation executed by Semaphore.
+4. **Schedules** allow you to automate task execution at specified times or intervals.
+5. **Inventory** is a collection of target hosts (servers, virtual machines, containers, etc.) on which tasks will be executed.
+6. **Variable Group** refers to a configuration context that holds sensitive information such as environment variables and secrets used by tasks during execution.
 
 ## Getting Started
 
@@ -70,14 +70,6 @@ We recommend using the [Container Configurator](https://semaphoreui.com/install/
 
 We offer a SaaS solution for using Semaphore UI without installation. Check it out at [Semaphore Cloud](https://portal.semaphoreui.com).
 
-### Deploy VM from Marketplace
-
-Supported cloud providers:
-* [Semaphore Run](https://cloud.semaphore.run/servers/new/semaphore)
-* [AWS](https://aws.amazon.com/marketplace/pp/prodview-5noeat2jipwca)
-* [Yandex Cloud](https://yandex.cloud/en-ru/marketplace/products/fastlix/semaphore)
-* DigitalOcean (coming soon)
-
 ### Other Installation Methods
 
 For more installation options, visit our [Installation page](https://semaphoreui.com/install).

api/router.go

@@ -221,6 +221,8 @@ func Route() *mux.Router {
 	projectUserAPI.Path("/tasks").HandlerFunc(projects.GetAllTasks).Methods("GET", "HEAD")
 	projectUserAPI.HandleFunc("/tasks/last", projects.GetLastTasks).Methods("GET", "HEAD")
 
+	projectUserAPI.Path("/stats").HandlerFunc(projects.GetTaskStats).Methods("GET", "HEAD")
+
 	projectUserAPI.Path("/templates").HandlerFunc(projects.GetTemplates).Methods("GET", "HEAD")
 	projectUserAPI.Path("/templates").HandlerFunc(projects.AddTemplate).Methods("POST")
 

db/Template.go

@@ -62,9 +62,12 @@ const (
 )
 
 type AnsibleTemplateParams struct {
+	AllowDebug             bool     `json:"allow_debug"`
 	AllowOverrideInventory bool     `json:"allow_override_inventory"`
 	AllowOverrideLimit     bool     `json:"allow_override_limit"`
 	Limit                  []string `json:"limit"`
+	Tags                   []string `json:"tags"`
+	SkipTags               []string `json:"skip_tags"`
 }
 
 type TerraformTemplateParams struct {
@@ -156,9 +159,9 @@ func (tpl *Template) FillParams(target interface{}) error {
 
 func (tpl *Template) CanOverrideInventory() (ok bool, err error) {
 	switch tpl.App {
-	case AppAnsible:
+	case AppAnsible, "":
 		var params AnsibleTemplateParams
-		err = tpl.FillParams(params)
+		err = tpl.FillParams(&params)
 		if err != nil {
 			return
 		}

db/sql/SqlDb.go

@@ -806,6 +806,10 @@ func (d *SqlDb) GetTaskStats(projectID int, templateID *int, unit db.TaskStatUni
 		q = q.Where("template_id=?", *templateID)
 	}
 
+	if filter.UserID != nil {
+		q = q.Where("user_id=?", *filter.UserID)
+	}
+
 	if filter.Start != nil {
 		q = q.Where("start>=?", *filter.Start)
 	}

services/tasks/LocalJob.go

@@ -343,7 +343,7 @@ func (t *LocalJob) getPlaybookArgs(username string, incomingVersion *string) (ar
 		return
 	}
 
-	if params.Debug {
+	if tplParams.AllowDebug && params.Debug {
 		args = append(args, "-vvvv")
 	}
 
@@ -401,6 +401,14 @@ func (t *LocalJob) getPlaybookArgs(username string, incomingVersion *string) (ar
 		templateArgs = append(templateArgs, "--limit="+limit)
 	}
 
+	if len(tplParams.Tags) > 0 {
+		templateArgs = append(templateArgs, "--tags="+strings.Join(tplParams.Tags, ","))
+	}
+
+	if len(tplParams.SkipTags) > 0 {
+		templateArgs = append(templateArgs, "--skip-tags="+strings.Join(tplParams.SkipTags, ","))
+	}
+
 	args = append(args, templateArgs...)
 	args = append(args, taskArgs...)
 	args = append(args, playbookName)

services/tasks/TaskRunner_test.go

@@ -305,6 +305,9 @@ func TestPopulateDetailsInventory(t *testing.T) {
 		RepositoryID:  repo.ID,
 		InventoryID:   &inv.ID,
 		EnvironmentID: &env.ID,
+		TaskParams: map[string]interface{}{
+			"allow_override_inventory": true,
+		},
 	})
 
 	if err != nil {

web/src/App.vue

@@ -718,6 +718,10 @@
   margin-left: 10px !important;
 }
 
+.v-slide-group__prev--disabled {
+  display: none !important;
+}
+
 @media (min-width: 960px) {
   .v-app-bar__nav-icon {
     display: none !important;

web/src/components/DashboardMenu.vue

@@ -1,13 +1,15 @@
 <template>
   <div>
-    <v-tabs show-arrows class="pl-4">
+    <v-tabs class="pl-4">
       <v-tab
         v-if="projectType === ''"
         key="history"
         :to="`/project/${projectId}/history`"
       >{{ $t('history') }}
       </v-tab>
 
+      <v-tab key="stats" :to="`/project/${projectId}/stats`">{{ $t('stats') }}</v-tab>
+
       <v-tab key="activity" :to="`/project/${projectId}/activity`">{{ $t('activity') }}</v-tab>
 
       <v-tab
@@ -31,12 +33,9 @@
   </div>
 </template>
 <script>
-import PermissionsCheck from '@/components/PermissionsCheck';
 
 export default {
 
-  mixins: [PermissionsCheck],
-
   props: {
     projectId: Number,
     projectType: String,
@@ -48,5 +47,6 @@ export default {
       id: null,
     };
   },
+
 };
 </script>

web/src/components/EditDialog.vue

@@ -10,7 +10,7 @@ Can use used in tandem with ItemFormBase.js. See KeyForm.vue for example.
     persistent
     :fullscreen="expandable && fullscreen"
     :transition="false"
-    :content-class="'item-dialog item-dialog--' + position"
+    :content-class="`item-dialog item-dialog item-dialog--${position} ${contentClass}`"
   >
     <v-card>
       <v-card-title>
@@ -45,7 +45,9 @@ Can use used in tandem with ItemFormBase.js. See KeyForm.vue for example.
           'pb-0': !hideButtons,
           'pa-0': noBodyPaddings,
         }"
-        :style="{minHeight: minContentHeight + 'px'}"
+        :style="{
+          minHeight: minContentHeight + 'px'
+        }"
       >
         <slot
           name="form"
@@ -93,6 +95,7 @@ import EventBus from '@/event-bus';
 
 export default {
   props: {
+    contentClass: String,
     position: String,
     title: String,
     icon: String,

web/src/components/EditTemplateDialog.vue

@@ -1,7 +1,7 @@
 <template>
   <EditDialog
       v-if="isAppsLoaded"
-      :max-width="700"
+      :max-width="1200"
       :min-content-height="457"
       v-model="dialog"
       :save-button-text="itemId === 'new' ? $t('create') : $t('save')"
@@ -10,6 +10,7 @@
       :title="(itemId === 'new' ? $t('newTemplate') : $t('editTemplate')) +
         ' \'' + getAppTitle(itemApp) + '\''"
       @save="onSave"
+      :content-class="`EditTemplateDialog EditTemplateDialog--${id}`"
   >
     <template v-slot:form="{ onSave, onError, needSave, needReset }">
       <TemplateForm
@@ -21,10 +22,27 @@
           :need-reset="needReset"
           :source-item-id="sourceItemId"
           :app="itemApp"
+          @resize="onFormResize"
       />
     </template>
   </EditDialog>
 </template>
+
+<style lang="scss">
+.EditTemplateDialog {
+  width: auto;
+  .v-card__text {
+    overflow-x: auto;
+  }
+}
+
+@media #{map-get($display-breakpoints, 'sm-and-down')} {
+  .EditTemplateDialog {
+    width: auto !important;
+  }
+}
+</style>
+
 <script>
 
 import TemplateForm from './TemplateForm.vue';
@@ -49,6 +67,7 @@ export default {
 
   data() {
     return {
+      id: Math.round(Math.random() * 1000000),
       dialog: false,
     };
   },
@@ -64,6 +83,11 @@ export default {
   },
 
   methods: {
+    onFormResize(e) {
+      const contentEl = document.querySelector(`.EditTemplateDialog--${this.id}`);
+      contentEl.style.width = `${e.width + 50}px`;
+    },
+
     onSave(e) {
       this.$emit('save', e);
     },

web/src/components/EnvironmentForm.vue

@@ -487,7 +487,7 @@ export default {
           operation = 'create';
         } else if (s.remove) {
           operation = 'delete';
-        } else if (s.value !== '') {
+        } else {
           operation = 'update';
         }
         return {

web/src/components/TaskForm.vue

@@ -108,8 +108,19 @@
       hide-details
     ></v-select>
 
-    <TaskParamsForm v-if="template.app === 'ansible'" v-model="item.params" :app="template.app" />
-    <TaskParamsForm v-else v-model="item.params" :app="template.app" />
+    <TaskParamsForm
+      v-if="template.app === 'ansible'"
+      v-model="item.params"
+      :app="template.app"
+      :template-params="template.task_params"
+    />
+
+    <TaskParamsForm
+      v-else
+      v-model="item.params"
+      :app="template.app"
+      :template-params="template.task_params"
+    />
 
     <ArgsPicker
       v-if="template.allow_override_args_in_task"

web/src/components/TaskParamsForm.vue

@@ -1,7 +1,7 @@
 <template>
   <div v-if="app === 'ansible'">
     <v-row no-gutters class="mt-6">
-      <v-col cols="12" sm="6">
+      <v-col cols="12" sm="6" v-if="templateParams.allow_debug">
         <v-checkbox
           class="mt-0"
           :input-value="params.debug"
@@ -118,6 +118,7 @@ export default {
   props: {
     value: Object,
     app: String,
+    templateParams: Object,
   },
 
   watch: {