Fixes #37758 - Delete host redirects to hosts list based on setting

theforeman · Jan 30, 2025 · 07ff0b6 · 07ff0b6
1 parent 74ddd88
commit 07ff0b6
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 6 deletions.
diff --git a/webpack/assets/javascripts/react_app/components/HostDetails/ActionsBar/actions.js b/webpack/assets/javascripts/react_app/components/HostDetails/ActionsBar/actions.js
@@ -12,7 +12,8 @@ import { POWER_REQURST_KEY } from '../DetailsCard/PowerStatus/constants';
 export const deleteHost = (
   hostName,
   compute,
-  destroyVmOnHostDelete
+  destroyVmOnHostDelete,
+  hostsIndexUrl
 ) => dispatch => {
   const successToast = () => sprintf(__('Host %s deleted'), hostName);
   const errorToast = ({ message }) => message;
@@ -44,7 +45,7 @@ export const deleteHost = (
             key: `${hostName}-DELETE`,
             successToast,
             errorToast,
-            handleSuccess: () => visit(foremanUrl('/hosts')),
+            handleSuccess: () => visit(foremanUrl(hostsIndexUrl)),
           })
         ),
       message: (

diff --git a/webpack/assets/javascripts/react_app/components/HostDetails/ActionsBar/index.js b/webpack/assets/javascripts/react_app/components/HostDetails/ActionsBar/index.js
@@ -23,7 +23,10 @@ import { translate as __ } from '../../../common/I18n';
 import { selectKebabItems } from './Selectors';
 import { foremanUrl } from '../../../common/helpers';
 import { cancelBuild, deleteHost, isHostTurnOn } from './actions';
-import { useForemanSettings } from '../../../Root/Context/ForemanContext';
+import {
+  useForemanSettings,
+  useForemanHostsPageUrl,
+} from '../../../Root/Context/ForemanContext';
 import BuildModal from './BuildModal';
 import Slot from '../../common/Slot';
 
@@ -51,12 +54,15 @@ const ActionsBar = ({
   const [isBuildModalOpen, setBuildModal] = useState(false);
   const onKebabToggle = isOpen => setKebab(isOpen);
   const { destroyVmOnHostDelete } = useForemanSettings();
+  const hostsIndexUrl = useForemanHostsPageUrl();
   const registeredItems = useSelector(selectKebabItems, shallowEqual);
   const isHostActive = useSelector(isHostTurnOn);
 
   const dispatch = useDispatch();
   const deleteHostHandler = () =>
-    dispatch(deleteHost(hostName, computeId, destroyVmOnHostDelete));
+    dispatch(
+      deleteHost(hostName, computeId, destroyVmOnHostDelete, hostsIndexUrl)
+    );
 
   const isConsoleDisabled = !(computeId && isHostActive);
   const determineTooltip = () => {

diff --git a/webpack/assets/javascripts/react_app/components/HostsIndex/index.js b/webpack/assets/javascripts/react_app/components/HostsIndex/index.js
@@ -37,7 +37,10 @@ import {
   getPageStats,
 } from '../PF4/TableIndexPage/Table/helpers';
 import { deleteHost } from '../HostDetails/ActionsBar/actions';
-import { useForemanSettings } from '../../Root/Context/ForemanContext';
+import {
+  useForemanSettings,
+  useForemanHostsPageUrl,
+} from '../../Root/Context/ForemanContext';
 import { bulkDeleteHosts } from './BulkActions/bulkDelete';
 import BulkBuildHostModal from './BulkActions/buildHosts';
 import BulkReassignHostgroupModal from './BulkActions/reassignHostGroup';
@@ -177,8 +180,11 @@ const HostsIndex = () => {
 
   const dispatch = useDispatch();
   const { destroyVmOnHostDelete } = useForemanSettings();
+  const hostsIndexUrl = useForemanHostsPageUrl();
   const deleteHostHandler = ({ hostName, computeId }) =>
-    dispatch(deleteHost(hostName, computeId, destroyVmOnHostDelete));
+    dispatch(
+      deleteHost(hostName, computeId, destroyVmOnHostDelete, hostsIndexUrl)
+    );
   const handleBulkDelete = () => {
     const bulkParams = fetchBulkParams();
     dispatch(