BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #19996 from ramonlsouza/fix-grid-pagination-loop

Browse Source 
fix: grid mode loop when pagination is active
This commit is contained in:
Ramón Souza 2024-04-12 13:46:48 -03:00 committed by GitHub
commit 32d06f1d85
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
bigbluebutton-html5/imports/ui/components/video-provider/service.js
View File

@ -530,30 +530,11 @@ class VideoService {
}
getGridUsers(users, streams) {
const pageSize = this.getMyPageSize();
const isPaginationDisabled = !this.isPaginationEnabled() || pageSize === 0;
const isGridEnabled = this.isGridEnabled();
let gridUsers = [];
if (isPaginationDisabled) {
if (isGridEnabled) {
const streamUsers = streams.map((stream) => stream.userId);
gridUsers = users.filter(
(user) => !user.loggedOut && !user.left && !streamUsers.includes(user.userId),
).map((user) => ({
isGridItem: true,
...user,
}));
}
return gridUsers;
}
const paginatedStreams = this.getVideoPage(streams, pageSize);
if (isGridEnabled) {
const streamUsers = paginatedStreams.map((stream) => stream.userId);
const streamUsers = streams.map((stream) => stream.userId);
gridUsers = users.filter(
(user) => !user.loggedOut && !user.left && !streamUsers.includes(user.userId),