ContentViewComponents.js in katello-4.10.0.rc1

- old
+ new

@@ -52,10 +52,11 @@
   const [versionEditing, setVersionEditing] = useState(false);
   const [compositeCvEditing, setCompositeCvEditing] = useState(null);
   const [componentCvEditing, setComponentCvEditing] = useState(null);
   const [componentLatest, setComponentLatest] = useState(false);
   const [componentId, setComponentId] = useState(null);
+  const [componentVersionId, setComponentVersionId] = useState(null);
   const [selectedComponentsToAdd, setSelectedComponentsToAdd] = useState(null);
   const [bulkAdding, setBulkAdding] = useState(false);
   const [bulkActionOpen, setBulkActionOpen] = useState(false);
   const dispatch = useDispatch();
   const resetFilters = () => setStatusSelected(ALL_STATUSES);
@@ -84,10 +85,15 @@
     if (published) { // If 1 or more versions present, open a modal to let user select version
       dispatch(getContentViewDetails(componentCvId, 'bulk_add'));
       setVersionEditing(true);
       setCompositeCvEditing(cvId);
       setComponentCvEditing(componentCvId);
+      if (added) {
+        setComponentVersionId(published?.id);
+      } else {
+        setComponentVersionId(null);
+      }
       setComponentLatest(latest);
       setComponentId(added);
     } else { // if no versions are present, default to always latest and add cv without modal
       dispatch(addComponent({
         compositeContentViewId: cvId,
@@ -295,9 +301,10 @@
             <ComponentContentViewAddModal
               cvId={compositeCvEditing}
               componentCvId={componentCvEditing}
               componentId={componentId}
               latest={componentLatest}
+              componentVersionId={componentVersionId}
               show={versionEditing}
               setIsOpen={setVersionEditing}
               aria-label="edit_component_modal"
             />}
             {bulkAdding &&