Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clean up group page variant of UserList component #10444

Merged
merged 3 commits into from
Aug 24, 2023
Merged

Clean up group page variant of UserList component #10444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2a7e907
Clean up group page variant of `UserList` component
cl8n Aug 7, 2023
5b5090c
Merge branch 'master' into user-list-group-page
nanaya Aug 24, 2023
bbe1e42
Merge branch 'master' into user-list-group-page
nanaya Aug 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 18 additions & 22 deletions resources/js/components/user-list.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// See the LICENCE file in the repository root for full licence text.

import GameMode from 'interfaces/game-mode';
import GroupJson from 'interfaces/group-json';
import UserJson from 'interfaces/user-json';
import { usernameSortAscending } from 'models/user';
import * as moment from 'moment';
Expand All @@ -24,10 +25,7 @@ const playModes: PlayModeFilter[] = ['all', 'osu', 'taiko', 'fruits', 'mania'];
const sortModes: SortMode[] = ['last_visit', 'rank', 'username'];

interface Props {
descriptionHtml?: string;
playmodeFilter?: boolean;
playmodeFilterGroupId?: number;
title?: string;
group?: GroupJson;
users: UserJson[];
}

Expand Down Expand Up @@ -152,16 +150,19 @@ export class UserList extends React.PureComponent<Props> {
{this.renderSelections()}

<div className='user-list'>
{this.props.title != null && (
<h1 className='user-list__title'>{this.props.title}</h1>
{this.props.group != null && (
<h1 className='user-list__title'>{this.props.group.name}</h1>
)}

{this.props.descriptionHtml != null && (
<div dangerouslySetInnerHTML={{ __html: this.props.descriptionHtml }} className='user-list__description' />
{this.props.group?.description != null && (
<div
dangerouslySetInnerHTML={{ __html: this.props.group.description.html }}
className='user-list__description'
/>
)}

<div className='user-list__toolbar'>
{this.props.playmodeFilter && (
{this.props.group?.has_playmodes && (
<div className='user-list__toolbar-row'>
<div className='user-list__toolbar-item'>{this.renderPlaymodeFilter()}</div>
</div>
Expand Down Expand Up @@ -273,19 +274,14 @@ export class UserList extends React.PureComponent<Props> {
// TODO: should be cached or something
let users = this.props.users.slice();
const playmode = this.state.playMode;
if (this.props.playmodeFilter && playmode !== 'all') {
users = users.filter((user) => {
if (user.groups && user.groups.length > 0) {
if (this.props.playmodeFilterGroupId != null) {
const filterGroup = user.groups.find((group) => group.id === this.props.playmodeFilterGroupId);
return filterGroup?.playmodes?.includes(playmode);
}

return user.groups.some((group) => group.playmodes?.includes(playmode));
} else {
return false;
}
});
if (playmode !== 'all' && this.props.group?.has_playmodes) {
const filterGroupId = this.props.group.id;
users = users.filter((user) => (
user.groups
?.find((group) => group.id === filterGroupId)
?.playmodes
?.includes(playmode)
));
}

switch (filter) {
Expand Down
5 changes: 1 addition & 4 deletions resources/js/groups-show/main.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,7 @@ export class Main extends React.PureComponent<Props> {

<div className='osu-page osu-page--generic-compact'>
<UserList
descriptionHtml={this.props.group.description?.html}
playmodeFilter={this.props.group.has_playmodes}
playmodeFilterGroupId={this.props.group.id}
title={this.props.group.name}
group={this.props.group}
users={this.props.users}
/>
</div>
Expand Down