katello 4.7.2 → 4.8.0.rc1

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

@@ -3,7 +3,7 @@ import { renderWithRedux, patientlyWaitFor, fireEvent } from 'react-testing-lib-
 import { Route } from 'react-router-dom';
 
 import api from '../../../../../services/api';
-import { nockInstance, assertNockRequest, mockAutocomplete, mockSetting } from '../../../../../test-utils/nockWrapper';
+import { nockInstance, assertNockRequest, mockAutocomplete } from '../../../../../test-utils/nockWrapper';
 import ContentViewFilters from '../ContentViewFilters';
 import CONTENT_VIEWS_KEY from '../../../ContentViewsConstants';
 import cvFilterFixtures from './contentViewFilters.fixtures.json';
@@ -27,19 +27,10 @@ const autocompleteUrl = '/content_view_filters/auto_complete_search';
 
 let firstFilter;
 let lastFilter;
-let searchDelayScope;
-let autoSearchScope;
 beforeEach(() => {
   const { results } = cvFilterFixtures;
   [firstFilter] = results;
   [lastFilter] = results.slice(-1);
-  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
-  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
-});
-
-afterEach(() => {
-  assertNockRequest(searchDelayScope);
-  assertNockRequest(autoSearchScope);
 });
 
 test('Can call API and show filters on page load', async (done) => {
@@ -68,17 +59,39 @@ test('Can call API and show filters on page load', async (done) => {
 
 test('Can search for filter', async (done) => {
   const { name, description } = firstFilter;
-  const searchQueryMatcher = actualParams => actualParams?.search?.includes(name);
-  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
-  const withSearchScope = mockAutocomplete(nockInstance, autocompleteUrl, searchQueryMatcher);
+  const autocompleteQuery = {
+    organization_id: 1,
+    search: '',
+  };
+  const searchQueryMatcher = {
+    organization_id: 1,
+    search: 'name = f5',
+  };
+  const searchResults = [
+    {
+      completed: 'name = f5',
+      part: 'and',
+      label: 'name = f5 and',
+      category: 'Operators',
+    },
+    {
+      completed: 'name = f5',
+      part: 'or',
+      label: 'name = f5 or',
+      category: 'Operators',
+    },
+  ];
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl, autocompleteQuery);
+  const withSearchScope = mockAutocomplete(
+    nockInstance,
+    autocompleteUrl,
+    searchQueryMatcher,
+    searchResults,
+  );
   const initialScope = nockInstance
     .get(cvFilters)
     .query(true)
     .reply(200, cvFilterFixtures);
-  const searchResultScope = nockInstance
-    .get(cvFilters)
-    .query(searchQueryMatcher)
-    .reply(200, { results: [firstFilter] });
 
   const { queryByText, getByLabelText, getByText } = renderWithRedux(
     withCVRoute(<ContentViewFilters cvId={1} details={details} />),
@@ -86,19 +99,23 @@ test('Can search for filter', async (done) => {
   );
 
   // Looking for description because the name is in the search bar and could match
-  await patientlyWaitFor(() => expect(getByText(description)).toBeInTheDocument());
+  await patientlyWaitFor(() => {
+    expect(getByText(description)).toBeInTheDocument();
+    expect(getByText(name)).toBeInTheDocument();
+    expect(getByText('f5')).toBeInTheDocument();
+  });
   // Search for a filter by name
-  fireEvent.change(getByLabelText(/text input for search/i), { target: { value: `name = ${name}` } });
+  getByLabelText('Search input').focus();
+  fireEvent.change(getByLabelText('Search input'), { target: { value: `name = ${lastFilter.name}` } });
   // Only the first filter should be showing, not the last one
   await patientlyWaitFor(() => {
-    expect(getByText(description)).toBeInTheDocument();
-    expect(queryByText(lastFilter.name)).not.toBeInTheDocument();
+    expect(getByText(`name = ${lastFilter.name} and`)).toBeInTheDocument();
+    expect(queryByText(`name = ${name} and`)).not.toBeInTheDocument();
   });
 
   assertNockRequest(autocompleteScope);
-  assertNockRequest(withSearchScope);
   assertNockRequest(initialScope);
-  assertNockRequest(searchResultScope, done);
+  assertNockRequest(withSearchScope, done);
 });
 
 test('Can remove a filter', async (done) => {

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

@@ -8,7 +8,6 @@ import {
   nockInstance,
   assertNockRequest,
   mockAutocomplete,
-  mockSetting,
 } from '../../../../../test-utils/nockWrapper';
 import api from '../../../../../services/api';
 import allErrata from './allFilterErrata.fixtures.json';
@@ -37,18 +36,6 @@ 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 enable and disable add filter button', async (done) => {
   const { name: cvFilterName } = cvFilterDetails;
   const cvFilterScope = nockInstance

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

@@ -8,7 +8,6 @@ import {
   nockInstance,
   assertNockRequest,
   mockAutocomplete,
-  mockSetting,
 } from '../../../../../test-utils/nockWrapper';
 import api from '../../../../../services/api';
 import allModuleStreams from './allFilterModulesStreams.fixtures.json';
@@ -37,18 +36,6 @@ 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 enable and disable add filter button', async (done) => {
   const { name: cvFilterName } = cvFilterDetails;
   const cvFilterScope = nockInstance

data/webpack/scenes/ContentViews/Details/Histories/ContentViewHistories.js

@@ -83,7 +83,8 @@ const ContentViewHistories = ({ cvId }) => {
       }}
       ouiaId="content-view-history-table"
       variant={TableVariant.compact}
-      autocompleteEndpoint={`/content_views/${cvId}/history/auto_complete_search`}
+      autocompleteEndpoint={`/katello/api/v2/content_views/${cvId}/history`}
+      bookmarkController="katello_content_view_histories"
       fetchItems={useCallback(params => getContentViewHistories(cvId, params), [cvId])}
     >
       <Thead>

data/webpack/scenes/ContentViews/Details/Histories/__tests__/contentViewHistory.test.js

@@ -1,7 +1,7 @@
 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 CONTENT_VIEWS_KEY from '../../../ContentViewsConstants';
 import ContentViewHistories from '../ContentViewHistories';
@@ -12,19 +12,10 @@ const cvHistories = api.getApiUrl('/content_views/1/history');
 const autocompleteUrl = '/content_views/1/history/auto_complete_search';
 
 let firstHistory;
-let searchDelayScope;
-let autoSearchScope;
 
 beforeEach(() => {
   const { results } = historyData;
   [firstHistory] = results;
-  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
-  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
-});
-
-afterEach(() => {
-  assertNockRequest(searchDelayScope);
-  assertNockRequest(autoSearchScope);
 });
 
 test('Can call API and show history on page load', async (done) => {

data/webpack/scenes/ContentViews/Details/Repositories/ContentViewRepositories.js

@@ -251,7 +251,8 @@ const ContentViewRepositories = ({ cvId, details }) => {
       ouiaId="content-view-repositories-table"
       {...selectAll}
       variant={TableVariant.compact}
-      autocompleteEndpoint="/repositories/auto_complete_search"
+      autocompleteEndpoint="/katello/api/v2/repositories"
+      bookmarkController="katello_content_view_repositories"
       fetchItems={useCallback(params => getCVReposWithOptions(params), [getCVReposWithOptions])}
       additionalListeners={[typeSelected, statusSelected]}
       displaySelectAllCheckbox={hasPermission(permissions, 'edit_content_views')}

data/webpack/scenes/ContentViews/Details/Repositories/__tests__/contentViewAddRemove.test.js

@@ -1,7 +1,7 @@
 import React from 'react';
 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 CONTENT_VIEWS_KEY from '../../../ContentViewsConstants';
 import ContentViewRepositories from '../ContentViewRepositories';
@@ -17,14 +17,10 @@ const repoTypesResponse = [{ name: 'deb' }, { name: 'docker' }, { name: 'file' }
 const cvDetailsPath = api.getApiUrl('/content_views/1');
 
 let firstRepo;
-let searchDelayScope;
-let autoSearchScope;
 
 beforeEach(() => {
   const { results } = repoData;
   [firstRepo] = results;
-  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
-  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
   nockInstance
     .persist() // match any query to this endpoint, gets cleaned up by `nock.cleanAll()`
     .get(api.getApiUrl('/repositories/repository_types'))
@@ -32,11 +28,6 @@ beforeEach(() => {
     .reply(200, repoTypesResponse);
 });
 
-afterEach(() => {
-  assertNockRequest(searchDelayScope);
-  assertNockRequest(autoSearchScope);
-});
-
 jest.mock('react-intl', () => ({ addLocaleData: () => { }, FormattedDate: () => 'mocked' }));
 
 test('Can enable and disable add repositories button', async (done) => {

data/webpack/scenes/ContentViews/Details/Versions/Compare/CVVersionCompareConfig.js

@@ -47,6 +47,8 @@ export const TableType = PropTypes.shape({
   responseSelector: PropTypes.func,
   statusSelector: PropTypes.func,
   autocompleteEndpoint: PropTypes.string,
+  autocompleteQueryParams: PropTypes.shape({}),
+  bookmarkController: PropTypes.string,
   fetchItems: PropTypes.func,
   columnHeaders:
     PropTypes.arrayOf(PropTypes.shape({
@@ -90,7 +92,9 @@ export default ({
         selectRepositoriesComparison(state, versionOneId, versionTwoId, viewBy),
       statusSelector: state =>
         selectRepositoriesComparisonStatus(state, versionOneId, versionTwoId, viewBy),
-      autocompleteEndpoint: '/repositories/auto_complete_search?archived=true',
+      autocompleteEndpoint: '/katello/api/v2/repositories',
+      autocompleteQueryParams: { archived: true },
+      bookmarkController: 'katello_content_view_repositories',
       fetchItems: params => getRepositoriesComparison(
         versionOneId,
         versionTwoId,
@@ -133,7 +137,8 @@ export default ({
         selectRPMPackagesComparison(state, versionOneId, versionTwoId, viewBy),
       statusSelector: state =>
         selectRPMPackagesComparisonStatus(state, versionOneId, versionTwoId, viewBy),
-      autocompleteEndpoint: '/packages/auto_complete_search',
+      autocompleteEndpoint: 'katello/api/v2/packages',
+      bookmarkController: 'katello_content_view_components',
       fetchItems: params => getRPMPackagesComparison(
         versionOneId,
         versionTwoId,
@@ -170,7 +175,8 @@ export default ({
         selectPackageGroupsComparison(state, versionOneId, versionTwoId, viewBy),
       statusSelector: state =>
         selectPackageGroupsComparisonStatus(state, versionOneId, versionTwoId, viewBy),
-      autocompleteEndpoint: '/package_groups/auto_complete_search',
+      autocompleteEndpoint: '/katello/api/v2/package_groups',
+      bookmarkController: 'katello_content_view_components',
       fetchItems: params => getPackageGroupsComparison(versionOneId, versionTwoId, viewBy, params),
       columnHeaders: [
         { title: __('Name'), getProperty: item => item?.name },
@@ -189,7 +195,8 @@ export default ({
       responseSelector: state => selectFilesComparison(state, versionOneId, versionTwoId, viewBy),
       statusSelector: state =>
         selectFilesComparisonStatus(state, versionOneId, versionTwoId, viewBy),
-      autocompleteEndpoint: '/files/auto_complete_search',
+      autocompleteEndpoint: '/katello/api/v2/files',
+      bookmarkController: 'katello_content_view_components',
       fetchItems: params => getFilesComparison(versionOneId, versionTwoId, viewBy, params),
       columnHeaders: [
         {
@@ -214,7 +221,8 @@ export default ({
       responseSelector: state => selectErrataComparison(state, versionOneId, versionTwoId, viewBy),
       statusSelector: state =>
         selectErrataComparisonStatus(state, versionOneId, versionTwoId, viewBy),
-      autocompleteEndpoint: '/errata/auto_complete_search',
+      autocompleteEndpoint: '/katello/api/v2/errata',
+      bookmarkController: 'katello_content_view_components',
       fetchItems: params => getErrataComparison(versionOneId, versionTwoId, viewBy, params),
       columnHeaders: [
         {
@@ -277,7 +285,8 @@ export default ({
         selectModuleStreamsComparison(state, versionOneId, versionTwoId, viewBy),
       statusSelector: state =>
         selectModuleStreamsComparisonStatus(state, versionOneId, versionTwoId, viewBy),
-      autocompleteEndpoint: '/module_streams/auto_complete_search',
+      autocompleteEndpoint: '/katello/api/v2/module_streams',
+      bookmarkController: 'katello_content_view_components',
       fetchItems: params => getModuleStreamsComparison(versionOneId, versionTwoId, viewBy, params),
       columnHeaders: [
         {
@@ -310,7 +319,8 @@ export default ({
         selectDebPackagesComparison(state, versionOneId, versionTwoId, viewBy),
       statusSelector: state =>
         selectDebPackagesComparisonStatus(state, versionOneId, versionTwoId, viewBy),
-      autocompleteEndpoint: '/debs/auto_complete_search',
+      autocompleteEndpoint: '/katello/api/v2/debs',
+      bookmarkController: 'katello_content_view_components',
       fetchItems: params => getDebPackagesComparison(versionOneId, versionTwoId, viewBy, params),
       columnHeaders: [
         {
@@ -339,7 +349,8 @@ export default ({
         selectDockerTagsComparison(state, versionOneId, versionTwoId, viewBy),
       statusSelector: state =>
         selectDockerTagsComparisonStatus(state, versionOneId, versionTwoId, viewBy),
-      autocompleteEndpoint: '/docker_tags/auto_complete_search',
+      autocompleteEndpoint: '/katello/api/v2/docker_tags',
+      bookmarkController: 'katello_content_view_components',
       fetchItems: params => getDockerTagsComparison(versionOneId, versionTwoId, viewBy, params),
       columnHeaders: [
         {
@@ -381,7 +392,8 @@ export default ({
           pluralLabel,
           viewBy,
         ),
-      autocompleteEndpoint: `/${pluralLabel}/auto_complete_search`,
+      autocompleteEndpoint: `/katello/api/v2/${pluralLabel}`,
+      bookmarkController: 'katello_content_view_components',
       fetchItems: params =>
         getGenericContentComparison(pluralLabel, versionOneId, versionTwoId, viewBy, params),
       columnHeaders: [

data/webpack/scenes/ContentViews/Details/Versions/Compare/CVVersionCompareTable.js

@@ -16,6 +16,8 @@ const CVVersionCompareTable = ({
     responseSelector,
     statusSelector,
     autocompleteEndpoint,
+    autocompleteQueryParams,
+    bookmarkController,
     fetchItems: fetchItemsSorted,
     columnHeaders,
     hideSearch,
@@ -48,6 +50,8 @@ const CVVersionCompareTable = ({
         updateSearchQuery,
         status,
         autocompleteEndpoint,
+        autocompleteQueryParams,
+        bookmarkController,
         hideSearch,
       }}
       key={`cvv-comparison-table-${name}`}

data/webpack/scenes/ContentViews/Details/Versions/Compare/__tests__/CVVersionCompare.test.js

@@ -2,7 +2,7 @@ import React from 'react';
 import { act, renderWithRedux, patientlyWaitFor, fireEvent } from 'react-testing-lib-wrapper';
 import { Route } from 'react-router-dom';
 import { head, last } from 'lodash';
-import { nockInstance, assertNockRequest, mockAutocomplete, mockSetting } from '../../../../../../test-utils/nockWrapper';
+import { nockInstance, assertNockRequest, mockAutocomplete } from '../../../../../../test-utils/nockWrapper';
 import api from '../../../../../../services/api';
 
 import ContentViewVersions from '../../ContentViewVersions';
@@ -55,8 +55,6 @@ const renderOptions = {
 
 };
 
-let searchDelayScope;
-let autoSearchScope;
 let envScope;
 
 const versionIdsAllContentTypes = {
@@ -343,9 +341,6 @@ test('Can make an API call and show comparison of two versions with all content
     renderOptions,
   );
 
-  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', undefined, 9);
-  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing', undefined, 9);
-
   // Nothing will show at first, page is loading
   expect(queryByText(`Version ${versionLabelsAllContentTypes.versionOneLabel}`)).toBeNull();
   expect(queryByText(`Version ${versionLabelsAllContentTypes.versionTwoLabel}`)).toBeNull();
@@ -381,8 +376,6 @@ test('Can make an API call and show comparison of two versions with all content
   scopeContentTypes.map(cv => assertNockRequest(cv));
   autoCompleteContentTypesScope.map(cv => assertNockRequest(cv));
   assertNockRequest(sortedRpmTabScope);
-  assertNockRequest(searchDelayScope);
-  assertNockRequest(autoSearchScope);
   act(done);
 });
 
@@ -412,9 +405,6 @@ test('Can make an API call and compare two versions with three content types', a
     renderOptions,
   );
 
-  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', undefined, 3);
-  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing', undefined, 3);
-
   // Nothing will show at first, page is loading
   expect(queryByText(`Version ${versionLabelsThreeContentTypes.versionOneLabel}`)).toBeNull();
   expect(queryByText(`Version ${versionLabelsThreeContentTypes.versionTwoLabel}`)).toBeNull();
@@ -442,8 +432,6 @@ test('Can make an API call and compare two versions with three content types', a
   assertNockRequest(scopeVersionTwoDetails);
   scopeContentTypes.map(cv => assertNockRequest(cv));
   autoCompleteContentTypesScope.map(cv => assertNockRequest(cv));
-  assertNockRequest(searchDelayScope);
-  assertNockRequest(autoSearchScope);
   act(done);
 });
 
@@ -453,8 +441,6 @@ test('Can select two versions and click compare button', async (done) => {
   const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
   const scopeContentTypes = testConfigAllContentTypes.map(({ dataUrl, data }) =>
     nockInstance.get(dataUrl).query(true).reply(200, data));
-  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', undefined, 10);
-  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing', undefined, 10);
   const scope = nockInstance
     .get(cvVersions)
     .query(true)
@@ -499,15 +485,11 @@ test('Can select two versions and click compare button', async (done) => {
   assertNockRequest(autocompleteScope);
   assertNockRequest(scope);
   assertNockRequest(scopeCVDetails);
-  assertNockRequest(searchDelayScope);
-  assertNockRequest(autoSearchScope);
   act(done);
 });
 
 test('Can select two versions with no content and click compare button', async (done) => {
   const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
-  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay');
-  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
   const scope = nockInstance
     .get(cvVersions)
     .query(true)
@@ -550,8 +532,6 @@ test('Can select two versions with no content and click compare button', async (
   assertNockRequest(autocompleteScope);
   assertNockRequest(scope);
   assertNockRequest(scopeCVDetails);
-  assertNockRequest(searchDelayScope);
-  assertNockRequest(autoSearchScope);
   act(done);
 });
 
@@ -586,9 +566,6 @@ test('Can select viewing by "Different" in the dropdown and see the content in e
     renderOptions,
   );
 
-  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', undefined, 3);
-  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing', undefined, 3);
-
   // Nothing will show at first, page is loading
   expect(queryByText(`Version ${versionLabelsThreeContentTypes.versionOneLabel}`)).toBeNull();
   expect(queryByText(`Version ${versionLabelsThreeContentTypes.versionTwoLabel}`)).toBeNull();
@@ -631,8 +608,6 @@ test('Can select viewing by "Different" in the dropdown and see the content in e
   assertNockRequest(scopeVersionTwoDetails);
   scopeContentTypes.map(cv => assertNockRequest(cv));
   autoCompleteContentTypesScope.map(cv => assertNockRequest(cv));
-  assertNockRequest(searchDelayScope);
-  assertNockRequest(autoSearchScope);
   act(done);
 });
 
@@ -667,10 +642,6 @@ test('Can select viewing by "Same" in the dropdown and see the content in common
     renderOptions,
   );
 
-  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', undefined, 3);
-  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing', undefined, 3);
-
-
   expect(queryByText(`Version ${versionLabelsThreeContentTypes.versionOneLabel}`)).toBeNull();
   expect(queryByText(`Version ${versionLabelsThreeContentTypes.versionTwoLabel}`)).toBeNull();
 
@@ -704,7 +675,5 @@ test('Can select viewing by "Same" in the dropdown and see the content in common
   assertNockRequest(scopeVersionTwoDetails);
   scopeContentTypes.map(cv => assertNockRequest(cv));
   autoCompleteContentTypesScope.map(cv => assertNockRequest(cv));
-  assertNockRequest(searchDelayScope);
-  assertNockRequest(autoSearchScope);
   act(done);
 });

data/webpack/scenes/ContentViews/Details/Versions/ContentViewVersions.js

@@ -253,7 +253,9 @@ const ContentViewVersions = ({ cvId, details }) => {
       }}
       ouiaId="content-view-versions-table"
       variant={TableVariant.compact}
-      autocompleteEndpoint={`/content_view_versions/auto_complete_search?content_view_id=${cvId}`}
+      autocompleteEndpoint="/katello/api/v2/content_view_versions"
+      autocompleteQueryParams={{ content_view_id: cvId }}
+      bookmarkController="katello_content_view_versions"
       fetchItems={fetchItems}
       {...hasActionPermissions ? selectionSetVars : []}
       actionButtons={

data/webpack/scenes/ContentViews/Details/Versions/Delete/__tests__/cvVersionRemove.test.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { renderWithRedux, patientlyWaitFor, fireEvent } from 'react-testing-lib-wrapper';
-import { nockInstance, assertNockRequest, mockAutocomplete, mockForemanAutocomplete, mockSetting } from '../../../../../../test-utils/nockWrapper';
+import { nockInstance, assertNockRequest, mockAutocomplete, mockForemanAutocomplete } from '../../../../../../test-utils/nockWrapper';
 import api, { foremanApi } from '../../../../../../services/api';
 import CONTENT_VIEWS_KEY from '../../../../ContentViewsConstants';
 import ContentViewVersions from '../../ContentViewVersions';
@@ -27,15 +27,11 @@ const cVDropDownOptionsPath = api.getApiUrl('/content_views?organization_id=1&in
 // const taskPollingUrl = '/foreman_tasks/api/tasks/6b900ff8-62bb-42ac-8c45-da86b7258520';
 
 let firstVersion;
-let searchDelayScope;
-let autoSearchScope;
 let envScope;
 
 beforeEach(() => {
   const { results } = cvVersionsData;
   [firstVersion] = results;
-  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
-  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
   envScope = nockInstance
     .get(environmentPathsPath)
     .query(true)
@@ -44,8 +40,6 @@ beforeEach(() => {
 
 afterEach(() => {
   assertNockRequest(envScope);
-  assertNockRequest(searchDelayScope);
-  assertNockRequest(autoSearchScope);
 });
 
 test('Can call API and show versions on page load', async (done) => {
@@ -128,8 +122,6 @@ test('Can open Remove wizard and remove version from environment with hosts', as
   const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
   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 scope = nockInstance
     .get(cvVersions)
@@ -206,8 +198,6 @@ test('Can open Remove wizard and remove version from environment with hosts', as
   assertNockRequest(scope);
   assertNockRequest(autocompleteScope);
   assertNockRequest(hostAutocompleteScope);
-  assertNockRequest(hostSearchDelayScope);
-  assertNockRequest(hostAutoSearchScope);
   assertNockRequest(hostScope);
   assertNockRequest(cVDropDownOptionsScope);
   assertNockRequest(envPathRemovalScope);
@@ -218,8 +208,6 @@ test('Can open Remove wizard and remove version from environment with activation
   const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
   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 scope = nockInstance
     .get(cvVersions)
@@ -297,8 +285,6 @@ test('Can open Remove wizard and remove version from environment with activation
   assertNockRequest(scope);
   assertNockRequest(autocompleteScope);
   assertNockRequest(akAutocompleteScope);
-  assertNockRequest(akSearchDelayScope);
-  assertNockRequest(akAutoSearchScope);
   assertNockRequest(activationKeysScope);
   assertNockRequest(cVDropDownOptionsScope);
   assertNockRequest(envPathRemovalScope);

data/webpack/scenes/ContentViews/Details/Versions/Delete/affectedActivationKeys.js

@@ -55,7 +55,7 @@ const AffectedActivationKeys = ({
         status,
       }}
       ouiaId="content-view-delete-modal-affected-activation-keys"
-      autocompleteEndpoint="/activation_keys/auto_complete_search"
+      autocompleteEndpoint="/katello/api/v2/activation_keys"
       variant={TableVariant.compact}
     >
       <Thead>

data/webpack/scenes/ContentViews/Details/Versions/Delete/affectedHosts.js

@@ -50,8 +50,7 @@ const AffectedHosts = ({
         status,
       }}
       ouiaId="content-view-delete-modal-affected-hosts-table"
-      autocompleteEndpoint="/hosts/auto_complete_search"
-      foremanApiAutoComplete
+      autocompleteEndpoint="/api/v2/hosts"
       variant={TableVariant.compact}
     >
       <Thead>