changes based on review

Author: jgowdyelastic

x-pack/plugins/ml/public/file_datavisualizer/components/analysis_summary/_analysis_summary.scss

@@ -1,10 +1,11 @@
-.analysis-summary-list {
-  .euiDescriptionList {
-    .euiDescriptionList__title {
-      flex-basis: 15%;
-    }
-    .euiDescriptionList__description {
-      flex-basis: 85%;
-    }
+.analysis-summary-list.euiDescriptionList {
+  // adding overrides for title and desciption
+  // these have to be overridden here as they are not
+  // accessable as overrides in the EuiDescriptionList component
+  .euiDescriptionList__title {
+    flex-basis: 15%;
+  }
+  .euiDescriptionList__description {
+    flex-basis: 85%;
   }
 }

x-pack/plugins/ml/public/file_datavisualizer/components/analysis_summary/analysis_summary.js

@@ -24,12 +24,11 @@ export function AnalysisSummary({ results }) {
 
       <EuiSpacer size="m" />
 
-      <div className="analysis-summary-list">
-        <EuiDescriptionList
-          type="column"
-          listItems={items}
-        />
-      </div>
+      <EuiDescriptionList
+        type="column"
+        listItems={items}
+        className="analysis-summary-list"
+      />
     </React.Fragment>
   );
 }

x-pack/plugins/ml/public/file_datavisualizer/components/import_errors/errors.js

@@ -23,7 +23,7 @@ export function ImportErrors({ errors, statuses }) {
     >
       {
         errors.map((e, i) => (
-          <Error error={e} key={i} />
+          <ImportError error={e} key={i} />
         ))
       }
 
@@ -48,7 +48,7 @@ function title(statuses) {
   }
 }
 
-function Error(error, key) {
+function ImportError(error, key) {
   const errorObj = toString(error);
   return (
     <React.Fragment>

x-pack/plugins/ml/public/file_datavisualizer/components/import_settings/import_settings.js

@@ -5,9 +5,7 @@
  */
 
 
-import React, {
-  Component,
-} from 'react';
+import React from 'react';
 
 import {
   EuiTabbedContent,
@@ -17,88 +15,79 @@ import {
 import { SimpleSettings } from './simple';
 import { AdvancedSettings } from './advanced';
 
-export class ImportSettings extends Component {
-  constructor(props) {
-    super(props);
+export function ImportSettings({
+  index,
+  indexPattern,
+  initialized,
+  onIndexChange,
+  createIndexPattern,
+  onCreateIndexPatternChange,
+  onIndexPatternChange,
+  indexSettingsString,
+  mappingsString,
+  pipelineString,
+  onIndexSettingsStringChange,
+  onMappingsStringChange,
+  onPipelineStringChange,
+  indexNameError,
+  indexPatternNameError
+}) {
 
-    this.state = {};
-  }
-
-  render() {
-    const {
-      index,
-      indexPattern,
-      initialized,
-      onIndexChange,
-      createIndexPattern,
-      onCreateIndexPatternChange,
-      onIndexPatternChange,
-      indexSettingsString,
-      mappingsString,
-      pipelineString,
-      onIndexSettingsStringChange,
-      onMappingsStringChange,
-      onPipelineStringChange,
-      indexNameError,
-      indexPatternNameError
-    } = this.props;
-
-    const tabs = [{
-      id: 'simple-settings',
-      name: 'Simple',
-      content: (
-        <React.Fragment>
+  const tabs = [{
+    id: 'simple-settings',
+    name: 'Simple',
+    content: (
+      <React.Fragment>
 
-          <EuiSpacer size="m" />
+        <EuiSpacer size="m" />
 
-          <SimpleSettings
-            index={index}
-            initialized={initialized}
-            onIndexChange={onIndexChange}
-            createIndexPattern={createIndexPattern}
-            onCreateIndexPatternChange={onCreateIndexPatternChange}
-            indexNameError={indexNameError}
-          />
-        </React.Fragment>
-      )
-    },
-    {
-      id: 'advanced-settings',
-      name: 'Advanced',
-      content: (
-        <React.Fragment>
+        <SimpleSettings
+          index={index}
+          initialized={initialized}
+          onIndexChange={onIndexChange}
+          createIndexPattern={createIndexPattern}
+          onCreateIndexPatternChange={onCreateIndexPatternChange}
+          indexNameError={indexNameError}
+        />
+      </React.Fragment>
+    )
+  },
+  {
+    id: 'advanced-settings',
+    name: 'Advanced',
+    content: (
+      <React.Fragment>
 
-          <EuiSpacer size="m" />
+        <EuiSpacer size="m" />
 
-          <AdvancedSettings
-            index={index}
-            indexPattern={indexPattern}
-            initialized={initialized}
-            onIndexChange={onIndexChange}
-            createIndexPattern={createIndexPattern}
-            onCreateIndexPatternChange={onCreateIndexPatternChange}
-            onIndexPatternChange={onIndexPatternChange}
-            indexSettingsString={indexSettingsString}
-            mappingsString={mappingsString}
-            pipelineString={pipelineString}
-            onIndexSettingsStringChange={onIndexSettingsStringChange}
-            onMappingsStringChange={onMappingsStringChange}
-            onPipelineStringChange={onPipelineStringChange}
-            indexNameError={indexNameError}
-            indexPatternNameError={indexPatternNameError}
-          />
-        </React.Fragment>
-      )
-    }
-    ];
-    return (
-      <React.Fragment>
-        <EuiTabbedContent
-          tabs={tabs}
-          initialSelectedTab={tabs[0]}
-          onTabClick={() => { }}
+        <AdvancedSettings
+          index={index}
+          indexPattern={indexPattern}
+          initialized={initialized}
+          onIndexChange={onIndexChange}
+          createIndexPattern={createIndexPattern}
+          onCreateIndexPatternChange={onCreateIndexPatternChange}
+          onIndexPatternChange={onIndexPatternChange}
+          indexSettingsString={indexSettingsString}
+          mappingsString={mappingsString}
+          pipelineString={pipelineString}
+          onIndexSettingsStringChange={onIndexSettingsStringChange}
+          onMappingsStringChange={onMappingsStringChange}
+          onPipelineStringChange={onPipelineStringChange}
+          indexNameError={indexNameError}
+          indexPatternNameError={indexPatternNameError}
         />
       </React.Fragment>
-    );
+    )
   }
+  ];
+  return (
+    <React.Fragment>
+      <EuiTabbedContent
+        tabs={tabs}
+        initialSelectedTab={tabs[0]}
+        onTabClick={() => { }}
+      />
+    </React.Fragment>
+  );
 }

x-pack/plugins/ml/public/file_datavisualizer/components/import_summary/_import_sumary.scss

@@ -1,11 +1,12 @@
-.import-summary-list {
-  .euiDescriptionList {
-    .euiDescriptionList__title {
-      flex-basis: 15%;
-    }
-    .euiDescriptionList__description {
-      flex-basis: 85%;
-    }
+.import-summary-list.euiDescriptionList {
+  // adding overrides for title and desciption
+  // these have to be overridden here as they are not
+  // accessable as overrides in the EuiDescriptionList component
+  .euiDescriptionList__title {
+    flex-basis: 15%;
+  }
+  .euiDescriptionList__description {
+    flex-basis: 85%;
   }
 }
 

x-pack/plugins/ml/public/file_datavisualizer/components/import_summary/import_summary.js

@@ -36,12 +36,11 @@ export function ImportSummary({
         color="success"
         iconType="check"
       >
-        <div className="import-summary-list">
-          <EuiDescriptionList
-            type="column"
-            listItems={items}
-          />
-        </div>
+        <EuiDescriptionList
+          type="column"
+          listItems={items}
+          className="import-summary-list"
+        />
       </EuiCallOut>
 
       {(importFailures && importFailures.length > 0) &&

x-pack/plugins/ml/public/file_datavisualizer/components/import_view/import_view.js

@@ -483,12 +483,14 @@ function isIndexPatternNameValid(name, indexPatternNames, index) {
   if (indexPatternNames.find(i => i === name)) {
     return 'Index pattern name already exists';
   }
-  const newName = name.replace('*', '.*');
+
+  // escape . and + to stop the regex matching more than it should.
+  let newName = name.replace('.', '\\.');
+  newName = newName.replace('+', '\\+');
+  // replace * with .* to make the wildcard match work.
+  newName = newName.replace('*', '.*');
   const reg = new RegExp(`^${newName}$`);
-  if ((
-    name.match(/[\.\+]/g) !== null) || // avoid accidental .+ regexp matches
-    (index.match(reg) === null) // name should match index
-  ) {
+  if (index.match(reg) === null) { // name should match index
     return 'Index pattern does not match index name';
   }
 

x-pack/plugins/ml/public/file_datavisualizer/components/import_view/importer/importer.js

@@ -96,7 +96,6 @@ export class Importer {
         console.error(resp);
         success = false;
         error = resp.error;
-        // debugger
         populateFailures(resp, failures, i);
         break;
       }

x-pack/plugins/ml/public/file_datavisualizer/components/results_links/results_links.js

@@ -20,7 +20,7 @@ import moment from 'moment';
 import uiChrome from 'ui/chrome';
 import { ml } from '../../../services/ml_api_service';
 
-const RECHECK_DELAY = 3000;
+const RECHECK_DELAY_MS = 3000;
 
 export class ResultsLinks extends Component {
   constructor(props) {
@@ -31,18 +31,18 @@ export class ResultsLinks extends Component {
       to: 'now',
     };
 
-    this.reCheckTimeout = null;
+    this.recheckTimeout = null;
   }
 
   componentDidMount() {
     this.updateTimeValues();
   }
 
   componentWillUnmount() {
-    clearTimeout(this.reCheckTimeout);
+    clearTimeout(this.recheckTimeout);
   }
 
-  async updateTimeValues(reCheck = true) {
+  async updateTimeValues(recheck = true) {
     const {
       index,
       timeFieldName,
@@ -54,16 +54,16 @@ export class ResultsLinks extends Component {
       to: (to === null) ? this.state.to : to,
     });
 
-    // these links may have been drawn too quickly for he index to be ready
-    // to give us the correct start and and times.
+    // these links may have been drawn too quickly for the index to be ready
+    // to give us the correct start and end times.
     // especially if the data was small.
     // so if the start and end were null, try again in 3s
     // the timeout is cleared when this component unmounts. just in case the user
     // resets the form or navigates away within 3s
-    if (reCheck && (from === null || to === null)) {
-      this.reCheckTimeout = setTimeout(() => {
+    if (recheck && (from === null || to === null)) {
+      this.recheckTimeout = setTimeout(() => {
         this.updateTimeValues(false);
-      }, RECHECK_DELAY);
+      }, RECHECK_DELAY_MS);
     }
   }
 

x-pack/plugins/ml/server/models/file_data_visualizer/import_data.js

@@ -44,7 +44,7 @@ export function importDataProvider(callWithRequest) {
       if (data.length && indexExits(index)) {
         const resp = await indexData(index, createdPipelineId, data);
         if (resp.success === false) {
-          if (resp.ingestError/* || resp.failures.length === data.length*/) {
+          if (resp.ingestError) {
             // all docs failed, abort
             throw resp;
           } else {