Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Jan 30, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions webpack/assets/javascripts/react_app/components/HostDetails/ActionsBar/actions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -44,7 +45,7 @@ export const deleteHost = (
key: `${hostName}-DELETE`,
successToast,
errorToast,
handleSuccess: () => visit(foremanUrl('/hosts')),
handleSuccess: () => visit(foremanUrl(hostsIndexUrl)),
})
),
message: (
Expand Down
10 changes: 8 additions & 2 deletions webpack/assets/javascripts/react_app/components/HostDetails/ActionsBar/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down Expand Up @@ -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 = () => {
Expand Down
10 changes: 8 additions & 2 deletions webpack/assets/javascripts/react_app/components/HostsIndex/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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(
Expand Down
Loading