Replace some types with MetricsItemsSchema['values'] to avoid duplica…

…tions
elastic · Jun 24, 2020 · bf4dba3 · bf4dba3
1 parent 1c11748
commit bf4dba3
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 18 deletions.
diff --git a/src/plugins/vis_type_timeseries/common/ui_restrictions.ts b/src/plugins/vis_type_timeseries/common/ui_restrictions.ts
@@ -44,11 +44,9 @@ export interface UIRestrictions {
   [restriction: string]: boolean;
 }
 
-export interface TimeseriesUIRestrictions {
-  [RESTRICTIONS_KEYS.WHITE_LISTED_GROUP_BY_FIELDS]: Record<string, UIRestrictions>;
-  [RESTRICTIONS_KEYS.WHITE_LISTED_METRICS]: Record<string, UIRestrictions>;
-  [RESTRICTIONS_KEYS.WHITE_LISTED_TIMERANGE_MODES]: Record<string, UIRestrictions>;
-}
+export type TimeseriesUIRestrictions = {
+  [key in RESTRICTIONS_KEYS]: Record<string, UIRestrictions>;
+};
 
 /**
  * Default value for the UIRestriction

diff --git a/...is_type_timeseries/public/application/components/aggs/percentile_rank/multi_value_row.tsx b/...is_type_timeseries/public/application/components/aggs/percentile_rank/multi_value_row.tsx
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import React from 'react';
+import React, { ChangeEvent } from 'react';
 import { get } from 'lodash';
 import { FormattedMessage } from '@kbn/i18n/react';
 import {
@@ -52,7 +52,7 @@ export const MultiValueRow = ({
 }: MultiValueRowProps) => {
   const htmlId = htmlIdGenerator();
 
-  const onFieldNumberChange = (event: any) =>
+  const onFieldNumberChange = (event: ChangeEvent<HTMLInputElement>) =>
     onChange({
       ...model,
       value: get(event, 'target.value'),
@@ -72,7 +72,7 @@ export const MultiValueRow = ({
         <EuiFlexItem grow={false}>
           <EuiFieldNumber
             value={model.value === '' ? '' : Number(model.value)}
-            placeholder={'0'}
+            placeholder="0"
             onChange={onFieldNumberChange}
           />
         </EuiFlexItem>

diff --git a/...is_type_timeseries/public/application/components/aggs/percentile_rank/percentile_rank.tsx b/...is_type_timeseries/public/application/components/aggs/percentile_rank/percentile_rank.tsx
@@ -18,7 +18,6 @@
  */
 
 import React from 'react';
-import { assign } from 'lodash';
 import {
   htmlIdGenerator,
   EuiFlexGroup,
@@ -69,12 +68,11 @@ export const PercentileRankAgg = (props: PercentileRankAggProps) => {
   const handleChange = createChangeHandler(props.onChange, model);
   const handleSelectChange = createSelectHandler(handleChange);
 
-  const handlePercentileRankValuesChange = (values: Array<string | null> | null | undefined) => {
-    handleChange(
-      assign({}, model, {
-        values,
-      })
-    );
+  const handlePercentileRankValuesChange = (values: MetricsItemsSchema['values']) => {
+    handleChange({
+      ...model,
+      values,
+    });
   };
 
   return (

diff --git a/..._timeseries/public/application/components/aggs/percentile_rank/percentile_rank_values.tsx b/..._timeseries/public/application/components/aggs/percentile_rank/percentile_rank_values.tsx
@@ -23,7 +23,7 @@ import { EuiFlexGroup } from '@elastic/eui';
 import { MultiValueRow } from './multi_value_row';
 
 interface PercentileRankValuesProps {
-  model: any[];
+  model: Array<string | null>;
   disableDelete: boolean;
   disableAdd: boolean;
   showOnlyLastRow: boolean;
@@ -69,7 +69,7 @@ export const PercentileRankValues = (props: PercentileRankValuesProps) => {
         renderRow({
           rowModel: {
             id: model.length - 1,
-            value: last(model),
+            value: last(model) || '',
           },
           disableAddRow: true,
           disableDeleteRow: true,
@@ -80,7 +80,7 @@ export const PercentileRankValues = (props: PercentileRankValuesProps) => {
           renderRow({
             rowModel: {
               id,
-              value,
+              value: value || '',
             },
             disableAddRow: disableAdd,
             disableDeleteRow: disableDelete || array.length < 2,