Skip to content

Commit 4c46d23

Browse files
Ensure projects get listed when only a subproject is favored
https://community.openproject.org/work_packages/54729
1 parent 9146eb0 commit 4c46d23

File tree

2 files changed

+32
-3
lines changed

2 files changed

+32
-3
lines changed

frontend/src/app/shared/components/header-project-select/header-project-select.component.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,6 @@ export class OpHeaderProjectSelectComponent extends UntilDestroyedMixin {
223223
return projects.length > 0;
224224
}
225225

226-
return projects.some((project) => favorites.includes(project.id.toString()));
226+
return projects.length > 0 && favorites.length > 0;
227227
}
228228
}

spec/features/projects/favorite_spec.rb

+31-2
Original file line numberDiff line numberDiff line change
@@ -92,14 +92,14 @@
9292
top_menu.expect_no_result other_project.name
9393
end
9494

95-
context 'when project is favored' do
95+
context "when projct is favored" do
9696
before do
9797
project.add_favoring_user(user)
9898
other_project.add_favoring_user(user)
9999
other_project.update! active: false
100100
end
101101

102-
it 'does not show archived projects' do
102+
it "does not show archived projects" do
103103
visit home_path
104104

105105
expect(page).to have_text 'Favorite projects'
@@ -111,4 +111,33 @@
111111
expect(page).to have_text 'My favorite!'
112112
end
113113
end
114+
115+
context "favoriting only one subproject" do
116+
before do
117+
project.update! parent: other_project
118+
project.add_favoring_user(user)
119+
end
120+
121+
it "still shows up in top menu (Regression #54729)" do
122+
visit home_path
123+
124+
expect(page).to have_text 'Favorite projects'
125+
expect(page).to have_test_selector 'favorite-project', text: 'My favorite!'
126+
127+
retry_block do
128+
top_menu.toggle unless top_menu.open?
129+
top_menu.expect_open
130+
131+
# projects are displayed initially
132+
top_menu.expect_result project.name
133+
top_menu.expect_result other_project.name
134+
end
135+
136+
top_menu.switch_mode "Favorites"
137+
138+
top_menu.expect_result project.name
139+
# Parent is also shown
140+
top_menu.expect_result other_project.name
141+
end
142+
end
114143
end

0 commit comments

Comments
 (0)