Katello · jeremylenz · Feb 6, 2026 · Jan 30, 2026
diff --git a/webpack/components/extensions/Hosts/ActionsBar/index.js b/webpack/components/extensions/Hosts/ActionsBar/index.js
@@ -1,15 +1,14 @@
-import React, { useContext, useEffect } from 'react';
+import React, { useContext } from 'react';
 import PropTypes from 'prop-types';
-import { useDispatch } from 'react-redux';
 import { Menu, MenuItem, MenuContent, MenuList } from '@patternfly/react-core';
 import { BanIcon } from '@patternfly/react-icons';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { foremanUrl } from 'foremanReact/common/helpers';
 import { ForemanHostsIndexActionsBarContext } from 'foremanReact/components/HostsIndex';
-import { useForemanModal } from 'foremanReact/components/ForemanModal/ForemanModalHooks';
-import { addModal } from 'foremanReact/components/ForemanModal/ForemanModalActions';
 import { useForemanOrganization, useForemanContext } from 'foremanReact/Root/Context/ForemanContext';
 import './ActionsBar.scss';
+import { openBulkModal } from '../BulkActions/bulkModalState';
+
 
 const DisabledMenuItemDescription = ({ disabledReason }) => (
   <span className="disabled-menu-item-span">
@@ -34,27 +33,6 @@ const HostActionsBar = () => {
     setMenuOpen,
   } = useContext(ForemanHostsIndexActionsBarContext);
 
-  const dispatch = useDispatch();
-  useEffect(() => {
-    [
-      'bulk-assign-cves-modal',
-      'bulk-packages-wizard',
-      'bulk-errata-wizard',
-      'bulk-repo-sets-wizard',
-      'bulk-change-host-collections-modal',
-      'bulk-system-purpose-modal',
-      'bulk-manage-traces-modal',
-    ].forEach((id) => {
-      dispatch(addModal({ id }));
-    });
-  }, [dispatch]);
-  const { setModalOpen: openBulkAssignCVEnvsModal } = useForemanModal({ id: 'bulk-assign-cves-modal' });
-  const { setModalOpen: openBulkPackagesWizardModal } = useForemanModal({ id: 'bulk-packages-wizard' });
-  const { setModalOpen: openBulkErrataWizardModal } = useForemanModal({ id: 'bulk-errata-wizard' });
-  const { setModalOpen: openBulkRepositorySetsWizardModal } = useForemanModal({ id: 'bulk-repo-sets-wizard' });
-  const { setModalOpen: openBulkSystemPurposeModal } = useForemanModal({ id: 'bulk-system-purpose-modal' });
-  const { setModalOpen: openBulkManageTracesModal } = useForemanModal({ id: 'bulk-manage-traces-modal' });
-
   const orgId = useForemanOrganization()?.id;
   const foremanContext = useForemanContext();
   const allowMultipleContentViews =
@@ -68,6 +46,11 @@ const HostActionsBar = () => {
     href = foremanUrl(`/change_host_content_source?search=${fetchBulkParams()}`);
   }
 
+  const handleOpenBulkModal = (modalId) => {
+    setMenuOpen(false);
+    setTimeout(() => openBulkModal(modalId, true), 0);
+  };
+
   return (
     <>
       <MenuItem
@@ -81,7 +64,7 @@ const HostActionsBar = () => {
                 <MenuItem
                   itemId="bulk-packages-wizard-dropdown-item"
                   key="bulk-packages-wizard-dropdown-item"
-                  onClick={openBulkPackagesWizardModal}
+                  onClick={() => handleOpenBulkModal('bulk-packages-wizard')}
                   isDisabled={selectedCount === 0 || !orgId}
                   description={!orgId && <DisabledMenuItemDescription disabledReason={__('To manage host packages, a specific organization must be selected from the organization context.')} />}
                 >
@@ -90,15 +73,15 @@ const HostActionsBar = () => {
                 <MenuItem
                   itemId="bulk-errata-wizard-dropdown-item"
                   key="bulk-errata-wizard-dropdown-item"
-                  onClick={openBulkErrataWizardModal}
+                  onClick={() => handleOpenBulkModal('bulk-errata-wizard')}
                   isDisabled={selectedCount === 0}
                 >
                   {__('Errata')}
                 </MenuItem>
                 <MenuItem
                   itemId="bulk-repo-sets-wizard-dropdown-item"
                   key="bulk-repo-sets-wizard-dropdown-item"
-                  onClick={openBulkRepositorySetsWizardModal}
+                  onClick={() => handleOpenBulkModal('bulk-repo-sets-wizard')}
                   isDisabled={selectedCount === 0 || !orgId}
                   description={!orgId && <DisabledMenuItemDescription disabledReason={__('To manage host content overrides, a specific organization must be selected from the organization context.')} />}
                 >
@@ -115,7 +98,7 @@ const HostActionsBar = () => {
                 <MenuItem
                   itemId="bulk-assign-cves-dropdown-item"
                   key="bulk-assign-cves-dropdown-item"
-                  onClick={openBulkAssignCVEnvsModal}
+                  onClick={() => handleOpenBulkModal('bulk-assign-cves-modal')}
                   isDisabled={selectedCount === 0 || !orgId}
                   description={!orgId && <DisabledMenuItemDescription disabledReason={__('To assign content view environment(s), a specific organization must be selected from the organization context.')} />}
                 >
@@ -124,7 +107,7 @@ const HostActionsBar = () => {
                 <MenuItem
                   itemId="bulk-system-purpose-dropdown-item"
                   key="bulk-system-purpose-dropdown-item"
-                  onClick={openBulkSystemPurposeModal}
+                  onClick={() => handleOpenBulkModal('bulk-system-purpose-modal')}
                   isDisabled={selectedCount === 0 || !orgId}
                   description={!orgId && <DisabledMenuItemDescription disabledReason={__('To change system purpose, a specific organization must be selected from the organization context.')} />}
                 >
@@ -140,7 +123,7 @@ const HostActionsBar = () => {
       <MenuItem
         itemId="bulk-manage-traces-menu-item"
         key="bulk-manage-traces-menu-item"
-        onClick={openBulkManageTracesModal}
+        onClick={() => handleOpenBulkModal('bulk-manage-traces-modal')}
         isDisabled={selectedCount === 0 || !orgId}
         description={!orgId && <DisabledMenuItemDescription disabledReason={__('To manage traces, a specific organization must be selected from the organization context.')} />}
       >

diff --git a/webpack/components/extensions/Hosts/BulkActions/BulkAssignCVEnvsModal/index.js b/webpack/components/extensions/Hosts/BulkActions/BulkAssignCVEnvsModal/index.js
@@ -1,16 +1,17 @@
 import React, { useContext } from 'react';
 import { useForemanOrganization, useForemanContext } from 'foremanReact/Root/Context/ForemanContext';
 import { ForemanActionsBarContext } from 'foremanReact/components/HostDetails/ActionsBar';
-import { useForemanModal } from 'foremanReact/components/ForemanModal/ForemanModalHooks';
+import { useBulkModalOpen } from '../bulkModalState';
 import BulkAssignCVEnvsModal from './BulkAssignCVEnvsModal';
 
 const BulkAssignCVEnvsModalScene = () => {
   const orgId = useForemanOrganization()?.id;
   const { selectedCount, fetchBulkParams } = useContext(ForemanActionsBarContext);
-  const { modalOpen, setModalClosed } = useForemanModal({ id: 'bulk-assign-cves-modal' });
+  const { isOpen, close: closeModal } = useBulkModalOpen('bulk-assign-cves-modal');
   const foremanContext = useForemanContext();
   const allowMultipleContentViews =
-    foremanContext?.metadata?.katello?.allow_multiple_content_views ?? true;
+      foremanContext?.metadata?.katello?.allow_multiple_content_views ?? true;
+
 
   if (!orgId) return null;
 
@@ -19,8 +20,8 @@ const BulkAssignCVEnvsModalScene = () => {
       key="bulk-assign-cves-modal"
       selectedCount={selectedCount}
       fetchBulkParams={fetchBulkParams}
-      isOpen={modalOpen}
-      closeModal={setModalClosed}
+      isOpen={isOpen}
+      closeModal={closeModal}
       orgId={orgId}
       allowMultipleContentViews={allowMultipleContentViews}
     />

diff --git a/webpack/components/extensions/Hosts/BulkActions/BulkChangeHostCollectionsModal/index.js b/webpack/components/extensions/Hosts/BulkActions/BulkChangeHostCollectionsModal/index.js
@@ -5,8 +5,8 @@ import { BanIcon } from '@patternfly/react-icons';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { useForemanOrganization } from 'foremanReact/Root/Context/ForemanContext';
 import { ForemanActionsBarContext } from 'foremanReact/components/HostDetails/ActionsBar';
-import { useForemanModal } from 'foremanReact/components/ForemanModal/ForemanModalHooks';
 import BulkChangeHostCollectionsModal from './BulkChangeHostCollectionsModal';
+import { openBulkModal, useBulkModalOpen } from '../bulkModalState';
 
 const DisabledMenuItemDescription = ({ disabledReason }) => (
   <span className="disabled-menu-item-span">
@@ -26,13 +26,13 @@ DisabledMenuItemDescription.propTypes = {
 // This component renders only the MenuItem trigger (for the slot in the menu)
 export const BulkChangeHostCollectionsMenuItem = ({ selectedCount }) => {
   const orgId = useForemanOrganization()?.id;
-  const { setModalOpen } = useForemanModal({ id: 'bulk-change-host-collections-modal' });
+  const openModal = () => openBulkModal('bulk-change-host-collections-modal', true);
 
   return (
     <MenuItem
       itemId="change-host-collections-dropdown-item"
       key="change-host-collections-dropdown-item"
-      onClick={setModalOpen}
+      onClick={openModal}
       isDisabled={selectedCount === 0 || !orgId}
       description={!orgId && <DisabledMenuItemDescription disabledReason={__('To manage host collections, a specific organization must be selected from the organization context.')} />}
     >
@@ -53,7 +53,7 @@ BulkChangeHostCollectionsMenuItem.defaultProps = {
 const BulkChangeHostCollectionsModalScene = () => {
   const orgId = useForemanOrganization()?.id;
   const { selectedCount, fetchBulkParams } = useContext(ForemanActionsBarContext);
-  const { modalOpen, setModalClosed } = useForemanModal({ id: 'bulk-change-host-collections-modal' });
+  const { isOpen, close: closeModal } = useBulkModalOpen('bulk-change-host-collections-modal');
 
   if (!orgId) return null;
 
@@ -62,8 +62,8 @@ const BulkChangeHostCollectionsModalScene = () => {
       key="bulk-change-host-collections-modal"
       fetchBulkParams={fetchBulkParams}
       selectedCount={selectedCount}
-      isOpen={modalOpen}
-      closeModal={setModalClosed}
+      isOpen={isOpen}
+      closeModal={closeModal}
     />
   );
 };

diff --git a/webpack/components/extensions/Hosts/BulkActions/BulkErrataWizard/BulkErrataWizard.js b/webpack/components/extensions/Hosts/BulkActions/BulkErrataWizard/BulkErrataWizard.js
@@ -1,11 +1,11 @@
 import React, { useState, createContext, useContext } from 'react';
+import PropTypes from 'prop-types';
 import {
   Wizard,
   WizardHeader,
   WizardStep,
 } from '@patternfly/react-core';
 import { translate as __ } from 'foremanReact/common/I18n';
-import { useForemanModal } from 'foremanReact/components/ForemanModal/ForemanModalHooks';
 import { useBulkSelect } from 'foremanReact/components/PF4/TableIndexPage/Table/TableHooks';
 import { ForemanActionsBarContext } from 'foremanReact/components/HostDetails/ActionsBar';
 import { useTableIndexAPIResponse } from 'foremanReact/components/PF4/TableIndexPage/Table/TableIndexHooks';
@@ -53,8 +53,7 @@ export const useErrataHostsBulkSelect = ({ initialSelectedHosts, modalIsOpen })
 
 export const ERRATA_URL = `${katelloApi.getApiUrl('/errata')}?per_page=7&include_permissions=true&errata_restrict_installable=true`;
 
-const BulkErrataWizard = () => {
-  const { modalOpen, setModalClosed: closeModal } = useForemanModal({ id: 'bulk-errata-wizard' });
+const BulkErrataWizard = ({ isOpen: modalOpen, closeModal }) => {
   const { selectedCount: initialSelectedHostCount, fetchBulkParams }
     = useContext(ForemanActionsBarContext);
 
@@ -159,3 +158,8 @@ const BulkErrataWizard = () => {
 };
 
 export default BulkErrataWizard;
+
+BulkErrataWizard.propTypes = {
+  isOpen: PropTypes.bool.isRequired,
+  closeModal: PropTypes.func.isRequired,
+};
diff --git a/webpack/components/extensions/Hosts/BulkActions/BulkErrataWizard/index.js b/webpack/components/extensions/Hosts/BulkActions/BulkErrataWizard/index.js
@@ -1,10 +1,10 @@
 import React from 'react';
 import { Modal, ModalVariant } from '@patternfly/react-core';
-import { useForemanModal } from 'foremanReact/components/ForemanModal/ForemanModalHooks';
 import BulkErrataWizard from './BulkErrataWizard';
+import { useBulkModalOpen } from '../bulkModalState';
 
 const BulkErrataWizardModal = () => {
-  const { modalOpen: isOpen } = useForemanModal({ id: 'bulk-errata-wizard' });
+  const { isOpen, close: closeModal } = useBulkModalOpen('bulk-errata-wizard');
 
   return (
     <Modal
@@ -16,7 +16,7 @@ const BulkErrataWizardModal = () => {
       hasNoBodyWrapper
       variant={ModalVariant.medium}
     >
-      <BulkErrataWizard />
+      <BulkErrataWizard isOpen={isOpen} closeModal={closeModal} />
     </Modal>
   );
 };

diff --git a/webpack/components/extensions/Hosts/BulkActions/BulkManageTracesModal/index.js b/webpack/components/extensions/Hosts/BulkActions/BulkManageTracesModal/index.js
@@ -1,14 +1,14 @@
 import React, { useContext } from 'react';
 import { useForemanOrganization } from 'foremanReact/Root/Context/ForemanContext';
 import { ForemanActionsBarContext } from 'foremanReact/components/HostDetails/ActionsBar';
-import { useForemanModal } from 'foremanReact/components/ForemanModal/ForemanModalHooks';
+import { useBulkModalOpen } from '../bulkModalState';
 import BulkManageTracesModal from './BulkManageTracesModal';
 
 const BulkManageTracesModalScene = () => {
   const orgId = useForemanOrganization()?.id;
   const contextValue = useContext(ForemanActionsBarContext);
   const { selectedCount, fetchBulkParams } = contextValue || {};
-  const { modalOpen, setModalClosed } = useForemanModal({ id: 'bulk-manage-traces-modal' });
+  const { isOpen, close: closeModal } = useBulkModalOpen('bulk-manage-traces-modal');
 
   if (!orgId) return null;
 
@@ -22,8 +22,8 @@ const BulkManageTracesModalScene = () => {
       key="bulk-manage-traces-modal"
       selectedCount={selectedCount || 0}
       fetchBulkParams={fetchBulkParams}
-      isOpen={modalOpen}
-      closeModal={setModalClosed}
+      isOpen={isOpen}
+      closeModal={closeModal}
       orgId={orgId}
     />
   );

diff --git a/webpack/components/extensions/Hosts/BulkActions/BulkPackagesWizard/BulkPackagesWizard.js b/webpack/components/extensions/Hosts/BulkActions/BulkPackagesWizard/BulkPackagesWizard.js
@@ -11,7 +11,6 @@ import {
 } from '@patternfly/react-core';
 
 import { translate as __ } from 'foremanReact/common/I18n';
-import { useForemanModal } from 'foremanReact/components/ForemanModal/ForemanModalHooks';
 import { useBulkSelect } from 'foremanReact/components/PF4/TableIndexPage/Table/TableHooks';
 import { ForemanActionsBarContext } from 'foremanReact/components/HostDetails/ActionsBar';
 import { useTableIndexAPIResponse } from 'foremanReact/components/PF4/TableIndexPage/Table/TableIndexHooks';
@@ -23,6 +22,7 @@ import { BulkPackagesUpgradeTable, BulkPackagesInstallTable, BulkPackagesRemoveT
 import { BulkPackagesReviewFooter } from './04_ReviewFooter';
 import katelloApi, { foremanApi } from '../../../../../services/api';
 import PACKAGE_CONTENT_TYPE_NAMES from '../BulkActionsConstants';
+import { useBulkModalOpen } from '../bulkModalState';
 
 export const UPGRADE_ALL = 'upgradeAll';
 export const UPGRADE = 'upgrade';
@@ -73,7 +73,7 @@ export const getPackagesUrl = (selectedAction, contentTypeName) => {
 };
 
 const BulkPackagesWizard = () => {
-  const { modalOpen, setModalClosed: closeModal } = useForemanModal({ id: 'bulk-packages-wizard' });
+  const { isOpen: modalOpen, close: closeModal } = useBulkModalOpen('bulk-packages-wizard');
 
   const [selectedAction, setSelectedAction] = useState(UPGRADE_ALL);
 

diff --git a/webpack/components/extensions/Hosts/BulkActions/BulkPackagesWizard/index.js b/webpack/components/extensions/Hosts/BulkActions/BulkPackagesWizard/index.js
@@ -1,10 +1,10 @@
 import React from 'react';
 import { Modal, ModalVariant } from '@patternfly/react-core';
-import { useForemanModal } from 'foremanReact/components/ForemanModal/ForemanModalHooks';
 import BulkPackagesWizard from './BulkPackagesWizard';
+import { useBulkModalOpen } from '../bulkModalState';
 
 const BulkPackagesWizardModal = () => {
-  const { modalOpen: isOpen } = useForemanModal({ id: 'bulk-packages-wizard' });
+  const { isOpen } = useBulkModalOpen('bulk-packages-wizard');
 
   return (
     <Modal

diff --git a/...ponents/extensions/Hosts/BulkActions/BulkRepositorySetsWizard/BulkRepositorySetsWizard.js b/...ponents/extensions/Hosts/BulkActions/BulkRepositorySetsWizard/BulkRepositorySetsWizard.js
@@ -9,7 +9,6 @@ import {
 } from '@patternfly/react-core';
 
 import { translate as __ } from 'foremanReact/common/I18n';
-import { useForemanModal } from 'foremanReact/components/ForemanModal/ForemanModalHooks';
 import { useBulkSelect } from 'foremanReact/components/PF4/TableIndexPage/Table/TableHooks';
 import { useForemanOrganization } from 'foremanReact/Root/Context/ForemanContext';
 import { ForemanActionsBarContext } from 'foremanReact/components/HostDetails/ActionsBar';
@@ -21,14 +20,15 @@ import HostReview from '../HostReview';
 import katelloApi from '../../../../../services/api';
 import { useHostsBulkSelect } from '../BulkPackagesWizard/BulkPackagesWizard';
 import { BulkRepositorySetsReviewFooter } from './03_ReviewFooter';
+import { useBulkModalOpen } from '../bulkModalState';
 
 const DEFAULT_PER_PAGE = 5;
 export const BulkRepositorySetsWizardContext = createContext({});
 export const repoSetsUrlForOrg = orgId =>
   katelloApi.getApiUrl(`/repository_sets?per_page=${DEFAULT_PER_PAGE}&include_permissions=true&enabled=true&with_custom=true&organization_id=${orgId}`);
 
 const BulkRepositorySetsWizard = () => {
-  const { modalOpen, setModalClosed: closeModal } = useForemanModal({ id: 'bulk-repo-sets-wizard' });
+  const { isOpen: modalOpen, close: closeModal } = useBulkModalOpen('bulk-repo-sets-wizard');
   const orgId = useForemanOrganization()?.id;
   const [pendingOverrides, setPendingOverrides] = useState({}); // { repo_label: 1 }
   const [shouldValidateStep2, setShouldValidateStep2] = useState(false);

diff --git a/webpack/components/extensions/Hosts/BulkActions/BulkRepositorySetsWizard/index.js b/webpack/components/extensions/Hosts/BulkActions/BulkRepositorySetsWizard/index.js
@@ -1,10 +1,10 @@
 import React from 'react';
 import { Modal, ModalVariant } from '@patternfly/react-core';
-import { useForemanModal } from 'foremanReact/components/ForemanModal/ForemanModalHooks';
 import BulkRepositorySetsWizard from './BulkRepositorySetsWizard';
+import { useBulkModalOpen } from '../bulkModalState';
 
 const BulkRepositorySetsWizardModal = () => {
-  const { modalOpen: isOpen } = useForemanModal({ id: 'bulk-repo-sets-wizard' });
+  const { isOpen } = useBulkModalOpen('bulk-repo-sets-wizard');
 
   return (
     <Modal

diff --git a/webpack/components/extensions/Hosts/BulkActions/BulkSystemPurposeModal/index.js b/webpack/components/extensions/Hosts/BulkActions/BulkSystemPurposeModal/index.js
@@ -1,13 +1,13 @@
 import React, { useContext } from 'react';
 import { useForemanOrganization } from 'foremanReact/Root/Context/ForemanContext';
 import { ForemanActionsBarContext } from 'foremanReact/components/HostDetails/ActionsBar';
-import { useForemanModal } from 'foremanReact/components/ForemanModal/ForemanModalHooks';
+import { useBulkModalOpen } from '../bulkModalState';
 import BulkSystemPurposeModal from './BulkSystemPurposeModal';
 
 const BulkSystemPurposeModalScene = () => {
   const orgId = useForemanOrganization()?.id;
   const { selectedCount, fetchBulkParams } = useContext(ForemanActionsBarContext);
-  const { modalOpen, setModalClosed } = useForemanModal({ id: 'bulk-system-purpose-modal' });
+  const { isOpen, close: closeModal } = useBulkModalOpen('bulk-system-purpose-modal');
 
   if (!orgId) return null;
 
@@ -16,8 +16,8 @@ const BulkSystemPurposeModalScene = () => {
       key="bulk-system-purpose-modal"
       selectedCount={selectedCount}
       fetchBulkParams={fetchBulkParams}
-      isOpen={modalOpen}
-      closeModal={setModalClosed}
+      isOpen={isOpen}
+      closeModal={closeModal}
       orgId={orgId}
     />
   );