katello 4.3.0.rc1 → 4.3.0.rc4

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

@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
 import PropTypes from 'prop-types';
-import { capitalize, head } from 'lodash';
+import { head } from 'lodash';
 import { Split, SplitItem, GridItem, TextContent, Text, TextVariants, Label } from '@patternfly/react-core';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { useDispatch } from 'react-redux';
@@ -10,6 +10,7 @@ import RepoIcon from '../Repositories/RepoIcon';
 import { repoType } from '../../../../utils/helpers';
 import EditableTextInput from '../../../../components/EditableTextInput';
 import { hasPermission } from '../../helpers';
+import { typeName } from './ContentType';
 
 const ContentViewFilterDetailsHeader = ({
   cvId, filterId, filterDetails, setShowAffectedRepos, details,
@@ -22,11 +23,8 @@ const ContentViewFilterDetailsHeader = ({
   const { permissions } = details;
   const errataByDate = !!(type === 'erratum' && head(rules)?.types);
   const repositoryType = repoType(type);
-  const displayedType = () => {
-    if (errataByDate) return __('Errata - by date range');
-    if (type) return capitalize(type.replace(/_/g, ' '));
-    return '';
-  };
+
+  const displayedType = () => typeName(type, errataByDate);
 
   const onEdit = (val, attribute) => {
     if (val === filterDetails[attribute]) return;
@@ -60,7 +58,7 @@ const ContentViewFilterDetailsHeader = ({
             textArea
             label={__('Description')}
             attribute="description"
-            placeholder={__('No description provided')}
+            placeholder={__('No description')}
             onEdit={onEdit}
             disabled={!hasPermission(permissions, 'edit_content_views')}
             value={description}
@@ -78,7 +76,7 @@ const ContentViewFilterDetailsHeader = ({
         />
       </GridItem>
       <GridItem span={10}>
-        <Split hasGutter>
+        <Split hasGutter style={{ alignItems: 'baseline' }}>
           <SplitItem>
             <Label color="blue">{inclusion ? __('Include') : __('Exclude')}</Label>
           </SplitItem>

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

@@ -21,6 +21,7 @@ import { truncate } from '../../../../utils/helpers';
 import ContentType from './ContentType';
 import CVFilterAddModal from './Add/CVFilterAddModal';
 import { hasPermission } from '../../helpers';
+import InactiveText from '../../components/InactiveText';
 
 const ContentViewFilters = ({ cvId, details }) => {
   const dispatch = useDispatch();
@@ -58,7 +59,11 @@ const ContentViewFilters = ({ cvId, details }) => {
 
       const cells = [
         { title: <Link to={`/filters/${id}`}>{name}</Link> },
-        truncate(description || ''),
+        {
+          title: description ?
+            truncate(description) :
+            <InactiveText text={__('No description')} />,
+        },
         { title: <LongDateTime date={updatedAt} showRelativeTimeTooltip /> },
         { title: <ContentType type={type} errataByDate={errataByDate} /> },
         {

data/webpack/scenes/ContentViews/Details/Filters/Rules/ContainerTag/AddEditContainerTagRuleModal.js

@@ -34,7 +34,7 @@ const AddEditContainerTagRuleModal = ({
 
   return (
     <Modal
-      title={isEditing ? __('Edit rule') : __('Add rule')}
+      title={isEditing ? __('Edit filter rule') : __('Add filter rule')}
       variant={ModalVariant.small}
       isOpen
       onClose={onClose}

data/webpack/scenes/ContentViews/Details/Filters/Rules/Package/AddEditPackageRuleModal.js

@@ -4,7 +4,10 @@ import { useDispatch, useSelector } from 'react-redux';
 import { STATUS } from 'foremanReact/constants';
 import PropTypes from 'prop-types';
 import { translate as __ } from 'foremanReact/common/I18n';
-import { Modal, ModalVariant, Form, FormGroup, TextInput, ActionGroup, Button, Select, SelectOption } from '@patternfly/react-core';
+import {
+  Modal, ModalVariant, Form, FormGroup, TextInput,
+  ActionGroup, Button, FormSelect, FormSelectOption,
+} from '@patternfly/react-core';
 import { addCVFilterRule, editCVFilterRule, getCVFilterRules } from '../../../ContentViewDetailActions';
 import {
   selectCreateFilterRuleStatus,
@@ -23,7 +26,7 @@ const AddEditPackageRuleModal = ({ filterId, onClose, selectedFilterRuleData })
   const isEditing = !!selectedFilterRuleData;
 
   const VersionModifiers = {
-    'All versions': __('All Versions'),
+    'All versions': __('All versions'),
     'Equal to': __('Equal to'),
     'Greater than': __('Greater than'),
     'Less than': __('Less than'),
@@ -48,7 +51,6 @@ const AddEditPackageRuleModal = ({ filterId, onClose, selectedFilterRuleData })
   const [maxVersion, setMaxVersion] = useState(editingMaxVersion || '');
   const [versionComparator, setVersionComparator] = useState(versionText(selectedFilterRuleData));
   const [saving, setSaving] = useState(false);
-  const [versionComparatorSelectOpen, setVersionComparatorSelectOpen] = useState(false);
   const dispatch = useDispatch();
   const status = useSelector(state => selectCreateFilterRuleStatus(state));
 
@@ -62,7 +64,7 @@ const AddEditPackageRuleModal = ({ filterId, onClose, selectedFilterRuleData })
 
   const formVersionParams = () => {
     switch (versionComparator) {
-      case 'All Versions':
+      case 'All versions':
         return {};
       case 'Equal to':
         return { version };
@@ -102,10 +104,6 @@ const AddEditPackageRuleModal = ({ filterId, onClose, selectedFilterRuleData })
       ));
   };
 
-  const onSelect = (_event, selection) => {
-    setVersionComparator(selection);
-    setVersionComparatorSelectOpen(false);
-  };
 
   useDeepCompareEffect(() => {
     if (status === STATUS.ERROR) {
@@ -115,7 +113,7 @@ const AddEditPackageRuleModal = ({ filterId, onClose, selectedFilterRuleData })
 
   return (
     <Modal
-      title={selectedFilterRuleData ? __('Edit package filter rule') : __('Create package filter rule')}
+      title={selectedFilterRuleData ? __('Edit RPM rule') : __('Add RPM rule')}
       variant={ModalVariant.small}
       isOpen
       onClose={onClose}
@@ -148,22 +146,18 @@ const AddEditPackageRuleModal = ({ filterId, onClose, selectedFilterRuleData })
           />
         </FormGroup>
         <FormGroup label={__('Version')} fieldId="version_comparator">
-          <Select
-            selections={versionComparator}
-            onSelect={onSelect}
-            isOpen={versionComparatorSelectOpen}
-            onToggle={isExpanded => setVersionComparatorSelectOpen(isExpanded)}
+          <FormSelect
+            value={versionComparator}
+            onChange={setVersionComparator}
             id="version_comparator"
             name="version_comparator"
             aria-label="version_comparator"
           >
             {
               Object.values(VersionModifiers).map(item => (
-                <SelectOption key={item} value={item}>
-                  {VersionModifiers[item]}
-                </SelectOption>))
+                <FormSelectOption key={item} value={item} label={VersionModifiers[item]} />))
             }
-          </Select>
+          </FormSelect>
         </FormGroup>
         {showVersion &&
           <FormGroup label={__('Version')} fieldId="version">
@@ -177,7 +171,7 @@ const AddEditPackageRuleModal = ({ filterId, onClose, selectedFilterRuleData })
             />
           </FormGroup>}
         {showMinVersion &&
-          <FormGroup label={__('Minimum Version')} fieldId="min_version">
+          <FormGroup label={__('Minimum version')} fieldId="min_version">
             <TextInput
               type="text"
               id="min_version"
@@ -188,7 +182,7 @@ const AddEditPackageRuleModal = ({ filterId, onClose, selectedFilterRuleData })
             />
           </FormGroup>}
         {showMaxVersion &&
-          <FormGroup label={__('Maximum Version')} fieldId="max_version">
+          <FormGroup label={__('Maximum version')} fieldId="max_version">
             <TextInput
               type="text"
               id="max_version"
@@ -200,12 +194,12 @@ const AddEditPackageRuleModal = ({ filterId, onClose, selectedFilterRuleData })
           </FormGroup>}
         <ActionGroup>
           <Button
-            aria-label="create_package_filter_rule"
+            aria-label="add_package_filter_rule"
             variant="primary"
             isDisabled={saving || submitDisabled}
             type="submit"
           >
-            {selectedFilterRuleData ? __('Edit rule') : __('Create rule')}
+            {selectedFilterRuleData ? __('Edit rule') : __('Add rule')}
           </Button>
           <Button variant="link" onClick={onClose}>
             {__('Cancel')}

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

@@ -83,7 +83,7 @@ test('Can show filter details and package groups on page load', async (done) =>
   assertNockRequest(cvFilterScope);
   assertNockRequest(cvFiltersScope);
   assertNockRequest(cvPackageFilterRulesScope, done);
-  await act(() => Promise.resolve());
+  act(done);
 });
 
 test('Can search for package rules in package filter details', async (done) => {
@@ -186,21 +186,21 @@ test('Can add package rules to filter in a self-closing modal', async (done) =>
   expect(queryByText(cvFilterName)).toBeNull();
   await patientlyWaitFor(() => {
     expect(getByText(cvFilterName)).toBeInTheDocument();
-    expect(getByLabelText('create_rpm_rule')).toBeInTheDocument();
+    expect(getByLabelText('add_rpm_rule')).toBeInTheDocument();
   });
-  getByLabelText('create_rpm_rule').click();
+  getByLabelText('add_rpm_rule').click();
   await patientlyWaitFor(() => {
     expect(getByLabelText('input_name')).toBeInTheDocument();
     expect(getByLabelText('input_architecture')).toBeInTheDocument();
-    expect(getByLabelText('create_package_filter_rule')).toBeInTheDocument();
+    expect(getByLabelText('add_package_filter_rule')).toBeInTheDocument();
   });
 
   fireEvent.change(getByLabelText('input_name'), { target: { value: 'elephant' } });
   fireEvent.change(getByLabelText('input_architecture'), { target: { value: 'noarch' } });
-  fireEvent.submit(getByLabelText('create_package_filter_rule'));
+  fireEvent.submit(getByLabelText('add_package_filter_rule'));
 
   await patientlyWaitFor(() => {
-    expect(queryByText('Create rule')).not.toBeInTheDocument();
+    expect(queryByText('Add rule')).not.toBeInTheDocument();
   });
   assertNockRequest(autocompleteScope);
   assertNockRequest(cvFiltersScope);
@@ -307,8 +307,8 @@ test('Edit rpm filter rule in a self-closing modal', async (done) => {
   getByText('Edit').click();
 
   await patientlyWaitFor(() => {
-    expect(getByText('Edit package filter rule')).toBeInTheDocument();
-    fireEvent.submit(getByLabelText('create_package_filter_rule'));
+    expect(getByText('Edit RPM rule')).toBeInTheDocument();
+    fireEvent.submit(getByLabelText('add_package_filter_rule'));
   });
 
   await patientlyWaitFor(() => {

data/webpack/scenes/ContentViews/Details/Filters/__tests__/ContentViewPackageGroupFilter.test.js

@@ -301,10 +301,8 @@ test('Can bulk add filter rules', async (done) => {
     expect(getByLabelText('bulk_actions')).toHaveAttribute('aria-expanded', 'false');
   });
   fireEvent.click(getByLabelText('Select all rows'));
-  fireEvent.click(getByLabelText('bulk_actions'));
-  expect(getByLabelText('bulk_actions')).toHaveAttribute('aria-expanded', 'true');
-  expect(getByLabelText('bulk_add')).toBeInTheDocument();
-  fireEvent.click(getByLabelText('bulk_add'));
+  expect(getByLabelText('add_filter_rule')).toBeInTheDocument();
+  fireEvent.click(getByLabelText('add_filter_rule'));
 
   assertNockRequest(cvFilterScope);
   assertNockRequest(cvFiltersScope);
@@ -439,7 +437,7 @@ test('Can show affected repository tab and remove affected repos', async (done)
     expect(getByText(name)).toBeInTheDocument();
     expect(getByText('Apply to subset of repositories')).toBeInTheDocument();
   });
-  fireEvent.click(getByText('Affected Repositories').closest('button'));
+  fireEvent.click(getByText('Affected repositories').closest('button'));
   await patientlyWaitFor(() => {
     expect(getByText(repoName)).toBeInTheDocument();
   });

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

@@ -141,7 +141,6 @@
           "name": "test_all_types"
         },
         "content_counts": {
-          "ostree_branch": 0,
           "docker_manifest": 0,
           "docker_tag": 0,
           "rpm": 8,
@@ -161,7 +160,6 @@
           "name": "test_all_types"
         },
         "content_counts": {
-          "ostree_branch": 0,
           "docker_manifest": 0,
           "docker_tag": 0,
           "rpm": 8,
@@ -181,7 +179,6 @@
           "name": "test_all_types"
         },
         "content_counts": {
-          "ostree_branch": 0,
           "docker_manifest": 0,
           "docker_tag": 0,
           "rpm": 22,
@@ -201,7 +198,6 @@
           "name": "test_all_types"
         },
         "content_counts": {
-          "ostree_branch": 0,
           "docker_manifest": 1,
           "docker_tag": 1,
           "rpm": 0,
@@ -221,7 +217,6 @@
           "name": "test_all_types"
         },
         "content_counts": {
-          "ostree_branch": 0,
           "docker_manifest": 0,
           "docker_tag": 0,
           "rpm": 0,
@@ -241,7 +236,6 @@
           "name": "test_all_types"
         },
         "content_counts": {
-          "ostree_branch": 0,
           "docker_manifest": 0,
           "docker_tag": 0,
           "rpm": 0,
@@ -261,7 +255,6 @@
           "name": "test_all_types"
         },
         "content_counts": {
-          "ostree_branch": 0,
           "docker_manifest": 0,
           "docker_tag": 0,
           "rpm": 0,
@@ -356,4 +349,4 @@
       "updated_at": "2021-10-06 09:50:25 -0400"
     }
   ]
-}
+}

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

@@ -41,7 +41,6 @@
                "name": "prod1"
             },
             "content_counts": {
-               "ostree_branch": 0,
                "docker_manifest": 0,
                "docker_tag": 0,
                "rpm": 32,
@@ -86,4 +85,4 @@
          "updated_at": "2021-02-23 20:57:19 -0500"
       }
    ]
-}
+}

data/webpack/scenes/ContentViews/Details/Filters/__tests__/contentViewFilterDetails.test.js

@@ -44,11 +44,6 @@ afterEach(() => {
   nock.cleanAll();
 });
 
-jest.mock('../../../../../utils/useDebounce', () => ({
-  __esModule: true,
-  default: value => value,
-}));
-
 test('Can show filter details and package groups on page load', async (done) => {
   const { name: cvFilterName } = cvFilterDetails;
   const cvFilterScope = nockInstance
@@ -64,7 +59,6 @@ test('Can show filter details and package groups on page load', async (done) =>
     .query(true)
     .reply(200, allPackageGroups);
   const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
-
   const { getByText, queryByText } =
     renderWithRedux(withCVRoute(<ContentViewFilterDetails
       cvId={1}
@@ -77,11 +71,12 @@ test('Can show filter details and package groups on page load', async (done) =>
   await patientlyWaitFor(() => {
     expect(getByText(cvFilterName)).toBeInTheDocument();
   });
-  await act(() => Promise.resolve());
+
   assertNockRequest(autocompleteScope);
   assertNockRequest(cvFilterScope);
   assertNockRequest(cvFiltersScope);
   assertNockRequest(packageGroupsScope, done);
+  act(done);
 });
 
 test('Can search for package groups in package group filter', async (done) => {
@@ -109,7 +104,8 @@ test('Can search for package groups in package group filter', async (done) => {
     .query(searchQueryMatcher)
     .reply(200, { results: [lastPackageGroup] });
 
-  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+  const autocompleteScope =
+    mockAutocomplete(nockInstance, autocompleteUrl, undefined, undefined, 2);
   const withSearchScope = mockAutocomplete(nockInstance, autocompleteUrl, searchQueryMatcher);
   const { getByText, queryByText, getByLabelText } =
     renderWithRedux(withCVRoute(<ContentViewFilterDetails
@@ -137,5 +133,5 @@ test('Can search for package groups in package group filter', async (done) => {
   assertNockRequest(packageGroupsScope);
   assertNockRequest(withSearchScope);
   assertNockRequest(packageGroupSearchScope, done);
-  await act(() => Promise.resolve());
+  act(done);
 });

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

@@ -62,7 +62,6 @@
       },
       "content_label": "Default_Organization_yums_test",
       "content_counts": {
-        "ostree_branch": 0,
         "docker_manifest": 0,
         "docker_manifest_list": 0,
         "docker_tag": 0,
@@ -130,7 +129,6 @@
       },
       "content_label": "Default_Organization_test_testYums",
       "content_counts": {
-        "ostree_branch": 0,
         "docker_manifest": 0,
         "docker_manifest_list": 0,
         "docker_tag": 0,

data/webpack/scenes/ContentViews/Details/Filters/__tests__/cvErrataDateFilterContent.test.js

@@ -10,19 +10,12 @@ import CVErrataDateFilterContent from '../CVErrataDateFilterContent';
 import cvFilterDetails from './contentViewErrataByDateDetails.fixtures.json';
 import details from '../../../__tests__/mockDetails.fixtures.json';
 
-const cvFilterDetailsPath = api.getApiUrl('/content_view_filters/36');
-
 const cvErrataDateRuleEditPath = api.getApiUrl('/content_view_filters/36/rules/35');
 
 test('Can display errata-date filter rule and edit', async (done) => {
   const useSelectorMock = jest.spyOn(reactRedux, 'useSelector');
   useSelectorMock.mockReturnValue(cvFilterDetails);
 
-  const cvFilterScope = nockInstance
-    .get(cvFilterDetailsPath)
-    .query(true)
-    .reply(200, cvFilterDetails);
-
   const editDetails = {
     id: 35,
     content_view_filter_id: '36',
@@ -42,7 +35,7 @@ test('Can display errata-date filter rule and edit', async (done) => {
     cvId={1}
     filterId="36"
     showAffectedRepos={false}
-    setShowAffectedRepos={() => {}}
+    setShowAffectedRepos={() => { }}
     details={details}
   />);
 
@@ -70,5 +63,4 @@ test('Can display errata-date filter rule and edit', async (done) => {
 
   useSelectorMock.mockClear();
   assertNockRequest(ruleEditScope, done);
-  assertNockRequest(cvFilterScope, done);
 });

data/webpack/scenes/ContentViews/Details/Filters/__tests__/cvErrataIDFilter.test.js

@@ -317,10 +317,8 @@ test('Can bulk add filter rules', async (done) => {
     expect(getByLabelText('bulk_actions')).toHaveAttribute('aria-expanded', 'false');
   });
   fireEvent.click(getByLabelText('Select all rows'));
-  fireEvent.click(getByLabelText('bulk_actions'));
-  expect(getByLabelText('bulk_actions')).toHaveAttribute('aria-expanded', 'true');
-  expect(getByLabelText('bulk_add')).toBeInTheDocument();
-  fireEvent.click(getByLabelText('bulk_add'));
+  expect(getByLabelText('add_filter_rule')).toBeInTheDocument();
+  fireEvent.click(getByLabelText('add_filter_rule'));
 
   assertNockRequest(autocompleteScope);
   assertNockRequest(cvFilterScope);

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

@@ -41,7 +41,6 @@
                  "name": "prod1"
               },
               "content_counts": {
-                 "ostree_branch": 0,
                  "docker_manifest": 0,
                  "docker_tag": 0,
                  "rpm": 32,
@@ -86,4 +85,4 @@
           "updated_at": "2013-01-27"
        }
     ]
- }
+ }

data/webpack/scenes/ContentViews/Details/Filters/__tests__/cvFilterDetailModuleAffectedRepos.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,
@@ -380,4 +373,4 @@
          "updated_at": "2021-09-07 12:51:46 -0400"
        }
      ]
-}
+}

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__/cvModuleStreamFilter.test.js

@@ -317,10 +317,8 @@ test('Can bulk add filter rules', async (done) => {
     expect(getByLabelText('bulk_actions')).toHaveAttribute('aria-expanded', 'false');
   });
   fireEvent.click(getByLabelText('Select all rows'));
-  fireEvent.click(getByLabelText('bulk_actions'));
-  expect(getByLabelText('bulk_actions')).toHaveAttribute('aria-expanded', 'true');
-  expect(getByLabelText('bulk_add')).toBeInTheDocument();
-  fireEvent.click(getByLabelText('bulk_add'));
+  expect(getByLabelText('add_filter_rule')).toBeInTheDocument();
+  fireEvent.click(getByLabelText('add_filter_rule'));
 
   assertNockRequest(autocompleteScope);
   assertNockRequest(cvFilterScope);

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"
     }
   ]
-}
+}