katello 4.3.0.rc1 → 4.3.0.rc4

data/webpack/scenes/ContentViews/Details/ContentViewDetailActions.js

@@ -211,7 +211,7 @@ export const editCVFilter = (filterId, params, handleSuccess) => put({
   url: api.getApiUrl(`/content_view_filters/${filterId}`),
   params,
   handleSuccess,
-  successToast: () => __('Filter edited successfully'),
+  successToast: () => __('Filter edited'),
   errorToast: error => __(`Something went wrong while editing the filter! ${getResponseErrorMsgs(error.response)}`),
 });
 
@@ -249,7 +249,7 @@ export const deleteContentViewFilters = (cvId, ids, handleSuccess) => put({
   url: api.getApiUrl(`/content_views/${cvId}/remove_filters`),
   params: { filter_ids: ids },
   handleSuccess,
-  successToast: () => __('Filters successfully deleted'),
+  successToast: () => __('Filters deleted'),
   errorToast: error => __(`Something went wrong while deleting filters! ${getResponseErrorMsgs(error.response)}`),
 });
 
@@ -259,7 +259,7 @@ export const deleteContentViewFilterRules = (filterId, ids, handleSuccess) => pu
   url: api.getApiUrl(`/content_view_filters/${filterId}/remove_filter_rules`),
   params: { rule_ids: ids },
   handleSuccess,
-  successToast: () => __('Filter rules successfully deleted'),
+  successToast: () => __('Filter rules deleted'),
   errorToast: error => __(`Something went wrong while deleting filter rules! ${getResponseErrorMsgs(error.response)}`),
 });
 
@@ -269,7 +269,7 @@ export const addContentViewFilterRules = (filterId, rulesParams, handleSuccess)
   url: api.getApiUrl(`/content_view_filters/${filterId}/add_filter_rules`),
   params: { rules_params: rulesParams },
   handleSuccess,
-  successToast: () => __('Filter rules successfully added'),
+  successToast: () => __('Filter rules added'),
   errorToast: error => __(`Something went wrong while adding filter rules! ${getResponseErrorMsgs(error.response)}`),
 });
 
@@ -278,7 +278,7 @@ export const deleteContentViewFilter = (filterId, handleSuccess) => APIActions.d
   key: DELETE_CONTENT_VIEW_FILTER_KEY,
   url: api.getApiUrl(`/content_view_filters/${filterId}`),
   handleSuccess,
-  successToast: () => __('Filter successfully deleted'),
+  successToast: () => __('Filter deleted'),
   errorToast: error => __(`Something went wrong while deleting this filter! ${getResponseErrorMsgs(error.response)}`),
 });
 
@@ -336,7 +336,7 @@ export const editCVFilterRule = (filterId, params, handleSuccess) => put({
   url: api.getApiUrl(`/content_view_filters/${filterId}/rules/${params.id}`),
   params,
   handleSuccess,
-  successToast: () => __('Filter rule edited successfully'),
+  successToast: () => __('Filter rule edited'),
   errorToast: error => __(`Something went wrong while editing a filter rule! ${getResponseErrorMsgs(error.response)}`),
 });
 
@@ -346,7 +346,7 @@ export const addCVFilterRule = (filterId, params, handleSuccess) => post({
   url: api.getApiUrl(`/content_view_filters/${filterId}/rules`),
   params,
   handleSuccess,
-  successToast: () => __('Filter rule added successfully'),
+  successToast: () => __('Filter rule added'),
   errorToast: error => __(`Something went wrong while adding a filter rule! ${getResponseErrorMsgs(error.response)}`),
 });
 
@@ -356,7 +356,7 @@ export const removeCVFilterRule = (filterId, packageGroupFilterId, handleSuccess
     key: REMOVE_CONTENT_VIEW_FILTER_RULE,
     url: api.getApiUrl(`/content_view_filters/${filterId}/rules/${packageGroupFilterId}`),
     handleSuccess,
-    successToast: () => __('Filter rule removed successfully'),
+    successToast: () => __('Filter rule removed'),
     errorToast: error => __(`Something went wrong while removing a filter rule! ${getResponseErrorMsgs(error.response)}`),
   });
 

