katello 4.7.3 → 4.8.0.rc1

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

@@ -152,7 +152,8 @@ const CVContainerImageFilterContent = ({
             onSelect={hasPermission(permissions, 'edit_content_views') ? onSelect(rows, setRows) : null}
             cells={columnHeaders}
             variant={TableVariant.compact}
-            autocompleteEndpoint={`/content_view_filters/${filterId}/rules/auto_complete_search`}
+            autocompleteEndpoint={`/katello/api/v2/content_view_filters/${filterId}/rules`}
+            bookmarkController="katello_content_view_docker_filter_rules"
             fetchItems={useCallback(params => getCVFilterRules(filterId, params), [filterId])}
             actionButtons={hasPermission(permissions, 'edit_content_views') &&
               <>

data/webpack/scenes/ContentViews/Details/Filters/CVDebFilterContent.js

@@ -170,7 +170,8 @@ const CVDebFilterContent = ({
             onSelect={hasPermission(permissions, 'edit_content_views') ? onSelect(rows, setRows) : null}
             cells={columnHeaders}
             variant={TableVariant.compact}
-            autocompleteEndpoint={`/content_view_filters/${filterId}/rules/auto_complete_search`}
+            autocompleteEndpoint={`/katello/api/v2/content_view_filters/${filterId}/rules`}
+            bookmarkController="katello_content_view_deb_filter_rules"
             fetchItems={useCallback(params => getCVFilterRules(filterId, params), [filterId])}
             actionButtons={
               <>

data/webpack/scenes/ContentViews/Details/Filters/CVErrataIDFilterContent.js

@@ -276,7 +276,9 @@ const CVErrataIDFilterContent = ({
             onSelect={hasPermission(permissions, 'edit_content_views') ? onSelect(rows, setRows) : null}
             cells={columnHeaders}
             variant={TableVariant.compact}
-            autocompleteEndpoint={`/errata/auto_complete_search?filterid=${filterId}`}
+            autocompleteEndpoint="/katello/api/v2/errata"
+            autocompleteQueryParams={{ filterid: filterId }}
+            bookmarkController="katello_content_view_erratum_filter_rules"
             additionalListeners={[statusSelected, selectedTypes.length,
               dateType, apiStartDate, apiEndDate]}
             fetchItems={useCallback(params =>

data/webpack/scenes/ContentViews/Details/Filters/CVModuleStreamFilterContent.js

@@ -229,7 +229,9 @@ const CVModuleStreamFilterContent = ({
             defaultFilters={[allAddedNotAdded[0]]}
             cells={columnHeaders}
             variant={TableVariant.compact}
-            autocompleteEndpoint={`/module_streams/auto_complete_search?filterid=${filterId}`}
+            autocompleteEndpoint="/katello/api/v2/module_streams"
+            autocompleteQueryParams={{ filterid: filterId }}
+            bookmarkController="katello_content_view_module_stream_filter_rules"
             fetchItems={fetchItems}
             actionResolver={hasPermission(permissions, 'edit_content_views') ? actionResolver : null}
             onSelect={hasPermission(permissions, 'edit_content_views') ? onSelect(rows, setRows) : null}

data/webpack/scenes/ContentViews/Details/Filters/CVPackageGroupFilterContent.js

@@ -219,7 +219,9 @@ const CVPackageGroupFilterContent = ({
             defaultFilters={[allAddedNotAdded[0]]}
             cells={columnHeaders}
             variant={TableVariant.compact}
-            autocompleteEndpoint={`/package_groups/auto_complete_search?filterid=${filterId}`}
+            autocompleteEndpoint="/katello/api/v2/package_groups"
+            autocompleteQueryParams={{ filterid: filterId }}
+            bookmarkController="katello_content_view_package_group_filter_rules"
             fetchItems={fetchItems}
             actionResolver={hasPermission(permissions, 'edit_content_views') ? actionResolver : null}
             onSelect={hasPermission(permissions, 'edit_content_views') ? onSelect(rows, setRows) : null}

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

@@ -183,7 +183,8 @@ const CVRpmFilterContent = ({
             onSelect={hasPermission(permissions, 'edit_content_views') ? onSelect(rows, setRows) : null}
             cells={columnHeaders}
             variant={TableVariant.compact}
-            autocompleteEndpoint={`/content_view_filters/${filterId}/rules/auto_complete_search`}
+            autocompleteEndpoint={`/katello/api/v2/content_view_filters/${filterId}/rules`}
+            bookmarkController="katello_content_view_package_filter_rules"
             fetchItems={useCallback(params => getCVFilterRules(filterId, params), [filterId])}
             actionButtons={
               <>

data/webpack/scenes/ContentViews/Details/Filters/ContentViewFilterDetailsHeader.js

@@ -67,6 +67,7 @@ const ContentViewFilterDetailsHeader = ({
   const dropDownItems = [
     <DropdownItem
       key="delete"
+      ouiaId="cv-filter-delete"
       onClick={() => {
         dispatch(deleteContentViewFilter(filterId, () => {
           push(`/content_views/${cvId}#/filters/`);
@@ -129,6 +130,7 @@ const ContentViewFilterDetailsHeader = ({
           </FlexItem>
           <FlexItem>
             <Dropdown
+              ouiaId="cv-filter-actions-kebab"
               position={DropdownPosition.right}
               style={{ marginLeft: 'auto' }}
               toggle={<KebabToggle onToggle={setDropdownOpen} id="toggle-dropdown" />}

data/webpack/scenes/ContentViews/Details/Filters/ContentViewFilters.js

@@ -142,7 +142,8 @@ const ContentViewFilters = ({ cvId, details }) => {
       onSelect={hasPermission(permissions, 'edit_content_views') ? onSelect(rows, setRows) : null}
       cells={columnHeaders}
       variant={TableVariant.compact}
-      autocompleteEndpoint="/content_view_filters/auto_complete_search"
+      autocompleteEndpoint="/katello/api/v2/content_view_filters"
+      bookmarkController="katello_content_view_filters"
       fetchItems={useCallback(params => getContentViewFilters(cvId, params), [cvId])}
       actionButtons={hasPermission(permissions, 'edit_content_views') &&
         <>

data/webpack/scenes/ContentViews/Details/Filters/MatchContentModal/CVDebMatchContentModal.js

@@ -54,7 +54,7 @@ const CVDebMatchContentModal = ({ filterId, onClose, filterRuleId }) => {
           status,
         }}
         ouiaId="content-view-deb-match-content-table"
-        autocompleteEndpoint="/debs/auto_complete_search"
+        autocompleteEndpoint="/katello/api/v2/debs"
         variant={TableVariant.compact}
       >
         <Thead>

data/webpack/scenes/ContentViews/Details/Filters/MatchContentModal/CVRpmMatchContentModal.js

@@ -55,7 +55,7 @@ const CVRpmMatchContentModal = ({ filterId, onClose, filterRuleId }) => {
           status,
         }}
         ouiaId="content-view-rpm-match-content-table"
-        autocompleteEndpoint="/packages/auto_complete_search"
+        autocompleteEndpoint="/katello/api/v2/packages"
         variant={TableVariant.compact}
       >
         <Thead>

data/webpack/scenes/ContentViews/Details/Filters/MatchContentModal/__tests__/CVRpmMatchContentModal.test.js

@@ -1,39 +1,28 @@
 import React from 'react';
 import { renderWithRedux, patientlyWaitFor, fireEvent } from 'react-testing-lib-wrapper';
 
-
 import api from '../../../../../../services/api';
 import CVRpmMatchContentModal from '../CVRpmMatchContentModal';
-import { nockInstance, assertNockRequest, mockSetting, mockAutocomplete } from '../../../../../../test-utils/nockWrapper';
+import { nockInstance, assertNockRequest, mockAutocomplete } from '../../../../../../test-utils/nockWrapper';
 
 import CVMatchedContent from './CVRpmMatchContent.fixtures.json';
-import CVMatchContentSearch from './CVRpmMatchContentSearch.fixtures.json';
 
 const firstMatchContent = CVMatchedContent.results[0];
 const { nvra: secondMatchContentName } = CVMatchedContent.results[1];
 const cvMatchContentPath = api.getApiUrl('/packages');
 const autocompleteUrl = '/packages/auto_complete_search';
+const autocompleteQuery = {
+  organization_id: 1,
+  search: '',
+};
 
 const onClose = jest.fn();
 
 const MatchContentModal =
   <CVRpmMatchContentModal filterId={194} filterRuleId={13} onClose={onClose} />;
 
-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 matching content modal', async (done) => {
-  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl, autocompleteQuery);
   const cvMatchContentscope = nockInstance
     .get(cvMatchContentPath)
     .query(true)
@@ -50,22 +39,36 @@ test('Can show matching content modal', async (done) => {
 });
 
 test('Can search with filter', async (done) => {
-  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+  const matchQuery = {
+    organization_id: 1,
+    search: `nvra = ${firstMatchContent.nvra}`,
+  };
+  const searchResults = [
+    {
+      completed: `nvra = ${firstMatchContent.nvra}`,
+      part: 'and',
+      label: `nvra = ${firstMatchContent.nvra} and`,
+      category: 'Operators',
+    },
+    {
+      completed: `nvra = ${firstMatchContent.nvra}`,
+      part: 'or',
+      label: `nvra = ${firstMatchContent.nvra} or`,
+      category: 'Operators',
+    },
+  ];
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl, autocompleteQuery);
+  const secondGetMatchContentscope = mockAutocomplete(
+    nockInstance,
+    autocompleteUrl,
+    matchQuery,
+    searchResults,
+  );
   const getMatchContentscope = nockInstance
     .get(cvMatchContentPath)
     .query(true)
     .reply(200, CVMatchedContent);
 
-  const autocompleteSearchScope = nockInstance
-    .get(api.getApiUrl(autocompleteUrl))
-    .query(true)
-    .reply(200, []);
-
-  const secondGetMatchContentscope = nockInstance
-    .get(cvMatchContentPath)
-    .query(true)
-    .reply(200, CVMatchContentSearch);
-
   const { queryByText, getByLabelText } = renderWithRedux(MatchContentModal);
 
   await patientlyWaitFor(() => {
@@ -73,17 +76,16 @@ test('Can search with filter', async (done) => {
     expect(queryByText(secondMatchContentName)).toBeInTheDocument();
   });
 
-  fireEvent.change(getByLabelText(/text input for search/i), { target: { value: `nvra = ${firstMatchContent.nvra}` } });
+  getByLabelText('Search input').focus();
+  fireEvent.change(getByLabelText('Search input'), { target: { value: `nvra = ${firstMatchContent.nvra}` } });
 
   await patientlyWaitFor(() => {
-    expect(queryByText('Matching content')).toBeInTheDocument();
+    expect(queryByText(`nvra = ${firstMatchContent.nvra} and`)).toBeInTheDocument();
     expect(queryByText(firstMatchContent.nvra)).toBeInTheDocument();
-    expect(queryByText(secondMatchContentName)).not.toBeInTheDocument();
+    expect(queryByText(`nvra = ${secondMatchContentName} and`)).not.toBeInTheDocument();
   });
 
-
   assertNockRequest(autocompleteScope);
   assertNockRequest(getMatchContentscope);
-  assertNockRequest(autocompleteSearchScope);
   assertNockRequest(secondGetMatchContentscope, done);
 });

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

@@ -32,6 +32,10 @@ const addedRule = {
 };
 
 const autocompleteUrl = '/content_view_filters/195/rules/auto_complete_search';
+const autocompleteQuery = {
+  organization_id: 1,
+  search: '',
+};
 const renderOptions = {
   apiNamespace: cvFilterDetailsKey(13, 195),
   routerParams: {
@@ -42,20 +46,8 @@ const renderOptions = {
 
 const withCVRoute = component => <Route path="/content_views/:id([0-9]+)#/filters/:filterId([0-9]+)">{component}</Route>;
 
-let searchDelayScope;
-let autoSearchScope;
-beforeEach(() => {
-  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
-  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
-});
-
-afterEach(() => {
-  assertNockRequest(searchDelayScope);
-  assertNockRequest(autoSearchScope);
-});
-
 test('Can view container image filter rules', async (done) => {
-  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl, autocompleteQuery);
   const cvFiltersScope = nockInstance
     .get(cvFilterRulesPath)
     .query(true)
@@ -89,7 +81,7 @@ test('Can view container image filter rules', async (done) => {
 
 // Remove
 test('Can remove filter rules', async (done) => {
-  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl, autocompleteQuery);
 
   const cvFiltersScope = nockInstance
     .get(cvFilterRulesPath)
@@ -140,10 +132,16 @@ test('Can remove filter rules', async (done) => {
 
 // Add
 test('Can add filter rules', async (done) => {
-  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl, true, [], 2);
+  const autocompleteScope = mockAutocomplete(
+    nockInstance,
+    autocompleteUrl,
+    autocompleteQuery,
+    [],
+    2,
+  );
   const autocompleteNameScope = mockAutocomplete(nockInstance, autocompleteNameUrl, true, [], 2);
-  const inputSearchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0, 2);
-  const inputAutoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing', undefined, 2);
+  const searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
+  const autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
 
   const cvFiltersScope = nockInstance
     .get(cvFilterRulesPath)
@@ -160,7 +158,7 @@ test('Can add filter rules', async (done) => {
     .query(true)
     .reply(200, { ...cvFilterFixtures, results: [...cvFilterFixtures.results, addedRule] });
 
-  const { queryByText, getByLabelText, getAllByLabelText } =
+  const { queryByText, getByLabelText } =
     renderWithRedux(
       withCVRoute(<CVContainerImageFilterContent filterId={195} details={details} />),
       renderOptions,
@@ -174,29 +172,23 @@ test('Can add filter rules', async (done) => {
     fireEvent.click(getByLabelText('add_filter_rule'));
   });
 
-
-  await patientlyWaitFor(() => {
-    expect(getAllByLabelText('text input for search')[0]).toBeInTheDocument();
-  });
-
-  fireEvent.change(getAllByLabelText('text input for search')[0], { target: { value: `name = ${addedRule.name}` } });
-
   await patientlyWaitFor(() => {
     expect(getByLabelText('add_edit_filter_rule')).toBeInTheDocument();
     expect(getByLabelText('add_edit_filter_rule')).toHaveAttribute('aria-disabled', 'true');
   });
 
-  fireEvent.submit(getAllByLabelText('text input for search')[1]);
+  fireEvent.change(getByLabelText('text input for search'), { target: { value: 'new-rule' } });
+  fireEvent.submit(getByLabelText('add_edit_filter_rule'));
 
   await patientlyWaitFor(() => {
-    expect(queryByText(addedRule.name)).toBeInTheDocument();
+    expect(queryByText('Add rule')).not.toBeInTheDocument();
   });
 
   assertNockRequest(autocompleteScope);
+  assertNockRequest(searchDelayScope);
+  assertNockRequest(autoSearchScope);
   assertNockRequest(cvFiltersScope);
   assertNockRequest(cvFilterAddScope);
-  assertNockRequest(inputSearchDelayScope);
-  assertNockRequest(inputAutoSearchScope);
   assertNockRequest(autocompleteNameScope);
   assertNockRequest(cvFiltersCallbackScope, done);
   act(done);
@@ -205,10 +197,16 @@ test('Can add filter rules', async (done) => {
 
 // Edit
 test('Can edit filter rules', async (done) => {
-  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl, true, [], 2);
+  const autocompleteScope = mockAutocomplete(
+    nockInstance,
+    autocompleteUrl,
+    autocompleteQuery,
+    [],
+    2,
+  );
   const autocompleteNameScope = mockAutocomplete(nockInstance, autocompleteNameUrl, true, [], 2);
-  const inputSearchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0, 2);
-  const inputAutoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing', undefined, 2);
+  const searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
+  const autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
 
   const cvFiltersScope = nockInstance
     .get(cvFilterRulesPath)
@@ -255,37 +253,42 @@ test('Can edit filter rules', async (done) => {
     fireEvent.click(queryByText('Edit'));
   });
 
-  fireEvent.change(getAllByLabelText('text input for search')[0], { target: { value: `name = ${addedRule.name}` } });
-
   await patientlyWaitFor(() => {
     expect(getByLabelText('add_edit_filter_rule')).toBeInTheDocument();
     expect(getByLabelText('add_edit_filter_rule')).toHaveAttribute('aria-disabled', 'false');
   });
 
-  fireEvent.submit(getAllByLabelText('text input for search')[1]);
+  fireEvent.change(getByLabelText('text input for search'), { target: { value: 'changed-name' } });
+  fireEvent.submit(getByLabelText('add_edit_filter_rule'));
 
   await patientlyWaitFor(() => {
-    expect(queryByText(firstResultName)).not.toBeInTheDocument();
-    expect(queryByText(addedRule.name)).toBeInTheDocument();
+    expect(queryByText('Edit rule')).not.toBeInTheDocument();
   });
 
   assertNockRequest(autocompleteScope);
+  assertNockRequest(searchDelayScope);
+  assertNockRequest(autoSearchScope);
   assertNockRequest(cvFiltersScope);
   assertNockRequest(cvFilterAddScope);
-  assertNockRequest(inputSearchDelayScope);
-  assertNockRequest(inputAutoSearchScope);
   assertNockRequest(autocompleteNameScope);
   assertNockRequest(cvFiltersCallbackScope, done);
   act(done);
 });
 
 test('Shows call-to-action when there are no filter rules', async (done) => {
-  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl, true, [], 2);
+  const autocompleteScope = mockAutocomplete(
+    nockInstance,
+    autocompleteUrl,
+    autocompleteQuery,
+    [],
+    2,
+  );
   const autocompleteNameScope = mockAutocomplete(nockInstance, autocompleteNameUrl, true, [], 2);
-  const inputSearchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0, 2);
-  const inputAutoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing', undefined, 2);
+  const searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
+  const autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
   const cvFiltersScope = nockInstance
     .get(cvFilterRulesPath)
+    .times(2)
     .query(true)
     .reply(200, emptyCVContainerImageData);
 
@@ -303,15 +306,15 @@ test('Shows call-to-action when there are no filter rules', async (done) => {
   });
 
   assertNockRequest(autocompleteScope);
-  assertNockRequest(inputSearchDelayScope);
-  assertNockRequest(inputAutoSearchScope);
   assertNockRequest(autocompleteNameScope);
+  assertNockRequest(searchDelayScope);
+  assertNockRequest(autoSearchScope);
   assertNockRequest(cvFiltersScope, done);
   act(done);
 });
 
 test('Hides bulk_remove dropdownItem when there are no filter rules', async (done) => {
-  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl, autocompleteQuery);
   const cvFiltersScope = nockInstance
     .get(cvFilterRulesPath)
     .query(true)

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

@@ -33,13 +33,15 @@ const renderOptions = {
     initialIndex: 1,
   },
 };
+const autocompleteQuery = {
+  organization_id: 1,
+  search: '',
+};
 
 const withCVRoute = component => <Route path="/content_views/:id([0-9]+)#/filters/:filterId([0-9]+)">{component}</Route>;
 
 test('Can show filter details and package groups on page load', async (done) => {
   const { name: cvFilterName } = cvFilterDetails;
-  const searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
-  const autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
   const cvFilterScope = nockInstance
     .get(cvFilterDetailsPath)
     .query(true)
@@ -52,7 +54,7 @@ test('Can show filter details and package groups on page load', async (done) =>
     .get(cvPackageFilterRulesPath)
     .query(true)
     .reply(200, cvPackageFilterRules);
-  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl, autocompleteQuery);
 
   const { getByText, queryByText } =
     renderWithRedux(withCVRoute(<ContentViewFilterDetails
@@ -67,8 +69,6 @@ test('Can show filter details and package groups on page load', async (done) =>
   });
 
   assertNockRequest(autocompleteScope);
-  assertNockRequest(searchDelayScope);
-  assertNockRequest(autoSearchScope);
   assertNockRequest(cvFilterScope);
   assertNockRequest(cvFiltersScope);
   assertNockRequest(cvPackageFilterRulesScope);
@@ -81,10 +81,24 @@ test('Can search for package rules in package filter details', async (done) => {
   const { name: cvFilterName } = cvFilterDetails;
   const { name: firstPackageRuleName } = firstPackageRule;
   const { name: lastPackageRuleName } = lastPackageRule;
-  const searchQueryMatcher = actualParams =>
-    actualParams?.search?.includes(lastPackageRuleName);
-  const searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
-  const autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
+  const searchQueryMatcher = {
+    organization_id: 1,
+    search: `name = ${lastPackageRuleName}`,
+  };
+  const searchResults = [
+    {
+      completed: `name = ${lastPackageRuleName}`,
+      part: 'and',
+      label: `name = ${lastPackageRuleName} and`,
+      category: 'Operators',
+    },
+    {
+      completed: `name = ${lastPackageRuleName}`,
+      part: 'or',
+      label: `name = ${lastPackageRuleName} or`,
+      category: 'Operators',
+    },
+  ];
 
   const cvFilterScope = nockInstance
     .get(cvFilterDetailsPath)
@@ -103,8 +117,13 @@ test('Can search for package rules in package filter details', async (done) => {
     .query(searchQueryMatcher)
     .reply(200, { results: [lastPackageRule] });
 
-  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
-  const withSearchScope = mockAutocomplete(nockInstance, autocompleteUrl, searchQueryMatcher);
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl, autocompleteQuery);
+  const withSearchScope = mockAutocomplete(
+    nockInstance,
+    autocompleteUrl,
+    searchQueryMatcher,
+    searchResults,
+  );
   const { getByText, queryByText, getByLabelText } =
     renderWithRedux(withCVRoute(<ContentViewFilterDetails
       cvId={1}
@@ -117,15 +136,14 @@ test('Can search for package rules in package filter details', async (done) => {
   });
 
   // Search and only searched result shows
-  fireEvent.change(getByLabelText(/text input for search/i), { target: { value: `name = ${lastPackageRuleName}` } });
+  getByLabelText('Search input').focus();
+  fireEvent.change(getByLabelText('Search input'), { target: { value: `name = ${lastPackageRuleName}` } });
   await patientlyWaitFor(() => {
-    expect(getByText(lastPackageRuleName)).toBeInTheDocument();
-    expect(queryByText(firstPackageRuleName)).not.toBeInTheDocument();
+    expect(getByText(`name = ${lastPackageRuleName} and`)).toBeInTheDocument();
+    expect(queryByText(`name = ${firstPackageRuleName} and`)).not.toBeInTheDocument();
   });
 
   assertNockRequest(autocompleteScope);
-  assertNockRequest(searchDelayScope);
-  assertNockRequest(autoSearchScope);
   assertNockRequest(cvFilterScope);
   assertNockRequest(cvFiltersScope);
   assertNockRequest(cvPackageFilterRulesScope);
@@ -136,9 +154,15 @@ test('Can search for package rules in package filter details', async (done) => {
 
 test('Can add package rules to filter in a self-closing modal', async (done) => {
   const { name: cvFilterName } = cvFilterDetails;
-  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
-  const autocompleteNameScope = mockAutocomplete(nockInstance, autocompleteNameUrl);
-  const autocompleteArchScope = mockAutocomplete(nockInstance, autocompleteArchUrl);
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl, true, undefined, 2);
+  const autocompleteNameScope = mockAutocomplete(
+    nockInstance, autocompleteNameUrl, true,
+    undefined, 2,
+  );
+  const autocompleteArchScope = mockAutocomplete(
+    nockInstance, autocompleteArchUrl, true,
+    undefined, 2,
+  );
   const searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0, 3);
   const autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing', undefined, 3);
 
@@ -190,12 +214,12 @@ 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('text input for search')[2]).toBeInTheDocument();
     expect(getByLabelText('add_package_filter_rule')).toBeInTheDocument();
   });
-  fireEvent.change(getAllByLabelText('text input for search')[1], { target: { value: 'elephant' } });
-  fireEvent.change(getAllByLabelText('text input for search')[2], { target: { value: 'noarch' } });
+  fireEvent.change(getAllByLabelText('text input for search')[0], { target: { value: 'elephant' } });
+  fireEvent.change(getAllByLabelText('text input for search')[1], { target: { value: 'noarch' } });
   fireEvent.submit(getByLabelText('add_package_filter_rule'));
 
   await patientlyWaitFor(() => {
@@ -259,6 +283,10 @@ test('Remove rpm filter rule in a self-closing modal', async (done) => {
   });
 
   getByText('Remove').click();
+  await patientlyWaitFor(() => {
+    expect(getByText(cvFilterName)).toBeInTheDocument();
+    expect(getAllByLabelText('Actions')[1]).toBeInTheDocument();
+  });
 
   assertNockRequest(autocompleteScope);
   assertNockRequest(searchDelayScope);
@@ -274,8 +302,14 @@ test('Remove rpm filter rule in a self-closing modal', async (done) => {
 test('Edit rpm filter rule in a self-closing modal', async (done) => {
   const { name: cvFilterName } = cvFilterDetails;
   const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl, true, undefined, 2);
-  const autocompleteNameScope = mockAutocomplete(nockInstance, autocompleteNameUrl);
-  const autocompleteArchScope = mockAutocomplete(nockInstance, autocompleteArchUrl);
+  const autocompleteNameScope = mockAutocomplete(
+    nockInstance, autocompleteNameUrl, true,
+    undefined, 2,
+  );
+  const autocompleteArchScope = mockAutocomplete(
+    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