Merge pull request #20030 from ramonlsouza/fix-grid-sort

fix: grid mode webcam order
This commit is contained in:
Ramón Souza 2024-04-17 16:08:13 -03:00 committed by GitHub
commit be45fd6346
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 2 deletions

View File

@ -61,8 +61,8 @@ const sortUsersByUserId = (a, b) => {
};
const sortUsersByName = (a, b) => {
const aName = a.sortName || '';
const bName = b.sortName || '';
const aName = a.sortName || a.nameSortable || '';
const bName = b.sortName || b.nameSortable || '';
// Extending for sorting strings with non-ASCII characters
// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#sorting_non-ascii_characters

View File

@ -14,6 +14,7 @@ subscription getvideoData($userIds: [String]!) {
disconnected
emoji
name
nameSortable
role
avatar
color
@ -37,6 +38,7 @@ subscription getVideoDataGrid {
disconnected
emoji
name
nameSortable
role
avatar
color