Refs #36793 - Addresseing PR comments

theforeman · Oct 25, 2023 · 2ad7ece · 2ad7ece
1 parent dd2670b
commit 2ad7ece
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/app/controllers/hosts_controller.rb b/app/controllers/hosts_controller.rb
@@ -941,4 +941,9 @@ def redirection_url_on_host_deletion
   def current_host_details_path(host)
     Setting['host_details_ui'] ? host_details_page_path(host) : host_path(host)
   end
+
+  def hosts_path
+    Setting[:new_hosts_page] ? '/new/hosts' : super
+  end
+
 end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -422,4 +422,8 @@ def ui_settings
   def current_host_details_path(host)
     Setting['host_details_ui'] ? host_details_page_path(host) : host_path(host)
   end
+
+  def hosts_path
+    Setting[:new_hosts_page] ? '/new/hosts' : '/hosts'
+  end
 end
diff --git a/webpack/assets/javascripts/react_app/Root/Context/ForemanContext.js b/webpack/assets/javascripts/react_app/Root/Context/ForemanContext.js
@@ -13,3 +13,8 @@ export const useForemanDocUrl = () => useForemanMetadata().docUrl;
 export const useForemanOrganization = () => useForemanMetadata().organization;
 export const useForemanLocation = () => useForemanMetadata().location;
 export const useForemanUser = () => useForemanMetadata().user;
+
+export const useForemanHostsPageUrl = () => {
+  const { displayNewHostsPage } = useForemanSettings();
+  return displayNewHostsPage ? '/new/hosts' : '/hosts';
+};
diff --git a/webpack/assets/javascripts/react_app/components/HostDetails/index.js b/webpack/assets/javascripts/react_app/components/HostDetails/index.js
@@ -43,7 +43,7 @@ import BreadcrumbBar from '../BreadcrumbBar';
 import { foremanUrl } from '../../common/helpers';
 import { CardExpansionContextWrapper } from './CardExpansionContext';
 import Head from '../Head';
-import { useForemanSettings } from '../../Root/Context/ForemanContext';
+import { useForemanSettings, useForemanHostsPageUrl } from '../../Root/Context/ForemanContext';
 
 const HostDetails = ({
   match: {
@@ -52,7 +52,7 @@ const HostDetails = ({
   location: { hash },
   history,
 }) => {
-  const { displayFqdnForHosts, displayNewHostsPage } = useForemanSettings();
+  const { displayFqdnForHosts } = useForemanSettings();
   const { response, status } = useAPI(
     'get',
     `/api/hosts/${id}?show_hidden_parameters=true`,
@@ -114,7 +114,7 @@ const HostDetails = ({
               }}
               breadcrumbItems={[
                 { caption: __('Hosts'),
-                  url: displayNewHostsPage ? foremanUrl('/new/hosts') : foremanUrl('/hosts') },
+                  url: useForemanHostsPageUrl() },
                 {
                   caption: displayFqdnForHosts
                     ? response.name