fixed race condition with overview render loop

Author: RobotEngine

public/crucial.js

@@ -22,7 +22,7 @@ const configurations = {
 };
 
 const configuration = "public";
-const version = "1.6.61"; // Big Update . Small Feature Release . Bug Fix
+const version = "1.6.62"; // Big Update . Small Feature Release . Bug Fix
 const domain = "markifyapp.com";
 
 let config = configurations[configuration];

public/modules/breakout/group.js

@@ -736,13 +736,21 @@ modules["breakout/group"] = class {
       }
     }, { sort: 1 });
 
+    let promptWelcomeModal = async () => {
+      if (this.welcomeRead != true && this.parent.parent.self.access < 4 && Object.keys(this.members).length > 1) {
+        this.welcomeRead = true;
+        frame.insertAdjacentHTML("beforeend", `<div class="boCreateBreakoutHolder"></div>`);
+        this.welcomeModal = await modalModule.open("modals/lesson/breakout/group/welcome", frame.querySelector(".boCreateBreakoutHolder"), null, "Your Team", null, { parent: this });
+      }
+    }
     this.pipeline.subscribe("memberAssign", "memberassign", (data) => {
       this.parent.parent.collaborators[data.collaborator._id] = data.collaborator;
       let groupMember = this.members[data.collaborator._id];
       if (data.group == this.group._id) {
         if (groupMember == null) {
           this.members[data.collaborator._id] = [];
         }
+        promptWelcomeModal();
       } else if (groupMember != null) {
         if (this.editor.realtime.module != null) {
           for (let i = 0; i < groupMember.length; i++) {
@@ -754,6 +762,7 @@ modules["breakout/group"] = class {
         this.updateMemberCount();
       }
     }, { sort: 1 });
+    promptWelcomeModal();
 
     // Fetch Annotations:
     let pageParam = getParam("page");
@@ -797,11 +806,6 @@ modules["breakout/group"] = class {
 
     modifyParams("team", this.group._id);
 
-    if (this.welcomeRead != true && this.parent.parent.self.access < 4) { // && Object.keys(this.members).length > 1
-      frame.insertAdjacentHTML("beforeend", `<div class="boCreateBreakoutHolder"></div>`);
-      this.welcomeModal = await modalModule.open("modals/lesson/breakout/group/welcome", frame.querySelector(".boCreateBreakoutHolder"), null, "Your Team", null, { parent: this });
-    }
-
     this.updateInterface();
   }
 }

public/modules/breakout/overview.js

@@ -890,6 +890,7 @@ modules["breakout/overview"] = class {
     }
     this.layout.runUpdateCycle = async () => {
       if (this.layout.runningUpdateCycle == true) {
+        this.layout.reRunUpdateCycle = true;
         return;
       }
       this.layout.runningUpdateCycle = true;
@@ -1152,6 +1153,10 @@ modules["breakout/overview"] = class {
       this.lastResizeWasSimulated = false;
 
       this.layout.runningUpdateCycle = false;
+      if (this.layout.reRunUpdateCycle == true) {
+        this.layout.reRunUpdateCycle = false;
+        this.layout.runUpdateCycle();
+      }
     }
     this.layout.refreshTotalColumnHeight = () => {
       this.layout.longestColumn = this.layout.getSectionTop();
@@ -1499,7 +1504,7 @@ modules["breakout/overview"] = class {
               groupTile.members.splice(index, 1);
             }
           }
-          this.layout.removeMemberTile(data.modify);
+          this.layout.removeMemberTile(data.modify, true);
         }
       }
       this.layout.members[data.modify] = { ...(existingMember ?? {}), group: data.group, modify: data.modify };
@@ -1541,7 +1546,7 @@ modules["breakout/overview"] = class {
         } else if (data.group != null) {
           updateUnassignedMemberCount(-1);
         }
-        this.layout.removeMemberTile(modify);
+        this.layout.removeMemberTile(modify, true);
         groupMember.group = data.group;
         if (data.group != null) {
           let groupTile = this.layout.tiles[data.group];
@@ -1556,10 +1561,10 @@ modules["breakout/overview"] = class {
             }
           } else if (groupTile.members != null && groupTile.members.includes(modify) == false) {
             groupTile.members.push(modify);
-            this.layout.addMemberTile(modify);
+            this.layout.addMemberTile(modify, true);
           }
         } else if ((this.layout.memberSessions[modify] ?? []).length > 0) {
-          this.layout.addMemberTile(modify);
+          this.layout.addMemberTile(modify, true);
           updateUnassignedMemberCount(1);
         }
       }
@@ -1596,7 +1601,7 @@ modules["breakout/overview"] = class {
               if (data.member.group != null) {
                 this.layout.updateMemberTile(this.parent.parent.collaborators[data.member.modify]);
               } else {
-                this.layout.removeMemberTile(data.member.modify);
+                this.layout.removeMemberTile(data.member.modify, true);
                 updateUnassignedMemberCount(-1);
               }
             }