Menu option to delete collection from all/repo

src/components/delete-modal/delete-collection-modal.tsx

@@ -13,6 +13,7 @@ interface IProps {
   cancelAction: () => void;
   deleteAction: () => void;
   setConfirmDelete: (val) => void;
+  deleteFromRepo: any;
 }
 
 export const DeleteCollectionModal = (props: IProps) => {
@@ -25,6 +26,7 @@ export const DeleteCollectionModal = (props: IProps) => {
     cancelAction,
     deleteAction,
     setConfirmDelete,
+    deleteFromRepo,
   } = props;
 
   return (
@@ -50,6 +52,13 @@ export const DeleteCollectionModal = (props: IProps) => {
                     {deleteCollection.collection_version.name} v
                     {collectionVersion}
                   </b>{' '}
+                  {deleteFromRepo ? (
+                    <>
+                      from repository <b>{deleteFromRepo} </b>
+                    </>
+                  ) : (
+                    <>from the system </>
+                  )}{' '}
                   and its data will be lost and this will cause the entire
                   collection to be deleted.
                 </Trans>
@@ -60,14 +69,28 @@ export const DeleteCollectionModal = (props: IProps) => {
                     {deleteCollection.collection_version.name} v
                     {collectionVersion}
                   </b>{' '}
+                  {deleteFromRepo ? (
+                    <>
+                      from repository <b>{deleteFromRepo} </b>
+                    </>
+                  ) : (
+                    <>from the system </>
+                  )}{' '}
                   and its data will be lost.
                 </Trans>
               )}
             </>
           ) : (
             <Trans>
-              Deleting <b>{deleteCollection.collection_version.name}</b> and its
-              data will be lost.
+              Deleting <b>{deleteCollection.collection_version.name}</b>{' '}
+              {deleteFromRepo ? (
+                <>
+                  from repository <b>{deleteFromRepo} </b>
+                </>
+              ) : (
+                <>from the system </>
+              )}{' '}
+              and its data will be lost.
             </Trans>
           )}
         </Text>

src/components/headers/collection-header.tsx

@@ -103,6 +103,7 @@ interface IState {
   versionToUploadCertificate: CollectionVersionSearch;
   namespace: NamespaceType;
   copyCollectionToRepositoryModal: CollectionVersionSearch;
+  deleteAll: boolean;
 }
 
 export class CollectionHeader extends React.Component<IProps, IState> {
@@ -123,6 +124,7 @@ export class CollectionHeader extends React.Component<IProps, IState> {
         page_size: Constants.DEFAULT_PAGINATION_OPTIONS[0],
       },
       deleteCollection: null,
+      deleteAll: false,
       collectionVersion: null,
       confirmDelete: false,
       alerts: [],
@@ -233,7 +235,14 @@ export class CollectionHeader extends React.Component<IProps, IState> {
       DeleteCollectionUtils.deleteMenuOption({
         canDeleteCollection: hasPermission('ansible.delete_collection'),
         noDependencies,
-        onClick: () => this.openDeleteModalWithConfirm(),
+        onClick: () => this.openDeleteModalWithConfirm(null, true),
+        deleteAll: true,
+      }),
+      DeleteCollectionUtils.deleteMenuOption({
+        canDeleteCollection: hasPermission('ansible.delete_collection'),
+        noDependencies,
+        onClick: () => this.openDeleteModalWithConfirm(null, false),
+        deleteAll: false,
       }),
       hasPermission('ansible.delete_collection') && (
         <DropdownItem
@@ -420,6 +429,9 @@ export class CollectionHeader extends React.Component<IProps, IState> {
                   });
             })
           }
+          deleteFromRepo={
+            this.state.deleteAll ? null : collection.repository.name
+          }
         />
         {copyCollectionToRepositoryModal && (
           <CopyCollectionToRepositoryModal
@@ -1016,11 +1028,12 @@ export class CollectionHeader extends React.Component<IProps, IState> {
     this.setState({ showImportModal: isOpen });
   }
 
-  private openDeleteModalWithConfirm(version = null) {
+  private openDeleteModalWithConfirm(version = null, deleteAll = true) {
     this.setState({
       deleteCollection: this.props.collection,
       collectionVersion: version,
       confirmDelete: false,
+      deleteAll: deleteAll,
     });
   }
 

src/containers/namespace-detail/namespace-detail.tsx

@@ -91,6 +91,7 @@ interface IState {
   showRoleRemoveModal?: string;
   showRoleSelectWizard?: { roles?: RoleType[] };
   group: GroupType;
+  deleteAll: boolean;
 }
 
 export class NamespaceDetail extends React.Component<RouteProps, IState> {
@@ -137,6 +138,7 @@ export class NamespaceDetail extends React.Component<RouteProps, IState> {
       showRoleRemoveModal: null,
       showRoleSelectWizard: null,
       group: null,
+      deleteAll: true,
     };
   }
 
@@ -348,6 +350,9 @@ export class NamespaceDetail extends React.Component<RouteProps, IState> {
               }),
             )
           }
