katello 4.8.0.rc2 → 4.8.1

data/webpack/components/extensions/HostDetails/Tabs/__tests__/moduleStreamsTab.test.js

@@ -93,6 +93,82 @@ test('Can handle no Module streams being present', async (done) => {
   act(done);
 });
 
+test('When there are no search results, can display an empty state with a clear search link that works', async (done) => {
+  // Setup autocomplete with mockForemanAutoComplete since we aren't adding /katello
+  const autocompleteScope = mockForemanAutocomplete(nockInstance, autocompleteUrl);
+  const noResults = {
+    total: 0,
+    subtotal: 0,
+    page: 1,
+    search: 'bad search',
+    per_page: 20,
+    results: [],
+  };
+
+  const initialScope = nockInstance
+    .get(hostModuleStreams)
+    .query(true)
+    .times(1)
+    .reply(200, mockModuleStreams);
+
+  const badSearchScope = nockInstance
+    .get(hostModuleStreams)
+    .query({
+      sort_by: 'name',
+      sort_order: 'asc',
+      per_page: '20',
+      page: '1',
+      search: 'bad search',
+    })
+    .reply(200, noResults);
+
+  const badAutoCompleteScope =
+    mockForemanAutocomplete(
+      nockInstance,
+      autocompleteUrl,
+      true,
+      [],
+      2, // times
+    );
+
+  const scopeWithoutSearch = nockInstance
+    .get(hostModuleStreams)
+    .query(true)
+    .reply(200, mockModuleStreams);
+
+  const { queryByText, getByRole } = renderWithRedux(<ModuleStreamsTab />, renderOptions());
+
+
+  await patientlyWaitFor(() => expect(queryByText(firstModuleStreams.name)).toBeInTheDocument());
+
+  const searchInput = getByRole('textbox', { name: 'Search input' });
+  // Foreman SearchAutocomplete doesn't run onSearchChange unless the element is focused!
+  searchInput.focus();
+
+  fireEvent.change(searchInput, { target: { value: 'bad search' } });
+  expect(searchInput.value).toBe('bad search');
+  const searchButton = getByRole('button', { name: 'Search' });
+  expect(searchButton).not.toHaveAttribute('aria-disabled', true);
+  fireEvent.click(searchButton);
+
+  await patientlyWaitFor(() => expect(queryByText('Your search returned no matching Module streams.')).toBeInTheDocument());
+  // Now click the clear search link and assert that the search is cleared and the results are back
+  const clearSearchLink = getByRole('button', { name: 'Clear search' });
+  fireEvent.click(clearSearchLink);
+
+  await patientlyWaitFor(() => {
+    expect(queryByText(firstModuleStreams.name)).toBeInTheDocument();
+    expect(getByRole('textbox', { name: 'Search input' }).value).toBe('');
+    expect(queryByText('Clear search')).not.toBeInTheDocument();
+  });
+
+  assertNockRequest(initialScope);
+  assertNockRequest(badAutoCompleteScope);
+  assertNockRequest(badSearchScope);
+  assertNockRequest(scopeWithoutSearch);
+  assertNockRequest(autocompleteScope, done);
+});
+
 test('Can filter results based on status', async (done) => {
   const autocompleteScope = mockForemanAutocomplete(nockInstance, autocompleteUrl);
   const scope = nockInstance

data/webpack/components/extensions/SearchBar/SearchBarConstants.js

@@ -0,0 +1,3 @@
+export const SET_CLEAR_SEARCH = 'SET_CLEAR_SEARCH';
+
+export default SET_CLEAR_SEARCH;

data/webpack/components/extensions/SearchBar/SearchBarHooks.js

@@ -0,0 +1,50 @@
+import { useEffect, useCallback, useRef } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import { selectSearchBarClearSearch } from './SearchBarSelectors';
+
+export const useClearSearch = ({
+  updateSearchQuery,
+}) => {
+  const dispatch = useDispatch();
+  // We keep the clearSearch function in Redux to avoid prop drilling and make EmptyStateMessage
+  // more reusable both with and without TableWrapper.
+  const existingClearSearch = useSelector(selectSearchBarClearSearch);
+  // In Katello we don't have access to Foreman <SearchBar /> component's internal state,
+  // so we don't have an easy way to clear the search input. We can use a counter to
+  // pass as a key prop to the <SearchBar /> component, which will force it to reset
+  // its internal state when clearSearch is called.
+  const counter = useRef(0);
+
+  const clearSearch = useCallback(() => {
+    counter.current += 1; // reset the text input
+    if (typeof updateSearchQuery !== 'function') {
+      // eslint-disable-next-line no-console
+      console.error('You must pass the updateSearchQuery function to useClearSearch');
+      return;
+    }
+    updateSearchQuery(''); // make a new API call with blank search query
+  }, [updateSearchQuery]);
+
+  useEffect(() => {
+    if (typeof existingClearSearch !== 'function') {
+      dispatch({
+        type: 'SET_CLEAR_SEARCH',
+        payload: clearSearch,
+      });
+    }
+  }, [dispatch, existingClearSearch, clearSearch]);
+
+  // eslint-disable-next-line arrow-body-style
+  useEffect(() => {
+    return function cleanupClearSearch() {
+      dispatch({
+        type: 'SET_CLEAR_SEARCH',
+        payload: {},
+      });
+    };
+  }, [dispatch]);
+
+  return `search-bar-${counter.current}`;
+};
+
+export default useClearSearch;

data/webpack/components/extensions/SearchBar/SearchBarReducer.js

@@ -0,0 +1,14 @@
+import Immutable from 'seamless-immutable';
+
+import { SET_CLEAR_SEARCH } from './SearchBarConstants';
+
+const initialState = Immutable({ clearSearch: undefined });
+
+export default (state = initialState, action) => {
+  switch (action.type) {
+  case SET_CLEAR_SEARCH:
+    return state.set('clearSearch', action.payload);
+  default:
+    return state;
+  }
+};

data/webpack/components/extensions/SearchBar/SearchBarSelectors.js

@@ -0,0 +1,5 @@
+export const selectSearchBarState = state =>
+  state.katello.searchBar;
+
+export const selectSearchBarClearSearch = state =>
+  selectSearchBarState(state)?.clearSearch;

data/webpack/redux/reducers/index.js

@@ -4,7 +4,6 @@ import redHatRepositories from './RedHatRepositories';
 import { subscriptions } from '../../scenes/Subscriptions';
 import { upstreamSubscriptions } from '../../scenes/Subscriptions/UpstreamSubscriptions';
 import { manifestHistory } from '../../scenes/Subscriptions/Manifest';
-import settings from '../../scenes/Settings';
 import { subscriptionDetails } from '../../scenes/Subscriptions/Details';
 import { setOrganization } from '../../components/SelectOrg/SetOrganization';
 import { moduleStreams } from '../../scenes/ModuleStreams';
@@ -13,6 +12,7 @@ import { moduleStreamDetails } from '../../scenes/ModuleStreams/Details';
 import { reducers as systemStatuses } from '../../components/extensions/about';
 import { contentViewDetails } from '../../scenes/ContentViews/Details';
 import hostDetails from '../../components/extensions/HostDetails/HostDetailsReducer';
+import searchBar from '../../components/extensions/SearchBar/SearchBarReducer';
 
 export default combineReducers({
   organization,
@@ -20,13 +20,13 @@ export default combineReducers({
   subscriptions,
   upstreamSubscriptions,
   manifestHistory,
-  settings,
   subscriptionDetails,
   setOrganization,
   moduleStreams,
   moduleStreamDetails,
   contentViewDetails,
   hostDetails,
+  searchBar,
   ...organizationProductsReducers,
   ...systemStatuses,
 });

data/webpack/scenes/AlternateContentSources/Create/__tests__/acsCreate.test.js

@@ -3,7 +3,7 @@ import * as reactRedux from 'react-redux';
 import { Route } from 'react-router-dom';
 import { act, fireEvent, patientlyWaitFor, renderWithRedux } from 'react-testing-lib-wrapper';
 import api, { foremanApi } from '../../../../services/api';
-import { assertNockRequest, mockAutocomplete, mockSetting, nockInstance } from '../../../../test-utils/nockWrapper';
+import { assertNockRequest, mockAutocomplete, nockInstance } from '../../../../test-utils/nockWrapper';
 import ACSTable from '../../MainTable/ACSTable';
 import contentCredentialResult from './contentCredentials.fixtures';
 import smartProxyResult from './smartProxy.fixtures';
@@ -70,18 +70,6 @@ const renderOptions = {
   },
 };
 
-let searchDelayScope;
-let autoSearchScope;
-beforeEach(() => {
-  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
-  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
-});
-
-afterEach(() => {
-  assertNockRequest(searchDelayScope);
-  assertNockRequest(autoSearchScope);
-});
-
 test('Can show add ACS button if can_create is true', async (done) => {
   const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
   const scope = nockInstance

data/webpack/scenes/AlternateContentSources/MainTable/ACSTable.js

@@ -107,6 +107,7 @@ const ACSTable = () => {
   const onBulkDelete = (ids) => {
     setDeleting(true);
     dispatch(bulkDeleteACS({ ids }, () => {
+      setDeleting(false);
       if (acsId && ids.has(Number(acsId))) {
         push('/alternate_content_sources');
       } else {

data/webpack/scenes/Content/{ContentPage.js → GenericContentPage.js}

@@ -12,7 +12,7 @@ import { getContentTypes } from './ContentActions';
 import Loading from '../../components/Loading';
 import EmptyStateMessage from '../../components/Table/EmptyStateMessage';
 
-const ContentPage = () => {
+const GenericContentPage = () => {
   const dispatch = useDispatch();
   const contentTypesResponse = useSelector(selectContentTypes);
   const contentTypesStatus = useSelector(selectContentTypesStatus);
@@ -86,4 +86,4 @@ const ContentPage = () => {
   );
 };
 
-export default ContentPage;
+export default GenericContentPage;

data/webpack/scenes/Content/__tests__/contentTable.test.js

@@ -2,7 +2,7 @@ import React from 'react';
 import { renderWithRedux, patientlyWaitFor } from 'react-testing-lib-wrapper';
 import { nockInstance, assertNockRequest, mockAutocomplete } from '../../../test-utils/nockWrapper';
 import api from '../../../services/api';
-import ContentPage from '../ContentPage';
+import GenericContentPage from '../GenericContentPage';
 import ansibleCollectionsResponse from './ansibleCollections.fixtures';
 import contentTypesResponse from './contentTypes.fixtures.json';
 import pythonPackagesResponse from './pythonPackages.fixtures.json';
@@ -29,7 +29,7 @@ test('Can call API for Python Packages and show table on page load', async (done
     .reply(200, contentTypesResponse);
 
   const { queryByText, getAllByText } =
-    renderWithRedux(<ContentPage />);
+    renderWithRedux(<GenericContentPage />);
 
   expect(queryByText(firstPackage.name)).toBeNull();
   await patientlyWaitFor(() => {

data/webpack/scenes/Content/index.js

@@ -1,4 +1,4 @@
 import { withRouter } from 'react-router-dom';
-import ContentPage from './ContentPage';
+import GenericContentPage from './GenericContentPage';
 
-export default withRouter(ContentPage);
+export default withRouter(GenericContentPage);

data/webpack/scenes/ContentViews/Details/Filters/Rules/ContainerTag/AddEditContainerTagRuleModal.js

@@ -5,7 +5,7 @@ import { translate as __ } from 'foremanReact/common/I18n';
 import { Modal, ModalVariant, Form, FormGroup, ActionGroup, Button } from '@patternfly/react-core';
 import { addCVFilterRule, editCVFilterRule, getCVFilterRules } from '../../../ContentViewDetailActions';
 import { orgId } from '../../../../../../services/api';
-import Search from '../../../../../../components/Search/Search';
+import SearchText from '../../../../../../components/Search/SearchText';
 
 const AddEditContainerTagRuleModal = ({
   onClose, filterId, selectedFilterRuleData, repositoryIds,
@@ -16,7 +16,7 @@ const AddEditContainerTagRuleModal = ({
   const [saving, setSaving] = useState(false);
   const isEditing = name && id;
 
-  const autoCompleteEndpoint = '/docker_tags/auto_complete_name';
+  const autoCompleteEndpoint = '/katello/api/v2/docker_tags/auto_complete_name';
 
   const onSubmit = () => {
     setSaving(true);
@@ -36,13 +36,10 @@ const AddEditContainerTagRuleModal = ({
     onClose();
   };
 
-  const getAutoCompleteParams = term => ({
-    endpoint: autoCompleteEndpoint,
-    params: {
-      organization_id: orgId(),
-      term,
-      repoids: repositoryIds,
-    },
+  const searchDataProp = term => ({
+    organization_id: orgId(),
+    term,
+    repoids: repositoryIds,
   });
 
   return (
@@ -59,14 +56,14 @@ const AddEditContainerTagRuleModal = ({
       }}
       >
         <FormGroup label={__('Tag name')} isRequired fieldId="tag_name">
-          <Search
-            patternfly4
-            initialInputValue={tagName}
-            onSearch={() => {}}
-            getAutoCompleteParams={getAutoCompleteParams}
-            foremanApiAutoComplete={false}
-            isTextInput
-            setTextInputValue={setTagName}
+          <SearchText
+            data={{
+              autocomplete: {
+                url: autoCompleteEndpoint,
+                apiParams: tag => searchDataProp(tag),
+              },
+            }}
+            onSearchChange={setTagName}
           />
         </FormGroup>
         <ActionGroup>

data/webpack/scenes/ContentViews/Details/Filters/Rules/Package/AddEditPackageRuleModal.js

@@ -13,7 +13,7 @@ import {
   selectCreateFilterRuleStatus,
 } from '../../../ContentViewDetailSelectors';
 import { orgId } from '../../../../../../services/api';
-import Search from '../../../../../../components/Search/Search';
+import SearchText from '../../../../../../components/Search/SearchText';
 
 const AddEditPackageRuleModal = ({
   filterId, onClose, selectedFilterRuleData, repositoryIds,
@@ -27,8 +27,8 @@ const AddEditPackageRuleModal = ({
     max_version: editingMaxVersion,
   } = selectedFilterRuleData || {};
 
-  const architectureAutoCompleteEndpoint = '/packages/auto_complete_arch';
-  const nameAutoCompleteEndpoint = '/packages/auto_complete_name';
+  const architectureAutoCompleteEndpoint = '/katello/api/v2/packages/auto_complete_arch';
+  const nameAutoCompleteEndpoint = '/katello/api/v2/packages/auto_complete_name';
 
   const isEditing = !!selectedFilterRuleData;
 
@@ -118,14 +118,11 @@ const AddEditPackageRuleModal = ({
     }
   }, [status, setSaving]);
 
-  const getAutoCompleteParams = (term, autoCompleteEndpoint) => ({
-    endpoint: autoCompleteEndpoint,
-    params: {
-      organization_id: orgId(),
-      term,
-      repoids: repositoryIds,
-      non_modular: true,
-    },
+  const searchDataProp = term => ({
+    organization_id: orgId(),
+    term,
+    repoids: repositoryIds,
+    non_modular: true,
   });
 
   return (
@@ -142,26 +139,25 @@ const AddEditPackageRuleModal = ({
       }}
       >
         <FormGroup label={__('RPM name')} isRequired fieldId="name">
-          <Search
-            patternfly4
-            initialInputValue={name}
-            onSearch={() => {}}
-            getAutoCompleteParams={term => getAutoCompleteParams(term, nameAutoCompleteEndpoint)}
-            foremanApiAutoComplete={false}
-            isTextInput
-            setTextInputValue={setName}
+          <SearchText
+            data={{
+              autocomplete: {
+                url: nameAutoCompleteEndpoint,
+                apiParams: input => searchDataProp(input),
+              },
+            }}
+            onSearchChange={setName}
           />
         </FormGroup>
         <FormGroup label={__('Architecture')} fieldId="architecture">
-          <Search
-            patternfly4
-            initialInputValue={architecture}
-            onSearch={() => {}}
-            getAutoCompleteParams={term =>
-              getAutoCompleteParams(term, architectureAutoCompleteEndpoint)}
-            foremanApiAutoComplete={false}
-            isTextInput
-            setTextInputValue={setArchitecture}
+          <SearchText
+            data={{
+              autocomplete: {
+                url: architectureAutoCompleteEndpoint,
+                apiParams: arch => searchDataProp(arch),
+              },
+            }}
+            onSearchChange={setArchitecture}
           />
         </FormGroup>
         <FormGroup label={__('Version')} fieldId="version_comparator">

data/webpack/scenes/ContentViews/Details/Filters/__tests__/CVContainerImageFilterContent.test.js

@@ -7,7 +7,6 @@ import {
   nockInstance,
   assertNockRequest,
   mockAutocomplete,
-  mockSetting,
 } from '../../../../../test-utils/nockWrapper';
 import api from '../../../../../services/api';
 import CVContainerImageFilterContent from '../CVContainerImageFilterContent';
@@ -140,8 +139,6 @@ test('Can add filter rules', async (done) => {
     2,
   );
   const autocompleteNameScope = mockAutocomplete(nockInstance, autocompleteNameUrl, true, [], 2);
-  const searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
-  const autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
 
   const cvFiltersScope = nockInstance
     .get(cvFilterRulesPath)
@@ -158,7 +155,7 @@ test('Can add filter rules', async (done) => {
     .query(true)
     .reply(200, { ...cvFilterFixtures, results: [...cvFilterFixtures.results, addedRule] });
 
-  const { queryByText, getByLabelText } =
+  const { queryByText, getByLabelText, getAllByLabelText } =
     renderWithRedux(
       withCVRoute(<CVContainerImageFilterContent filterId={195} details={details} />),
       renderOptions,
@@ -177,7 +174,9 @@ test('Can add filter rules', async (done) => {
     expect(getByLabelText('add_edit_filter_rule')).toHaveAttribute('aria-disabled', 'true');
   });
 
-  fireEvent.change(getByLabelText('text input for search'), { target: { value: 'new-rule' } });
+  const searchInput = getAllByLabelText('Search input')[1];
+  searchInput.focus();
+  fireEvent.change(searchInput, { target: { value: 'new-rule' } });
   fireEvent.submit(getByLabelText('add_edit_filter_rule'));
 
   await patientlyWaitFor(() => {
@@ -185,8 +184,6 @@ test('Can add filter rules', async (done) => {
   });
 
   assertNockRequest(autocompleteScope);
-  assertNockRequest(searchDelayScope);
-  assertNockRequest(autoSearchScope);
   assertNockRequest(cvFiltersScope);
   assertNockRequest(cvFilterAddScope);
   assertNockRequest(autocompleteNameScope);
@@ -205,8 +202,6 @@ test('Can edit filter rules', async (done) => {
     2,
   );
   const autocompleteNameScope = mockAutocomplete(nockInstance, autocompleteNameUrl, true, [], 2);
-  const searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
-  const autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
 
   const cvFiltersScope = nockInstance
     .get(cvFilterRulesPath)
@@ -231,7 +226,9 @@ test('Can edit filter rules', async (done) => {
       }),
     });
 
-  const { queryByText, getAllByLabelText, getByLabelText } =
+  const {
+    queryByText, getAllByLabelText, getByLabelText,
+  } =
     renderWithRedux(
       withCVRoute(<CVContainerImageFilterContent filterId={195} details={details} />),
       renderOptions,
@@ -258,7 +255,9 @@ test('Can edit filter rules', async (done) => {
     expect(getByLabelText('add_edit_filter_rule')).toHaveAttribute('aria-disabled', 'false');
   });
 
-  fireEvent.change(getByLabelText('text input for search'), { target: { value: 'changed-name' } });
+  const searchInput = getAllByLabelText('Search input')[1];
+  searchInput.focus();
+  fireEvent.change(searchInput, { target: { value: 'changed-name' } });
   fireEvent.submit(getByLabelText('add_edit_filter_rule'));
 
   await patientlyWaitFor(() => {
@@ -266,8 +265,6 @@ test('Can edit filter rules', async (done) => {
   });
 
   assertNockRequest(autocompleteScope);
-  assertNockRequest(searchDelayScope);
-  assertNockRequest(autoSearchScope);
   assertNockRequest(cvFiltersScope);
   assertNockRequest(cvFilterAddScope);
   assertNockRequest(autocompleteNameScope);
@@ -284,8 +281,6 @@ test('Shows call-to-action when there are no filter rules', async (done) => {
     2,
   );
   const autocompleteNameScope = mockAutocomplete(nockInstance, autocompleteNameUrl, true, [], 2);
-  const searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
-  const autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
   const cvFiltersScope = nockInstance
     .get(cvFilterRulesPath)
     .times(2)
@@ -302,13 +297,11 @@ test('Shows call-to-action when there are no filter rules', async (done) => {
   await patientlyWaitFor(() => expect(queryByLabelText('add_filter_rule_empty_state')).toBeInTheDocument());
   fireEvent.click(queryByLabelText('add_filter_rule_empty_state'));
   await patientlyWaitFor(() => {
-    expect(getAllByLabelText('text input for search')[0]).toBeInTheDocument();
+    expect(getAllByLabelText('Search input')[0]).toBeInTheDocument();
   });
 
   assertNockRequest(autocompleteScope);
   assertNockRequest(autocompleteNameScope);
-  assertNockRequest(searchDelayScope);
-  assertNockRequest(autoSearchScope);
   assertNockRequest(cvFiltersScope, done);
   act(done);
 });

data/webpack/scenes/ContentViews/Details/Filters/__tests__/CVRpmFilterContent.test.js

@@ -8,7 +8,6 @@ import {
   nockInstance,
   assertNockRequest,
   mockAutocomplete,
-  mockSetting,
 } from '../../../../../test-utils/nockWrapper';
 import api from '../../../../../services/api';
 import cvFilterDetails from './cvPackageFilterDetail.fixtures.json';
@@ -163,8 +162,6 @@ test('Can add package rules to filter in a self-closing modal', async (done) =>
     nockInstance, autocompleteArchUrl, true,
     undefined, 2,
   );
-  const searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0, 3);
-  const autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing', undefined, 3);
 
   const cvFiltersScope = nockInstance
     .get(cvFiltersPath)
@@ -214,20 +211,22 @@ test('Can add package rules to filter in a self-closing modal', async (done) =>
   });
   getByLabelText('add_rpm_rule').click();
   await patientlyWaitFor(() => {
-    expect(getAllByLabelText('text input for search')[0]).toBeInTheDocument();
-    expect(getAllByLabelText('text input for search')[1]).toBeInTheDocument();
+    expect(getAllByLabelText('Search input')[0]).toBeInTheDocument();
+    expect(getAllByLabelText('Search input')[1]).toBeInTheDocument();
     expect(getByLabelText('add_package_filter_rule')).toBeInTheDocument();
   });
-  fireEvent.change(getAllByLabelText('text input for search')[0], { target: { value: 'elephant' } });
-  fireEvent.change(getAllByLabelText('text input for search')[1], { target: { value: 'noarch' } });
+  const nameSearchInput = getAllByLabelText('Search input')[1];
+  const archSearchInput = getAllByLabelText('Search input')[2];
+  nameSearchInput.focus();
+  fireEvent.change(nameSearchInput, { target: { value: 'elephant' } });
+  archSearchInput.focus();
+  fireEvent.change(archSearchInput, { target: { value: 'noarch' } });
   fireEvent.submit(getByLabelText('add_package_filter_rule'));
 
   await patientlyWaitFor(() => {
     expect(queryByText('Add rule')).not.toBeInTheDocument();
   });
   assertNockRequest(autocompleteScope);
-  assertNockRequest(searchDelayScope);
-  assertNockRequest(autoSearchScope);
   assertNockRequest(autocompleteNameScope);
   assertNockRequest(autocompleteArchScope);
   assertNockRequest(cvFiltersScope);
@@ -241,8 +240,6 @@ test('Can add package rules to filter in a self-closing modal', async (done) =>
 test('Remove rpm filter rule in a self-closing modal', async (done) => {
   const { name: cvFilterName } = cvFilterDetails;
   const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
-  const searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
-  const autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
 
   const cvFiltersScope = nockInstance
     .get(cvFiltersPath)
@@ -289,8 +286,6 @@ test('Remove rpm filter rule in a self-closing modal', async (done) => {
   });
 
   assertNockRequest(autocompleteScope);
-  assertNockRequest(searchDelayScope);
-  assertNockRequest(autoSearchScope);
   assertNockRequest(cvFiltersScope);
   assertNockRequest(cvFilterDetailsScope);
   assertNockRequest(cvPackageFilterRulesScope);
@@ -310,8 +305,6 @@ test('Edit rpm filter rule in a self-closing modal', async (done) => {
     nockInstance, autocompleteArchUrl, true,
     undefined, 2,
   );
-  const searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0, 3);
-  const autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing', undefined, 3);
   const cvFiltersScope = nockInstance
     .get(cvFiltersPath)
     .times(2)
@@ -366,8 +359,6 @@ test('Edit rpm filter rule in a self-closing modal', async (done) => {
   });
 
   assertNockRequest(autocompleteScope);
-  assertNockRequest(searchDelayScope);
-  assertNockRequest(autoSearchScope);
   assertNockRequest(autocompleteNameScope);
   assertNockRequest(autocompleteArchScope);
   assertNockRequest(cvFiltersScope);
@@ -381,8 +372,6 @@ test('Shows call-to-action when there are no RPM filters', async (done) => {
   const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
   const autocompleteNameScope = mockAutocomplete(nockInstance, autocompleteNameUrl);
   const autocompleteArchScope = mockAutocomplete(nockInstance, autocompleteArchUrl);
-  const searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0, 3);
-  const autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing', undefined, 3);
   const cvFilterDetailScope = nockInstance
     .get(cvFilterDetailsPath)
     .query(true)
@@ -397,7 +386,7 @@ test('Shows call-to-action when there are no RPM filters', async (done) => {
     .query(true)
     .reply(200, emptyCVPackageFilterRules);
   const {
-    queryByLabelText, getAllByLabelText, queryByText,
+    queryByLabelText, queryByText, getAllByLabelText,
   } =
     renderWithRedux(withCVRoute(<ContentViewFilterDetails
       cvId={1}
@@ -408,7 +397,7 @@ test('Shows call-to-action when there are no RPM filters', async (done) => {
   fireEvent.click(queryByLabelText('add_rpm_rule_empty_state'));
 
   await patientlyWaitFor(() => {
-    expect(getAllByLabelText('text input for search')[0]).toBeInTheDocument();
+    expect(getAllByLabelText('Search input')[0]).toBeInTheDocument();
     expect(queryByText('Cancel')).toBeInTheDocument();
   });
   fireEvent.click(queryByText('Cancel'));
@@ -418,8 +407,6 @@ test('Shows call-to-action when there are no RPM filters', async (done) => {
   assertNockRequest(autocompleteNameScope);
   assertNockRequest(autocompleteArchScope);
   assertNockRequest(autocompleteScope);
-  assertNockRequest(searchDelayScope);
-  assertNockRequest(autoSearchScope);
   assertNockRequest(cvFiltersScope);
   assertNockRequest(cvFilterDetailScope);
   assertNockRequest(cvPackageFilterRulesScope);

data/webpack/scenes/ContentViews/Details/Filters/__tests__/ContentViewPackageGroupFilter.test.js

@@ -46,8 +46,6 @@ const renderOptions = {
 
 const withCVRoute = component => <Route path="/content_views/:id([0-9]+)#/filters/:filterId([0-9]+)">{component}</Route>;
 
-jest.mock('../../../../../components/Search', () => () => 'mocked!');
-
 test('Can enable and disable add filter button', async (done) => {
   const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl, autocompleteQuery);
   const { name: cvFilterName } = cvFilterDetails;