forked/shlink-web-client
1
0
Fork 0
mirror of https://github.com/shlinkio/shlink-web-client.git synced 2026-03-11 01:53:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed loading state in servers list

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

5
src/short-urls/ShortUrlsList.js
View File

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

3
src/short-urls/reducers/shortUrlsList.js
View File

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