katello 4.8.4 → 4.9.0.rc1

data/webpack/scenes/ContentViews/Details/Versions/BulkDelete/Steps/ReassignHosts.js

@@ -4,7 +4,6 @@ import React, {
 } from 'react';
 
 import { translate as __ } from 'foremanReact/common/I18n';
-import { STATUS } from 'foremanReact/constants';
 import { first } from 'lodash';
 import { FormattedMessage } from 'react-intl';
 import {
@@ -39,6 +38,7 @@ import {
   getNumberOfHosts,
 } from '../BulkDeleteHelpers';
 import ContentViewSelect from '../../../../components/ContentViewSelect/ContentViewSelect';
+import { getCVPlaceholderText, shouldDisableCVSelect } from '../../../../components/ContentViewSelect/helpers';
 
 export default () => {
   const dispatch = useDispatch();
@@ -55,7 +55,6 @@ export default () => {
   const { results = [] } = useSelector(selectContentViews);
   const { content_view: { name: cvName, id: cvId } } = first(versions);
   const contentViewsInEnvStatus = useSelector(selectContentViewStatus);
-  const cvInEnvLoading = contentViewsInEnvStatus === STATUS.PENDING;
   const [toggleCVSelect, setToggleCVSelect] = useState(false);
 
   const numberOfHosts = getNumberOfHosts(versions);
@@ -92,18 +91,12 @@ export default () => {
         {name}
       </SelectOption>));
 
-  const placeHolder = (() => {
-    switch (true) {
-    case cvInEnvLoading && !!selectedEnvForHosts.length:
-      return __('Loading...');
-    case selectedEnvForHosts.length === 0:
-      return __('Select an environment above');
-    case selectOptions.length > 0:
-      return __('Select a content view');
-    default:
-      return __('No content views available');
-    }
-  })();
+  const placeholderText = getCVPlaceholderText({
+    contentSourceId: null,
+    environments: selectedEnvForHosts,
+    contentViewsStatus: contentViewsInEnvStatus,
+    cvSelectOptions: selectOptions,
+  });
 
   const setUserCheckedItems = (value) => {
     setSelectedCVForHosts(null);
@@ -131,6 +124,13 @@ export default () => {
     setToggleCVSelect(false);
   };
 
+  const disableCVSelect = shouldDisableCVSelect({
+    contentSourceId: null,
+    environments: selectedEnvForHosts,
+    contentViewsStatus: contentViewsInEnvStatus,
+    cvSelectOptions: selectOptions,
+  });
+
   const contentHostHref =
     `/content_hosts?search=content_view = ${cvName} AND ( ${versionEnvironments.map(({ name }) =>
       `lifecycle_environment = ${name}`).join(' OR ')})`;
@@ -206,8 +206,8 @@ export default () => {
         selections={selectedCVForHosts}
         onSelect={onSelect}
         onClear={onClear}
-        isDisabled={cvInEnvLoading || !selectOptions?.length || !selectedEnvForHosts?.length}
-        placeholderText={placeHolder}
+        isDisabled={disableCVSelect}
+        placeholderText={placeholderText}
         isOpen={toggleCVSelect}
         onToggle={setToggleCVSelect}
         menuAppendTo={() => document.body}

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

@@ -212,7 +212,8 @@
       },
       "permissions": {
         "deletable": true
-      }
+      },
+      "filters_applied": true
     },
     {
       "version": "82.0",
@@ -394,7 +395,8 @@
       },
       "permissions": {
         "deletable": true
-      }
+      },
+      "filters_applied": true
     },
     {
       "version": "81.0",
@@ -594,7 +596,8 @@
       },
       "permissions": {
         "deletable": true
-      }
+      },
+      "filters_applied": true
     }
   ]
 }

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

@@ -192,7 +192,8 @@
       },
       "permissions": {
         "deletable": true
-      }
+      },
+      "filters_applied": true
     },
     {
       "version": "88.0",
@@ -378,7 +379,8 @@
       },
       "permissions": {
         "deletable": true
-      }
+      },
+      "filters_applied": true
     },
     {
       "version": "85.0",
@@ -560,7 +562,8 @@
       },
       "permissions": {
         "deletable": true
-      }
+      },
+      "filters_applied": true
     },
     {
       "version": "84.0",
@@ -745,7 +748,8 @@
       },
       "permissions": {
         "deletable": true
-      }
+      },
+      "filters_applied": true
     },
     {
       "version": "83.0",
@@ -930,7 +934,8 @@
       },
       "permissions": {
         "deletable": true
-      }
+      },
+      "filters_applied": true
     }
   ]
 }

