katello 4.13.1 → 4.14.0.rc1

data/webpack/components/extensions/Hosts/BulkActions/HostReview.js

@@ -0,0 +1,176 @@
+import React, { useEffect } from 'react'; // Don't useContext here so this component is reusable
+import PropTypes from 'prop-types';
+import {
+  Alert,
+  ToolbarItem,
+  Text,
+  TextContent,
+  TextVariants,
+} from '@patternfly/react-core';
+import TableIndexPage from 'foremanReact/components/PF4/TableIndexPage/TableIndexPage';
+import { HOSTS_API_PATH } from 'foremanReact/routes/Hosts/constants';
+import { translate as __ } from 'foremanReact/common/I18n';
+import SelectAllCheckbox from 'foremanReact/components/PF4/TableIndexPage/Table/SelectAllCheckbox';
+import { RowSelectTd } from 'foremanReact/components/HostsIndex/RowSelectTd';
+import { getPageStats } from 'foremanReact/components/PF4/TableIndexPage/Table/helpers';
+
+const HostReview = ({
+  initialSelectedHosts,
+  hostsBulkSelect,
+  setShouldValidateStep,
+}) => {
+  const apiOptions = { key: 'HOST_REVIEW' };
+
+  const {
+    hostsBulkSelect: {
+      selectPage,
+      selectAll,
+      selectNone,
+      selectOne,
+      isSelected,
+      selectedCount,
+      areAllRowsSelected,
+      areAllRowsOnPageSelected,
+      updateSearchQuery,
+      hasInteracted,
+    },
+    hostsMetadata: {
+      subtotal,
+      total,
+      page,
+      per_page: perPage,
+    },
+    hostsResponse: response,
+  } = hostsBulkSelect;
+
+  const { response: { results } = {} } = response;
+
+  useEffect(() => {
+    if (results?.length && hasInteracted) {
+      setShouldValidateStep(true);
+    }
+  }, [setShouldValidateStep, results?.length, hasInteracted]);
+
+  const pageStats = getPageStats({ total: subtotal, page, perPage });
+  const selectionToolbar = (
+    <ToolbarItem key="selectAll">
+      <SelectAllCheckbox
+        {...{
+          selectedCount,
+          pageRowCount: pageStats.pageRowCount,
+          areAllRowsSelected,
+          areAllRowsOnPageSelected,
+          selectAll,
+          selectNone,
+          selectPage,
+        }}
+        totalCount={total}
+        areAllRowsOnPageSelected={areAllRowsOnPageSelected()}
+        areAllRowsSelected={areAllRowsSelected()}
+      />
+    </ToolbarItem>
+  );
+
+  const columns = {
+    name: {
+      title: __('Name'),
+      wrapper: ({ name, display_name: displayName }) => (
+        <a target="_blank" href={`hosts/${name}`} rel="noreferrer">{displayName}</a>
+      ),
+      isSorted: true,
+      weight: 50,
+    },
+    os_title: {
+      title: __('OS'),
+      wrapper: hostDetails => hostDetails?.operatingsystem_name,
+      isSorted: true,
+      weight: 100,
+    },
+  };
+
+  // restrict search query to only selected hosts
+  const restrictedSearchQuery = (newSearch) => {
+    let newSearchQuery = initialSelectedHosts;
+    const trimmedSearch = newSearch?.trim() ?? '';
+    if (!!trimmedSearch && !trimmedSearch.includes(initialSelectedHosts)) {
+      newSearchQuery = `${initialSelectedHosts} and ${trimmedSearch}`;
+    }
+    return newSearchQuery;
+  };
+
+  return (
+    <>
+      <TextContent>
+        <Text ouiaId="mpw-step-3-header" component={TextVariants.h3}>
+          {__('Review hosts')}
+        </Text>
+        <Text ouiaId="mpw-step-3-content" component={TextVariants.p}>
+          {__('Review and optionally exclude hosts from your selection.')}
+        </Text>
+      </TextContent>
+      {selectedCount === 0 && hasInteracted && (
+        <Alert
+          ouiaId="no-hosts-alert"
+          variant="danger"
+          isInline
+          title={__('You must select at least one host.')}
+          style={{ marginBottom: '1rem' }}
+        />
+      )}
+      <TableIndexPage
+        columns={columns}
+        showCheckboxes
+        apiUrl={HOSTS_API_PATH}
+        apiOptions={apiOptions}
+        headerText={__('Hosts')}
+        header={null}
+        controller="hosts"
+        creatable={false}
+        replacementResponse={response}
+        selectionToolbar={selectionToolbar}
+        updateSearchQuery={updateSearchQuery}
+        restrictedSearchQuery={restrictedSearchQuery}
+        rowSelectTd={RowSelectTd}
+        selectOne={selectOne}
+        isSelected={isSelected}
+        updateParamsByUrl={false}
+        bookmarksPosition="right"
+      />
+    </>
+  );
+};
+
+HostReview.propTypes = {
+  initialSelectedHosts: PropTypes.string,
+  hostsBulkSelect: PropTypes.shape({
+    hostsBulkSelect: PropTypes.shape({
+      selectPage: PropTypes.func,
+      selectAll: PropTypes.func,
+      selectNone: PropTypes.func,
+      selectOne: PropTypes.func,
+      exclusionSet: PropTypes.object, // eslint-disable-line react/forbid-prop-types
+      isSelected: PropTypes.func,
+      selectedCount: PropTypes.number,
+      areAllRowsSelected: PropTypes.func,
+      areAllRowsOnPageSelected: PropTypes.func,
+      updateSearchQuery: PropTypes.func,
+      inclusionSet: PropTypes.object, // eslint-disable-line react/forbid-prop-types
+      hasInteracted: PropTypes.bool,
+    }),
+    hostsMetadata: PropTypes.shape({
+      total: PropTypes.number,
+      page: PropTypes.number,
+      per_page: PropTypes.number,
+      subtotal: PropTypes.number,
+    }),
+    hostsResponse: PropTypes.shape([]),
+  }),
+  setShouldValidateStep: PropTypes.func.isRequired,
+};
+
+HostReview.defaultProps = {
+  hostsBulkSelect: {},
+  initialSelectedHosts: '',
+};
+
+export default HostReview;

