Fixes #36869 - Redirect /hosts to /new/hosts in index #9879

parthaa · 2023-10-26T18:09:43Z

Also removed logic in the hosts controller and application helper to rewrite the URL. Decided to go with the redirect on index approach instead since we want this redirect to happen only on get requests.

Test this

Go to Administer-> Settings -> New Hosts Page. Set that to Yes
Go to http://<satellite>/hosts and notice that it should get redirected to http://<satellite>/new/hosts
Make operations like create/update/delete hosts all work ok.

ekohl

I'm not a fan of this. With the host detail page we took an approach of making sure the links to it were correct, but still retained the old detail page as a fallback. This implementation means you effectively disable the whole old host page. If you go that route, why don't you make /hosts return the new content?

ekohl · 2023-10-27T12:09:30Z

app/controllers/hosts_controller.rb

+        if Setting[:new_hosts_page]
+          redirect_to(new_hosts_index_page_path)
+          next
+        end


If you do this, why can't it be at at the very beginning? So line 42.

Updated to try your approach. @jeremylenz what do you think ?

jeremylenz · 2023-10-27T14:34:44Z

Well, for what it's worth, I just tested this and it unbreaks host create. So 👍 in that regard.

app/controllers/hosts_controller.rb

jeremylenz

LGTM

Host create works
also did some spot checks and links go to the correct place.

APJ (and @ekohl) 👍

ekohl

I was late on the other PR, but one thing I really didn't like about the new host detail page was the URL change.

In your current implementation you're treating the pages as if they're equal: you can go to either one or the other. Can't we somehow implement the page in the controller to either render the old or the new version? Either based on preference or cookie.

The thing I'm mostly worried about is this scenario:

Have the setting set to prefer the new overview
Go to the old overview
Use a bulk action
Expect to be redirect back to old overview

In reality this will redirect to the new overview.

Another case I fear about is plugins. They may redirect to the hosts overview as well.

ekohl · 2023-10-31T20:39:52Z

app/controllers/hosts_controller.rb

@@ -684,11 +684,11 @@ def statuses
    render :json => statuses
  end

-  def hosts_path(*args)
+  def current_hosts_path(*args)


Don't controllers include all helpers? So isn't this duplicating the current_hosts_path from ApplicationHelper?

Updated it use helpers.current_hosts_path instead

ekohl · 2023-10-31T20:40:33Z

app/helpers/application_helper.rb

@@ -423,11 +423,11 @@ def current_host_details_path(host)
    Setting['host_details_ui'] ? host_details_page_path(host) : host_path(host)
  end

-  def hosts_path(*args)
+  def current_hosts_path(*args)


Nit: is current the best naming? Perhaps preferred is better, though it's also not great either.

This is consistent with current_host_details_path which was already there. 🤷

ekohl · 2023-10-31T20:48:29Z

app/presenters/host_status_presenter.rb

@@ -55,14 +55,14 @@ def global_statuses
      query = send("#{status_name}_total_query")
      return if query.empty?

-      Rails.application.routes.url_helpers.hosts_path(search: query)
+      Rails.application.routes.url_helpers.current_hosts_path(search: query)


Does this work?

parthaa · 2023-10-31T21:07:33Z

The thing I'm mostly worried about is this scenario:

Have the setting set to prefer the new overview

Go to the old overview

Use a bulk action

Expect to be redirect back to old overview

You bring up an interesting idea here.

May be we could try to be more conservative here instead of doing the s/hosts_path/current_hosts_path en masse. Basically have host_controllers always return hosts_path unless the new hosts page implements those actions? . So for example right now only delete/create/change content source actions are available in New Hosts. You 'd have to go to old hosts for the rest of the actions.

Actually I just realized most of the actions on host_controller do what you were suggesting. Something like redirect_back_or_to hosts_path already.
https://github.com/theforeman/foreman/blob/develop/app/controllers/hosts_controller.rb#L446 for example.

Which then runs

    def redirect_back(fallback_location:, allow_other_host: true, **args)
      referer = request.headers["Referer"]
      redirect_to_referer = referer && (allow_other_host || _url_host_allowed?(referer))
      redirect_to redirect_to_referer ? referer : fallback_location, **args
    end

This would mean that if the referer pointed to the old page they'd be redirected back to that and the new url would only be a fall back

parthaa · 2023-11-01T14:30:06Z

@ekohl any thoughts on ^ ?

ekohl · 2023-11-16T18:31:44Z

That sounds like it would be less of a problem than I was afraid of, which is good.

parthaa · 2023-11-21T04:24:14Z

@jeremylenz can you run a quick test again on this and ack if it works

jeremylenz · 2023-11-21T13:43:33Z

[test unit]

jeremylenz

Tested host create again and spot checked a few links, still works well for me

jeremylenz · 2023-11-21T14:51:25Z

[test unit]

parthaa · 2023-11-21T19:29:49Z

[test unit]

parthaa · 2023-11-22T04:30:49Z

[test unit]

Comments in #9879 (review) were addressed

pr-processor bot added the Not yet reviewed label Oct 26, 2023

