katello 4.7.3 → 4.8.0.rc1

data/webpack/scenes/AlternateContentSources/Create/Steps/AcsUrlPaths.js

@@ -16,16 +16,8 @@ const AcsUrlPaths = () => {
     acsType, url, setUrl, subpaths, setSubpaths,
   } = useContext(ACSCreateContext);
 
+  const urlValidated = (url === '' || isValidUrl(url, acsType)) ? 'default' : 'error';
   const subPathValidated = areSubPathsValid(subpaths) ? 'default' : 'error';
-  const [urlValidated, setUrlValidated] = React.useState('default');
-  const handleUrlChange = (newUrl, _event) => {
-    setUrl(newUrl);
-    if (isValidUrl(newUrl, acsType)) {
-      setUrlValidated('success');
-    } else {
-      setUrlValidated('error');
-    }
-  };
 
   const baseURLplaceholder = acsType === 'rhui' ?
     'https://rhui-server.example.com/pulp/content' :
@@ -57,12 +49,13 @@ const AcsUrlPaths = () => {
             isRequired
             type="url"
             id="acs_base_url_field"
+            ouiaId="acs_base_url_field"
             name="acs_base_url_field"
             aria-label="acs_base_url_field"
             placeholder={baseURLplaceholder}
             value={url}
             validated={urlValidated}
-            onChange={handleUrlChange}
+            onChange={value => setUrl(value)}
           />
         </FormGroup>
         {acsType === 'rhui' &&

data/webpack/scenes/AlternateContentSources/Create/Steps/NameACS.js

@@ -31,6 +31,7 @@ const NameACS = () => {
             isRequired
             type="text"
             id="acs_name_field"
+            ouiaId="acs_name_field"
             name="acs_name_field"
             aria-label="acs_name_field"
             value={name}

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

@@ -45,7 +45,7 @@ const createSimplifiedACSDetails = {
 const createRHUIACSDetails = {
   name: 'acs_rhui_test',
   description: '',
-  base_url: 'https://test_url.com/',
+  base_url: 'https://test_url.com/pulp/content',
   subpaths: ['test/repo1/', 'test/repo2/'],
   smart_proxy_names: ['centos7-katello-devel-stable.example.com'],
   content_type: 'yum',
@@ -297,8 +297,8 @@ test('Can display create wizard and create RHUI ACS', async (done) => {
   // Go to URL and subpath step
   fireEvent.click(getByText('Next'));
 
-  fireEvent.change(getByLabelText('acs_base_url_field'), { target: { value: 'https://test_url.com/' } });
-  expect(getByLabelText('acs_base_url_field')).toHaveAttribute('value', 'https://test_url.com/');
+  fireEvent.change(getByLabelText('acs_base_url_field'), { target: { value: 'https://test_url.com/pulp/content' } });
+  expect(getByLabelText('acs_base_url_field')).toHaveAttribute('value', 'https://test_url.com/pulp/content');
   fireEvent.change(getByLabelText('acs_subpath_field'), { target: { value: 'test/repo1/,test/repo2/' } });
 
   // Mock content credential data

data/webpack/scenes/AlternateContentSources/Details/EditModals/ACSEditDetails.js

@@ -45,6 +45,7 @@ const ACSEditDetails = ({ onClose, acsId, acsDetails }) => {
             isRequired
             type="text"
             id="acs_name_field"
+            ouiaId="acs_name_field"
             name="acs_name_field"
             aria-label="acs_name_field"
             value={acsName}

data/webpack/scenes/AlternateContentSources/Details/EditModals/ACSEditURLPaths.js

@@ -7,13 +7,19 @@ import { editACS, getACSDetails } from '../../ACSActions';
 import { areSubPathsValid, isValidUrl } from '../../helpers';
 
 const ACSEditURLPaths = ({ onClose, acsId, acsDetails }) => {
-  const { subpaths, base_url: url } = acsDetails;
+  const { subpaths, base_url: url, alternate_content_source_type: acsType } = acsDetails;
   const dispatch = useDispatch();
   const [acsUrl, setAcsUrl] = useState(url);
   const [acsSubpath, setAcsSubpath] = useState(subpaths.join() || '');
   const [saving, setSaving] = useState(false);
   const subPathValidated = areSubPathsValid(acsSubpath) ? 'default' : 'error';
-  const urlValidated = (acsUrl === '' || isValidUrl(acsUrl)) ? 'default' : 'error';
+  const urlValidated = (acsUrl === '' || isValidUrl(acsUrl, acsType)) ? 'default' : 'error';
+  const baseURLplaceholder = acsType === 'rhui' ?
+    'https://rhui-server.example.com/pulp/content' :
+    'http:// or https://';
+  const helperTextInvalid = acsType === 'rhui' ?
+    'http://rhui-server.example.com/pulp/content or https://rhui-server.example.com/pulp/content' :
+    'http://, https:// or file://';
 
   const onSubmit = () => {
     setSaving(true);
@@ -56,7 +62,7 @@ const ACSEditURLPaths = ({ onClose, acsId, acsDetails }) => {
           label={__('Base URL')}
           type="string"
           fieldId="acs_base_url"
-          helperTextInvalid="http://, https:// or file://"
+          helperTextInvalid={helperTextInvalid}
           validated={urlValidated}
           isRequired
         >
@@ -66,7 +72,7 @@ const ACSEditURLPaths = ({ onClose, acsId, acsDetails }) => {
             id="acs_base_url_field"
             name="acs_base_url_field"
             aria-label="acs_base_url_field"
-            placeholder="https:// or file://"
+            placeholder={baseURLplaceholder}
             value={acsUrl}
             validated={urlValidated}
             onChange={value => setAcsUrl(value)}
@@ -119,12 +125,14 @@ ACSEditURLPaths.propTypes = {
   acsDetails: PropTypes.shape({
     base_url: PropTypes.string,
     subpaths: PropTypes.arrayOf(PropTypes.string),
+    alternate_content_source_type: PropTypes.string,
     id: PropTypes.number,
   }),
 };
 
 ACSEditURLPaths.defaultProps = {
   acsDetails: {
+    alternate_content_source_type: '',
     base_url: '',
     subpaths: '',
     id: undefined,

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

@@ -162,7 +162,7 @@ const ACSTable = () => {
         <DrawerHead>
           {results && isExpanded &&
           <div ref={drawerRef}>
-            <Text component={TextVariants.h1} style={{ marginTop: '0px', fontWeight: 'bold' }}>
+            <Text ouiaId="acs-name-text" component={TextVariants.h1} style={{ marginTop: '0px', fontWeight: 'bold' }}>
               {acs?.name}
             </Text>
             <TextContent>
@@ -320,11 +320,13 @@ const ACSTable = () => {
                 fetchItems,
                 showPrimaryAction,
                 primaryActionButton,
+                selectedCount,
               }}
               ouiaId="alternate-content-sources-table"
               variant={TableVariant.compact}
               additionalListeners={[activeSortColumn, activeSortDirection]}
-              autocompleteEndpoint="/alternate_content_sources/auto_complete_search"
+              autocompleteEndpoint="/katello/api/v2/alternate_content_sources"
+              bookmarkController="katello_alternate_content_sources"
               {...selectionSetVars}
               actionButtons={
                 <>
@@ -384,7 +386,7 @@ const ACSTable = () => {
               hideSearch={!canView}
             >
               <Thead>
-                <Tr>
+                <Tr ouiaId="acs-table-column-headers-row">
                   <Th
                     key="acs-checkbox"
                     style={{ width: 0 }}
@@ -415,6 +417,7 @@ const ACSTable = () => {
                   return (
                     <Tr
                       key={index}
+                      ouiaId={`acs-row-${id}`}
                       style={isSingleSelected(id) && isExpanded ? customStyle : {}}
                       isStriped={isSingleSelected(id) && isExpanded}
                     >
@@ -428,7 +431,7 @@ const ACSTable = () => {
                         />
                       </Td>
                       <Td>
-                        <Text onClick={() => onClick(id)} component="a">{name}</Text>
+                        <Text onClick={() => onClick(id)} component="a" ouiaId={`acs-link-text-${index}`}>{name}</Text>
                       </Td>
                       <Td>{acsType === 'rhui' ? upperCase(acsType) : capitalize(acsType)}</Td>
                       <Td><LastSync

data/webpack/scenes/AlternateContentSources/MainTable/__tests__/acsTable.test.js

@@ -1,7 +1,7 @@
 import React from 'react';
-import { renderWithRedux, patientlyWaitFor } from 'react-testing-lib-wrapper';
+import { renderWithRedux, patientlyWaitFor, act } from 'react-testing-lib-wrapper';
 
-import { nockInstance, assertNockRequest, mockAutocomplete, mockSetting } from '../../../../test-utils/nockWrapper';
+import { nockInstance, assertNockRequest, mockAutocomplete } from '../../../../test-utils/nockWrapper';
 import api from '../../../../services/api';
 import ACSTable from '../ACSTable';
 import acsData from './acsIndex.fixtures.json';
@@ -10,8 +10,6 @@ const acsURL = api.getApiUrl('/alternate_content_sources');
 const autocompleteUrl = '/alternate_content_sources/auto_complete_search';
 
 let firstAcs;
-let searchDelayScope;
-let autoSearchScope;
 
 beforeEach(() => {
   const { results } = acsData;
@@ -24,8 +22,6 @@ test('Can call API and show ACS on page load', async (done) => {
     .get(acsURL)
     .query(true)
     .reply(200, acsData);
-  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
-  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
 
   const { getByText, queryByText } = renderWithRedux(<ACSTable />);
 
@@ -34,9 +30,8 @@ test('Can call API and show ACS on page load', async (done) => {
   // Assert that the ACS name is now showing on the screen, but wait for it to appear.
   await patientlyWaitFor(() => expect(getByText(firstAcs.name)).toBeInTheDocument());
   assertNockRequest(autocompleteScope);
-  assertNockRequest(searchDelayScope);
-  assertNockRequest(autoSearchScope);
   assertNockRequest(scope, done);
+  act(done);
 });
 
 test('Can handle no ACS being present', async (done) => {
@@ -62,4 +57,5 @@ test('Can handle no ACS being present', async (done) => {
   expect(queryByLabelText('Select all')).not.toBeInTheDocument();
   await patientlyWaitFor(() => expect(queryByText("You currently don't have any alternate content sources.")).toBeInTheDocument());
   assertNockRequest(scope, done);
+  act(done);
 });

data/webpack/scenes/AlternateContentSources/helpers.js

@@ -3,7 +3,7 @@ export const isValidUrl = (urlString, acsType = '') => {
     const urlFromString = new URL(urlString);
     let valid = urlFromString.protocol === 'https:' || urlFromString.protocol === 'http:' || urlFromString.protocol === 'file:';
     if (acsType === 'rhui') {
-      valid = valid && urlFromString.pathname === '/pulp/content';
+      valid = urlFromString.pathname.endsWith('/pulp/content');
     }
     return valid;
   } catch (e) {

data/webpack/scenes/Content/Details/ContentRepositories.js

@@ -44,21 +44,22 @@ const ContentRepositories = ({ contentType, id, tabKey }) => {
       }}
       ouiaId="content-repositories-table"
       variant={TableVariant.compact}
-      autocompleteEndpoint="/repositories/auto_complete_search"
+      autocompleteEndpoint="/katello/api/v2/repositories"
+      bookmarkController="katello_repositories"
       fetchItems={useCallback(
         params => getRepositoryContentDetails(typeSingularLabel, id, params),
         [typeSingularLabel, id],
       )}
     >
       <Thead>
-        <Tr>
+        <Tr ouiaId="content-repositories-column-headers-row">
           {columnHeaders.map(col =>
             <Th key={col.title}>{col.title}</Th>)}
         </Tr>
       </Thead>
       <Tbody>
-        {results?.map(details => (
-          <Tr key={`${details.id}`}>
+        {results?.map((details, idx) => (
+          <Tr key={`${details.id}`} ouiaId={`content-repositories-row-${idx}`}>
             {columnHeaders.map((col, index) =>
               <Td key={index}>{col.getProperty(details, typeSingularLabel)}</Td>)
             }

data/webpack/scenes/Content/Details/__tests__/contentDetail.test.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import { Route } from 'react-router-dom';
 import { renderWithRedux, patientlyWaitFor } from 'react-testing-lib-wrapper';
-import { nockInstance, assertNockRequest, mockAutocomplete, mockSetting } from '../../../../test-utils/nockWrapper';
+import { nockInstance, assertNockRequest, mockAutocomplete } from '../../../../test-utils/nockWrapper';
 import api from '../../../../services/api';
 import { CONTENT_ID_KEY } from '../../ContentConstants';
 import ContentDetails from '../ContentDetails';
@@ -17,9 +17,6 @@ const contentRepositoryDetailsPath = api.getApiUrl('/repositories');
 
 const withContentRoute = component => <Route path="/content/:content_type([a-z_]+)/:id([0-9]+)">{component}</Route>;
 
-let searchDelayScope;
-let autoSearchScope;
-
 jest.mock('react-intl', () => ({ addLocaleData: () => { }, FormattedDate: () => 'mocked' }));
 
 test('Can call API for Python package details and show details tab on page load', async (done) => {
@@ -59,8 +56,6 @@ test('Can call API for Python package details and show details tab on page load'
 test('Can call API for Python package repository details and show repositories tab', async (done) => {
   const autocompleteUrl = '/repositories/auto_complete_search';
   const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
-  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
-  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
 
   const results = pythonPackageRepositoryDetailsResponse.results[0];
   const repoName = results.name;
@@ -84,8 +79,6 @@ test('Can call API for Python package repository details and show repositories t
     expect(getAllByText(contentCountWords)[0]).toBeInTheDocument();
   });
 
-  assertNockRequest(autoSearchScope);
-  assertNockRequest(searchDelayScope);
   assertNockRequest(autocompleteScope);
   assertNockRequest(pythonPackageRepositoryDetailsScope, done);
 });
@@ -122,8 +115,6 @@ test('Can call API for Ansible collection details and show details tab on page l
 test('Can call API for Ansible collection repository details and show repositories tab', async (done) => {
   const autocompleteUrl = '/repositories/auto_complete_search';
   const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
-  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
-  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
 
   const results = ansibleCollectionRepositoryDetailsResponse.results[0];
   const repoName = results.name;
@@ -147,8 +138,6 @@ test('Can call API for Ansible collection repository details and show repositori
     expect(getAllByText(contentCountWords)[0]).toBeInTheDocument();
   });
 
-  assertNockRequest(autoSearchScope);
-  assertNockRequest(searchDelayScope);
   assertNockRequest(autocompleteScope);
   assertNockRequest(ansibleCollectionRepositoryDetailsScope, done);
 });

data/webpack/scenes/Content/Table/ContentTable.js

@@ -33,7 +33,8 @@ const ContentTable = ({
       ouiaId="content-table"
       key={selectedContentType}
       variant={TableVariant.compact}
-      autocompleteEndpoint={`/${contentTypes[selectedContentType][1]}/auto_complete_search`}
+      autocompleteEndpoint={`/katello/api/v2/${contentTypes[selectedContentType][1]}`}
+      bookmarkController="katello_generic_content_units"
       emptyContentTitle={__(`You currently don't have any ${selectedContentType}.`)}
       emptySearchTitle={__(`No matching ${selectedContentType} found`)}
       emptyContentBody={__(`${selectedContentType} will appear here when created.`)}

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

@@ -1,6 +1,6 @@
 import React from 'react';
 import { renderWithRedux, patientlyWaitFor } from 'react-testing-lib-wrapper';
-import { nockInstance, assertNockRequest, mockAutocomplete, mockSetting } from '../../../test-utils/nockWrapper';
+import { nockInstance, assertNockRequest, mockAutocomplete } from '../../../test-utils/nockWrapper';
 import api from '../../../services/api';
 import ContentPage from '../ContentPage';
 import ansibleCollectionsResponse from './ansibleCollections.fixtures';
@@ -12,19 +12,6 @@ const contentTypesPath = api.getApiUrl('/repositories/content_types');
 const pythonPackagesPath = api.getApiUrl('/python_packages');
 const ansibleCollectionsPath = api.getApiUrl('/ansible_collections');
 
-let searchDelayScope;
-let autoSearchScope;
-
-beforeEach(() => {
-  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
-  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
-});
-
-afterEach(() => {
-  assertNockRequest(autoSearchScope);
-  assertNockRequest(searchDelayScope);
-});
-
 test('Can call API for Python Packages and show table on page load', async (done) => {
   const autocompleteUrl = '/python_packages/auto_complete_search';
   const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);

data/webpack/scenes/ContentViews/Delete/__tests__/contentViewDelete.test.js

@@ -3,7 +3,7 @@ import React from 'react';
 import { renderWithRedux, patientlyWaitFor, fireEvent, act } from 'react-testing-lib-wrapper';
 import api, { foremanApi } from '../../../../services/api';
 import {
-  nockInstance, assertNockRequest, mockAutocomplete, mockSetting, mockForemanAutocomplete,
+  nockInstance, assertNockRequest, mockAutocomplete, mockForemanAutocomplete,
 } from '../../../../test-utils/nockWrapper';
 import CONTENT_VIEWS_KEY from '../../ContentViewsConstants';
 import ContentViewsPage from '../../ContentViewsPage.js';
@@ -37,24 +37,10 @@ const baseQuery = {
   sort_order: 'asc',
 };
 
-let scopeBookmark;
 let firstCV;
-let searchDelayScope;
-let autoSearchScope;
 beforeEach(() => {
   const { results } = cvIndexData;
   [firstCV] = results;
-  scopeBookmark = nockInstance
-    .get('/api/v2/bookmarks')
-    .query(true)
-    .reply(200, {});
-  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
-  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
-});
-
-afterEach(() => {
-  assertNockRequest(searchDelayScope);
-  assertNockRequest(autoSearchScope);
 });
 
 test('Can call API for CVs and show Delete Wizard for the row', async (done) => {
@@ -93,7 +79,6 @@ test('Can call API for CVs and show Delete Wizard for the row', async (done) =>
   await patientlyWaitFor(() => expect(getAllByText('Remove versions from environments')[1]).toBeInTheDocument());
 
   assertNockRequest(scope);
-  assertNockRequest(scopeBookmark);
   assertNockRequest(autocompleteScope);
   assertNockRequest(envPathDeleteScope);
   assertNockRequest(cvDetailsScope);
@@ -103,12 +88,8 @@ test('Can call API for CVs and show Delete Wizard for the row', async (done) =>
 test('Can open Delete wizard and delete CV with all steps', async (done) => {
   const hostAutocompleteUrl = '/hosts/auto_complete_search';
   const hostAutocompleteScope = mockForemanAutocomplete(nockInstance, hostAutocompleteUrl);
-  const hostSearchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
-  const hostAutoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
   const akAutocompleteUrl = '/activation_keys/auto_complete_search';
   const akAutocompleteScope = mockAutocomplete(nockInstance, akAutocompleteUrl);
-  const akSearchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
-  const akAutoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
 
   const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
 
@@ -231,19 +212,14 @@ test('Can open Delete wizard and delete CV with all steps', async (done) => {
   fireEvent.click(getAllByText('Delete')[0]);
 
   assertNockRequest(scope);
-  assertNockRequest(scopeBookmark);
   assertNockRequest(autocompleteScope);
   assertNockRequest(envPathDeleteScope);
   assertNockRequest(cvDetailsScope);
   assertNockRequest(cvVersionsScope);
   assertNockRequest(hostAutocompleteScope);
-  assertNockRequest(hostSearchDelayScope);
-  assertNockRequest(hostAutoSearchScope);
   assertNockRequest(hostScope);
   assertNockRequest(cVDropDownOptionsScope);
   assertNockRequest(akAutocompleteScope);
-  assertNockRequest(akSearchDelayScope);
-  assertNockRequest(akAutoSearchScope);
   assertNockRequest(activationKeysScope);
   assertNockRequest(cVDropDownOptionsScope);
   assertNockRequest(cvDeleteScope);

data/webpack/scenes/ContentViews/Details/ComponentContentViews/ContentViewComponents.js

@@ -252,7 +252,8 @@ const ContentViewComponents = ({ cvId, details }) => {
       onSelect={onSelect(rows, setRows)}
       cells={columnHeaders}
       variant={TableVariant.compact}
-      autocompleteEndpoint="/content_views/auto_complete_search"
+      autocompleteEndpoint="/katello/api/v2/content_views"
+      bookmarkController="katello_content_views"
       fetchItems={useCallback(params =>
         getContentViewComponents(cvId, params, statusSelected), [cvId, statusSelected])}
       additionalListeners={[statusSelected, addComponentsResolved, removeComponentsResolved]}

data/webpack/scenes/ContentViews/Details/ComponentContentViews/__tests__/contentViewComponents.test.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { renderWithRedux, patientlyWaitFor, fireEvent } from 'react-testing-lib-wrapper';
-import { nockInstance, assertNockRequest, mockAutocomplete, mockSetting } from '../../../../../test-utils/nockWrapper';
+import { nockInstance, assertNockRequest, mockAutocomplete } from '../../../../../test-utils/nockWrapper';
 import api from '../../../../../services/api';
 import CONTENT_VIEWS_KEY from '../../../ContentViewsConstants';
 import ContentViewComponents from '../ContentViewComponents';
@@ -15,27 +15,21 @@ const cvComponents = api.getApiUrl('/content_views/4/content_view_components/sho
 const addComponentURL = api.getApiUrl('/content_views/4/content_view_components/add');
 const publishedComponentDetailsURL = api.getApiUrl('/content_views/13');
 const removeComponentURL = api.getApiUrl('/content_views/4/content_view_components/remove');
-const cvComponentsSearchURL = api.getApiUrl('/content_views/4/content_view_components/show_all?per_page=20&page=1&search=name+%3D+%227%22&status=All');
 const autocompleteUrl = '/content_views/auto_complete_search';
+const autocompleteQuery = {
+  organization_id: 1,
+  search: '',
+};
 
 let firstComponent;
-let searchDelayScope;
-let autoSearchScope;
 
 beforeEach(() => {
   const { results } = cvComponentData;
   [firstComponent] = results;
-  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
-  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
-});
-
-afterEach(() => {
-  assertNockRequest(searchDelayScope);
-  assertNockRequest(autoSearchScope);
 });
 
 test('Can call API and show components on page load', async (done) => {
-  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl, autocompleteQuery);
   const scope = nockInstance
     .get(cvComponents)
     .reply(200, cvComponentData);
@@ -55,7 +49,7 @@ test('Can call API and show components on page load', async (done) => {
 });
 
 test('Can call API and show unpublished components', async (done) => {
-  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl, autocompleteQuery);
   const scope = nockInstance
     .get(cvComponents)
     .reply(200, cvUnpublishedComponentData);
@@ -79,7 +73,7 @@ test('Can call API and show unpublished components', async (done) => {
 });
 
 test('Can link to view environment', async () => {
-  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl, autocompleteQuery);
   const scope = nockInstance
     .get(cvComponents)
     .reply(200, cvComponentData);
@@ -102,17 +96,36 @@ test('Can search for component content views in composite view', async (done) =>
   const lastComponent = cvComponentData.results[1];
   const { name: firstComponentName } = firstComponent.content_view;
   const { name: lastComponentName } = lastComponent.content_view;
-  const searchQueryMatcher = actualParams => actualParams?.search?.includes(lastComponentName);
+  const searchQueryMatcher = {
+    organization_id: 1,
+    search: `name = ${lastComponentName}`,
+  };
+  const searchResults = [
+    {
+      completed: `name = ${lastComponentName}`,
+      part: 'and',
+      label: `name = ${lastComponentName} and`,
+      category: 'Operators',
+    },
+    {
+      completed: `name = ${lastComponentName}`,
+      part: 'or',
+      label: `name = ${lastComponentName} or`,
+      category: 'Operators',
+    },
+  ];
 
   const cvComponentsScope = nockInstance
     .get(cvComponents)
     .reply(200, cvComponentData);
-  const cvComponentsSearchScope = nockInstance
-    .get(cvComponentsSearchURL)
-    .reply(200, { results: [lastComponent] });
 
-  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(<ContentViewComponents cvId={4} details={cvDetails} />, renderOptions);
 
@@ -123,23 +136,23 @@ test('Can search for component content views in composite view', async (done) =>
   });
 
   // Search and only searched result shows
-  const searchInput = getByLabelText(/text input for search/i);
+  const searchInput = getByLabelText('Search input');
   expect(searchInput).toBeInTheDocument();
-  fireEvent.change(searchInput, { target: { value: `name = "${lastComponentName}"` } });
+  searchInput.focus();
+  fireEvent.change(searchInput, { target: { value: `name = ${lastComponentName}` } });
 
   await patientlyWaitFor(() => {
-    expect(getByText(lastComponentName)).toBeInTheDocument();
-    expect(queryByText(firstComponentName)).not.toBeInTheDocument();
+    expect(getByText(`name = ${lastComponentName} and`)).toBeInTheDocument();
+    expect(queryByText(`name = ${firstComponentName} and`)).not.toBeInTheDocument();
   });
 
   assertNockRequest(autocompleteScope);
   assertNockRequest(cvComponentsScope);
-  assertNockRequest(withSearchScope);
-  assertNockRequest(cvComponentsSearchScope, done);
+  assertNockRequest(withSearchScope, done);
 });
 
 test('Can handle no components being present', async (done) => {
-  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl, autocompleteQuery);
 
   const noResults = {
     total: 0,
@@ -172,7 +185,7 @@ test('Can handle no components being present', async (done) => {
 });
 
 test('Can add published component views to content view with modal', async (done) => {
-  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl, autocompleteQuery);
   const scope = nockInstance
     .get(cvComponentsWithoutSearch)
     .reply(200, cvComponentData);
@@ -225,7 +238,7 @@ test('Can add published component views to content view with modal', async (done
 });
 
 test('Can add unpublished component views to content view', async (done) => {
-  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl, autocompleteQuery);
   const scope = nockInstance
     .get(cvComponentsWithoutSearch)
     .reply(200, cvComponentData);
@@ -261,7 +274,7 @@ test('Can add unpublished component views to content view', async (done) => {
 });
 
 test('Can remove component views from content view', async (done) => {
-  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl, autocompleteQuery);
   const scope = nockInstance
     .get(cvComponentsWithoutSearch)
     .reply(200, cvComponentData);
@@ -297,7 +310,7 @@ test('Can remove component views from content view', async (done) => {
 });
 
 test('Can bulk add component views to content view with modal', async (done) => {
-  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl, autocompleteQuery);
   const scope = nockInstance
     .get(cvComponentsWithoutSearch)
     .reply(200, cvComponentData);

data/webpack/scenes/ContentViews/Details/ContentViewDetails.js

@@ -82,6 +82,7 @@ export default () => {
   const dropDownItems = [
     <DropdownItem
       key="copy"
+      ouiaId="cv-copy"
       onClick={() => {
         setCopying(true);
       }}
@@ -90,6 +91,7 @@ export default () => {
     </DropdownItem>,
     <DropdownItem
       key="delete"
+      ouiaId="cv-delete"
       onClick={() => {
         setDeleting(true);
       }}

data/webpack/scenes/ContentViews/Details/Filters/AffectedRepositories/AffectedRepositoryTable.js

@@ -178,6 +178,9 @@ const AffectedRepositoryTable = ({
   const emptySearchBody = __('Try changing your search settings.');
   const activeFilters = [productSelected];
   const defaultFilters = [allProducts];
+  const resetFilters = () => {
+    setProductSelected(allProducts);
+  };
   const dropdownItems = [
     <DropdownItem aria-label="bulk_remove" key="bulk_remove" isDisabled={!hasAddedSelected} component="button" onClick={removeBulk}>
       {__('Remove')}
@@ -197,6 +200,7 @@ const AffectedRepositoryTable = ({
         updateSearchQuery,
         activeFilters,
         defaultFilters,
+        resetFilters,
         error,
         status,
       }}
@@ -204,7 +208,8 @@ const AffectedRepositoryTable = ({
       onSelect={hasPermission(permissions, 'edit_content_views') ? onSelect(rows, setRows) : null}
       cells={columnHeaders}
       variant={TableVariant.compact}
-      autocompleteEndpoint="/repositories/auto_complete_search"
+      autocompleteEndpoint="/katello/api/v2/repositories"
+      bookmarkController="katello_content_view_filters"
       fetchItems={useCallback(params => getCVReposWithOptions(params), [getCVReposWithOptions])}
       additionalListeners={[productSelected]}
       actionButtons={