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

[ML] Single metric viewer: Fixes full page refresh behavior. #44884

Merged
merged 3 commits into from
Sep 7, 2019
Merged

[ML] Single metric viewer: Fixes full page refresh behavior. #44884

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d785346
[ML] Fixes 'soft' refresh.
walterra Sep 5, 2019
8987ad0
[ML] Tweak SCSS.
walterra Sep 7, 2019
eb6ec7f
Merge branch 'master' of github.com:elastic/kibana into ml-fix-single…
walterra Sep 7, 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
9 changes: 9 additions & 0 deletions x-pack/legacy/plugins/ml/public/timeseriesexplorer/_timeseriesexplorer.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,3 +333,12 @@
}
}
}

/* Hides the progress bar's background so it doesn't look like it increases the thickness
of the horizontal bar below the tab menu elements in its inactive state. */
.mlTimeSeriesExplorerProgress {
background-color: $euiColorEmptyShade;
&::-moz-progress-bar, &::-webkit-progress-bar {
background-color: $euiColorEmptyShade;
}
}
45 changes: 29 additions & 16 deletions x-pack/legacy/plugins/ml/public/timeseriesexplorer/timeseriesexplorer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import {
EuiFlexGroup,
EuiFlexItem,
EuiFormRow,
EuiProgress,
EuiSelect,
EuiSpacer,
EuiText,
Expand Down Expand Up @@ -103,6 +104,7 @@ function getTimeseriesexplorerDefaultState() {
focusAnnotationData: [],
focusChartData: undefined,
focusForecastData: undefined,
fullRefresh: true,
hasResults: false,
jobs: [],
// Counter to keep track of what data sets have been loaded.
Expand All @@ -127,9 +129,14 @@ function getTimeseriesexplorerDefaultState() {
};
}

const TimeSeriesExplorerPage = ({ children, jobSelectorProps, resizeRef }) => (
const TimeSeriesExplorerPage = ({ children, jobSelectorProps, loading, resizeRef }) => (
<Fragment>
<NavigationMenu tabId="timeseriesexplorer" />
{/* Show animated progress bar while loading */}
{loading && (<EuiProgress className="mlTimeSeriesExplorerProgress" color="primary" size="xs" />)}
{/* Show a progress bar with progress 0% when not loading.
If we'd just show no progress bar when not loading it would result in a flickering height effect. */}
{!loading && (<EuiProgress className="mlTimeSeriesExplorerProgress" value="0" max="100" color="primary" size="xs" />)}
<JobSelector {...jobSelectorProps} />
<div className="ml-time-series-explorer" ref={resizeRef} >
{children}
Expand Down Expand Up @@ -466,8 +473,8 @@ export class TimeSeriesExplorer extends React.Component {
});
}

refresh = () => {
if (this.state.loading) {
refresh = (fullRefresh = true) => {
if (this.state.loading && fullRefresh === false) {
return;
}

Expand All @@ -485,17 +492,22 @@ export class TimeSeriesExplorer extends React.Component {

this.contextChartSelectedInitCallDone = false;

// Only when `fullRefresh` is true we'll reset all data
// and show the loading spinner within the page.
this.setState({
chartDetails: undefined,
contextChartData: undefined,
contextForecastData: undefined,
focusChartData: undefined,
focusForecastData: undefined,
fullRefresh,
loadCounter: currentLoadCounter + 1,
loading: true,
modelPlotEnabled: isModelPlotEnabled(currentSelectedJob, +currentDetectorId, currentEntities),
hasResults: false,
dataNotChartable: false
...(fullRefresh ? {
chartDetails: undefined,
Copy link
Contributor

Choose a reason for hiding this comment

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

Component's state is pretty massive, maybe chart related props deserve a dedicated method?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This PR has a note about the history of this file, it's a recent mostly as-is conversion from angularjs to React.

contextChartData: undefined,
contextForecastData: undefined,
focusChartData: undefined,
focusForecastData: undefined,
modelPlotEnabled: isModelPlotEnabled(currentSelectedJob, +currentDetectorId, currentEntities),
hasResults: false,
dataNotChartable: false
} : {}),
}, () => {
const { detectorId, entities, loadCounter, jobs, modelPlotEnabled, selectedJob } = this.state;
const detectorIndex = +detectorId;
Expand Down Expand Up @@ -797,7 +809,7 @@ export class TimeSeriesExplorer extends React.Component {
this.subscriptions.add(annotationsRefresh$.subscribe(this.refresh));
this.subscriptions.add(interval$.subscribe(tableControlsListener));
this.subscriptions.add(severity$.subscribe(tableControlsListener));
this.subscriptions.add(mlTimefilterRefresh$.subscribe(this.refresh));
this.subscriptions.add(mlTimefilterRefresh$.subscribe(() => this.refresh(false)));

// Listen for changes to job selection.
this.subscriptions.add(this.jobSelectService.subscribe(({ selection: selectedJobIds }) => {
Expand Down Expand Up @@ -927,6 +939,7 @@ export class TimeSeriesExplorer extends React.Component {
focusAnnotationData,
focusChartData,
focusForecastData,
fullRefresh,
hasResults,
jobs,
loading,
Expand Down Expand Up @@ -1005,7 +1018,7 @@ export class TimeSeriesExplorer extends React.Component {
this.previousShowModelBounds = showModelBounds;

return (
<TimeSeriesExplorerPage jobSelectorProps={jobSelectorProps} resizeRef={this.resizeRef}>
<TimeSeriesExplorerPage jobSelectorProps={jobSelectorProps} loading={loading} resizeRef={this.resizeRef}>
<div className="series-controls" data-test-subj="mlSingleMetricViewerSeriesControls">
<EuiFlexGroup>
<EuiFlexItem grow={false}>
Expand Down Expand Up @@ -1045,19 +1058,19 @@ export class TimeSeriesExplorer extends React.Component {
</EuiFlexGroup>
</div>

{(loading === true) && (
{(fullRefresh && loading === true) && (
<LoadingIndicator
label={i18n.translate('xpack.ml.timeSeriesExplorer.loadingLabel', {
defaultMessage: 'Loading',
})}
/>
)}

{(jobs.length > 0 && loading === false && hasResults === false) && (
{(jobs.length > 0 && (fullRefresh === false || loading === false) && hasResults === false) && (
<TimeseriesexplorerNoChartData dataNotChartable={dataNotChartable} entities={entities} />
)}

{(jobs.length > 0 && loading === false && hasResults === true) && (
{(jobs.length > 0 && (fullRefresh === false || loading === false) && hasResults === true) && (
<EuiText className="results-container">
<span className="panel-title">
{i18n.translate('xpack.ml.timeSeriesExplorer.singleTimeSeriesAnalysisTitle', {
Expand Down