katello 4.4.1 → 4.5.0

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

@@ -1,15 +1,14 @@
 import React, { useState, useEffect, useCallback } from 'react';
-import useDeepCompareEffect from 'use-deep-compare-effect';
 import { useDispatch, useSelector } from 'react-redux';
-import { TableVariant, TableText } from '@patternfly/react-table';
+import { TableVariant, TableText, Tbody, Thead, Td, Tr, Th } from '@patternfly/react-table';
+import { Checkbox, Dropdown, DropdownItem, Grid, KebabToggle } from '@patternfly/react-core';
 import { translate as __ } from 'foremanReact/common/I18n';
 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 { first } from 'lodash';
+import { useSelectionSet } from '../../../../components/Table/TableHooks';
 import TableWrapper from '../../../../components/Table/TableWrapper';
 import InactiveText from '../../components/InactiveText';
 import ContentViewVersionEnvironments from './ContentViewVersionEnvironments';
@@ -24,35 +23,51 @@ import {
 import getEnvironmentPaths from '../../components/EnvironmentPaths/EnvironmentPathActions';
 import ContentViewVersionPromote from '../Promote/ContentViewVersionPromote';
 import TaskPresenter from '../../components/TaskPresenter/TaskPresenter';
-import { startPollingTask, stopPollingTask } from '../../../Tasks/TaskActions';
 import RemoveCVVersionWizard from './Delete/RemoveCVVersionWizard';
 import { hasPermission } from '../../helpers';
-import { pollTaskKey } from '../../../Tasks/helpers';
+import BulkDeleteModal from './BulkDelete/BulkDeleteModal';
+import { selectEnvironmentPathsStatus } from '../../components/EnvironmentPaths/EnvironmentPathSelectors';
+
 
 const ContentViewVersions = ({ cvId, details }) => {
   const response = useSelector(state => selectCVVersions(state, cvId));
   const { results, ...metadata } = response;
+
+  const firstIdWithActiveHistory =
+    results?.find(({ active_history: activeHistory }) =>
+      activeHistory?.length)?.id;
+
   const status = useSelector(state => selectCVVersionsStatus(state, cvId));
   const error = useSelector(state => selectCVVersionsError(state, cvId));
-  const [pollingFinished, setPollingFinished] = useState(false);
-  const loading = status === STATUS.PENDING;
+  const envStatus = useSelector(state => selectEnvironmentPathsStatus(state, cvId));
+
   const dispatch = useDispatch();
-  const [rows, setRows] = useState([]);
   const [searchQuery, updateSearchQuery] = useState('');
   const [versionIdToPromote, setVersionIdToPromote] = useState('');
   const [versionNameToPromote, setVersionNameToPromote] = useState('');
   const [versionIdToRemove, setVersionIdToRemove] = useState('');
   const [versionNameToRemove, setVersionNameToRemove] = useState('');
   const [versionEnvironments, setVersionEnvironments] = useState([]);
+  const [bulkDeleteModalOpen, setBulkDeleteModalOpen] = useState(false);
   const [promoting, setPromoting] = useState(false);
   const [removingFromEnv, setRemovingFromEnv] = useState(false);
   const [deleteVersion, setDeleteVersion] = useState(false);
   const [currentStep, setCurrentStep] = useState(1);
   const { permissions } = details;
-  const pendingTaskSet = useSet([]);
-  const intervals = useSelector(state => selectIntervals(state));
+  const [kebabOpen, setKebabOpen] = useState(false);
+  const hasActionPermissions = hasPermission(permissions, 'promote_or_remove_content_views');
+  const renderActionButtons =
+    hasActionPermissions && status === STATUS.RESOLVED && !!results?.length;
+  const {
+    selectOne, isSelected, isSelectable: _isSelectable,
+    selectedCount, selectionSet, ...selectionSetVars
+  } = useSelectionSet({
+    results,
+    metadata,
+  });
 
   const columnHeaders = [
+    '',
     __('Version'),
     __('Environments'),
     __('Packages'),
@@ -63,22 +78,14 @@ const ContentViewVersions = ({ cvId, details }) => {
 
   useEffect(
     () => {
-      dispatch(getEnvironmentPaths());
+      if (envStatus !== STATUS.RESOLVED) { dispatch(getEnvironmentPaths()); }
     },
+    // We only want this to fire once
+    // eslint-disable-next-line react-hooks/exhaustive-deps
     [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 buildCells = (cvVersion) => {
     const {
       version,
       description,
@@ -86,96 +93,50 @@ const ContentViewVersions = ({ cvId, details }) => {
       environments,
       rpm_count: packageCount,
       errata_counts: errataCounts,
-    } = cvVersion;
-    return [
-      { title: <Link to={`/versions/${versionId}`}>{__('Version ')}{version}</Link> },
-      { title: <ContentViewVersionEnvironments {...{ environments }} /> },
-      {
-        title: Number(packageCount) ?
-          <a href={urlBuilder(`content_views/${cvId}#/versions/${versionId}/rpmPackages`, '')}>{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, pollIntervals) => {
-    const {
-      version,
-      description,
-      id: versionId,
       active_history: activeHistory,
     } = cvVersion;
-    const { task } = activeHistory[0];
-    const { result } = 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);
-          }
-        },
-      ));
+    if (activeHistory?.length) {
+      return [
+        '',
+        <Link disabled to={`/versions/${versionId}`}>{__('Version ')}{version}</Link>,
+        <TaskPresenter
+          activeHistory={first(activeHistory)}
+          cvId={cvId}
+          allowCallback={firstIdWithActiveHistory === versionId}
+        />,
+        '',
+        '',
+        '',
+        description ? <TableText wrapModifier="truncate">{description}</TableText> : <InactiveText text={__('No description')} />,
+      ];
     }
 
     return [
-      { title: <Link disabled to={`/versions/${versionId}`}>{__('Version ')}{version}</Link> },
-      {
-        title: <TaskPresenter
-          activeHistory={activeHistory[0]}
-          setPollingFinished={setPollingFinished}
-        />,
-      },
-      { title: '' },
-      { title: '' },
-      { title: '' },
-      { title: description ? <TableText wrapModifier="truncate">{description}</TableText> : <InactiveText text={__('No description')} /> },
+      <Checkbox
+        id={versionId}
+        isChecked={isSelected(versionId)}
+        onChange={selected =>
+          selectOne(selected, versionId)
+        }
+      />,
+      <Link to={`/versions/${versionId}`}>{__('Version ')}{version}</Link>,
+      <ContentViewVersionEnvironments {...{ environments }} />,
+      Number(packageCount) ?
+        <a href={urlBuilder(`content_views/${cvId}#/versions/${versionId}/packages`, '')}>{packageCount}</a> :
+        <InactiveText text={__('No packages')} />,
+      <ContentViewVersionErrata {...{ cvId, versionId, errataCounts }} />,
+      <ContentViewVersionContent {...{ cvId, versionId, cvVersion }} />,
+      description ? <TableText wrapModifier="truncate">{description}</TableText> : <InactiveText text={__('No description')} />,
     ];
-  }, [dispatch, pendingTaskSet]);
-
-  useDeepCompareEffect(() => {
-    const buildRows = () => {
-      const newRows = [];
-      results.forEach((cvVersion) => {
-        const {
-          version,
-          id: versionId,
-          environments,
-          active_history: activeHistory,
-        } = cvVersion;
+  };
 
-        const cells = activeHistory.length ?
-          buildActiveTaskCells(cvVersion, intervals) :
-          buildCells(cvVersion);
-        newRows.push({
-          cvVersionId: versionId,
-          cvVersionName: version,
-          cvVersionEnvironments: environments,
-          activeHistory,
-          cells,
-        });
-      });
-      return newRows;
-    };
-
-    if (!loading && results) {
-      const newRows = buildRows();
-      setRows(newRows);
-    }
-  }, [response, results, buildActiveTaskCells, buildCells, dispatch, loading, setRows, intervals]);
 
   const onPromote = ({ cvVersionId, cvVersionName, cvVersionEnvironments }) => {
     setVersionIdToPromote(cvVersionId);
     setVersionNameToPromote(cvVersionName);
     setVersionEnvironments(cvVersionEnvironments);
     setPromoting(true);
-    setPollingFinished(false);
   };
 
   const onRemoveFromEnv = ({
@@ -186,46 +147,44 @@ const ContentViewVersions = ({ cvId, details }) => {
     setVersionEnvironments(cvVersionEnvironments);
     setRemovingFromEnv(true);
     setDeleteVersion(deleting);
-    setPollingFinished(false);
   };
 
-  const actionResolver = (rowData, { _rowIndex }) => [
-    {
-      title: __('Promote'),
-      isDisabled: rowData.activeHistory.length,
-      onClick: (_event, rowId, rowInfo) => {
-        onPromote({
-          cvVersionId: rowInfo.cvVersionId,
-          cvVersionName: rowInfo.cvVersionName,
-          cvVersionEnvironments: rowInfo.cvVersionEnvironments,
-        });
+  const rowDropdownItems = ({
+    version,
+    id: versionId,
+    environments,
+  }) =>
+    [
+      {
+        title: __('Promote'),
+        onClick: () => {
+          onPromote({
+            cvVersionId: versionId,
+            cvVersionName: version,
+            cvVersionEnvironments: environments,
+          });
+        },
       },
-    },
-    {
-      title: __('Remove from environments'),
-      isDisabled: rowData.activeHistory.length,
-      onClick: (_event, rowId, rowInfo) => {
-        onRemoveFromEnv({
-          cvVersionId: rowInfo.cvVersionId,
-          cvVersionName: rowInfo.cvVersionName,
-          cvVersionEnvironments: rowInfo.cvVersionEnvironments,
-          deleting: false,
-        });
+      {
+        title: __('Remove from environments'),
+        onClick: () => {
+          onRemoveFromEnv({
+            cvVersionId: versionId,
+            cvVersionName: version,
+            cvVersionEnvironments: environments,
+            deleting: false,
+          });
+        },
       },
-    },
-    {
-      title: __('Delete'),
-      isDisabled: rowData.activeHistory.length,
-      onClick: (_event, rowId, rowInfo) => {
-        onRemoveFromEnv({
-          cvVersionId: rowInfo.cvVersionId,
-          cvVersionName: rowInfo.cvVersionName,
-          cvVersionEnvironments: rowInfo.cvVersionEnvironments,
-          deleting: true,
-        });
+      {
+        title: __('Delete'),
+        onClick: () => {
+          selectionSet.clear();
+          selectOne(true, versionId);
+          setBulkDeleteModalOpen(true);
+        },
       },
-    },
-  ];
+    ];
 
   const emptyContentTitle = __("You currently don't have any versions for this content view.");
   const emptyContentBody = __('Versions will appear here when the content view is published.'); // needs link
@@ -235,7 +194,6 @@ const ContentViewVersions = ({ cvId, details }) => {
   return (
     <TableWrapper
       {...{
-        rows,
         metadata,
         emptyContentTitle,
         emptyContentBody,
@@ -245,42 +203,109 @@ const ContentViewVersions = ({ cvId, details }) => {
         updateSearchQuery,
         error,
         status,
+        selectedCount,
       }}
-      actionResolver={hasPermission(permissions, 'promote_or_remove_content_views') ? actionResolver : null}
-      cells={columnHeaders}
+      ouiaId="content-view-versions-table"
       variant={TableVariant.compact}
       autocompleteEndpoint={`/content_view_versions/auto_complete_search?content_view_id=${cvId}`}
-      fetchItems={useCallback(params => getContentViewVersions(cvId, params), [cvId])}
-      additionalListeners={[pollingFinished]}
+      fetchItems={useCallback((params) => {
+        selectionSet.clear();
+        return getContentViewVersions(cvId, params);
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+      }, [cvId])}
+      {...hasActionPermissions ? selectionSetVars : []}
       actionButtons={
-        <>
-          {promoting &&
-            <ContentViewVersionPromote
-              cvId={cvId}
-              versionIdToPromote={versionIdToPromote}
-              versionNameToPromote={versionNameToPromote}
-              versionEnvironments={versionEnvironments}
-              setIsOpen={setPromoting}
-              aria-label="promote_content_view_modal"
-            />
-          }
-          {removingFromEnv &&
-            <RemoveCVVersionWizard
-              cvId={cvId}
-              versionIdToRemove={versionIdToRemove}
-              versionNameToRemove={versionNameToRemove}
-              versionEnvironments={versionEnvironments}
-              show={removingFromEnv}
-              setIsOpen={setRemovingFromEnv}
-              currentStep={currentStep}
-              setCurrentStep={setCurrentStep}
-              deleteWizard={deleteVersion}
-              aria-label="remove_content_view_version_modal"
+        renderActionButtons && (
+          <Grid>
+            <Dropdown
+              toggle={<KebabToggle aria-label="bulk_actions" onToggle={setKebabOpen} />}
+              isOpen={kebabOpen}
+              isPlain
+              dropdownItems={[
+                <DropdownItem
+                  aria-label="bulk_delete"
+                  key="bulk_delete"
+                  isDisabled={selectedCount < 1}
+                  component="button"
+                  onClick={() => {
+                    setKebabOpen(false);
+                    setBulkDeleteModalOpen(true);
+                  }}
+                >
+                  {__('Delete')}
+                </DropdownItem>]}
             />
-          }
-        </>
-      }
-    />);
+          </Grid>
+        )}
+      displaySelectAllCheckbox={hasActionPermissions}
+    >
+      <Thead>
+        {bulkDeleteModalOpen &&
+          <BulkDeleteModal
+            versions={results?.filter(({ id }) => selectionSet.has(id))}
+            onClose={() => {
+              selectionSet.clear();
+              setBulkDeleteModalOpen(false);
+            }}
+          />
+        }
+        {promoting &&
+          <ContentViewVersionPromote
+            cvId={cvId}
+            versionIdToPromote={versionIdToPromote}
+            versionNameToPromote={versionNameToPromote}
+            versionEnvironments={versionEnvironments}
+            setIsOpen={setPromoting}
+            aria-label="promote_content_view_modal"
+          />
+        }
+        {removingFromEnv &&
+          <RemoveCVVersionWizard
+            cvId={cvId}
+            versionIdToRemove={versionIdToRemove}
+            versionNameToRemove={versionNameToRemove}
+            versionEnvironments={versionEnvironments}
+            show={removingFromEnv}
+            setIsOpen={setRemovingFromEnv}
+            currentStep={currentStep}
+            setCurrentStep={setCurrentStep}
+            deleteWizard={deleteVersion}
+            aria-label="remove_content_view_version_modal"
+          />
+        }
+        <Tr key="version-header">
+          {columnHeaders.map((title, index) => {
+            if (index === 0 && !hasActionPermissions) return undefined;
+            return <Th key={`col-header-${title}`}>{title}</Th>;
+          })}
+        </Tr>
+      </Thead>
+      <Tbody>
+        {results?.map((cvVersion) => {
+          const hasHistory = !!cvVersion?.active_history?.length;
+          const cells = buildCells(cvVersion);
+          return (
+            <Tr key={`column-${cvVersion.id}`}>
+              {cells.map((cell, index) => {
+                if (index === 0 && !hasActionPermissions) return undefined;
+                return (
+                  <Td
+                    key={`cell-${index + 1}`}
+                    style={index === 0 ? { padding: '0px 16px', width: '45px' } : undefined}
+                  >
+                    {cell}
+                  </Td>);
+              })}
+              {(!hasHistory && hasActionPermissions) &&
+                <Td
+                  actions={{
+                    items: rowDropdownItems(cvVersion),
+                  }}
+                />}
+            </Tr>);
+        })}
+      </Tbody>
+    </TableWrapper >);
 };
 
 ContentViewVersions.propTypes = {

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, detailsPage,
+  currentStep, setCurrentStep, deleteWizard,
 }) => {
   const [selectedEnvForAK, setSelectedEnvForAK] = useState([]);
   const [selectedEnvForHost, setSelectedEnvForHost] = useState([]);
@@ -78,7 +78,7 @@ const RemoveCVVersionWizard = ({
     component: <CVReassignActivationKeysForm />,
     enableNext: canReview,
     canJumpTo: affectedActivationKeys &&
-    (affectedHosts ? selectedEnvForHost && selectedCVForHosts : true),
+      (affectedHosts ? selectedEnvForHost && selectedCVForHosts : true),
   };
 
   const reviewStep = {
@@ -133,7 +133,6 @@ const RemoveCVVersionWizard = ({
       selectedEnvForHost,
       setSelectedEnvForHost,
       selectedEnvSet,
-      detailsPage,
     }}
     >
       <Wizard
@@ -166,14 +165,12 @@ 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/CVVersionDeleteFinish.js

@@ -1,11 +1,11 @@
-import React, { useState, useContext } from 'react';
+import React, { useState, useEffect, useContext } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
-import { Redirect } from 'react-router-dom';
-import useDeepCompareEffect from 'use-deep-compare-effect';
+import { useHistory } from 'react-router-dom';
 import { STATUS } from 'foremanReact/constants';
+import useDeepCompareEffect from 'use-deep-compare-effect';
 import { translate as __ } from 'foremanReact/common/I18n';
-import { selectRemoveCVVersionResponse, selectRemoveCVVersionStatus } from '../../../ContentViewDetailSelectors';
-import { getContentViewVersions, removeContentViewVersion } from '../../../ContentViewDetailActions';
+import { selectRemoveCVVersionStatus } from '../../../ContentViewDetailSelectors';
+import getContentViewDetails, { removeContentViewVersion } from '../../../ContentViewDetailActions';
 import Loading from '../../../../../../components/Loading';
 import DeleteContext from '../DeleteContext';
 
@@ -15,50 +15,27 @@ const CVVersionDeleteFinish = () => {
     setIsOpen, selectedEnvSet,
     selectedCVForAK, selectedEnvForAK, selectedCVForHosts,
     selectedEnvForHost, affectedActivationKeys, affectedHosts,
-    deleteFlow, removeDeletionFlow, detailsPage,
+    deleteFlow, removeDeletionFlow,
   } = useContext(DeleteContext);
-  const removeCVVersionResponse = useSelector(state =>
-    selectRemoveCVVersionResponse(state, versionIdToRemove, versionEnvironments));
+
+  const dispatch = useDispatch();
   const removeCVVersionStatus = useSelector(state =>
     selectRemoveCVVersionStatus(state, versionIdToRemove, versionEnvironments));
-  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));
+  const { push, location: { pathname } } = useHistory();
 
-  useDeepCompareEffect(() => {
-    if (removeResolved && removeCVVersionResponse && removeDispatched) {
-      dispatch(getContentViewVersions(cvId));
-      if (detailsPage) {
-        setRedirect(true);
-      } else {
-        setIsOpen(false);
-      }
+  useEffect(() => {
+    if (removeCVVersionStatus === STATUS.ERROR) {
+      setIsOpen(false);
     }
-  }, [removeCVVersionResponse, removeResolved, setIsOpen,
-    dispatch, cvId, removeDispatched, detailsPage, setRedirect]);
-
-  /*
-    The remove version from environment API takes the following params :
-     id: Content View to remove from environments
-     environment_ids: List of environments to remove CV from
+  }, [setIsOpen, removeCVVersionStatus]);
 
-     If activation keys need to be reassigned, we need to pass:
-     key_content_view_id : New Content view for activation keys
-     key_environment_id: Environment of the CV we are reassigning keys to
 
-     Additionally, if hosts need to be reassigned, we need to pass:
-     system_content_view_id: New Content view for Hosts
-     system_environment_id: Environment of the CV we are reassigning hosts to
-
-    Finally, if we want to delete the version after removing it from all environments,
-    we need to pass content_view_version_ids param, that accepts an array of versions to delete
-
-    This hook forms the params based on selections made in the wizard and dispatches the call.
-  */
   useDeepCompareEffect(() => {
     if (!removeDispatched) {
+      setRemoveDispatched(true);
+
       const environmentIdParams = (deleteFlow || removeDeletionFlow) ?
         versionEnvironments.map(env => env.id) :
         selectedEnv.map(env => env.id);
@@ -69,36 +46,44 @@ const CVVersionDeleteFinish = () => {
       };
 
       if (affectedActivationKeys) {
-        const activationKeysParams = {
+        params = {
+          ...params,
           key_content_view_id: selectedCVForAK,
           key_environment_id: selectedEnvForAK[0].id,
         };
-        params = { ...activationKeysParams, ...params };
       }
 
       if (affectedHosts) {
-        const hostParams = {
+        params = {
+          ...params,
           system_content_view_id: selectedCVForHosts,
           system_environment_id: selectedEnvForHost[0].id,
         };
-        params = { ...hostParams, ...params };
       }
 
       if (deleteFlow || removeDeletionFlow) {
-        const deletionParams = { content_view_version_ids: [versionIdToRemove] };
-        params = { ...deletionParams, ...params };
+        params = {
+          ...params,
+          content_view_version_ids: [versionIdToRemove],
+        };
       }
-      dispatch(removeContentViewVersion(cvId, versionIdToRemove, versionEnvironments, params));
-      setRemoveDispatched(true);
+
+      dispatch(removeContentViewVersion(
+        cvId,
+        versionIdToRemove,
+        versionEnvironments,
+        params,
+        () => {
+          dispatch(getContentViewDetails(cvId));
+          if (pathname !== '/versions') push('/versions');
+        },
+      ));
     }
-  }, [cvId, versionIdToRemove, versionEnvironments, dispatch, affectedActivationKeys,
-    affectedHosts, deleteFlow, removeDeletionFlow, selectedCVForAK, selectedCVForHosts,
-    selectedEnvForAK, selectedEnvForHost, selectedEnv,
-    removeCVVersionResponse, removeCVVersionStatus, removeDispatched]);
+  }, [affectedActivationKeys, affectedHosts, cvId, deleteFlow,
+    dispatch, pathname, push, removeDeletionFlow, removeDispatched,
+    selectedCVForAK, selectedCVForHosts, selectedEnv, selectedEnvForAK,
+    selectedEnvForHost, setIsOpen, versionEnvironments, versionIdToRemove]);
 
-  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

@@ -26,7 +26,7 @@ const CVVersionRemoveReview = () => {
 
   return (
     <>
-      <WizardHeader title={__('Review Details')} />
+      <WizardHeader title={__('Review details')} />
       {!alertDismissed && (deleteFlow || removeDeletionFlow) &&
         <Alert
           variant="warning"