feat(ui): check system flag

Author: fiftin

api/projects/project.go

@@ -81,7 +81,7 @@ func (c *ProjectController) UpdateProject(w http.ResponseWriter, r *http.Request
 		return
 	}
 
-	err := c.ProjectService.UpdateProject(project)
+	err := c.ProjectService.UpdateProject(body)
 
 	if err != nil {
 		helpers.WriteError(w, err)

api/router.go

@@ -582,9 +582,10 @@ func getSystemInfo(w http.ResponseWriter, r *http.Request) {
 		"auth_methods": authMethods,
 
 		"premium_features": map[string]bool{
-			"project_runners":   false,
-			"terraform_backend": false,
-			"task_result":       false,
+			"project_runners":         false,
+			"terraform_backend":       false,
+			"task_result":             false,
+			"hashicorp_vault_secrets": false,
 		},
 
 		"git_client": util.Config.GitClientId,

db/Project.go

@@ -13,6 +13,5 @@ type Project struct {
 	AlertChat        *string   `db:"alert_chat" json:"alert_chat,omitempty"`
 	MaxParallelTasks int       `db:"max_parallel_tasks" json:"max_parallel_tasks,omitempty"`
 	Type             string    `db:"type" json:"type"`
-
-	VaultToken string `db:"-" json:"vault_token,omitempty" backup:"-"`
+	VaultToken       string    `db:"-" json:"vault_token,omitempty" backup:"-"`
 }

services/project_svc.go

@@ -45,7 +45,7 @@ func (s *ProjectServiceImpl) UpdateProject(project db.Project) (err error) {
 	if len(keys) == 0 {
 		if project.VaultToken != "" {
 			_, err = s.keyRepo.CreateAccessKey(db.AccessKey{
-				Type:      db.AccessKeyLoginPassword,
+				Type:      db.AccessKeyString,
 				ProjectID: &project.ID,
 				Secret:    nil,
 				String:    project.VaultToken,
@@ -59,7 +59,7 @@ func (s *ProjectServiceImpl) UpdateProject(project db.Project) (err error) {
 			err = s.keyRepo.DeleteAccessKey(project.ID, vault.ID)
 		} else {
 			vault.OverrideSecret = true
-			vault.Secret = &project.VaultToken
+			vault.String = project.VaultToken
 			err = s.keyRepo.UpdateAccessKey(vault)
 		}
 	}

web/src/components/ProjectForm.vue

@@ -52,6 +52,17 @@
       dense
     ></v-text-field>
 
+    <v-text-field
+      v-if="systemInfo.premium_features.hashicorp_vault_secrets"
+      v-model="item.vault_token"
+      :label="$t('Hashicorp Vault Token')"
+      :disabled="formSaving"
+      data-testid="newProject-tg"
+      outlined
+      dense
+      append-icon="mdi-lock"
+    ></v-text-field>
+
     <v-switch
       v-if="itemId === 'new'"
       v-model="item.demo"
@@ -67,6 +78,9 @@ import ItemFormBase from '@/components/ItemFormBase';
 
 export default {
   mixins: [ItemFormBase],
+  props: {
+    systemInfo: Object,
+  },
   methods: {
     getItemsUrl() {
       return '/api/projects';

web/src/views/project/New.vue

@@ -1,30 +1,36 @@
 <template xmlns:v-slot="http://www.w3.org/1999/XSL/Transform">
   <div>
-    <v-toolbar flat >
+    <v-toolbar flat>
       <v-app-bar-nav-icon @click="showDrawer()"></v-app-bar-nav-icon>
       <v-toolbar-title>{{ $t('newProject') }}</v-toolbar-title>
       <v-spacer></v-spacer>
     </v-toolbar>
 
-    <v-divider />
+    <v-divider/>
 
     <div
       style="margin: auto; max-width: 600px; padding: 0 16px;"
       class="CenterToScreen"
     >
-        <div class="project-settings-form">
+      <div class="project-settings-form">
         <div style="height: 300px;">
-            <ProjectForm item-id="new" ref="editForm" @save="onSave" />
+          <ProjectForm
+            item-id="new"
+            ref="editForm"
+            @save="onSave"
+            :system-info="systemInfo"
+          />
         </div>
 
         <div class="text-right">
-            <v-btn
+          <v-btn
             color="success" class="mr-3" @click="createDemoProject()"
-            >{{ $t('CreateDemoProject') }}</v-btn>
+          >{{ $t('CreateDemoProject') }}
+          </v-btn>
 
-            <v-btn color="primary" @click="createProject()">{{ $t('create') }}</v-btn>
-        </div>
+          <v-btn color="primary" @click="createProject()">{{ $t('create') }}</v-btn>
         </div>
+      </div>
     </div>
 
   </div>
@@ -39,10 +45,11 @@ import ProjectForm from '@/components/ProjectForm.vue';
 export default {
   components: { ProjectForm },
   data() {
-    return {
-    };
+    return {};
+  },
+  props: {
+    systemInfo: Object,
   },
-
   methods: {
     onSave(e) {
       EventBus.$emit('i-project', {

web/src/views/project/Settings.vue

@@ -27,8 +27,14 @@
       <v-divider class="mb-8" />
 
       <div class="project-settings-form">
-        <div style="height: 300px;">
-          <ProjectForm :item-id="projectId" ref="form" @error="onError" @save="onSave"/>
+        <div>
+          <ProjectForm
+            :item-id="projectId"
+            ref="form"
+            @error="onError"
+            @save="onSave"
+            :system-info="systemInfo"
+          />
         </div>
 
         <div class="text-right">
@@ -153,6 +159,7 @@ export default {
   props: {
     projectId: Number,
     projectType: String,
+    systemInfo: Object,
   },
 
   data() {