schemaTitle

elastic · Mar 4, 2020 · 338dbf6 · 338dbf6
1 parent dec4ac9
commit 338dbf6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 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
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
@@ -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
@@ -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()}