From 43040892e83fecd09fb37e5094864e54e180b6ea Mon Sep 17 00:00:00 2001 From: Alexey Antonov Date: Mon, 13 Apr 2020 11:38:41 +0300 Subject: [PATCH] fix PR comments --- .../components/add_filter/add_filter.tsx | 5 ----- .../components/table/table.tsx | 21 ++++--------------- .../source_filters_table.tsx | 8 ------- 3 files changed, 4 insertions(+), 30 deletions(-) diff --git a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/source_filters_table/components/add_filter/add_filter.tsx b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/source_filters_table/components/add_filter/add_filter.tsx index 1d5468ff209bf77..d0f397637de3351 100644 --- a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/source_filters_table/components/add_filter/add_filter.tsx +++ b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/source_filters_table/components/add_filter/add_filter.tsx @@ -18,7 +18,6 @@ */ import React, { useState, useCallback } from 'react'; -import PropTypes from 'prop-types'; import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n/react'; @@ -62,7 +61,3 @@ export const AddFilter = ({ onAddFilter }: AddFilterProps) => { ); }; - -AddFilter.propTypes = { - onAddFilter: PropTypes.func.isRequired, -}; diff --git a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/source_filters_table/components/table/table.tsx b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/source_filters_table/components/table/table.tsx index 556825b262db534..d1e7a85a9bf29f9 100644 --- a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/source_filters_table/components/table/table.tsx +++ b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/source_filters_table/components/table/table.tsx @@ -18,7 +18,6 @@ */ import React, { Component } from 'react'; -import PropTypes from 'prop-types'; import { keyCodes, @@ -84,15 +83,6 @@ export interface TableState { } export class Table extends Component { - static propTypes = { - indexPattern: PropTypes.object.isRequired, - items: PropTypes.array.isRequired, - deleteFilter: PropTypes.func.isRequired, - fieldWildcardMatcher: PropTypes.func.isRequired, - saveFilter: PropTypes.func.isRequired, - isSaving: PropTypes.bool.isRequired, - }; - constructor(props: TableProps) { super(props); this.state = { @@ -155,16 +145,13 @@ export class Table extends Component { dataType: 'string', sortable: true, render: (value, filter) => { + const wildcardMatcher = fieldWildcardMatcher([ + this.state.editingFilterId === filter.clientId ? this.state.editingFilterValue : value, + ]); const matches = indexPattern .getNonScriptedFields() .map((currentFilter: any) => currentFilter.name) - .filter( - fieldWildcardMatcher([ - this.state.editingFilterId === filter.clientId - ? this.state.editingFilterValue - : value, - ]) - ) + .filter(wildcardMatcher) .sort(); if (matches.length) { diff --git a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/source_filters_table/source_filters_table.tsx b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/source_filters_table/source_filters_table.tsx index 20ec4050904ac9c..dcf8ae9e1323f3b 100644 --- a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/source_filters_table/source_filters_table.tsx +++ b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/source_filters_table/source_filters_table.tsx @@ -18,7 +18,6 @@ */ import React, { Component } from 'react'; -import PropTypes from 'prop-types'; import { createSelector } from 'reselect'; import { EuiSpacer } from '@elastic/eui'; @@ -44,13 +43,6 @@ export class SourceFiltersTable extends Component< SourceFiltersTableProps, SourceFiltersTableState > { - static propTypes = { - indexPattern: PropTypes.object.isRequired, - filterFilter: PropTypes.string, - fieldWildcardMatcher: PropTypes.func.isRequired, - onAddOrRemoveFilter: PropTypes.func, - }; - // Source filters do not have any unique ids, only the value is stored. // To ensure we can create a consistent and expected UX when managing // source filters, we are assigning a unique id to each filter on the