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

OP#59817 Remove activity menu for anonymous users with login required #17314

Open
wants to merge 4 commits into
base: dev
Choose a base branch
from
Open

OP#59817 Remove activity menu for anonymous users with login required #17314

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c5cf9d5
Remove activity menu for anonymous users with login required
top4ek Nov 29, 2024
b602ffd
Fix spec
top4ek Dec 4, 2024
eac1fa8
Review patch: return empty item groups
top4ek Dec 10, 2024
40c943f
Merge branch 'dev' into remove_anonymous_menu
top4ek Dec 11, 2024
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
1 change: 1 addition & 0 deletions config/initializers/menus.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
menu.push :activity,
{ controller: "/activities", action: "index" },
context: :modules,
if: Proc.new { User.current.logged? || !Setting.login_required? },
icon: "history"

menu.push :work_packages,
Expand Down
2 changes: 2 additions & 0 deletions lib/redmine/menu_manager/top_menu_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,8 @@ def more_top_menu_items

def module_top_menu_item_groups
items = more_top_menu_items
return items if items.empty?
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Even though an empty array is an empty array in ruby, I would suggest not returning the empty items array here, but the item_groups array. You can do this in a way, that add & in line 223: unless items.first&.heading?. If you do it that way the reduce is operating again on an empty list or containing a single item.

Let me know if I should explain more in depth.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doing that gives us empty menu dropdown as unless items.first&.heading? adds to item_groups [{:title=>nil, :items=>[]}]

Screenshot_20241204_195215

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As a variant?

def module_top_menu_item_groups
    item_groups = []
    items = more_top_menu_items
    return item_groups if items.blank?


item_groups = []

# add untitled group, if no heading is present
Expand Down
6 changes: 0 additions & 6 deletions spec/features/menu_items/top_menu_item_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,12 +138,6 @@ def click_link_in_open_menu(title)
context "as an anonymous user" do
let(:user) { create(:anonymous) }

context "when login_required", with_settings: { login_required: true } do
it "redirects to login" do
expect(page).to have_current_path /login/
end
end

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please do not simply delete this test because the redirect should still work and be tested. I think you just have to set let(:open_menu) { false } for this context to work again.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure why :top_menu is forced before examples, but all other specs fail even if we don't open top menu there.

context "when not login_required", with_settings: { login_required: false } do
it "displays only projects, activity and news" do
has_menu_items? project_item, activity_item, news_item
Expand Down
Loading