katello 4.8.4 → 4.9.0.rc1

data/webpack/scenes/Content/Table/ContentTable.js

@@ -58,14 +58,14 @@ const ContentTable = ({
       }
     >
       <Thead>
-        <Tr>
+        <Tr ouiaId="content-table-tr">
           {columnHeaders.map(col =>
             <Th key={col.title}>{col.title}</Th>)}
         </Tr>
       </Thead>
       <Tbody>
         {results?.map(details => (
-          <Tr key={details.id}>
+          <Tr key={`${details.id}`} ouiaId={`${details.id}-tr`}>
             {columnHeaders.map((col, index) =>
               <Td key={index}>{col.getProperty(details)}</Td>)
             }

data/webpack/scenes/ContentViews/ContentViewsConstants.js

@@ -17,6 +17,7 @@ export const DELETE_CONTENT_VIEW_FILTERS_KEY = 'CONTENT_VIEW_FILTERS_DELETE';
 export const DELETE_CONTENT_VIEW_FILTER_RULES_KEY = 'CONTENT_VIEW_FILTER_RULES_DELETE';
 export const ADD_CONTENT_VIEW_FILTER_RULES_KEY = 'CONTENT_VIEW_FILTER_RULES_ADD';
 export const PUBLISH_CONTENT_VIEW_KEY = 'CONTENT_VIEW_PUBLISH';
+export const CONTENT_VIEW_VERSION_REPUBLISH_REPO_METADATA_KEY = 'CONTENT_VIEW_VERSION_REPUBLISH_REPO_METADATA';
 export const UPDATE_CONTENT_VIEW = 'UPDATE_CONTENT_VIEW';
 export const UPDATE_CONTENT_VIEW_SUCCESS = 'UPDATE_CONTENT_VIEW_SUCCESS';
 export const UPDATE_CONTENT_VIEW_FAILURE = 'UPDATE_CONTENT_VIEW_FAILURE';
@@ -34,6 +35,8 @@ export const MODULE_STREAMS_CONTENT = 'MODULE_STREAMS_CONTENT';
 export const DEB_PACKAGES_CONTENT = 'DEB_PACKAGES_CONTENT';
 export const RPM_PACKAGES_CONTENT = 'RPM_PACKAGES_CONTENT';
 export const FILE_CONTENT = 'FILE_CONTENT';
+export const CONTENT_VIEW_NEEDS_PUBLISH = 'CV_NEEDS_PUBLISH';
+export const CONTENT_VIEW_NEEDS_PUBLISH_RESET = 'CV_NEEDS_PUBLISH_RESET';
 export const generatedContentKey = pluralLabel => `${toUpper(pluralLabel)}_CONTENT`;
 export const cvDetailsKey = cvId => `${CONTENT_VIEWS_KEY}_${cvId}`;
 export const cvDetailsRepoKey = cvId => `${CONTENT_VIEWS_KEY}_REPOSITORIES_${cvId}`;
@@ -54,6 +57,7 @@ export const bulkRemoveVersionKey = cvId => `BULK_REMOVE_CV_VERSION_${cvId}`;
 export const cvRemoveVersionKey = (versionId, versionEnvironments) => `REMOVE_CV_VERSION_${versionId}_${versionEnvironments.length}`;
 export const cvVersionPromoteKey = (versionId, environmentIds) => `PROMOTE_CONTENT_VIEW_VERSION_${versionId}_${environmentIds.length}`;
 export const cvVersionDetailsKey = (cvId, versionId) => `CONTENT_VIEW_VERSION_DETAILS_${cvId}_${versionId}`;
+export const cvVersionRepublishRepoMetadataKey = (cvId, versionId) => `${CONTENT_VIEW_VERSION_REPUBLISH_REPO_METADATA_KEY}_${cvId}_${versionId}`;
 export const cvVersionPublishKey = (cvId, versionCount) => `${PUBLISH_CONTENT_VIEW_KEY}_${cvId}_VERSION_${versionCount}`;
 export const cvVersionTaskPollingKey = cvId => `CONTENT_VIEW_VERSION_POLLING_${cvId}`;
 export const cvAddComponentKey = cvId => `${CONTENT_VIEWS_KEY}_ADD_COMPONENT_${cvId}`;

data/webpack/scenes/ContentViews/Delete/Steps/CVDeletionReassignActivationKeysForm.js

@@ -10,6 +10,7 @@ import CVDeleteContext from '../CVDeleteContext';
 import EnvironmentPaths from '../../components/EnvironmentPaths/EnvironmentPaths';
 import AffectedActivationKeys from '../../Details/Versions/Delete/affectedActivationKeys';
 import ContentViewSelect from '../../components/ContentViewSelect/ContentViewSelect';
+import { getCVPlaceholderText, shouldDisableCVSelect } from '../../components/ContentViewSelect/helpers';
 
 const CVDeletionReassignActivationKeysForm = () => {
   const dispatch = useDispatch();
@@ -78,6 +79,20 @@ const CVDeletionReassignActivationKeysForm = () => {
     setCVSelectOpen(false);
   };
 
+  const placeholderText = getCVPlaceholderText({
+    contentSourceId: null,
+    environments: selectedEnvForAK,
+    contentViewsStatus: contentViewsInEnvStatus,
+    cvSelectOptions,
+  });
+
+  const disableCVSelect = shouldDisableCVSelect({
+    contentSourceId: null,
+    environments: selectedEnvForAK,
+    contentViewsStatus: contentViewsInEnvStatus,
+    cvSelectOptions,
+  });
+
   return (
     <>
       <EnvironmentPaths
@@ -87,19 +102,17 @@ const CVDeletionReassignActivationKeysForm = () => {
         headerText={__('Select lifecycle environment')}
         multiSelect={false}
       />
-      {!cvInEnvLoading && selectedEnvForAK.length > 0 &&
-        <ContentViewSelect
-          selections={selectedCVForAK}
-          onSelect={onSelect}
-          onClear={onClear}
-          isOpen={cvSelectOpen}
-          isDisabled={cvSelectOptions.length === 0}
-          onToggle={isExpanded => setCVSelectOpen(isExpanded)}
-          placeholderText={(cvSelectOptions.length === 0) ? __('No content views available') : __('Select a content view')}
-        >
-          {cvSelectOptions}
-        </ContentViewSelect>
-      }
+      <ContentViewSelect
+        selections={selectedCVForAK}
+        onSelect={onSelect}
+        onClear={onClear}
+        isOpen={cvSelectOpen}
+        isDisabled={disableCVSelect}
+        onToggle={isExpanded => setCVSelectOpen(isExpanded)}
+        placeholderText={placeholderText}
+      >
+        {cvSelectOptions}
+      </ContentViewSelect>
       <ExpandableSection
         toggleText={showActivationKeys ?
           'Hide activation keys' :

data/webpack/scenes/ContentViews/Delete/Steps/CVDeletionReassignHostsForm.js

@@ -10,6 +10,7 @@ import CVDeleteContext from '../CVDeleteContext';
 import EnvironmentPaths from '../../components/EnvironmentPaths/EnvironmentPaths';
 import AffectedHosts from '../../Details/Versions/Delete/affectedHosts';
 import ContentViewSelect from '../../components/ContentViewSelect/ContentViewSelect';
+import { getCVPlaceholderText, shouldDisableCVSelect } from '../../components/ContentViewSelect/helpers';
 
 
 const CVDeletionReassignHostsForm = () => {
@@ -79,6 +80,21 @@ const CVDeletionReassignHostsForm = () => {
     setCVSelectOpen(false);
   };
 
+  const placeholderText = getCVPlaceholderText({
+    contentSourceId: null,
+    environments: selectedEnvForHost,
+    contentViewsStatus: contentViewsInEnvStatus,
+    cvSelectOptions,
+  });
+
+  const disableCVSelect = shouldDisableCVSelect({
+    contentSourceId: null,
+    environments: selectedEnvForHost,
+    contentViewsStatus: contentViewsInEnvStatus,
+    cvSelectOptions,
+  });
+
+
   return (
     <>
       <EnvironmentPaths
@@ -88,19 +104,17 @@ const CVDeletionReassignHostsForm = () => {
         headerText={__('Select lifecycle environment')}
         multiSelect={false}
       />
-      {selectedEnvForHost.length > 0 &&
-        <ContentViewSelect
-          selections={selectedCVForHosts}
-          onSelect={onSelect}
-          onClear={onClear}
-          isOpen={cvSelectOpen}
-          isDisabled={cvSelectOptions.length === 0}
-          onToggle={isExpanded => setCVSelectOpen(isExpanded)}
-          placeholderText={(cvSelectOptions.length === 0) ? __('No content views available') : __('Select a content view')}
-        >
-          {cvSelectOptions}
-        </ContentViewSelect>
-      }
+      <ContentViewSelect
+        selections={selectedCVForHosts}
+        onSelect={onSelect}
+        onClear={onClear}
+        isOpen={cvSelectOpen}
+        isDisabled={disableCVSelect}
+        onToggle={isExpanded => setCVSelectOpen(isExpanded)}
+        placeholderText={placeholderText}
+      >
+        {cvSelectOptions}
+      </ContentViewSelect>
       <ExpandableSection
         toggleText={showHosts ? 'Hide hosts' : 'Show hosts'}
         onToggle={expanded => setShowHosts(expanded)}

data/webpack/scenes/ContentViews/Delete/__tests__/cvVersionsData.fixtures.json

@@ -261,7 +261,8 @@
       },
       "permissions": {
         "deletable": true
-      }
+      },
+      "filters_applied": true
     },
     {
       "version": "3.0",
@@ -531,7 +532,8 @@
       },
       "permissions": {
         "deletable": true
-      }
+      },
+      "filters_applied": true
     },
     {
       "version": "2.0",
@@ -693,7 +695,8 @@
       },
       "permissions": {
         "deletable": true
-      }
+      },
+      "filters_applied": true
     },
     {
       "version": "1.0",
@@ -855,7 +858,8 @@
       },
       "permissions": {
         "deletable": true
-      }
+      },
+      "filters_applied": true
     }
   ]
 }

