improve form field sorting and backward compatibility

Author: mms-gianni

client/src/App.vue

@@ -230,7 +230,6 @@ export default {
                 .get("/api/banner")
                 .then((result) => {
                     this.banner = result.data;
-                    this.app.name = "oooo"
                 })
                 .catch((err) => {
                     console.log(err);

client/src/components/apps/addons.vue

@@ -221,7 +221,7 @@ export default {
                         value: storageClass.name
                     });
                 }
-                console.log(this.availableStorageClasses);
+                //console.log(this.availableStorageClasses);
             })
             .catch(error => {
                 console.log(error);
@@ -237,7 +237,7 @@ export default {
             }
         },
         editAddon(addon){
-            console.log(addon);
+            //console.log(addon);
             this.mode = 'edit';
 
             // search in available addons for the selected addon
@@ -249,7 +249,7 @@ export default {
             }
 
             // set the formfields to the values from the yaml
-            console.log(this.selectedAddon.formfields);
+            //console.log(this.selectedAddon.formfields);
             Object.entries(this.selectedAddon.formfields).forEach(([field, value]) => {
                 const fieldvalue = get(addon.resourceDefinitions, field, value.default)
                 //console.log(field, value, fieldvalue);
@@ -276,7 +276,7 @@ export default {
             });
         },
         addonChange(event) {
-            console.log(event);
+            //console.log(event);
             this.selectedAddon = event;
         },
         submitForm() {
@@ -309,7 +309,7 @@ export default {
                 resourceDefinitions: this.selectedAddon.resourceDefinitions,
             };
 
-            console.log(addon);
+            //console.log(addon);
 
             if (this.mode === 'create') {
                 this.addAddon(addon);

client/src/components/apps/new.vue

@@ -339,14 +339,14 @@
         <v-expansion-panel-header class="text-uppercase text-caption-2 font-weight-medium secondary">Security</v-expansion-panel-header>
         <v-expansion-panel-content class="secondary">
 
-          <v-row>
+          <v-row  v-if="deploymentstrategy == 'git'">
             <v-col
               cols="12"
               md="6"
             >
               <v-switch
-                v-model="security.vulnerabilityScans"
-                label="Enable Trivy vulnerabfility scans"
+                v-model="buildpack.run.readOnlyAppStorage"
+                label="Read only app volume"
                 color="primary"
             ></v-switch>
             </v-col>
@@ -363,8 +363,8 @@
               md="6"
             >
               <v-switch
-                v-model="buildpack.run.readOnlyAppStorage"
-                label="Read only app storage"
+                v-model="buildpack.run.securityContext.readOnlyRootFilesystem"
+                label="Read only root filesystem"
                 color="primary"
             ></v-switch>
             </v-col>
@@ -373,8 +373,8 @@
               md="6"
             >
               <v-switch
-                v-model="buildpack.run.securityContext.readOnlyRootFilesystem"
-                label="Read only root filesystem"
+                v-model="security.vulnerabilityScans"
+                label="Enable Trivy vulnerabfility scans"
                 color="primary"
             ></v-switch>
             </v-col>
@@ -1324,6 +1324,11 @@ export default {
           if (this.cronjobs.length > 0) {
             this.panel.push(4)
           }
+
+          // Backward compability older v1.11.1
+          if (this.buildpack.run && this.buildpack.run.readOnlyAppStorage === undefined) {
+            this.buildpack.run.readOnlyAppStorage = true;
+          }
         });
       },
       changeName(name) {
@@ -1363,6 +1368,11 @@ export default {
             */
           }
 
+          // Backward compability older v1.11.1
+          if (this.buildpack.run && this.buildpack.run.readOnlyAppStorage === undefined) {
+            this.buildpack.run.readOnlyAppStorage = true;
+          }
+
         });
       },
       loadStorageClasses() {
@@ -1491,6 +1501,11 @@ export default {
             this.addons= response.data.spec.addons || [];
             this.security.vulnerabilityScans = response.data.spec.vulnerabilityscan.enabled;
             this.ingress = response.data.spec.ingress || {};
+
+            // Backward compability older v1.11.1
+            if (this.buildpack.run && this.buildpack.run.readOnlyAppStorage === undefined) {
+              this.buildpack.run.readOnlyAppStorage = true;
+            }
           });
         }
       },
@@ -1599,34 +1614,7 @@ export default {
           security: this.security,
           ingress: this.ingress,
         }
-/*
-        if (this.security.vulnerabilityScans) {
-          postdata.vulnerabilityscan = {
-            enabled: true,
-            image: {
-              repository: "aquasec/trivy",
-              tag: "latest",
-            },
-          }
-        } else {
-          postdata.vulnerabilityscan = {
-            enabled: false,
-          }
-        }
-*/
 
-/*
-        postdata.image.run.securityContext = {
-            readOnlyRootFilesystem: this.security.readOnlyRootFilesystem,
-            runAsNonRoot: this.security.runAsNonRoot,
-            runAsUser: parseInt(this.security.runAsUser),
-            runAsGroup: parseInt(this.security.runAsGroup),
-            capabilities: {
-              add: this.security.capabilities.add,
-              drop: this.security.capabilities.drop,
-            },
-        }
-*/
         axios.put(`/api/pipelines/${this.pipeline}/${this.phase}/${this.app}`, postdata
           // eslint-disable-next-line no-unused-vars
         ).then(response => {