toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix sidebar teams order (#8281)

Browse source
This commit is contained in:
Elias Nahum 2024-10-30 17:12:58 +08:00 committed by GitHub
parent a580642114
commit 534aeaaef6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
app/components/team_sidebar/team_list/index.ts
View file

@ -14,6 +14,7 @@ import {queryJoinedTeams, queryMyTeams} from '@queries/servers/team';
import TeamList from './team_list';
import type {WithDatabaseArgs} from '@typings/database/database';
import type MyTeamModel from '@typings/database/models/servers/my_team';
const withTeams = withObservables([], ({database}: WithDatabaseArgs) => {
const myTeams = queryMyTeams(database).observe();
@ -33,22 +34,18 @@ const withTeams = withObservables([], ({database}: WithDatabaseArgs) => {
map((t) => t.id);
}
const indexes: {[x: string]: number} = {};
const originalIndexes: {[x: string]: number} = {};
ids.forEach((v, i) => {
indexes[v] = i;
});
const teamMap = ts.reduce<{[x: string]: MyTeamModel}>((result, team) => {
result[team.id] = team;
return result;
}, {});
ts.forEach((t, i) => {
originalIndexes[t.id] = i;
});
return ts.sort((a, b) => {
if ((indexes[a.id] != null) || (indexes[b.id] != null)) {
return (indexes[a.id] ?? tids.length) - (indexes[b.id] ?? tids.length);
return ids.reduce<MyTeamModel[]>((result, id) => {
const t = teamMap[id];
if (t) {
result.push(t);
}
return (originalIndexes[a.id] - originalIndexes[b.id]);
});
return result;
}, []);
}),
);
return {