Fixed loading state in servers list

This commit is contained in:
Alejandro Celaya 2018-06-15 21:51:50 +02:00
parent c0203f1336
commit f4c48bc94f
2 changed files with 5 additions and 3 deletions

View file

@ -1,6 +1,7 @@
import React from 'react';
import { connect } from 'react-redux';
import { listShortUrls } from './reducers/shortUrlsList';
import { isEmpty } from 'ramda';
export class ShortUrlsList extends React.Component {
componentDidMount() {
@ -18,8 +19,8 @@ export class ShortUrlsList extends React.Component {
renderShortUrls() {
const { shortUrlsList } = this.props;
if (! shortUrlsList) {
return '<li><i>Loading...</i></li>';
if (isEmpty(shortUrlsList)) {
return <li><i>Loading...</i></li>;
}
return shortUrlsList.map(shortUrl => (

View file

@ -16,6 +16,7 @@ export const listShortUrls = (serverId) => {
const selectedServer = ServersService.findServerById(serverId);
ShlinkApiClient.setConfig(selectedServer);
dispatch({ type: LIST_SHORT_URLS, shortUrls: await ShlinkApiClient.listShortUrls() });
const shortUrls = await ShlinkApiClient.listShortUrls();
dispatch({ type: LIST_SHORT_URLS, shortUrls });
};
};