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

Jump to bottom

Fix ESLint errors for FollowUsers #798

Merged
merged 4 commits into from
Apr 12, 2020
Merged

Fix ESLint errors for FollowUsers #798

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a177a37
Fix ESLint errors
ishaanshah Apr 12, 2020
9df617f
Fix types
ishaanshah Apr 12, 2020
5cdb98e
Fix input problem
ishaanshah Apr 12, 2020
e81c42b
Fix "Save List"
ishaanshah Apr 12, 2020
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
160 changes: 77 additions & 83 deletions listenbrainz/webserver/static/js/src/FollowUsers.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
/* eslint-disable */
// TODO: Make the code ESLint compliant
// TODO: Port to typescript

import {
faPlusCircle,
faSave,
Expand All @@ -11,37 +7,40 @@ import {
} from "@fortawesome/free-solid-svg-icons";

import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { IconProp } from "@fortawesome/fontawesome-svg-core";
import * as React from "react";
import { isNil as _isNil } from "lodash";
import { getArtistLink, getPlayButton, getTrackLink } from "./utils";
import { IconProp } from "@fortawesome/fontawesome-svg-core";

type FollowUsersProps = {
followList?: Array<string>,
saveUrl?: string,
listId: number,
listName: string,
onUserListChange: (users: Array<string>) => void;
creator: ListenBrainzUser,
followList?: Array<string>;
saveUrl?: string;
listId?: number;
listName?: string;
onUserListChange: (users: Array<string>, dontSendUpdate?: boolean) => void;
creator: ListenBrainzUser;
newAlert: (
alertType: AlertType,
type: AlertType,
title: string,
message?: string | JSX.Element
) => void,
playingNow: FollowUsersPlayingNow,
playListen: (listen: Listen) => void,
}
) => void;
playingNow: FollowUsersPlayingNow;
playListen: (listen: Listen) => void;
};

type FollowUsersState = {
users: Array<string>,
saveUrl: string,
listId: number | null,
listName: string,
}
users: Array<string>;
saveUrl: string;
listId: number | undefined;
listName: string | undefined;
};

export default class FollowUsers extends React.Component<FollowUsersProps, FollowUsersState> {
private textInput = React.createRef<HTMLInputElement>();
private nameInput = React.createRef<HTMLInputElement>();
export default class FollowUsers extends React.Component<
FollowUsersProps,
FollowUsersState
> {
textInput = React.createRef<HTMLInputElement>();
nameInput = React.createRef<HTMLInputElement>();
constructor(props: FollowUsersProps) {
super(props);
this.state = {
Expand All @@ -59,10 +58,10 @@ export default class FollowUsers extends React.Component<FollowUsersProps, Follo
if (!this.textInput) return;
if (!this.textInput.current) return;
const currentValue: string = this.textInput.current.value;
const {users} = this.state;
const { users } = this.state;
if (
(currentValue === "" ||
users.find((user: string) => user === currentValue))
currentValue === "" ||
users.find((user: string) => user === currentValue)
) {
return;
}
Expand All @@ -74,12 +73,11 @@ export default class FollowUsers extends React.Component<FollowUsersProps, Follo
if (this.textInput && this.textInput.current) {
this.textInput.current.value = "";
}
const {onUserListChange} = this.props;
const {users} = this.state;
const { onUserListChange } = this.props;
onUserListChange(users);
}
);
}
};

removeUserFromList = (index: number): void => {
this.setState(
Expand All @@ -88,97 +86,97 @@ export default class FollowUsers extends React.Component<FollowUsersProps, Follo
return { users: prevState.users };
},
() => {
const {onUserListChange} = this.props;
const {users} = this.state;
const { onUserListChange } = this.props;
const { users } = this.state;
onUserListChange(users);
}
);
}
};

saveFollowList = (): void => {
if (!this.nameInput) return;
if (!this.nameInput.current) return;

const { listName , users, listId, saveUrl } = this.state;
const {creator, newAlert} = this.props;
const { listName, users, listId, saveUrl } = this.state;
const { creator, newAlert } = this.props;

let finalListName = listName;
if (!_isNil(this.nameInput.current.value) && this.nameInput.current.value.length) {
if (
!_isNil(this.nameInput.current.value) &&
this.nameInput.current.value.length
) {
finalListName = this.nameInput.current.value;
}


fetch(saveUrl, {
method: "POST",
body: JSON.stringify({
users: users,
users,
name: finalListName,
id: listId,
id: listId === undefined ? listId : null,
}),
headers: { Authorization: `Token ${creator.auth_token}` },
})
.then((response) => {
if (!response.ok) {
throw Error(response.statusText);
}
newAlert("success", "Successfully saved list");
newAlert("success", "Successfully saved list", "Success");
return response.json();
})
.then((data) => {
console.debug(data);
this.setState(
{ listId: data.list_id }
);
this.setState({ listId: data.list_id });
})
.catch((error) => {
console.error(error);
newAlert("danger", "Could not save list", error.message);
});
}
};

newFollowList = (event: React.MouseEvent<HTMLButtonElement, MouseEvent>) => {
event.preventDefault();
this.setState(
{
users: [],
listId: null,
listName: "",
}
);
this.setState({
users: [],
listId: undefined,
listName: "",
});
if (this.nameInput && this.nameInput.current) {
this.nameInput.current.value = "";
}
}
};

addFollowerOnClick = (event: React.MouseEvent<HTMLButtonElement, MouseEvent>) => {
event.preventDefault()
addFollowerOnClick = (
event: React.MouseEvent<HTMLButtonElement, MouseEvent>
) => {
event.preventDefault();
this.addUserToList();
}
};

