Fix jest test and remove getting filter param from parent

elastic · Jun 2, 2020 · 0f5f80a · 0f5f80a
1 parent c40ade5
commit 0f5f80a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 15 deletions.
diff --git a/x-pack/plugins/index_management/__jest__/client_integration/helpers/home.helpers.ts b/x-pack/plugins/index_management/__jest__/client_integration/helpers/home.helpers.ts
@@ -22,7 +22,7 @@ import { WithAppDependencies, services } from './setup_environment';
 const testBedConfig: TestBedConfig = {
   store: () => indexManagementStore(services as any),
   memoryRouter: {
-    initialEntries: [`${BASE_PATH}indices?includeHidden=true`],
+    initialEntries: [`${BASE_PATH}indices?includeHiddenIndices=true`],
     componentRoutePath: `${BASE_PATH}:section(indices|templates)`,
   },
   doMountAsync: true,

diff --git a/x-pack/plugins/index_management/public/application/sections/home/index_list/index_list.js b/x-pack/plugins/index_management/public/application/sections/home/index_list/index_list.js
@@ -8,14 +8,10 @@ import React from 'react';
 import { DetailPanel } from './detail_panel';
 import { IndexTable } from './index_table';
 
-export function IndexList({
-  match: {
-    params: { filter },
-  },
-}) {
+export function IndexList() {
   return (
     <div className="im-snapshotTestSubject" data-test-subj="indicesList">
-      <IndexTable filterFromURI={filter} />
+      <IndexTable />
       <DetailPanel />
     </div>
   );

diff --git a/...s/index_management/public/application/sections/home/index_list/index_table/index_table.js b/...s/index_management/public/application/sections/home/index_list/index_table/index_table.js
@@ -95,7 +95,6 @@ export class IndexTable extends Component {
 
     this.state = {
       includeHiddenIndices: false,
-      dataStreamFilter: undefined,
       selectedIndicesMap: {},
     };
   }
@@ -106,10 +105,10 @@ export class IndexTable extends Component {
       () => this.props.reloadIndices(this.props.indices.map((i) => i.name)),
       REFRESH_RATE_INDEX_LIST
     );
-    const { filterChanged, filterFromURI } = this.props;
-
-    if (filterFromURI) {
-      const decodedFilter = decodeURIComponent(filterFromURI);
+    const { location, filterChanged } = this.props;
+    const { filter } = qs.parse((location && location.search) || '');
+    if (filter) {
+      const decodedFilter = decodeURIComponent(filter);
 
       try {
         const filter = EuiSearchBar.Query.parse(decodedFilter);
@@ -118,19 +117,21 @@ export class IndexTable extends Component {
         this.setState({ filterError: e });
       }
     }
-    this.syncUrlParams();
+
+    this.syncFromUrlParams();
   }
   componentWillUnmount() {
     clearInterval(this.interval);
   }
 
   componentDidUpdate() {
-    this.syncUrlParams();
+    this.syncFromUrlParams();
   }
 
-  syncUrlParams() {
+  syncFromUrlParams() {
     const { location } = this.props;
     const { includeHiddenIndices } = qs.parse((location && location.search) || '');
+
     const nextValue = includeHiddenIndices === 'true';
     if (this.state.includeHiddenIndices !== nextValue) {
       this.setState({ includeHiddenIndices: nextValue });