data/webpack/scenes/ContentViews/Details/ComponentContentViews/ComponentContentViewAddModal.js

@@ -15,6 +15,7 @@ import {
   selectCVDetailError,
 } from '../../Details/ContentViewDetailSelectors';
 import { addComponent } from '../ContentViewDetailActions';
+import { CONTENT_VIEW_NEEDS_PUBLISH } from '../../ContentViewsConstants';
 
 const ComponentContentViewAddModal = ({
   cvId, componentCvId, componentId, latest, show, setIsOpen,
@@ -73,12 +74,12 @@ const ComponentContentViewAddModal = ({
       dispatch(addComponent({
         compositeContentViewId: cvId,
         components: getUpdateParams(),
-      }));
+      }, () => dispatch({ type: CONTENT_VIEW_NEEDS_PUBLISH })));
     } else {
       dispatch(addComponent({
         compositeContentViewId: cvId,
         components: getAddParams(),
-      }));
+      }, () => dispatch({ type: CONTENT_VIEW_NEEDS_PUBLISH })));
     }
     setIsOpen(false);
   };

data/webpack/scenes/ContentViews/Details/ComponentContentViews/ComponentEnvironments.js

@@ -10,7 +10,7 @@ const ComponentEnvironments = ({ environments }) => environments.map((env, index
     href={`/lifecycle_environments/${env.id}`}
     isTruncated
   >
-    {env.name}
+    {`${env.name}`}
   </Label>
 ));
 