addFollowerOnEnter(event: React.KeyboardEvent<HTMLInputElement>) {
saveListOnClick = (
event: React.MouseEvent<HTMLButtonElement, MouseEvent>
) => {
event.preventDefault();
this.saveFollowList();
};

addFollowerOnEnter(event: React.KeyboardEvent<HTMLInputElement>) {
if (event.key === "Enter") {
this.addUserToList();
}
}

saveListOnClick = (event: React.MouseEvent<HTMLButtonElement, MouseEvent>) => {
event.preventDefault();
this.saveFollowList()
}

saveListOnEnter(event: React.KeyboardEvent<HTMLInputElement>) {
event.preventDefault();
if (event.key === "Enter") {
this.saveFollowList();
}
}

render() {
const { listName, users } = this.state;
const { playingNow, playListen } = this.props;
const noTopBottomPadding = {
paddingTop: 0,
paddingBottom: 0,
};

return (
<div className="panel panel-primary">
<div className="panel-heading">
Expand Down Expand Up @@ -225,7 +223,7 @@ export default class FollowUsers extends React.Component<FollowUsersProps, Follo
<input
type="text"
className="form-control"
defaultValue={this.state.listName}
defaultValue={listName}
placeholder="New list name"
ref={this.nameInput}
onKeyPress={this.saveListOnEnter}
Expand Down Expand Up @@ -255,41 +253,37 @@ export default class FollowUsers extends React.Component<FollowUsersProps, Follo
<tr>
<th>User</th>
<th>Listening now</th>
<th style={{width: "50px"}} />
<th style={{width: "65px"}} />
{/* eslint-disable-next-line jsx-a11y/control-has-associated-label */}
<th style={{ width: "50px" }} />
{/* eslint-disable-next-line jsx-a11y/control-has-associated-label */}
<th style={{ width: "65px" }} />
</tr>
</thead>
<tbody>
{this.state.users.map((user, index) => {
{users.map((user, index) => {
return (
<tr
key={user}
className={this.props.playingNow[user] && "playing_now"}
onDoubleClick={this.props.playListen.bind(
this,
this.props.playingNow[user]
)}
className={playingNow[user] && "playing_now"}
onDoubleClick={playListen.bind(this, playingNow[user])}
>
<td>{user}</td>
<td>
{this.props.playingNow[user] && (
{playingNow[user] && (
<>
{getTrackLink(this.props.playingNow[user])}
{getTrackLink(playingNow[user])}
<span className="small">
{" "}
— {getArtistLink(this.props.playingNow[user])}
— {getArtistLink(playingNow[user])}
</span>
</>
)}
</td>
<td className="playButton">
{this.props.playingNow[user] &&
{playingNow[user] &&
getPlayButton(
this.props.playingNow[user],
this.props.playListen.bind(
this,
this.props.playingNow[user]
)
playingNow[user],
playListen.bind(this, playingNow[user])
)}
</td>
<td style={noTopBottomPadding}>
Expand Down
22 changes: 10 additions & 12 deletions listenbrainz/webserver/static/js/src/RecentListens.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ import * as ReactDOM from "react-dom";
import * as _ from "lodash";
import * as io from "socket.io-client";
import SpotifyPlayer from "./SpotifyPlayer";
// @ts-ignore
import { FollowUsers } from "./follow-users";
import FollowUsers from "./FollowUsers";
import APIService from "./APIService";
import {
getArtistLink,
Expand All @@ -24,7 +23,7 @@ export interface RecentListensProps {
apiUrl: string;
artistCount?: number | null | undefined;
followList?: string[];
followListId?: string;
followListId?: number;
followListName?: string;
haveListenCount?: boolean;
latestListenTs?: number;
Expand All @@ -37,7 +36,7 @@ export interface RecentListensProps {
profileUrl?: string;
saveUrl?: string;
spotify: SpotifyUser;
user: User;
user: ListenBrainzUser;
webSocketsServerUrl: string;
}

Expand All @@ -47,7 +46,7 @@ export interface RecentListensState {
currentListen: Listen;
direction: SpotifyPlayDirection;
followList: Array<string>;
listId: string;
listId?: number;
listName: string;
listens: Array<Listen>;
mode: "listens" | "follow" | "recent";
Expand Down Expand Up @@ -77,7 +76,7 @@ class RecentListens extends React.Component<
playingNowByUser: {},
saveUrl: props.saveUrl || "",
listName: props.followListName || "",
listId: props.followListId || "",
listId: props.followListId || undefined,
direction: "down",
};

Expand Down Expand Up @@ -122,7 +121,7 @@ class RecentListens extends React.Component<

handleFollowUserListChange = (
userList: string[],
dontSendUpdate: boolean
dontSendUpdate?: boolean
): void => {
const { mode } = this.state;
const { user } = this.props;
Expand Down Expand Up @@ -250,7 +249,7 @@ class RecentListens extends React.Component<
newAlert = (
type: AlertType,
title: string,
message: string | JSX.Element
message?: string | JSX.Element
): void => {
const newAlert = {
id: new Date().getTime(),
Expand Down Expand Up @@ -392,7 +391,7 @@ class RecentListens extends React.Component<
<th>User</th>
)}
{/* eslint-disable-next-line jsx-a11y/control-has-associated-label */}
<th />
<th style={{ width: "50px" }} />
</tr>
</thead>
<tbody>
Expand All @@ -406,11 +405,10 @@ class RecentListens extends React.Component<
}
return 0;
})
.map((listen, index) => {
.map((listen) => {
return (
<tr
// eslint-disable-next-line react/no-array-index-key
key={index}
key={listen}
onDoubleClick={this.playListen.bind(this, listen)}
className={`listen ${
this.isCurrentListen(listen) ? "info" : ""
Expand Down
Loading