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] Adding initial file analysis overrides #74376

Merged
merged 8 commits into from
Aug 11, 2020
Merged

[ML] Adding initial file analysis overrides #74376

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
851fffb
[ML] Adding initial file analysis overrides
jgowdyelastic Aug 5, 2020
ff05982
using common default sample lines
jgowdyelastic Aug 6, 2020
205d370
correcting bottom padding
jgowdyelastic Aug 6, 2020
0a6c91b
adding missed padding
jgowdyelastic Aug 6, 2020
1ea0ff8
code clean up
jgowdyelastic Aug 6, 2020
bde656c
Merge branch 'master' into adding-initial-file-analysis-overrides
elasticmachine Aug 6, 2020
afb02fb
Merge branch 'master' into adding-initial-file-analysis-overrides
elasticmachine Aug 10, 2020
6421627
fixing translations
jgowdyelastic Aug 10, 2020
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
75 changes: 46 additions & 29 deletions ...datavisualizer/file_based/components/file_datavisualizer_view/file_datavisualizer_view.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import { EditFlyout } from '../edit_flyout';
import { ExplanationFlyout } from '../explanation_flyout';
import { ImportView } from '../import_view';
import {
DEFAULT_LINES_TO_SAMPLE,
getMaxBytes,
readFile,
createUrlOverrides,
Expand Down Expand Up @@ -55,7 +56,9 @@ export class FileDataVisualizerView extends Component {

this.overrides = {};
this.previousOverrides = {};
this.originalSettings = {};
this.originalSettings = {
linesToSample: DEFAULT_LINES_TO_SAMPLE,
};
this.maxFileUploadBytes = getMaxBytes();
}

Expand Down Expand Up @@ -129,7 +132,7 @@ export class FileDataVisualizerView extends Component {
const serverSettings = processResults(resp);
const serverOverrides = resp.overrides;

this.previousOverrides = this.overrides;
this.previousOverrides = overrides;
this.overrides = {};

if (serverSettings.format === 'xml') {
Expand Down Expand Up @@ -185,9 +188,8 @@ export class FileDataVisualizerView extends Component {
serverError: error,
});

// as long as the previous overrides are different to the current overrides,
// reload the results with the previous overrides
if (overrides !== undefined && isEqual(this.previousOverrides, overrides) === false) {
if (isRetry === false) {
this.setState({
loading: true,
loaded: false,
Expand Down Expand Up @@ -244,6 +246,11 @@ export class FileDataVisualizerView extends Component {
};

onCancel = () => {
this.overrides = {};
this.previousOverrides = {};
this.originalSettings = {
linesToSample: DEFAULT_LINES_TO_SAMPLE,
};
this.changeMode(MODE.READ);
this.onFilePickerChange([]);
};
Expand Down Expand Up @@ -276,8 +283,12 @@ export class FileDataVisualizerView extends Component {
return (
<div>
{mode === MODE.READ && (
<React.Fragment>
{!loading && !loaded && <AboutPanel onFilePickerChange={this.onFilePickerChange} />}
<>
{!loading && !loaded && (
<>
Copy link
Contributor

Choose a reason for hiding this comment

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

I wonder if this fragment wrapper can be removed since it's only one element on the inside, maybe a leftover from refactoring?

<AboutPanel onFilePickerChange={this.onFilePickerChange} />
</>
)}

{loading && <LoadingPanel />}

Expand All @@ -286,10 +297,14 @@ export class FileDataVisualizerView extends Component {
)}

{fileCouldNotBeRead && loading === false && (
<React.Fragment>
<FileCouldNotBeRead error={serverError} loaded={loaded} />
<>
<FileCouldNotBeRead
error={serverError}
loaded={loaded}
showEditFlyout={() => this.showEditFlyout()}
Copy link
Contributor

Choose a reason for hiding this comment

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

Does this.showEditFlyout need to be wrapped in an arrow function here?

/>
<EuiSpacer size="l" />
</React.Fragment>
</>
)}

{loaded && (
Expand Down Expand Up @@ -317,19 +332,20 @@ export class FileDataVisualizerView extends Component {
)}

{bottomBarVisible && loaded && (
<BottomBar
mode={MODE.READ}
onChangeMode={this.changeMode}
onCancel={this.onCancel}
disableImport={hasPermissionToImport === false}
/>
<>
<BottomBar
mode={MODE.READ}
onChangeMode={this.changeMode}
onCancel={this.onCancel}
disableImport={hasPermissionToImport === false}
/>
<BottomPadding />
</>
)}

<BottomPadding />
</React.Fragment>
</>
)}
{mode === MODE.IMPORT && (
<React.Fragment>
<>
<ImportView
results={results}
fileName={fileName}
Expand All @@ -342,15 +358,16 @@ export class FileDataVisualizerView extends Component {
/>

{bottomBarVisible && (
<BottomBar
mode={MODE.IMPORT}
onChangeMode={this.changeMode}
onCancel={this.onCancel}
/>
<>
<BottomBar
mode={MODE.IMPORT}
onChangeMode={this.changeMode}
onCancel={this.onCancel}
/>
<BottomPadding />
</>
)}

<BottomPadding />
</React.Fragment>
</>
)}
</div>
);
Expand All @@ -360,10 +377,10 @@ export class FileDataVisualizerView extends Component {
function BottomPadding() {
// padding for the BottomBar
return (
<React.Fragment>
<>
<EuiSpacer size="m" />
<EuiSpacer size="l" />
<EuiSpacer size="l" />
</React.Fragment>
</>
);
}
69 changes: 46 additions & 23 deletions ...ion/datavisualizer/file_based/components/file_datavisualizer_view/file_error_callouts.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import { FormattedMessage } from '@kbn/i18n/react';
import React, { FC } from 'react';

import { EuiCallOut, EuiSpacer } from '@elastic/eui';
import { EuiCallOut, EuiSpacer, EuiButtonEmpty, EuiHorizontalRule } from '@elastic/eui';

import numeral from '@elastic/numeral';
import { ErrorResponse } from '../../../../../../common/types/errors';
Expand Down Expand Up @@ -77,34 +77,57 @@ export const FileTooLarge: FC<FileTooLargeProps> = ({ fileSize, maxFileSize }) =
interface FileCouldNotBeReadProps {
error: ErrorResponse;
loaded: boolean;
showEditFlyout(): void;
}

export const FileCouldNotBeRead: FC<FileCouldNotBeReadProps> = ({ error, loaded }) => {
export const FileCouldNotBeRead: FC<FileCouldNotBeReadProps> = ({
error,
loaded,
showEditFlyout,
}) => {
const message = error?.body?.message || '';
return (
<EuiCallOut
title={
<FormattedMessage
id="xpack.ml.fileDatavisualizer.fileErrorCallouts.fileCouldNotBeReadTitle"
defaultMessage="File could not be read"
/>
}
color="danger"
iconType="cross"
data-test-subj="mlFileUploadErrorCallout fileCouldNotBeRead"
>
{message}
<Explanation error={error} />
{loaded && (
<>
<EuiSpacer size="s" />
<>
<EuiCallOut
title={
<FormattedMessage
id="xpack.ml.fileDatavisualizer.fileErrorCallouts.revertingToPreviousSettingsDescription"
defaultMessage="Reverting to previous settings"
id="xpack.ml.fileDatavisualizer.fileErrorCallouts.fileCouldNotBeReadTitle"
defaultMessage="File structure cannot be determined"
/>
</>
)}
</EuiCallOut>
}
color="danger"
iconType="cross"
data-test-subj="mlFileUploadErrorCallout fileCouldNotBeRead"
>
{loaded === false && (
<>
<FormattedMessage
id="xpack.ml.fileDatavisualizer.fileErrorCallouts.revertingToPreviousSettingsDescription"
defaultMessage="If you know something about this data, such as the file format or timestamp format, adding initial overrides may help us to infer the rest of the structure."
/>
<br />
<EuiButtonEmpty onClick={showEditFlyout} flush="left" size="xs">
<FormattedMessage
id="xpack.ml.fileDatavisualizer.fileErrorCallouts.overrideButton"
defaultMessage="Apply override settings"
/>
</EuiButtonEmpty>
<EuiHorizontalRule />
</>
)}
{message}
<Explanation error={error} />
{loaded && (
<>
<EuiSpacer size="s" />
<FormattedMessage
id="xpack.ml.fileDatavisualizer.fileErrorCallouts.revertingToPreviousSettingsDescription"
defaultMessage="Reverting to previous settings"
/>
</>
)}
</EuiCallOut>
</>
);
};

Expand Down
1 change: 1 addition & 0 deletions x-pack/plugins/ml/public/application/datavisualizer/file_based/components/utils/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,5 @@ export {
readFile,
getMaxBytes,
getMaxBytesFormatted,
DEFAULT_LINES_TO_SAMPLE,
} from './utils';
2 changes: 1 addition & 1 deletion x-pack/plugins/ml/public/application/datavisualizer/file_based/components/utils/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import {
import { getUiSettings } from '../../../../util/dependency_cache';
import { FILE_DATA_VISUALIZER_MAX_FILE_SIZE } from '../../../../../../common/constants/settings';

const DEFAULT_LINES_TO_SAMPLE = 1000;
export const DEFAULT_LINES_TO_SAMPLE = 1000;
const UPLOAD_SIZE_MB = 5;

const overrideDefaults = {
Expand Down