katello 4.10.0 → 4.11.0.rc2

data/webpack/components/extensions/HostDetails/Cards/SystemPurposeCard/SystemPurposeEditModal.js

@@ -17,14 +17,20 @@ import {
 } from '@patternfly/react-core';
 import { FormattedMessage } from 'react-intl';
 import { translate as __ } from 'foremanReact/common/I18n';
-import { selectOrganizationStatus, selectOrganization, selectAvailableReleaseVersions, selectAvailableReleaseVersionsStatus } from './SystemPurposeSelectors';
-import { getAvailableReleaseVersions, getOrganization, updateSystemPurposeAttributes } from './SystemPurposeActions';
+import {
+  selectOrganizationStatus,
+  selectOrganization,
+  selectAvailableReleaseVersions,
+  selectAvailableReleaseVersionsStatus,
+} from './SystemPurposeSelectors';
+import { getHostAvailableReleaseVersions, getAKAvailableReleaseVersions, getOrganization, updateHostSysPurposeAttributes, updateAKSysPurposeAttributes } from './SystemPurposeActions';
 import HOST_DETAILS_KEY from '../../HostDetailsConstants';
 import { defaultUsages, defaultRoles, defaultServiceLevels } from './SystemPurposeConstants';
+import { getActivationKey } from '../../../../../scenes/ActivationKeys/Details/ActivationKeyActions';
 
 const SystemPurposeEditModal = ({
-  closeModal, hostName, purposeRole, purposeUsage, purposeAddons,
-  serviceLevel, releaseVersion, isOpen, orgId, hostId,
+  closeModal, name, purposeRole, purposeUsage, purposeAddons,
+  serviceLevel, releaseVersion, isOpen, orgId, id, type,
 }) => {
   const initialPurposeRole = purposeRole ?? '';
   const initialServiceLevel = serviceLevel ?? '';
@@ -54,22 +60,24 @@ const SystemPurposeEditModal = ({
   const availableServiceLevels = orgDetails?.serviceLevels ?? [];
   const { addons: availableAddons, roles: availableRoles, usage: availableUsages }
     = availableSyspurposeAttributes;
+  const selectorAPIKey = type === 'host' ? 'AVAILABLE_RELEASE_VERSIONS' : 'RELEASES';
 
   const availableReleaseVersionsStatus
-    = useSelector(state => selectAvailableReleaseVersionsStatus(state, orgId));
+    = useSelector(state => selectAvailableReleaseVersionsStatus(state, id, selectorAPIKey));
   const availableReleaseVersions = useSelector(state =>
-    selectAvailableReleaseVersions(state, hostId))?.results ?? [];
+    selectAvailableReleaseVersions(state, id, selectorAPIKey))?.results ?? [];
   useEffect(() => {
     if (orgId && orgStatus !== STATUS.RESOLVED) {
       dispatch(getOrganization({ orgId }));
     }
   }, [orgId, orgStatus, dispatch]);
 
+  const actionToDispatch = type === 'host' ? getHostAvailableReleaseVersions : getAKAvailableReleaseVersions;
   useEffect(() => {
-    if (hostId && availableReleaseVersionsStatus !== STATUS.RESOLVED) {
-      dispatch(getAvailableReleaseVersions({ hostId }));
+    if (id && availableReleaseVersionsStatus !== STATUS.RESOLVED) {
+      dispatch(actionToDispatch({ id }));
     }
-  }, [hostId, availableReleaseVersionsStatus, dispatch]);
+  }, [type, id, availableReleaseVersionsStatus, actionToDispatch, dispatch]);
 
   const toggleAddonSelect = isOpenState => setAddonSelectOpen(isOpenState);
 
@@ -88,7 +96,7 @@ const SystemPurposeEditModal = ({
     type: 'API_GET',
     payload: {
       key: HOST_DETAILS_KEY,
-      url: `/api/hosts/${hostName}`,
+      url: `/api/hosts/${name}`,
     },
   });
 
@@ -133,18 +141,33 @@ const SystemPurposeEditModal = ({
     closeModal();
     const optionsToValue = (options, stateValue) =>
       options.find(option => option.value === stateValue)?.value;
-    dispatch(updateSystemPurposeAttributes({
-      hostId,
-      attributes: {
-        autoheal: true,
-        purpose_role: optionsToValue(roleOptions, selectedRole),
-        purpose_usage: optionsToValue(usageOptions, selectedUsage),
-        purpose_addons: selectedAddons,
-        release_version: optionsToValue(releaseVersionOptions, selectedReleaseVersion),
-        service_level: optionsToValue(serviceLevelOptions, selectedServiceLevel),
-      },
-      refreshHostDetails,
-    }));
+    if (type === 'host') {
+      dispatch(updateHostSysPurposeAttributes({
+        id,
+        attributes: {
+          autoheal: true,
+          purpose_role: optionsToValue(roleOptions, selectedRole),
+          purpose_usage: optionsToValue(usageOptions, selectedUsage),
+          purpose_addons: selectedAddons,
+          release_version: optionsToValue(releaseVersionOptions, selectedReleaseVersion),
+          service_level: optionsToValue(serviceLevelOptions, selectedServiceLevel),
+        },
+        refreshHostDetails,
+      }));
+    } else {
+      dispatch(updateAKSysPurposeAttributes({
+        id,
+        attributes: {
+          autoheal: true,
+          purpose_role: optionsToValue(roleOptions, selectedRole),
+          purpose_usage: optionsToValue(usageOptions, selectedUsage),
+          purpose_addons: selectedAddons,
+          release_version: optionsToValue(releaseVersionOptions, selectedReleaseVersion),
+          service_level: optionsToValue(serviceLevelOptions, selectedServiceLevel),
+        },
+        refreshAKDetails: () => dispatch(getActivationKey(id)),
+      }));
+    }
   };
 
   const handleCancel = () => {
@@ -180,9 +203,9 @@ const SystemPurposeEditModal = ({
       <FormattedMessage
         className="syspurpose-edit-modal-blurb"
         id="syspurpose-edit-modal-blurb"
-        defaultMessage={__('Select system purpose attributes for host {hostName}.')}
+        defaultMessage={type === 'host' ? __('Select system purpose attributes for host {name}.') : __('Select system purpose attributes for activation key {name}.')}
         values={{
-          hostName: <strong>{hostName}</strong>,
+          name: <strong>{name}</strong>,
         }}
       />
       <Form isHorizontal style={{ marginTop: '1.3rem' }}>
@@ -239,7 +262,7 @@ const SystemPurposeEditModal = ({
         </FormGroup>
         <FormGroup label={__('Release version')} fieldId="releaseVersion">
           <FormSelect
-            id="release_version"
+            id="releaseVersion"
             name="release_version"
             ouiaId="release-version-select"
             value={selectedReleaseVersion}
@@ -288,7 +311,7 @@ export default SystemPurposeEditModal;
 
 SystemPurposeEditModal.propTypes = {
   closeModal: PropTypes.func.isRequired,
-  hostName: PropTypes.string,
+  name: PropTypes.string,
   purposeRole: PropTypes.string.isRequired,
   purposeUsage: PropTypes.string.isRequired,
   purposeAddons: PropTypes.arrayOf(PropTypes.string).isRequired,
@@ -296,12 +319,13 @@ SystemPurposeEditModal.propTypes = {
   releaseVersion: PropTypes.string,
   isOpen: PropTypes.bool.isRequired,
   orgId: PropTypes.number,
-  hostId: PropTypes.number,
+  id: PropTypes.number,
+  type: PropTypes.string.isRequired,
 };
 
 SystemPurposeEditModal.defaultProps = {
-  hostName: '',
+  name: '',
   orgId: null,
-  hostId: null,
+  id: null,
   releaseVersion: '',
 };

data/webpack/components/extensions/HostDetails/Cards/SystemPurposeCard/SystemPurposeSelectors.js

@@ -14,12 +14,13 @@ export const selectOrganizationStatus = (state, orgId) =>
 export const selectOrganizationError = (state, orgId) =>
   selectAPIError(state, `ORGANIZATION_${orgId}`);
 
-export const selectAvailableReleaseVersions = (state, hostId) =>
-  selectAPIResponse(state, `AVAILABLE_RELEASE_VERSIONS_${hostId}`) ?? {};
+export const selectAvailableReleaseVersions = (state, id, key = 'AVAILABLE_RELEASE_VERSIONS') =>
+  selectAPIResponse(state, `${key}_${id}`) ?? {};
 
-export const selectAvailableReleaseVersionsStatus = (state, hostId) =>
-  selectAPIStatus(state, `AVAILABLE_RELEASE_VERSIONS_${hostId}`) ??
+export const selectAvailableReleaseVersionsStatus = (state, id, key = 'AVAILABLE_RELEASE_VERSIONS') =>
+  selectAPIStatus(state, `${key}_${id}`) ??
   STATUS.PENDING;
 
-export const selectAvailableReleaseVersionsError = (state, hostId) =>
-  selectAPIError(state, `AVAILABLE_RELEASE_VERSIONS_${hostId}`);
+export const selectAvailableReleaseVersionsError = (state, id, key = 'AVAILABLE_RELEASE_VERSIONS') =>
+  selectAPIError(state, `${key}_${id}`);
+

data/webpack/components/extensions/HostDetails/Cards/SystemPurposeCard/__tests__/SystemPurposeCard.test.js

@@ -4,6 +4,7 @@ import HOST_DETAILS from '../../../HostDetailsConstants';
 import SystemPurposeCard from '../SystemPurposeCard';
 import katelloApi, { foremanApi } from '../../../../../../services/api';
 import { assertNockRequest, nockInstance } from '../../../../../../test-utils/nockWrapper';
+import { ACTIVATION_KEY } from '../../../../../../scenes/ActivationKeys/Details/ActivationKeyConstants';
 
 const organizationDetails = katelloApi.getApiUrl('/organizations/1');
 const availableReleaseVersions = foremanApi.getApiUrl('/hosts/1/subscriptions/available_release_versions');
@@ -24,11 +25,17 @@ const baseHostDetails = {
   },
 };
 
-const renderOptions = () => ({
-  apiNamespace: HOST_DETAILS,
+const akHostDetails = {
+  ...baseHostDetails,
+  subscription_facet_attributes: undefined,
+  ...baseHostDetails.subscription_facet_attributes,
+};
+
+const renderOptions = (apiNamespace = HOST_DETAILS) => ({
+  apiNamespace,
   initialState: {
     API: {
-      HOST_DETAILS: {
+      [apiNamespace]: {
         response: {
           id: 1,
           name: 'test-host',
@@ -40,7 +47,7 @@ const renderOptions = () => ({
   },
 });
 
-test('shows system purpose details', async (done) => {
+test('shows system purpose details for a host', async (done) => {
   const orgScope = nockInstance
     .get(organizationDetails)
     .reply(200, {
@@ -49,7 +56,6 @@ test('shows system purpose details', async (done) => {
   const availableReleaseVersionsScope = nockInstance
     .get(availableReleaseVersions)
     .reply(200, []);
-
   const { getByText }
     = renderWithRedux(<SystemPurposeCard hostDetails={baseHostDetails} />, renderOptions());
   expect(getByText('Red Hat Enterprise Linux Server')).toBeInTheDocument();
@@ -63,6 +69,19 @@ test('shows system purpose details', async (done) => {
   assertNockRequest(availableReleaseVersionsScope, done);
 });
 
+test('shows system purpose details for an activation key', () => {
+  const { getByText } = renderWithRedux(
+    <SystemPurposeCard akDetails={akHostDetails} />,
+    renderOptions(`${ACTIVATION_KEY}_1`),
+  );
+  expect(getByText('Red Hat Enterprise Linux Server')).toBeInTheDocument();
+  expect(getByText('Production')).toBeInTheDocument();
+  expect(getByText('Premium')).toBeInTheDocument();
+  expect(getByText('Addon1')).toBeInTheDocument();
+  expect(getByText('Addon2')).toBeInTheDocument();
+  expect(getByText('8')).toBeInTheDocument();
+});
+
 
 test('shows edit button for a user with edit_hosts permission', async (done) => {
   const orgScope = nockInstance

data/webpack/components/extensions/HostDetails/Cards/SystemPurposeCard/__tests__/SystemPurposeEditModal.test.js

@@ -5,10 +5,14 @@ import HOST_DETAILS from '../../../HostDetailsConstants';
 import SystemPurposeEditModal from '../SystemPurposeEditModal';
 import { assertNockRequest, nockInstance } from '../../../../../../test-utils/nockWrapper';
 import katelloApi, { foremanApi } from '../../../../../../services/api';
+import { ACTIVATION_KEY } from '../../../../../../scenes/ActivationKeys/Details/ActivationKeyConstants';
 
 const organizationDetails = katelloApi.getApiUrl('/organizations/1');
 const availableReleaseVersions = foremanApi.getApiUrl('/hosts/1/subscriptions/available_release_versions');
+const akAvailableReleaseVersions = katelloApi.getApiUrl('/activation_keys/1/releases');
 const hostEditUrl = foremanApi.getApiUrl('/hosts/1');
+const akEditUrl = katelloApi.getApiUrl('/activation_keys/1');
+const akDetailsGetUrl = akEditUrl;
 const hostDetailsGetUrl = '/api/hosts/test-host';
 
 const baseHostDetails = {
@@ -26,24 +30,33 @@ const baseHostDetails = {
   },
 };
 
+const akHostDetails = {
+  ...baseHostDetails,
+  permissions: {
+    edit_activation_keys: true,
+  },
+  subscription_facet_attributes: undefined,
+  ...baseHostDetails.subscription_facet_attributes,
+};
+
 const facetAttributes = propsToCamelCase(baseHostDetails.subscription_facet_attributes);
 const baseAttributes = {
-  hostName: 'test-host',
+  name: 'test-host',
   closeModal: jest.fn(),
   isOpen: true,
   orgId: 1,
-  hostId: 1,
+  id: 1,
 };
 
-const renderOptions = () => ({
-  apiNamespace: HOST_DETAILS,
+const renderOptions = (apiNamespace = HOST_DETAILS) => ({
+  apiNamespace,
   initialState: {
     API: {
-      HOST_DETAILS: {
+      [apiNamespace]: {
         response: {
           id: 1,
           name: 'test-host',
-          ...baseHostDetails,
+          ...(apiNamespace === HOST_DETAILS ? baseHostDetails : akHostDetails),
         },
         status: 'RESOLVED',
       },
@@ -64,6 +77,7 @@ describe('SystemPurposeEditModal', () => {
 
     const { getByText }
       = renderWithRedux(<SystemPurposeEditModal
+        type="host"
         {...baseAttributes}
         {...facetAttributes}
       />, renderOptions());
@@ -90,6 +104,7 @@ describe('SystemPurposeEditModal', () => {
       .reply(200, []);
     const { getAllByText }
       = renderWithRedux(<SystemPurposeEditModal
+        type="host"
         {...
           {
             ...baseAttributes,
@@ -103,7 +118,7 @@ describe('SystemPurposeEditModal', () => {
     assertNockRequest(orgScope);
     assertNockRequest(availableReleaseVersionsScope);
   });
-  test('Calls API and changes syspurpose values', async (done) => {
+  test('Calls API and changes syspurpose values for host', async (done) => {
     const orgScope = nockInstance
       .get(organizationDetails)
       .reply(200, {
@@ -134,6 +149,7 @@ describe('SystemPurposeEditModal', () => {
 
     const { getByLabelText, getByRole }
       = renderWithRedux(<SystemPurposeEditModal
+        type="host"
         {...baseAttributes}
         {...facetAttributes}
       />, renderOptions());
@@ -158,4 +174,118 @@ describe('SystemPurposeEditModal', () => {
     });
     assertNockRequest(hostDetailsScope, done);
   });
+  test('Calls API and changes syspurpose values for activation key', async (done) => {
+    const orgScope = nockInstance
+      .get(organizationDetails)
+      .reply(200, {
+        id: 1,
+      });
+    const availableReleaseVersionsScope = nockInstance
+      .get(akAvailableReleaseVersions)
+      .reply(200, []);
+    const akEditScope = nockInstance
+      .put(akEditUrl, {
+        id: 1,
+        activation_key: {
+          // we're going to change role from 'Server' to 'Workstation'
+          autoheal: true,
+          purpose_role: 'Red Hat Enterprise Linux Workstation',
+          purpose_usage: 'Production',
+          purpose_addons: ['Addon1', 'Addon2'],
+          release_version: '8',
+          service_level: 'Premium',
+        },
+      })
+      .reply(200);
+    const akDetailsScope = nockInstance
+      .get(akDetailsGetUrl)
+      .reply(200);
+
+    const { getByLabelText, getByRole }
+      = renderWithRedux(<SystemPurposeEditModal
+        type="ak"
+        {...baseAttributes}
+        {...facetAttributes}
+      />, renderOptions(ACTIVATION_KEY));
+
+    const saveButton = getByRole('button', { name: 'Save' });
+    // Save button should be disabled if no values have been changed
+    expect(saveButton).toHaveAttribute('aria-disabled', 'true');
+
+    const roleDropdown = getByLabelText('Role');
+    fireEvent.change(roleDropdown, { target: { value: 'Red Hat Enterprise Linux Workstation' } });
+
+    // Save button should now be enabled
+    expect(saveButton).toHaveAttribute('aria-disabled', 'false');
+    fireEvent.click(saveButton);
+
+    await patientlyWaitFor(() => {
+      expect(baseAttributes.closeModal).toHaveBeenCalled();
+    });
+
+    [orgScope, availableReleaseVersionsScope, akEditScope].forEach((scope) => {
+      assertNockRequest(scope);
+    });
+    assertNockRequest(akDetailsScope, done);
+  });
+  test('Retrieves available release versions for host', async (done) => {
+    const orgScope = nockInstance
+      .get(organizationDetails)
+      .reply(200, {
+        id: 1,
+      });
+    const availableReleaseVersionsScope = nockInstance
+      .get(availableReleaseVersions)
+      .reply(200, { results: ['8', '9'] });
+
+    const { getByLabelText, getByText }
+      = renderWithRedux(<SystemPurposeEditModal
+        type="host"
+        {...baseAttributes}
+        {...facetAttributes}
+      />, renderOptions());
+
+    const releaseVersionDropdown = getByLabelText('Release version');
+    fireEvent.click(releaseVersionDropdown);
+
+    await patientlyWaitFor(() => {
+      expect(getByText('8')).toBeInTheDocument();
+      expect(getByText('9')).toBeInTheDocument();
+    });
+
+    [orgScope, availableReleaseVersionsScope].forEach((scope) => {
+      assertNockRequest(scope);
+    });
+    done();
+  });
+  test('Retrieves available release versions for activation key', async (done) => {
+    const orgScope = nockInstance
+      .get(organizationDetails)
+      .reply(200, {
+        id: 1,
+      });
+    const availableReleaseVersionsScope = nockInstance
+      .get(akAvailableReleaseVersions)
+      .reply(200, { results: ['8', '9'] });
+
+    const { getByLabelText, getByText }
+      = renderWithRedux(<SystemPurposeEditModal
+        type="ak"
+        {...baseAttributes}
+        {...facetAttributes}
+      />, renderOptions(ACTIVATION_KEY));
+
+    const releaseVersionDropdown = getByLabelText('Release version');
+    fireEvent.click(releaseVersionDropdown);
+
+    await patientlyWaitFor(() => {
+      expect(getByText('8')).toBeInTheDocument();
+      expect(getByText('9')).toBeInTheDocument();
+    });
+
+    [orgScope, availableReleaseVersionsScope].forEach((scope) => {
+      assertNockRequest(scope);
+    });
+    done();
+  });
 });

data/webpack/components/extensions/HostDetails/DetailsTabCards/HwPropertiesCard.js

@@ -1,6 +1,5 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { propsToCamelCase } from 'foremanReact/common/helpers';
 import { translate as __ } from 'foremanReact/common/I18n';
 import {
   DescriptionList,
@@ -14,7 +13,12 @@ import CardTemplate from 'foremanReact/components/HostDetails/Templates/CardItem
 import { TranslatedPlural } from '../../../Table/components/TranslatedPlural';
 import { hostIsNotRegistered } from '../hostDetailsHelpers';
 
-const HostDisks = ({ totalDisks }) => {
+const HostDisks = ({ blockDevices }) => {
+  if (!blockDevices) return null;
+  // blockDevices fact will look like this by default 'sr0,sda' and increment like sdb etc
+  const disks = blockDevices.split(',');
+  // We are filtering out the CDROM drive that gets added by default a lot of the time
+  const totalDisks = disks.filter(e => !e.startsWith('sr')).length;
   if (!totalDisks) return null;
   return (
     <>
@@ -27,11 +31,11 @@ const HostDisks = ({ totalDisks }) => {
 };
 
 HostDisks.propTypes = {
-  totalDisks: PropTypes.number,
+  blockDevices: PropTypes.string,
 };
 
 HostDisks.defaultProps = {
-  totalDisks: null,
+  blockDevices: '',
 };
 
 const HwPropertiesCard = ({ isExpandedGlobal, hostDetails }) => {
@@ -41,8 +45,7 @@ const HwPropertiesCard = ({ isExpandedGlobal, hostDetails }) => {
   const cpuCount = facts?.['cpu::cpu(s)'];
   const cpuSockets = facts?.['cpu::cpu_socket(s)'];
   const coreSocket = facts?.['cpu::core(s)_per_socket'];
-  const reportedFacts = propsToCamelCase(hostDetails?.reported_data || {});
-  const totalDisks = reportedFacts?.disksTotal;
+  const blockDevices = facts?.blockdevices;
   const memory = facts?.['dmi::memory::maximum_capacity'];
 
   return (
@@ -74,7 +77,7 @@ const HwPropertiesCard = ({ isExpandedGlobal, hostDetails }) => {
           <DescriptionListDescription>{memory}</DescriptionListDescription>
         </DescriptionListGroup>
         <DescriptionListGroup>
-          <HostDisks totalDisks={totalDisks} />
+          <HostDisks blockDevices={blockDevices} />
         </DescriptionListGroup>
       </DescriptionList>
     </CardTemplate>
@@ -90,9 +93,7 @@ HwPropertiesCard.propTypes = {
       cpuSockets: PropTypes.number,
       coreSocket: PropTypes.number,
       memory: PropTypes.string,
-    }),
-    reported_data: PropTypes.shape({
-      totalDisks: PropTypes.number,
+      blockdevices: PropTypes.string,
     }),
   }),
 };

data/webpack/components/extensions/HostDetails/DetailsTabCards/RegistrationCard.js

@@ -55,9 +55,12 @@ const RegistrationCard = ({ isExpandedGlobal, hostDetails }) => {
   const subscriptionFacetAttributes
     = propsToCamelCase(hostDetails?.subscription_facet_attributes || {});
   const {
-    registeredAt, registeredThrough, activationKeys, user,
+    registeredAt, activationKeys, user,
   }
     = subscriptionFacetAttributes;
+  const contentFacetAttributes
+    = propsToCamelCase(hostDetails?.content_facet_attributes || {});
+  const { contentSourceName } = contentFacetAttributes;
   const login = user?.login;
   if (!registeredAt) return null;
   return (
@@ -78,7 +81,7 @@ const RegistrationCard = ({ isExpandedGlobal, hostDetails }) => {
         </DescriptionListGroup>
         <DescriptionListGroup>
           <DescriptionListTerm>{__('Content source')}</DescriptionListTerm>
-          <DescriptionListDescription>{registeredThrough}</DescriptionListDescription>
+          <DescriptionListDescription>{contentSourceName}</DescriptionListDescription>
         </DescriptionListGroup>
       </DescriptionList>
     </CardTemplate>
@@ -99,6 +102,9 @@ RegistrationCard.propTypes = {
         name: PropTypes.string,
       })),
     }),
+    content_facet_attributes: PropTypes.shape({
+      content_source_name: PropTypes.string,
+    }),
   }),
 };
 

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

@@ -19,15 +19,17 @@ import {
 } from '@patternfly/react-table';
 import { isEqual } from 'lodash';
 import { translate as __ } from 'foremanReact/common/I18n';
+import { HOST_DETAILS_KEY } from 'foremanReact/components/HostDetails/consts';
 import { selectAPIResponse } from 'foremanReact/redux/API/APISelectors';
 import IsoDate from 'foremanReact/components/common/dates/IsoDate';
 import { urlBuilder } from 'foremanReact/common/urlHelpers';
 import { propsToCamelCase } from 'foremanReact/common/helpers';
+import { useSet, useBulkSelect, useUrlParams } from 'foremanReact/components/PF4/TableIndexPage/Table/TableHooks';
+import { useTableSort } from 'foremanReact/components/PF4/Helpers/useTableSort';
 import SelectableDropdown from '../../../../SelectableDropdown';
-import { useSet, useBulkSelect, useUrlParams, useTableSort } from '../../../../../components/Table/TableHooks';
 import TableWrapper from '../../../../../components/Table/TableWrapper';
 import { ErrataType, ErrataSeverity, ErrataToggleGroupItem } from '../../../../../components/Errata';
-import { getInstallableErrata, regenerateApplicability } from './HostErrataActions';
+import { getInstallableErrata } from './HostErrataActions';
 import ErratumExpansionDetail from './ErratumExpansionDetail';
 import ErratumExpansionContents from './ErratumExpansionContents';
 import { selectHostErrataStatus } from './HostErrataSelectors';
@@ -42,6 +44,7 @@ import { hasRequiredPermissions as can,
 import SortableColumnHeaders from '../../../../Table/components/SortableColumnHeaders';
 import { useRexJobPolling } from '../RemoteExecutionHooks';
 import { errataStatusContemplation, friendlyErrataStatus } from '../../../../Errata/errataHelpers';
+import { runSubmanRepos } from '../../Cards/ContentViewDetailsCard/HostContentViewActions';
 
 const recalculateApplicability = ['edit_hosts'];
 const invokeRexJobs = ['create_job_invocations'];
@@ -106,6 +109,23 @@ export const ErrataTab = () => {
     setToggleGroupState(APPLICABLE);
   };
 
+  const refreshHostDetails = () => dispatch({
+    type: 'API_GET',
+    payload: {
+      key: HOST_DETAILS_KEY,
+      url: `/api/hosts/${hostname}`,
+    },
+  });
+
+  const {
+    triggerJobStart: triggerRecalculate, lastCompletedJob: lastCompletedRecalculate,
+  } = useRexJobPolling(() => runSubmanRepos(hostname, refreshHostDetails));
+
+  const recalculateErrata = () => {
+    setIsBulkActionOpen(false);
+    triggerRecalculate();
+  };
+
   let resetFilters = resetFiltersOnly;
   let secondaryActionTextOverride;
   let emptyContentTitle;
@@ -114,6 +134,8 @@ export const ErrataTab = () => {
   case 'All up to date':
     emptyContentTitle = __('All up to date');
     emptyContentBody = __('No action is needed because there are no applicable errata for this host.');
+    resetFilters = recalculateErrata;
+    secondaryActionTextOverride = __('Refresh errata applicability');
     break;
   case 'Needed':
     emptyContentTitle = __('No matching errata found');
@@ -266,11 +288,6 @@ export const ErrataTab = () => {
     hostname, search: (selectedCount > 0) ? fetchBulkParams() : '',
   });
 
-  const recalculateErrata = () => {
-    setIsBulkActionOpen(false);
-    dispatch(regenerateApplicability(hostId));
-  };
-
   const showActions = can(invokeRexJobs, userPermissions);
 
   const readOnlyBookmarks =
@@ -284,7 +301,7 @@ export const ErrataTab = () => {
       component="button"
       onClick={recalculateErrata}
     >
-      {__('Recalculate')}
+      {__('Refresh errata applicability')}
     </DropdownItem>,
   ];
 
@@ -447,13 +464,13 @@ export const ErrataTab = () => {
             secondaryActionTextOverride,
           }
           }
-          showSecondaryActionButton={neededErrata}
+          showSecondaryActionButton={neededErrata || showRecalculate}
           happyEmptyContent={allUpToDate}
           ouiaId="host-errata-table"
           additionalListeners={[
             hostId, toggleGroupState, errataTypeSelected,
             errataSeveritySelected, activeSortColumn, activeSortDirection,
-            lastCompletedApply, lastCompletedBulkApply]}
+            lastCompletedApply, lastCompletedBulkApply, lastCompletedRecalculate]}
           fetchItems={fetchItems}
           bookmarkController="katello_errata"
           readOnlyBookmarks={readOnlyBookmarks}

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

@@ -1,7 +1,6 @@
-import { API_OPERATIONS, get, put } from 'foremanReact/redux/API';
+import { API_OPERATIONS, get } from 'foremanReact/redux/API';
 import { foremanApi } from '../../../../../services/api';
-import { HOST_ERRATA_KEY, HOST_ERRATA_APPLICABILITY_KEY } from './HostErrataConstants';
-import { errorToast } from '../../../../../scenes/Tasks/helpers';
+import { HOST_ERRATA_KEY } from './HostErrataConstants';
 
 export const getInstallableErrata = (hostId, params) => get({
   type: API_OPERATIONS.GET,
@@ -10,23 +9,5 @@ export const getInstallableErrata = (hostId, params) => get({
   params,
 });
 
-export const regenerateApplicability = (hostId, params) => put({
-  type: API_OPERATIONS.PUT,
-  key: HOST_ERRATA_APPLICABILITY_KEY,
-  url: foremanApi.getApiUrl(`/hosts/${hostId}/errata/applicability`),
-  // This endpoint doesn't return a task, so can't use renderTaskStartedToast
-  // also can't use successToast because we want the type to be 'info'
-  handleSuccess: () => {
-    window.tfm.toastNotifications.notify({
-      message: 'Regenerating errata applicability.',
-      type: 'info',
-      link: {
-        children: 'View related tasks',
-        href: '/foreman_tasks/tasks?search=action+~+applicability&page=1',
-      },
-    });
-  },
-  errorToast: error => errorToast(error),
-  params,
-});
+export default getInstallableErrata;