✨ : editable variables

Some variables could be made "unmodifiable" by module users. To do so, add a switch or a checkbox in the module definition, next to each variables in the module edit view. Then in the stack view, the variable MUST not be visible or editable by users. resolves #5
gaia-app · Jun 10, 2019 · 07a938d · 07a938d
1 parent 11b6dc6
commit 07a938d
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 8 deletions.
diff --git a/src/main/java/io/codeka/gaia/bo/TerraformVariable.java b/src/main/java/io/codeka/gaia/bo/TerraformVariable.java
@@ -1,5 +1,8 @@
 package io.codeka.gaia.bo;
 
+/**
+ * Represents a module variable
+ */
 public class TerraformVariable {
 
     private String name;
@@ -8,6 +11,8 @@ public class TerraformVariable {
 
     private String defaultValue;
 
+    private boolean editable;
+
     public String getName() {
         return name;
     }
@@ -31,4 +36,12 @@ public String getDefaultValue() {
     public void setDefaultValue(String defaultValue) {
         this.defaultValue = defaultValue;
     }
+
+    public boolean isEditable() {
+        return editable;
+    }
+
+    public void setEditable(boolean editable) {
+        this.editable = editable;
+    }
 }
diff --git a/src/main/resources/static/css/style.css b/src/main/resources/static/css/style.css
@@ -3416,4 +3416,12 @@ pre[class*="language-"] {
 
 code[class*="language-"] b {
     font-weight: bold;
-}
+}
+
+.form-check{
+    margin-bottom: 0.5rem;
+}
+.form-check-input{
+    margin-top: 0;
+    margin-left: -1.5rem;
+}
diff --git a/src/main/resources/templates/module.html b/src/main/resources/templates/module.html
@@ -75,19 +75,26 @@ <h2>Module {{name}}</h2>
                 <h2>Variables <button type="button" class="btn btn-success" @click="addVar()">+</button></h2>
 
                 <div class="form-row align-items-end" v-for="(modVar,modVarIdx) in variables">
-                    <div class="form-group col-md-4" >
+                    <div class="form-group col-md-3" >
                         <label for="var-name">Name: </label>
                         <input type="text" class="form-control" id="var-name" v-model="modVar.name">
                     </div>
-                    <div class="form-group col-md-4" >
+                    <div class="form-group col-md-3" >
                         <label for="var-description">Description: </label>
                         <input type="text" class="form-control" id="var-description" v-model="modVar.description">
                     </div>
-                    <div class="form-group col-md-3" >
+                    <div class="form-group col-md-2" >
                         <label for="var-defaultValue">Default value: </label>
                         <input type="text" class="form-control" id="var-defaultValue" v-model="modVar.defaultValue">
                     </div>
-                    <div class="form-group col-md-1" >
+                    <div class="form-group col-md-1">
+                        <div class="form-check">
+                            <input class="form-check-input" type="checkbox" :id="'check-' + modVarIdx" v-model="modVar.editable">
+                            <label class="form-check-label" :for="'check-' + modVarIdx"
+                                   data-toggle="tooltip" data-placement="top" title="Set this variable as editable for module users">Editable</label>
+                        </div>
+                    </div>
+                    <div class="form-group" >
                         <button type="button" class="form-control btn btn-danger" @click="removeVar(modVarIdx)">-</button>
                     </div>
                 </div>
@@ -132,7 +139,8 @@ <h2>Variables <button type="button" class="btn btn-success" @click="addVar()">+<
                         data.variables.push({});
                     }
                 }
-            })
+            });
+            $('[data-toggle="tooltip"]').tooltip();
         });
 </script>
 

diff --git a/src/main/resources/templates/stack.html b/src/main/resources/templates/stack.html
@@ -164,13 +164,16 @@ <h2>Module variables values</h2>
                         <small>This is the configuration of your module's variables !</small>
                     </div>
                     <div class="block_content">
-                        <div class="form-row align-items-end" v-for="(modVar,modVarIdx) in stack.module.variables">
-                            <div class="form-group col-md-4" >
+                        <div class="form-row align-items-end" v-for="(modVar,modVarIdx) in editableVars" v-if="editableVars.length > 0">
+                            <div class="form-group col">
                                 <label for="var-name">{{modVar.name}}: </label>
                                 <input type="text" class="form-control" id="var-name" v-model="stack.variableValues[modVar.name]" @change="recomputeState">
                                 <small id="emailHelp" class="form-text text-muted">{{modVar.description}}</small>
                             </div>
                         </div>
+                        <div v-if="editableVars.length === 0">
+                            <p>No editable variable defined for this module.</p>
+                        </div>
                     </div>
                 </div>
             </div>
@@ -271,6 +274,11 @@ <h2><span><i class="fas fa-history"></i> Job history</span></h2>
                         stack.state = "TO_UPDATE";
                     }
                 }
+            },
+            computed: {
+                editableVars: function() {
+                    return this.stack.module.variables.filter(variable => variable.editable);
+                }
             }
         });