Skip to content

added option to hide experimental recommendations #322

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

Merged
kenkoooo merged 1 commit into from
Nov 1, 2019
Merged

added option to hide experimental recommendations #322

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
73 changes: 45 additions & 28 deletions atcoder-problems-frontend/src/pages/UserPage/Recommendations.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,14 +107,16 @@ interface Props {
interface LocalState {
recommendNum: number;
recommendOption: RecommendOption;
recommendExperimental: boolean;
}

class Recommendations extends React.Component<Props, LocalState> {
constructor(props: Props) {
super(props);
this.state = {
recommendNum: 10,
recommendOption: "Moderate"
recommendOption: "Moderate",
recommendExperimental: true
};
}

Expand All @@ -126,7 +128,7 @@ class Recommendations extends React.Component<Props, LocalState> {
problemModels,
userRatingInfo
} = this.props;
const { recommendNum, recommendOption } = this.state;
const { recommendNum, recommendOption, recommendExperimental } = this.state;

if (userSubmissions.isEmpty()) {
return null;
Expand All @@ -144,8 +146,10 @@ class Recommendations extends React.Component<Props, LocalState> {
.filter(p => problemModels.has(p.id))
.map(p => ({
...p,
difficulty: problemModels.getIn([p.id, "difficulty"], undefined)
difficulty: problemModels.getIn([p.id, "difficulty"], undefined),
is_experimental: problemModels.getIn([p.id, "is_experimental"], false)
}))
.filter(p => recommendExperimental || !p.is_experimental)
.filter(p => p.difficulty !== undefined)
.map(p => {
const internalRating = userRatingInfo.internalRating;
Expand Down Expand Up @@ -200,26 +204,42 @@ class Recommendations extends React.Component<Props, LocalState> {
return (
<>
<Row className="my-3 d-flex justify-content-between">
<ButtonGroup>
<Button
onClick={() => this.setState({ recommendOption: "Easy" })}
active={recommendOption === "Easy"}
>
Easy
</Button>
<Button
onClick={() => this.setState({ recommendOption: "Moderate" })}
active={recommendOption === "Moderate"}
>
Moderate
</Button>
<Button
onClick={() => this.setState({ recommendOption: "Difficult" })}
active={recommendOption === "Difficult"}
>
Difficult
</Button>
</ButtonGroup>
<div>
<ButtonGroup>
<Button
onClick={() => this.setState({ recommendOption: "Easy" })}
active={recommendOption === "Easy"}
>
Easy
</Button>
<Button
onClick={() => this.setState({ recommendOption: "Moderate" })}
active={recommendOption === "Moderate"}
>
Moderate
</Button>
<Button
onClick={() => this.setState({ recommendOption: "Difficult" })}
active={recommendOption === "Difficult"}
>
Difficult
</Button>
</ButtonGroup>
<ButtonGroup className="mx-3">
<Button
onClick={() => this.setState({ recommendExperimental: true })}
active={recommendExperimental}
>
Show 🧪
</Button>
<Button
onClick={() => this.setState({ recommendExperimental: false })}
active={!recommendExperimental}
>
Hide 🧪
</Button>
</ButtonGroup>
</div>
<UncontrolledDropdown direction="left">
<DropdownToggle caret>
{recommendNum === Number.POSITIVE_INFINITY ? "All" : recommendNum}
Expand Down Expand Up @@ -248,14 +268,11 @@ class Recommendations extends React.Component<Props, LocalState> {
dataField="title"
dataFormat={(
title: string,
{ id, contest_id }: { id: string; contest_id: string }
{ id, contest_id, is_experimental }: { id: string; contest_id: string; is_experimental: boolean }
) => (
<ProblemLink
difficulty={problemModels.getIn([id, "difficulty"], null)}
isExperimentalDifficulty={problemModels.getIn(
[id, "is_experimental"],
false
)}
isExperimentalDifficulty={is_experimental}
showDifficulty={true}
problemId={id}
problemTitle={title}
Expand Down