Added proper loading status handling to short URLs list

This commit is contained in:
Alejandro Celaya
2018-07-15 10:39:05 +02:00
parent a4f9a2b8b3
commit 010e3ce0f3
3 changed files with 25 additions and 8 deletions

View File

@@ -43,11 +43,15 @@ export class ShortUrlsList extends React.Component {
}
renderShortUrls() {
const { shortUrlsList, selectedServer } = this.props;
if (isEmpty(shortUrlsList)) {
const { shortUrlsList, selectedServer, loading } = this.props;
if (loading) {
return <tr><td colSpan="6" className="text-center">Loading...</td></tr>;
}
if (! loading && isEmpty(shortUrlsList)) {
return <tr><td colSpan="6" className="text-center">No results found</td></tr>;
}
return shortUrlsList.map(shortUrl => (
<Row shortUrl={shortUrl} selectedServer={selectedServer} key={shortUrl.shortCode} />
));
@@ -69,8 +73,9 @@ class Row extends React.Component {
const { shortUrl, selectedServer } = this.props;
return (
<tr onMouseEnter={() => this.setState({ displayMenu: true })}
onMouseLeave={() => this.setState({ displayMenu: false })}
<tr
onMouseEnter={() => this.setState({ displayMenu: true })}
onMouseLeave={() => this.setState({ displayMenu: false })}
>
<td className="nowrap short-urls-list__cell">
<Moment format="YYYY-MM-DD HH:mm" interval={0}>{shortUrl.dateCreated}</Moment>