review feedback

elastic · Sep 18, 2020 · 22ac2a1 · 22ac2a1
1 parent 335122e
commit 22ac2a1
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 18 deletions.
diff --git a/...application/datavisualizer/file_based/components/combined_fields/combined_fields_form.tsx b/...application/datavisualizer/file_based/components/combined_fields/combined_fields_form.tsx
@@ -38,6 +38,7 @@ interface Props {
  combinedFields: CombinedField[];
  onCombinedFieldsChange(combinedFields: CombinedField[]): void;
  results: FindFileStructureResponse;
+ isDisabled: boolean;
 }
 
 interface State {
@@ -188,28 +189,35 @@ export class CombinedFieldsForm extends Component<Props, State> {
  <EuiFlexItem>
  <CombinedFieldLabel combinedField={combinedField} />
  </EuiFlexItem>
- <EuiFlexItem grow={false}>
- <EuiButtonIcon
- iconType="trash"
- color="danger"
- onClick={this.removeCombinedField.bind(null, idx)}
- title={i18n.translate('xpack.ml.fileDatavisualizer.removeCombinedFieldsLabel', {
- defaultMessage: 'Remove combined field',
- })}
- aria-label={i18n.translate(
- 'xpack.ml.fileDatavisualizer.removeCombinedFieldsLabel',
- {
+ {!this.props.isDisabled && (
+ <EuiFlexItem grow={false}>
+ <EuiButtonIcon
+ iconType="trash"
+ color="danger"
+ onClick={this.removeCombinedField.bind(null, idx)}
+ title={i18n.translate('xpack.ml.fileDatavisualizer.removeCombinedFieldsLabel', {
  defaultMessage: 'Remove combined field',
- }
- )}
- />
- </EuiFlexItem>
+ })}
+ aria-label={i18n.translate(
+ 'xpack.ml.fileDatavisualizer.removeCombinedFieldsLabel',
+ {
+ defaultMessage: 'Remove combined field',
+ }
+ )}
+ />
+ </EuiFlexItem>
+ )}
  </EuiFlexGroup>
  ))}
  <EuiPopover
  id="combineFieldsPopover"
  button={
- <EuiButtonEmpty onClick={this.togglePopover} size="xs" iconType="plusInCircleFilled">
+ <EuiButtonEmpty
+ onClick={this.togglePopover}
+ size="xs"
+ iconType="plusInCircleFilled"
+ isDisabled={this.props.isDisabled}
+ >
  <FormattedMessage
  id="xpack.ml.fileDatavisualizer.addCombinedFieldsLabel"
  defaultMessage="Add combined field"

diff --git a/.../ml/public/application/datavisualizer/file_based/components/combined_fields/geo_point.tsx b/.../ml/public/application/datavisualizer/file_based/components/combined_fields/geo_point.tsx
@@ -5,7 +5,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import _ from 'lodash';
+import debounce from 'lodash/debounce';
 import { FormattedMessage } from '@kbn/i18n/react';
 import React, { ChangeEvent, Component, Fragment } from 'react';
 
@@ -86,7 +86,7 @@ export class GeoPointForm extends Component<Props, State> {
  this.hasNameCollision(geoPointField);
  };
 
- hasNameCollision = _.debounce((name: string) => {
+ hasNameCollision = debounce((name: string) => {
  try {
  const geoPointFieldError = this.props.hasNameCollision(name) ? getNameCollisionMsg(name) : '';
  this.setState({ geoPointFieldError });

diff --git a/...s/ml/public/application/datavisualizer/file_based/components/import_settings/advanced.tsx b/...s/ml/public/application/datavisualizer/file_based/components/import_settings/advanced.tsx
@@ -139,6 +139,7 @@ export const AdvancedSettings: FC<Props> = ({
  combinedFields={combinedFields}
  onCombinedFieldsChange={onCombinedFieldsChange}
  results={results}
+ isDisabled={initialized === true}
  />
 
  <EuiFlexGroup>