katello 4.3.0.rc1 → 4.3.0.rc4

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

@@ -7,7 +7,9 @@ import { urlBuilder } from 'foremanReact/common/urlHelpers';
 import { STATUS } from 'foremanReact/constants';
 import { Link } from 'react-router-dom';
 import PropTypes from 'prop-types';
+import { selectIntervals } from 'foremanReact/redux/middlewares/IntervalMiddleware/IntervalSelectors.js';
 
+import { useSet } from '../../../../components/Table/TableHooks';
 import TableWrapper from '../../../../components/Table/TableWrapper';
 import InactiveText from '../../components/InactiveText';
 import ContentViewVersionEnvironments from './ContentViewVersionEnvironments';
@@ -22,9 +24,10 @@ import {
 import getEnvironmentPaths from '../../components/EnvironmentPaths/EnvironmentPathActions';
 import ContentViewVersionPromote from '../Promote/ContentViewVersionPromote';
 import TaskPresenter from '../../components/TaskPresenter/TaskPresenter';
-import { startPollingTask } from '../../../Tasks/TaskActions';
+import { startPollingTask, stopPollingTask } from '../../../Tasks/TaskActions';
 import RemoveCVVersionWizard from './Delete/RemoveCVVersionWizard';
 import { hasPermission } from '../../helpers';
+import { pollTaskKey } from '../../../Tasks/helpers';
 
 const ContentViewVersions = ({ cvId, details }) => {
   const response = useSelector(state => selectCVVersions(state, cvId));
@@ -46,6 +49,8 @@ const ContentViewVersions = ({ cvId, details }) => {
   const [deleteVersion, setDeleteVersion] = useState(false);
   const [currentStep, setCurrentStep] = useState(1);
   const { permissions } = details;
+  const pendingTaskSet = useSet([]);
+  const intervals = useSelector(state => selectIntervals(state));
 
   const columnHeaders = [
     __('Version'),
@@ -63,6 +68,16 @@ const ContentViewVersions = ({ cvId, details }) => {
     [dispatch],
   );
 
+  useEffect(() => { // eslint-disable-line arrow-body-style
+    return () => {
+      if (pendingTaskSet.size) {
+        pendingTaskSet.forEach(id =>
+          dispatch(stopPollingTask(id)));
+        pendingTaskSet.clear();
+      }
+    };
+  }, [pendingTaskSet, dispatch]);
+
   const buildCells = useCallback((cvVersion) => {
     const {
       version,
@@ -75,14 +90,18 @@ const ContentViewVersions = ({ cvId, details }) => {
     return [
       { title: <Link to={`/versions/${versionId}`}>{__('Version ')}{version}</Link> },
       { title: <ContentViewVersionEnvironments {...{ environments }} /> },
-      { title: <a href={urlBuilder(`content_views/${cvId}#/versions/${versionId}/packages`, '')}>{packageCount}</a> },
+      {
+        title: Number(packageCount) ?
+          <a href={urlBuilder(`content_views/${cvId}#/versions/${versionId}/packages`, '')}>{packageCount}</a> :
+          <InactiveText text={__('No packages')} />,
+      },
       { title: <ContentViewVersionErrata {...{ cvId, versionId, errataCounts }} /> },
       { title: <ContentViewVersionContent {...{ cvId, versionId, cvVersion }} /> },
       { title: description ? <TableText wrapModifier="truncate">{description}</TableText> : <InactiveText text={__('No description')} /> },
     ];
   }, [cvId]);
 
-  const buildActiveTaskCells = useCallback((cvVersion) => {
+  const buildActiveTaskCells = useCallback((cvVersion, pollIntervals) => {
     const {
       version,
       description,
@@ -91,8 +110,18 @@ const ContentViewVersions = ({ cvId, details }) => {
     } = cvVersion;
     const { task } = activeHistory[0];
     const { result } = task || {};
-    if (result !== 'error') {
-      dispatch(startPollingTask(task.id, task));
+
+    if (result !== 'error' && !pollIntervals[pollTaskKey(task.id)]) {
+      pendingTaskSet.add(task.id);
+      dispatch(startPollingTask(
+        task.id, task,
+        ({ data: { pending } = {} }) => {
+          if (!pending) {
+            dispatch(stopPollingTask(task.id));
+            pendingTaskSet.delete(task.id);
+          }
+        },
+      ));
     }
 
     return [
@@ -108,7 +137,7 @@ const ContentViewVersions = ({ cvId, details }) => {
       { title: '' },
       { title: description ? <TableText wrapModifier="truncate">{description}</TableText> : <InactiveText text={__('No description')} /> },
     ];
-  }, [dispatch]);
+  }, [dispatch, pendingTaskSet]);
 
   useDeepCompareEffect(() => {
     const buildRows = () => {
@@ -122,7 +151,7 @@ const ContentViewVersions = ({ cvId, details }) => {
         } = cvVersion;
 
         const cells = activeHistory.length ?
-          buildActiveTaskCells(cvVersion) :
+          buildActiveTaskCells(cvVersion, intervals) :
           buildCells(cvVersion);
         newRows.push({
           cvVersionId: versionId,
@@ -139,7 +168,7 @@ const ContentViewVersions = ({ cvId, details }) => {
       const newRows = buildRows();
       setRows(newRows);
     }
-  }, [response, results, buildActiveTaskCells, buildCells, dispatch, loading, setRows]);
+  }, [response, results, buildActiveTaskCells, buildCells, dispatch, loading, setRows, intervals]);
 
   const onPromote = ({ cvVersionId, cvVersionName, cvVersionEnvironments }) => {
     setVersionIdToPromote(cvVersionId);
@@ -173,7 +202,7 @@ const ContentViewVersions = ({ cvId, details }) => {
       },
     },
     {
-      title: __('Remove'),
+      title: __('Remove from environments'),
       isDisabled: rowData.activeHistory.length,
       onClick: (_event, rowId, rowInfo) => {
         onRemoveFromEnv({

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

@@ -17,7 +17,7 @@ import { useSet } from '../../../../../components/Table/TableHooks';
 const RemoveCVVersionWizard = ({
   cvId, versionIdToRemove, versionNameToRemove,
   versionEnvironments, show, setIsOpen,
-  currentStep, setCurrentStep, deleteWizard,
+  currentStep, setCurrentStep, deleteWizard, detailsPage,
 }) => {
   const [selectedEnvForAK, setSelectedEnvForAK] = useState([]);
   const [selectedEnvForHost, setSelectedEnvForHost] = useState([]);
@@ -133,6 +133,7 @@ const RemoveCVVersionWizard = ({
       selectedEnvForHost,
       setSelectedEnvForHost,
       selectedEnvSet,
+      detailsPage,
     }}
     >
       <Wizard
@@ -165,12 +166,14 @@ RemoveCVVersionWizard.propTypes = {
   currentStep: PropTypes.number.isRequired,
   setCurrentStep: PropTypes.func.isRequired,
   deleteWizard: PropTypes.bool.isRequired,
+  detailsPage: PropTypes.bool,
 };
 
 RemoveCVVersionWizard.defaultProps = {
   versionEnvironments: [],
   show: false,
   setIsOpen: null,
+  detailsPage: false,
 };
 
 export default RemoveCVVersionWizard;

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

@@ -1,11 +1,12 @@
-import React, { useContext } from 'react';
+import React, { useContext, useState } from 'react';
 import useDeepCompareEffect from 'use-deep-compare-effect';
-import { Alert, Checkbox, EmptyState, EmptyStateVariant, Title, EmptyStateBody } from '@patternfly/react-core';
+import { Alert, Checkbox, EmptyState, EmptyStateVariant, Title, EmptyStateBody, AlertActionCloseButton } from '@patternfly/react-core';
 import { TableVariant, TableComposable, Thead, Tbody, Tr, Th, Td } from '@patternfly/react-table';
 import { translate as __ } from 'foremanReact/common/I18n';
 import DeleteContext from '../DeleteContext';
 
 const CVEnvironmentSelectionForm = () => {
+  const [alertDismissed, setAlertDismissed] = useState(false);
   const {
     versionNameToRemove, versionEnvironments, selectedEnvSet,
     setAffectedActivationKeys, setAffectedHosts, deleteFlow,
@@ -51,55 +52,60 @@ const CVEnvironmentSelectionForm = () => {
     'You can delete this version completely and it will no longer be available for promotion.');
   return (
     <>
-      {deleteFlow &&
-      <Alert variant="warning" isInline title={__('Warning')}>
-        <p style={{ marginBottom: '0.5em' }}>{versionDeleteInfo}</p>
-      </Alert>
+      {!alertDismissed && deleteFlow &&
+        <Alert
+          variant="warning"
+          isInline
+          title={__('Warning')}
+          actionClose={<AlertActionCloseButton onClose={() => setAlertDismissed(true)} />}
+        >
+          <p style={{ marginBottom: '0.5em' }}>{versionDeleteInfo}</p>
+        </Alert>
       }
       {(!deleteFlow &&
         (removeDeletionFlow || areAllSelected() || versionEnvironments.length === 0))
-      && (
-      <Alert variant="warning" isInline title={__('Warning')}>
-        <p style={{ marginBottom: '0.5em' }}>{removeDeletionFlow ? versionDeleteInfo : versionRemovalInfo}</p>
-        <Checkbox
-          id="delete_version"
-          label={__('Delete version')}
-          isChecked={removeDeletionFlow}
-          onChange={checked => setRemoveDeletionFlow(checked)}
-          style={{ margin: 0 }}
-        />
-      </Alert>)}
-      {(versionEnvironments.length !== 0) &&
-      <TableComposable variant={TableVariant.compact}>
-        <Thead>
-          <Tr>
-            <Td
-              select={{
-              rowIndex: 0,
-              onSelect: onSelectAll,
-              isSelected: areAllSelected() || deleteFlow || removeDeletionFlow,
-              disable: deleteFlow || removeDeletionFlow,
-              }}
+        && (
+          <Alert variant="warning" isInline title={__('Warning')}>
+            <p style={{ marginBottom: '0.5em' }}>{removeDeletionFlow ? versionDeleteInfo : versionRemovalInfo}</p>
+            <Checkbox
+              id="delete_version"
+              label={__('Delete version')}
+              isChecked={removeDeletionFlow}
+              onChange={checked => setRemoveDeletionFlow(checked)}
+              style={{ margin: 0 }}
             />
-            {columnHeaders.map(col =>
-              <Th key={col}>{col}</Th>)}
-          </Tr>
-        </Thead>
-        <Tbody>
-          {versionEnvironments?.map(({
-                                       id, name, activation_key_count: akCount,
-                                       host_count: hostCount,
-                                     }, rowIndex) =>
+          </Alert>)}
+      {(versionEnvironments.length !== 0) &&
+        <TableComposable variant={TableVariant.compact}>
+          <Thead>
+            <Tr>
+              <Td
+                select={{
+                  rowIndex: 0,
+                  onSelect: onSelectAll,
+                  isSelected: areAllSelected() || deleteFlow || removeDeletionFlow,
+                  disable: deleteFlow || removeDeletionFlow,
+                }}
+              />
+              {columnHeaders.map(col =>
+                <Th key={col}>{col}</Th>)}
+            </Tr>
+          </Thead>
+          <Tbody>
+            {versionEnvironments?.map(({
+              id, name, activation_key_count: akCount,
+              host_count: hostCount,
+            }, rowIndex) =>
             (
               <Tr key={`${name}_${id}`}>
                 <Td
                   key={`${name}__${id}_select`}
                   select={{
-                          rowIndex,
-                          onSelect: (event, isSelected) => onSelect(event, isSelected, id),
-                          isSelected: selectedEnvSet.has(id) || deleteFlow || removeDeletionFlow,
-                          disable: deleteFlow || removeDeletionFlow,
-                        }}
+                    rowIndex,
+                    onSelect: (event, isSelected) => onSelect(event, isSelected, id),
+                    isSelected: selectedEnvSet.has(id) || deleteFlow || removeDeletionFlow,
+                    disable: deleteFlow || removeDeletionFlow,
+                  }}
                 />
                 <Td>
                   {name}
@@ -108,18 +114,18 @@ const CVEnvironmentSelectionForm = () => {
                 <Td>{akCount}</Td>
               </Tr>
             ))
-          }
-        </Tbody>
-      </TableComposable>}
+            }
+          </Tbody>
+        </TableComposable>}
       {(versionEnvironments.length === 0) &&
-      <EmptyState variant={EmptyStateVariant.xs}>
-        <Title headingLevel="h4" size="md">
-          {__('This version has not been promoted to any environments.')}
-        </Title>
-        <EmptyStateBody>
-          {versionEnvironmentsEmptyInfo}
-        </EmptyStateBody>
-      </EmptyState>}
+        <EmptyState variant={EmptyStateVariant.xs}>
+          <Title headingLevel="h4" size="md">
+            {__('This version has not been promoted to any environments.')}
+          </Title>
+          <EmptyStateBody>
+            {versionEnvironmentsEmptyInfo}
+          </EmptyStateBody>
+        </EmptyState>}
     </>
   );
 };

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

@@ -1,5 +1,6 @@
 import React, { useState, useContext } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
+import { Redirect } from 'react-router-dom';
 import useDeepCompareEffect from 'use-deep-compare-effect';
 import { STATUS } from 'foremanReact/constants';
 import { translate as __ } from 'foremanReact/common/I18n';
@@ -13,7 +14,8 @@ const CVVersionDeleteFinish = () => {
     cvId, versionIdToRemove, versionEnvironments,
     setIsOpen, selectedEnvSet,
     selectedCVForAK, selectedEnvForAK, selectedCVForHosts,
-    selectedEnvForHost, affectedActivationKeys, affectedHosts, deleteFlow, removeDeletionFlow,
+    selectedEnvForHost, affectedActivationKeys, affectedHosts,
+    deleteFlow, removeDeletionFlow, detailsPage,
   } = useContext(DeleteContext);
   const removeCVVersionResponse = useSelector(state =>
     selectRemoveCVVersionResponse(state, versionIdToRemove, versionEnvironments));
@@ -22,14 +24,20 @@ const CVVersionDeleteFinish = () => {
   const removeResolved = removeCVVersionStatus === STATUS.RESOLVED;
   const dispatch = useDispatch();
   const [removeDispatched, setRemoveDispatched] = useState(false);
+  const [redirect, setRedirect] = useState(false);
   const selectedEnv = versionEnvironments.filter(env => selectedEnvSet.has(env.id));
 
   useDeepCompareEffect(() => {
     if (removeResolved && removeCVVersionResponse && removeDispatched) {
-      setIsOpen(false);
       dispatch(getContentViewVersions(cvId));
+      if (detailsPage) {
+        setRedirect(true);
+      } else {
+        setIsOpen(false);
+      }
     }
-  }, [removeCVVersionResponse, removeResolved, setIsOpen, dispatch, cvId, removeDispatched]);
+  }, [removeCVVersionResponse, removeResolved, setIsOpen,
+    dispatch, cvId, removeDispatched, detailsPage, setRedirect]);
 
   /*
     The remove version from environment API takes the following params :
@@ -88,6 +96,9 @@ const CVVersionDeleteFinish = () => {
     selectedEnvForAK, selectedEnvForHost, selectedEnv,
     removeCVVersionResponse, removeCVVersionStatus, removeDispatched]);
 
+  if (redirect) {
+    return (<Redirect to="/versions" />);
+  }
   return <Loading loadingText={__('Please wait while the task starts..')} />;
 };
 

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

@@ -1,13 +1,15 @@
-import React, { useContext } from 'react';
+import React, { useContext, useState } from 'react';
 import { useSelector } from 'react-redux';
-import { Alert, Flex, FlexItem, Label } from '@patternfly/react-core';
+import { Alert, Flex, FlexItem, Label, AlertActionCloseButton } from '@patternfly/react-core';
 import { ExclamationTriangleIcon } from '@patternfly/react-icons';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { selectCVActivationKeys, selectCVHosts } 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,
     selectedEnvForAK, selectedCVNameForAK, selectedCVNameForHosts,
@@ -20,16 +22,21 @@ const CVVersionRemoveReview = () => {
   const selectedEnv = versionEnvironments.filter(env => selectedEnvSet.has(env.id));
   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.');
+    'Changes listed below will be effective after clicking Remove.');
 
   return (
     <>
-      <h2>{__('Review Details')}</h2>
-      {(deleteFlow || removeDeletionFlow) &&
-      <Alert variant="warning" isInline title={__('Warning')}>
-        <p style={{ marginBottom: '0.5em' }}>{versionDeleteInfo}</p>
-      </Alert>}
-      {!(deleteFlow || removeDeletionFlow) && removalNotice}
+      <WizardHeader title={__('Review Details')} />
+      {!alertDismissed && (deleteFlow || removeDeletionFlow) &&
+        <Alert
+          variant="warning"
+          isInline
+          title={__('Warning')}
+          actionClose={<AlertActionCloseButton onClose={() => setAlertDismissed(true)} />}
+        >
+          <p style={{ marginBottom: '0.5em' }}>{versionDeleteInfo}</p>
+        </Alert>}
+      {!(deleteFlow || removeDeletionFlow) && <WizardHeader description={removalNotice} />}
       {(selectedEnv.length !== 0) &&
         <>
           <h3>{__('Environments')}</h3>
@@ -52,14 +59,14 @@ const CVVersionRemoveReview = () => {
           </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>
-      </>}
+        <>
+          <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>
+        </>}
     </>
   );
 };

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

@@ -108,7 +108,7 @@ test('Can open Remove wizard and remove version from simple environment', async
   expect(getAllByLabelText('Actions')[0]).toHaveAttribute('aria-expanded', 'false');
   fireEvent.click(getAllByLabelText('Actions')[0]);
   expect(getAllByLabelText('Actions')[0]).toHaveAttribute('aria-expanded', 'true');
-  fireEvent.click(getByText('Remove'));
+  fireEvent.click(getByText('Remove from environments'));
   await patientlyWaitFor(() => {
     expect(getByText('Remove Version')).toBeInTheDocument();
   });
@@ -180,7 +180,7 @@ test('Can open Remove wizard and remove version from environment with hosts', as
   expect(getAllByLabelText('Actions')[0]).toHaveAttribute('aria-expanded', 'false');
   fireEvent.click(getAllByLabelText('Actions')[0]);
   expect(getAllByLabelText('Actions')[0]).toHaveAttribute('aria-expanded', 'true');
-  fireEvent.click(getByText('Remove'));
+  fireEvent.click(getByText('Remove from environments'));
   await patientlyWaitFor(() => {
     expect(getByText('Remove Version')).toBeInTheDocument();
   });
@@ -272,7 +272,7 @@ test('Can open Remove wizard and remove version from environment with activation
   expect(getAllByLabelText('Actions')[0]).toHaveAttribute('aria-expanded', 'false');
   fireEvent.click(getAllByLabelText('Actions')[0]);
   expect(getAllByLabelText('Actions')[0]).toHaveAttribute('aria-expanded', 'true');
-  fireEvent.click(getByText('Remove'));
+  fireEvent.click(getByText('Remove from environments'));
   await patientlyWaitFor(() => {
     expect(getByText('Remove Version')).toBeInTheDocument();
   });

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

@@ -242,7 +242,6 @@
       "srpm_count": 0,
       "module_stream_count": 0,
       "package_count": 8,
-      "ostree_branch_count": null,
       "ansible_collection_repository_count": 0,
       "deb_repository_count": 0,
       "docker_repository_count": 0,
@@ -403,7 +402,6 @@
       "srpm_count": 0,
       "module_stream_count": 0,
       "package_count": 8,
-      "ostree_branch_count": null,
       "ansible_collection_repository_count": 0,
       "deb_repository_count": 0,
       "docker_repository_count": 0,
@@ -562,7 +560,6 @@
       "srpm_count": 0,
       "module_stream_count": 0,
       "package_count": 8,
-      "ostree_branch_count": null,
       "ansible_collection_repository_count": 0,
       "deb_repository_count": 0,
       "docker_repository_count": 0,
@@ -580,4 +577,4 @@
       }
     }
   ]
-}
+}

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

@@ -21,6 +21,7 @@ const ContentViewVersionDetails = ({ cvId, details }) => {
   const { push } = useHistory();
   const dispatch = useDispatch();
   const [versionDetails, setVersionDetails] = useState({});
+  const [mounted, setMounted] = useState(true);
   // Example urls expected:/versions/:id or /versions/:id/repositories.
   const tab = pathname.split('/')[3];
   const response = useSelector(state =>
@@ -31,10 +32,11 @@ const ContentViewVersionDetails = ({ cvId, details }) => {
   const tableConfigs = getCVVersionTableConfigs({ cvId, versionId });
 
   useEffect(() => {
-    if (isEmpty(response) && status === STATUS.PENDING) {
+    if (mounted || (isEmpty(response) && status === STATUS.PENDING)) {
       dispatch(getContentViewVersionDetails(versionId, cvId));
     }
-  }, [dispatch, versionId, cvId, response, status]);
+    return () => { setMounted(false); };
+  }, [dispatch, mounted, setMounted, versionId, cvId, response, status]);
 
   useDeepCompareEffect(() => {
     if (loaded) {