fix conflicts

Signed-off-by: Qxisylolo <[email protected]>

Author: Qxisylolo

src/plugins/explore/public/components/visualizations/bar/bar_chart_utils.ts

@@ -13,7 +13,8 @@ import {
 } from '../types';
 import { applyAxisStyling, getSchemaByAxis } from '../utils/utils';
 import { BarChartStyle } from './bar_vis_config';
-import { getColors, DEFAULT_GREY, resolveColor } from '../theme/default_colors';
+import { getColors, DEFAULT_GREY } from '../theme/default_colors';
+import { resolveColor } from '../theme/color_utils';
 
 export const inferTimeIntervals = (data: Array<Record<string, any>>, field: string | undefined) => {
   if (!data || data.length === 0 || !field) {

src/plugins/explore/public/components/visualizations/bar_gauge/bar_gauge_utils.ts

@@ -5,7 +5,7 @@
 
 import { AxisColumnMappings, Threshold, VisFieldType } from '../types';
 import { BarGaugeChartStyle } from './bar_gauge_vis_config';
-import { resolveColor } from '../theme/default_colors';
+import { resolveColor } from '../theme/color_utils';
 
 export const getBarOrientation = (
   styles: BarGaugeChartStyle,

src/plugins/explore/public/components/visualizations/bar_gauge/to_expression.test.ts

@@ -18,6 +18,9 @@ jest.mock('../utils/calculation', () => ({
 jest.mock('../theme/default_colors', () => ({
   darkenColor: jest.fn((color) => '#00000'),
   getColors: jest.fn(() => ({ text: 'black', statusGreen: 'green', backgroundShade: 'grey' })),
+}));
+
+jest.mock('../theme/color_utils', () => ({
   resolveColor: jest.fn((color) => color),
 }));
 

src/plugins/explore/public/components/visualizations/bar_gauge/to_expression.ts

@@ -7,7 +7,8 @@ import { groupBy } from 'lodash';
 import { BarGaugeChartStyle } from './bar_gauge_vis_config';
 import { VisColumn, AxisColumnMappings, VEGASCHEMA, Threshold, VisFieldType } from '../types';
 import { calculateValue } from '../utils/calculation';
-import { getColors, resolveColor } from '../theme/default_colors';
+import { getColors } from '../theme/default_colors';
+import { resolveColor } from '../theme/color_utils';
 import { getSchemaByAxis } from '../utils/utils';
 import {
   getBarOrientation,

src/plugins/explore/public/components/visualizations/gauge/to_expression.ts

@@ -13,7 +13,8 @@ import {
   mergeThresholdsWithBase,
   getMaxAndMinBase,
 } from '../style_panel/threshold/threshold_utils';
-import { getColors, DEFAULT_GREY, resolveColor } from '../theme/default_colors';
+import { getColors, DEFAULT_GREY } from '../theme/default_colors';
+import { resolveColor } from '../theme/color_utils';
 import { getUnitById, showDisplayValue } from '../style_panel/unit/collection';
 
 export const createGauge = (

src/plugins/explore/public/components/visualizations/heatmap/heatmap_chart_utils.ts

@@ -7,7 +7,8 @@ import type { Encoding } from 'vega-lite/build/src/encoding';
 import { AggregationType, VisColumn } from '../types';
 import { HeatmapChartStyle } from './heatmap_vis_config';
 
-import { getColors, DEFAULT_GREY, resolveColor } from '../theme/default_colors';
+import { getColors, DEFAULT_GREY } from '../theme/default_colors';
+import { resolveColor } from '../theme/color_utils';
 
 // isRegular=== true refers to 2 dimension and 1 metric heatmap.
 export const createLabelLayer = (

src/plugins/explore/public/components/visualizations/histogram/histogram_vis_config.test.ts

@@ -24,7 +24,7 @@ describe('bar_vis_config', () => {
 
         // Threshold and grid
         thresholdOptions: {
-          baseColor: '#00BD6B',
+          baseColor: '#017D73',
           thresholds: [],
           thresholdStyle: ThresholdMode.Off,
         },

src/plugins/explore/public/components/visualizations/metric/to_expression.ts

@@ -7,7 +7,8 @@ import { MetricChartStyle } from './metric_vis_config';
 import { VisColumn, VEGASCHEMA, AxisRole, AxisColumnMappings, Threshold } from '../types';
 import { getTooltipFormat } from '../utils/utils';
 import { calculatePercentage, calculateValue } from '../utils/calculation';
-import { getColors, resolveColor } from '../theme/default_colors';
+import { getColors } from '../theme/default_colors';
+import { resolveColor } from '../theme/color_utils';
 import { DEFAULT_OPACITY } from '../constants';
 import { getUnitById, showDisplayValue } from '../style_panel/unit/collection';
 import {

src/plugins/explore/public/components/visualizations/style_panel/color_group_panel/color_group_panel.test.tsx

@@ -16,7 +16,10 @@ jest.mock('../../../visualizations/theme/color_utils', () => ({
       blue1: '#5885bfff',
     },
   }),
-  resolveColor: (color: string) => color,
+  resolveColor: jest.fn((color) => color),
+}));
+
+jest.mock('../../../visualizations/theme/default_colors', () => ({
   getColors: () => [],
 }));
 

src/plugins/explore/public/components/visualizations/style_panel/threshold/threshold_utils.ts

@@ -3,7 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { getColors, resolveColor } from '../../theme/default_colors';
+import { getColors } from '../../theme/default_colors';
+import { resolveColor } from '../../theme/color_utils';
 import {
   Threshold,
   ThresholdLine,