address review feedback

x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecation_tab_content.tsx

@@ -45,8 +45,8 @@ export const filterDeps = (level: LevelFilterOption, search: string = '') => {
     // Change everything to lower case for a case-insensitive comparison
     conditions.push((dep) => {
       try {
-        const searchReg = new RegExp(search.toLowerCase());
-        return Boolean(dep.message.toLowerCase().match(searchReg));
+        const searchReg = new RegExp(search, 'i');
+        return searchReg.test(dep.message);
       } catch (e) {
         // ignore any regexp errors.
         return true;
@@ -59,10 +59,9 @@ export const filterDeps = (level: LevelFilterOption, search: string = '') => {
 };
 
 /**
- * Collection of calculated fields based on props, extracted for reuse in
- * `render` and `getDerivedStateFromProps`.
+ * Collection of calculated fields based on props
  */
-const CalcFields = {
+const calcFields = {
   filteredDeprecations(props: {
     deprecations: EnrichedDeprecationInfo[];
     currentFilter: LevelFilterOption;
@@ -78,7 +77,7 @@ const CalcFields = {
     search: string;
     currentGroupBy: GroupByOption;
   }) {
-    return groupBy(CalcFields.filteredDeprecations(props), props.currentGroupBy);
+    return groupBy(calcFields.filteredDeprecations(props), props.currentGroupBy);
   },
 
   numPages(props: {
@@ -87,7 +86,7 @@ const CalcFields = {
     search: string;
     currentGroupBy: GroupByOption;
   }) {
-    return Math.ceil(Object.keys(CalcFields.groups(props)).length / DEPRECATIONS_PER_PAGE);
+    return Math.ceil(Object.keys(calcFields.groups(props)).length / DEPRECATIONS_PER_PAGE);
   },
 };
 
@@ -126,7 +125,7 @@ export const DeprecationTabContent: FunctionComponent<CheckupTabProps> = ({
 
   useEffect(() => {
     if (deprecations) {
-      const pageCount = CalcFields.numPages({
+      const pageCount = calcFields.numPages({
         deprecations,
         currentFilter,
         search,
@@ -159,15 +158,15 @@ export const DeprecationTabContent: FunctionComponent<CheckupTabProps> = ({
     const deprecationLevelsCount = Object.keys(levelGroups).reduce((counts, level) => {
       counts[level] = levelGroups[level].length;
       return counts;
-    }, {} as { [level: string]: number });
+    }, {} as Record<string, number>);
 
-    const filteredDeprecations = CalcFields.filteredDeprecations({
+    const filteredDeprecations = calcFields.filteredDeprecations({
       deprecations,
       currentFilter,
       search,
     });
 
-    const groups = CalcFields.groups({
+    const groups = calcFields.groups({
       deprecations,
       currentFilter,
       search,
@@ -229,7 +228,7 @@ export const DeprecationTabContent: FunctionComponent<CheckupTabProps> = ({
               <EuiSpacer />
 
               <DeprecationPagination
-                pageCount={CalcFields.numPages({
+                pageCount={calcFields.numPages({
                   deprecations,
                   currentFilter,
                   search,

x-pack/plugins/upgrade_assistant/public/application/components/kibana_deprecations/deprecation_item.tsx

@@ -16,7 +16,7 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import { DomainDeprecationDetails } from 'kibana/public';
+import type { DomainDeprecationDetails } from 'kibana/public';
 import { DeprecationHealth } from '../shared';
 import { LEVEL_MAP } from '../constants';
 import { StepsModalContent } from './steps_modal';

x-pack/plugins/upgrade_assistant/public/application/components/kibana_deprecations/deprecation_list.tsx

@@ -9,7 +9,7 @@ import React, { FunctionComponent, useState, useEffect } from 'react';
 import { groupBy } from 'lodash';
 import { EuiHorizontalRule, EuiSpacer } from '@elastic/eui';
 
-import { DomainDeprecationDetails } from 'kibana/public';
+import type { DomainDeprecationDetails } from 'kibana/public';
 
 import { LevelFilterOption } from '../types';
 import { SearchBar, DeprecationListBar, DeprecationPagination } from '../shared';
@@ -33,13 +33,13 @@ const getFilteredDeprecations = (
 ) => {
   return deprecations
     .filter((deprecation) => {
-      return level === 'all' ? true : deprecation.level === level;
+      return level === 'all' || deprecation.level === level;
     })
     .filter((filteredDep) => {
       if (search.length > 0) {
         try {
-          const searchReg = new RegExp(search.toLowerCase());
-          return Boolean(filteredDep.message.toLowerCase().match(searchReg));
+          const searchReg = new RegExp(search, 'i');
+          return searchReg.test(filteredDep.message);
         } catch (e) {
           // ignore any regexp errors
           return true;

x-pack/plugins/upgrade_assistant/public/application/components/kibana_deprecations/kibana_deprecations.tsx

@@ -18,7 +18,7 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import { DomainDeprecationDetails } from 'kibana/public';
+import type { DomainDeprecationDetails } from 'kibana/public';
 import { SectionLoading } from '../../../shared_imports';
 import { useAppContext } from '../../app_context';
 import { NoDeprecationsPrompt } from '../shared';

x-pack/plugins/upgrade_assistant/public/application/components/kibana_deprecations/resolve_deprecation_modal.tsx

@@ -9,7 +9,7 @@ import React, { FunctionComponent } from 'react';
 import { i18n } from '@kbn/i18n';
 
 import { EuiConfirmModal } from '@elastic/eui';
-import { DomainDeprecationDetails } from 'kibana/public';
+import type { DomainDeprecationDetails } from 'kibana/public';
 
 interface Props {
   closeModal: () => void;

x-pack/plugins/upgrade_assistant/public/application/components/overview/kibana_stats.tsx

@@ -21,7 +21,7 @@ import {
 import { i18n } from '@kbn/i18n';
 
 import { RouteComponentProps } from 'react-router-dom';
-import { DomainDeprecationDetails } from 'kibana/public';
+import type { DomainDeprecationDetails } from 'kibana/public';
 import { reactRouterNavigate } from '../../../../../../../src/plugins/kibana_react/public';
 import { useAppContext } from '../../app_context';
 

x-pack/plugins/upgrade_assistant/public/application/components/shared/search_bar/search_bar.tsx

@@ -16,7 +16,7 @@ import {
   EuiSpacer,
 } from '@elastic/eui';
 
-import { DomainDeprecationDetails } from 'kibana/public';
+import type { DomainDeprecationDetails } from 'kibana/public';
 import { DeprecationInfo } from '../../../../../common/types';
 import { validateRegExpString } from '../../../lib/utils';
 import { GroupByOption, LevelFilterOption } from '../../types';

x-pack/plugins/upgrade_assistant/tests_client_integration/kibana.test.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { DomainDeprecationDetails } from 'kibana/public';
+import type { DomainDeprecationDetails } from 'kibana/public';
 import { act } from 'react-dom/test-utils';
 import { deprecationsServiceMock } from 'src/core/public/mocks';
 

x-pack/plugins/upgrade_assistant/tests_client_integration/overview.test.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { DomainDeprecationDetails } from 'kibana/public';
+import type { DomainDeprecationDetails } from 'kibana/public';
 import { act } from 'react-dom/test-utils';
 import { deprecationsServiceMock } from 'src/core/public/mocks';
 import { UpgradeAssistantStatus } from '../common/types';