katello 4.15.0 → 4.16.0.rc1

data/webpack/scenes/ContentViews/Details/Filters/CVErrataDateFilterContent.js

@@ -46,7 +46,12 @@ const CVErrataDateFilterContent = ({
     selectCVFilterDetails(state, cvId, filterId), shallowEqual);
   const { repositories = [], rules } = filterDetails;
   const [{
-    id, types, start_date: ruleStartDate, end_date: ruleEndDate, date_type: ruleDateType,
+    id,
+    types,
+    allow_other_types: ruleAllowOtherTypes,
+    start_date: ruleStartDate,
+    end_date: ruleEndDate,
+    date_type: ruleDateType,
   } = {}] = rules;
   const { permissions } = details;
   const [startDate, setStartDate] = useState(convertAPIDateToUIFormat(ruleStartDate));
@@ -54,12 +59,23 @@ const CVErrataDateFilterContent = ({
   const [dateType, setDateType] = useState(ruleDateType);
   const [dateTypeSelectOpen, setDateTypeSelectOpen] = useState(false);
   const [typeSelectOpen, setTypeSelectOpen] = useState(false);
-  const [selectedTypes, setSelectedTypes] = useState(types);
   const dispatch = useDispatch();
   const [activeTabKey, setActiveTabKey] = useState(0);
   const [startEntry, setStartEntry] = useState(false);
   const [endEntry, setEndEntry] = useState(false);
 
+  const getInitialSelectedTypes = () => {
+    if (!types) {
+      return ['other'];
+    }
+    if (ruleAllowOtherTypes) {
+      return [...types, 'other'];
+    }
+    return types;
+  };
+
+  const [selectedTypes, setSelectedTypes] = useState(getInitialSelectedTypes());
+
   const onSave = () => {
     dispatch(editCVFilterRule(
       filterId,
@@ -68,8 +84,9 @@ const CVErrataDateFilterContent = ({
         content_view_filter_id: filterId,
         start_date: startDate && startDate !== '' ? dateParse(startDate) : null,
         end_date: endDate && endDate !== '' ? dateParse(endDate) : null,
-        types: selectedTypes,
+        types: selectedTypes.filter(e => e !== 'other'),
         date_type: dateType,
+        allow_other_types: selectedTypes.includes('other'),
       },
       () => {
         dispatch({ type: CONTENT_VIEW_NEEDS_PUBLISH });
@@ -81,15 +98,21 @@ const CVErrataDateFilterContent = ({
   const resetFilters = () => {
     setStartDate(convertAPIDateToUIFormat(ruleStartDate));
     setEndDate(convertAPIDateToUIFormat(ruleEndDate));
-    setSelectedTypes(types);
     setDateType(ruleDateType);
+    setSelectedTypes(getInitialSelectedTypes());
   };
 
   const onTypeSelect = (selection) => {
     if (selectedTypes.includes(selection)) {
+      // If the selection is the only selection remaining, do not allow it to be removed
       if (selectedTypes.length === 1) return;
+
+      // Filter out the current selection to deselect it
       setSelectedTypes(selectedTypes.filter(e => e !== selection));
-    } else setSelectedTypes([...selectedTypes, selection]);
+    } else {
+      // Add the selection to the selected types
+      setSelectedTypes([...selectedTypes, selection]);
+    }
   };
 
   const singleSelection = selection => (selectedTypes.length === 1
@@ -99,7 +122,7 @@ const CVErrataDateFilterContent = ({
     (
       isEqual(convertAPIDateToUIFormat(ruleStartDate), startDate) &&
       isEqual(convertAPIDateToUIFormat(ruleEndDate), endDate) &&
-      isEqual(sortBy(types), sortBy(selectedTypes)) &&
+      isEqual(sortBy(getInitialSelectedTypes()), sortBy(selectedTypes)) &&
       isEqual(ruleDateType, dateType)
     );
 
@@ -171,6 +194,15 @@ const CVErrataDateFilterContent = ({
                       {__('Bugfix')}
                     </p>
                   </SelectOption>
+                  <SelectOption
+                    isDisabled={singleSelection('other') || !hasPermission(permissions, 'edit_content_views')}
+                    key="other"
+                    value="other"
+                  >
+                    <p style={{ marginTop: '4px' }}>
+                      {__('Other')}
+                    </p>
+                  </SelectOption>
                 </Select>
               </FlexItem>
               <FlexItem span={1} spacer={{ default: 'spacerNone' }}>
@@ -178,7 +210,7 @@ const CVErrataDateFilterContent = ({
                   <Tooltip
                     position="top"
                     content={
-                      __('Atleast one errata type needs to be selected.')
+                      __('At least one errata type option needs to be selected.')
                     }
                   >
                     <OutlinedQuestionCircleIcon />

data/webpack/scenes/ContentViews/Details/Filters/CVErrataIDFilterContent.js

@@ -60,7 +60,7 @@ const CVErrataIDFilterContent = ({
   const hasNotAddedSelected = rows.some(({ selected, added }) => selected && !added);
   const [statusSelected, setStatusSelected] = useState(ALL_STATUSES);
   const [typeSelectOpen, setTypeSelectOpen] = useState(false);
-  const [selectedTypes, setSelectedTypes] = useState(ERRATA_TYPES);
+  const [selectedTypes, setSelectedTypes] = useState([...ERRATA_TYPES, 'other']);
   const [startDate, setStartDate] = useState('');
   const [endDate, setEndDate] = useState('');
   const activeFilters = [statusSelected, selectedTypes, startDate, endDate];
@@ -198,9 +198,15 @@ const CVErrataIDFilterContent = ({
 
   const onTypeSelect = (selection) => {
     if (selectedTypes.includes(selection)) {
+      // If the selection is the only selection remaining, do not allow it to be removed
       if (selectedTypes.length === 1) return;
+
+      // Filter out the current selection to deselect it
       setSelectedTypes(selectedTypes.filter(e => e !== selection));
-    } else setSelectedTypes([...selectedTypes, selection]);
+    } else {
+      // Add the current selection to the selected types
+      setSelectedTypes([...selectedTypes, selection]);
+    }
     setTypeSelectOpen(false);
   };
 
@@ -326,6 +332,11 @@ const CVErrataIDFilterContent = ({
                           {__('Bugfix')}
                         </p>
                       </SelectOption>
+                      <SelectOption isDisabled={singleSelection('bugfix')} key="other" value="other">
+                        <p style={{ marginTop: '4px' }}>
+                          {__('Other')}
+                        </p>
+                      </SelectOption>
                     </Select>
                   </SplitItem>
                   {hasPermission(permissions, 'edit_content_views') &&

data/webpack/scenes/ContentViews/Details/Filters/CVFilterDetailType.js

@@ -47,7 +47,7 @@ const CVFilterDetailType = ({
       details={details}
     />);
   case 'erratum':
-    if (head(rules)?.types) {
+    if (head(rules)?.types || head(rules)?.allow_other_types) {
       return (<CVErrataDateFilterContent
         cvId={cvId}
         filterId={filterId}

data/webpack/scenes/ContentViews/Details/Filters/__tests__/cvErrataDateFilterContent.test.js

@@ -23,6 +23,7 @@ test('Can display errata-date filter rule and edit', async (done) => {
     end_date: '2020-08-15T12:00:00.000Z',
     types: ['enhancement', 'security'],
     date_type: 'issued',
+    allow_other_types: false,
   };
 
   const ruleEditScope = nockInstance

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

@@ -3,7 +3,7 @@ import { Tooltip } from '@patternfly/react-core';
 import { BundleIcon, MiddlewareIcon, BoxIcon, CodeBranchIcon, FanIcon, TenantIcon, AnsibleTowerIcon } from '@patternfly/react-icons';
 import PropTypes from 'prop-types';
 
-const RepoIcon = ({ type }) => {
+const RepoIcon = ({ type, customTooltip }) => {
   const iconMap = {
     yum: BundleIcon,
     docker: MiddlewareIcon,
@@ -14,15 +14,17 @@ const RepoIcon = ({ type }) => {
   };
   const Icon = iconMap[type] || BoxIcon;
 
-  return <Tooltip content={<div>{type}</div>}><Icon aria-label={`${type}_type_icon`} /></Tooltip>;
+  return <Tooltip content={<div>{customTooltip ?? type}</div>}><Icon aria-label={`${type}_type_icon`} /></Tooltip>;
 };
 
 RepoIcon.propTypes = {
   type: PropTypes.string,
+  customTooltip: PropTypes.string,
 };
 
 RepoIcon.defaultProps = {
   type: '', // prevent errors if data isn't loaded yet
+  customTooltip: null,
 };
 
 export default RepoIcon;

data/webpack/scenes/ContentViews/Details/Versions/BulkDelete/__tests__/hosts.fixtures.json

@@ -138,8 +138,7 @@
         "purpose_role": "",
         "purpose_usage": "",
         "hypervisor": false,
-        "user": null,
-        "purpose_addons": []
+        "user": null
       },
       "infrastructure_facet": {
         "foreman_instance": false,

data/webpack/scenes/ContentViews/Details/Versions/Delete/RemoveSteps/CVReassignActivationKeysForm.js

@@ -1,12 +1,13 @@
 import React, { useState, useContext } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import useDeepCompareEffect from 'use-deep-compare-effect';
-import { ExpandableSection, SelectOption } from '@patternfly/react-core';
+import { ExpandableSection, SelectOption, Alert, AlertActionCloseButton } from '@patternfly/react-core';
 import { STATUS } from 'foremanReact/constants';
 import { translate as __ } from 'foremanReact/common/I18n';
 import EnvironmentPaths from '../../../../components/EnvironmentPaths/EnvironmentPaths';
 import getContentViews from '../../../../ContentViewsActions';
 import { selectContentViewError, selectContentViews, selectContentViewStatus } from '../../../../ContentViewSelectors';
+import { selectCVActivationKeys } from '../../../ContentViewDetailSelectors';
 import AffectedActivationKeys from '../affectedActivationKeys';
 import DeleteContext from '../DeleteContext';
 import ContentViewSelect from '../../../../components/ContentViewSelect/ContentViewSelect';
@@ -17,7 +18,9 @@ const CVReassignActivationKeysForm = () => {
   const contentViewsInEnvResponse = useSelector(selectContentViews);
   const contentViewsInEnvStatus = useSelector(selectContentViewStatus);
   const contentViewsInEnvError = useSelector(selectContentViewError);
+  const activationKeysResponse = useSelector(selectCVActivationKeys);
   const cvInEnvLoading = contentViewsInEnvStatus === STATUS.PENDING;
+  const [alertDismissed, setAlertDismissed] = useState(false);
   const [cvSelectOpen, setCVSelectOpen] = useState(false);
   const [cvSelectOptions, setCvSelectionOptions] = useState([]);
   const [showActivationKeys, setShowActivationKeys] = useState(false);
@@ -72,6 +75,9 @@ const CVReassignActivationKeysForm = () => {
     contentViewsInEnvError, selectedEnvForAK, setSelectedCVForAK, setSelectedCVNameForAK,
     cvInEnvLoading, selectedCVForAK, cvId, versionEnvironments, selectedEnvSet]);
 
+  const multiCVWarning = activationKeysResponse?.results?.some?.(key =>
+    key.multi_content_view_environment);
+
   const fetchSelectedCVName = (id) => {
     const { results } = contentViewsInEnvResponse ?? { };
     return results.filter(cv => cv.id === id)[0]?.name;
@@ -102,8 +108,21 @@ const CVReassignActivationKeysForm = () => {
     cvSelectOptions,
   });
 
+  const multiCVRemovalInfo = __('This environment is used in one or more multi-environment activation keys. The environment will simply be removed from the multi-environment keys. The content view and lifecycle environment you select here will only apply to single-environment activation keys. See hammer activation-key --help for more details.');
+
   return (
     <>
+      {!alertDismissed && multiCVWarning && (
+        <Alert
+          ouiaId="multi-cv-warning-alert"
+          variant="warning"
+          isInline
+          title={__('Warning')}
+          actionClose={<AlertActionCloseButton onClose={() => setAlertDismissed(true)} />}
+        >
+          <p>{multiCVRemovalInfo}</p>
+        </Alert>
+      )}
       <EnvironmentPaths
         userCheckedItems={selectedEnvForAK}
         setUserCheckedItems={setSelectedEnvForAK}

data/webpack/scenes/ContentViews/Details/Versions/Delete/RemoveSteps/CVReassignHostsForm.js

@@ -1,12 +1,13 @@
 import React, { useState, useContext } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import useDeepCompareEffect from 'use-deep-compare-effect';
-import { ExpandableSection, SelectOption } from '@patternfly/react-core';
+import { ExpandableSection, SelectOption, Alert, AlertActionCloseButton } from '@patternfly/react-core';
 import { STATUS } from 'foremanReact/constants';
 import { translate as __ } from 'foremanReact/common/I18n';
 import EnvironmentPaths from '../../../../components/EnvironmentPaths/EnvironmentPaths';
 import getContentViews from '../../../../ContentViewsActions';
 import { selectContentViewError, selectContentViews, selectContentViewStatus } from '../../../../ContentViewSelectors';
+import { selectCVHosts } from '../../../ContentViewDetailSelectors';
 import AffectedHosts from '../affectedHosts';
 import DeleteContext from '../DeleteContext';
 import ContentViewSelect from '../../../../components/ContentViewSelect/ContentViewSelect';
@@ -25,6 +26,13 @@ const CVReassignHostsForm = () => {
     cvId, versionEnvironments, selectedEnvSet, selectedEnvForHost, setSelectedEnvForHost,
     currentStep, selectedCVForHosts, setSelectedCVNameForHosts, setSelectedCVForHosts,
   } = useContext(DeleteContext);
+  const [alertDismissed, setAlertDismissed] = useState(false);
+  const hostResponse = useSelector(selectCVHosts);
+
+  const multiCVWarning = hostResponse?.results?.some?.(host =>
+    host.content_facet_attributes?.multi_content_view_environment);
+
+  const multiCVRemovalInfo = __('This content view version is used in one or more multi-environment hosts. The version will simply be removed from the multi-environment hosts. The content view and lifecycle environment you select here will only apply to single-environment hosts. See hammer activation-key --help for more details.');
 
   // Fetch content views for selected environment to reassign hosts to.
   useDeepCompareEffect(
@@ -103,6 +111,17 @@ const CVReassignHostsForm = () => {
 
   return (
     <>
+      {!alertDismissed && multiCVWarning && (
+        <Alert
+          ouiaId="multi-cv-warning-alert"
+          variant="warning"
+          isInline
+          title={__('Warning')}
+          actionClose={<AlertActionCloseButton onClose={() => setAlertDismissed(true)} />}
+        >
+          <p>{multiCVRemovalInfo}</p>
+        </Alert>
+      )}
       <EnvironmentPaths
         userCheckedItems={selectedEnvForHost}
         setUserCheckedItems={setSelectedEnvForHost}

data/webpack/scenes/ContentViews/Details/Versions/Delete/RemoveSteps/CVVersionRemoveReview.js

@@ -2,28 +2,44 @@ import React, { useContext, useState } from 'react';
 import { useSelector } from 'react-redux';
 import { Alert, Flex, FlexItem, Label, AlertActionCloseButton } from '@patternfly/react-core';
 import { ExclamationTriangleIcon } from '@patternfly/react-icons';
+import { FormattedMessage } from 'react-intl';
 import { translate as __ } from 'foremanReact/common/I18n';
-import { selectCVActivationKeys, selectCVHosts } from '../../../ContentViewDetailSelectors';
+import { selectCVActivationKeys, selectCVHosts, selectCVVersions } from '../../../ContentViewDetailSelectors';
 import DeleteContext from '../DeleteContext';
-import { pluralize } from '../../../../../../utils/helpers';
 import WizardHeader from '../../../../components/WizardHeader';
 
 const CVVersionRemoveReview = () => {
   const [alertDismissed, setAlertDismissed] = useState(false);
   const {
-    cvId, versionNameToRemove, versionEnvironments, selectedEnvSet,
+    cvId, versionIdToRemove, versionNameToRemove, selectedEnvSet,
     selectedEnvForAK, selectedCVNameForAK, selectedCVNameForHosts,
     selectedEnvForHost, affectedActivationKeys, affectedHosts, deleteFlow, removeDeletionFlow,
   } = useContext(DeleteContext);
   const activationKeysResponse = useSelector(state => selectCVActivationKeys(state, cvId));
   const hostsResponse = useSelector(state => selectCVHosts(state, cvId));
-  const { results: hostResponse } = hostsResponse;
-  const { results: akResponse } = activationKeysResponse;
-  const selectedEnv = versionEnvironments.filter(env => selectedEnvSet.has(env.id));
+  const { results: hostResponse = [] } = hostsResponse || {};
+  const { results: akResponse = [] } = activationKeysResponse || {};
+  const cvVersions = useSelector(state => selectCVVersions(state, cvId));
   const versionDeleteInfo = __(`Version ${versionNameToRemove} will be deleted from all environments. It will no longer be available for promotion.`);
   const removalNotice = __(`Version ${versionNameToRemove} will be removed from the environments listed below, and will remain available for later promotion. ` +
     'Changes listed below will be effective after clicking Remove.');
 
+  const matchedCVResults = cvVersions?.results?.filter(cv => cv.id === versionIdToRemove) || [];
+  const selectedCVE = matchedCVResults
+    .flatMap(cv => cv.content_view_environments || [])
+    .filter(env => selectedEnvSet.has(env.environment_id));
+
+  const multiCVHosts = hostResponse?.filter(host =>
+    host.content_facet_attributes?.multi_content_view_environment) || [];
+  const multiCVHostsCount = multiCVHosts.length;
+
+  const singleCVHostsCount = (hostResponse?.length || 0) - multiCVHostsCount;
+
+  const multiCVActivationKeys = akResponse.filter(key => key.multi_content_view_environment);
+  const multiCVActivationKeysCount = multiCVActivationKeys.length;
+
+  const singleCVActivationKeysCount = akResponse.length - multiCVActivationKeysCount;
+
   return (
     <>
       <WizardHeader title={__('Review details')} />
@@ -38,7 +54,7 @@ const CVVersionRemoveReview = () => {
           <p style={{ marginBottom: '0.5em' }}>{versionDeleteInfo}</p>
         </Alert>}
       {!(deleteFlow || removeDeletionFlow) && <WizardHeader description={removalNotice} />}
-      {(selectedEnv.length !== 0) &&
+      {(selectedCVE?.length !== 0) &&
         <>
           <h3>{__('Environments')}</h3>
           <Flex>
@@ -46,27 +62,121 @@ const CVVersionRemoveReview = () => {
             <FlexItem style={{ marginBottom: '0.5em' }}>{__('This version will be removed from:')}</FlexItem>
           </Flex>
           <Flex>
-            {selectedEnv?.map(({ name, id }) =>
+            {selectedCVE?.map(({ environment_name: name, environment_id: id }) =>
               <FlexItem key={name}><Label isTruncated color="purple" href={`/lifecycle_environments/${id}`}>{name}</Label></FlexItem>)}
           </Flex>
         </>}
       {affectedHosts &&
         <>
           <h3>{__('Content hosts')}</h3>
-          <Flex>
-            <FlexItem><ExclamationTriangleIcon /></FlexItem>
-            <FlexItem><p>{__(`${pluralize(hostResponse.length, 'host')} will be moved to content view ${selectedCVNameForHosts} in `)}</p></FlexItem>
-            <FlexItem><Label isTruncated color="purple" href={`/lifecycle_environments/${selectedEnvForHost[0].id}`}>{selectedEnvForHost[0].name}</Label></FlexItem>
-          </Flex>
+          {singleCVHostsCount > 0 && (
+            <Flex>
+              <FlexItem><ExclamationTriangleIcon /></FlexItem>
+              <FlexItem data-testid="single-cv-hosts-remove">
+                <FormattedMessage
+                  id="single-cv-hosts-remove"
+                  defaultMessage="{count, plural, one {# {singular}} other {# {plural}}} will be moved to content view {cvName} in {envName}."
+                  values={{
+                    count: singleCVHostsCount,
+                    singular: __('host'),
+                    plural: __('hosts'),
+                    cvName: selectedCVNameForHosts,
+                    envName: selectedEnvForHost[0] && (
+                      <Label isTruncated color="purple" href={`/lifecycle_environments/${selectedEnvForHost[0].id}`}>
+                        {selectedEnvForHost[0].name}
+                      </Label>
+                    ),
+                  }}
+                />
+              </FlexItem>
+            </Flex>
+          )}
+          {multiCVHostsCount > 0 && (
+            <Flex>
+              <FlexItem><ExclamationTriangleIcon /></FlexItem>
+              <FlexItem>
+                <FormattedMessage
+                  id="multi-cv-hosts-remove"
+                  defaultMessage="{envSingularOrPlural} {envCV} will be removed from {hostCount, plural, one {# {hostSingular}} other {# {hostPlural}}}."
+                  values={{
+                    envSingularOrPlural: (
+                      <FormattedMessage
+                        id="environment.plural"
+                        defaultMessage="{count, plural, one {{envSingular}} other {{envPlural}}}"
+                        values={{
+                          count: selectedCVE?.length,
+                          envSingular: __('Content view environment'),
+                          envPlural: __('Content view environments'),
+                        }}
+                      />
+                    ),
+                    envCV: selectedCVE
+                      ?.map(cve => cve.label)
+                      .join(', '),
+                    hostCount: multiCVHostsCount,
+                    hostSingular: __('multi-environment host'),
+                    hostPlural: __('multi-environment hosts'),
+                  }}
+                />
+              </FlexItem>
+            </Flex>
+          )}
         </>}
       {affectedActivationKeys &&
         <>
           <h3>{__('Activation keys')}</h3>
-          <Flex>
-            <FlexItem><ExclamationTriangleIcon /></FlexItem>
-            <FlexItem><p>{__(`${pluralize(akResponse.length, 'activation key')} will be moved to content view ${selectedCVNameForAK} in `)}</p></FlexItem>
-            <FlexItem><Label isTruncated color="purple" href={`/lifecycle_environments/${selectedEnvForAK[0].id}`}>{selectedEnvForAK[0].name}</Label></FlexItem>
-          </Flex>
+          {singleCVActivationKeysCount > 0 && (
+            <Flex>
+              <FlexItem><ExclamationTriangleIcon /></FlexItem>
+              <FlexItem data-testid="single-cv-activation-keys-remove">
+                <FormattedMessage
+                  id="single-cv-activation-keys-remove"
+                  defaultMessage="{count, plural, one {# {singular}} other {# {plural}}} will be moved to content view {cvName} in {envName}."
+                  values={{
+                    count: singleCVActivationKeysCount,
+                    singular: __('activation key'),
+                    plural: __('activation keys'),
+                    cvName: selectedCVNameForAK,
+                    envName: selectedEnvForAK[0] && (
+                      <Label isTruncated color="purple" href={`/lifecycle_environments/${selectedEnvForAK[0].id}`}>
+                        {selectedEnvForAK[0].name}
+                      </Label>
+                    ),
+                  }}
+                />
+              </FlexItem>
+            </Flex>
+          )}
+          {multiCVActivationKeysCount > 0 && (
+            <Flex>
+              <FlexItem><ExclamationTriangleIcon /></FlexItem>
+              <FlexItem>
+                <FormattedMessage
+                  id="multi-cv-activation-keys-remove"
+                  defaultMessage="{envSingularOrPlural} {envCV} will be removed from {akCount, plural, one {# {keySingular}} other {# {keyPlural}}}."
+                  values={{
+                    envSingularOrPlural: (
+                      <FormattedMessage
+                        id="environment.plural"
+                        defaultMessage="{count, plural, one {{envSingular}} other {{envPlural}}}"
+                        values={{
+                          count: selectedCVE?.length,
+                          envSingular: __('Content view environment'),
+                          envPlural: __('Content view environments'),
+                        }}
+                      />
+                    ),
+                    envCV: selectedCVE
+                      ?.map(cve => cve.label)
+                      .join(', '),
+                    akCount: multiCVActivationKeysCount,
+                    keySingular: __('multi-environment activation key'),
+                    keyPlural: __('multi-environment activation keys'),
+                  }}
+                />
+              </FlexItem>
+            </Flex>
+          )}
         </>}
     </>
   );

data/webpack/scenes/ContentViews/Details/Versions/Delete/__tests__/cvAffectedActivationKeys.fixture.json

@@ -42,7 +42,6 @@
       },
       "products": [],
       "host_collections": [],
-      "purpose_addons": [],
       "permissions": {
         "view_activation_keys": true,
         "edit_activation_keys": true,

data/webpack/scenes/ContentViews/Details/Versions/Delete/__tests__/cvAffectedHosts.fixture.json

@@ -132,8 +132,7 @@
         "purpose_role": "",
         "purpose_usage": "",
         "hypervisor": false,
-        "user": null,
-        "purpose_addons": []
+        "user": null
       }
     }
   ]

data/webpack/scenes/ContentViews/Details/Versions/Delete/__tests__/cvVersionRemove.test.js

@@ -152,7 +152,8 @@ test('Can open Remove wizard and remove version from environment with hosts', as
 
 
   const {
-    getByText, getAllByText, getByLabelText, getAllByLabelText, queryByText, getByPlaceholderText,
+    getByText, getAllByText, getByLabelText, getAllByLabelText, queryByText,
+    getByPlaceholderText, getByTestId,
   } = renderWithRedux(
     <ContentViewVersions cvId={2} details={cvDetailData} />,
     renderOptions,
@@ -192,7 +193,7 @@ test('Can open Remove wizard and remove version from environment with hosts', as
   fireEvent.click(getByText('Next'));
   await patientlyWaitFor(() => {
     expect(getByText('Review details')).toBeInTheDocument();
-    expect(getByText('1 host will be moved to content view cv2 in')).toBeInTheDocument();
+    expect(getByTestId('single-cv-hosts-remove')).toBeInTheDocument();
   });
   fireEvent.click(getAllByText('Remove')[0]);
   assertNockRequest(scope);
@@ -238,7 +239,8 @@ test('Can open Remove wizard and remove version from environment with activation
 
 
   const {
-    getByText, getAllByText, getByLabelText, getAllByLabelText, queryByText, getByPlaceholderText,
+    getByText, getAllByText, getByLabelText, getAllByLabelText, queryByText,
+    getByPlaceholderText, getByTestId,
   } = renderWithRedux(
     <ContentViewVersions cvId={2} details={cvDetailData} />,
     renderOptions,
@@ -278,7 +280,7 @@ test('Can open Remove wizard and remove version from environment with activation
   fireEvent.click(getByText('Next'));
   await patientlyWaitFor(() => {
     expect(getByText('Review details')).toBeInTheDocument();
-    expect(getByText('1 activation key will be moved to content view cv2 in')).toBeInTheDocument();
+    expect(getByTestId('single-cv-activation-keys-remove')).toBeInTheDocument();
   });
   fireEvent.click(getAllByText('Remove')[0]);
 

data/webpack/scenes/ContentViews/Details/Versions/Delete/affectedActivationKeys.js

@@ -35,6 +35,7 @@ const AffectedActivationKeys = ({
   const columnHeaders = [
     __('Name'),
     __('Environment'),
+    __('Multi Content View Environment'),
   ];
   const emptyContentTitle = __('No matching activation keys found.');
   const emptyContentBody = __("Given criteria doesn't match any activation keys. Try changing your rule.");
@@ -65,12 +66,15 @@ const AffectedActivationKeys = ({
         </Tr>
       </Thead>
       <Tbody>
-        {results?.map(({ name, id, environment }) => (
+        {results?.map(({
+          name, id, environment, multi_content_view_environment: multiContentViewEnvironment,
+        }) => (
           <Tr ouiaId={id} key={id}>
             <Td>
               <a rel="noreferrer" target="_blank" href={urlBuilder(`activation_keys/${id}`, '')}>{name}</a>
             </Td>
             <Td><EnvironmentLabels environments={environment} /></Td>
+            <Td>{ multiContentViewEnvironment ? 'Yes' : 'No' }</Td>
           </Tr>
         ))
         }

data/webpack/scenes/ContentViews/Details/Versions/Delete/affectedHosts.js

@@ -30,6 +30,7 @@ const AffectedHosts = ({
   const columnHeaders = [
     __('Name'),
     __('Environment'),
+    __('Multi Content View Environment'),
   ];
   const emptyContentTitle = __('No matching hosts found.');
   const emptyContentBody = __("Given criteria doesn't match any hosts. Try changing your rule.");
@@ -63,13 +64,17 @@ const AffectedHosts = ({
         {results?.map(({
           name,
           id,
-          content_facet_attributes: { lifecycle_environment: environment },
+          content_facet_attributes: {
+            lifecycle_environment: environment,
+            multi_content_view_environment: multiContentViewEnvironment,
+          },
         }) => (
           <Tr ouiaId={id} key={id}>
             <Td>
               <a rel="noreferrer" target="_blank" href={urlBuilder(`new/hosts/${id}`, '')}>{name}</a>
             </Td>
             <Td><EnvironmentLabels environments={environment} /></Td>
+            <Td>{ multiContentViewEnvironment ? __('Yes') : __('No') }</Td>
           </Tr>
         ))
         }

data/webpack/scenes/ContentViews/__tests__/contentViewPage.test.js

@@ -132,7 +132,7 @@ test('Can expand cv and show activation keys and hosts', async (done) => {
     expect(queryByLabelText('activation_keys_link_2').textContent).toEqual('1');
 
     // Displays hosts link with count
-    expect(queryByLabelText('host_link_2')).toHaveAttribute('href', '/hosts?search=content_view_id+%3D+2');
+    expect(queryByLabelText('host_link_2')).toHaveAttribute('href', '/new/hosts?search=content_view_id%3D2');
     expect(queryByLabelText('host_link_2').textContent).toEqual('1');
   });
 

data/webpack/scenes/ContentViews/expansions/DetailsExpansion.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { translate as __ } from 'foremanReact/common/I18n';
+import { useForemanHostsPageUrl } from 'foremanReact/Root/Context/ForemanContext';
 import RelatedCompositeContentViewsModal from './RelatedCompositeContentViewsModal';
 import RelatedContentViewComponentsModal from './RelatedContentViewComponentsModal';
 
@@ -10,6 +11,9 @@ const DetailsExpansion = ({
   const activationKeyCount = activationKeys.length;
   const hostCount = hosts.length;
 
+  const baseHostsPageUrl = useForemanHostsPageUrl();
+  const hostsPageUrl = `${baseHostsPageUrl}?search=${encodeURIComponent(`content_view_id=${cvId}`)}`;
+
   const relatedContentViewModal = () => {
     if (cvComposite) {
       return (
@@ -36,7 +40,7 @@ const DetailsExpansion = ({
     <div id={`cv-details-expansion-${cvId}`}>
       {__('Activation keys: ')}<a aria-label={`activation_keys_link_${cvId}`} href={`/activation_keys?search=content_view_id+%3D+${cvId}`}>{activationKeyCount}</a>
       <br />
-      {__('Hosts: ')}<a aria-label={`host_link_${cvId}`} href={`/hosts?search=content_view_id+%3D+${cvId}`}>{hostCount}</a>
+      {__('Hosts: ')}<a aria-label={`host_link_${cvId}`} href={hostsPageUrl}>{hostCount}</a>
       <br />
       {relatedContentViewModal()}
     </div>