Got rid of lodash isArray, added Number.isFinite where needed and cha…

…nged symbol of string join and array split
elastic · Apr 10, 2020 · c827bd8 · c827bd8
1 parent a774fd2
commit c827bd8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/src/plugins/data/public/search/aggs/buckets/migrate_include_exclude_format.ts b/src/plugins/data/public/search/aggs/buckets/migrate_include_exclude_format.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { isString, isObject, isArray } from 'lodash';
+import { isString, isObject } from 'lodash';
 import { IBucketAggConfig, BucketAggType, BucketAggParam } from './bucket_agg_type';
 import { IAggConfig } from '../agg_config';
 
@@ -36,7 +36,7 @@ export const isStringOrNumberType = isType('string', 'number');
 export const migrateIncludeExcludeFormat = {
   serialize(this: BucketAggParam<IBucketAggConfig>, value: any, agg: IBucketAggConfig) {
     if (this.shouldShow && !this.shouldShow(agg)) return;
-    if (!value || isString(value) || isArray(value)) return value;
+    if (!value || isString(value) || Array.isArray(value)) return value;
     else return value.pattern;
   },
   write(
@@ -46,8 +46,8 @@ export const migrateIncludeExcludeFormat = {
   ) {
     const value = aggConfig.getParam(this.name);
 
-    if (isArray(value) && value.length > 0 && isNumberType(aggConfig)) {
-      const parsedValue = (value as number[]).filter((val: number) => val || val === 0);
+    if (Array.isArray(value) && value.length > 0 && isNumberType(aggConfig)) {
+      const parsedValue = value.filter((val): val is number => Number.isFinite(val));
       if (parsedValue.length) {
         output.params[this.name] = parsedValue;
       }

diff --git a/src/plugins/vis_default_editor/public/components/controls/components/simple_number_list.tsx b/src/plugins/vis_default_editor/public/components/controls/components/simple_number_list.tsx
@@ -43,7 +43,7 @@ function SimpleNumberList({
   useEffect(() => {
     if (
       isArray(value) &&
-      (value?.length !== numbers.length ||
+      (value.length !== numbers.length ||
         !value.every((numberValue, index) => numberValue === numbers[index].value))
     ) {
       setNumbers(

diff --git a/src/plugins/vis_default_editor/public/components/controls/include_exclude.tsx b/src/plugins/vis_default_editor/public/components/controls/include_exclude.tsx
@@ -18,7 +18,6 @@
  */
 
 import React, { useEffect } from 'react';
-import { isArray } from 'lodash';
 import { AggParamEditorProps } from '../agg_param_props';
 import { StringParamEditor } from './string';
 import { search } from '../../../../data/public';
@@ -31,14 +30,14 @@ export function IncludeExcludeParamEditor(props: AggParamEditorProps<string | Ar
 
   // This useEffect converts value from string type to number and back when the field type is changed
   useEffect(() => {
-    if (isAggOfNumberType && !isArray(value) && value !== undefined) {
+    if (isAggOfNumberType && !Array.isArray(value) && value !== undefined) {
       const numberArray = value
-        .split(',')
+        .split('|')
         .map(item => parseFloat(item))
-        .filter(number => !isNaN(number));
+        .filter(number => Number.isFinite(number));
       setValue(numberArray.length ? numberArray : ['']);
-    } else if (!isAggOfNumberType && isArray(value) && value !== undefined) {
-      setValue((value as Array<number | ''>).filter(item => item !== '').toString());
+    } else if (!isAggOfNumberType && Array.isArray(value) && value !== undefined) {
+      setValue(value.filter(item => item !== '').join('|'));
     }
   }, [isAggOfNumberType, setValue, value]);