Fixes #36492 - duplicate content warning for composite CVs for non-do…

…cker repos
Katello · Oct 5, 2023 · 7bb76f2 · 7bb76f2
1 parent 7089672
commit 7bb76f2
Show file tree

Hide file tree

Showing 9 changed files with 501 additions and 17 deletions.
diff --git a/app/views/katello/api/v2/content_views/base.json.rabl b/app/views/katello/api/v2/content_views/base.json.rabl
@@ -2,7 +2,7 @@ extends 'katello/api/v2/common/identifier'
 extends 'katello/api/v2/common/org_reference'
 
 attributes :composite
-attributes :component_ids
+attributes :component_ids, :duplicate_repositories_to_publish
 attributes :default
 attributes :version_count
 attributes :latest_version, :latest_version_id

diff --git a/webpack/scenes/ContentViews/Details/ComponentContentViews/ComponentContentViewAddModal.js b/webpack/scenes/ContentViews/Details/ComponentContentViews/ComponentContentViewAddModal.js
@@ -13,8 +13,7 @@ import {
   selectCVDetails,
   selectCVDetailStatus,
 } from '../../Details/ContentViewDetailSelectors';
-import { addComponent } from '../ContentViewDetailActions';
-import { CONTENT_VIEW_NEEDS_PUBLISH } from '../../ContentViewsConstants';
+import getContentViewDetails, { addComponent } from '../ContentViewDetailActions';
 
 const ComponentContentViewAddModal = ({
   cvId, componentCvId, componentId, latest, componentVersionId, show, setIsOpen,
@@ -67,12 +66,12 @@ const ComponentContentViewAddModal = ({
       dispatch(addComponent({
         compositeContentViewId: cvId,
         components: getUpdateParams(),
-      }, () => dispatch({ type: CONTENT_VIEW_NEEDS_PUBLISH })));
+      }, () => dispatch(getContentViewDetails(cvId))));
     } else {
       dispatch(addComponent({
         compositeContentViewId: cvId,
         components: getAddParams(),
-      }, () => dispatch({ type: CONTENT_VIEW_NEEDS_PUBLISH })));
+      }, () => dispatch(getContentViewDetails(cvId))));
     }
     setIsOpen(false);
   };

diff --git a/...ack/scenes/ContentViews/Details/ComponentContentViews/ComponentContentViewBulkAddModal.js b/...ack/scenes/ContentViews/Details/ComponentContentViews/ComponentContentViewBulkAddModal.js
@@ -8,7 +8,7 @@ import {
 import { OutlinedQuestionCircleIcon } from '@patternfly/react-icons';
 import { useDispatch } from 'react-redux';
 import { translate as __ } from 'foremanReact/common/I18n';
-import { addComponent } from '../ContentViewDetailActions';
+import getContentViewDetails, { addComponent } from '../ContentViewDetailActions';
 
 const ComponentContentViewBulkAddModal = ({ cvId, rowsToAdd, onClose }) => {
   const dispatch = useDispatch();
@@ -37,7 +37,7 @@ const ComponentContentViewBulkAddModal = ({ cvId, rowsToAdd, onClose }) => {
     dispatch(addComponent({
       compositeContentViewId: cvId,
       components: bulkAddParams(),
-    }));
+    }, () => dispatch(getContentViewDetails(cvId))));
     onClose();
   };
 

diff --git a/webpack/scenes/ContentViews/Details/ComponentContentViews/ContentViewComponents.js b/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, CONTENT_VIEW_NEEDS_PUBLISH, NOT_ADDED } from '../../ContentViewsConstants';
+import { ADDED, ALL_STATUSES, NOT_ADDED } from '../../ContentViewsConstants';
 import SelectableDropdown from '../../../../components/SelectableDropdown/SelectableDropdown';
 import '../../../../components/EditableTextInput/editableTextInput.scss';
 import ComponentContentViewAddModal from './ComponentContentViewAddModal';
@@ -98,7 +98,7 @@ const ContentViewComponents = ({ cvId, details }) => {
       dispatch(addComponent({
         compositeContentViewId: cvId,
         components: [{ latest: true, content_view_id: componentCvId }],
-      }, () => dispatch({ type: CONTENT_VIEW_NEEDS_PUBLISH })));
+      }, () => dispatch(getContentViewDetails(cvId))));
     }
   }, [cvId, dispatch]);
 
@@ -108,7 +108,7 @@ const ContentViewComponents = ({ cvId, details }) => {
     dispatch(removeComponent({
       compositeContentViewId: cvId,
       component_ids: componentIds,
-    }, () => dispatch({ type: CONTENT_VIEW_NEEDS_PUBLISH })));
+    }, () => dispatch(getContentViewDetails(cvId))));
   };
 
   const addBulk = () => {
@@ -122,7 +122,7 @@ const ContentViewComponents = ({ cvId, details }) => {
     dispatch(removeComponent({
       compositeContentViewId: cvId,
       component_ids: [componentIdToRemove],
-    }, () => dispatch({ type: CONTENT_VIEW_NEEDS_PUBLISH })));
+    }, () => dispatch(getContentViewDetails(cvId))));
   };
 
   const toggleBulkAction = () => {