data/webpack/scenes/ContentViews/Details/ComponentContentViews/ContentViewComponents.js

@@ -30,7 +30,7 @@ import AddedStatusLabel from '../../../../components/AddedStatusLabel';
 import ComponentVersion from './ComponentVersion';
 import ComponentEnvironments from './ComponentEnvironments';
 import ContentViewIcon from '../../components/ContentViewIcon';
-import { ADDED, ALL_STATUSES, NOT_ADDED } from '../../ContentViewsConstants';
+import { ADDED, ALL_STATUSES, CONTENT_VIEW_NEEDS_PUBLISH, NOT_ADDED } from '../../ContentViewsConstants';
 import SelectableDropdown from '../../../../components/SelectableDropdown/SelectableDropdown';
 import '../../../../components/EditableTextInput/editableTextInput.scss';
 import ComponentContentViewAddModal from './ComponentContentViewAddModal';
@@ -73,7 +73,7 @@ const ContentViewComponents = ({ cvId, details }) => {
   const addComponentsResolved = componentAddedStatus === STATUS.RESOLVED;
   const removeComponentsResolved = componentRemovedStatus === STATUS.RESOLVED;
 
-  const { label, permissions } = details || {};
+  const { permissions } = details || {};
 
   const bulkRemoveEnabled = () => rows.some(row => row.selected && row.added);
   const bulkAddEnabled = () => rows.some(row => row.selected && !row.added);
@@ -92,7 +92,7 @@ const ContentViewComponents = ({ cvId, details }) => {
       dispatch(addComponent({
         compositeContentViewId: cvId,
         components: [{ latest: true, content_view_id: componentCvId }],
-      }));
+      }, () => dispatch({ type: CONTENT_VIEW_NEEDS_PUBLISH })));
     }
   }, [cvId, dispatch]);
 