data/webpack/scenes/ContentViews/Details/Versions/Compare/CVVersionCompareConfig.js

@@ -137,7 +137,7 @@ export default ({
         selectRPMPackagesComparison(state, versionOneId, versionTwoId, viewBy),
       statusSelector: state =>
         selectRPMPackagesComparisonStatus(state, versionOneId, versionTwoId, viewBy),
-      autocompleteEndpoint: '/katello/api/v2/packages',
+      autocompleteEndpoint: 'katello/api/v2/packages',
       bookmarkController: 'katello_content_view_components',
       fetchItems: params => getRPMPackagesComparison(
         versionOneId,
@@ -367,7 +367,14 @@ export default ({
             return __('Schema Version 2');
           },
         },
-        { title: __('Product Name'), getProperty: item => item?.product?.name },
+        {
+          title: __('Product'),
+          getProperty: item => (
+            <a href={urlBuilder(`products/${item?.product?.id}`, '')}>
+              {item?.product?.name}
+            </a>),
+        },
+        { title: __('Image'), getProperty: item => item?.upstream_name },
         { title: __(`Version ${versionOne}`), getProperty: item => compareContent(item, versionOneId) },
         { title: __(`Version ${versionTwo}`), getProperty: item => compareContent(item, versionTwoId) },
       ],

data/webpack/scenes/ContentViews/Details/Versions/Compare/CVVersionCompareTable.js

@@ -71,6 +71,7 @@ const CVVersionCompareTable = ({
           {columnHeaders.map(({ title }) =>
             (
               <Th
+                modifier="wrap"
                 key={`${title}-header`}
                 sort={sortConfig[title] ? pfSortParams(title) : undefined}
               >

data/webpack/scenes/ContentViews/Details/Versions/Compare/__tests__/contentViewVersionOneDetials.fixtures.json

@@ -157,5 +157,6 @@
   },
   "permissions": {
     "deletable": true
-  }
+  },
+  "filters_applied": true
 }

data/webpack/scenes/ContentViews/Details/Versions/Compare/__tests__/contentViewVersionThreeDetails.fixtures.json

@@ -150,5 +150,6 @@
   },
   "permissions": {
     "deletable": true
-  }
+  },
+  "filters_applied": true
 }

data/webpack/scenes/ContentViews/Details/Versions/Compare/__tests__/contentViewVersionTwoDetails.fixtures.json

@@ -207,5 +207,6 @@
   },
   "permissions": {
     "deletable": true
-  }
+  },
+  "filters_applied": true
 }

data/webpack/scenes/ContentViews/Details/Versions/Compare/__tests__/contentViewVersions.fixtures.json

@@ -220,7 +220,8 @@
       },
       "permissions": {
         "deletable": true
-      }
+      },
+      "filters_applied": true
     },
     {
       "version": "5.0",
@@ -402,7 +403,8 @@
       },
       "permissions": {
         "deletable": true
-      }
+      },
+      "filters_applied": true
     },
     {
       "version": "4.0",
@@ -563,7 +565,8 @@
       },
       "permissions": {
         "deletable": true
-      }
+      },
+      "filters_applied": true
     },
     {
       "version": "3.0",
@@ -717,7 +720,8 @@
       },
       "permissions": {
         "deletable": true
-      }
+      },
+      "filters_applied": true
     },
     {
       "version": "2.0",
@@ -862,7 +866,8 @@
       },
       "permissions": {
         "deletable": true
-      }
+      },
+      "filters_applied": true
     },
     {
       "version": "1.0",
@@ -1007,7 +1012,8 @@
       },
       "permissions": {
         "deletable": true
-      }
+      },
+      "filters_applied": true
     }
   ]
 }

data/webpack/scenes/ContentViews/Details/Versions/Compare/__tests__/emptyStateCVVersionOneDetails.fixtures.json

@@ -141,5 +141,6 @@
   },
   "permissions": {
     "deletable": true
-  }
+  },
+  "filters_applied": true
 }

data/webpack/scenes/ContentViews/Details/Versions/Compare/__tests__/emptyStateCVVersionTwoDetails.fixtures.json

@@ -141,5 +141,6 @@
   },
   "permissions": {
     "deletable": true
-  }
+  },
+  "filters_applied": true
 }

data/webpack/scenes/ContentViews/Details/Versions/ContentViewVersions.js

