Merge pull request #692 from Real-Dev-Squad/fix/loader

[Live-site] - Fix the Loader when kicking out the participants
Real-Dev-Squad · Oct 27, 2023 · 9dddd20 · 9dddd20
2 parents 55dfac0 + 9247e59
commit 9dddd20
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/app/components/live-participants.hbs b/app/components/live-participants.hbs
@@ -24,7 +24,11 @@
               )
             }}
               {{#if (not-eq peer.id this.liveService.localPeer.id)}}
-                {{#if this.liveService.isUserRemoved}}
+                {{#if
+                  (and
+                    this.liveService.isUserRemoved (eq @peerToRemove.id peer.id)
+                  )
+                }}
                   <div class='loading'>
                     <span></span>
                     <span></span>

diff --git a/app/components/live-sidebar.hbs b/app/components/live-sidebar.hbs
@@ -47,27 +47,31 @@
       @peers={{@peers}}
       @minimumParticipants={{this.liveService.hostRole}}
       @openKickoutModal={{@openKickoutModal}}
+      @peerToRemove={{@peerToRemove}}
     />
     <LiveParticipants
       @user='Mavens'
       @role='maven'
       @peers={{@peers}}
       @minimumParticipants={{this.liveService.mavenRole}}
       @openKickoutModal={{@openKickoutModal}}
+      @peerToRemove={{@peerToRemove}}
     />
     <LiveParticipants
       @user='Moderators'
       @role='moderator'
       @peers={{@peers}}
       @minimumParticipants={{this.liveService.moderatorRole}}
       @openKickoutModal={{@openKickoutModal}}
+      @peerToRemove={{@peerToRemove}}
     />
     <LiveParticipants
       @user='Guests'
       @role='guest'
       @peers={{@peers}}
       @minimumParticipants={{this.liveService.guestRole}}
       @openKickoutModal={{@openKickoutModal}}
+      @peerToRemove={{@peerToRemove}}
     />
   </div>
 </div>
diff --git a/app/templates/live.hbs b/app/templates/live.hbs
@@ -79,6 +79,7 @@
               <LiveSidebar
                 @openKickoutModal={{this.openKickoutModal}}
                 @peers={{this.liveService.peers}}
+                @peerToRemove={{this.peerToRemove}}
               />
             {{/if}}
           </div>