katello 4.8.4 → 4.9.0.rc1

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

@@ -15,6 +15,7 @@ import { selectCVFilterDetails } from '../ContentViewDetailSelectors';
 import AffectedRepositoryTable from './AffectedRepositories/AffectedRepositoryTable';
 import { editCVFilterRule } from '../ContentViewDetailActions';
 import { hasPermission } from '../../helpers';
+import { CONTENT_VIEW_NEEDS_PUBLISH } from '../../ContentViewsConstants';
 
 export const dateFormat = date => `${(date.getMonth() + 1).toString().padStart(2, '0')}/${date.getDate().toString().padStart(2, '0')}/${date.getFullYear()}`;
 
@@ -68,7 +69,10 @@ const CVErrataDateFilterContent = ({
         types: selectedTypes,
         date_type: dateType,
       },
-      () => push('/filters'),
+      () => {
+        dispatch({ type: CONTENT_VIEW_NEEDS_PUBLISH });
+        push('/filters');
+      },
     ));
   };
 

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

@@ -55,7 +55,6 @@ const CVErrataIDFilterContent = ({
   const filterLoaded = filterLoad === 'RESOLVED';
   const loading = status === STATUS.PENDING;
   const [bulkActionOpen, setBulkActionOpen] = useState(false);
-  const deselectAll = () => setRows(rows.map(row => ({ ...row, selected: false })));
   const toggleBulkAction = () => setBulkActionOpen(prevState => !prevState);
   const hasAddedSelected = rows.some(({ selected, added }) => selected && added);
   const hasNotAddedSelected = rows.some(({ selected, added }) => selected && !added);
@@ -137,7 +136,6 @@ const CVErrataIDFilterContent = ({
       selected && !added).map(({ erratumId }) => ({ errata_ids: [erratumId] })); // eslint-disable-line max-len
     dispatch(addContentViewFilterRules(filterId, addData, () =>
       dispatch(getContentViewDetails(cvId))));
-    deselectAll();
   };
 
   const bulkRemove = () => {
@@ -147,7 +145,6 @@ const CVErrataIDFilterContent = ({
         selected && added).map(({ erratumRuleId }) => erratumRuleId);
     dispatch(deleteContentViewFilterRules(filterId, erratumRuleIds, () =>
       dispatch(getContentViewDetails(cvId))));
-    deselectAll();
   };
 
   useEffect(() => {
@@ -204,6 +201,7 @@ const CVErrataIDFilterContent = ({
       if (selectedTypes.length === 1) return;
       setSelectedTypes(selectedTypes.filter(e => e !== selection));
     } else setSelectedTypes([...selectedTypes, selection]);
+    setTypeSelectOpen(false);
   };
 
   const setValidStartDate = (e, value) => {
@@ -239,8 +237,8 @@ const CVErrataIDFilterContent = ({
     dateType === 'issued' &&
     statusSelected === ALL_STATUSES;
 
-  const emptyContentTitle = __('No errata available to add to this filter.');
-  const emptyContentBody = __('No errata available for this content view.');
+  const emptyContentTitle = __('No errata filter rules yet');
+  const emptyContentBody = __('No errata to add yet');
   const emptySearchTitle = __('No matching filter rules found.');
   const emptySearchBody = __('Try changing your search settings.');
 
@@ -283,56 +281,57 @@ const CVErrataIDFilterContent = ({
               dateType, apiStartDate, apiEndDate]}
             fetchItems={useCallback(params =>
               getCVFilterErrataWithOptions(params), [getCVFilterErrataWithOptions])}
-            actionButtons={
-              <Split hasGutter>
-                <SplitItem data-testid="allAddedNotAdded">
-                  <SelectableDropdown
-                    items={[ALL_STATUSES, ADDED, NOT_ADDED]}
-                    title=""
-                    selected={statusSelected}
-                    setSelected={setStatusSelected}
-                    placeholderText={__('Status')}
-                    aria-label="status_selector"
-                    ouiaId="status-selector"
-                  />
-                </SplitItem>
-                <SplitItem>
-                  <Select
-                    aria-label="errata_type_selector"
-                    ouiaId="errata_type_selector"
-                    variant={SelectVariant.checkbox}
-                    onToggle={setTypeSelectOpen}
-                    onSelect={(_event, selection) => onTypeSelect(selection)}
-                    selections={selectedTypes}
-                    isOpen={typeSelectOpen}
-                    placeholderText={__('Errata type')}
-                    isCheckboxSelectionBadgeHidden
-                  >
-                    <SelectOption aria-label="security_selection" isDisabled={singleSelection('security')} key="security" value="security">
-                      <p style={{ marginTop: '4px' }}>
-                        {__('Security')}
-                      </p>
-                    </SelectOption>
-                    <SelectOption isDisabled={singleSelection('enhancement')} key="enhancement" value="enhancement">
-                      <p style={{ marginTop: '4px' }}>
-                        {__('Enhancement')}
-                      </p>
-                    </SelectOption>
-                    <SelectOption isDisabled={singleSelection('bugfix')} key="bugfix" value="bugfix">
-                      <p style={{ marginTop: '4px' }}>
-                        {__('Bugfix')}
-                      </p>
-                    </SelectOption>
-                  </Select>
-                </SplitItem>
-                {hasPermission(permissions, 'edit_content_views') &&
+            actionButtons={hasPermission(permissions, 'edit_content_views') &&
+                status === STATUS.RESOLVED && rows.length !== 0 &&
+                <Split hasGutter>
+                  <SplitItem data-testid="allAddedNotAdded">
+                    <SelectableDropdown
+                      items={[ALL_STATUSES, ADDED, NOT_ADDED]}
+                      title=""
+                      selected={statusSelected}
+                      setSelected={setStatusSelected}
+                      placeholderText={__('Status')}
+                      aria-label="status_selector"
+                      ouiaId="status-selector"
+                    />
+                  </SplitItem>
+                  <SplitItem>
+                    <Select
+                      aria-label="errata_type_selector"
+                      ouiaId="errata_type_selector"
+                      variant={SelectVariant.checkbox}
+                      onToggle={setTypeSelectOpen}
+                      onSelect={(_event, selection) => onTypeSelect(selection)}
+                      selections={selectedTypes}
+                      isOpen={typeSelectOpen}
+                      placeholderText={__('Errata type')}
+                      isCheckboxSelectionBadgeHidden
+                    >
+                      <SelectOption aria-label="security_selection" isDisabled={singleSelection('security')} key="security" value="security">
+                        <p style={{ marginTop: '4px' }}>
+                          {__('Security')}
+                        </p>
+                      </SelectOption>
+                      <SelectOption isDisabled={singleSelection('enhancement')} key="enhancement" value="enhancement">
+                        <p style={{ marginTop: '4px' }}>
+                          {__('Enhancement')}
+                        </p>
+                      </SelectOption>
+                      <SelectOption isDisabled={singleSelection('bugfix')} key="bugfix" value="bugfix">
+                        <p style={{ marginTop: '4px' }}>
+                          {__('Bugfix')}
+                        </p>
+                      </SelectOption>
+                    </Select>
+                  </SplitItem>
+                  {hasPermission(permissions, 'edit_content_views') &&
                   <SplitItem>
                     <Button ouiaId="add-errata-id-button" isDisabled={!hasNotAddedSelected} onClick={bulkAdd} variant="primary" aria-label="add_filter_rule">
                       {__('Add errata')}
                     </Button>
                   </SplitItem>
                 }
-                {hasPermission(permissions, 'edit_content_views') &&
+                  {hasPermission(permissions, 'edit_content_views') &&
                   <SplitItem>
                     <Dropdown
                       toggle={<KebabToggle aria-label="bulk_actions" onToggle={toggleBulkAction} />}
@@ -347,9 +346,9 @@ const CVErrataIDFilterContent = ({
                     />
                   </SplitItem>
                 }
-              </Split>
+                </Split>
             }
-            nodesBelowSearch={
+            nodesBelowSearch={status === STATUS.RESOLVED && rows.length !== 0 &&
               <>
                 <Flex>
                   <FlexItem span={2} spacer={{ default: 'spacerNone' }}>

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

@@ -194,8 +194,8 @@ const CVModuleStreamFilterContent = ({
     },
   ];
 
-  const emptyContentTitle = __('No rules have been added to this filter.');
-  const emptyContentBody = __("Add to this filter using the 'Add filter rule' button.");
+  const emptyContentTitle = __('No module stream filter rules yet');
+  const emptyContentBody = __('No module streams to add yet.');
   const emptySearchTitle = __('No matching filter rules found.');
   const emptySearchBody = __('Try changing your search settings.');
 
@@ -236,49 +236,50 @@ const CVModuleStreamFilterContent = ({
             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}
-                    ouiaId="added-notAdded-selector"
-                    onSelect={(_event, selection) => {
-                      setSelectedIndex(allAddedNotAdded.indexOf(selection));
-                      setSelectOpen(false);
-                    }}
-                    selections={selectedAdded}
-                    isOpen={selectOpen}
-                    isCheckboxSelectionBadgeHidden
-                  >
-                    {allAddedNotAdded.map(item =>
-                      <SelectOption aria-label={item} key={item} value={item} />)}
-                  </Select>
-                </SplitItem>
-                <SplitItem>
-                  <Button
-                    ouiaId="add-module-stream-rule-button"
-                    isDisabled={!hasNotAddedSelected}
-                    onClick={bulkAdd}
-                    variant="primary"
-                    aria-label="add_filter_rule"
-                  >
-                    {__('Add filter rule')}
-                  </Button>
-                </SplitItem>
-                <SplitItem>
-                  <Dropdown
-                    toggle={<KebabToggle aria-label="bulk_actions" onToggle={toggleBulkAction} />}
-                    isOpen={bulkActionOpen}
-                    ouiaId="bulk-actions-dropdown"
-                    isPlain
-                    dropdownItems={[
-                      <DropdownItem ouiaId="bulk-remove" aria-label="bulk_remove" key="bulk_remove" isDisabled={!hasAddedSelected} component="button" onClick={bulkRemove}>
-                        {__('Remove')}
-                      </DropdownItem>]
+                status === STATUS.RESOLVED && rows.length !== 0 &&
+                <Split hasGutter>
+                  <SplitItem data-testid="allAddedNotAdded">
+                    <Select
+                      variant={SelectVariant.single}
+                      onToggle={setSelectOpen}
+                      ouiaId="added-notAdded-selector"
+                      onSelect={(_event, selection) => {
+                        setSelectedIndex(allAddedNotAdded.indexOf(selection));
+                        setSelectOpen(false);
+                      }}
+                      selections={selectedAdded}
+                      isOpen={selectOpen}
+                      isCheckboxSelectionBadgeHidden
+                    >
+                      {allAddedNotAdded.map(item =>
+                        <SelectOption aria-label={item} key={item} value={item} />)}
+                    </Select>
+                  </SplitItem>
+                  <SplitItem>
+                    <Button
+                      ouiaId="add-module-stream-rule-button"
+                      isDisabled={!hasNotAddedSelected}
+                      onClick={bulkAdd}
+                      variant="primary"
+                      aria-label="add_filter_rule"
+                    >
+                      {__('Add filter rule')}
+                    </Button>
+                  </SplitItem>
+                  <SplitItem>
+                    <Dropdown
+                      toggle={<KebabToggle aria-label="bulk_actions" onToggle={toggleBulkAction} />}
+                      isOpen={bulkActionOpen}
+                      ouiaId="bulk-actions-dropdown"
+                      isPlain
+                      dropdownItems={[
+                        <DropdownItem ouiaId="bulk-remove" aria-label="bulk_remove" key="bulk_remove" isDisabled={!hasAddedSelected} component="button" onClick={bulkRemove}>
+                          {__('Remove')}
+                        </DropdownItem>]
                     }
-                  />
-                </SplitItem>
-              </Split>
+                    />
+                  </SplitItem>
+                </Split>
             }
           />
         </div>

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

@@ -184,8 +184,8 @@ const CVPackageGroupFilterContent = ({
     },
   ];
 
-  const emptyContentTitle = __('No rules have been added to this filter.');
-  const emptyContentBody = __("Add to this filter using the 'Add filter rule' button.");
+  const emptyContentTitle = __('No package groups yet');
+  const emptyContentBody = __('Add repositories with package groups to content view to select them here.');
   const emptySearchTitle = __('No matching filter rules found.');
   const emptySearchBody = __('Try changing your search settings.');
   const resetFilters = () => setSelectedIndex(0);
@@ -226,49 +226,50 @@ 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}
-                    ouiaId="allAddedNotAdded"
-                    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
-                    ouiaId="add-package-group-filter-rule-button"
-                    isDisabled={!hasNotAddedSelected}
-                    onClick={bulkAdd}
-                    variant="primary"
-                    aria-label="add_filter_rule"
-                  >
-                    {__('Add filter rule')}
-                  </Button>
-                </SplitItem>
-                <SplitItem>
-                  <Dropdown
-                    toggle={<KebabToggle aria-label="bulk_actions" onToggle={toggleBulkAction} />}
-                    isOpen={bulkActionOpen}
-                    ouiaId="cv-package-group-filter-bulk-actions-dropdown"
-                    isPlain
-                    dropdownItems={[
-                      <DropdownItem ouiaId="bulk_remove" aria-label="bulk_remove" key="bulk_remove" isDisabled={!hasAddedSelected} component="button" onClick={bulkRemove}>
-                        {__('Remove')}
-                      </DropdownItem>]
+                status === STATUS.RESOLVED && rows.length !== 0 &&
+                <Split hasGutter>
+                  <SplitItem data-testid="allAddedNotAdded">
+                    <Select
+                      variant={SelectVariant.single}
+                      onToggle={setSelectOpen}
+                      ouiaId="allAddedNotAdded"
+                      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
+                      ouiaId="add-package-group-filter-rule-button"
+                      isDisabled={!hasNotAddedSelected}
+                      onClick={bulkAdd}
+                      variant="primary"
+                      aria-label="add_filter_rule"
+                    >
+                      {__('Add filter rule')}
+                    </Button>
+                  </SplitItem>
+                  <SplitItem>
+                    <Dropdown
+                      toggle={<KebabToggle aria-label="bulk_actions" onToggle={toggleBulkAction} />}
+                      isOpen={bulkActionOpen}
+                      ouiaId="cv-package-group-filter-bulk-actions-dropdown"
+                      isPlain
+                      dropdownItems={[
+                        <DropdownItem ouiaId="bulk_remove" aria-label="bulk_remove" key="bulk_remove" isDisabled={!hasAddedSelected} component="button" onClick={bulkRemove}>
+                          {__('Remove')}
+                        </DropdownItem>]
                     }
-                  />
-                </SplitItem>
-              </Split>
+                    />
+                  </SplitItem>
+                </Split>
             }
           />
         </div>

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

@@ -18,6 +18,11 @@ import CVRpmMatchContentModal from './MatchContentModal/CVRpmMatchContentModal';
 import AddEditPackageRuleModal from './Rules/Package/AddEditPackageRuleModal';
 import AffectedRepositoryTable from './AffectedRepositories/AffectedRepositoryTable';
 import { hasPermission } from '../../helpers';
+import { emptyContentTitle,
+  emptyContentBody,
+  emptySearchTitle,
+  emptySearchBody } from './FilterRuleConstants';
+import { CONTENT_VIEW_NEEDS_PUBLISH } from '../../ContentViewsConstants';
 
 const CVRpmFilterContent = ({
   cvId, filterId, inclusion, showAffectedRepos, setShowAffectedRepos, details,
@@ -104,10 +109,6 @@ const CVRpmFilterContent = ({
     }
   }, [showAffectedRepos, repositories.length]);
 
-  const emptyContentTitle = __('No rules have been added to this filter.');
-  const emptyContentBody = __('Items will appear here when a filter rule is added.');
-  const emptySearchTitle = __('No matching rules found.');
-  const emptySearchBody = __('Try changing your search settings.');
   const tabTitle = (inclusion ? __('Included') : __('Excluded')) + __(' RPMs');
 
 
@@ -115,8 +116,10 @@ const CVRpmFilterContent = ({
     {
       title: __('Remove'),
       onClick: (_event, _rowId, { id }) => {
-        dispatch(removeCVFilterRule(filterId, id, () =>
-          dispatch(getCVFilterRules(filterId))));
+        dispatch(removeCVFilterRule(filterId, id, () => {
+          dispatch(getCVFilterRules(filterId));
+          dispatch({ type: CONTENT_VIEW_NEEDS_PUBLISH });
+        }));
       },
     },
     {
@@ -139,8 +142,10 @@ const CVRpmFilterContent = ({
     setBulkActionOpen(false);
     const rpmFilterIds =
       rows.filter(row => row.selected).map(selected => selected.id);
-    dispatch(deleteContentViewFilterRules(filterId, rpmFilterIds, () =>
-      dispatch(getCVFilterRules(filterId))));
+    dispatch(deleteContentViewFilterRules(filterId, rpmFilterIds, () => {
+      dispatch(getCVFilterRules(filterId));
+      dispatch({ type: CONTENT_VIEW_NEEDS_PUBLISH });
+    }));
     deselectAll();
   };
 

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

@@ -20,8 +20,7 @@ import {
 } from '@patternfly/react-core';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { useDispatch } from 'react-redux';
-import {
-  getCVFilterDetails,
+import getContentViewDetails, {
   editCVFilter,
   deleteContentViewFilter,
 } from '../ContentViewDetailActions';
@@ -32,6 +31,7 @@ import { hasPermission } from '../../helpers';
 import { typeName } from './ContentType';
 import ActionableDetail from '../../../../components/ActionableDetail';
 import { ArtifactsWithNoErrataRenderer } from './ArtifactsWithNoErrata';
+import { CONTENT_VIEW_NEEDS_PUBLISH } from '../../ContentViewsConstants';
 
 const ContentViewFilterDetailsHeader = ({
   cvId, filterId, filterDetails, setShowAffectedRepos, details,
@@ -58,7 +58,7 @@ const ContentViewFilterDetailsHeader = ({
       { [attribute]: val },
       () => {
         setLoading(false);
-        dispatch(getCVFilterDetails(cvId, filterId));
+        dispatch(getContentViewDetails(cvId));
       },
       () => setLoading(false),
     ));
@@ -70,6 +70,7 @@ const ContentViewFilterDetailsHeader = ({
       ouiaId="cv-filter-delete"
       onClick={() => {
         dispatch(deleteContentViewFilter(filterId, () => {
+          dispatch({ type: CONTENT_VIEW_NEEDS_PUBLISH });
           push(`/content_views/${cvId}#/filters/`);
         }));
       }}

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

@@ -22,6 +22,7 @@ import ContentType from './ContentType';
 import CVFilterAddModal from './Add/CVFilterAddModal';
 import { hasPermission } from '../../helpers';
 import InactiveText from '../../components/InactiveText';
+import { CONTENT_VIEW_NEEDS_PUBLISH } from '../../ContentViewsConstants';
 
 const ContentViewFilters = ({ cvId, details }) => {
   const dispatch = useDispatch();
@@ -83,6 +84,7 @@ const ContentViewFilters = ({ cvId, details }) => {
     const filterIds = rows.filter(({ selected }) => selected).map(({ id }) => id);
     dispatch(deleteContentViewFilters(cvId, filterIds, () =>
       dispatch(getContentViewFilters(cvId, {}))));
+    dispatch({ type: CONTENT_VIEW_NEEDS_PUBLISH });
   };
 
   useEffect(() => {
@@ -103,12 +105,13 @@ const ContentViewFilters = ({ cvId, details }) => {
       onClick: (_event, _rowId, { id }) => {
         dispatch(deleteContentViewFilter(id, () =>
           dispatch(getContentViewFilters(cvId, {}))));
+        dispatch({ type: CONTENT_VIEW_NEEDS_PUBLISH });
       },
     },
   ];
 
-  const emptyContentTitle = __("You currently don't have any filters for this content view.");
-  const emptyContentBody = __('Filters will appear here when the filter is created.'); // needs link
+  const emptyContentTitle = __('No filters yet');
+  const emptyContentBody = __('To include or exclude specific content from the content view, create a filter. Without filters, the content view includes everything from the added repositories.');
   const emptySearchTitle = __('No matching filters found');
   const emptySearchBody = __('Try changing your search settings.');
   const showPrimaryAction = true;

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

@@ -0,0 +1,6 @@
+import { translate as __ } from 'foremanReact/common/I18n';
+
+export const emptyContentTitle = __('No rules yet');
+export const emptyContentBody = __('To get started, add a filter rule to this filter');
+export const emptySearchTitle = __('No matching filter rules found.');
+export const emptySearchBody = __('Try changing your search settings.');

data/webpack/scenes/ContentViews/Details/Filters/MatchContentModal/CVDebMatchContentModal.js

@@ -35,6 +35,7 @@ const CVDebMatchContentModal = ({ filterId, onClose, filterRuleId }) => {
 
   return (
     <Modal
+      ouiaId="cv-deb-match-content-modal"
       title={__('Matching content')}
       variant={ModalVariant.medium}
       isOpen
@@ -58,7 +59,7 @@ const CVDebMatchContentModal = ({ filterId, onClose, filterRuleId }) => {
         variant={TableVariant.compact}
       >
         <Thead>
-          <Tr>
+          <Tr ouiaId="content-view-deb-match-content-tr">
             {columnHeaders.map(col =>
               <Th key={col}>{col}</Th>)}
           </Tr>
@@ -69,7 +70,7 @@ const CVDebMatchContentModal = ({ filterId, onClose, filterRuleId }) => {
               nva, description = '-', id,
             } = result;
             return (
-              <Tr key={`${nva}_${description}_${id}`}>
+              <Tr key={`${nva}_${description}_${id}`} ouiaId={`${nva}-${id}-tr`}>
                 <Td>
                   <a rel="noreferrer" target="_blank" href={urlBuilder(`debs/${id}`, '')}>{nva}</a>
                 </Td>

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

@@ -6,6 +6,7 @@ import { Modal, ModalVariant, Form, FormGroup, ActionGroup, Button } from '@patt
 import { addCVFilterRule, editCVFilterRule, getCVFilterRules } from '../../../ContentViewDetailActions';
 import { orgId } from '../../../../../../services/api';
 import SearchText from '../../../../../../components/Search/SearchText';
+import { CONTENT_VIEW_NEEDS_PUBLISH } from '../../../../ContentViewsConstants';
 
 const AddEditContainerTagRuleModal = ({
   onClose, filterId, selectedFilterRuleData, repositoryIds,
@@ -24,13 +25,19 @@ const AddEditContainerTagRuleModal = ({
       dispatch(editCVFilterRule(
         filterId,
         { id, name: tagName },
-        () => dispatch(getCVFilterRules(filterId)),
+        () => {
+          dispatch(getCVFilterRules(filterId));
+          dispatch({ type: CONTENT_VIEW_NEEDS_PUBLISH });
+        },
       ));
     } else {
       dispatch(addCVFilterRule(
         filterId,
         { name: tagName },
-        () => dispatch(getCVFilterRules(filterId)),
+        () => {
+          dispatch(getCVFilterRules(filterId));
+          dispatch({ type: CONTENT_VIEW_NEEDS_PUBLISH });
+        },
       ));
     }
     onClose();
@@ -44,6 +51,7 @@ const AddEditContainerTagRuleModal = ({
 
   return (
     <Modal
+      ouiaId="add-edit-container-tag-rule-modal"
       title={isEditing ? __('Edit filter rule') : __('Add filter rule')}
       variant={ModalVariant.small}
       isOpen

data/webpack/scenes/ContentViews/Details/Filters/Rules/DebPackage/AddEditDebPackageRuleModal.js

@@ -60,6 +60,7 @@ const AddEditDebPackageRuleModal = ({ filterId, onClose, selectedFilterRuleData
 
   return (
     <Modal
+      ouiaId="add-edit-deb-filter-rule-modal"
       title={selectedFilterRuleData ? __('Edit package filter rule') : __('Create package filter rule')}
       variant={ModalVariant.small}
       isOpen
@@ -73,6 +74,7 @@ const AddEditDebPackageRuleModal = ({ filterId, onClose, selectedFilterRuleData
       >
         <FormGroup label={__('DEB name')} isRequired fieldId="name">
           <TextInput
+            ouiaId="input-name"
             isRequired
             type="text"
             id="name"
@@ -84,6 +86,7 @@ const AddEditDebPackageRuleModal = ({ filterId, onClose, selectedFilterRuleData
         </FormGroup>
         <FormGroup label={__('Architecture')} fieldId="architecture">
           <TextInput
+            ouiaId="input-architecture"
             type="text"
             id="architecture"
             aria-label="input_architecture"
@@ -94,6 +97,7 @@ const AddEditDebPackageRuleModal = ({ filterId, onClose, selectedFilterRuleData
         </FormGroup>
         <ActionGroup>
           <Button
+            ouiaId="create-deb-package-filter-rule"
             aria-label="create_deb_package_filter_rule"
             variant="primary"
             isDisabled={saving || submitDisabled}
@@ -101,7 +105,7 @@ const AddEditDebPackageRuleModal = ({ filterId, onClose, selectedFilterRuleData
           >
             {selectedFilterRuleData ? __('Edit rule') : __('Create rule')}
           </Button>
-          <Button variant="link" onClick={onClose}>
+          <Button ouiaId="cancel-button" variant="link" onClick={onClose}>
             {__('Cancel')}
           </Button>
         </ActionGroup>