init feedback

elastic · May 24, 2021 · 6f06429 · 6f06429
1 parent 004fb15
commit 6f06429
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 19 deletions.
diff --git a/x-pack/plugins/file_upload/public/api/json_upload_and_parse_async_wrapper.tsx b/x-pack/plugins/file_upload/public/api/json_upload_and_parse_async_wrapper.tsx
@@ -21,6 +21,7 @@ export class JsonUploadAndParseAsyncWrapper extends React.Component<
     JsonUploadAndParse: null,
   };
   private _isMounted = false;
+
   componentDidMount() {
     this._isMounted = true;
     lazyLoadModules().then((modules) => {
@@ -32,6 +33,10 @@ export class JsonUploadAndParseAsyncWrapper extends React.Component<
     });
   }
 
+  componentWillUnmount(): void {
+    this._isMounted = false;
+  }
+
   render() {
     const { JsonUploadAndParse } = this.state;
     return JsonUploadAndParse ? (

diff --git a/x-pack/plugins/file_upload/public/components/geojson_upload_form/index_name_form.tsx b/x-pack/plugins/file_upload/public/components/geojson_upload_form/index_name_form.tsx
@@ -34,19 +34,15 @@ export class IndexNameForm extends Component<Props> {
     const indexName = event.target.value;
     this.props.onIndexNameChange(indexName);
     this._validateIndexName(indexName);
-    if (this.props.onIndexNameValidationStart) {
-      this.props.onIndexNameValidationStart();
-    }
+    this.props.onIndexNameValidationStart();
   };
 
   _validateIndexName = _.debounce(async (indexName: string) => {
     const indexNameError = await validateIndexName(indexName);
     if (!this._isMounted || indexName !== this.props.indexName) {
       return;
     }
-    if (this.props.onIndexNameValidationEnd) {
-      this.props.onIndexNameValidationEnd();
-    }
+    this.props.onIndexNameValidationEnd();
     this.props.onIndexNameChange(indexName, indexNameError);
   }, 500);
 

diff --git a/...or_layer_wizard/utils/indexing_service.ts → ..._layer_wizard/create_new_index_pattern.ts b/...or_layer_wizard/utils/indexing_service.ts → ..._layer_wizard/create_new_index_pattern.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { getHttp } from '../../../../kibana_services';
-import { CreateDocSourceResp, INDEX_SOURCE_API_PATH } from '../../../../../common';
+import { getHttp } from '../../../kibana_services';
+import { CreateDocSourceResp, INDEX_SOURCE_API_PATH } from '../../../../common';
 
 export const createNewIndexAndPattern = async (indexName: string) => {
   return await getHttp().fetch<CreateDocSourceResp>({

diff --git a/x-pack/plugins/maps/public/classes/layers/new_vector_layer_wizard/wizard.tsx b/x-pack/plugins/maps/public/classes/layers/new_vector_layer_wizard/wizard.tsx
@@ -8,7 +8,7 @@
 import React, { Component, Fragment } from 'react';
 import { EuiEmptyPrompt, EuiPanel } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { createNewIndexAndPattern } from './utils/indexing_service';
+import { createNewIndexAndPattern } from './create_new_index_pattern';
 import { RenderWizardArguments } from '../layer_wizard_registry';
 import { VectorLayer } from '../vector_layer';
 import { ESSearchSource } from '../../sources/es_search_source';
@@ -17,19 +17,17 @@ import { getIndexNameFormComponent } from '../../../kibana_services';
 
 interface State {
   indexName: string;
-  indexError: string;
+  indexNameError: string;
   indexingTriggered: boolean;
-  indexPatternId: string;
 }
 
 export class NewVectorLayerEditor extends Component<RenderWizardArguments, State> {
   private _isMounted: boolean = false;
 
   state: State = {
     indexName: '',
-    indexError: '',
+    indexNameError: '',
     indexingTriggered: false,
-    indexPatternId: '',
   };
 
   componentDidMount() {
@@ -52,7 +50,7 @@ export class NewVectorLayerEditor extends Component<RenderWizardArguments, State
       return;
     }
     this.setState({
-      indexError: i18n.translate('xpack.maps.layers.newVectorLayerWizard.createIndexError', {
+      indexNameError: i18n.translate('xpack.maps.layers.newVectorLayerWizard.createIndexError', {
         defaultMessage: 'Could not create index: {errorMessage}',
         values: {
           errorMessage: message,
@@ -62,7 +60,7 @@ export class NewVectorLayerEditor extends Component<RenderWizardArguments, State
   }
 
   _createNewIndex = async () => {
-    let indexPatternId: string;
+    let indexPatternId: string | undefined;
     try {
       const response = await createNewIndexAndPattern(this.state.indexName);
       indexPatternId = response.indexPatternId;
@@ -74,9 +72,9 @@ export class NewVectorLayerEditor extends Component<RenderWizardArguments, State
     if (!indexPatternId) {
       return this._setCreateIndexError(
         i18n.translate('xpack.maps.layers.newVectorLayerWizard.createIndexError', {
-          defaultMessage: 'Could not create index: {errorMessage}',
+          defaultMessage: 'Could not create index with name {message}',
           values: {
-            errorMessage: message,
+            message: this.state.indexName,
           },
         })
       );
@@ -102,7 +100,7 @@ export class NewVectorLayerEditor extends Component<RenderWizardArguments, State
   _onIndexChange = (indexName: string, indexError?: string) => {
     this.setState({
       indexName,
-      indexError: indexError ? indexError : '',
+      indexNameError: indexError ? indexError : '',
     });
     if (indexName && !indexError) {
       this.props.enableNextBtn();

diff --git a/x-pack/plugins/maps/public/kibana_services.ts b/x-pack/plugins/maps/public/kibana_services.ts
@@ -58,7 +58,6 @@ let mapAppConfig: MapsConfigType;
 export const setMapAppConfig = (config: MapsConfigType) => (mapAppConfig = config);
 export const getMapAppConfig = () => mapAppConfig;
 
-export const getEnabled = () => getMapAppConfig().enabled;
 export const getShowMapsInspectorAdapter = () => getMapAppConfig().showMapsInspectorAdapter;
 export const getPreserveDrawingBuffer = () => getMapAppConfig().preserveDrawingBuffer;