Use studyvm to go to a given move after chapter is fetched

Author: Carbrex

ui/analyse/src/study/interfaces.ts

@@ -25,6 +25,7 @@ export interface StudyVm {
   loading: boolean;
   nextChapterId?: ChapterId;
   justSetChapterId?: ChapterId;
+  nextPly?: number;
   tab: Prop<Tab>;
   toolTab: Prop<ToolTab>;
   chapterId: ChapterId;

ui/analyse/src/study/relay/chatHandler.ts

@@ -32,24 +32,15 @@ export function broadcastChatHandler(ctrl: AnalyseCtrl): BroadcastChatHandler {
       const segs = msg.split(separator);
       if (segs.length == 3) {
         const [_, chapterId, ply] = segs;
-        ctrl.study.setChapter(chapterId);
-
-        let attempts = 0;
-        const maxAttempts = 50;
-
-        // wait for the chapter to be set before jumping to the move
-        const waitForLoadingAndJump = () => {
-          if (!ctrl.study?.vm.loading) {
-            ctrl.jumpToMain(parseInt(ply));
-          } else if (attempts < maxAttempts) {
-            attempts++;
-            setTimeout(waitForLoadingAndJump, 100);
-          } else {
-            console.log('Failed to jump to move, took too many attempts.');
+        if (ctrl.study.vm.chapterId != chapterId || ctrl.study.vm.loading) {
+          ctrl.study.vm.nextPly = parseInt(ply);
+          ctrl.study.setChapter(chapterId);
+        } else {
+          if (ctrl.study.relay.tourShow()) {
+            ctrl.study.relay.tourShow(false);
           }
-        };
-
-        waitForLoadingAndJump();
+          ctrl.jumpToMain(parseInt(ply));
+        }
       }
     }
   };

ui/analyse/src/study/studyCtrl.ts

@@ -364,8 +364,13 @@ export default class StudyCtrl {
         : this.data.chapter.relayPath || this.chapters.localPaths[this.vm.chapterId] || treePath.root;
     }
 
-    // path could be gone (because of subtree deletion), go as far as possible
-    this.ctrl.userJump(this.ctrl.tree.longestValidPath(nextPath));
+    if (this.vm.nextPly) {
+      this.ctrl.jumpToMain(this.vm.nextPly);
+      this.vm.nextPly = undefined;
+    } else {
+      // path could be gone (because of subtree deletion), go as far as possible
+      this.ctrl.userJump(this.ctrl.tree.longestValidPath(nextPath));
+    }
 
     this.vm.justSetChapterId = undefined;