feat(secrets): add new feature flag

Author: fiftin

pro/pkg/features/features.go

@@ -2,13 +2,6 @@ package features
 
 import "github.com/semaphoreui/semaphore/db"
 
-type Features struct {
-	ProjectRunners   bool `json:"project_runners"`
-	TerraformBackend bool `json:"terraform_backend"`
-	TaskSummary      bool `json:"task_summary"`
-	SecretStorages   bool `json:"secret_storages"`
-}
-
 func GetFeatures(user *db.User) map[string]bool {
 	return map[string]bool{
 		"project_runners":   false,

web/src/components/EnvironmentForm.vue

@@ -6,41 +6,6 @@
     v-if="item != null && secretStorages != null"
     class="pb-3"
   >
-
-<!--    <v-dialog-->
-<!--      v-model="envEditorDialog"-->
-<!--      max-width="800"-->
-<!--      persistent-->
-<!--      :transition="false"-->
-<!--    >-->
-<!--      <div style="position: relative;">-->
-<!--        <codemirror-->
-<!--          class="EnvironmentMaximizedEditor"-->
-<!--          :style="{ border: '1px solid lightgray' }"-->
-<!--          v-model="json"-->
-<!--          :options="cmOptions"-->
-<!--          :placeholder="$t('enterExtraVariablesJson')"-->
-<!--        />-->
-
-<!--        <v-btn-->
-<!--          dark-->
-<!--          fab-->
-<!--          small-->
-<!--          color="blue-grey"-->
-<!--          v-if="extraVarsEditMode === 'json'"-->
-<!--          style="-->
-<!--            position: absolute;-->
-<!--            right: 0;-->
-<!--            top: 0;-->
-<!--            margin: 10px;-->
-<!--          "-->
-<!--          @click="envEditorDialog = false"-->
-<!--        >-->
-<!--          <v-icon>mdi-arrow-collapse</v-icon>-->
-<!--        </v-btn>-->
-<!--      </div>-->
-<!--    </v-dialog>-->
-
     <v-alert
       :value="formError"
       color="error"
@@ -58,7 +23,7 @@
       dense
     ></v-text-field>
 
-    <v-row v-if="isNew">
+    <v-row v-if="supportStorages && isNew">
       <v-col>
         <v-autocomplete
           v-model="item.secret_storage_id"
@@ -156,24 +121,6 @@
               margin: 10px;
             "
           />
-
-<!--          <v-btn-->
-<!--            dark-->
-<!--            fab-->
-<!--            small-->
-<!--            color="blue-grey"-->
-<!--            v-if="extraVarsEditMode === 'json'"-->
-<!--            style="-->
-<!--              position: absolute;-->
-<!--              right: 0;-->
-<!--              top: 0;-->
-<!--              margin: 10px;-->
-<!--            "-->
-<!--            @click="envEditorDialog = true"-->
-<!--          >-->
-<!--            <v-icon>mdi-arrow-expand</v-icon>-->
-<!--          </v-btn>-->
-
         </div>
         <div v-else-if="extraVarsEditMode === 'table'">
           <v-data-table
@@ -435,13 +382,6 @@
     height: 160px !important;
   }
 }
-
-//.EnvironmentMaximizedEditor {
-//  .CodeMirror {
-//    font-size: 14px;
-//    height: 600px !important;
-//  }
-//}
 </style>
 <script>
 /* eslint-disable import/no-extraneous-dependencies,import/extensions */
@@ -460,6 +400,7 @@ export default {
 
   props: {
     needHelp: Boolean,
+    supportStorages: Boolean,
   },
 
   components: {
@@ -477,12 +418,6 @@ export default {
   },
 
   watch: {
-    // envEditorDialog(val) {
-    //   this.$emit('maximize', {
-    //     maximized: val,
-    //   });
-    // },
-
     extraVarsEditMode(val) {
       let extraVars;
 
@@ -546,7 +481,6 @@ export default {
       },
 
       extraVarsEditMode: 'json',
-      // envEditorDialog: false,
 
       secretStorages: null,
     };

web/src/components/KeyForm.vue

@@ -23,6 +23,7 @@
     />
 
     <v-autocomplete
+      v-if="supportStorages"
       v-model="item.source_storage_id"
       :label="$t('Storage (optional)')"
       :items="secretStorages"
@@ -35,7 +36,7 @@
     />
 
     <v-text-field
-      v-if="item.source_storage_id != null"
+      v-if="supportStorages && item.source_storage_id != null"
       v-model="item.source_storage_key"
       :label="$t('Source Key')"
       :disabled="formSaving || !canEditSecrets"

web/src/views/project/Environment.vue

@@ -19,6 +19,7 @@
           :need-save="needSave"
           :need-reset="needReset"
           :need-help="needHelp"
+          :support-storages="systemInfo.premium_features?.secret_storages"
           @maximize="editNoEscape = $event.maximized"
         />
       </template>
@@ -87,6 +88,7 @@ export default {
   data() {
     return {
       editNoEscape: false,
+      systemInfo: Object,
     };
   },
   methods: {

web/src/views/project/SecretStorages.vue

@@ -42,7 +42,7 @@
 
       <v-menu
         offset-y
-        v-if="premiumFeatures.secret_storages"
+        v-if="premiumFeatures.secret_storage_management"
       >
         <template v-slot:activator="{ on, attrs }">
 
@@ -95,7 +95,7 @@
     <v-divider style="margin-top: -1px;"/>
 
     <v-alert
-      v-if="!premiumFeatures.secret_storages"
+      v-if="!premiumFeatures.secret_storage_management"
       type="info"
       text
       color="hsl(348deg, 86%, 61%)"