fix(vis_type_vega): Use default categorical color palette directly (#…

…3663) (#3744) rather than relying on vega.scheme. Also update vega.scheme name Fixes #3582 (cherry picked from commit e194bc5) Signed-off-by: Josh Romero <rmerqg@amazon.com> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
opensearch-project · Apr 5, 2023 · 3275a7b · 3275a7b
1 parent 339969f
commit 3275a7b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/plugins/vis_type_vega/public/data_model/vega_parser.test.js b/src/plugins/vis_type_vega/public/data_model/vega_parser.test.js
@@ -30,6 +30,7 @@
 
 import { cloneDeep } from 'lodash';
 import { euiThemeVars } from '@osd/ui-shared-deps/theme';
+import { euiPaletteColorBlind } from '@elastic/eui';
 import { VegaParser } from './vega_parser';
 import { bypassExternalUrlCheck } from '../vega_view/vega_base_view';
 
@@ -88,7 +89,7 @@ describe(`VegaParser._setDefaultColors`, () => {
           tickColor: euiThemeVars.euiColorChartLines,
         },
         background: 'transparent',
-        range: { category: { scheme: 'elastic' } },
+        range: { category: euiPaletteColorBlind() },
         mark: { color: '#54B399' },
         style: {
           'group-title': {
@@ -121,7 +122,7 @@ describe(`VegaParser._setDefaultColors`, () => {
           tickColor: euiThemeVars.euiColorChartLines,
         },
         background: 'transparent',
-        range: { category: { scheme: 'elastic' } },
+        range: { category: euiPaletteColorBlind() },
         arc: { fill: '#54B399' },
         area: { fill: '#54B399' },
         line: { stroke: '#54B399' },

diff --git a/src/plugins/vis_type_vega/public/data_model/vega_parser.ts b/src/plugins/vis_type_vega/public/data_model/vega_parser.ts
@@ -677,7 +677,7 @@ The URL is an identifier only. OpenSearch Dashboards and your browser will never
    */
   _setDefaultColors() {
     // Default category coloring to the OpenSearch color scheme
-    this._setDefaultValue({ scheme: 'elastic' }, 'config', 'range', 'category');
+    this._setDefaultValue(euiPaletteColorBlind(), 'config', 'range', 'category');
 
     if (this.isVegaLite) {
       // Vega-Lite: set default color, works for fill and strike --  config: { mark:  { color: '#54B399' }}

diff --git a/src/plugins/vis_type_vega/public/vega_view/vega_base_view.js b/src/plugins/vis_type_vega/public/vega_view/vega_base_view.js
@@ -41,7 +41,7 @@ import { opensearchFilters } from '../../../data/public';
 import { getEnableExternalUrls, getData } from '../services';
 import { extractIndexPatternsFromSpec } from '../lib/extract_index_pattern';
 
-vega.scheme('elastic', euiPaletteColorBlind());
+vega.scheme('euiPaletteColorBlind', euiPaletteColorBlind());
 
 // Vega's extension functions are global. When called,
 // we forward execution to the instance-specific handler