katello 4.6.2.1 → 4.7.0.rc1

data/webpack/components/extensions/HostDetails/Tabs/RepositorySetsTab/RepositorySetsTab.js

@@ -355,13 +355,34 @@ const RepositorySetsTab = () => {
   cannot(createBookmarks, userPermissionsFromHostDetails({ hostDetails }));
 
   const dropdownItems = [
-    <DropdownItem aria-label="bulk_enable" key="bulk_enable" ouiaId="bulk_enable" component="button" onClick={enableRepoSets} isDisabled={selectedCount === 0}>
+    <DropdownItem
+      aria-label="bulk_enable"
+      key="bulk_enable"
+      ouiaId="bulk_enable"
+      component="button"
+      onClick={enableRepoSets}
+      isDisabled={selectedCount === 0}
+    >
       {__('Override to enabled')}
     </DropdownItem>,
-    <DropdownItem aria-label="bulk_disable" key="bulk_disable" ouiaId="bulk_disable" component="button" onClick={disableRepoSets} isDisabled={selectedCount === 0}>
+    <DropdownItem
+      aria-label="bulk_disable"
+      key="bulk_disable"
+      ouiaId="bulk_disable"
+      component="button"
+      onClick={disableRepoSets}
+      isDisabled={selectedCount === 0}
+    >
       {__('Override to disabled')}
     </DropdownItem>,
-    <DropdownItem aria-label="bulk_reset_default" key="bulk_reset_default" ouiaId="bulk_reset_default" component="button" onClick={resetToDefaultRepoSets} isDisabled={selectedCount === 0}>
+    <DropdownItem
+      aria-label="bulk_reset_default"
+      key="bulk_reset_default"
+      ouiaId="bulk_reset_default"
+      component="button"
+      onClick={resetToDefaultRepoSets}
+      isDisabled={selectedCount === 0}
+    >
       {__('Reset to default')}
     </DropdownItem>,
   ];

data/webpack/components/extensions/HostDetails/Tabs/TracesTab/EnableTracerModal.js

@@ -43,7 +43,7 @@ const EnableTracerModal = ({ isOpen, setIsOpen, triggerJobStart }) => {
   };
 
   const dropdownItems = dropdownOptions.map(text => (
-    <DropdownItem key={`option_${text}`} onClick={() => setSelectedOption(text)}>{text}</DropdownItem>
+    <DropdownItem key={`option_${text}`} ouiaId={`option_${text}`} onClick={() => setSelectedOption(text)}>{text}</DropdownItem>
   ));
 
   const customizedRexUrl = katelloPackageInstallUrl({ hostname, packages: KATELLO_TRACER_PACKAGE });
@@ -54,6 +54,7 @@ const EnableTracerModal = ({ isOpen, setIsOpen, triggerJobStart }) => {
       return (
         <Button
           key="enable_button"
+          ouiaId="enable-button-via-rex"
           type="submit"
           variant="primary"
           isLoading={buttonLoading}
@@ -67,6 +68,7 @@ const EnableTracerModal = ({ isOpen, setIsOpen, triggerJobStart }) => {
     return (
       <Button
         key="enable_button"
+        ouiaId="enable-button-via-customized-rex"
         component="a"
         isLoading={buttonLoading}
         isDisabled={buttonLoading}
@@ -83,12 +85,13 @@ const EnableTracerModal = ({ isOpen, setIsOpen, triggerJobStart }) => {
     <Modal
       variant={ModalVariant.small}
       title={title}
+      ouiaId="enable-tracer-modal"
       width="28em"
       isOpen={isOpen}
       onClose={handleClose}
       actions={[
         getEnableTracerButton(),
-        <Button key="cancel_button" variant="link" onClick={() => setIsOpen(false)}>{__('Cancel')}</Button>,
+        <Button key="cancel_button" ouiaId="cancel-button" variant="link" onClick={() => setIsOpen(false)}>{__('Cancel')}</Button>,
       ]}
     >
       <Flex direction={{ default: 'column' }}>
@@ -96,9 +99,11 @@ const EnableTracerModal = ({ isOpen, setIsOpen, triggerJobStart }) => {
         <FlexItem><div>{__('Select a provider to install katello-host-tools-tracer')}</div></FlexItem>
         <FlexItem>
           <Dropdown
+            ouiaId="enable-tracer-modal-dropdown"
             toggle={
               <DropdownToggle
                 id="toggle-enable-tracer-modal-dropdown"
+                ouiaId="enable-tracer-modal-dropdown-toggle"
                 onToggle={toggleDropdownOpen}
                 toggleIndicator={CaretDownIcon}
                 isDisabled={buttonLoading}

data/webpack/components/extensions/HostDetails/Tabs/TracesTab/TracesEnabler.js

@@ -23,6 +23,7 @@ const EnableTracerButton = ({ setEnableTracerModalOpen, pollingStarted }) => (
   <Button
     onClick={() => setEnableTracerModalOpen(true)}
     isDisabled={pollingStarted}
+    ouiaId="enable-traces-button"
   >
     {__('Enable Traces')}
   </Button>
@@ -70,7 +71,7 @@ const TracesEnabler = ({ hostname }) => {
         <Spinner /> :
         <EmptyStateIcon icon={WrenchIcon} />
       }
-      <Title headingLevel="h2" size="lg">
+      <Title ouiaId="enable-tracer-title" headingLevel="h2" size="lg">
         {pollingStarted ? enablingTitle : title}
       </Title>
       <EmptyStateBody>

data/webpack/components/extensions/HostDetails/Tabs/TracesTab/TracesTab.js

@@ -125,10 +125,24 @@ const TracesTab = () => {
   cannot(createBookmarks, userPermissionsFromHostDetails({ hostDetails }));
 
   const dropdownItems = [
-    <DropdownItem isDisabled={selectedCount === 0} aria-label="bulk_rex" key="bulk_rex" component="button" onClick={onBulkRestartApp}>
+    <DropdownItem
+      isDisabled={selectedCount === 0}
+      aria-label="bulk_rex"
+      ouiaId="bulk_rex"
+      key="bulk_rex"
+      component="button"
+      onClick={onBulkRestartApp}
+    >
       {__('Restart via remote execution')}
     </DropdownItem>,
-    <DropdownItem isDisabled={selectedCount === 0} aria-label="bulk_rex_customized" key="bulk_rex_customized" component="a" href={bulkCustomizedRexUrl()}>
+    <DropdownItem
+      isDisabled={selectedCount === 0}
+      aria-label="bulk_rex_customized"
+      ouiaId="bulk_rex_customized"
+      key="bulk_rex_customized"
+      component="a"
+      href={bulkCustomizedRexUrl()}
+    >
       {__('Restart via customized remote execution')}
     </DropdownItem>,
   ];
@@ -140,9 +154,11 @@ const TracesTab = () => {
           <ActionListItem>
             <Dropdown
               aria-label="bulk_actions_dropdown"
+              ouiaId="bulk_actions_dropdown"
               toggle={
                 <DropdownToggle
                   aria-label="bulk_actions"
+                  ouiaId="bulk_actions"
                   splitButtonItems={[
                     <DropdownToggleAction key="action" onClick={onBulkRestartApp}>
                       {__('Restart app')}
@@ -205,7 +221,7 @@ const TracesTab = () => {
         requestKey={HOST_TRACES_KEY}
       >
         <Thead>
-          <Tr>
+          <Tr ouiaId="row-header">
             <Th key="select_checkbox" />
             <SortableColumnHeaders
               columnHeaders={columnHeaders}
@@ -239,7 +255,7 @@ const TracesTab = () => {
               ];
             }
             return (
-              <Tr key={id} >
+              <Tr key={id} ouiaId={`row-${id}`} >
                 {showActions ? (
                   <Td
                     select={{

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

@@ -23,7 +23,20 @@ const contentFacetAttributes = {
   uuid: 'e5761ea3-4117-4ecf-83d0-b694f99b389e',
   content_view_default: false,
   lifecycle_environment_library: false,
+  errata_counts: {
+    total: 3,
+  },
 };
+
+const cfWithErrataTotal = total => ({
+  ...contentFacetAttributes,
+  errata_counts: {
+    total,
+  },
+});
+
+const cfNoErrata = cfWithErrataTotal(0);
+
 const hostName = 'foo.example.com';
 
 const errataBookmarks = foremanApi.getApiUrl('/bookmarks?search=controller%3Dkatello_errata');
@@ -36,6 +49,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',
@@ -145,7 +160,7 @@ 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());
@@ -252,7 +267,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 +308,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 +352,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 +388,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 +440,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 +497,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 +531,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 +583,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 +593,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 +619,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 +646,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 +685,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 +721,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 +752,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 +784,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());
@@ -810,7 +828,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());
@@ -844,7 +862,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 +900,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 +946,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 +991,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 +1047,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 +1086,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 +1117,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());
@@ -1127,7 +1145,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 +1201,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 +1233,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');

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

@@ -2,7 +2,7 @@ import React from 'react';
 import { renderWithRedux, patientlyWaitFor, fireEvent } from 'react-testing-lib-wrapper';
 import { nockInstance, assertNockRequest, mockForemanAutocomplete, mockSetting } 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';
@@ -181,7 +181,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,7 +256,7 @@ 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(
@@ -284,6 +284,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 +338,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}&host_ids=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);

data/webpack/components/extensions/HostDetails/Tabs/customizedRexUrlHelpers.js

@@ -2,7 +2,7 @@ import { REX_FEATURES } from './RemoteExecutionConstants';
 import { TRACES_SEARCH_QUERY } from './TracesTab/HostTracesConstants';
 import { ERRATA_SEARCH_QUERY } from './ErrataTab/HostErrataConstants';
 import { PACKAGE_SEARCH_QUERY } from './PackagesTab/YumInstallablePackagesConstants';
-import { PACKAGES_SEARCH_QUERY } from './PackagesTab/HostPackagesConstants';
+import { PACKAGES_SEARCH_QUERY, SELECTED_UPDATE_VERSIONS } from './PackagesTab/HostPackagesConstants';
 
 export const createJob = ({
   hostname, feature, inputs,
@@ -35,10 +35,10 @@ export const katelloPackageUpdateUrl = ({ hostname, packageName }) => createJob(
   inputs: { package: packageName },
 });
 
-export const packagesUpdateUrl = ({ hostname, search }) => createJob({
+export const packagesUpdateUrl = ({ hostname, search, versions }) => createJob({
   hostname,
   feature: REX_FEATURES.KATELLO_PACKAGES_UPDATE_BY_SEARCH,
-  inputs: { [PACKAGES_SEARCH_QUERY]: search },
+  inputs: { [PACKAGES_SEARCH_QUERY]: search, [SELECTED_UPDATE_VERSIONS]: versions },
 });
 
 export const resolveTraceUrl = ({ hostname, search }) => createJob({

data/webpack/containers/Application/config.js

@@ -72,11 +72,11 @@ export const links = [
     component: WithOrganization(withHeader(ChangeContentSource, { title: __('Change host content source') })),
   },
   {
-    path: 'labs/alternate_content_sources',
+    path: 'alternate_content_sources',
     component: WithOrganization(withHeader(AlternateContentSource, { title: __('Alternate Content Sources') })),
   },
   {
-    path: 'labs/alternate_content_sources/:id([0-9]+)',
+    path: 'alternate_content_sources/:id([0-9]+)',
     component: WithOrganization(withHeader(AlternateContentSource, { title: __('Alternate Content Sources') })),
     exact: false,
   },

data/webpack/containers/Application/overrides.scss

@@ -164,4 +164,16 @@ html .pagination-pf-pagesize.btn-group {
   animation-duration: 2s;
   animation-iteration-count: 1;
   animation-fill-mode: forwards;
+}
+
+.primary-detail-border {
+  border-top: 0.2px;
+  border-top-color: var(--pf-c-table--BorderColor);
+  border-top-style: inset;
+}
+
+.primary-detail-stack-items-border {
+  border-bottom: 0.2px;
+  border-bottom-color: var(--pf-c-table--BorderColor);
+  border-bottom-style: inset;
 }

data/webpack/global_test_setup.js

@@ -6,9 +6,27 @@ import nock from 'nock';
 // output and traceback for actual error.
 const originalConsoleError = global.console.error;
 global.console.error = (error, stack) => {
-  originalConsoleError(error); // ensure error is printed to console
+  originalConsoleError(error); // ensure error is printed to console, comment
+  // in case of ouia-id check
+
+  /* Uncomment block below to filter out PF4 ouiaId errors */
+  // const ignore = ['in ForwardRef (created by Tabs)',
+  //    'in Button (created by Label)', 'created by _default',
+  //    'created by PaginationOptionsMenu', 'created by TypeAheadItems',
+  //    'The prop `ouiaId` is marked as required in `Modal`, but its value is `undefined`',
+  //    'created by WizardHeader', 'created by Navigation',
+  //    'created by ActionsColumn', 'created by InactiveText', 'created by Select',
+  //    'created by Context.Consumer'];
+
   /* eslint-disable-next-line no-console */
   if (stack) console.log(stack); // Prints out original stack trace
+
+  /* Uncomment block below to filter out PF4 ouiaId errors */
+  //  if (error && !ignore.some(e => error.includes(e))) {
+  //   originalConsoleError(error); // ensure error is printed to console
+  //   console.log(stack); // Prints out original stack trace
+  // }
+
   throw new Error(error); // comment this and uncomment the next line when checking for ouia ids
   // if (!error.includes('Failed prop type')) throw new Error(error);
 };

data/webpack/ouia_id_check.js

@@ -34,7 +34,6 @@ import {
   Toolbar,
 } from '@patternfly/react-core';
 import {
-  RowWrapper,
   Table,
   TableComposable,
   Tr,
@@ -74,7 +73,6 @@ const checkForOuiaIds = () => {
     TextInput,
     Title,
     Toolbar,
-    RowWrapper,
     Table,
     TableComposable,
     Tr,

data/webpack/redux/actions/RedHatRepositories/helpers.js

@@ -22,6 +22,7 @@ const recommendedRepositoriesRHEL = [
   'rhel-7-server-optional-rpms',
   'rhel-7-server-extras-rpms',
   'rhel-7-server-kickstart',
+  'rhel-6-server-els-rpms',
 ];
 
 const recommendedRepositoriesSatTools = [
@@ -32,15 +33,10 @@ const recommendedRepositoriesSatTools = [
 ];
 
 const recommendedRepositoriesMisc = [
-  'rhel-server-rhscl-7-rpms',
-  'rhel-7-server-satellite-capsule-6.11-rpms',
-  'satellite-capsule-6.11-for-rhel-8-x86_64-rpms',
-  'rhel-7-server-ansible-2.9-rpms',
+  'satellite-capsule-6.12-for-rhel-8-x86_64-rpms',
   'ansible-2-for-rhel-8-x86_64-rpms',
-  'rhel-7-server-satellite-maintenance-6.11-rpms',
-  'rhel-7-server-satellite-utils-6.11-rpms',
-  'satellite-maintenance-6.11-for-rhel-8-x86_64-rpms',
-  'satellite-utils-6.11-for-rhel-8-x86_64-rpms',
+  'satellite-maintenance-6.12-for-rhel-8-x86_64-rpms',
+  'satellite-utils-6.12-for-rhel-8-x86_64-rpms',
 ];
 
 const recommendedRepositorySetLables = recommendedRepositoriesRHEL