ekohl previously requested changes Oct 27, 2023

View reviewed changes

pr-processor bot added Waiting on contributor and removed Not yet reviewed labels Oct 27, 2023

stejskalleos assigned ekohl Oct 30, 2023

parthaa force-pushed the 36869 branch from bfac923 to 4c91ba3 Compare October 31, 2023 18:28

pr-processor bot added Needs re-review and removed Waiting on contributor labels Oct 31, 2023

jeremylenz reviewed Oct 31, 2023

View reviewed changes

app/controllers/hosts_controller.rb Outdated Show resolved Hide resolved

parthaa force-pushed the 36869 branch 2 times, most recently from 2c65e61 to 344051d Compare October 31, 2023 20:13

jeremylenz previously approved these changes Oct 31, 2023

View reviewed changes

pr-processor bot removed the Needs re-review label Oct 31, 2023

ekohl reviewed Oct 31, 2023

View reviewed changes

parthaa dismissed jeremylenz’s stale review via 193ca15 October 31, 2023 21:24

parthaa force-pushed the 36869 branch from 344051d to 193ca15 Compare October 31, 2023 21:24

parthaa force-pushed the 36869 branch 3 times, most recently from 2b93a60 to 0fb71e5 Compare November 2, 2023 15:54

parthaa mentioned this pull request Nov 2, 2023

Fixes #36867 - Add host delete & create to new host overview #9878

Merged

parthaa force-pushed the 36869 branch from 0fb71e5 to 4286985 Compare November 7, 2023 16:42

parthaa force-pushed the 36869 branch 2 times, most recently from f086b71 to 3263b37 Compare November 21, 2023 04:22

parthaa force-pushed the 36869 branch 2 times, most recently from 2bb24b7 to 5ffd2d7 Compare November 21, 2023 05:58

parthaa requested a review from ekohl November 21, 2023 06:00

parthaa force-pushed the 36869 branch from 5ffd2d7 to 4109f72 Compare November 21, 2023 06:01

jeremylenz previously approved these changes Nov 21, 2023

View reviewed changes

Fixes #36869 - update hosts path with current_hosts_path

b650130

parthaa dismissed jeremylenz’s stale review via b650130 November 22, 2023 17:03

parthaa force-pushed the 36869 branch from 4109f72 to b650130 Compare November 22, 2023 17:03

jeremylenz approved these changes Nov 28, 2023

View reviewed changes

jeremylenz merged commit 3ecce16 into theforeman:develop Nov 28, 2023
9 checks passed

parthaa deleted the 36869 branch November 28, 2023 20:05

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fixes #36869 - Redirect /hosts to /new/hosts in index #9879

Fixes #36869 - Redirect /hosts to /new/hosts in index #9879

parthaa commented Oct 26, 2023 •

edited by jeremylenz

Loading

ekohl left a comment

ekohl Oct 27, 2023

parthaa Oct 31, 2023

jeremylenz commented Oct 27, 2023

jeremylenz left a comment

ekohl left a comment

ekohl Oct 31, 2023

parthaa Nov 1, 2023

ekohl Oct 31, 2023

jeremylenz Oct 31, 2023

ekohl Oct 31, 2023

parthaa commented Oct 31, 2023 •

edited

Loading

parthaa commented Nov 1, 2023

ekohl commented Nov 16, 2023

parthaa commented Nov 21, 2023

jeremylenz commented Nov 21, 2023

jeremylenz left a comment

jeremylenz commented Nov 21, 2023

parthaa commented Nov 21, 2023

parthaa commented Nov 22, 2023

Fixes #36869 - Redirect /hosts to /new/hosts in index #9879

Fixes #36869 - Redirect /hosts to /new/hosts in index #9879

Conversation

parthaa commented Oct 26, 2023 • edited by jeremylenz Loading

ekohl left a comment

Choose a reason for hiding this comment

ekohl Oct 27, 2023

Choose a reason for hiding this comment

parthaa Oct 31, 2023

Choose a reason for hiding this comment

jeremylenz commented Oct 27, 2023

jeremylenz left a comment

Choose a reason for hiding this comment

ekohl left a comment

Choose a reason for hiding this comment

ekohl Oct 31, 2023

Choose a reason for hiding this comment

parthaa Nov 1, 2023

Choose a reason for hiding this comment

ekohl Oct 31, 2023

Choose a reason for hiding this comment

jeremylenz Oct 31, 2023

Choose a reason for hiding this comment

ekohl Oct 31, 2023

Choose a reason for hiding this comment

parthaa commented Oct 31, 2023 • edited Loading

parthaa commented Nov 1, 2023

ekohl commented Nov 16, 2023

parthaa commented Nov 21, 2023

jeremylenz commented Nov 21, 2023

jeremylenz left a comment

Choose a reason for hiding this comment

jeremylenz commented Nov 21, 2023

parthaa commented Nov 21, 2023

parthaa commented Nov 22, 2023

parthaa commented Oct 26, 2023 •

edited by jeremylenz

Loading

parthaa commented Oct 31, 2023 •

edited

Loading