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

[#67347] Componentize Homescreen Announcements

Alexander Brandon Colesbdaa8a3d77a1
diff --git a/app/components/homescreen/announcement_component.html.erb b/app/components/homescreen/announcement_component.html.erb
new file mode 100644
index 00000000000..0af28fa942e
--- /dev/null
+++ b/app/components/homescreen/announcement_component.html.erb
@@ -0,0 +1,36 @@
+<%#-- copyright
+OpenProject is an open source project management software.
+Copyright (C) the OpenProject GmbH
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License version 3.
+
+OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+Copyright (C) 2006-2013 Jean-Philippe Lang
+Copyright (C) 2010-2013 the ChiliProject Team
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+See COPYRIGHT and LICENSE files for more details.
+
+++#%>
+
+<div id="announcement">
+ <div class="op-toast -info">
+ <div class="op-toast--content op-uc-container">
+ <%= format_text announcement.text %>
+ </div>
+ </div>
+</div>
diff --git a/app/components/homescreen/announcement_component.rb b/app/components/homescreen/announcement_component.rb
new file mode 100644
index 00000000000..ed4d57a8c71
--- /dev/null
+++ b/app/components/homescreen/announcement_component.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module Homescreen
+ class AnnouncementComponent < ApplicationComponent
+ include OpenProject::TextFormatting
+
+ attr_reader :announcement
+
+ def initialize(announcement:)
+ super
+
+ @announcement = announcement
+ end
+
+ def render?
+ announcement.present?
+ end
+ end
+end
diff --git a/app/views/announcements/_show.html.erb b/app/views/announcements/_show.html.erb
deleted file mode 100644
index 36dd257a5db..00000000000
--- a/app/views/announcements/_show.html.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<% announcement = Announcement.active_and_current %>
-<% if announcement.present? %>
-<div id="announcement">
- <div class="op-toast -info">
- <div class="op-toast--content op-uc-container">
- <%= format_text announcement.text %>
- </div>
- </div>
-</div>
-<% end %>
diff --git a/app/views/homescreen/index.html.erb b/app/views/homescreen/index.html.erb
index 97fc0607cc7..f34a8f012d5 100644
--- a/app/views/homescreen/index.html.erb
+++ b/app/views/homescreen/index.html.erb
@@ -33,7 +33,7 @@ See COPYRIGHT and LICENSE files for more details.
end
%>
-<%= render partial: "announcements/show" %>
+<%= render Homescreen::AnnouncementComponent.new(announcement: @announcement) %>
<%= render Homescreen::BlocksGridComponent.new(homescreen: @homescreen) %>