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

chore(ui): only fetch updates if seconds passed since last fetch #1113

Merged
merged 1 commit into from
Oct 31, 2019
Merged

chore(ui): only fetch updates if seconds passed since last fetch #1113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 2 additions & 32 deletions ui/src/Components/Fetcher/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import React, { Component } from "react";
import PropTypes from "prop-types";

import { observable, action } from "mobx";
import { observer } from "mobx-react";

import moment from "moment";
Expand All @@ -16,23 +15,6 @@ const Fetcher = observer(
settingsStore: PropTypes.instanceOf(Settings).isRequired
};

lastTick = observable(
{
time: moment(0),
completedAt: moment(0),
update() {
this.time = moment();
},
markCompleted() {
this.completedAt = moment();
}
},
{
update: action,
markCompleted: action
}
);

getSortSettings = () => {
const { settingsStore } = this.props;

Expand Down Expand Up @@ -77,11 +59,7 @@ const Fetcher = observer(
fetchIfIdle = () => {
const { alertStore, settingsStore } = this.props;

// add 5s minimum interval between fetches
const idleAt = moment(this.lastTick.completedAt).add(5, "seconds");
const isIdle = moment().isSameOrAfter(idleAt);

const nextTick = moment(this.lastTick.time).add(
const nextTick = moment(alertStore.status.lastUpdateAt).add(
settingsStore.fetchConfig.config.interval,
"seconds"
);
Expand All @@ -93,13 +71,7 @@ const Fetcher = observer(
status === AlertStoreStatuses.Fetching.toString() ||
status === AlertStoreStatuses.Processing.toString();

if (
isIdle &&
pastDeadline &&
!updateInProgress &&
!alertStore.status.paused
) {
this.lastTick.update();
if (pastDeadline && !updateInProgress && !alertStore.status.paused) {
this.callFetch();
}
};
Expand All @@ -117,7 +89,6 @@ const Fetcher = observer(
sortSettings.sortLabel,
sortSettings.sortReverse
);
this.lastTick.markCompleted();
};

componentDidMount() {
Expand All @@ -130,7 +101,6 @@ const Fetcher = observer(
const { alertStore } = this.props;

if (!alertStore.status.paused) {
this.lastTick.update();
this.callFetch();
}
}
Expand Down
4 changes: 3 additions & 1 deletion ui/src/Components/Fetcher/index.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ beforeEach(() => {
alertStore = new AlertStore(["label=value"]);
fetchSpy = jest
.spyOn(alertStore, "fetchWithThrottle")
.mockImplementation(() => {});
.mockImplementation(() => {
alertStore.status.setIdle();
});

settingsStore = new Settings();
settingsStore.fetchConfig.config.interval = 30;
Expand Down
5 changes: 5 additions & 0 deletions ui/src/Stores/AlertStore.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import equal from "fast-deep-equal";

import qs from "qs";

import moment from "moment";

import { FetchWithCredentials } from "Common/Fetch";

const QueryStringEncodeOptions = {
Expand Down Expand Up @@ -210,11 +212,13 @@ class AlertStore {
status = observable(
{
value: AlertStoreStatuses.Idle,
lastUpdateAt: 0,
error: null,
paused: false,
setIdle() {
this.value = AlertStoreStatuses.Idle;
this.error = null;
this.lastUpdateAt = moment();
},
setFetching() {
this.value = AlertStoreStatuses.Fetching;
Expand All @@ -226,6 +230,7 @@ class AlertStore {
setFailure(err) {
this.value = AlertStoreStatuses.Failure;
this.error = err;
this.lastUpdateAt = moment();
},
pause() {
this.paused = true;
Expand Down