Bug fixes

Author: katharina-schulze

viplab-standalone-frontend-vue/.env

@@ -1,4 +1,4 @@
-VUE_APP_FILENAME = hello-world.docker-container-example
+VUE_APP_FILENAME = leap-year.computation-template
 #leap-year.computation-template
 #case_1.computation-template
 #viplab-computation-template

viplab-standalone-frontend-vue/src/input/case_1.computation-template.json

@@ -61,7 +61,7 @@
             },
             "parts": [
                 {
-                    "identifier": "f3fc4404-3529-4962-b252-47bc4ddd02a1",
+                    "identifier": "f3fc4404-3529-4962-b252-47bc4ddd02a2",
                     "access": "template",
                     "metadata": {
                         "name": "Parameters for Execution of Case 1"

viplab-standalone-frontend-vue/src/main.js

@@ -85,7 +85,8 @@ const store = new Vuex.Store({
         "resources.numCPUs": 1
       }, 
       "files": []
-    }
+    },
+    modifiedByTeacher: false,
   },
   mutations: {
     updateJsonTemplate (state, newValue) {
@@ -102,6 +103,9 @@ const store = new Vuex.Store({
     },
     updateGeneratedComputationTemplate (state, newValue) {
       state.generatedComputationTemplate = newValue;
+    },
+    updateModifiedByTeacher (state, newValue) {
+      state.modifiedByTeacher = newValue;
     }
   },
   plugins: [

viplab-standalone-frontend-vue/src/pages/teacher/App.vue

@@ -149,7 +149,7 @@
         </b-collapse>
 
         <!-- Graphical View of Template -->
-        <div class="dnd-window" id="drag-components-here">
+        <div class="dnd-window" id="drag-components-here" :key="signifyChange">
           <b-card no-body>
             <b-tabs card class="files" content-class="m-2" fill>
 
@@ -235,7 +235,7 @@
                                           <b-icon class="when-open" icon="caret-up"></b-icon>
                                         </b-button>
                                       </b-card-header>
-                                      <b-collapse :id="item.identifier+'content'" visible accordion="my-accordion-2" role="tabpanel">
+                                      <b-collapse :id="item.identifier +'content'" visible accordion="my-accordion-2" role="tabpanel">
                                         <b-card-body>
                                           <div class="part-content-field">
                                             <div class="d-flex"> 
@@ -1279,7 +1279,8 @@ export default {
         }
       ],
       validationRunning: false,
-      classValidity: ""
+      classValidity: "",
+      signifyChange: true,
     };
   },
   computed: {
@@ -1320,6 +1321,14 @@ export default {
         this.$store.commit("updateGeneratedComputationTemplate", newValue)
       }
     },
+    modifiedByTeacher : {
+      get () {
+        return this.$store.state.modifiedByTeacher;
+      },
+      set (newValue) {
+        this.$store.commit("updateModifiedByTeacher", newValue)
+      }
+    },
     thereIsTemplate() {
       for (var file in this.computationTemplate.files) {
         for (var part in this.computationTemplate.files[file].parts) {
@@ -1633,6 +1642,8 @@ export default {
         this.validationPartParameterResult = null;
         this.validationArgsResult = null;
         this.validationRunning = false; 
+
+        this.$forceUpdate()
       },
       deep: true
     },
@@ -2567,15 +2578,17 @@ export default {
       // TODO: Should also function without metadata as it is not required
       // add metadata if missing
 
+      // save current template, as it will be overwritten to perform validation
       let tmp = this.computationTemplate;
+      // set generatedTemplate/computationTemplate so validation can be performed
       this.$store.commit("updateGeneratedComputationTemplate", obj)
       let isValid = this.validateJson(true)
       if (!isValid) {
         this.$alert("Your template is not valid. Thus, it can not be imported!", "Import Error", "error");
         this.$store.commit("updateGeneratedComputationTemplate", tmp)
       } else {
         this.$store.commit("updateGeneratedComputationTemplate", obj)
-
+        this.signifyChange = !this.signifyChange
         // set number of options for configuring parameters and commandline arguments
         this.setNumbersOfOptions();
       }
@@ -2615,7 +2628,7 @@ export default {
         let file = JSON.stringify(this.computationTemplate);
         let dataBase64url = base64url(Buffer.from(file).toString());
         
-        //baseUrl = "http://localhost:3000/";
+        baseUrl = "http://localhost:3000/";
         fetch(baseUrl + "sign", {
           method: 'POST',
           body: dataBase64url
@@ -2629,8 +2642,9 @@ export default {
         }).then(jsonResponse => {
           // get token from sign-endpoint
           let token = jsonResponse.token;
-            
+          
           // set all values in Vuex store
+          this.$store.commit("updateModifiedByTeacher", true);
           this.$store.commit("updateJsonTemplate", this.computationTemplate)
           this.$store.commit("updateToken", token);
           this.$store.commit("updateDataTemplate", dataBase64url);

viplab-standalone-frontend-vue/src/pages/viplab/App.vue

@@ -627,6 +627,14 @@ export default {
         this.$store.commit("updateWebSocket", newValue)
       }
     },
+    modifiedByTeacher : {
+      get () {
+        return this.$store.state.modifiedByTeacher;
+      },
+      set (newValue) {
+        this.$store.commit("updateModifiedByTeacher", newValue)
+      }
+    },
     /* return parameters section of json file */
     parsedParametersJson: function () {
       var parsed = this.json.parameters;
@@ -685,9 +693,10 @@ export default {
         this.$store.commit("updateDataTemplate", data);
       } else if (Object.keys(this.$store.state.jsonTemplate).length > 0) {
         console.log("2")
-        if (data && (data === "{{ data }}" || data === "")) {
+        if (data && (data === "{{ data }}" || data === "") || this.modifiedByTeacher) {
           this.json = this.$store.state.jsonTemplate;
           this.dataTemplate = this.$store.state.dataTemplate;
+          this.$store.commit("updateModifiedByTeacher", false);
         } else {
           this.json = JSON.parse(base64url.decode(data));
           this.$store.commit("updateDataTemplate", data);