+          deleteFromRepo={
+            this.state.deleteAll ? null : deleteCollection?.repository?.name
+          }
         />
         {isOpenNamespaceModal && (
           <DeleteModal
@@ -977,7 +982,21 @@ export class NamespaceDetail extends React.Component<RouteProps, IState> {
                   addAlert: (alert) => this.addAlert(alert),
                   setState: (state) => this.setState(state),
                   collection,
+                  deleteAll: true,
+                }),
+              deleteAll: true,
+            }),
+            DeleteCollectionUtils.deleteMenuOption({
+              canDeleteCollection: hasPermission('ansible.delete_collection'),
+              noDependencies: null,
+              onClick: () =>
+                DeleteCollectionUtils.tryOpenDeleteModalWithConfirm({
+                  addAlert: (alert) => this.addAlert(alert),
+                  setState: (state) => this.setState(state),
+                  collection,
+                  deleteAll: false,
                 }),
+              deleteAll: false,
             }),
             <DropdownItem
               onClick={() =>

src/containers/search/search.tsx

@@ -65,6 +65,7 @@ interface IState {
   deleteCollection: CollectionVersionSearch;
   confirmDelete: boolean;
   isDeletionPending: boolean;
+  deleteAll: boolean;
 }
 
 class Search extends React.Component<RouteProps, IState> {
@@ -104,6 +105,7 @@ class Search extends React.Component<RouteProps, IState> {
       deleteCollection: null,
       confirmDelete: false,
       isDeletionPending: false,
+      deleteAll: true,
     };
   }
 
@@ -182,6 +184,9 @@ class Search extends React.Component<RouteProps, IState> {
               }),
             )
           }
+          deleteFromRepo={
+            this.state.deleteAll ? null : deleteCollection?.repository?.name
+          }
         />
 
         {showImportModal && (
@@ -376,7 +381,21 @@ class Search extends React.Component<RouteProps, IState> {
             addAlert: (alert) => this.addAlert(alert),
             setState: (state) => this.setState(state),
             collection,
+            deleteAll: true,
+          }),
+        deleteAll: true,
+      }),
+      DeleteCollectionUtils.deleteMenuOption({
+        canDeleteCollection: hasPermission('ansible.delete_collection'),
+        noDependencies: null,
+        onClick: () =>
+          DeleteCollectionUtils.tryOpenDeleteModalWithConfirm({
+            addAlert: (alert) => this.addAlert(alert),
+            setState: (state) => this.setState(state),
+            collection,
+            deleteAll: false,
           }),
+        deleteAll: false,
       }),
       hasPermission('galaxy.upload_to_namespace') && (
         <DropdownItem

src/utilities/delete-collection.tsx

@@ -27,11 +27,16 @@ export class DeleteCollectionUtils {
     canDeleteCollection,
     noDependencies,
     onClick,
+    deleteAll,
   }) {
     if (!canDeleteCollection) {
       return null;
     }
 
+    const caption = deleteAll
+      ? t`Delete entire collection from system`
+      : t`Delete collection from repository`;
+
     if (noDependencies === false) {
       return (
         <Tooltip
@@ -45,7 +50,7 @@ export class DeleteCollectionUtils {
             </Trans>
           }
         >
-          <DropdownItem isDisabled>{t`Delete entire collection`}</DropdownItem>
+          <DropdownItem isDisabled>{caption}</DropdownItem>
         </Tooltip>
       );
     }
@@ -56,7 +61,7 @@ export class DeleteCollectionUtils {
         onClick={onClick}
         data-cy='delete-collection-dropdown'
       >
-        {t`Delete entire collection`}
+        {caption}
       </DropdownItem>
     );
   }
@@ -65,6 +70,7 @@ export class DeleteCollectionUtils {
     addAlert,
     setState,
     collection,
+    deleteAll,
   }) {
     DeleteCollectionUtils.getUsedbyDependencies(collection)
       .then((noDependencies) =>
@@ -73,6 +79,7 @@ export class DeleteCollectionUtils {
           setState,
           noDependencies,
           collection,
+          deleteAll,
         }),
       )
       .catch((alert) => addAlert(alert));
@@ -83,11 +90,13 @@ export class DeleteCollectionUtils {
     setState,
     noDependencies,
     collection,
+    deleteAll,
   }) {
     if (noDependencies) {
       setState({
         deleteCollection: collection,
         confirmDelete: false,
+        deleteAll: deleteAll,
       });
     } else {
       addAlert({
@@ -100,11 +109,6 @@ export class DeleteCollectionUtils {
         ),
         variant: 'warning',
       });
-
-      setState({
-        deleteCollection: collection,
-        confirmDelete: false,
-      });
     }
   }