Skip to content

OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub

Show message when no news is available

Alexander Brandon Colesc5b310a8bae7
diff --git a/modules/overviews/app/components/overviews/widgets/news_component.html.erb b/modules/overviews/app/components/overviews/widgets/news_component.html.erb
index e267c49b623..ca94764cea4 100644
--- a/modules/overviews/app/components/overviews/widgets/news_component.html.erb
+++ b/modules/overviews/app/components/overviews/widgets/news_component.html.erb
@@ -30,44 +30,50 @@ See COPYRIGHT and LICENSE files for more details.
<%=
component_wrapper tag: :"turbo-frame" do
box_collection do |box|
- @newest.each_with_index do |news, i|
- box.with_box(mt: 2, pb: 2, border: i == @newest.count - 1 ? false : :bottom) do
- component_collection do |body|
- body.with_component(
- if @project
- render(
- Primer::Beta::Link.new(
- font_weight: :bold,
- underline: true,
- href: news_path(news)
- )
- ) { news.title }
- else
- render(Primer::OpenProject::FlexLayout.new) do |layout|
- layout.with_column do
- render(
- Primer::Beta::Link.new(
- font_weight: :bold,
- scheme: :secondary,
- underline: false,
- href: project_path(news.project)
- )
- ) { "#{news.project.name}:" }
- end
+ if @newest.empty?
+ box.with_box do
+ render(Primer::Beta::Text.new(color: :subtle)) { t(:"js.grid.widgets.news.no_results") }
+ end
+ else
+ @newest.each_with_index do |news, i|
+ box.with_box(mt: 2, pb: 2, border: i == @newest.count - 1 ? false : :bottom) do
+ component_collection do |body|
+ body.with_component(
+ if @project
+ render(
+ Primer::Beta::Link.new(
+ font_weight: :bold,
+ underline: true,
+ href: news_path(news)
+ )
+ ) { news.title }
+ else
+ render(Primer::OpenProject::FlexLayout.new) do |layout|
+ layout.with_column do
+ render(
+ Primer::Beta::Link.new(
+ font_weight: :bold,
+ scheme: :secondary,
+ underline: false,
+ href: project_path(news.project)
+ )
+ ) { "#{news.project.name}:" }
+ end
- layout.with_column do
- render(Primer::Beta::Link.new(ml: 1, font_weight: :bold, underline: true, href: news_path(news))) { news.title }
+ layout.with_column do
+ render(Primer::Beta::Link.new(ml: 1, font_weight: :bold, underline: true, href: news_path(news))) { news.title }
+ end
end
- end
- end
- )
- body.with_component(
- render(Primer::Beta::Text.new(tag: :p, color: :subtle)) { helpers.authoring_at(format_time(news.created_at), news.author) }
- )
- body.with_component(
- render(Primer::Beta::Text.new) { news.summary }
- )
+ end
+ )
+ body.with_component(
+ render(Primer::Beta::Text.new(tag: :p, color: :subtle)) { helpers.authoring_at(format_time(news.created_at), news.author) }
+ )
+ body.with_component(
+ render(Primer::Beta::Text.new) { news.summary }
+ )
+ end
end
end
end
diff --git a/modules/overviews/spec/components/overviews/widgets/news_component_spec.rb b/modules/overviews/spec/components/overviews/widgets/news_component_spec.rb
index 99c0590eea2..a10f168a4d6 100644
--- a/modules/overviews/spec/components/overviews/widgets/news_component_spec.rb
+++ b/modules/overviews/spec/components/overviews/widgets/news_component_spec.rb
@@ -31,12 +31,14 @@
require "rails_helper"
RSpec.describe Overviews::Widgets::NewsComponent, type: :component do
+ include Rails.application.routes.url_helpers
+
def render_component(...)
render_inline(described_class.new(...))
end
- let(:project) { build_stubbed(:project) }
- let(:user) { build_stubbed(:user) }
+ let(:project) { create(:project) }
+ let(:user) { create(:admin) }
current_user { user }
@@ -47,4 +49,24 @@ RSpec.describe Overviews::Widgets::NewsComponent, type: :component do
it "renders turbo-frame component wrapper" do
expect(rendered_component).to have_element :"turbo-frame"
end
+
+ context "with no news" do
+ it "renders a message" do
+ expect(rendered_component).to have_primer_text "Nothing new to report.", color: "subtle"
+ end
+ end
+
+ context "with news" do
+ let(:author) { create(:user) }
+ let!(:news) { create_list(:news, 3, project:, author:) }
+
+ it "renders news items", :aggregate_failures do
+ expect(rendered_component).to have_css(".mt-2", count: 3)
+ expect(rendered_component).to have_css(".mt-2:last-of-type") do |item|
+ expect(item).to have_link href: news_path(news.first)
+ expect(item).to have_content /Added by .+ on \d{2}\/\d{2}\/\d{4} \d{2}:\d{2} [AP]M/
+ expect(item).to have_link href: user_path(author)
+ end
+ end
+ end
end