katello 4.7.2 → 4.8.0.rc1

data/webpack/scenes/AlternateContentSources/Create/ACSCreateWizard.js

@@ -40,7 +40,6 @@ const ACSCreateWizard = ({ show, setIsOpen }) => {
   const [caCertName, setCACertName] = useState('');
   const [productIds, setProductIds] = useState([]);
   const [productNames, setProductNames] = useState([]);
-  const [currentStep, setCurrentStep] = useState(1);
   const dispatch = useDispatch();
 
   useEffect(
@@ -52,6 +51,11 @@ const ACSCreateWizard = ({ show, setIsOpen }) => {
     [dispatch],
   );
 
+  const subPathValidated = areSubPathsValid(subpaths) ? 'default' : 'error';
+  const urlValidated = (url === '' || isValidUrl(url, acsType)) ? 'default' : 'error';
+
+  const urlAndPathsValid = () => url !== '' && urlValidated !== 'error' && subPathValidated !== 'error';
+
   const credentialsFilled = () => {
     if (authentication === 'manual') {
       return username !== '';
@@ -59,9 +63,6 @@ const ACSCreateWizard = ({ show, setIsOpen }) => {
     return true;
   };
 
-  const subPathValidated = areSubPathsValid(subpaths) ? 'default' : 'error';
-  const urlValidated = (url === '' || isValidUrl(url)) ? 'default' : 'error';
-
   const sourceTypeStep = {
     id: 1,
     name: __('Select source type'),
@@ -89,7 +90,7 @@ const ACSCreateWizard = ({ show, setIsOpen }) => {
     id: 4,
     name: __('Select products'),
     component: <ACSProducts />,
-    canJumpTo: smartProxies.length,
+    canJumpTo: smartProxies.length && name !== '',
     enableNext: productIds.length,
   };
 
@@ -97,16 +98,16 @@ const ACSCreateWizard = ({ show, setIsOpen }) => {
     id: 5,
     name: __('URL and paths'),
     component: <AcsUrlPaths />,
-    canJumpTo: (acsType === 'custom' || acsType === 'rhui') && (smartProxies.length),
-    enableNext: url !== '' && urlValidated !== 'error' && subPathValidated !== 'error',
+    canJumpTo: (acsType === 'custom' || acsType === 'rhui') && (smartProxies.length) && name !== '',
+    enableNext: urlAndPathsValid(),
   };
 
   const credentialsStep = {
     id: 6,
     name: __('Credentials'),
     component: <ACSCredentials />,
-    canJumpTo: url !== '' && urlValidated !== 'error' && subPathValidated !== 'error',
-    enableNext: (url !== '' || productIds.length) && smartProxies.length && name !== '' && acsType && contentType && credentialsFilled(),
+    canJumpTo: urlAndPathsValid() && (smartProxies.length) && name !== '',
+    enableNext: (urlAndPathsValid() || productIds.length) && smartProxies.length && name !== '' && acsType && contentType && credentialsFilled(),
   };
 
   const reviewStep = {
@@ -114,8 +115,8 @@ const ACSCreateWizard = ({ show, setIsOpen }) => {
     name: __('Review details'),
     component: <ACSReview />,
     nextButtonText: __('Add'),
-    canJumpTo: (url !== '' || productIds.length) && smartProxies.length && name !== '' && acsType && contentType && credentialsFilled(),
-    enableNext: (url !== '' || productIds.length) && smartProxies.length && name !== '' && acsType && contentType,
+    canJumpTo: (urlAndPathsValid() || productIds.length) && smartProxies.length && name !== '' && acsType && contentType && credentialsFilled(),
+    enableNext: (urlAndPathsValid() || productIds.length) && smartProxies.length && name !== '' && acsType && contentType,
   };
 
   const finishStep = {
@@ -139,8 +140,6 @@ const ACSCreateWizard = ({ show, setIsOpen }) => {
     <ACSCreateContext.Provider value={{
       show,
       setIsOpen,
-      currentStep,
-      setCurrentStep,
       acsType,
       setAcsType,
       contentType,
@@ -186,10 +185,6 @@ const ACSCreateWizard = ({ show, setIsOpen }) => {
       <Wizard
         title={__('Add an alternate content source')}
         steps={steps}
-        startAtStep={currentStep}
-        onGoToStep={({ id }) => setCurrentStep(id)}
-        onNext={({ id }) => setCurrentStep(id)}
-        onBack={({ id }) => setCurrentStep(id)}
         onClose={() => {
           setIsOpen(false);
         }}

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

@@ -1,7 +1,9 @@
 import React, { useCallback, useContext, useState } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { useHistory } from 'react-router-dom';
+import PropTypes from 'prop-types';
 import useDeepCompareEffect from 'use-deep-compare-effect';
+import { WizardContextConsumer } from '@patternfly/react-core';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { STATUS } from 'foremanReact/constants';
 import ACSCreateContext from '../ACSCreateContext';
@@ -9,10 +11,16 @@ import { selectCreateACS, selectCreateACSError, selectCreateACSStatus } from '..
 import getAlternateContentSources, { createACS } from '../../ACSActions';
 import Loading from '../../../../components/Loading';
 
-const ACSCreateFinish = () => {
+const ACSCreateFinishWrapper = () => (
+  <WizardContextConsumer>
+    {({ activeStep }) => <ACSCreateFinish activeStep={activeStep} />}
+  </WizardContextConsumer>
+);
+
+const ACSCreateFinish = ({ activeStep }) => {
   const { push } = useHistory();
+  const currentStep = activeStep.id;
   const {
-    currentStep,
     setIsOpen,
     acsType,
     contentType,
@@ -94,4 +102,10 @@ const ACSCreateFinish = () => {
   return <Loading loadingText={__('Saving alternate content source...')} />;
 };
 
-export default ACSCreateFinish;
+ACSCreateFinish.propTypes = {
+  activeStep: PropTypes.shape({
+    id: PropTypes.number.isRequired,
+  }).isRequired,
+};
+
+export default ACSCreateFinishWrapper;

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

@@ -47,6 +47,7 @@ const ACSCredentials = () => {
         <Radio
           label={__('Manual authentication')}
           id="manual_auth"
+          ouiaId="manual_auth"
           name="manual_auth"
           aria-label="manual_auth"
           isChecked={authentication === 'manual'}
@@ -71,6 +72,7 @@ const ACSCredentials = () => {
                 isRequired
                 type="text"
                 id="acs_username_field"
+                ouiaId="acs_username_field"
                 name="acs_username_field"
                 aria-label="acs_username_field"
                 value={username}
@@ -87,6 +89,7 @@ const ACSCredentials = () => {
                 isRequired
                 type="password"
                 id="acs_password_field"
+                ouiaId="acs_password_field"
                 name="acs_password_field"
                 aria-label="acs_password_field"
                 value={password}
@@ -98,6 +101,7 @@ const ACSCredentials = () => {
         <Radio
           label={__('Content credentials')}
           id="content_credentials"
+          ouiaId="content_credentials"
           aria-label="content_credentials"
           name="content_cred_auth"
           isChecked={authentication === 'content_credentials'}
@@ -163,6 +167,7 @@ const ACSCredentials = () => {
           label={__('None')}
           id="none"
           name="none"
+          ouiaId="none"
           aria-label="none"
           isChecked={authentication === ''}
           onChange={() => {
@@ -178,6 +183,7 @@ const ACSCredentials = () => {
         <FormGroup label={__('Verify SSL')} fieldId="verify_ssl">
           <Switch
             id="verify-ssl-switch"
+            ouiaId="verify-ssl-switch"
             aria-label="verify-ssl-switch"
             isChecked={verifySSL}
             onChange={checked => setVerifySSL(checked)}

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

@@ -55,6 +55,7 @@ const ACSSmartProxies = () => {
       >
         <Switch
           id="use-http-proxies-switch"
+          ouiaId="use-http-proxies-switch"
           aria-label="use-http-proxies-switch"
           isChecked={useHttpProxies}
           onChange={checked => setUseHttpProxies(checked)}

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]}