Merge: - client: check if data loaded before the request with older_than

* commit '85d6994719a724e8dd0828bb90c459a422767d12':
  - client: check if data loaded before the request with older_than
This commit is contained in:
Ildar Kamalov 2019-09-27 14:57:26 +03:00
commit 75a8f9f850
2 changed files with 2 additions and 2 deletions

View File

@ -265,7 +265,7 @@ class Logs extends Component {
fetchData = (state) => {
const { pageSize, page, pages } = state;
const { allLogs, filter } = this.props.queryLogs;
const isLastPage = page + 1 === pages;
const isLastPage = pages && (page + 1 === pages);
if (isLastPage) {
const lastRow = allLogs[allLogs.length - 1];

View File

@ -90,7 +90,7 @@ const queryLogs = handleActions(
logs: [],
interval: 1,
allLogs: [],
pages: 1,
pages: 0,
total: 0,
enabled: true,
older_than: '',