@@ -19,7 +19,7 @@ import {
   selectCVVersions,
   selectCVVersionsStatus,
   selectCVVersionsError,
-  selectCVDetails,
+  selectCVDetails, selectCVNeedsPublish,
 } from '../ContentViewDetailSelectors';
 import getEnvironmentPaths from '../../components/EnvironmentPaths/EnvironmentPathActions';
 import ContentViewVersionPromote from '../Promote/ContentViewVersionPromote';
@@ -30,6 +30,8 @@ import BulkDeleteModal from './BulkDelete/BulkDeleteModal';
 import { selectEnvironmentPathsStatus } from '../../components/EnvironmentPaths/EnvironmentPathSelectors';
 import PublishContentViewWizard from '../../Publish/PublishContentViewWizard';
 import CVVersionCompare from './Compare/CVVersionCompare';
+import NeedsPublishIcon from '../../components/NeedsPublishIcon';
+import FiltersAppliedIcon from '../../components/FiltersAppliedIcon';
 
 const ContentViewVersions = ({ cvId, details }) => {
   const response = useSelector(state => selectCVVersions(state, cvId));
@@ -56,7 +58,10 @@ const ContentViewVersions = ({ cvId, details }) => {
   const [removingFromEnv, setRemovingFromEnv] = useState(false);
   const [deleteVersion, setDeleteVersion] = useState(false);
   const [currentStep, setCurrentStep] = useState(1);
-  const { permissions } = details;
+  const {
+    permissions, needs_publish: needsPublish, composite, latest_version_id: latestVersionId,
+  } = details;
+  const needsPublishLocal = useSelector(state => selectCVNeedsPublish(state));
   const [kebabOpen, setKebabOpen] = useState(false);
   const hasActionPermissions = hasPermission(permissions, 'promote_or_remove_content_views');
   const hasPublishCvPermissions = hasPermission(permissions, 'publish_content_views');
@@ -121,6 +126,7 @@ const ContentViewVersions = ({ cvId, details }) => {
       rpm_count: packageCount,
       errata_counts: errataCounts,
       active_history: activeHistory,
+      filters_applied: filtersApplied,
     } = cvVersion;
 
     if (activeHistory?.length) {
@@ -147,7 +153,19 @@ const ContentViewVersions = ({ cvId, details }) => {
         isChecked={isSelected(versionId)}
         onChange={selected => selectOne(selected, versionId)}
       />,
-      <Link to={`/versions/${versionId}`}>{__('Version ')}{version}</Link>,
+      <>
+        <Link to={`/versions/${versionId}`}>{__('Version ')}{version}</Link>
+        {(latestVersionId === versionId &&
+                (needsPublish === null || needsPublish || needsPublishLocal)) &&
+                <NeedsPublishIcon
+                  composite={composite}
+                  determinate={needsPublish !== null || needsPublishLocal}
+                />
+        }
+        {(filtersApplied) &&
+        <FiltersAppliedIcon />
+        }
+      </>,
       <ContentViewVersionEnvironments {...{ environments }} />,
       Number(packageCount) ?
         <a href={urlBuilder(`content_views/${cvId}#/versions/${versionId}/packages`, '')}>{packageCount}</a> :
@@ -213,7 +231,7 @@ const ContentViewVersions = ({ cvId, details }) => {
       },
     ];
 
-  const emptyContentTitle = __("You currently don't have any versions for this content view.");
+  const emptyContentTitle = __('No versions yet');
   const emptyContentBody = __('Versions will appear here when the content view is published.');
   const emptySearchTitle = __('No matching version found');
   const emptySearchBody = __('Try changing your search settings.');
@@ -384,6 +402,9 @@ ContentViewVersions.propTypes = {
   cvId: PropTypes.number.isRequired,
   details: PropTypes.shape({
     permissions: PropTypes.shape({}),
+    needs_publish: PropTypes.bool,
+    composite: PropTypes.bool,
+    latest_version_id: PropTypes.number,
   }).isRequired,
 };
 

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

@@ -54,6 +54,7 @@ const CVEnvironmentSelectionForm = () => {
     <>
       {!alertDismissed && deleteFlow &&
         <Alert
+          ouiaId="delete-version-info-alert"
           variant="warning"
           isInline
           title={__('Warning')}
@@ -65,9 +66,10 @@ const CVEnvironmentSelectionForm = () => {
       {(!deleteFlow &&
         (removeDeletionFlow || areAllSelected() || versionEnvironments.length === 0))
         && (
-          <Alert variant="warning" isInline title={__('Warning')}>
+          <Alert variant="warning" isInline title={__('Warning')} ouiaId="delete-version-alert">
             <p style={{ marginBottom: '0.5em' }}>{removeDeletionFlow ? versionDeleteInfo : versionRemovalInfo}</p>
             <Checkbox
+              ouiaId="delete-version-checkbox"
               id="delete_version"
               label={__('Delete version')}
               isChecked={removeDeletionFlow}
@@ -119,7 +121,7 @@ const CVEnvironmentSelectionForm = () => {
         </TableComposable>}
       {(versionEnvironments.length === 0) &&
         <EmptyState variant={EmptyStateVariant.xs}>
-          <Title headingLevel="h4" size="md">
+          <Title headingLevel="h4" size="md" ouiaId="not-promoted-title">
             {__('This version has not been promoted to any environments.')}
           </Title>
           <EmptyStateBody>

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

@@ -10,6 +10,7 @@ import { selectContentViewError, selectContentViews, selectContentViewStatus } f
 import AffectedActivationKeys from '../affectedActivationKeys';
 import DeleteContext from '../DeleteContext';
 import ContentViewSelect from '../../../../components/ContentViewSelect/ContentViewSelect';
+import { getCVPlaceholderText, shouldDisableCVSelect } from '../../../../components/ContentViewSelect/helpers';
 
 const CVReassignActivationKeysForm = () => {
   const dispatch = useDispatch();
@@ -87,6 +88,20 @@ const CVReassignActivationKeysForm = () => {
     setCVSelectOpen(false);
   };
 
+  const placeholderText = getCVPlaceholderText({
+    contentSourceId: null,
+    environments: selectedEnvForAK,
+    contentViewsStatus: contentViewsInEnvStatus,
+    cvSelectOptions,
+  });
+
+  const disableCVSelect = shouldDisableCVSelect({
+    contentSourceId: null,
+    environments: selectedEnvForAK,
+    contentViewsStatus: contentViewsInEnvStatus,
+    cvSelectOptions,
+  });
+
   return (
     <>
       <EnvironmentPaths
@@ -96,19 +111,17 @@ const CVReassignActivationKeysForm = () => {
         headerText={__('Select lifecycle environment')}
         multiSelect={false}
       />
-      {!cvInEnvLoading && selectedEnvForAK.length > 0 &&
-        <ContentViewSelect
-          selections={selectedCVForAK}
-          onSelect={onSelect}
-          onClear={onClear}
-          isOpen={cvSelectOpen}
-          isDisabled={cvSelectOptions.length === 0}
-          onToggle={isExpanded => setCVSelectOpen(isExpanded)}
-          placeholderText={(cvSelectOptions.length === 0) ? __('No content views available') : __('Select a content view')}
-        >
-          {cvSelectOptions}
-        </ContentViewSelect>
-      }
+      <ContentViewSelect
+        selections={selectedCVForAK}
+        onSelect={onSelect}
+        onClear={onClear}
+        isOpen={cvSelectOpen}
+        isDisabled={disableCVSelect}
+        onToggle={isExpanded => setCVSelectOpen(isExpanded)}
+        placeholderText={placeholderText}
+      >
+        {cvSelectOptions}
+      </ContentViewSelect>
       <ExpandableSection
         toggleText={showActivationKeys ?
           'Hide activation keys' :

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

@@ -10,6 +10,7 @@ import { selectContentViewError, selectContentViews, selectContentViewStatus } f
 import AffectedHosts from '../affectedHosts';
 import DeleteContext from '../DeleteContext';
 import ContentViewSelect from '../../../../components/ContentViewSelect/ContentViewSelect';
+import { getCVPlaceholderText, shouldDisableCVSelect } from '../../../../components/ContentViewSelect/helpers';
 
 const CVReassignHostsForm = () => {
   const dispatch = useDispatch();
@@ -86,6 +87,20 @@ const CVReassignHostsForm = () => {
     setCVSelectOpen(false);
   };
 
+  const placeholderText = getCVPlaceholderText({
+    contentSourceId: null,
+    environments: selectedEnvForHost,
+    contentViewsStatus: contentViewsInEnvStatus,
+    cvSelectOptions,
+  });
+
+  const disableCVSelect = shouldDisableCVSelect({
+    contentSourceId: null,
+    environments: selectedEnvForHost,
+    contentViewsStatus: contentViewsInEnvStatus,
+    cvSelectOptions,
+  });
+
   return (
     <>
       <EnvironmentPaths
@@ -95,23 +110,21 @@ const CVReassignHostsForm = () => {
         headerText={__('Select lifecycle environment')}
         multiSelect={false}
       />
-      {selectedEnvForHost.length > 0 &&
-        <ContentViewSelect
-          onClear={onClear}
-          selections={selectedCVForHosts}
-          onSelect={onSelect}
-          isOpen={cvSelectOpen}
-          isDisabled={cvSelectOptions.length === 0}
-          onToggle={isExpanded => setCVSelectOpen(isExpanded)}
-          id="selectCV"
-          ouiaId="selectCV"
-          name="selectCV"
-          aria-label="selectCV"
-          placeholderText={(cvSelectOptions.length === 0) ? __('No content views available') : __('Select a content view')}
-        >
-          {cvSelectOptions}
-        </ContentViewSelect>
-      }
+      <ContentViewSelect
+        onClear={onClear}
+        selections={selectedCVForHosts}
+        onSelect={onSelect}
+        isOpen={cvSelectOpen}
+        isDisabled={disableCVSelect}
+        onToggle={isExpanded => setCVSelectOpen(isExpanded)}
+        id="selectCV"
+        ouiaId="selectCV"
+        name="selectCV"
+        aria-label="selectCV"
+        placeholderText={placeholderText}
+      >
+        {cvSelectOptions}
+      </ContentViewSelect>
       <ExpandableSection
         toggleText={showHosts ? 'Hide hosts' : 'Show hosts'}
         onToggle={expanded => setShowHosts(expanded)}

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

@@ -29,6 +29,7 @@ const CVVersionRemoveReview = () => {
       <WizardHeader title={__('Review details')} />
       {!alertDismissed && (deleteFlow || removeDeletionFlow) &&
         <Alert
+          ouiaId="cvv-remove-review-alert"
           variant="warning"
           isInline
           title={__('Warning')}

data/webpack/scenes/ContentViews/Details/Versions/Delete/__tests__/versionsResponseData.fixtures.json

@@ -256,7 +256,8 @@
       },
       "permissions": {
         "deletable": true
-      }
+      },
+      "filters_applied": true
     },
     {
       "version": "6.0",
@@ -416,7 +417,8 @@
       },
       "permissions": {
         "deletable": true
-      }
+      },
+      "filters_applied": true
     },
     {
       "version": "5.0",
@@ -574,7 +576,8 @@
       },
       "permissions": {
         "deletable": true
-      }
+      },
+      "filters_applied": true
     }
   ]
 }

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

@@ -66,7 +66,7 @@ const AffectedActivationKeys = ({
       </Thead>
       <Tbody>
         {results?.map(({ name, id, environment }) => (
-          <Tr ouiaId={id} key={id}>
+          <Tr ouiaId={`${id}`} key={`${id}`}>
             <Td>
               <a rel="noreferrer" target="_blank" href={urlBuilder(`activation_keys/${id}`, '')}>{name}</a>
             </Td>

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

@@ -65,9 +65,9 @@ const AffectedHosts = ({
           id,
           content_facet_attributes: { lifecycle_environment: environment },
         }) => (
-          <Tr ouiaId={id} key={id}>
+          <Tr ouiaId={`${id}`} key={`${id}`}>
             <Td>
-              <a rel="noreferrer" target="_blank" href={urlBuilder(`hosts/${id}`, '')}>{name}</a>
+              <a rel="noreferrer" target="_blank" href={urlBuilder(`new/hosts/${id}`, '')}>{name}</a>
             </Td>
             <Td><EnvironmentLabels environments={environment} /></Td>
           </Tr>

data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/ContentViewVersionDetailConfig.js

@@ -330,7 +330,14 @@ export default ({ cvId, versionId }) => [
           return __('Schema Version 2');
         },
       },
-      { title: __('Product Name'), getProperty: item => item?.product?.name },
+      {
+        title: __('Product'),
+        getProperty: item => (
+          <a href={urlBuilder(`products/${item?.product?.id}`, '')}>
+            {item?.product?.name}
+          </a>),
+      },
+      { title: __('Image'), getProperty: item => item?.upstream_name },
     ],
   },
   ...ContentConfig.map(({

data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/ContentViewVersionDetails.js

@@ -87,7 +87,7 @@ const ContentViewVersionDetails = ({ cvId, details }) => {
               />
             ))}
           </Tabs>
-          <Switch>
+          <Switch ouiaId="cv-version-details-switch">
             {filteredTableConfigs.map(config => (
               <Route
                 key={config.route}