katello 4.3.0.rc1 → 4.3.0.rc2

data/webpack/scenes/ContentViews/Details/Filters/__tests__/cvFilterDetailWithAffectedRepos.fixtures.json

@@ -75,7 +75,6 @@
           "name": "yums"
         },
         "content_counts": {
-          "ostree_branch": 0,
           "docker_manifest": 0,
           "docker_tag": 0,
           "rpm": 22,
@@ -95,7 +94,6 @@
           "name": "test"
         },
         "content_counts": {
-          "ostree_branch": 0,
           "docker_manifest": 0,
           "docker_tag": 0,
           "rpm": 8,
@@ -115,7 +113,6 @@
           "name": "test"
         },
         "content_counts": {
-          "ostree_branch": 0,
           "docker_manifest": 1,
           "docker_tag": 1,
           "rpm": 0,
@@ -135,7 +132,6 @@
           "name": "test"
         },
         "content_counts": {
-          "ostree_branch": 0,
           "docker_manifest": 0,
           "docker_tag": 0,
           "rpm": 0,
@@ -155,7 +151,6 @@
           "name": "test"
         },
         "content_counts": {
-          "ostree_branch": 0,
           "docker_manifest": 0,
           "docker_tag": 0,
           "rpm": 0,
@@ -268,7 +263,6 @@
       },
       "content_label": "Default_Organization_test_testYums",
       "content_counts": {
-        "ostree_branch": 0,
         "docker_manifest": 0,
         "docker_manifest_list": 0,
         "docker_tag": 0,
@@ -336,7 +330,6 @@
       },
       "content_label": "Default_Organization_yums_test",
       "content_counts": {
-        "ostree_branch": 0,
         "docker_manifest": 0,
         "docker_manifest_list": 0,
         "docker_tag": 0,
@@ -372,4 +365,4 @@
       "updated_at": "2021-02-23 20:57:19 -0500"
     }
   ]
-}
+}

data/webpack/scenes/ContentViews/Details/Filters/__tests__/cvModuleStreamFilterDetails.fixtures.json

@@ -41,7 +41,6 @@
                "name": "prod1"
             },
             "content_counts": {
-               "ostree_branch": 0,
                "docker_manifest": 0,
                "docker_tag": 0,
                "rpm": 32,
@@ -94,4 +93,4 @@
          "updated_at": "2021-09-07 12:51:46 -0400"
        }
      ]
-}
+}

data/webpack/scenes/ContentViews/Details/Filters/__tests__/cvPackageFilterDetail.fixtures.json

@@ -52,7 +52,6 @@
           "name": "test"
         },
         "content_counts": {
-          "ostree_branch": 0,
           "docker_manifest": 0,
           "docker_tag": 0,
           "rpm": 8,
@@ -72,7 +71,6 @@
           "name": "test"
         },
         "content_counts": {
-          "ostree_branch": 0,
           "docker_manifest": 0,
           "docker_tag": 0,
           "rpm": 8,
@@ -144,4 +142,4 @@
       "updated_at": "2021-04-01 11:35:39 -0400"
     }
   ]
-}
+}

data/webpack/scenes/ContentViews/Details/Promote/ContentViewVersionPromote.js

@@ -3,7 +3,10 @@ import useDeepCompareEffect from 'use-deep-compare-effect';
 import { useDispatch, useSelector } from 'react-redux';
 import { STATUS } from 'foremanReact/constants';
 import PropTypes from 'prop-types';
