katello 4.9.2 → 4.10.0.rc1

data/webpack/components/extensions/HostDetails/Tabs/ErrataTab/HostErrataActions.js

@@ -1,7 +1,7 @@
 import { API_OPERATIONS, get, put } from 'foremanReact/redux/API';
 import { foremanApi } from '../../../../../services/api';
-import { HOST_ERRATA_KEY, HOST_ERRATA_APPLICABILITY_KEY, HOST_ERRATA_APPLY_KEY } from './HostErrataConstants';
-import { errorToast, renderTaskStartedToast } from '../../../../../scenes/Tasks/helpers';
+import { HOST_ERRATA_KEY, HOST_ERRATA_APPLICABILITY_KEY } from './HostErrataConstants';
+import { errorToast } from '../../../../../scenes/Tasks/helpers';
 
 export const getInstallableErrata = (hostId, params) => get({
   type: API_OPERATIONS.GET,
@@ -30,12 +30,3 @@ export const regenerateApplicability = (hostId, params) => put({
   params,
 });
 
-export const applyViaKatelloAgent = (hostId, params) => put({
-  type: API_OPERATIONS.PUT,
-  key: HOST_ERRATA_APPLY_KEY,
-  url: foremanApi.getApiUrl(`/hosts/${hostId}/errata/apply`),
-  handleSuccess: response => renderTaskStartedToast(response.data),
-  errorToast: error => errorToast(error),
-  params,
-});
-

data/webpack/components/extensions/HostDetails/Tabs/PackagesTab/HostPackagesActions.js

@@ -1,11 +1,7 @@
-import { API_OPERATIONS, get, put } from 'foremanReact/redux/API';
-import { errorToast, renderTaskStartedToast } from '../../../../../scenes/Tasks/helpers';
+import { API_OPERATIONS, get } from 'foremanReact/redux/API';
 import { foremanApi } from '../../../../../services/api';
 import {
-  HOST_PACKAGES_INSTALL_KEY,
   HOST_PACKAGES_KEY,
-  HOST_PACKAGES_REMOVE_KEY,
-  HOST_PACKAGES_UPGRADE_KEY,
 } from './HostPackagesConstants';
 
 export const getInstalledPackagesWithLatest = (hostId, params) => get({
@@ -15,38 +11,3 @@ export const getInstalledPackagesWithLatest = (hostId, params) => get({
   params,
 });
 export default getInstalledPackagesWithLatest;
-
-export const installPackageViaKatelloAgent = (hostId, params) => put({
-  type: API_OPERATIONS.PUT,
-  key: HOST_PACKAGES_INSTALL_KEY,
-  url: foremanApi.getApiUrl(`/hosts/${hostId}/packages/install`),
-  handleSuccess: ({ data }) => renderTaskStartedToast(data),
-  errorToast: error => errorToast(error),
-  params,
-});
-
-export const removePackageViaKatelloAgent = (hostId, params) => put({
-  type: API_OPERATIONS.PUT,
-  key: HOST_PACKAGES_REMOVE_KEY,
-  url: foremanApi.getApiUrl(`/hosts/${hostId}/packages/remove`),
-  handleSuccess: ({ data }) => renderTaskStartedToast(data),
-  errorToast: error => errorToast(error),
-  params,
-});
-
-export const upgradePackageViaKatelloAgent = (hostId, params) => put({
-  type: API_OPERATIONS.PUT,
-  key: HOST_PACKAGES_UPGRADE_KEY,
-  url: foremanApi.getApiUrl(`/hosts/${hostId}/packages/upgrade`),
-  handleSuccess: ({ data }) => renderTaskStartedToast(data),
-  errorToast: error => errorToast(error),
-  params,
-});
-
-export const upgradeAllViaKatelloAgent = hostId => put({
-  type: API_OPERATIONS.PUT,
-  key: HOST_PACKAGES_UPGRADE_KEY,
-  url: foremanApi.getApiUrl(`/hosts/${hostId}/packages/upgrade_all`),
-  handleSuccess: ({ data }) => renderTaskStartedToast(data),
-  errorToast: error => errorToast(error),
-});

data/webpack/components/extensions/HostDetails/Tabs/PackagesTab/HostPackagesConstants.js

@@ -1,7 +1,4 @@
 export const HOST_PACKAGES_KEY = 'HOST_PACKAGES';
-export const HOST_PACKAGES_INSTALL_KEY = 'HOST_PACKAGES_KATELLO_AGENT_INSTALL';
-export const HOST_PACKAGES_REMOVE_KEY = 'HOST_PACKAGES_REMOVE';
-export const HOST_PACKAGES_UPGRADE_KEY = 'HOST_PACKAGES_UPGRADE';
 export const PACKAGES_SEARCH_QUERY = 'Packages search query';
 export const SELECTED_UPDATE_VERSIONS = 'Selected update versions';
 

data/webpack/components/extensions/HostDetails/Tabs/PackagesTab/PackageInstallModal.js

@@ -1,7 +1,7 @@
 import React, { useState } from 'react';
 import { Modal, Button, Dropdown, DropdownItem, DropdownToggle, DropdownDirection, DropdownToggleAction } from '@patternfly/react-core';
 import { CaretDownIcon, CaretUpIcon } from '@patternfly/react-icons';
-import { useSelector, useDispatch } from 'react-redux';
+import { useSelector } from 'react-redux';
 import { FormattedMessage } from 'react-intl';
 import { Thead, Th, Tbody, Tr, Td, TableVariant } from '@patternfly/react-table';
 import { noop } from 'foremanReact/common/helpers';
@@ -17,12 +17,10 @@ import { getHostYumInstallablePackages } from './YumInstallablePackagesActions';
 import './PackageInstallModal.scss';
 import { katelloPackageInstallBySearchUrl, katelloPackageInstallUrl } from '../customizedRexUrlHelpers';
 import hostIdNotReady from '../../HostDetailsActions';
-import { installPackageViaKatelloAgent } from './HostPackagesActions';
 
 const InstallDropdown = ({
-  isDisabled, installViaRex, installViaKatelloAgent,
-  bulkCustomizedRexUrl, showKatelloAgent,
-  disableInstallViaKatelloAgent,
+  isDisabled, installViaRex,
+  bulkCustomizedRexUrl,
 }) => {
   const [isActionOpen, setIsActionOpen] = useState(false);
   const onActionSelect = () => {
@@ -33,15 +31,6 @@ const InstallDropdown = ({
   };
 
   const dropdownItems = [
-    <DropdownItem
-      key="install-k-agent"
-      ouiaId="install-k-agent"
-      component="button"
-      onClick={installViaKatelloAgent}
-      isDisabled={disableInstallViaKatelloAgent}
-    >
-      {__('Install via katello-agent')}
-    </DropdownItem>,
     <DropdownItem key="install-rex" ouiaId="install-rex" component="button" onClick={installViaRex}>
       {__('Install via remote execution')}
     </DropdownItem>,
@@ -56,9 +45,6 @@ const InstallDropdown = ({
     </DropdownItem>,
   ];
 
-  if (!showKatelloAgent) dropdownItems.shift();
-  const defaultRemoteAction = showKatelloAgent ? installViaKatelloAgent : installViaRex;
-
   return (
     <Dropdown
       ouiaId="action-dropdown"
@@ -69,7 +55,7 @@ const InstallDropdown = ({
           ouiaId="install-action-toggle"
           isDisabled={isDisabled}
           splitButtonItems={[
-            <DropdownToggleAction key="install" onClick={defaultRemoteAction}>
+            <DropdownToggleAction key="install" onClick={installViaRex}>
               Install
             </DropdownToggleAction>,
           ]}
@@ -88,23 +74,17 @@ const InstallDropdown = ({
 InstallDropdown.propTypes = {
   isDisabled: PropTypes.bool,
   installViaRex: PropTypes.func,
-  installViaKatelloAgent: PropTypes.func,
   bulkCustomizedRexUrl: PropTypes.string,
-  showKatelloAgent: PropTypes.bool,
-  disableInstallViaKatelloAgent: PropTypes.bool,
 };
 
 InstallDropdown.defaultProps = {
   isDisabled: false,
   installViaRex: noop,
-  installViaKatelloAgent: noop,
   bulkCustomizedRexUrl: '',
-  showKatelloAgent: false,
-  disableInstallViaKatelloAgent: false,
 };
 
 const PackageInstallModal = ({
-  isOpen, closeModal, hostId, hostName, showKatelloAgent, triggerPackageInstall,
+  isOpen, closeModal, hostId, hostName, triggerPackageInstall,
 }) => {
   const emptyContentTitle = __('No packages available to install');
   const emptyContentBody = __('No packages available to install on this host. Please check the host\'s content view and lifecycle environment.');
@@ -114,7 +94,6 @@ const PackageInstallModal = ({
   const response =
     useSelector(state => selectAPIResponse(state, HOST_YUM_INSTALLABLE_PACKAGES_KEY));
   const status = useSelector(state => selectHostYumInstallablePackagesStatus(state));
-  const dispatch = useDispatch();
   const { results, ...metadata } = response;
   const [suppressFirstFetch, setSuppressFirstFetch] = useState(false);
 
@@ -150,12 +129,6 @@ const PackageInstallModal = ({
     closeModal();
   };
 
-  const installViaKatelloAgent = () => {
-    dispatch(installPackageViaKatelloAgent(hostId, { packages: selectedPackageNames() }));
-    selectNone();
-    closeModal();
-  };
-
   const handleModalClose = () => {
     setSuppressFirstFetch(true);
     closeModal();
@@ -173,10 +146,7 @@ const PackageInstallModal = ({
       key="install"
       isDisabled={!selectedCount}
       installViaRex={installViaRex}
-      installViaKatelloAgent={installViaKatelloAgent}
       bulkCustomizedRexUrl={enableSimpleRexUrl ? simpleBulkCustomizedRexUrl : bulkCustomizedRexUrl}
-      showKatelloAgent={showKatelloAgent}
-      disableInstallViaKatelloAgent={selectedResults.length === 0}
     />,
     <Button key="cancel" ouiaId="cancel-button" variant="link" onClick={handleModalClose}>
       Cancel
@@ -274,12 +244,7 @@ PackageInstallModal.propTypes = {
   closeModal: PropTypes.func.isRequired,
   hostId: PropTypes.number.isRequired,
   hostName: PropTypes.string.isRequired,
-  showKatelloAgent: PropTypes.bool,
   triggerPackageInstall: PropTypes.func.isRequired,
 };
 
-PackageInstallModal.defaultProps = {
-  showKatelloAgent: false,
-};
-
 export default PackageInstallModal;

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

@@ -1,5 +1,5 @@
 import React, { useCallback, useState, useRef } from 'react';
-import { useSelector, useDispatch } from 'react-redux';
+import { useSelector } from 'react-redux';
 import {
   ActionList,
   ActionListItem,
@@ -28,9 +28,6 @@ import { useBulkSelect, useTableSort, useUrlParams, useSet } from '../../../../.
 import PackagesStatus from '../../../../../components/Packages';
 import {
   getInstalledPackagesWithLatest,
-  removePackageViaKatelloAgent,
-  upgradeAllViaKatelloAgent,
-  upgradePackageViaKatelloAgent,
 } from './HostPackagesActions';
 import { selectHostPackagesStatus } from './HostPackagesSelectors';
 import {
@@ -41,17 +38,13 @@ import { katelloPackageUpdateUrl, packagesUpdateUrl } from '../customizedRexUrlH
 import './PackagesTab.scss';
 import hostIdNotReady, { getHostDetails } from '../../HostDetailsActions';
 import PackageInstallModal from './PackageInstallModal';
-import { defaultRemoteActionMethod,
-  hasRequiredPermissions as can,
+import { hasRequiredPermissions as can,
   missingRequiredPermissions as cannot,
-  KATELLO_AGENT,
   userPermissionsFromHostDetails } from '../../hostDetailsHelpers';
 import SortableColumnHeaders from '../../../../Table/components/SortableColumnHeaders';
 import { useRexJobPolling } from '../RemoteExecutionHooks';
-import KatelloAgentDeprecationAlert from '../../common/KatelloAgentDeprecationAlert';
 
 const invokeRexJobs = ['create_job_invocations'];
-const doKatelloAgentActions = ['edit_hosts'];
 const createBookmarks = ['create_bookmarks'];
 
 const UpdateVersionsSelect = ({
@@ -126,7 +119,6 @@ export const PackagesTab = () => {
   } = hostDetails;
 
   const { searchParam, status: statusParam } = useUrlParams();
-  const dispatch = useDispatch();
   const PACKAGE_STATUS = __('Status');
   const [packageStatusSelected, setPackageStatusSelected] = useState(statusParam ?? PACKAGE_STATUS);
   const activeFilters = [packageStatusSelected];
@@ -135,10 +127,7 @@ export const PackagesTab = () => {
   const toggleBulkAction = () => setIsBulkActionOpen(prev => !prev);
   const [isModalOpen, setIsModalOpen] = useState(false);
   const closeModal = () => setIsModalOpen(false);
-  const showKatelloAgent = (defaultRemoteActionMethod({ hostDetails }) === KATELLO_AGENT);
-  const showActions = showKatelloAgent ?
-    can(doKatelloAgentActions, userPermissionsFromHostDetails({ hostDetails })) :
-    can(invokeRexJobs, userPermissionsFromHostDetails({ hostDetails }));
+  const showActions = can(invokeRexJobs, userPermissionsFromHostDetails({ hostDetails }));
 
   const [isActionOpen, setIsActionOpen] = useState(false);
   const onActionSelect = () => {
@@ -295,11 +284,6 @@ export const PackagesTab = () => {
 
   const removePackageViaRemoteExecution = packageName => triggerPackageRemove(packageName);
 
-  const removeViaKatelloAgent = (packageName) => {
-    dispatch(removePackageViaKatelloAgent(hostId, { packages: [packageName] }));
-    selectNone();
-  };
-
   const removePackagesViaRemoteExecution = () => {
     const selected = fetchBulkParams();
     setIsBulkActionOpen(false);
@@ -307,32 +291,9 @@ export const PackagesTab = () => {
     triggerBulkPackageRemove(selected);
   };
 
-  const selectedPackageNames = () => selectedResults.map(({ name }) => name);
-  const selectedUpgradableVersions = () => selectedResults.map(({ name, upgradable_versions: v }) =>
-    selectedNewVersions.current[name] || v[0]);
-
-  const removePackagesViaKatelloAgent = () => {
-    dispatch(removePackageViaKatelloAgent(hostId, { packages: selectedPackageNames() }));
-    selectNone();
-  };
-
-  const defaultRemoteAction = defaultRemoteActionMethod({ hostDetails });
-
-  const removeBulk = () => {
-    if (defaultRemoteAction === KATELLO_AGENT) {
-      removePackagesViaKatelloAgent();
-    } else {
-      removePackagesViaRemoteExecution();
-    }
-  };
+  const removeBulk = () => removePackagesViaRemoteExecution();
 
-  const handlePackageRemove = (packageName) => {
-    if (defaultRemoteAction === KATELLO_AGENT) {
-      removeViaKatelloAgent(packageName);
-    } else {
-      removePackageViaRemoteExecution(packageName);
-    }
-  };
+  const handlePackageRemove = packageName => removePackageViaRemoteExecution(packageName);
 
   const upgradeViaRemoteExecution = ({ packageName, upgradableVersions }) => (
     triggerPackageUpgrade({ packageName, upgradableVersions })
@@ -345,22 +306,7 @@ export const PackagesTab = () => {
     triggerBulkPackageUpgrade(selected);
   };
 
-  const upgradeBulkViaKatelloAgent = () => {
-    if (areAllRowsSelected()) {
-      dispatch(upgradeAllViaKatelloAgent(hostId));
-    } else {
-      dispatch(upgradePackageViaKatelloAgent(hostId, { packages: selectedUpgradableVersions() }));
-    }
-    selectNone();
-  };
-
-  const upgradeBulk = () => {
-    if (defaultRemoteAction === KATELLO_AGENT) {
-      upgradeBulkViaKatelloAgent();
-    } else {
-      upgradeBulkViaRemoteExecution();
-    }
-  };
+  const upgradeBulk = () => upgradeBulkViaRemoteExecution();
 
   const upgradeViaCustomizedRemoteExecution = selectedCount ?
     packagesUpdateUrl({
@@ -375,7 +321,6 @@ export const PackagesTab = () => {
     selectedResults.every(item => item.upgradable_versions?.length > 0);
   const disableUpgrade = () => selectedCount === 0 ||
     (selectAllMode && packageStatusSelected !== 'Upgradable') ||
-    (defaultRemoteAction === KATELLO_AGENT && selectAllMode && !areAllRowsSelected()) ||
     (!selectAllMode && !allUpgradable());
 
   const readOnlyBookmarks =
@@ -492,9 +437,6 @@ export const PackagesTab = () => {
   return (
     <div>
       <div id="packages-tab">
-        {showKatelloAgent && (
-          <KatelloAgentDeprecationAlert />
-        )}
         <TableWrapper
           {...{
             metadata,
@@ -638,7 +580,6 @@ export const PackagesTab = () => {
           hostId={hostId}
           key={hostId}
           hostName={hostname}
-          showKatelloAgent={showKatelloAgent}
           triggerPackageInstall={triggerPackageInstall}
         />
       }

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

@@ -64,9 +64,11 @@ import { selectRepositorySetsStatus } from './RepositorySetsSelectors';
 import './RepositorySetsTab.scss';
 import SortableColumnHeaders from '../../../../Table/components/SortableColumnHeaders';
 import SelectableDropdown from '../../../../SelectableDropdown';
-import { hasRequiredPermissions as can,
+import {
+  hasRequiredPermissions as can,
   missingRequiredPermissions as cannot,
-  userPermissionsFromHostDetails } from '../../hostDetailsHelpers';
+  userPermissionsFromHostDetails,
+} from '../../hostDetailsHelpers';
 
 const viewRepoSets = [
   'view_hosts', 'view_activation_keys', 'view_products',
@@ -397,7 +399,7 @@ const RepositorySetsTab = () => {
   });
 
   const readOnlyBookmarks =
-  cannot(createBookmarks, userPermissionsFromHostDetails({ hostDetails }));
+    cannot(createBookmarks, userPermissionsFromHostDetails({ hostDetails }));
 
   const dropdownItems = [
     <DropdownItem
@@ -604,7 +606,6 @@ const RepositorySetsTab = () => {
                 pfSortParams={pfSortParams}
                 columnsToSortParams={COLUMNS_TO_SORT_PARAMS}
               />
-              <Th />
               <Th key="action-menu" />
             </Tr>
           </Thead>

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

@@ -1,5 +1,4 @@
 import React from 'react';
-import { isEqual } from 'lodash';
 import { renderWithRedux, patientlyWaitFor, within, fireEvent } from 'react-testing-lib-wrapper';
 import { nockInstance, assertNockRequest, mockForemanAutocomplete } from '../../../../../test-utils/nockWrapper';
 import { foremanApi } from '../../../../../services/api';
@@ -101,7 +100,6 @@ const baseQueryWithSort = {
 const defaultQuery = { ...baseQueryWithSort, search: '' };
 const page2Query = { ...baseQueryWithSort, page: 2 };
 const jobInvocations = foremanApi.getApiUrl('/job_invocations');
-const applyByKatelloAgentUrl = foremanApi.getApiUrl('/hosts/1/errata/apply');
 
 let firstErrata;
 let thirdErrata;
@@ -839,173 +837,6 @@ test('Can filter by severity', async (done) => {
   assertNockRequest(scope2, done); // Pass jest callback to confirm test is done
 });
 
-test('apply button chooses katello agent if enabled', async (done) => {
-  const autocompleteScope = mockForemanAutocomplete(nockInstance, autocompleteUrl);
-  const mockErrata = makeMockErrata({});
-  const options = renderOptions({
-    ...cfWithErrataTotal(mockErrata.total),
-    katelloAgentInstalled: true,
-    katelloAgentEnabled: true,
-  });
-
-  const scope = nockInstance
-    .get(hostErrata)
-    .query(defaultQuery)
-    .reply(200, mockErrata);
-
-  const resolveErrataScope = nockInstance
-    .put(applyByKatelloAgentUrl)
-    .reply(201, mockResolveErrataTask);
-
-  const { getAllByText, getByLabelText, queryByText } = renderWithRedux(
-    <ErrataTab />,
-    options,
-  );
-  // Assert that the errata are now showing on the screen, but wait for them to appear.
-  await patientlyWaitFor(() => expect(getAllByText('Important')[0]).toBeInTheDocument());
-
-  getByLabelText('Select row 0').click();
-  getByLabelText('Select row 1').click();
-
-  const viaAction = queryByText('Apply');
-  expect(viaAction).toBeInTheDocument();
-  viaAction.click();
-
-  assertNockRequest(autocompleteScope);
-  assertNockRequest(resolveErrataScope);
-  assertNockRequest(scope, done);
-});
-
-test('Can bulk apply via katello agent', async (done) => {
-  const autocompleteScope = mockForemanAutocomplete(nockInstance, autocompleteUrl);
-  const mockErrata = makeMockErrata({});
-  const { results } = mockErrata;
-  const options = renderOptions({
-    ...cfWithErrataTotal(mockErrata.total),
-    katelloAgentInstalled: true,
-    katelloAgentEnabled: true,
-  });
-
-  const scope = nockInstance
-    .get(hostErrata)
-    .query(defaultQuery)
-    .reply(200, mockErrata);
-
-  const postBody = ({ search }) => {
-    const [firstResult, secondResult] = results;
-    return isEqual(search, `errata_id ^ (${firstResult.errata_id},${secondResult.errata_id})`);
-  };
-  const resolveErrataScope = nockInstance
-    .put(applyByKatelloAgentUrl, postBody)
-    .reply(201, mockResolveErrataTask);
-
-  const { getAllByText, getByLabelText, queryByText } = renderWithRedux(
-    <ErrataTab />,
-    options,
-  );
-  // Assert that the errata are now showing on the screen, but wait for them to appear.
-  await patientlyWaitFor(() => expect(getAllByText('Important')[0]).toBeInTheDocument());
-
-  getByLabelText('Select row 0').click();
-  getByLabelText('Select row 1').click();
-
-  const actionMenu = getByLabelText('expand_errata_toggle');
-  actionMenu.click();
-  const viaAction = queryByText('Apply via Katello agent');
-  expect(viaAction).toBeInTheDocument();
-  viaAction.click();
-
-  assertNockRequest(autocompleteScope);
-  assertNockRequest(resolveErrataScope);
-  assertNockRequest(scope, done);
-});
-
-test('Can select all, exclude and bulk apply via katello agent', async (done) => {
-  // This is the same test as above,
-  // but using the table action bar instead of the Apply button
-  const autocompleteScope = mockForemanAutocomplete(nockInstance, autocompleteUrl);
-  const mockErrata = makeMockErrata({});
-  const { results } = mockErrata;
-  const options = renderOptions({
-    ...cfWithErrataTotal(mockErrata.total),
-    katelloAgentInstalled: true,
-    katelloAgentEnabled: true,
-  });
-
-  const scope = nockInstance
-    .get(hostErrata)
-    .query(defaultQuery)
-    .reply(200, mockErrata);
-
-  const postBody = ({ search }) => {
-    const [firstResult] = results;
-    return isEqual(search, `errata_id !^ (${firstResult.errata_id})`);
-  };
-
-  const resolveErrataScope = nockInstance
-    .put(applyByKatelloAgentUrl, postBody)
-    .reply(201, mockResolveErrataTask);
-
-  const { getAllByText, getByLabelText, queryByText } = renderWithRedux(
-    <ErrataTab />,
-    options,
-  );
-  // Assert that the errata are now showing on the screen, but wait for them to appear.
-  await patientlyWaitFor(() => expect(getAllByText('Important')[0]).toBeInTheDocument());
-  const selectAllCheckbox = getByLabelText('Select all');
-  selectAllCheckbox.click();
-
-  getByLabelText('Select row 0').click(); // deselect
-
-  const actionMenu = getByLabelText('expand_errata_toggle');
-  actionMenu.click();
-  const viaAction = queryByText('Apply via Katello agent');
-  expect(viaAction).toBeInTheDocument();
-  viaAction.click();
-
-  assertNockRequest(autocompleteScope);
-  assertNockRequest(resolveErrataScope);
-  assertNockRequest(scope, done);
-});
-
-test('Apply button chooses remote execution', async (done) => {
-  const autocompleteScope = mockForemanAutocomplete(nockInstance, autocompleteUrl);
-  const mockErrata = makeMockErrata({});
-  const options = renderOptions({
-    ...cfWithErrataTotal(mockErrata.total),
-    katelloAgentInstalled: true,
-    katelloAgentEnabled: true,
-    remoteExecutionByDefault: true,
-  });
-
-  const scope = nockInstance
-    .get(hostErrata)
-    .query(defaultQuery)
-    .reply(200, mockErrata);
-
-  const resolveErrataScope = nockInstance
-    .post(jobInvocations)
-    .reply(201, mockResolveErrataTask);
-
-  const { getAllByText, getByLabelText, queryByText } = renderWithRedux(
-    <ErrataTab />,
-    options,
-  );
-  // Assert that the errata are now showing on the screen, but wait for them to appear.
-  await patientlyWaitFor(() => expect(getAllByText('Important')[0]).toBeInTheDocument());
-
-  getByLabelText('Select row 0').click();
-  getByLabelText('Select row 1').click();
-
-  const viaAction = queryByText('Apply');
-  expect(viaAction).toBeInTheDocument();
-  viaAction.click();
-
-  assertNockRequest(autocompleteScope);
-  assertNockRequest(resolveErrataScope);
-  assertNockRequest(scope, done);
-});
-
 test('Can bulk apply via remote execution', async (done) => {
   const autocompleteScope = mockForemanAutocomplete(nockInstance, autocompleteUrl);
   const mockErrata = makeMockErrata({});
@@ -1121,49 +952,6 @@ test('Can apply errata in bulk via customized remote execution', async (done) =>
   assertNockRequest(scope, done);
 });
 
-test('Can apply a single erratum to the host via katello agent', async (done) => {
-  const autocompleteScope = mockForemanAutocomplete(nockInstance, autocompleteUrl);
-  const mockErrata = makeMockErrata({});
-  const { results } = mockErrata;
-  const options = renderOptions({
-    ...cfWithErrataTotal(mockErrata.total),
-    katelloAgentInstalled: true,
-    katelloAgentEnabled: true,
-  });
-
-  const scope = nockInstance
-    .get(hostErrata)
-    .query(defaultQuery)
-    .reply(200, mockErrata);
-
-  const postBody = ({ errata_ids: errataIds }) => isEqual(errataIds, [results[0].errata_id]);
-
-  const resolveErrataScope = nockInstance
-    .put(applyByKatelloAgentUrl, postBody)
-    .reply(201, mockResolveErrataTask);
-
-  const { getAllByText, getByLabelText, getByText } = renderWithRedux(
-    <ErrataTab />,
-    options,
-  );
-
-  await patientlyWaitFor(() => expect(getAllByText('Important')[0]).toBeInTheDocument());
-  const erratumActionMenu = within(getByLabelText('Select row 0').closest('tr')).getByLabelText('Actions');
-  expect(erratumActionMenu).toHaveAttribute('aria-label', 'Actions');
-  erratumActionMenu.click();
-
-  let viaAction;
-  await patientlyWaitFor(() => {
-    viaAction = getByText('Apply via Katello agent');
-    expect(viaAction).toBeInTheDocument();
-  });
-  viaAction.click();
-
-  assertNockRequest(autocompleteScope);
-  assertNockRequest(resolveErrataScope);
-  assertNockRequest(scope, done);
-});
-
 test('Can apply a single erratum to the host via remote execution', async (done) => {
   const autocompleteScope = mockForemanAutocomplete(nockInstance, autocompleteUrl);
   const mockErrata = makeMockErrata({});