feat(secrets): load secrets in var group form

Author: fiftin

api/router.go

@@ -588,6 +588,7 @@ func serveFile(w http.ResponseWriter, r *http.Request, name string) {
 }
 
 func getSystemInfo(w http.ResponseWriter, r *http.Request) {
+	user := helpers.GetFromContext(r, "user").(*db.User)
 
 	var authMethods LoginAuthMethods
 
@@ -605,7 +606,7 @@ func getSystemInfo(w http.ResponseWriter, r *http.Request) {
 
 		"auth_methods": authMethods,
 
-		"premium_features": proFeatures.GetFeatures(),
+		"premium_features": proFeatures.GetFeatures(user),
 
 		"git_client": util.Config.GitClientId,
 

pro/pkg/features/features.go

@@ -1,6 +1,8 @@
 package features
 
-func GetFeatures() map[string]bool {
+import "github.com/semaphoreui/semaphore/db"
+
+func GetFeatures(user *db.User) map[string]bool {
 	return map[string]bool{
 		"project_runners":   false,
 		"terraform_backend": false,

web/src/components/EnvironmentForm.vue

@@ -607,17 +607,21 @@ export default {
       this.item.secrets = secrets;
     },
 
-    async beforeLoadData() {
-      [
-        this.secretStorages,
-      ] = await Promise.all([
-        this.loadProjectResources('secret_storages'),
-      ]);
-    },
-
-    afterLoadData() {
+    async afterLoadData() {
       if (this.item) {
-        return;
+        this.secretStorages = [];
+
+        if (this.item.secret_storage_id) {
+          this.secretStorages.push(
+            await this.loadProjectResource('secret_storages', this.item.secret_storage_id),
+          );
+        }
+      } else {
+        [
+          this.secretStorages,
+        ] = await Promise.all([
+          this.loadProjectResources('secret_storages'),
+        ]);
       }
 
       this.json = JSON.stringify(JSON.parse(this.item?.json || '{}'), null, 2);

web/src/views/project/Keys.vue

@@ -5,7 +5,6 @@
       :save-button-text="itemId === 'new' ? $t('create') : $t('save')"
       :title="`${itemId === 'new' ? $t('nnew') : $t('edit')} Key`"
       :max-width="450"
-      position="top"
       @save="loadItems()"
     >
       <template v-slot:form="{ onSave, onError, needSave, needReset }">