-import { Form, FormGroup, TextArea, ActionGroup, Button, Modal, ModalVariant, Alert } from '@patternfly/react-core';
+import {
+  Form, FormGroup, TextArea, ActionGroup, Button,
+  Modal, ModalVariant, Alert, TextContent, AlertActionCloseButton,
+} from '@patternfly/react-core';
 import { translate as __ } from 'foremanReact/common/I18n';
 
 import {
@@ -24,7 +27,8 @@ const ContentViewVersionPromote = ({
 }) => {
   const [description, setDescription] = useState('');
   const [userCheckedItems, setUserCheckedItems] = useState([]);
-  const [promoting, setPromoting] = useState(false);
+  const [alertDismissed, setAlertDismissed] = useState(false);
+  const [loading, setLoading] = useState(false);
   const [forcePromote, setForcePromote] = useState([]);
   const environmentPathResponse = useSelector(selectEnvironmentPaths);
   const environmentPathStatus = useSelector(selectEnvironmentPathsStatus);
@@ -39,7 +43,7 @@ const ContentViewVersionPromote = ({
   const dispatch = useDispatch();
 
   const onPromote = () => {
-    setPromoting(true);
+    setLoading(true);
     dispatch(promoteContentViewVersion({
       id: versionIdToPromote,
       description,
@@ -55,9 +59,9 @@ const ContentViewVersionPromote = ({
       dispatch(getContentViewVersions(cvId));
     }
     if (promoteError) {
-      setPromoting(false);
+      setLoading(false);
     }
-  }, [promoteResponse, promoteResolved, promoteError, setPromoting, setIsOpen, dispatch, cvId]);
+  }, [promoteResponse, promoteResolved, promoteError, setLoading, setIsOpen, dispatch, cvId]);
 
   const envPathFlat = useMemo(() => {
     if (!environmentPathLoading) {
@@ -88,6 +92,8 @@ const ContentViewVersionPromote = ({
     setForcePromote(userCheckedItems.filter(item => !isValid(item)));
   }, [userCheckedItems, setForcePromote, isValid]);
 
+  const submitDisabled = loading || userCheckedItems.length === 0;
+
   return (
     <Modal
       title={__(`Promote version ${versionNameToPromote}`)}
@@ -98,9 +104,13 @@ const ContentViewVersionPromote = ({
       }}
       appendTo={document.body}
     >
-      {promoting ? <Loading loadingText={__('Please wait while the task starts..')} /> :
-      <>
-        <Form>
+      {loading ?
+        <Loading loadingText={__('Please wait while the task starts..')} /> :
+        <Form onSubmit={(e) => {
+          e.preventDefault();
+          onPromote();
+        }}
+        >
           <FormGroup label="Description" fieldId="description">
             <TextArea
               isRequired
@@ -112,28 +122,34 @@ const ContentViewVersionPromote = ({
               onChange={value => setDescription(value)}
             />
           </FormGroup>
-        </Form>
-        <hr />
-        {forcePromote.length > 0 && (
-          <Alert variant="info" isInline title="Force Promotion">
-            <p>{__('Selected environments are out of the environment order. ' +
-              'The recommended practice is to promote to the next environment in the path.')}
-            </p>
-            <ComponentEnvironments environments={forcePromote} />
-          </Alert>)}
-        <EnvironmentPaths
-          userCheckedItems={userCheckedItems}
-          setUserCheckedItems={setUserCheckedItems}
-          promotedEnvironments={versionEnvironments}
-          publishing={false}
-        />
-        <Form>
-          <ActionGroup>
+          {!alertDismissed && forcePromote.length > 0 && (
+            <Alert
+              variant="info"
+              isInline
+              title={__('Force promotion')}
+              actionClose={<AlertActionCloseButton onClose={() => setAlertDismissed(true)} />}
+            >
+              <TextContent>
+                {forcePromote.length > 1 ? __('Selected environments ') : __('Selected environment ')}
+                <ComponentEnvironments environments={forcePromote} />
+                {forcePromote.length > 1 ?
+                  __(' are out of the environment path order. The recommended practice is to promote the next environment in the path.') :
+                  __(' is out of the environment path order. The recommended practice is to promote the next environment in the path.')
+                }
+              </TextContent>
+            </Alert>)}
+          <EnvironmentPaths
+            userCheckedItems={userCheckedItems}
+            setUserCheckedItems={setUserCheckedItems}
+            promotedEnvironments={versionEnvironments}
+            publishing={false}
+          />
+          <ActionGroup style={{ margin: 0 }}>
             <Button
               aria-label="promote_content_view"
               variant="primary"
-              isDisabled={promoting}
-              onClick={() => onPromote()}
+              isDisabled={submitDisabled}
+              type="submit"
             >
               {__('Promote')}
             </Button>
@@ -142,7 +158,7 @@ const ContentViewVersionPromote = ({
             </Button>
           </ActionGroup>
         </Form>
-      </>}
+      }
     </Modal>
   );
 };

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

@@ -14,7 +14,6 @@ const repoLabels = {
   docker_manifest_list: ['container manifest lists', 'container manifest list', 'content/docker_manifest_lists'],
   docker_tag: ['container tags', 'container tag', 'content/docker_tags'],
   file: ['files', 'file', 'content/files'],
-  ostree_branch: ['ostree branches', 'ostree branch', 'content/ostree_branches'],
   package_group: ['package groups', 'package group', 'package_groups'],
   srpm: ['source RPMs', 'source RPM', 'source_rpms'], // no link?
 };
@@ -46,6 +45,8 @@ const ContentCounts = ({ productId, repoId, counts }) => {
     if (config) {
       const { pluralLowercase, singularLowercase, pluralLabel } = config.names;
       info = [pluralLowercase, singularLowercase, pluralLabel];
+    } else if (!info) {
+      info = ['unknown units', 'unknown unit', ''];
     }
     // package and rpm are the same
     if (type !== 'package' && count > 0) allCounts.push(appendCount(type, count, info, productId, repoId));

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

@@ -95,7 +95,7 @@ const ContentViewRepositories = ({ cvId, details }) => {
         { title: <Bullseye><RepoIcon type={contentType} /></Bullseye> },
         { title: <a href={urlBuilder(`products/${productId}/repositories`, '', id)}>{name}</a> },
         productName,
-        { title: <LastSync {...{ lastSyncWords, lastSync }} /> },
+        { title: <LastSync {...{ startedAt: lastSync?.started_at, lastSyncWords, lastSync }} /> },
         { title: <ContentCounts {...{ counts, productId }} repoId={id} /> },
         {
           title: <AddedStatusLabel added={addedToCV || statusSelected === ADDED} />,

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

@@ -1,10 +1,21 @@
 import React, { Fragment } from 'react';
-import { CheckCircleIcon, ExclamationTriangleIcon, ExclamationCircleIcon, InProgressIcon } from '@patternfly/react-icons';
+import {
+  CheckCircleIcon,
+  ExclamationTriangleIcon,
+  ExclamationCircleIcon,
+  InProgressIcon,
+} from '@patternfly/react-icons';
+import { Tooltip, TooltipPosition } from '@patternfly/react-core';
+
 import { foremanUrl } from 'foremanReact/common/helpers';
 import PropTypes from 'prop-types';
+import { translate as __ } from 'foremanReact/common/I18n';
 import InactiveText from '../../components/InactiveText';
+import { makeReadableDate } from '../../../../utils/dateTimeHelpers';
 
-const LastSync = ({ lastSyncWords, lastSync, emptyMessage }) => {
+const LastSync = ({
+  lastSyncWords, lastSync, emptyMessage, startedAt,
+}) => {
   if (lastSync && lastSyncWords) {
     let Icon;
     let color = 'black';
@@ -26,16 +37,42 @@ const LastSync = ({ lastSyncWords, lastSync, emptyMessage }) => {
       Icon = Fragment;
     }
 
+    if (startedAt) {
+      return (
+        <Tooltip
+          position={TooltipPosition.top}
+          content={makeReadableDate(startedAt)}
+        >
+          <a
+            href={foremanUrl(`/foreman_tasks/tasks/${id}/`)}
+            style={{
+              display: 'inline-flex', alignItems: 'center', margin: 0,
+            }}
+          >
+            <Icon style={{ color, marginRight: '5px' }} />
+            <span>{lastSyncWords}{__(' ago')}</span>
+          </a >
+        </Tooltip >
+      );
+    }
+
     return (
-      <a href={foremanUrl(`/foreman_tasks/tasks/${id}/`)}>
-        <Icon style={{ color }} />&nbsp;{`${lastSyncWords} ago`}
-      </a>
-    );
+      <a
+        href={foremanUrl(`/foreman_tasks/tasks/${id}/`)}
+        style={{
+          display: 'flex', alignItems: 'center',
+        }}
+      >
+        <Icon style={{ color, marginRight: '5px' }} />
+        <span>{lastSyncWords}{__(' ago')}</span>
+      </a >);
   }
+
   return <InactiveText text={emptyMessage} />;
 };
 
 LastSync.propTypes = {
+  startedAt: PropTypes.string,
   lastSyncWords: PropTypes.string,
   lastSync: PropTypes.shape({
     id: PropTypes.string, // API returns string
@@ -45,8 +82,9 @@ LastSync.propTypes = {
 };
 
 LastSync.defaultProps = {
-  lastSyncWords: null,
-  lastSync: null,
+  startedAt: undefined,
+  lastSyncWords: undefined,
+  lastSync: undefined,
   emptyMessage: 'Not Synced',
 };
 

data/webpack/scenes/ContentViews/Details/Repositories/__tests__/contentViewDetailRepos.fixtures.json

@@ -62,7 +62,6 @@
       },
       "content_label": "Orion_Lagoon_Nebula_Butterfly",
       "content_counts": {
-        "ostree_branch": 0,
         "docker_manifest": 0,
         "docker_manifest_list": 0,
         "docker_tag": 0,
@@ -131,7 +130,6 @@
       },
       "content_label": "Orion_Lagoon_Nebula_Coma",
       "content_counts": {
-        "ostree_branch": 1,
         "docker_manifest": 2,
         "docker_manifest_list": 2,
         "docker_tag": 0,

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

@@ -8,6 +8,7 @@ import {
 } from '@patternfly/react-core';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { urlBuilder } from 'foremanReact/common/urlHelpers';
+import ContentConfig from './../../../Content/ContentConfig';
 
 const ContentViewVersionContent = ({ cvId, versionId, cvVersion }) => {
   const {
@@ -19,6 +20,14 @@ const ContentViewVersionContent = ({ cvId, versionId, cvVersion }) => {
     ansible_collection_count: ansibleCollectionCount,
   } = cvVersion;
 
+  const genericContentTypes = {};
+
+  ContentConfig().forEach((type) => {
+    const countLabel = `${type.names.singularLabel}_count`;
+    genericContentTypes[countLabel.replace(/([-_]\w)/g, g => g[1].toUpperCase())] = [cvVersion[countLabel], type.names.pluralLowercase];
+  });
+  const genericContentCountsStyle = { whiteSpace: 'pre-line' };
+
   return (
     <React.Fragment>
       {(moduleStreamCount > 0 &&
@@ -53,12 +62,19 @@ const ContentViewVersionContent = ({ cvId, versionId, cvVersion }) => {
         <a href={urlBuilder(`content_views/${cvId}#/versions/${versionId}/ansibleCollections`, '')}>{`${ansibleCollectionCount} Collections`}</a><br />
       </>
       }
+      <>
+        <span style={genericContentCountsStyle}>
+          {Object.keys(genericContentTypes).filter(typeCountKey => genericContentTypes[typeCountKey][0] > 0).map(typeCountKey => `${genericContentTypes[typeCountKey][0]} ${genericContentTypes[typeCountKey][1]}\n`)}
+        </span>
+      </>
       {(moduleStreamCount === 0 && debCount === 0 &&
         dockerManifestCount === 0 && dockerTagCount === 0 &&
         fileCount === 0 && ansibleCollectionCount === 0 &&
-        <TextContent>
-          <Text component={TextVariants.small}>{__('N/A')}</Text>
-        </TextContent>
+        Object.keys(genericContentTypes).map(typeCountKey =>
+          genericContentTypes[typeCountKey][0]).reduce((pv, cv) => pv + cv) === 0 &&
+          <TextContent>
+            <Text component={TextVariants.small}>{__('N/A')}</Text>
+          </TextContent>
       )
       }
     </React.Fragment>

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

@@ -13,12 +13,12 @@ const ContentViewVersionEnvironments = ({ environments }) => {
 
   return environments.map(env => (
     <React.Fragment key={env.id}>
-      <Flex>
+      <Flex style={{ margin: '4px 0' }} >
         <FlexItem>
           <Label isTruncated color="purple" href={`/lifecycle_environments/${env.id}`}>{env.name}</Label>
         </FlexItem>
         <FlexItem>
-          <InactiveText text={` ${env.publish_date} ago`} /><br />
+          <InactiveText text={` ${env.publish_date} ago`} />
         </FlexItem>
       </Flex>
     </React.Fragment>));

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

@@ -36,10 +36,12 @@ const ContentViewVersionErrata = ({ cvId, versionId, errataCounts }) => {
   }
 
   return (
-    <React.Fragment>
-      <a href={urlBuilder(`content_views/${cvId}#/versions/${versionId}/errata`, '')}>{`${total || 0} `}</a>
+    <>
+      <a href={urlBuilder(`content_views/${cvId}#/versions/${versionId}/errata`, '')}>
+        {total || 0}{' '}
+      </a>
       ( <ErrataLinkwithIcon /> )
-    </React.Fragment>
+    </>
   );
 };
 

data/webpack/scenes/ContentViews/Details/Versions/ContentViewVersionErrata.scss

@@ -1,8 +1,11 @@
 .errata-icons-with-commas {
+  margin: 0;
+
   &:not(:last-child):after {
     content: ', ';
-    margin-right: 0.5em;
+    margin-right: 4px;
   }
+
   display: inline-flex;
-  margin-left: 0.5em;
+  margin-left: 4px;
 }

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

@@ -7,6 +7,7 @@ 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 TableWrapper from '../../../../components/Table/TableWrapper';
 import InactiveText from '../../components/InactiveText';
@@ -25,6 +26,7 @@ import TaskPresenter from '../../components/TaskPresenter/TaskPresenter';
 import { startPollingTask } 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 +48,7 @@ const ContentViewVersions = ({ cvId, details }) => {
   const [deleteVersion, setDeleteVersion] = useState(false);
   const [currentStep, setCurrentStep] = useState(1);
   const { permissions } = details;
+  const intervals = useSelector(state => selectIntervals(state));
 
   const columnHeaders = [
     __('Version'),
@@ -82,7 +85,7 @@ const ContentViewVersions = ({ cvId, details }) => {
     ];
   }, [cvId]);
 
-  const buildActiveTaskCells = useCallback((cvVersion) => {
+  const buildActiveTaskCells = useCallback((cvVersion, pollIntervals) => {
     const {
       version,
       description,
@@ -91,7 +94,7 @@ const ContentViewVersions = ({ cvId, details }) => {
     } = cvVersion;
     const { task } = activeHistory[0];
     const { result } = task || {};
-    if (result !== 'error') {
+    if (result !== 'error' && !pollIntervals[pollTaskKey(task.id)]) {
       dispatch(startPollingTask(task.id, task));
     }
 
@@ -122,7 +125,7 @@ const ContentViewVersions = ({ cvId, details }) => {
         } = cvVersion;
 
         const cells = activeHistory.length ?
-          buildActiveTaskCells(cvVersion) :
+          buildActiveTaskCells(cvVersion, intervals) :
           buildCells(cvVersion);
         newRows.push({
           cvVersionId: versionId,
@@ -139,7 +142,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);

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>}
     </>
   );
 };