fix scripted fields

elastic · Apr 24, 2020 · 142169a · 142169a
1 parent d2ef538
commit 142169a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 22 deletions.
diff --git a/src/legacy/ui/public/field_editor/field_editor.test.tsx b/src/legacy/ui/public/field_editor/field_editor.test.tsx
@@ -59,9 +59,7 @@ jest.mock('@elastic/eui', () => ({
 }));
 
 jest.mock('ui/scripting_languages', () => ({
-  GetEnabledScriptingLanguagesProvider: jest
-    .fn()
-    .mockImplementation(() => () => ['painless', 'testlang']),
+  getEnabledScriptingLanguages: () => ['painless', 'testlang'],
   getSupportedScriptingLanguages: () => ['painless'],
   getDeprecatedScriptingLanguages: () => ['testlang'],
 }));

diff --git a/src/legacy/ui/public/field_editor/field_editor.tsx b/src/legacy/ui/public/field_editor/field_editor.tsx
@@ -22,7 +22,7 @@ import { intersection, union, get } from 'lodash';
 import { HttpStart } from 'src/core/public';
 
 import {
-  GetEnabledScriptingLanguagesProvider,
+  getEnabledScriptingLanguages,
   getDeprecatedScriptingLanguages,
   getSupportedScriptingLanguages,
 } from 'ui/scripting_languages';
@@ -183,8 +183,7 @@ export class FieldEditor extends PureComponent<FieldEdiorProps, FieldEditorState
     const { field } = this.state;
     const { indexPattern } = this.props;
 
-    const getEnabledScriptingLanguages = GetEnabledScriptingLanguagesProvider(getHttpStart());
-    const enabledLangs = await getEnabledScriptingLanguages();
+    const enabledLangs = await getEnabledScriptingLanguages(await getHttpStart());
     const scriptingLangs = intersection(
       enabledLangs,
       union(this.supportedLangs, this.deprecatedLangs)

diff --git a/src/legacy/ui/public/scripting_languages/index.ts b/src/legacy/ui/public/scripting_languages/index.ts
@@ -19,7 +19,6 @@
 
 import { i18n } from '@kbn/i18n';
 import { HttpStart } from 'src/core/public';
-import chrome from '../chrome';
 import { toastNotifications } from '../notify';
 
 export function getSupportedScriptingLanguages(): string[] {
@@ -30,18 +29,12 @@ export function getDeprecatedScriptingLanguages(): string[] {
   return [];
 }
 
-export function GetEnabledScriptingLanguagesProvider($http: HttpStart) {
-  return () => {
-    return $http
-      .get(chrome.addBasePath('/api/kibana/scripts/languages'))
-      .then((res: any) => res.data)
-      .catch(() => {
-        toastNotifications.addDanger(
-          i18n.translate('common.ui.scriptingLanguages.errorFetchingToastDescription', {
-            defaultMessage: 'Error getting available scripting languages from Elasticsearch',
-          })
-        );
-        return [];
-      });
-  };
-}
+export const getEnabledScriptingLanguages = (http: HttpStart) =>
+  http.get('/api/kibana/scripts/languages').catch(() => {
+    toastNotifications.addDanger(
+      i18n.translate('common.ui.scriptingLanguages.errorFetchingToastDescription', {
+        defaultMessage: 'Error getting available scripting languages from Elasticsearch',
+      })
+    );
+    return [];
+  });