[maps] convert vector style properties to TS (#74553)

* [maps] convert vector style properties to TS * more conversionts * tslint cleanup * final tslint fixes * update snapshots for bug fix * review feedback Co-authored-by: Elastic Machine <[email protected]>
elastic · Aug 10, 2020 · 8a2697d · 8a2697d
1 parent e07b87f
commit 8a2697d
Show file tree

Hide file tree

Showing 19 changed files with 302 additions and 146 deletions.
diff --git a/x-pack/plugins/maps/public/classes/styles/color_palettes.ts b/x-pack/plugins/maps/public/classes/styles/color_palettes.ts
@@ -129,7 +129,7 @@ export function getColorRampCenterColor(colorPaletteId: string): string | null {
 // Returns an array of color stops
 // [ stop_input_1: number, stop_output_1: color, stop_input_n: number, stop_output_n: color ]
 export function getOrdinalMbColorRampStops(
-  colorPaletteId: string,
+  colorPaletteId: string | null,
   min: number,
   max: number
 ): Array<number | string> | null {

diff --git a/x-pack/plugins/maps/public/classes/styles/vector/components/legend/breaked_legend.tsx b/x-pack/plugins/maps/public/classes/styles/vector/components/legend/breaked_legend.tsx
@@ -14,8 +14,8 @@ const EMPTY_VALUE = '';
 
 interface Break {
   color: string;
-  label: ReactElement<any> | string;
-  symbolId: string;
+  label: ReactElement<any> | string | number;
+  symbolId?: string;
 }
 
 interface Props {

diff --git a/x-pack/plugins/maps/public/classes/styles/vector/components/legend/category.tsx b/x-pack/plugins/maps/public/classes/styles/vector/components/legend/category.tsx
@@ -11,11 +11,11 @@ import { VectorIcon } from './vector_icon';
 
 interface Props {
   styleName: VECTOR_STYLES;
-  label: ReactElement<any> | string;
+  label: ReactElement<any> | string | number;
   color: string;
   isLinesOnly: boolean;
   isPointsOnly: boolean;
-  symbolId: string;
+  symbolId?: string;
 }
 
 export function Category({ styleName, label, color, isLinesOnly, isPointsOnly, symbolId }: Props) {

diff --git a/...ots__/dynamic_color_property.test.js.snap → ...ts__/dynamic_color_property.test.tsx.snap b/...ots__/dynamic_color_property.test.js.snap → ...ts__/dynamic_color_property.test.tsx.snap
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/properties/__tests__/test_util.ts b/x-pack/plugins/maps/public/classes/styles/vector/properties/__tests__/test_util.ts
@@ -25,21 +25,6 @@ class MockField extends AbstractField {
   }
 }
 
-export class MockMbMap {
-  _paintPropertyCalls: unknown[];
-
-  constructor() {
-    this._paintPropertyCalls = [];
-  }
-  setPaintProperty(...args: unknown[]) {
-    this._paintPropertyCalls.push([...args]);
-  }
-
-  getPaintPropertyCalls(): unknown[] {
-    return this._paintPropertyCalls;
-  }
-}
-
 export const mockField: IField = new MockField({
   fieldName: 'foobar',
   origin: FIELD_ORIGIN.SOURCE,