data/webpack/scenes/ContentViews/Details/ContentViewDetails.js

@@ -1,7 +1,18 @@
 import React, { useState } from 'react';
 import { useSelector, shallowEqual } from 'react-redux';
 import { useParams } from 'react-router-dom';
-import { Grid, GridItem, TextContent, Text, TextVariants, Button, Flex, FlexItem } from '@patternfly/react-core';
+import { Grid,
+  GridItem,
+  TextContent,
+  Text,
+  TextVariants,
+  Button,
+  Flex,
+  FlexItem,
+  Dropdown,
+  DropdownItem,
+  KebabToggle,
+  DropdownPosition } from '@patternfly/react-core';
 import { ExternalLinkAltIcon } from '@patternfly/react-icons';
 import { translate as __ } from 'foremanReact/common/I18n';
 
@@ -18,6 +29,8 @@ import ContentViewIcon from '../components/ContentViewIcon';
 import CVBreadCrumb from '../components/CVBreadCrumb';
 import PublishContentViewWizard from '../Publish/PublishContentViewWizard';
 import { hasPermission } from '../helpers';
+import CopyContentViewModal from '../Copy/CopyContentViewModal';
+import ContentViewDeleteWizard from '../Delete/ContentViewDeleteWizard';
 
 export default () => {
   const { id } = useParams();
@@ -25,8 +38,31 @@ export default () => {
   const details = useSelector(state => selectCVDetails(state, cvId), shallowEqual);
   const [isPublishModalOpen, setIsPublishModalOpen] = useState(false);
   const [currentStep, setCurrentStep] = useState(1);
+  const [dropDownOpen, setDropdownOpen] = useState(false);
+  const [copying, setCopying] = useState(false);
+  const [deleting, setDeleting] = useState(false);
+  const dropDownItems = [
+    <DropdownItem
+      key="copy"
+      onClick={() => {
+        setCopying(true);
+      }}
+    >
+      {__('Copy')}
+    </DropdownItem>,
+    <DropdownItem
+      key="delete"
+      onClick={() => {
+        setDeleting(true);
+      }}
+    >
+      {__('Delete')}
+    </DropdownItem>,
+  ];
 
-  const { name, composite, permissions } = details;
+  const {
+    name, composite, permissions, environments, versions,
+  } = details;
   const tabs = [
     {
       key: 'details',
@@ -60,25 +96,28 @@ export default () => {
   ];
 
   return (
-    <Grid className="grid-with-margin">
-      <DetailsContainer cvId={cvId}>
-        <React.Fragment>
-          <CVBreadCrumb />
-          <GridItem xl={8} lg={7} sm={12} >
-            <Flex>
-              <FlexItem>
-                <TextContent>
-                  <Text component={TextVariants.h1}>{`${name} content view`}</Text>
-                </TextContent>
-              </FlexItem>
-              <FlexItem spacer={{ default: 'spacerXl' }}>
-                <Text component={TextVariants.h1}><ContentViewIcon composite={composite} /></Text>
-              </FlexItem>
-            </Flex>
-          </GridItem>
-          <GridItem xl={4} lg={5} sm={12} >
-            <Flex justifyContent={{ lg: 'justifyContentFlexEnd', sm: 'justifyContentFlexStart' }}>
-              {hasPermission(permissions, 'publish_content_views') &&
+    <>
+      <Grid className="grid-with-margin">
+        <DetailsContainer cvId={cvId}>
+          <>
+            <CVBreadCrumb />
+            <GridItem xl={8} lg={7} sm={12} style={{ margin: '10px 0' }}>
+              <Flex alignItems={{
+              default: 'alignItemsCenter',
+            }}
+              >
+                <FlexItem>
+                  <TextContent>
+                    <Text component={TextVariants.h1}>
+                      <ContentViewIcon count={name} composite={composite} />
+                    </Text>
+                  </TextContent>
+                </FlexItem>
+              </Flex>
+            </GridItem>
+            <GridItem xl={4} lg={5} sm={12} >
+              <Flex justifyContent={{ lg: 'justifyContentFlexEnd', sm: 'justifyContentFlexStart' }}>
+                {hasPermission(permissions, 'publish_content_views') &&
                 <FlexItem>
                   <Button onClick={() => { setIsPublishModalOpen(true); }} variant="primary" aria-label="publish_content_view">
                     {__('Publish new version')}
@@ -93,25 +132,53 @@ export default () => {
                   />}
                 </FlexItem>
               }
-              <FlexItem>
-                <Button
-                  component="a"
-                  aria-label="view tasks button"
-                  href={`/foreman_tasks/tasks?search=resource_type%3D+Katello%3A%3AContentView+resource_id%3D${cvId}`}
-                  target="_blank"
-                  variant="secondary"
-                >
-                  {'View tasks '}
-                  <ExternalLinkAltIcon />
-                </Button>
-              </FlexItem>
-            </Flex>
-          </GridItem>
-          <GridItem span={12}>
-            <RoutedTabs tabs={tabs} defaultTabIndex={1} />
-          </GridItem>
-        </React.Fragment>
-      </DetailsContainer>
-    </Grid>
+                <FlexItem>
+                  <Button
+                    component="a"
+                    aria-label="view tasks button"
+                    href={`/foreman_tasks/tasks?search=resource_type%3D+Katello%3A%3AContentView+resource_id%3D${cvId}`}
+                    target="_blank"
+                    variant="secondary"
+                  >
+                    {'View tasks '}
+                    <ExternalLinkAltIcon />
+                  </Button>
+                </FlexItem>
+                <FlexItem>
+                  <Dropdown
+                    position={DropdownPosition.right}
+                    style={{ marginLeft: 'auto' }}
+                    toggle={<KebabToggle onToggle={setDropdownOpen} id="toggle-dropdown" />}
+                    isOpen={dropDownOpen}
+                    isPlain
+                    dropdownItems={dropDownItems}
+                  />
+                </FlexItem>
+              </Flex>
+            </GridItem>
+            <GridItem span={12}>
+              <RoutedTabs tabs={tabs} defaultTabIndex={1} />
+            </GridItem>
+          </ >
+        </DetailsContainer >
+      </Grid >
+      {copying && <CopyContentViewModal
+        cvId={cvId}
+        cvName={name}
+        show={copying}
+        setIsOpen={setCopying}
+        aria-label="copy_content_view_modal"
+      />}
+      {deleting && <ContentViewDeleteWizard
+        cvId={cvId && Number(cvId)}
+        cvEnvironments={environments}
+        cvVersions={versions}
+        show={deleting}
+        setIsOpen={setDeleting}
+        currentStep={currentStep}
+        setCurrentStep={setCurrentStep}
+        aria-label="delete_content_view_modal"
+      />}
+    </>
   );
 };

data/webpack/scenes/ContentViews/Details/ContentViewInfo.js

@@ -70,8 +70,9 @@ const ContentViewInfo = ({ cvId, details }) => {
         </TextListItem>
         <TextListItem component={TextListItemVariants.dd} className="foreman-spaced-list">
           <Flex>
-            <FlexItem spacer={{ default: 'spacerXs' }}><ContentViewIcon composite={composite} /></FlexItem>
-            <FlexItem>{composite ? 'Composite' : 'Component'}</FlexItem>
+            <FlexItem spacer={{ default: 'spacerXs' }}>
+              <ContentViewIcon composite={composite} description={composite ? __('Composite') : __('Component')} />
+            </FlexItem>
           </Flex>
         </TextListItem>
         <ActionableDetail

data/webpack/scenes/ContentViews/Details/Filters/Add/CVFilterAddModal.js

@@ -127,7 +127,7 @@ const CVFilterAddModal = ({ cvId, onClose }) => {
                 isChecked={inclusion}
                 name="radio-1"
                 onChange={checked => setInclusion(checked)}
-                label="Include Filter"
+                label={__('Include filter')}
                 id="include_filter"
                 value="includeFilter"
                 style={{ margin: '1px' }}
@@ -138,7 +138,7 @@ const CVFilterAddModal = ({ cvId, onClose }) => {
                 isChecked={!inclusion}
                 name="radio-1"
                 onChange={checked => setInclusion(!checked)}
-                label="Exclude Filter"
+                label={__('Exclude filter')}
                 id="exclude_filter"
                 value="excludeFilter"
                 style={{ margin: '1px' }}

data/webpack/scenes/ContentViews/Details/Filters/Add/__tests__/cvFilterCreateResult.fixtures.json

@@ -76,7 +76,6 @@
           "name": "test1"
         },
         "content_counts": {
-          "ostree_branch": 0,
           "docker_manifest": 0,
           "docker_tag": 0,
           "rpm": 8,
@@ -121,4 +120,4 @@
   "repositories": [],
   "type": "package_group",
   "rules": []
-}
+}

data/webpack/scenes/ContentViews/Details/Filters/AffectedRepositories/AffectedRepositoryTable.js

@@ -179,9 +179,6 @@ const AffectedRepositoryTable = ({
   const activeFilters = [productSelected];
   const defaultFilters = [allProducts];
   const dropdownItems = [
-    <DropdownItem aria-label="bulk_add" key="bulk_add" isDisabled={!hasNotAddedSelected} component="button" onClick={addBulk}>
-      {__('Add')}
-    </DropdownItem>,
     <DropdownItem aria-label="bulk_remove" key="bulk_remove" isDisabled={!hasAddedSelected} component="button" onClick={removeBulk}>
       {__('Remove')}
     </DropdownItem>,
@@ -226,7 +223,7 @@ const AffectedRepositoryTable = ({
                 <ActionList>
                   <ActionListItem>
                     <Button onClick={addBulk} isDisabled={!hasNotAddedSelected} variant="secondary" aria-label="add_repositories">
-                      Add repositories
+                      {__('Add repositories')}
                     </Button>
                   </ActionListItem>
                   <ActionListItem>

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

@@ -173,11 +173,11 @@ const CVContainerImageFilterContent = ({
         </div>
       </Tab>
       {(repositories.length || showAffectedRepos) &&
-      <Tab eventKey={1} title={<TabTitleText>{__('Affected Repositories')}</TabTitleText>}>
-        <div className="tab-body-with-spacing">
-          <AffectedRepositoryTable cvId={cvId} filterId={filterId} repoType="docker" setShowAffectedRepos={setShowAffectedRepos} details={details} />
-        </div>
-      </Tab>
+        <Tab eventKey={1} title={<TabTitleText>{__('Affected repositories')}</TabTitleText>}>
+          <div className="tab-body-with-spacing">
+            <AffectedRepositoryTable cvId={cvId} filterId={filterId} repoType="docker" setShowAffectedRepos={setShowAffectedRepos} details={details} />
+          </div>
+        </Tab>
       }
     </Tabs>
   );
@@ -197,6 +197,6 @@ CVContainerImageFilterContent.defaultProps = {
   cvId: '',
   filterId: '',
   showAffectedRepos: false,
-  setShowAffectedRepos: () => {},
+  setShowAffectedRepos: () => { },
 };
 export default CVContainerImageFilterContent;

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

@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import { isEqual, sortBy, capitalize } from 'lodash';
 import { shallowEqual, useSelector, useDispatch } from 'react-redux';
-import { Link } from 'react-router-dom';
+import { Link, useHistory } from 'react-router-dom';
 import {
   Tooltip, Form, ActionGroup, Flex, FlexItem, Select,
   SelectOption, SelectVariant, ChipGroup, Chip,
@@ -12,7 +12,7 @@ import { OutlinedQuestionCircleIcon } from '@patternfly/react-icons';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { selectCVFilterDetails } from '../ContentViewDetailSelectors';
 import AffectedRepositoryTable from './AffectedRepositories/AffectedRepositoryTable';
-import { editCVFilterRule, getCVFilterDetails } from '../ContentViewDetailActions';
+import { editCVFilterRule } from '../ContentViewDetailActions';
 import { hasPermission } from '../../helpers';
 
 export const dateFormat = date => `${(date.getMonth() + 1).toString().padStart(2, '0')}/${date.getDate().toString().padStart(2, '0')}/${date.getFullYear()}`;
@@ -37,6 +37,7 @@ export const isValidDate = date => date instanceof Date && !Number.isNaN(date.ge
 const CVErrataDateFilterContent = ({
   cvId, filterId, inclusion, showAffectedRepos, setShowAffectedRepos, details,
 }) => {
+  const { push } = useHistory();
   const filterDetails = useSelector(state =>
     selectCVFilterDetails(state, cvId, filterId), shallowEqual);
   const { repositories = [], rules } = filterDetails;
@@ -64,7 +65,7 @@ const CVErrataDateFilterContent = ({
         types: selectedTypes,
         date_type: dateType,
       },
-      () => dispatch(getCVFilterDetails(cvId, filterId)),
+      () => push('/filters'),
     ));
   };
 
@@ -236,7 +237,12 @@ const CVErrataDateFilterContent = ({
               </FlexItem>
               {hasPermission(permissions, 'edit_content_views') &&
                 <FlexItem>
-                  <Button variant="link" onClick={resetFilters} isInline>
+                  <Button
+                    disabled={saveDisabled}
+                    variant="link"
+                    onClick={resetFilters}
+                    isInline
+                  >
                     {__('Reset filters')}
                   </Button>
                 </FlexItem>
@@ -263,7 +269,7 @@ const CVErrataDateFilterContent = ({
         </div>
       </Tab>
       {(repositories.length || showAffectedRepos) &&
-        <Tab eventKey={1} title={<TabTitleText>{__('Affected Repositories')}</TabTitleText>}>
+        <Tab eventKey={1} title={<TabTitleText>{__('Affected repositories')}</TabTitleText>}>
           <div className="tab-body-with-spacing">
             <AffectedRepositoryTable cvId={cvId} filterId={filterId} repoType="yum" setShowAffectedRepos={setShowAffectedRepos} details={details} />
           </div>

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

@@ -317,13 +317,10 @@ const CVErrataIDFilterContent = ({
                       isOpen={bulkActionOpen}
                       isPlain
                       dropdownItems={[
-                        <DropdownItem aria-label="bulk_add" key="bulk_add" isDisabled={!hasNotAddedSelected} component="button" onClick={bulkAdd}>
-                          {__('Add')}
-                        </DropdownItem>,
                         <DropdownItem aria-label="bulk_remove" key="bulk_remove" isDisabled={!hasAddedSelected} component="button" onClick={bulkRemove}>
                           {__('Remove')}
                         </DropdownItem>]
-                    }
+                      }
                     />
                   </SplitItem>
                 }
@@ -418,11 +415,11 @@ const CVErrataIDFilterContent = ({
         </div>
       </Tab>
       {(repositories.length || showAffectedRepos) &&
-      <Tab eventKey={1} title={<TabTitleText>{__('Affected Repositories')}</TabTitleText>}>
-        <div className="tab-body-with-spacing">
-          <AffectedRepositoryTable cvId={cvId} filterId={filterId} repoType="yum" setShowAffectedRepos={setShowAffectedRepos} details={details} />
-        </div>
-      </Tab>
+        <Tab eventKey={1} title={<TabTitleText>{__('Affected repositories')}</TabTitleText>}>
+          <div className="tab-body-with-spacing">
+            <AffectedRepositoryTable cvId={cvId} filterId={filterId} repoType="yum" setShowAffectedRepos={setShowAffectedRepos} details={details} />
+          </div>
+        </Tab>
       }
     </Tabs>
   );

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

@@ -259,9 +259,6 @@ const CVModuleStreamFilterContent = ({
                     isOpen={bulkActionOpen}
                     isPlain
                     dropdownItems={[
-                      <DropdownItem aria-label="bulk_add" key="bulk_add" isDisabled={!hasNotAddedSelected} component="button" onClick={bulkAdd}>
-                        {__('Add')}
-                      </DropdownItem>,
                       <DropdownItem aria-label="bulk_remove" key="bulk_remove" isDisabled={!hasAddedSelected} component="button" onClick={bulkRemove}>
                         {__('Remove')}
                       </DropdownItem>]
@@ -279,11 +276,11 @@ const CVModuleStreamFilterContent = ({
         </div>
       </Tab>
       {(repositories.length || showAffectedRepos) &&
-      <Tab eventKey={1} title={<TabTitleText>{__('Affected Repositories')}</TabTitleText>}>
-        <div className="tab-body-with-spacing">
-          <AffectedRepositoryTable cvId={cvId} filterId={filterId} repoType="yum" setShowAffectedRepos={setShowAffectedRepos} details={details} />
-        </div>
-      </Tab>
+        <Tab eventKey={1} title={<TabTitleText>{__('Affected repositories')}</TabTitleText>}>
+          <div className="tab-body-with-spacing">
+            <AffectedRepositoryTable cvId={cvId} filterId={filterId} repoType="yum" setShowAffectedRepos={setShowAffectedRepos} details={details} />
+          </div>
+        </Tab>
       }
     </Tabs >
   );

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

@@ -216,54 +216,51 @@ const CVPackageGroupFilterContent = ({
             actionResolver={hasPermission(permissions, 'edit_content_views') ? actionResolver : null}
             onSelect={hasPermission(permissions, 'edit_content_views') ? onSelect(rows, setRows) : null}
             actionButtons={hasPermission(permissions, 'edit_content_views') &&
-            <Split hasGutter>
-              <SplitItem data-testid="allAddedNotAdded">
-                <Select
-                  variant={SelectVariant.single}
-                  onToggle={setSelectOpen}
-                  onSelect={(_event, selection) => {
-                    setSelectedIndex(allAddedNotAdded.indexOf(selection));
-                    setSelectOpen(false);
-                  }}
-                  selections={allAddedNotAdded[selectedIndex]}
-                  isOpen={selectOpen}
-                  isCheckboxSelectionBadgeHidden
-                >
-                  {allAddedNotAdded.map(item =>
-                    <SelectOption aria-label={item} key={item} value={item} />)}
-                </Select>
-              </SplitItem>
-              <SplitItem>
-                <Button isDisabled={!hasNotAddedSelected} onClick={bulkAdd} variant="secondary" aria-label="add_filter_rule">
-                  {__('Add filter rule')}
-                </Button>
-              </SplitItem>
-              <SplitItem>
-                <Dropdown
-                  toggle={<KebabToggle aria-label="bulk_actions" onToggle={toggleBulkAction} />}
-                  isOpen={bulkActionOpen}
-                  isPlain
-                  dropdownItems={[
-                    <DropdownItem aria-label="bulk_add" key="bulk_add" isDisabled={!hasNotAddedSelected} component="button" onClick={bulkAdd}>
-                      {__('Add')}
-                    </DropdownItem>,
-                    <DropdownItem aria-label="bulk_remove" key="bulk_remove" isDisabled={!hasAddedSelected} component="button" onClick={bulkRemove}>
-                      {__('Remove')}
-                    </DropdownItem>]
-                  }
-                />
-              </SplitItem>
-            </Split>
+              <Split hasGutter>
+                <SplitItem data-testid="allAddedNotAdded">
+                  <Select
+                    variant={SelectVariant.single}
+                    onToggle={setSelectOpen}
+                    onSelect={(_event, selection) => {
+                      setSelectedIndex(allAddedNotAdded.indexOf(selection));
+                      setSelectOpen(false);
+                    }}
+                    selections={allAddedNotAdded[selectedIndex]}
+                    isOpen={selectOpen}
+                    isCheckboxSelectionBadgeHidden
+                  >
+                    {allAddedNotAdded.map(item =>
+                      <SelectOption aria-label={item} key={item} value={item} />)}
+                  </Select>
+                </SplitItem>
+                <SplitItem>
+                  <Button isDisabled={!hasNotAddedSelected} onClick={bulkAdd} variant="secondary" aria-label="add_filter_rule">
+                    {__('Add filter rule')}
+                  </Button>
+                </SplitItem>
+                <SplitItem>
+                  <Dropdown
+                    toggle={<KebabToggle aria-label="bulk_actions" onToggle={toggleBulkAction} />}
+                    isOpen={bulkActionOpen}
+                    isPlain
+                    dropdownItems={[
+                      <DropdownItem aria-label="bulk_remove" key="bulk_remove" isDisabled={!hasAddedSelected} component="button" onClick={bulkRemove}>
+                        {__('Remove')}
+                      </DropdownItem>]
+                    }
+                  />
+                </SplitItem>
+              </Split>
             }
           />
         </div>
       </Tab>
       {(repositories.length || showAffectedRepos) &&
-      <Tab eventKey={1} title={<TabTitleText>{__('Affected Repositories')}</TabTitleText>}>
-        <div className="tab-body-with-spacing">
-          <AffectedRepositoryTable cvId={cvId} filterId={filterId} repoType="yum" setShowAffectedRepos={setShowAffectedRepos} details={details} />
-        </div>
-      </Tab>
+        <Tab eventKey={1} title={<TabTitleText>{__('Affected repositories')}</TabTitleText>}>
+          <div className="tab-body-with-spacing">
+            <AffectedRepositoryTable cvId={cvId} filterId={filterId} repoType="yum" setShowAffectedRepos={setShowAffectedRepos} details={details} />
+          </div>
+        </Tab>
       }
     </Tabs>
   );

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

@@ -179,7 +179,7 @@ const CVRpmFilterContent = ({
                 {hasPermission(permissions, 'edit_content_views') &&
                   <Split hasGutter>
                     <SplitItem>
-                      <Button onClick={() => setModalOpen(true)} variant="secondary" aria-label="create_rpm_rule">
+                      <Button onClick={() => setModalOpen(true)} variant="secondary" aria-label="add_rpm_rule">
                         {__('Add RPM rule')}
                       </Button>
                     </SplitItem>
@@ -213,7 +213,7 @@ const CVRpmFilterContent = ({
         </div>
       </Tab>
       {(repositories.length || showAffectedRepos) &&
-        <Tab eventKey={1} title={<TabTitleText>{__('Affected Repositories')}</TabTitleText>}>
+        <Tab eventKey={1} title={<TabTitleText>{__('Affected repositories')}</TabTitleText>}>
           <div className="tab-body-with-spacing">
             <AffectedRepositoryTable cvId={cvId} filterId={filterId} repoType="yum" setShowAffectedRepos={setShowAffectedRepos} details={details} />
           </div>

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

@@ -5,18 +5,18 @@ import { translate as __ } from 'foremanReact/common/I18n';
 import RepoIcon from '../Repositories/RepoIcon';
 import { capitalize, repoType } from '../../../../utils/helpers';
 
-const typeName = (type, errataByDate) => {
+export const typeName = (type, errataByDate) => {
   if (errataByDate) return 'Errata - by date range';
   const nameMap = {
     rpm: __('RPM'),
     docker: __('Container image tag'),
     modulemd: __('Module stream'),
     erratum: __('Errata'),
-    erratum_date: __('Errata - Date and Type'),
-    erratum_id: __('Errata - Id'),
+    erratum_date: __('Errata - by date range'),
+    erratum_id: __('Errata'),
   };
 
-  if (Object.prototype.hasOwnProperty.call(nameMap, type)) return nameMap[type];
+  if (type in nameMap) return nameMap[type];
   return capitalize(type.replace('_', ' '));
 };