X-Git-Url: https://git.auder.net/?p=vchess.git;a=blobdiff_plain;f=client%2Fsrc%2Fviews%2FMyGames.vue;h=d12fff480f845d1e031cc98926e24b89da124ce7;hp=5c3522ec55561487c0746a282aca0b8e3710b818;hb=bae751bc6bc548791772c3ff5883a03deeb77264;hpb=e50a802531b99829c533f22ecd21e359e7e1e049

diff --git a/client/src/views/MyGames.vue b/client/src/views/MyGames.vue
index 5c3522ec..d12fff48 100644
--- a/client/src/views/MyGames.vue
+++ b/client/src/views/MyGames.vue
@@ -84,6 +84,14 @@ export default {
   watch: {
     $route: function(to, from) {
       if (to.path != "/mygames") this.cleanBeforeDestroy();
+    },
+    // st.variants changes only once, at loading from [] to [...]
+    "st.variants": function() {
+      // Set potential games variant names + display:
+      this.liveGames.concat(this.corrGames).concat(this.importGames)
+      .forEach(o => {
+        if (!o.vname) this.setVname(o);
+      });
     }
   },
   created: function() {
@@ -149,6 +157,7 @@ export default {
               this.corrGames.forEach(g => {
                 g.type = "corr";
                 g.score = "*";
+                g.options = JSON.parse(g.options);
               });
               this.decorate(this.corrGames);
               // Now ask completed games (partial list)
@@ -191,6 +200,14 @@ export default {
           document.getElementById(t + "Games").classList.remove("active");
       }
     },
+    // TODO: duplicated from Hall.vue:
+    setVname: function(obj) {
+      const variant = this.st.variants.find(v => v.id == obj.vid);
+      if (!!variant) {
+        obj.vname = variant.name;
+        obj.vdisp = variant.display;
+      }
+    },
     addGameImport(game) {
       game.type = "import";
       ImportgameStorage.add(game, (err) => {
@@ -230,6 +247,7 @@ export default {
           if ((rem == 0 && g.myColor == 'w') || (rem == 1 && g.myColor == 'b'))
             g.myTurn = true;
         }
+        this.setVname(g);
       });
     },
     socketMessageListener: function(msg) {
@@ -260,15 +278,13 @@ export default {
           break;
         }
         case "notifynewgame": {
-          const gameInfo = data.data;
-          // st.variants might be uninitialized,
-          // if unlucky and newgame right after connect:
-          const v = this.st.variants.find(v => v.id == gameInfo.vid);
-          const vname = !!v ? v.name : "";
+          let gameInfo = data.data;
+          this.setVname(gameInfo);
+          // TODO: remove patch on next line (options || "{}")
+          gameInfo.options = JSON.parse(gameInfo.options || "{}");
           const type = (gameInfo.cadence.indexOf('d') >= 0 ? "corr": "live");
           let game = Object.assign(
             {
-              vname: vname,
               type: type,
               score: "*",
               created: Date.now()
@@ -355,7 +371,10 @@ export default {
               if (L > 0) {
                 this.cursor["corr"] = res.games[L - 1].created;
                 let moreGames = res.games;
-                moreGames.forEach(g => g.type = "corr");
+                moreGames.forEach(g => {
+                  g.type = "corr";
+                  g.options = JSON.parse(g.options);
+                });
                 this.decorate(moreGames);
                 this.corrGames = this.corrGames.concat(moreGames);
               }
@@ -371,7 +390,11 @@ export default {
           if (L > 0) {
             // Add "-1" because IDBKeyRange.upperBound includes boundary
             this.cursor["live"] = localGames[L - 1].created - 1;
-            localGames.forEach(g => g.type = "live");
+            localGames.forEach(g => {
+              g.type = "live";
+              // TODO: remove patch on next line (options || "{}")
+              g.options = JSON.parse(g.options || "{}");
+            });
             this.decorate(localGames);
             this.liveGames = this.liveGames.concat(localGames);
           }
@@ -385,7 +408,12 @@ export default {
           if (L > 0) {
             // Add "-1" because IDBKeyRange.upperBound includes boundary
             this.cursor["import"] = importGames[L - 1].created - 1;
-            importGames.forEach(g => g.type = "import");
+            importGames.forEach(g => {
+              g.type = "import";
+              // TODO: remove following patch (options || "{}")
+              g.options = JSON.parse(g.options || "{}");
+              this.setVname(g);
+            });
             this.importGames = this.importGames.concat(importGames);
           }
           else this.hasMore["import"] = false;