data/webpack/components/extensions/Hosts/TableRowActions/index.js

@@ -0,0 +1,17 @@
+import { translate as __ } from 'foremanReact/common/I18n';
+import { foremanUrl } from 'foremanReact/common/helpers';
+
+const hostTableRowActions = (hostDetails) => {
+  const hostIsRegistered = hostDetails?.subscription_facet_attributes?.uuid;
+  return [
+    {
+      title: __('Change content view environments'),
+      onClick: () => {
+        window.location.href = foremanUrl(`hosts/${hostDetails.display_name}#/Overview?content_view_assignment=true`);
+      },
+      isDisabled: !hostIsRegistered,
+    },
+  ];
+};
+
+export default hostTableRowActions;

data/webpack/global_index.js

@@ -4,8 +4,10 @@ import { registerReducer } from 'foremanReact/common/MountingService';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { registerColumns } from 'foremanReact/components/HostsIndex/Columns/core';
 import componentRegistry from 'foremanReact/components/componentRegistry';
+import { registerGetActions } from 'foremanReact/components/HostsIndex/TableRowActions/core';
 
 import hostsIndexColumnExtensions from './ForemanColumnExtensions/index';
+import hostTableRowActions from './components/extensions/Hosts/TableRowActions';
 import SystemStatuses from './components/extensions/about';
 import {
   RegistrationCommands,
@@ -33,8 +35,8 @@ import HostsIndexActionsBar from './components/extensions/Hosts/ActionsBar';
 import RecentCommunicationCardExtensions from './components/extensions/HostDetails/DetailsTabCards/RecentCommunicationCardExtensions';
 import SystemPurposeCard from './components/extensions/HostDetails/Cards/SystemPurposeCard/SystemPurposeCard';
 import BulkChangeHostCVModal from './components/extensions/Hosts/BulkActions/BulkChangeHostCVModal/index.js';
-
-
+import BulkPackagesWizardModal from './components/extensions/Hosts/BulkActions/BulkPackagesWizard/index.js';
+import BulkErrataWizardModal from './components/extensions/Hosts/BulkActions/BulkErrataWizard/index.js';
 import ActivationKeysSearch from './components/ActivationKeysSearch';
 
 registerReducer('katelloExtends', extendReducer);
@@ -90,9 +92,15 @@ addGlobalFill('host-tab-details-cards', 'HW properties', <HwPropertiesCard key="
 
 // Hosts Index page extensions
 addGlobalFill('_all-hosts-modals', 'BulkChangeHostCVModal', <BulkChangeHostCVModal key="bulk-change-host-cv-modal" />, 100);
+addGlobalFill('_all-hosts-modals', 'BulkPackagesWizardModal', <BulkPackagesWizardModal key="bulk-packages-wizard-modal" />, 200);
+addGlobalFill('_all-hosts-modals', 'BulkErrataWizardModal', <BulkErrataWizardModal key="bulk-errata-wizard-modal" />, 200);
 
 registerColumns(hostsIndexColumnExtensions);
-
+registerGetActions({
+  pluginName: 'katello',
+  getActionsFunc: hostTableRowActions,
+  tableName: 'hosts',
+});
 
 componentRegistry.register({
   name: 'ActivationKeysSearch',

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

@@ -68,13 +68,12 @@ const loadRepositorySetRepos = (contentId, productId) => async (dispatch) => {
       productId,
       results: data.results,
     });
-  } catch (response) {
-    const error = response && response.data && response.data.error;
-    return dispatch({
-      type: REPOSITORY_SET_REPOSITORIES_FAILURE,
-      contentId,
+  } catch (error) {
+    return dispatch(apiError(
+      REPOSITORY_SET_REPOSITORIES_FAILURE,
       error,
-    });
+      { contentId },
+    ));
   }
 };
 

data/webpack/redux/reducers/RedHatRepositories/__tests__/repositorySetRepositories.test.js

@@ -39,7 +39,7 @@ describe('repositorySetRepositories reducer', () => {
   it('should have error on REPOSITORY_SET_REPOSITORIES_FAILURE', () => {
     expect(reducer(initialState, {
       type: types.REPOSITORY_SET_REPOSITORIES_FAILURE,
-      contentId,
+      payload: { contentId },
       error: 'Unable to process request.',
     })).toEqual(errorState);
   });

data/webpack/redux/reducers/RedHatRepositories/repositorySetRepositories.js

@@ -81,7 +81,7 @@ export default (state = initialState, action) => {
     });
 
   case REPOSITORY_SET_REPOSITORIES_FAILURE:
-    return state.set(action.contentId, {
+    return state.set(action.payload.contentId, {
       loading: false,
       repositories: [],
       error: action.error,

data/webpack/scenes/ContentViews/Copy/CopyContentViewModal.js

@@ -4,6 +4,7 @@ import { Modal, ModalVariant } from '@patternfly/react-core';
 import { FormattedMessage } from 'react-intl';
 import { translate as __ } from 'foremanReact/common/I18n';
 import CopyContentViewForm from './CopyContentViewForm';
+import { truncate } from '../../../utils/helpers';
 
 const CopyContentViewModal = ({
   cvId, cvName, show, setIsOpen,
@@ -11,7 +12,7 @@ const CopyContentViewModal = ({
   const description = (
     <FormattedMessage
       id="copy-cv-description"
-      values={{ cv: <b>{cvName}</b> }}
+      values={{ cv: <b>{truncate(cvName)}</b> }}
       defaultMessage={__('This will create a copy of {cv}, including details, repositories, and filters. Generated data such as history, tasks and versions will not be copied.')}
     />
   );

data/webpack/scenes/ContentViews/Details/ComponentContentViews/ComponentContentViewAddModal.js

@@ -14,6 +14,7 @@ import {
   selectCVDetailStatus,
 } from '../../Details/ContentViewDetailSelectors';
 import getContentViewDetails, { addComponent } from '../ContentViewDetailActions';
+import { truncate } from '../../../../utils/helpers';
 
 const ComponentContentViewAddModal = ({
   cvId, componentCvId, componentId, latest, componentVersionId, show, setIsOpen,
@@ -84,7 +85,7 @@ const ComponentContentViewAddModal = ({
       variant={ModalVariant.small}
       isOpen={show}
       ouiaId="add-update-cv-modal"
-      description={__(`Select available version of ${cvName} to use`)}
+      description={__(`Select available version of ${truncate(cvName)} to use`)}
       onClose={() => {
         setIsOpen(false);
       }}

data/webpack/scenes/ContentViews/Details/ComponentContentViews/ComponentContentViewBulkAddModal.js

@@ -9,6 +9,7 @@ import { OutlinedQuestionCircleIcon } from '@patternfly/react-icons';
 import { useDispatch } from 'react-redux';
 import { translate as __ } from 'foremanReact/common/I18n';
 import getContentViewDetails, { addComponent } from '../ContentViewDetailActions';
+import { truncate } from '../../../../utils/helpers';
 
 const ComponentContentViewBulkAddModal = ({ cvId, rowsToAdd, onClose }) => {
   const dispatch = useDispatch();
@@ -62,7 +63,7 @@ const ComponentContentViewBulkAddModal = ({ cvId, rowsToAdd, onClose }) => {
             aria-label="componentCvName"
             key={componentCvName}
           >
-            <CardTitle aria-label={componentCvName}>{componentCvName}</CardTitle>
+            <CardTitle aria-label={componentCvName}>{truncate(componentCvName)}</CardTitle>
             <CardBody>
               <FormGroup label={__('Version')} isRequired fieldId="version">
                 <Select

data/webpack/scenes/ContentViews/Details/ComponentContentViews/ContentViewComponents.js

@@ -36,6 +36,7 @@ import ComponentContentViewAddModal from './ComponentContentViewAddModal';
 import ComponentContentViewBulkAddModal from './ComponentContentViewBulkAddModal';
 import { hasPermission } from '../../helpers';
 import InactiveText from '../../components/InactiveText';
+import { truncate } from '../../../../utils/helpers';
 
 
 const ContentViewComponents = ({ cvId, details }) => {
@@ -144,7 +145,7 @@ const ContentViewComponents = ({ cvId, details }) => {
 
       const cells = [
         { title: <Bullseye><ContentViewIcon composite={false} /></Bullseye> },
-        { title: <a href={urlBuilder('content_views', '') + id}>{name}</a> },
+        { title: <a href={urlBuilder('content_views', '') + id}>{truncate(name)}</a> },
         {
           title: (
             <Split>

data/webpack/scenes/ContentViews/Details/ContentViewDetails.js

@@ -39,6 +39,7 @@ import ContentViewDeleteWizard from '../Delete/ContentViewDeleteWizard';
 import EmptyStateMessage from '../../../components/Table/EmptyStateMessage';
 import { CONTENT_VIEW_NEEDS_PUBLISH_RESET, cvVersionTaskPollingKey } from '../ContentViewsConstants';
 import { clearPollTaskData, stopPollingTask } from '../../Tasks/TaskActions';
+import { truncate } from '../../../utils/helpers';
 
 export default () => {
   const { id } = useParams();
@@ -161,7 +162,7 @@ export default () => {
               <FlexItem>
                 <TextContent>
                   <Text ouiaId="cv-details-header-name" component={TextVariants.h1}>
-                    <ContentViewIcon count={name} composite={composite} />
+                    <ContentViewIcon count={truncate(name)} composite={composite} />
                   </Text>
                 </TextContent>
               </FlexItem>

data/webpack/scenes/ContentViews/Details/Repositories/ContentViewRepositories.js

@@ -4,6 +4,7 @@ import React, {
   useState,
 } from 'react';
 import { FormattedMessage } from 'react-intl';
+import { getDocsURL } from 'foremanReact/common/helpers';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { urlBuilder } from 'foremanReact/common/urlHelpers';
 import { STATUS } from 'foremanReact/constants';
@@ -40,7 +41,6 @@ import {
   Td,
 } from '@patternfly/react-table';
 import { useSelectionSet } from 'foremanReact/components/PF4/TableIndexPage/Table/TableHooks';
-import { useKatelloDocUrl } from '../../../../utils/useKatelloDocUrl';
 import AddedStatusLabel from '../../../../components/AddedStatusLabel';
 import SelectableDropdown from '../../../../components/SelectableDropdown';
 import TableWrapper from '../../../../components/Table/TableWrapper';
@@ -139,7 +139,7 @@ const ContentViewRepositories = ({ cvId, details }) => {
     __('Status'),
   ];
 
-  const documentationUrl = useKatelloDocUrl('Managing_Content', '#Products_and_Repositories_content-management');
+  const documentationUrl = getDocsURL('Managing_Content', 'Products_and_Repositories_content-management');
 
   useEffect(() => {
     dispatch(getRepositoryTypes());

data/webpack/scenes/ContentViews/Publish/CVPublishForm.js

@@ -12,6 +12,7 @@ import ComponentEnvironments from '../Details/ComponentContentViews/ComponentEnv
 import './cvPublishForm.scss';
 import WizardHeader from '../components/WizardHeader';
 import { selectCVNeedsPublish } from '../Details/ContentViewDetailSelectors';
+import { truncate } from '../../../utils/helpers';
 
 const CVPublishForm = ({
   description,
@@ -83,7 +84,7 @@ const CVPublishForm = ({
                   <TextContent>{__('Repositories common to the selected content view versions will merge, resulting in a composite content view that is a union of all content from each of the content view versions.')}</TextContent>
                 </Alert>)
             }
-            {__('A new version of ')}<b>{composite ? <RegistryIcon /> : <EnterpriseIcon />} {name}</b>
+            {__('A new version of ')}<b>{composite ? <RegistryIcon /> : <EnterpriseIcon />} {truncate(name)}</b>
             {__(' will be created and automatically promoted to the ' +
               'Library environment. You can promote to other environments as well. ')
             }

data/webpack/scenes/ContentViews/Publish/CVPublishReview.js

@@ -16,6 +16,7 @@ import ComponentEnvironments from '../Details/ComponentContentViews/ComponentEnv
 import { selectEnvironmentPaths, selectEnvironmentPathsStatus } from '../components/EnvironmentPaths/EnvironmentPathSelectors';
 import WizardHeader from '../components/WizardHeader';
 import { selectCVFilters, selectCVFiltersStatus } from '../Details/ContentViewDetailSelectors';
+import { truncate } from '../../../utils/helpers';
 
 const CVPublishReview = ({
   details: {
@@ -53,7 +54,7 @@ const CVPublishReview = ({
         title={__('Review details')}
         description={
           <>
-            {__('Review your currently selected changes for ')}<b>{composite ? <RegistryIcon /> : <EnterpriseIcon />} {name}.</b>
+            {__('Review your currently selected changes for ')}<b>{composite ? <RegistryIcon /> : <EnterpriseIcon />} {truncate(name)}.</b>
             {filtered && (
             <Alert
               ouiaId="filters-applied-alert"
@@ -78,7 +79,7 @@ const CVPublishReview = ({
         <Tbody>
           <Tr ouiaId="cv-publish-review-table-row">
             <Td>
-              <><ContentViewIcon composite={composite} description={name} /><InactiveText text={__('Newly published')} /></>
+              <><ContentViewIcon composite={composite} description={truncate(name)} /><InactiveText text={__('Newly published')} /></>
             </Td>
             <Td>
               {__('Version')} {nextVersion}

data/webpack/scenes/ContentViews/Publish/PublishContentViewWizard.js

@@ -15,6 +15,7 @@ import {
 import { stopPollingTask } from '../../Tasks/TaskActions';
 import { cvVersionTaskPollingKey } from '../ContentViewsConstants';
 import { getContentViewFilters } from '../Details/ContentViewDetailActions';
+import { truncate } from '../../../utils/helpers';
 
 const PublishContentViewWizard = ({
   details, show, onClose,
@@ -108,7 +109,7 @@ const PublishContentViewWizard = ({
   return (
     <Wizard
       title={__('Publish')}
-      description={currentStep === 3 ? __(`Publishing ${name}`) : __(`Determining settings for ${name}`)}
+      description={currentStep === 3 ? __(`Publishing ${truncate(name)}`) : __(`Determining settings for ${truncate(name)}`)}
       steps={steps}
       startAtStep={currentStep}
       // Let the wizard handle step change

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

@@ -24,6 +24,7 @@ import InactiveText from '../components/InactiveText';
 import ContentViewVersionCell from './ContentViewVersionCell';
 import DetailsExpansion from '../expansions/DetailsExpansion';
 import ContentViewDeleteWizard from '../Delete/ContentViewDeleteWizard';
+import { truncate } from '../../../utils/helpers';
 
 const ContentViewTable = () => {
   const response = useSelector(selectContentViews);
@@ -265,7 +266,7 @@ const ContentViewTable = () => {
                   }}
                 />
                 <Td><ContentViewIcon position="right" composite={composite} /></Td>
-                <Td><Link to={`${urlBuilder('content_views', '')}${cvId}`}>{name}</Link></Td>
+                <Td><Link to={`${urlBuilder('content_views', '')}${cvId}`}>{truncate(name)}</Link></Td>
                 <Td>{lastPublished ? <LongDateTime date={lastPublished} showRelativeTimeTooltip /> : <InactiveText text={__('Not yet published')} />}</Td>
                 <Td><LastSync startedAt={startedAt} lastSync={lastTask} lastSyncWords={lastSyncWords} emptyMessage="N/A" /></Td>
                 <Td>{latestVersion ?

data/webpack/scenes/ContentViews/components/CVBreadCrumb.js

@@ -10,6 +10,7 @@ import {
   selectCVDetails, selectCVDetailStatus, selectCVFilterDetails, selectCVFilterDetailStatus,
   selectCVVersionDetails, selectCVVersionDetailsStatus,
 } from '../Details/ContentViewDetailSelectors';
+import { truncate } from '../../../utils/helpers';
 
 const CVBreadcrumb = () => {
   const { id } = useParams();
@@ -47,7 +48,7 @@ const CVBreadcrumb = () => {
       Object.keys(breadcrumbItems).length === 1) {
       const cvRecordCrumb = {
         [`b_${cvDetails?.name}`]: {
-          render: () => (<Link to={`/content_views/${cvId}`}>{cvDetails?.name}</Link>),
+          render: () => (<Link to={`/content_views/${cvId}`}>{truncate(cvDetails?.name)}</Link>),
         },
       };
       const tabName = splitHash[1];

data/webpack/scenes/ContentViews/components/ContentViewSelect/ContentViewSelectOption.js

@@ -7,7 +7,7 @@ import {
   global_palette_black_600 as pfDescriptionColor,
 } from '@patternfly/react-tokens';
 import ContentViewIcon from '../../../../scenes/ContentViews/components/ContentViewIcon';
-import { uniq } from '../../../../utils/helpers';
+import { truncate, uniq } from '../../../../utils/helpers';
 
 export const ContentViewDescription = ({ cv, versionNumber }) => {
   const descriptionStyle = {
@@ -63,7 +63,7 @@ const ContentViewSelectOption = ({ cv, env, value }) => (
         flexWrap={{ default: 'nowrap' }}
         alignItems={{ default: 'alignItemsFlexStart', sm: 'alignItemsFlexStart' }}
       >
-        {cv.name}
+        {truncate(cv.name)}
         <ContentViewDescription
           cv={cv}
           versionNumber={relevantVersionFromCv(cv, env)}

data/webpack/scenes/Subscriptions/Details/SubscriptionAttributes.js

@@ -15,4 +15,5 @@ export default {
   type: __('Type'),
   multi_entitlement: __('Multi-entitlement'),
   stacking_id: __('Stacking ID'),
+  product_host_count: __('Product Host Count'),
 };

data/webpack/scenes/Subscriptions/Details/__tests__/__snapshots__/SubscriptionDetailInfo.test.js.snap

@@ -150,6 +150,16 @@ exports[`subscriptions detail associations page renders correctly 1`] = `
           SER0421
         </td>
       </tr>
+      <tr>
+        <td>
+          <b>
+            Product Host Count
+          </b>
+        </td>
+        <td>
+          
+        </td>
+      </tr>
       <tr>
         <td>
           <b>

data/webpack/scenes/Subscriptions/SubscriptionConstants.js

@@ -102,6 +102,11 @@ export const SUBSCRIPTION_TABLE_COLUMNS = [
     label: __('Entitlements'),
     value: false,
   },
+  {
+    key: 'product_host_count',
+    label: __('Product Host Count'),
+    value: false,
+  },
 ];
 
 export const SUBSCRIPTION_TABLE_DEFAULT_COLUMNS = [
@@ -114,4 +119,5 @@ export const SUBSCRIPTION_TABLE_DEFAULT_COLUMNS = [
   'consumed',
   'quantity',
   'type',
+  'product_host_count',
 ];

data/webpack/scenes/Subscriptions/__tests__/__snapshots__/SubscriptionsPage.test.js.snap

@@ -117,6 +117,7 @@ exports[`subscriptions page should render 1`] = `
                   "instance_multiplier": 1,
                   "multi_entitlement": null,
                   "name": "zoo",
+                  "product_host_count": 1,
                   "product_id": "853987721546",
                   "product_name": "zoo",
                   "quantity": -1,
@@ -143,6 +144,7 @@ exports[`subscriptions page should render 1`] = `
                   "instance_multiplier": 1,
                   "multi_entitlement": null,
                   "name": "hsdfhsdh",
+                  "product_host_count": 0,
                   "product_id": "947637693017",
                   "product_name": "hsdfhsdh",
                   "quantity": -1,

data/webpack/scenes/Subscriptions/__tests__/subscriptions.fixtures.js

@@ -63,6 +63,7 @@ export const requestSuccessResponse = Immutable({
       unmapped_guest: false,
       virt_only: false,
       virt_who: false,
+      product_host_count: 1,
     },
     {
       id: 4,
@@ -89,6 +90,7 @@ export const requestSuccessResponse = Immutable({
       unmapped_guest: false,
       virt_only: false,
       virt_who: false,
+      product_host_count: 0,
     },
   ],
 });
@@ -110,6 +112,7 @@ export const quantitiesRequestSuccessResponse = Immutable({
         4,
         5,
       ],
+      product_host_count: 9469,
     },
     {
       id: '6b123381519abf020151ab082c5e4678',
@@ -125,6 +128,7 @@ export const quantitiesRequestSuccessResponse = Immutable({
       local_pool_ids: [
         6,
       ],
+      product_host_count: 9469,
     },
   ],
   page: 1,
@@ -167,6 +171,7 @@ export const groupedSubscriptions = Immutable({
       unmapped_guest: false,
       virt_only: false,
       virt_who: false,
+      product_host_count: 1,
     },
     {
       id: 4,
@@ -193,6 +198,7 @@ export const groupedSubscriptions = Immutable({
       unmapped_guest: false,
       virt_only: false,
       virt_who: false,
+      product_host_count: 0,
     },
   ],
   searchIsActive: false,
@@ -236,6 +242,7 @@ export const successState = Immutable({
       unmapped_guest: false,
       virt_only: false,
       virt_who: false,
+      product_host_count: 1,
     },
     {
       id: 4,
@@ -262,6 +269,7 @@ export const successState = Immutable({
       unmapped_guest: false,
       virt_only: false,
       virt_who: false,
+      product_host_count: 0,
     },
   ],
   searchIsActive: false,
@@ -454,6 +462,11 @@ export const tableColumns = [
     label: 'Entitlements',
     value: true,
   },
+  {
+    key: 'product_host_count',
+    label: 'Product Host Count',
+    value: true,
+  },
 ];
 
 export const loadTableColumnsSuccessAction = [
@@ -470,6 +483,7 @@ export const loadTableColumnsSuccessAction = [
         'consumed',
         'quantity',
         'type',
+        'product_host_count',
       ],
     },
   },

data/webpack/scenes/Subscriptions/components/SubscriptionsTable/SubscriptionsTableHelpers.js

@@ -50,6 +50,7 @@ const buildTableCollapseRow = (subscriptionGroup) => {
     name: first.name,
     virt_only: first.virt_only,
     hypervisor: first.hypervisor,
+    product_host_count: 'NA',
   };
   return heading;
 };