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

adding loading spinner for watch visualization #35798

Merged
merged 2 commits into from
Apr 30, 2019
Merged

adding loading spinner for watch visualization #35798

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4d8cff
adding loading spinner for watch visualization
bmcconaghy Apr 30, 2019
942c716
responding to PR feedback
bmcconaghy Apr 30, 2019
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
56 changes: 37 additions & 19 deletions x-pack/plugins/watcher/public/sections/watch_edit/components/watch_visualization.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,11 @@ import {
ScaleType,
Settings,
} from '@elastic/charts';
import { debounce } from 'lodash';
import { TimeBuckets } from 'ui/time_buckets';
import dateMath from '@elastic/datemath';
import chrome from 'ui/chrome';
import moment from 'moment-timezone';
import { EuiCallOut, EuiSpacer } from '@elastic/eui';
import { EuiCallOut, EuiFlexGroup, EuiFlexItem, EuiLoadingChart, EuiSpacer } from '@elastic/eui';
import { FormattedMessage, injectI18n } from '@kbn/i18n/react';
import { VisualizeOptions } from 'plugins/watcher/models/visualize_options';
import { getWatchVisualizationData } from '../../../lib/api';
Expand Down Expand Up @@ -93,28 +92,31 @@ const getTimeBuckets = (watch: any) => {
return timeBuckets;
};

const loadWatchVisualizationData = debounce(async (watch: any, setWatchVisualizationData: any) => {
const domain = getDomain(watch);
const timeBuckets = new TimeBuckets();
timeBuckets.setBounds(domain);
const interval = timeBuckets.getInterval().expression;
const visualizeOptions = new VisualizeOptions({
rangeFrom: domain.min,
rangeTo: domain.max,
interval,
timezone: getTimezone(),
});
const { visualizeData } = (await getWatchVisualizationData(watch, visualizeOptions)) as any;
setWatchVisualizationData(visualizeData || {});
}, 500);

const WatchVisualizationUi = () => {
const { watch } = useContext(WatchContext);
const [watchVisualizationData, setWatchVisualizationData] = useState<any>({});

const [isLoading, setIsLoading] = useState(true);
const loadWatchVisualizationData = async () => {
const domain = getDomain(watch);
const timeBuckets = new TimeBuckets();
timeBuckets.setBounds(domain);
const interval = timeBuckets.getInterval().expression;
const visualizeOptions = new VisualizeOptions({
rangeFrom: domain.min,
rangeTo: domain.max,
interval,
timezone: getTimezone(),
});
const { visualizeData } = (await getWatchVisualizationData(watch, visualizeOptions)) as any;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could you update getWatchVisualizationData in api.ts to use the use_request helper CJ added? I think that returns an isLoading prop.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got an error when I tried to do this. Punting for now.

setIsLoading(false);
setWatchVisualizationData(visualizeData || {});
};
useEffect(
() => {
loadWatchVisualizationData(watch, setWatchVisualizationData);
const handler = setTimeout(loadWatchVisualizationData, 500);
return () => {
clearTimeout(handler);
};
},
[watch]
);
Expand All @@ -137,8 +139,24 @@ const WatchVisualizationUi = () => {
return customSeriesColors;
};

if (isLoading) {
return (
<Fragment>
<EuiSpacer size="m" />
<EuiFlexGroup justifyContent="spaceAround">
<EuiFlexItem grow={false}>
<EuiLoadingChart size="xl" />
</EuiFlexItem>
</EuiFlexGroup>

<EuiSpacer size="m" />
</Fragment>
);
}

const domain = getDomain(watch);
const watchVisualizationDataKeys = Object.keys(watchVisualizationData);

return (
<Fragment>
<EuiSpacer size="m" />
Expand Down