@@ -102,7 +102,7 @@ const ContentViewComponents = ({ cvId, details }) => {
     dispatch(removeComponent({
       compositeContentViewId: cvId,
       component_ids: componentIds,
-    }));
+    }, () => dispatch({ type: CONTENT_VIEW_NEEDS_PUBLISH })));
   };
 
   const addBulk = () => {
@@ -116,7 +116,7 @@ const ContentViewComponents = ({ cvId, details }) => {
     dispatch(removeComponent({
       compositeContentViewId: cvId,
       component_ids: [componentIdToRemove],
-    }));
+    }, () => dispatch({ type: CONTENT_VIEW_NEEDS_PUBLISH })));
   };
 
   const toggleBulkAction = () => {
@@ -216,8 +216,8 @@ const ContentViewComponents = ({ cvId, details }) => {
     </DropdownItem>,
   ];
 
-  const emptyContentTitle = __(`No content views belong to ${label}`);
-  const emptyContentBody = __('Please add some content views.');
+  const emptyContentTitle = __('No content views to add yet');
+  const emptyContentBody = __('Please create some content views.');
   const emptySearchTitle = __('No matching content views found');
   const emptySearchBody = __('Try changing your search settings.');
   const activeFilters = [statusSelected];
@@ -257,19 +257,20 @@ const ContentViewComponents = ({ cvId, details }) => {
       fetchItems={useCallback(params =>
         getContentViewComponents(cvId, params, statusSelected), [cvId, statusSelected])}
       additionalListeners={[statusSelected, addComponentsResolved, removeComponentsResolved]}
-      actionButtons={
-        <>
-          <Split hasGutter>
-            <SplitItem>
-              <SelectableDropdown
-                items={[ALL_STATUSES, ADDED, NOT_ADDED]}
-                title={__('Status')}
-                selected={statusSelected}
-                setSelected={setStatusSelected}
-                placeholderText={__('Status')}
-              />
-            </SplitItem>
-            {hasPermission(permissions, 'edit_content_views') &&
+      actionButtons={hasPermission(permissions, 'edit_content_views') &&
+          status === STATUS.RESOLVED && rows.length !== 0 &&
+          <>
+            <Split hasGutter>
+              <SplitItem>
+                <SelectableDropdown
+                  items={[ALL_STATUSES, ADDED, NOT_ADDED]}
+                  title={__('Status')}
+                  selected={statusSelected}
+                  setSelected={setStatusSelected}
+                  placeholderText={__('Status')}
+                />
+              </SplitItem>
+              {hasPermission(permissions, 'edit_content_views') &&
               <SplitItem>
                 <ActionList>
                   <ActionListItem>
@@ -289,8 +290,8 @@ const ContentViewComponents = ({ cvId, details }) => {
                 </ActionList>
               </SplitItem>
             }
-          </Split>
-          {versionEditing &&
+            </Split>
+            {versionEditing &&
             <ComponentContentViewAddModal
               cvId={compositeCvEditing}
               componentCvId={componentCvEditing}
@@ -300,14 +301,14 @@ const ContentViewComponents = ({ cvId, details }) => {
               setIsOpen={setVersionEditing}
               aria-label="edit_component_modal"
             />}
-          {bulkAdding &&
+            {bulkAdding &&
             <ComponentContentViewBulkAddModal
               cvId={compositeCvEditing}
               rowsToAdd={selectedComponentsToAdd}
               onClose={() => setBulkAdding(false)}
               aria-label="bulk_add_components_modal"
             />}
-        </>
+          </>
       }
     />
   );

data/webpack/scenes/ContentViews/Details/ComponentContentViews/__tests__/contentViewComponents.test.js

@@ -179,7 +179,7 @@ test('Can handle no components being present', async (done) => {
     renderWithRedux(<ContentViewComponents cvId={4} details={mockDetails} />, renderOptions);
 
   expect(queryByText(firstComponent.content_view.label)).toBeNull();
-  await patientlyWaitFor(() => expect(queryByText('No content views belong to test_empty')).toBeInTheDocument());
+  await patientlyWaitFor(() => expect(queryByText('No content views to add yet')).toBeInTheDocument());
   assertNockRequest(autocompleteScope);
   assertNockRequest(scope, done);
 });

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

@@ -37,6 +37,7 @@ import {
   addComponentSuccessMessage,
   removeComponentSuccessMessage,
   cvVersionPromoteKey,
+  cvVersionRepublishRepoMetadataKey,
   cvFilterRepoKey,
   cvVersionDetailsKey,
   cvRemoveVersionKey,
@@ -229,29 +230,32 @@ export const updateContentView = (cvId, params, handleSuccess) => put({
   },
 });
 
-export const addComponent = params => put({
+export const addComponent = (params, handleSuccess) => put({
   type: API_OPERATIONS.PUT,
   key: cvAddComponentKey(params.compositeContentViewId),
   url: api.getApiUrl(`/content_views/${params.compositeContentViewId}/content_view_components/${params.components.id ? params.components.id : 'add'}`),
   params: params.components.id ? params.components : params,
+  handleSuccess,
   successToast: () => addComponentSuccessMessage(params.components.id),
   errorToast: error => __(`Something went wrong while adding component! ${getResponseErrorMsgs(error.response)}`),
 });
 
-export const removeComponent = params => put({
+export const removeComponent = (params, handleSuccess) => put({
   type: API_OPERATIONS.PUT,
   key: cvRemoveComponentKey(params.compositeContentViewId),
   url: api.getApiUrl(`/content_views/${params.compositeContentViewId}/content_view_components/remove`),
   params,
+  handleSuccess,
   successToast: () => removeComponentSuccessMessage(params.component_ids.length),
   errorToast: error => __(`Something went wrong while removing component! ${getResponseErrorMsgs(error.response)}`),
 });
 
-export const createContentViewFilter = (cvId, params) => post({
+export const createContentViewFilter = (cvId, params, handleSuccess) => post({
   type: API_OPERATIONS.POST,
   key: CREATE_CONTENT_VIEW_FILTER_KEY,
   url: api.getApiUrl(`/content_view_filters?content_view_id=${cvId}`),
   params,
+  handleSuccess,
   successToast: () => __('Filter created'),
   errorToast: error => __(`Something went wrong while creating the filter! ${getResponseErrorMsgs(error.response)}`),
 });
@@ -584,4 +588,16 @@ export const promoteContentViewVersion = (params, handleSuccess) => post({
   errorToast: error => cvErrorToast(error),
 });
 
+export const republishCVVRepoMetadata = (params, handleSuccess) => put({
+  type: API_OPERATIONS.PUT,
+  key: cvVersionRepublishRepoMetadataKey(params.cvId, params.id),
+  url: api.getApiUrl(`/content_view_versions/${params.id}/republish_repositories`),
+  params: { ...params, force: true },
+  handleSuccess: (response) => {
+    if (handleSuccess) return handleSuccess();
+    return renderTaskStartedToast(response.data);
+  },
+  errorToast: error => cvErrorToast(error),
+});
+
 export default getContentViewDetails;

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

@@ -3,6 +3,8 @@ import {
   UPDATE_CONTENT_VIEW,
   UPDATE_CONTENT_VIEW_FAILURE,
   UPDATE_CONTENT_VIEW_SUCCESS,
+  CONTENT_VIEW_NEEDS_PUBLISH,
+  CONTENT_VIEW_NEEDS_PUBLISH_RESET,
 } from '../ContentViewsConstants';
 
 const initialState = Immutable({
@@ -17,6 +19,10 @@ export default (state = initialState, action) => {
     return state.merge({ updating: false });
   case UPDATE_CONTENT_VIEW_FAILURE:
     return state.set('updating', false);
+  case CONTENT_VIEW_NEEDS_PUBLISH:
+    return state.set('needsPublish', true);
+  case CONTENT_VIEW_NEEDS_PUBLISH_RESET:
+    return state.set('needsPublish', false);
   default:
     return state;
   }

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

@@ -389,3 +389,5 @@ export const selectRemoveCVVersionError = (state, versionId, versionEnvironments
 
 
 export const selectIsCVUpdating = state => state.katello?.contentViewDetails?.updating;
+
+export const selectCVNeedsPublish = state => state.katello?.contentViewDetails?.needsPublish;

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

@@ -14,7 +14,7 @@ import { selectCreateContentViewFilter, selectCreateContentViewFilterStatus,
   selectCreateContentViewFilterError, selectCreateFilterRule,
   selectCreateFilterRuleError, selectCreateFilterRuleStatus,
   selectRepoTypes, selectRepoTypesStatus } from '../../../Details/ContentViewDetailSelectors';
-import { FILTER_TYPES } from '../../../ContentViewsConstants';
+import { CONTENT_VIEW_NEEDS_PUBLISH, FILTER_TYPES } from '../../../ContentViewsConstants';
 import ContentType from '../ContentType';
 
 const CVFilterAddModal = ({ cvId, onClose }) => {
@@ -46,7 +46,7 @@ const CVFilterAddModal = ({ cvId, onClose }) => {
       cvId,
       {
         name, description, inclusion, type,
-      },
+      }, () => dispatch({ type: CONTENT_VIEW_NEEDS_PUBLISH }),
     ));
   };
 

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

@@ -28,6 +28,7 @@ import TableWrapper from '../../../../../components/Table/TableWrapper';
 import RepoIcon from '../../Repositories/RepoIcon';
 import SelectableDropdown from '../../../../../components/SelectableDropdown/SelectableDropdown';
 import { hasPermission } from '../../../helpers';
+import { CONTENT_VIEW_NEEDS_PUBLISH } from '../../../ContentViewsConstants';
 
 const allProducts = 'All products';
 
@@ -131,6 +132,7 @@ const AffectedRepositoryTable = ({
       filterId,
       { id: filterId, repository_ids: repositoryIds.concat(repos) }, () => {
         dispatch(getCVFilterDetails(cvId, filterId));
+        dispatch({ type: CONTENT_VIEW_NEEDS_PUBLISH });
       },
     ));
   };
@@ -142,7 +144,10 @@ const AffectedRepositoryTable = ({
     dispatch(editCVFilter(
       filterId,
       { id: filterId, repository_ids: deletedRepos },
-      () => dispatch(getCVFilterDetails(cvId, filterId, {})),
+      () => {
+        dispatch(getCVFilterDetails(cvId, filterId, {}));
+        dispatch({ type: CONTENT_VIEW_NEEDS_PUBLISH });
+      },
     ));
     if (deletedRepos.length === 0) setShowAffectedRepos(false);
   };
@@ -182,7 +187,14 @@ const AffectedRepositoryTable = ({
     setProductSelected(allProducts);
   };
   const dropdownItems = [
-    <DropdownItem aria-label="bulk_remove" key="bulk_remove" isDisabled={!hasAddedSelected} component="button" onClick={removeBulk}>
+    <DropdownItem
+      ouiaId="bulk-remove-dropdown-item"
+      aria-label="bulk_remove"
+      key="bulk_remove"
+      isDisabled={!hasAddedSelected}
+      component="button"
+      onClick={removeBulk}
+    >
       {__('Remove')}
     </DropdownItem>,
   ];
@@ -234,6 +246,7 @@ const AffectedRepositoryTable = ({
                   </ActionListItem>
                   <ActionListItem>
                     <Dropdown
+                      ouiaId="bulk-actions-dropdown"
                       toggle={<KebabToggle aria-label="bulk_actions" onToggle={toggleBulkAction} />}
                       isOpen={bulkActionOpen}
                       isPlain

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

@@ -4,6 +4,7 @@ import PropTypes from 'prop-types';
 import { Switch } from '@patternfly/react-core';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { editCVFilter } from '../ContentViewDetailActions';
+import { CONTENT_VIEW_NEEDS_PUBLISH } from '../../ContentViewsConstants';
 
 export const ArtifactsWithNoErrataRenderer = ({ filterDetails }) => {
   const dispatch = useDispatch();
@@ -18,7 +19,10 @@ export const ArtifactsWithNoErrataRenderer = ({ filterDetails }) => {
   const setArtifactsNoErrata = (checked) => {
     enableArtifactsNoErrata(checked);
     setLoading(true);
-    dispatch(editCVFilter(id, { [artifactAttribute]: checked }, () => setLoading(false)));
+    dispatch(editCVFilter(id, { [artifactAttribute]: checked }, () => {
+      setLoading(false);
+      dispatch({ type: CONTENT_VIEW_NEEDS_PUBLISH });
+    }));
   };
   const getLabel = () => {
     switch (true) {

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

@@ -28,11 +28,11 @@ import { deleteContentViewFilterRules, getCVFilterRules, removeCVFilterRule } fr
 import AddEditContainerTagRuleModal from './Rules/ContainerTag/AddEditContainerTagRuleModal';
 import AffectedRepositoryTable from './AffectedRepositories/AffectedRepositoryTable';
 import { hasPermission } from '../../helpers';
-
-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 filter rules found.');
-const emptySearchBody = __('Try changing your search settings.');
+import { emptyContentTitle,
+  emptyContentBody,
+  emptySearchTitle,
+  emptySearchBody } from './FilterRuleConstants';
+import { CONTENT_VIEW_NEEDS_PUBLISH } from '../../ContentViewsConstants';
 
 const CVContainerImageFilterContent = ({
   cvId, filterId, showAffectedRepos, setShowAffectedRepos, details,
@@ -80,8 +80,10 @@ const CVContainerImageFilterContent = ({
     setBulkActionOpen(false);
     const tagFilterIds =
       rows.filter(row => row.selected).map(selected => selected.id);
-    dispatch(deleteContentViewFilterRules(filterId, tagFilterIds, () =>
-      dispatch(getCVFilterRules(filterId))));
+    dispatch(deleteContentViewFilterRules(filterId, tagFilterIds, () => {
+      dispatch(getCVFilterRules(filterId));
+      dispatch({ type: CONTENT_VIEW_NEEDS_PUBLISH });
+    }));
     deselectAll();
   };
 
@@ -111,8 +113,10 @@ const CVContainerImageFilterContent = ({
     {
       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 });
+        }));
       },
     },
     {

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

@@ -18,6 +18,10 @@ import CVDebMatchContentModal from './MatchContentModal/CVDebMatchContentModal';
 import AddEditDebPackageRuleModal from './Rules/DebPackage/AddEditDebPackageRuleModal';
 import AffectedRepositoryTable from './AffectedRepositories/AffectedRepositoryTable';
 import { hasPermission } from '../../helpers';
+import { emptyContentTitle,
+  emptyContentBody,
+  emptySearchTitle,
+  emptySearchBody } from './FilterRuleConstants';
 
 const CVDebFilterContent = ({
   cvId, filterId, inclusion, showAffectedRepos, setShowAffectedRepos, details,
@@ -104,10 +108,6 @@ const CVDebFilterContent = ({
     }
   }, [showAffectedRepos, repositories.length]);
 
-  const emptyContentTitle = __('No rules have been added to this filter.');
-  const emptyContentBody = __("Add to this filter using the 'Add Deb rule' button.");
-  const emptySearchTitle = __('No matching rules found.');
-  const emptySearchBody = __('Try changing your search settings.');
   const tabTitle = (inclusion ? __('Included') : __('Excluded')) + __(' DEBs');
 
 
@@ -184,17 +184,30 @@ const CVDebFilterContent = ({
                   />}
                 <Split hasGutter>
                   <SplitItem>
-                    <Button onClick={() => setModalOpen(true)} variant="secondary" aria-label="create_deb_rule">
+                    <Button
+                      ouiaId="create-deb-rule-button"
+                      onClick={() => setModalOpen(true)}
+                      variant="secondary"
+                      aria-label="create_deb_rule"
+                    >
                       {__('Add DEB rule')}
                     </Button>
                   </SplitItem>
                   <SplitItem>
                     <Dropdown
+                      ouiaId="bulk-actions-dropdown"
                       toggle={<KebabToggle aria-label="bulk_actions" onToggle={toggleBulkAction} />}
                       isOpen={bulkActionOpen}
                       isPlain
                       dropdownItems={[
-                        <DropdownItem aria-label="bulk_remove" key="bulk_remove" isDisabled={!hasSelected} component="button" onClick={bulkRemove}>
+                        <DropdownItem
+                          ouiaId="bulk-remove-dropdown-item"
+                          aria-label="bulk_remove"
+                          key="bulk_remove"
+                          isDisabled={!hasSelected}
+                          component="button"
+                          onClick={bulkRemove}
+                        >
                           {__('Remove')}
                         </DropdownItem>]
                       }