katello 4.7.4 → 4.8.0.rc1

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>

data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/ContentViewVersionDetailConfig.js

@@ -55,6 +55,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({
@@ -72,6 +74,8 @@ export default ({ cvId, versionId }) => [
     responseSelector: state => selectCVVersions(state, cvId),
     statusSelector: state => selectCVVersionsStatus(state, cvId),
     autocompleteEndpoint: '',
+    autocompleteQueryParams: undefined,
+    bookmarkController: '',
     fetchItems: params => getContentViewVersions(
       cvId,
       { composite_version_id: versionId, ...params, content_view_id: undefined },
@@ -99,7 +103,9 @@ export default ({ cvId, versionId }) => [
     getCountKey: item => item?.repositories?.length,
     responseSelector: state => selectRepositories(state),
     statusSelector: state => selectRepositoriesStatus(state),
-    autocompleteEndpoint: `/repositories/auto_complete_search?archived=true&content_view_version_id=${versionId}`,
+    autocompleteEndpoint: '/katello/api/v2/repositories',
+    autocompleteQueryParams: { archived: true, content_view_version_id: versionId },
+    bookmarkController: 'katello_content_view_repositories',
     fetchItems: params => getRepositories({
       content_view_version_id: versionId,
       archived: true,
@@ -137,7 +143,9 @@ export default ({ cvId, versionId }) => [
     getCountKey: item => item?.rpm_count,
     responseSelector: state => selectRPMPackages(state),
     statusSelector: state => selectRPMPackagesStatus(state),
-    autocompleteEndpoint: `/packages/auto_complete_search?content_view_version_id=${versionId}`,
+    autocompleteEndpoint: '/katello/api/v2/packages',
+    autocompleteQueryParams: { content_view_version_id: versionId },
+    bookmarkController: 'katello_content_view_components',
     fetchItems: params => getRPMPackages({ content_view_version_id: versionId, ...params }),
     columnHeaders: [
       {
@@ -160,7 +168,9 @@ export default ({ cvId, versionId }) => [
     getCountKey: item => item?.package_group_count,
     responseSelector: state => selectRPMPackageGroups(state),
     statusSelector: state => selectRPMPackageGroupsStatus(state),
-    autocompleteEndpoint: `/package_groups/auto_complete_search?content_view_version_id=${versionId}`,
+    autocompleteEndpoint: '/katello/api/v2/package_groups',
+    autocompleteQueryParams: { content_view_version_id: versionId },
+    bookmarkController: 'katello_content_view_components',
     fetchItems: params => getPackageGroups({ content_view_version_id: versionId, ...params }),
     columnHeaders: [
       { title: __('Name'), getProperty: item => item?.name },
@@ -174,7 +184,9 @@ export default ({ cvId, versionId }) => [
     getCountKey: item => item?.file_count,
     responseSelector: state => selectFiles(state),
     statusSelector: state => selectFilesStatus(state),
-    autocompleteEndpoint: `/files/auto_complete_search?content_view_version_id=${versionId}`,
+    autocompleteEndpoint: '/katello/api/v2/files',
+    autocompleteQueryParams: { content_view_version_id: versionId },
+    bookmarkController: 'katello_content_view_components',
     fetchItems: params => getFiles({ content_view_version_id: versionId, ...params }),
     columnHeaders: [
       {
@@ -194,7 +206,9 @@ export default ({ cvId, versionId }) => [
     getCountKey: item => item?.erratum_count,
     responseSelector: state => selectErrata(state),
     statusSelector: state => selectErrataStatus(state),
-    autocompleteEndpoint: `/errata/auto_complete_search?content_view_version_id=${versionId}`,
+    autocompleteEndpoint: '/katello/api/v2/errata',
+    autocompleteQueryParams: { content_view_version_id: versionId },
+    bookmarkController: 'katello_content_view_components',
     fetchItems: params => getErrata({ content_view_version_id: versionId, ...params }),
     columnHeaders: [
       {
@@ -249,7 +263,9 @@ export default ({ cvId, versionId }) => [
     getCountKey: item => item?.module_stream_count,
     responseSelector: state => selectModuleStreams(state),
     statusSelector: state => selectModuleStreamsStatus(state),
-    autocompleteEndpoint: `/module_streams/auto_complete_search?content_view_version_id=${versionId}`,
+    autocompleteEndpoint: '/katello/api/v2/module_streams',
+    autocompleteQueryParams: { content_view_version_id: versionId },
+    bookmarkController: 'katello_content_view_components',
     fetchItems: params => getModuleStreams({ content_view_version_id: versionId, ...params }),
     columnHeaders: [
       {
@@ -272,7 +288,9 @@ export default ({ cvId, versionId }) => [
     getCountKey: item => item?.deb_count,
     responseSelector: state => selectDebPackages(state),
     statusSelector: state => selectDebPackagesStatus(state),
-    autocompleteEndpoint: `/debs/auto_complete_search?content_view_version_id=${versionId}`,
+    autocompleteEndpoint: '/katello/api/v2/debs',
+    autocompleteQueryParams: { content_view_version_id: versionId },
+    bookmarkController: 'katello_content_view_components',
     fetchItems: params => getDebPackages({ content_view_version_id: versionId, ...params }),
     columnHeaders: [
       {
@@ -293,7 +311,9 @@ export default ({ cvId, versionId }) => [
     getCountKey: item => item?.docker_tag_count,
     responseSelector: state => selectDockerTags(state),
     statusSelector: state => selectDockerTagsStatus(state),
-    autocompleteEndpoint: `/docker_tags/auto_complete_search?content_view_version_id=${versionId}`,
+    autocompleteEndpoint: '/katello/api/v2/docker_tags',
+    autocompleteQueryParams: { content_view_version_id: versionId },
+    bookmarkController: 'katello_content_view_components',
     fetchItems: params => getDockerTags({ content_view_version_id: versionId, ...params }),
     columnHeaders: [
       {
@@ -323,7 +343,9 @@ export default ({ cvId, versionId }) => [
     getCountKey: item => item[`${singularLabel}_count`],
     responseSelector: state => selectContent(pluralLabel, state),
     statusSelector: state => selectContentStatus(pluralLabel, state),
-    autocompleteEndpoint: `/${pluralLabel}/auto_complete_search?content_view_version_id=${versionId}`,
+    autocompleteEndpoint: `/katello/api/v2/${pluralLabel}`,
+    autocompleteQueryParams: { content_view_version_id: versionId },
+    bookmarkController: 'katello_content_view_components',
     fetchItems: params =>
       getContent(pluralLabel, { content_view_version_id: versionId, ...params }),
     columnHeaders,

data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/ContentViewVersionDetailsTable.js

@@ -32,6 +32,8 @@ const ContentViewVersionDetailsTable = ({
     responseSelector,
     statusSelector,
     autocompleteEndpoint,
+    autocompleteQueryParams,
+    bookmarkController,
     fetchItems,
     columnHeaders,
     hideSearch,
@@ -77,6 +79,8 @@ const ContentViewVersionDetailsTable = ({
           updateSearchQuery,
           status,
           autocompleteEndpoint,
+          autocompleteQueryParams,
+          bookmarkController,
           hideSearch,
         }}
         ouiaId={`content-view-version-details-${kebabCase(route)}-table`}

data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/__tests__/ContentViewVersionDetails.test.js

@@ -2,11 +2,10 @@ import React from 'react';
 import { renderWithRedux, patientlyWaitFor } from 'react-testing-lib-wrapper';
 import { Route } from 'react-router-dom';
 import { head, last } from 'lodash';
-import { nockInstance, assertNockRequest, mockSetting, mockAutocomplete } from '../../../../../../test-utils/nockWrapper';
+import { nockInstance, assertNockRequest, mockAutocomplete } from '../../../../../../test-utils/nockWrapper';
 import api from '../../../../../../services/api';
 import { cvVersionDetailsKey } from '../../../../ContentViewsConstants';
 import ContentViewVersionDetails from '../ContentViewVersionDetails';
-import { AUTOSEARCH_DELAY, AUTOSEARCH_WHILE_TYPING } from '../../../../../Settings/SettingsConstants';
 import ContentViewVersionDetailsData from './ContentViewVersionDetails.fixtures.json';
 import ContentViewVersionDetailsCounts from './ContentViewVersionDetailsCounts.fixtures.json';
 import cvDetailData from '../../../../__tests__/mockDetails.fixtures.json';
@@ -42,6 +41,28 @@ const renderOptions = {
   },
 };
 
+const autocompleteQuery = name => ((name === 'Repositories') ? {
+  archived: true,
+  organization_id: 1,
+  content_view_version_id: 73,
+  search: '',
+} : {
+  organization_id: 1,
+  content_view_version_id: 73,
+  search: '',
+});
+
+const queryParams = name => ((name === 'Repositories') ? {
+  archived: true,
+  content_view_version_id: 73,
+  per_page: 20,
+  page: 1,
+} : {
+  content_view_version_id: 73,
+  per_page: 20,
+  page: 1,
+});
+
 beforeEach(() => {
   envScope = nockInstance
     .get(environmentPathsPath)
@@ -90,7 +111,6 @@ test('Can show versions details - Components Tab', async (done) => {
   assertNockRequest(componentScope, done);
 });
 
-
 const testConfig = [
   {
     name: 'Repositories',
@@ -196,9 +216,11 @@ testConfig.forEach(({
   test(`Can show versions details - ${name} Tab`, async (done) => {
     const { version } = ContentViewVersionDetailsData;
 
-    const autocompleteScope = mockAutocomplete(nockInstance, autoCompleteUrl);
-    const searchDelayScope = mockSetting(nockInstance, AUTOSEARCH_DELAY);
-    const autoSearchScope = mockSetting(nockInstance, AUTOSEARCH_WHILE_TYPING);
+    const autocompleteScope = mockAutocomplete(
+      nockInstance,
+      autoCompleteUrl,
+      autocompleteQuery(name),
+    );
 
     const scope = nockInstance
       .get(cvVersions)
@@ -207,7 +229,7 @@ testConfig.forEach(({
 
     const tabScope = nockInstance
       .get(dataUrl)
-      .query(true)
+      .query(queryParams(name))
       .reply(200, data);
 
     const { getByText, queryByText } = renderWithRedux(
@@ -231,8 +253,6 @@ testConfig.forEach(({
     });
 
     assertNockRequest(autocompleteScope);
-    assertNockRequest(searchDelayScope);
-    assertNockRequest(autoSearchScope);
     assertNockRequest(scope);
     assertNockRequest(tabScope);
     assertNockRequest(scope, done);
@@ -247,9 +267,7 @@ test('Can change repository selector', async (done) => {
   } = testConfig[1]; // RPM Packages
 
   const { version } = ContentViewVersionDetailsData;
-  const autocompleteScope = mockAutocomplete(nockInstance, autoCompleteUrl);
-  const searchDelayScope = mockSetting(nockInstance, AUTOSEARCH_DELAY, 0);
-  const autoSearchScope = mockSetting(nockInstance, AUTOSEARCH_WHILE_TYPING);
+  const autocompleteScope = mockAutocomplete(nockInstance, autoCompleteUrl, autocompleteQuery);
 
   const scope = nockInstance
     .get(cvVersions)
@@ -297,8 +315,6 @@ test('Can change repository selector', async (done) => {
   });
 
   assertNockRequest(autocompleteScope);
-  assertNockRequest(searchDelayScope);
-  assertNockRequest(autoSearchScope);
   assertNockRequest(scope);
   assertNockRequest(tabScope);
   assertNockRequest(scope, done);

data/webpack/scenes/ContentViews/Table/ContentViewsTable.js

@@ -162,7 +162,7 @@ const ContentViewTable = () => {
       bookmarkController="katello_content_views"
       variant={TableVariant.compact}
       status={status}
-      autocompleteEndpoint="/content_views/auto_complete_search"
+      autocompleteEndpoint="/katello/api/v2/content_views"
       primaryActionButton={canCreate ? (
         <Button
           ouiaId="create-content-view"