Merge pull request #107 from codeurjc-students/hotfixes

Hotfixes

Author: ivchicano

.travis.yml

@@ -15,9 +15,9 @@ jobs:
     - "./mvnw clean package -B -q"
     after_script:
     - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
-    - docker build -t vscode4teaching/vscode4teaching:2.0.1 .
+    - docker build -t vscode4teaching/vscode4teaching:2.0.2 .
     - docker build -t vscode4teaching/vscode4teaching:latest .
-    - docker push vscode4teaching/vscode4teaching:2.0.1
+    - docker push vscode4teaching/vscode4teaching:2.0.2
     - docker push vscode4teaching/vscode4teaching:latest
   - language: node_js
     os:

vscode4teaching-extension/package-lock.json

@@ -12,9 +12,9 @@
 	},
 	"displayName": "VS Code 4 Teaching",
 	"description": "Bring the programming exercises directly to the student’s editor.",
-	"version": "2.0.1",
+	"version": "2.0.2",
 	"engines": {
-		"vscode": "^1.45.1"
+		"vscode": "^1.61.0"
 	},
 	"categories": [
 		"Other"
@@ -310,6 +310,7 @@
 		"@types/glob": "^7.1.1",
 		"@types/jest": "^25.2.3",
 		"@types/jest-cli": "^24.3.0",
+		"@types/lodash.escaperegexp": "^4.1.6",
 		"@types/mkdirp": "^1.0.0",
 		"@types/node": "^10.15.1",
 		"@types/rimraf": "^3.0.0",
@@ -332,6 +333,7 @@
 		"form-data": "^3.0.0",
 		"ignore": "^5.1.6",
 		"jszip": "^3.4.0",
+		"lodash.escaperegexp": "^4.1.2",
 		"mkdirp": "^1.0.4",
 		"vsls": "^1.0.3015",
 		"ws": "^7.4.6"

vscode4teaching-extension/package.json

@@ -18,29 +18,42 @@
 
     window.addEventListener('message', event => {
         const message = event.data;
-        for (const key in message) {
-            document.getElementById(key).textContent = message[key]
+        switch (message.type) {
+            case 'updateDate':
+                for (const key in message.update) {
+                    document.getElementById(key).textContent = message.update[key]
+                }
+                break;
+            case 'openDone':
+                document.querySelectorAll(".button-col > button").forEach((e) => {
+                    e.disabled = false;
+                });
+                break;
         }
     })
 
     document.querySelectorAll(".workspace-link").forEach((row) => {
         row.addEventListener("click", () => {
+            document.querySelectorAll(".button-col > button").forEach((e) => {
+                e.disabled = true;
+            });
             const username = Array.from(row.parentElement.parentElement.children).find(e => e.classList.contains('username')).innerHTML;
             vscode.postMessage({
                 type: "goToWorkspace",
                 username: username,
-                lastMod:row.attributes.getNamedItem("data-lastMod").value,
             });
         });
     });
 
     document.querySelectorAll(".workspace-link-diff").forEach((row) => {
         row.addEventListener("click", () => {
+            Array.from(row.parentElement.children).forEach((e) => {
+                e.disabled = true;
+            });
             const username = Array.from(row.parentElement.parentElement.children).find(e => e.classList.contains('username')).innerHTML;
             vscode.postMessage({
                 type: "diff",
                 username: username,
-                lastMod:row.attributes.getNamedItem("data-lastMod-diff").value,
             });
         });
     });