katello 4.5.1 → 4.8.0.rc2

data/webpack/components/extensions/HostDetails/Tabs/__tests__/errataTab.test.js

@@ -1,14 +1,13 @@
 import React from 'react';
 import { isEqual } from 'lodash';
 import { renderWithRedux, patientlyWaitFor, within, fireEvent } from 'react-testing-lib-wrapper';
-import { nockInstance, assertNockRequest, mockForemanAutocomplete, mockSetting } from '../../../../../test-utils/nockWrapper';
+import { nockInstance, assertNockRequest, mockForemanAutocomplete } from '../../../../../test-utils/nockWrapper';
 import { foremanApi } from '../../../../../services/api';
 import { HOST_ERRATA_KEY, ERRATA_SEARCH_QUERY } from '../ErrataTab/HostErrataConstants';
 import { REX_FEATURES } from '../RemoteExecutionConstants';
 import { ErrataTab } from '../ErrataTab/ErrataTab.js';
 import mockErrataData from './errata.fixtures.json';
 import mockResolveErrataTask from './resolveErrata.fixtures.json';
-import mockBookmarkData from './bookmarks.fixtures.json';
 
 jest.mock('../../hostDetailsHelpers', () => ({
   ...jest.requireActual('../../hostDetailsHelpers'),
@@ -23,10 +22,21 @@ const contentFacetAttributes = {
   uuid: 'e5761ea3-4117-4ecf-83d0-b694f99b389e',
   content_view_default: false,
   lifecycle_environment_library: false,
+  errata_counts: {
+    total: 3,
+  },
 };
-const hostName = 'foo.example.com';
 
-const errataBookmarks = foremanApi.getApiUrl('/bookmarks?search=controller%3Dkatello_errata');
+const cfWithErrataTotal = total => ({
+  ...contentFacetAttributes,
+  errata_counts: {
+    total,
+  },
+});
+
+const cfNoErrata = cfWithErrataTotal(0);
+
+const hostName = 'foo.example.com';
 
 const renderOptions = (facetAttributes = contentFacetAttributes) => ({
   apiNamespace: HOST_ERRATA_KEY,
@@ -36,6 +46,8 @@ const renderOptions = (facetAttributes = contentFacetAttributes) => ({
         response: {
           id: 1,
           name: hostName,
+          errata_status_label: 'Security errata applicable',
+          errata_status: 2,
           content_facet_attributes: { ...facetAttributes },
         },
         status: 'RESOLVED',
@@ -93,22 +105,10 @@ const applyByKatelloAgentUrl = foremanApi.getApiUrl('/hosts/1/errata/apply');
 
 let firstErrata;
 let thirdErrata;
-let searchDelayScope;
-let autoSearchScope;
-let bookmarkScope;
 
 beforeEach(() => {
   const { results } = mockErrataData;
   [firstErrata, , thirdErrata] = results;
-  bookmarkScope = nockInstance.get(errataBookmarks).reply(200, mockBookmarkData);
-  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
-  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
-});
-
-afterEach(() => {
-  assertNockRequest(searchDelayScope);
-  assertNockRequest(autoSearchScope);
-  assertNockRequest(bookmarkScope);
 });
 
 test('Can call API for errata and show on screen on page load', async (done) => {
@@ -145,10 +145,10 @@ test('Can handle no errata being present', async (done) => {
     .query(defaultQuery)
     .reply(200, noResults);
 
-  const { queryByText } = renderWithRedux(<ErrataTab />, renderOptions());
+  const { queryByText } = renderWithRedux(<ErrataTab />, renderOptions(cfNoErrata));
 
   // Assert that there are not any errata showing on the screen.
-  await patientlyWaitFor(() => expect(queryByText('This host has errata that are applicable, but not installable.')).toBeInTheDocument());
+  await patientlyWaitFor(() => expect(queryByText('This host has errata that are applicable, but not installable. Adjust your filters and try again.')).toBeInTheDocument());
   // Assert request was made and completed, see helper function
   assertNockRequest(autocompleteScope);
   assertNockRequest(scope, done); // Pass jest callback to confirm test is done
@@ -252,7 +252,7 @@ test('Can select all errata across pages through checkbox', async (done) => {
     getAllByText,
     getByLabelText,
     getAllByLabelText,
-  } = renderWithRedux(<ErrataTab />, renderOptions());
+  } = renderWithRedux(<ErrataTab />, renderOptions(cfWithErrataTotal(mockErrata.total)));
 
   // Assert that the errata are now showing on the screen, but wait for them to appear.
   await patientlyWaitFor(() => expect(getAllByText('Important')[0]).toBeInTheDocument());
@@ -293,7 +293,7 @@ test('Can deselect all errata across pages through checkbox', async (done) => {
     getAllByText,
     getByLabelText,
     getAllByLabelText,
-  } = renderWithRedux(<ErrataTab />, renderOptions());
+  } = renderWithRedux(<ErrataTab />, renderOptions(cfWithErrataTotal(mockErrata.total)));
 
   // Assert that the errata are now showing on the screen, but wait for them to appear.
   await patientlyWaitFor(() => expect(getAllByText('Important')[0]).toBeInTheDocument());
@@ -337,7 +337,7 @@ test('Can select & deselect errata across pages', async (done) => {
     getAllByText,
     getByLabelText,
     getAllByLabelText,
-  } = renderWithRedux(<ErrataTab />, renderOptions());
+  } = renderWithRedux(<ErrataTab />, renderOptions(cfWithErrataTotal(100)));
 
   // Assert that the errata are now showing on the screen, but wait for them to appear.
   await patientlyWaitFor(() => expect(getAllByText('Important')[0]).toBeInTheDocument());
@@ -373,7 +373,7 @@ test('Can select & de-select all errata through selectDropDown', async (done) =>
     queryByText,
     getAllByText,
     getByLabelText,
-  } = renderWithRedux(<ErrataTab />, renderOptions());
+  } = renderWithRedux(<ErrataTab />, renderOptions(cfWithErrataTotal(mockErrata.total)));
 
   // Assert that the errata are now showing on the screen, but wait for them to appear.
   await patientlyWaitFor(() => expect(getAllByText('Important')[0]).toBeInTheDocument());
@@ -425,7 +425,7 @@ test('Can de-select items in select all mode across pages', async (done) => {
     getAllByText,
     getByLabelText,
     getAllByLabelText,
-  } = renderWithRedux(<ErrataTab />, renderOptions());
+  } = renderWithRedux(<ErrataTab />, renderOptions(cfWithErrataTotal(mockErrata.total)));
 
   // Assert that the errata are now showing on the screen, but wait for them to appear.
   await patientlyWaitFor(() => expect(getAllByText('Important')[0]).toBeInTheDocument());
@@ -482,7 +482,7 @@ test('Can select page and select only items on the page', async (done) => {
     queryByText,
     getAllByText,
     getByLabelText,
-  } = renderWithRedux(<ErrataTab />, renderOptions());
+  } = renderWithRedux(<ErrataTab />, renderOptions(cfWithErrataTotal(mockErrata.total)));
 
   // Assert that the errata are now showing on the screen, but wait for them to appear.
   await patientlyWaitFor(() => expect(getAllByText('Important')[0]).toBeInTheDocument());
@@ -516,7 +516,7 @@ test('Select all is disabled if all rows are selected', async (done) => {
     queryByText,
     getAllByText,
     getByLabelText,
-  } = renderWithRedux(<ErrataTab />, renderOptions());
+  } = renderWithRedux(<ErrataTab />, renderOptions(cfWithErrataTotal(mockErrata.total)));
 
   // Assert that the errata are now showing on the screen, but wait for them to appear.
   await patientlyWaitFor(() => expect(getAllByText('Important')[0]).toBeInTheDocument());
@@ -568,7 +568,7 @@ test('Toggle Group shows if it\'s not the default content view or library enviro
   const {
     queryByLabelText,
     getAllByText,
-  } = renderWithRedux(<ErrataTab />, renderOptions());
+  } = renderWithRedux(<ErrataTab />, renderOptions(cfWithErrataTotal(mockErrata.total)));
 
   // Assert that the errata are now showing on the screen, but wait for them to appear.
   await patientlyWaitFor(() => expect(getAllByText('Important')[0]).toBeInTheDocument());
@@ -578,13 +578,13 @@ test('Toggle Group shows if it\'s not the default content view or library enviro
 });
 
 test('Toggle Group shows if it\'s the default content view but non-library environment', async (done) => {
-  const options = renderOptions({
-    ...contentFacetAttributes,
-    content_view_default: true,
-  });
   // Setup autocomplete with mockForemanAutoComplete since we aren't adding /katello
   const autocompleteScope = mockForemanAutocomplete(nockInstance, autocompleteUrl);
   const mockErrata = makeMockErrata({});
+  const options = renderOptions({
+    ...cfWithErrataTotal(mockErrata.total),
+    content_view_default: true,
+  });
   // return errata data results when we look for errata
   const scope = nockInstance
     .get(hostErrata)
@@ -604,13 +604,14 @@ test('Toggle Group shows if it\'s the default content view but non-library envir
 });
 
 test('Toggle Group shows if it\'s the library environment but non-default content view', async (done) => {
-  const options = renderOptions({
-    ...contentFacetAttributes,
-    lifecycle_environment_library: true,
-  });
   // Setup autocomplete with mockForemanAutoComplete since we aren't adding /katello
   const autocompleteScope = mockForemanAutocomplete(nockInstance, autocompleteUrl);
   const mockErrata = makeMockErrata({});
+  const options = renderOptions({
+    ...cfWithErrataTotal(mockErrata.total),
+    lifecycle_environment_library: true,
+  });
+
   // return errata data results when we look for errata
   const scope = nockInstance
     .get(hostErrata)
@@ -630,14 +631,14 @@ test('Toggle Group shows if it\'s the library environment but non-default conten
 });
 
 test('Toggle Group does not show if it\'s the default content view and library environment', async (done) => {
+  // Setup autocomplete with mockForemanAutoComplete since we aren't adding /katello
+  const autocompleteScope = mockForemanAutocomplete(nockInstance, autocompleteUrl);
+  const mockErrata = makeMockErrata({});
   const options = renderOptions({
-    ...contentFacetAttributes,
+    ...cfWithErrataTotal(mockErrata.total),
     content_view_default: true,
     lifecycle_environment_library: true,
   });
-  // Setup autocomplete with mockForemanAutoComplete since we aren't adding /katello
-  const autocompleteScope = mockForemanAutocomplete(nockInstance, autocompleteUrl);
-  const mockErrata = makeMockErrata({});
   // return errata data results when we look for errata
   const scope = nockInstance
     .get(hostErrata)
@@ -669,7 +670,7 @@ test('Selection is disabled for errata which are applicable but not installable'
   const {
     getAllByText,
     getByLabelText,
-  } = renderWithRedux(<ErrataTab />, renderOptions());
+  } = renderWithRedux(<ErrataTab />, renderOptions(cfWithErrataTotal(3)));
 
   // Assert that the errata are now showing on the screen, but wait for them to appear.
   await patientlyWaitFor(() => expect(getAllByText(firstErrata.severity)[0]).toBeInTheDocument());
@@ -705,7 +706,7 @@ test('Can select only installable errata across pages through checkbox', async (
     getAllByText,
     getByLabelText,
     getAllByLabelText,
-  } = renderWithRedux(<ErrataTab />, renderOptions());
+  } = renderWithRedux(<ErrataTab />, renderOptions(cfWithErrataTotal(mockErrata.total)));
 
   // Assert that the errata are now showing on the screen, but wait for them to appear.
   await patientlyWaitFor(() => expect(getAllByText('Important')[0]).toBeInTheDocument());
@@ -736,14 +737,16 @@ test('Can toggle with the Toggle Group ', async (done) => {
 
   const {
     queryByLabelText,
+    getByText,
     getAllByText,
-  } = renderWithRedux(<ErrataTab />, renderOptions());
+  } = renderWithRedux(<ErrataTab />, renderOptions(cfWithErrataTotal(mockErrata.total)));
 
   // Assert that the errata are now showing on the screen, but wait for them to appear.
   await patientlyWaitFor(() => expect(getAllByText('Important')[0]).toBeInTheDocument());
   expect(queryByLabelText('Installable Errata')).toBeInTheDocument();
-  expect(queryByLabelText('Show Installable')).toHaveAttribute('aria-pressed', 'true');
-  expect(queryByLabelText('Show All')).toHaveAttribute('aria-pressed', 'false');
+  expect(getByText('Applicable')).toBeInTheDocument();
+  expect(getByText('Applicable').parentElement).toHaveAttribute('aria-pressed', 'false');
+  expect(getAllByText('Installable')[0].parentElement).toHaveAttribute('aria-pressed', 'true');
   assertNockRequest(autocompleteScope);
   assertNockRequest(scope, done); // Pass jest callback to confirm test is done
 });
@@ -766,7 +769,7 @@ test('Can filter by errata type', async (done) => {
     getByRole,
     getAllByText,
     getByText,
-  } = renderWithRedux(<ErrataTab />, renderOptions());
+  } = renderWithRedux(<ErrataTab />, renderOptions(cfWithErrataTotal(3)));
 
   // Assert that the errata are now showing on the screen, but wait for them to appear.
   await patientlyWaitFor(() => expect(getAllByText('Important')[0]).toBeInTheDocument());
@@ -787,8 +790,6 @@ test('Can filter by errata type', async (done) => {
 
   assertNockRequest(autocompleteScope);
   assertNockRequest(scope);
-  assertNockRequest(searchDelayScope);
-  assertNockRequest(autoSearchScope);
   assertNockRequest(scope2, done); // Pass jest callback to confirm test is done
 });
 
@@ -810,7 +811,7 @@ test('Can filter by severity', async (done) => {
     queryByLabelText,
     getAllByText,
     getByText,
-  } = renderWithRedux(<ErrataTab />, renderOptions());
+  } = renderWithRedux(<ErrataTab />, renderOptions(cfWithErrataTotal(3)));
 
   // Assert that the errata are now showing on the screen, but wait for them to appear.
   await patientlyWaitFor(() => expect(getAllByText('Important')[0]).toBeInTheDocument());
@@ -835,8 +836,6 @@ test('Can filter by severity', async (done) => {
 
   assertNockRequest(autocompleteScope);
   assertNockRequest(scope);
-  assertNockRequest(searchDelayScope);
-  assertNockRequest(autoSearchScope);
   assertNockRequest(scope2, done); // Pass jest callback to confirm test is done
 });
 
@@ -844,7 +843,7 @@ test('apply button chooses katello agent if enabled', async (done) => {
   const autocompleteScope = mockForemanAutocomplete(nockInstance, autocompleteUrl);
   const mockErrata = makeMockErrata({});
   const options = renderOptions({
-    ...contentFacetAttributes,
+    ...cfWithErrataTotal(mockErrata.total),
     katelloAgentInstalled: true,
     katelloAgentEnabled: true,
   });
@@ -882,7 +881,7 @@ test('Can bulk apply via katello agent', async (done) => {
   const mockErrata = makeMockErrata({});
   const { results } = mockErrata;
   const options = renderOptions({
-    ...contentFacetAttributes,
+    ...cfWithErrataTotal(mockErrata.total),
     katelloAgentInstalled: true,
     katelloAgentEnabled: true,
   });
@@ -928,7 +927,7 @@ test('Can select all, exclude and bulk apply via katello agent', async (done) =>
   const mockErrata = makeMockErrata({});
   const { results } = mockErrata;
   const options = renderOptions({
-    ...contentFacetAttributes,
+    ...cfWithErrataTotal(mockErrata.total),
     katelloAgentInstalled: true,
     katelloAgentEnabled: true,
   });
@@ -973,7 +972,7 @@ test('Apply button chooses remote execution', async (done) => {
   const autocompleteScope = mockForemanAutocomplete(nockInstance, autocompleteUrl);
   const mockErrata = makeMockErrata({});
   const options = renderOptions({
-    ...contentFacetAttributes,
+    ...cfWithErrataTotal(mockErrata.total),
     katelloAgentInstalled: true,
     katelloAgentEnabled: true,
     remoteExecutionByDefault: true,
@@ -1029,7 +1028,7 @@ test('Can bulk apply via remote execution', async (done) => {
 
   const { getAllByText, getByLabelText, queryByText } = renderWithRedux(
     <ErrataTab />,
-    renderOptions(),
+    renderOptions(cfWithErrataTotal(mockErrata.total)),
   );
   // Assert that the errata are now showing on the screen, but wait for them to appear.
   await patientlyWaitFor(() => expect(getAllByText('Important')[0]).toBeInTheDocument());
@@ -1068,7 +1067,7 @@ test('Can select all, exclude and bulk apply via remote execution', async (done)
 
   const { getAllByText, getByLabelText, queryByText } = renderWithRedux(
     <ErrataTab />,
-    renderOptions(),
+    renderOptions(cfWithErrataTotal(mockErrata.total)),
   );
   // Assert that the errata are now showing on the screen, but wait for them to appear.
   await patientlyWaitFor(() => expect(getAllByText('Important')[0]).toBeInTheDocument());
@@ -1099,7 +1098,7 @@ test('Can apply errata in bulk via customized remote execution', async (done) =>
 
   const { getAllByText, getByLabelText, queryByText } = renderWithRedux(
     <ErrataTab />,
-    renderOptions(),
+    renderOptions(cfWithErrataTotal(mockErrata.total)),
   );
 
   await patientlyWaitFor(() => expect(getAllByText('Important')[0]).toBeInTheDocument());
@@ -1114,7 +1113,7 @@ test('Can apply errata in bulk via customized remote execution', async (done) =>
   expect(viaRexAction).toBeInTheDocument();
   expect(viaRexAction).toHaveAttribute(
     'href',
-    `/job_invocations/new?feature=${feature}&host_ids=name%20%5E%20(${hostName})&inputs%5BErrata%20search%20query%5D=errata_id%20%5E%20(${errata})`,
+    `/job_invocations/new?feature=${feature}&search=name%20%5E%20(${hostName})&inputs%5BErrata%20search%20query%5D=errata_id%20%5E%20(${errata})`,
   );
 
   viaRexAction.click();
@@ -1127,7 +1126,7 @@ test('Can apply a single erratum to the host via katello agent', async (done) =>
   const mockErrata = makeMockErrata({});
   const { results } = mockErrata;
   const options = renderOptions({
-    ...contentFacetAttributes,
+    ...cfWithErrataTotal(mockErrata.total),
     katelloAgentInstalled: true,
     katelloAgentEnabled: true,
   });
@@ -1183,7 +1182,7 @@ test('Can apply a single erratum to the host via remote execution', async (done)
 
   const { getByText, getAllByText, getByLabelText } = renderWithRedux(
     <ErrataTab />,
-    renderOptions(),
+    renderOptions(cfWithErrataTotal(mockErrata.total)),
   );
   await patientlyWaitFor(() => expect(getAllByText('Important')[0]).toBeInTheDocument());
   const erratumActionMenu = within(getByLabelText('Select row 0').closest('tr')).getByLabelText('Actions');
@@ -1215,7 +1214,7 @@ test('Can apply a single erratum to the host via customized remote execution', a
 
   const { getByText, getAllByText, getByLabelText } = renderWithRedux(
     <ErrataTab />,
-    renderOptions(),
+    renderOptions(cfWithErrataTotal(mockErrata.total)),
   );
   await patientlyWaitFor(() => expect(getAllByText('Important')[0]).toBeInTheDocument());
   const erratumActionMenu = within(getByLabelText('Select row 0').closest('tr')).getByLabelText('Actions');
@@ -1230,7 +1229,7 @@ test('Can apply a single erratum to the host via customized remote execution', a
   viaRexAction.click();
   expect(viaRexAction).toHaveAttribute(
     'href',
-    `/job_invocations/new?feature=${feature}&host_ids=name%20%5E%20(${hostName})&inputs%5BErrata%20search%20query%5D=errata_id%20=%20${errataId}`,
+    `/job_invocations/new?feature=${feature}&search=name%20%5E%20(${hostName})&inputs%5BErrata%20search%20query%5D=errata_id%20=%20${errataId}`,
   );
   assertNockRequest(autocompleteScope);
   assertNockRequest(scope, done);

data/webpack/components/extensions/HostDetails/Tabs/__tests__/moduleStreamsTab.test.js

@@ -1,10 +1,9 @@
 import React from 'react';
 import { act } from 'react-test-renderer';
 import { renderWithRedux, patientlyWaitFor, within, fireEvent } from 'react-testing-lib-wrapper';
-import { nockInstance, assertNockRequest, mockForemanAutocomplete, mockSetting } from '../../../../../test-utils/nockWrapper';
+import { nockInstance, assertNockRequest, mockForemanAutocomplete } from '../../../../../test-utils/nockWrapper';
 import { ModuleStreamsTab } from '../ModuleStreamsTab/ModuleStreamsTab.js';
 import mockModuleStreams from './moduleStreams.fixtures.json';
-import mockBookmarkData from './bookmarks.fixtures.json';
 import { MODULE_STREAMS_KEY } from '../../../../../scenes/ModuleStreams/ModuleStreamsConstants';
 import { foremanApi } from '../../../../../services/api';
 
@@ -15,8 +14,6 @@ jest.mock('../../hostDetailsHelpers', () => ({
   }),
 }));
 
-const moduleBookmarks = foremanApi.getApiUrl('/bookmarks?search=controller%3Dkatello_host_available_module_streams');
-
 const contentFacetAttributes = {
   id: 11,
   uuid: 'e5761ea3-4117-4ecf-83d0-b694f99b389e',
@@ -44,34 +41,10 @@ const hostModuleStreams = foremanApi.getApiUrl('/hosts/1/module_streams');
 const autocompleteUrl = '/hosts/1/module_streams/auto_complete_search';
 
 let firstModuleStreams;
-let searchDelayScope;
-let autoSearchScope;
-let bookmarkScope;
-
-beforeEach(() => {
-  const { results } = mockModuleStreams;
-  [firstModuleStreams] = results;
-  bookmarkScope = nockInstance.get(moduleBookmarks).reply(200, mockBookmarkData);
-  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
-  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
-});
-
-afterEach(() => {
-  assertNockRequest(searchDelayScope);
-  assertNockRequest(autoSearchScope);
-  assertNockRequest(bookmarkScope);
-});
 
 beforeEach(() => {
   const { results } = mockModuleStreams;
   [firstModuleStreams] = results;
-  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
-  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
-});
-
-afterEach(() => {
-  assertNockRequest(searchDelayScope);
-  assertNockRequest(autoSearchScope);
 });
 
 test('Can call API for Module streams and show on screen on page load', async (done) => {
@@ -208,8 +181,8 @@ test('Can provide dropdown actions with redirects on Module Streams with customi
   await patientlyWaitFor(() => expect(getByLabelText('customize-checkbox-3')).toBeInTheDocument());
   fireEvent.click(getByLabelText('customize-checkbox-3'));
   await patientlyWaitFor(() => expect(getByText('Enable')).toBeInTheDocument());
-  expect(getByText('Enable')).toHaveAttribute('href', '/job_invocations/new?feature=katello_module_stream_action&host_ids=name%20%5E%20(test-host)&inputs%5Baction%5D=enable&inputs%5Bmodule_spec%5D=walrus:2.4');
-  expect(getByText('Install')).toHaveAttribute('href', '/job_invocations/new?feature=katello_module_stream_action&host_ids=name%20%5E%20(test-host)&inputs%5Baction%5D=install&inputs%5Bmodule_spec%5D=walrus:2.4');
+  expect(getByText('Enable')).toHaveAttribute('href', '/job_invocations/new?feature=katello_module_stream_action&search=name%20%5E%20(test-host)&inputs%5Baction%5D=enable&inputs%5Bmodule_spec%5D=walrus:2.4');
+  expect(getByText('Install')).toHaveAttribute('href', '/job_invocations/new?feature=katello_module_stream_action&search=name%20%5E%20(test-host)&inputs%5Baction%5D=install&inputs%5Bmodule_spec%5D=walrus:2.4');
   assertNockRequest(autocompleteScope);
   assertNockRequest(scope, done);
   act(done);

data/webpack/components/extensions/HostDetails/Tabs/__tests__/packageInstallModal.test.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { renderWithRedux, patientlyWaitFor, fireEvent, within } from 'react-testing-lib-wrapper';
-import { nockInstance, assertNockRequest, mockForemanAutocomplete, mockSetting } from '../../../../../test-utils/nockWrapper';
+import { nockInstance, assertNockRequest, mockForemanAutocomplete } from '../../../../../test-utils/nockWrapper';
 import katelloApi, { foremanApi } from '../../../../../services/api';
 import mockPackagesData from './yumInstallablePackages.fixtures.json';
 import PackageInstallModal from '../PackagesTab/PackageInstallModal';
@@ -54,19 +54,10 @@ const defaultQuery = {
 
 let firstPackages;
 let secondPackages;
-let searchDelayScope;
-let autoSearchScope;
 
 beforeEach(() => {
   const { results } = mockPackagesData;
   [firstPackages, secondPackages] = results;
-  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 500);
-  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing', true);
-});
-
-afterEach(() => {
-  assertNockRequest(searchDelayScope);
-  assertNockRequest(autoSearchScope);
 });
 
 test('Can call API for installable packages and show on screen on page load', async (done) => {
@@ -310,7 +301,7 @@ test('Can install a package via customized remote execution', async (done) => {
   expect(customizedRexOption).toBeInTheDocument();
   expect(customizedRexOption).toHaveAttribute(
     'href',
-    `/job_invocations/new?feature=${REX_FEATURES.KATELLO_PACKAGE_INSTALL}&host_ids=name%20%5E%20(test-host)&inputs%5Bpackage%5D=duck,cheetah`,
+    `/job_invocations/new?feature=${REX_FEATURES.KATELLO_PACKAGE_INSTALL}&search=name%20%5E%20(test-host)&inputs%5Bpackage%5D=duck,cheetah`,
   );
   assertNockRequest(autocompleteScope);
   assertNockRequest(scope, done);
@@ -348,7 +339,7 @@ test('Uses package_install_by_search_query template when in select all mode', as
   expect(customizedRexOption).toBeInTheDocument();
   expect(customizedRexOption).toHaveAttribute(
     'href',
-    `/job_invocations/new?feature=${REX_FEATURES.KATELLO_PACKAGE_INSTALL_BY_SEARCH}&host_ids=name%20%5E%20(test-host)&inputs%5BPackage%20search%20query%5D=id%20!%5E%20(32376)`,
+    `/job_invocations/new?feature=${REX_FEATURES.KATELLO_PACKAGE_INSTALL_BY_SEARCH}&search=name%20%5E%20(test-host)&inputs%5BPackage%20search%20query%5D=id%20!%5E%20(32376)`,
   );
   assertNockRequest(autocompleteScope);
   assertNockRequest(scope, done);

data/webpack/components/extensions/HostDetails/Tabs/__tests__/packages.fixtures.json

@@ -10,19 +10,19 @@
 	"id": 738,
 	"name": "coreutils",
 	"nvra": "coreutils-8.30-6.el8.x86_64",
-	"upgradable_version": "coreutils-9.0-1.el8.x86_64"
+	"upgradable_versions": ["coreutils-9.0-1.el8.x86_64"]
     },
     {
 	"id": 646,
 	"name": "chrony",
 	"nvra": "chrony-3.3-3.el8.x86_64",
-	"upgradable_version": "chrony-4.0-1.el8.x86_64"
+	"upgradable_versions": ["chrony-4.0-1.el8.x86_64"]
     },
     {
         "id": 676,
 	"name": "acl",
 	"nvra": "acl-2.2.53-1.el8.x86_64",
-	"upgradable_version": null
+	"upgradable_versions": null
      }
   ]
 }

data/webpack/components/extensions/HostDetails/Tabs/__tests__/packagesTab.test.js

@@ -1,13 +1,12 @@
 import React from 'react';
 import { renderWithRedux, patientlyWaitFor, fireEvent } from 'react-testing-lib-wrapper';
-import { nockInstance, assertNockRequest, mockForemanAutocomplete, mockSetting } from '../../../../../test-utils/nockWrapper';
+import { nockInstance, assertNockRequest, mockForemanAutocomplete } from '../../../../../test-utils/nockWrapper';
 import { foremanApi } from '../../../../../services/api';
-import { HOST_PACKAGES_KEY, PACKAGES_SEARCH_QUERY } from '../PackagesTab/HostPackagesConstants';
+import { HOST_PACKAGES_KEY, PACKAGES_SEARCH_QUERY, SELECTED_UPDATE_VERSIONS } from '../PackagesTab/HostPackagesConstants';
 import { PackagesTab } from '../PackagesTab/PackagesTab.js';
 import mockPackagesData from './packages.fixtures.json';
 import { REX_FEATURES } from '../RemoteExecutionConstants';
 import * as hooks from '../../../../Table/TableHooks';
-import mockBookmarkData from './bookmarks.fixtures.json';
 
 jest.mock('../../hostDetailsHelpers', () => ({
   ...jest.requireActual('../../hostDetailsHelpers'),
@@ -25,8 +24,6 @@ const contentFacetAttributes = {
 };
 
 const hostname = 'test-host.example.com';
-const packageBookmarks = foremanApi.getApiUrl('/bookmarks?search=controller%3Dkatello_host_installed_packages');
-
 const renderOptions = (facetAttributes = contentFacetAttributes) => ({
   apiNamespace: HOST_PACKAGES_KEY,
   initialState: {
@@ -61,22 +58,10 @@ const defaultQuery = { ...defaultQueryWithoutSearch, search: '' };
 
 let firstPackage;
 let secondPackage;
-let searchDelayScope;
-let autoSearchScope;
-let bookmarkScope;
 
 beforeEach(() => {
   const { results } = mockPackagesData;
   [firstPackage, secondPackage] = results;
-  bookmarkScope = nockInstance.get(packageBookmarks).reply(200, mockBookmarkData);
-  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 0);
-  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing');
-});
-
-afterEach(() => {
-  assertNockRequest(searchDelayScope);
-  assertNockRequest(autoSearchScope);
-  assertNockRequest(bookmarkScope);
 });
 
 test('Can call API for packages and show on screen on page load', async (done) => {
@@ -159,8 +144,6 @@ test('Can filter by package status', async (done) => {
 
   assertNockRequest(autocompleteScope);
   assertNockRequest(scope);
-  assertNockRequest(searchDelayScope);
-  assertNockRequest(autoSearchScope);
   assertNockRequest(scope2, done); // Pass jest callback to confirm test is done
 });
 
@@ -181,7 +164,7 @@ test('Can upgrade a package via remote execution', async (done) => {
     .post(jobInvocations, {
       job_invocation: {
         inputs: {
-          package: firstPackage.upgradable_version,
+          package: firstPackage.upgradable_versions[0],
         },
         search_query: `name ^ (${hostname})`,
         feature: REX_FEATURES.KATELLO_PACKAGE_UPDATE,
@@ -256,12 +239,12 @@ test('Can upgrade a package via customized remote execution', async (done) => {
 
   const rexAction = getByText('Upgrade via customized remote execution');
   const feature = REX_FEATURES.KATELLO_PACKAGE_UPDATE;
-  const packageName = firstPackage.upgradable_version;
+  const packageName = firstPackage.upgradable_versions[0];
 
   expect(rexAction).toBeInTheDocument();
   expect(rexAction).toHaveAttribute(
     'href',
-    `/job_invocations/new?feature=${feature}&host_ids=name%20%5E%20(${hostname})&inputs%5Bpackage%5D=${packageName}`,
+    `/job_invocations/new?feature=${feature}&search=name%20%5E%20(${hostname})&inputs%5Bpackage%5D=${packageName}`,
   );
 
   fireEvent.click(rexAction);
@@ -284,6 +267,7 @@ test('Can bulk upgrade via remote execution', async (done) => {
       job_invocation: {
         inputs: {
           [PACKAGES_SEARCH_QUERY]: `id ^ (${firstPackage.id},${secondPackage.id})`,
+          [SELECTED_UPDATE_VERSIONS]: JSON.stringify([]),
         },
         search_query: `name ^ (${hostname})`,
         feature: REX_FEATURES.KATELLO_PACKAGES_UPDATE_BY_SEARCH,
@@ -337,7 +321,7 @@ test('Can bulk upgrade via customized remote execution', async (done) => {
   const feature = REX_FEATURES.KATELLO_PACKAGES_UPDATE_BY_SEARCH;
   const packages = `${firstPackage.id},${secondPackage.id}`;
   const job =
-    `/job_invocations/new?feature=${feature}&host_ids=name%20%5E%20(${hostname})&inputs%5BPackages%20search%20query%5D=id%20%5E%20(${packages})`;
+    `/job_invocations/new?feature=${feature}&search=name%20%5E%20(${hostname})&inputs%5BPackages%20search%20query%5D=id%20%5E%20(${packages})&inputs%5BSelected%20update%20versions%5D=%5B%5D`;
 
   getByRole('checkbox', { name: 'Select row 0' }).click();
   expect(getByLabelText('Select row 0').checked).toEqual(true);
@@ -404,7 +388,7 @@ test('Remove is disabled when in select all mode', async (done) => {
   fireEvent.click(selectAllCheckbox);
   getByRole('button', { name: 'bulk_actions' }).click();
 
-  const removeButton = getByRole('button', { name: 'bulk_remove' });
+  const removeButton = getByRole('menuitem', { name: 'bulk_remove' });
   await patientlyWaitFor(() => expect(removeButton).toBeInTheDocument());
   expect(removeButton).toHaveAttribute('aria-disabled', 'true');
 

data/webpack/components/extensions/HostDetails/Tabs/__tests__/repositorySets.fixtures.json

@@ -42,6 +42,7 @@
       "gpgUrl": null,
       "contentUrl": "/custom/ParthaProduct/empty_repo",
       "osRestricted": null,
+      "archRestricted": "noarch",
       "override": "default",
       "overrides": [],
       "enabled_content_override": null
@@ -77,6 +78,7 @@
       "gpgUrl": null,
       "contentUrl": "/custom/ParthaProduct/partha_multi-errata",
       "osRestricted": "rhel-7",
+      "archRestricted": "x86_64",
       "override": "0",
       "overrides": [
         {
@@ -110,6 +112,7 @@
       "gpgUrl": null,
       "contentUrl": "/custom/Pull_Provider/yggdrasil",
       "osRestricted": null,
+      "archRestricted": "noarch",
       "override": "1",
       "overrides": [
         {