From 338dbf6e33d9ea3726d733f22ee3a1c7710d2411 Mon Sep 17 00:00:00 2001
From: ppisljar <peter.pisljar@gmail.com>
Date: Wed, 4 Mar 2020 09:00:56 -0500
Subject: [PATCH] schemaTitle

---
 .../public/components/__snapshots__/agg.test.tsx.snap      | 6 +++++-
 .../vis_default_editor/public/components/agg.test.tsx      | 2 +-
 .../vis_default_editor/public/components/agg.tsx           | 7 ++++---
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/__snapshots__/agg.test.tsx.snap b/src/legacy/core_plugins/vis_default_editor/public/components/__snapshots__/agg.test.tsx.snap
index 9552cd39a5e23..ba5f2ae975cbe 100644
--- a/src/legacy/core_plugins/vis_default_editor/public/components/__snapshots__/agg.test.tsx.snap
+++ b/src/legacy/core_plugins/vis_default_editor/public/components/__snapshots__/agg.test.tsx.snap
@@ -66,7 +66,11 @@ exports[`DefaultEditorAgg component should init with the default set of props 1`
     setAggParamValue={[MockFunction]}
     setTouched={[Function]}
     setValidity={[Function]}
-    state={Object {}}
+    state={
+      Object {
+        "params": Object {},
+      }
+    }
   />
 </EuiAccordion>
 `;
diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/agg.test.tsx b/src/legacy/core_plugins/vis_default_editor/public/components/agg.test.tsx
index e409181ceee9d..22e0ebb3d30dc 100644
--- a/src/legacy/core_plugins/vis_default_editor/public/components/agg.test.tsx
+++ b/src/legacy/core_plugins/vis_default_editor/public/components/agg.test.tsx
@@ -70,7 +70,7 @@ describe('DefaultEditorAgg component', () => {
       isLastBucket: false,
       isRemovable: false,
       metricAggs: [],
-      state: {} as VisState,
+      state: { params: {} } as VisState,
       setAggParamValue,
       setStateParamValue,
       onAggTypeChange: () => {},
diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/agg.tsx b/src/legacy/core_plugins/vis_default_editor/public/components/agg.tsx
index 835eff7b62be6..30ccd4f0b6cae 100644
--- a/src/legacy/core_plugins/vis_default_editor/public/components/agg.tsx
+++ b/src/legacy/core_plugins/vis_default_editor/public/components/agg.tsx
@@ -34,6 +34,7 @@ import { DefaultEditorAggCommonProps } from './agg_common_props';
 import { AGGS_ACTION_KEYS, AggsAction } from './agg_group_state';
 import { RowsOrColumnsControl } from './controls/rows_or_columns';
 import { RadiusRatioOptionControl } from './controls/radius_ratio_option';
+import { getSchemaByName } from '../schemas';
 
 export interface DefaultEditorAggProps extends DefaultEditorAggCommonProps {
   agg: IAggConfig;
@@ -256,10 +257,10 @@ function DefaultEditorAgg({
       </div>
     );
   };
-
+  const schemaTitle = getSchemaByName(schemas, agg.schema).title;
   const buttonContent = (
     <>
-      {agg.schema} {showDescription && <span>{aggDescription}</span>}
+      {schemaTitle || agg.schema} {showDescription && <span>{aggDescription}</span>}
     </>
   );
 
@@ -273,7 +274,7 @@ function DefaultEditorAgg({
       className="visEditorSidebar__section visEditorSidebar__collapsible visEditorSidebar__collapsible--marginBottom"
       aria-label={i18n.translate('visDefaultEditor.agg.toggleEditorButtonAriaLabel', {
         defaultMessage: 'Toggle {schema} editor',
-        values: { schema: agg.schema },
+        values: { schema: schemaTitle || agg.schema },
       })}
       data-test-subj={`visEditorAggAccordion${agg.id}`}
       extraAction={renderAggButtons()}