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
Ruby agile-developmentangularbcfboardsbug-trackerganttgantt-chartifcissue-trackerjira-alternativekanbanopenprojectproduct-managementproject-managementproject-planningroadmaprubyscrumtimelineworkflows
Move news widget code to overviews module
Henriette Darge43b2e01fe716
diff --git a/frontend/src/app/shared/components/grids/widgets/news-beta/news-beta.component.ts b/frontend/src/app/shared/components/grids/widgets/news-beta/news-beta.component.tsindex a7cdd4ddcfd..294ba9d5218 100644--- a/frontend/src/app/shared/components/grids/widgets/news-beta/news-beta.component.ts+++ b/frontend/src/app/shared/components/grids/widgets/news-beta/news-beta.component.ts@@ -35,6 +35,6 @@ import { AbstractTurboWidgetComponent } from 'core-app/shared/components/grids/wstandalone: false,})export class WidgetNewsBetaComponent extends AbstractTurboWidgetComponent {- override frameId = 'grids-widgets-news-component';+ override frameId = 'overviews-widgets-news-component';override name = 'news';}diff --git a/modules/grids/config/routes.rb b/modules/grids/config/routes.rbdeleted file mode 100644index 23a06676c9f..00000000000--- a/modules/grids/config/routes.rb+++ /dev/null@@ -1,47 +0,0 @@-# 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.-#++--Rails.application.routes.draw do- constraints(Constraints::ProjectIdentifier) do- scope "projects/:project_id", as: "project" do- scope module: "grids" do- namespace :widgets do- resource :news, only: %i[show]- end- end- end- end-- scope module: "grids" do- namespace :widgets do- resource :news, only: %i[show]- end- end-enddiff --git a/modules/grids/lib/grids/engine.rb b/modules/grids/lib/grids/engine.rbindex 763cd34dec3..5baf8626711 100644--- a/modules/grids/lib/grids/engine.rb+++ b/modules/grids/lib/grids/engine.rb@@ -8,16 +8,6 @@ module Grids"#{root}/grids/#{id}/attachments"end- initializer "grids.permissions" do- Rails.application.reloader.to_prepare do- OpenProject::AccessControl.permission(:view_news)- .controller_actions- .push(- "grids/widgets/news/show"- )- end- end-config.to_prepare doQueries::Register.register(Grids::Query) dofilter Grids::Filters::ScopeFilterdiff --git a/modules/grids/spec/routing/widget_routing_spec.rb b/modules/grids/spec/routing/widget_routing_spec.rbdeleted file mode 100644index bd3ac6ed5cc..00000000000--- a/modules/grids/spec/routing/widget_routing_spec.rb+++ /dev/null@@ -1,69 +0,0 @@-# 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.-#++--require "rails_helper"--RSpec.describe Grids::WidgetController do- describe "news routing" do- describe "GET #show" do- context "for root" do- it do- expect(get("/widgets/news"))- .to route_to(controller: "grids/widgets/news", action: "show")- end- end-- context "with project" do- it do- expect(get("/projects/my-project/widgets/news"))- .to route_to(controller: "grids/widgets/news", action: "show", project_id: "my-project")- end- end- end- end-- describe "news named routing" do- describe "GET #show" do- context "for root" do- it do- expect(get(widgets_news_path))- .to route_to(controller: "grids/widgets/news", action: "show")- end- end-- context "with project" do- it do- expect(get(project_widgets_news_path("my-project")))- .to route_to(controller: "grids/widgets/news", action: "show", project_id: "my-project")- end- end- end- end-enddiff --git a/modules/grids/app/controllers/grids/widgets/news_controller.rb b/modules/overviews/app/controllers/overviews/widgets/news_controller.rbsimilarity index 94%rename from modules/grids/app/controllers/grids/widgets/news_controller.rbrename to modules/overviews/app/controllers/overviews/widgets/news_controller.rbindex 8ba1027006d..d64f9cfe9f7 100644--- a/modules/grids/app/controllers/grids/widgets/news_controller.rb+++ b/modules/overviews/app/controllers/overviews/widgets/news_controller.rb@@ -28,5 +28,5 @@# See COPYRIGHT and LICENSE files for more details.#++-class Grids::Widgets::NewsController < Grids::WidgetController+class Overviews::Widgets::NewsController < Overviews::WidgetControllerenddiff --git a/modules/grids/app/views/grids/widgets/news/show.html.erb b/modules/overviews/app/views/overviews/widgets/news/show.html.erbsimilarity index 100%rename from modules/grids/app/views/grids/widgets/news/show.html.erbrename to modules/overviews/app/views/overviews/widgets/news/show.html.erbdiff --git a/modules/overviews/config/routes.rb b/modules/overviews/config/routes.rbindex 3e24165a5ec..ba918c70f4e 100644--- a/modules/overviews/config/routes.rb+++ b/modules/overviews/config/routes.rb@@ -19,6 +19,7 @@ Rails.application.routes.draw donamespace :widgets doresource :project_status, only: %i[show update]+ resource :news, only: %i[show]endendenddiff --git a/modules/overviews/lib/overviews/engine.rb b/modules/overviews/lib/overviews/engine.rbindex 4b930b01f0a..121293ac501 100644--- a/modules/overviews/lib/overviews/engine.rb+++ b/modules/overviews/lib/overviews/engine.rb@@ -103,6 +103,12 @@ module Overviewsrequire: :memberendend++ OpenProject::AccessControl.permission(:view_news)+ .controller_actions+ .push(+ "overviews/widgets/news/show"+ )endenddiff --git a/modules/overviews/spec/components/overviews/widgets/news_component_spec.rb b/modules/overviews/spec/components/overviews/widgets/news_component_spec.rbindex 9960530ac0b..d6c1627d06e 100644--- a/modules/overviews/spec/components/overviews/widgets/news_component_spec.rb+++ b/modules/overviews/spec/components/overviews/widgets/news_component_spec.rb@@ -43,7 +43,7 @@ RSpec.describe Overviews::Widgets::NewsComponent, type: :component docurrent_user { user }subject(:rendered_component) do- render_component(project:, current_user:)+ render_component(project)endit "renders turbo-frame component wrapper" do@@ -62,9 +62,8 @@ RSpec.describe Overviews::Widgets::NewsComponent, type: :component dolet!(:news) { create_list(:news, 2, author:) }it "renders news items", :aggregate_failures do- expect(rendered_component).to have_list_item(count: 3)- expect(rendered_component).to have_list_item(count: 1, aria: { hidden: true }) # dividers- expect(rendered_component).to have_list_item(position: 3) do |item|+ expect(rendered_component).to have_list_item(count: 2)+ expect(rendered_component).to have_list_item(position: 2) 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)@@ -87,9 +86,8 @@ RSpec.describe Overviews::Widgets::NewsComponent, type: :component dolet!(:news) { create_list(:news, 3, project:, author:) }it "renders news items", :aggregate_failures do- expect(rendered_component).to have_list_item(count: 5)- expect(rendered_component).to have_list_item(count: 2, aria: { hidden: true }) # dividers- expect(rendered_component).to have_list_item(position: 5) do |item|+ expect(rendered_component).to have_list_item(count: 3)+ expect(rendered_component).to have_list_item(position: 3) 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)diff --git a/modules/grids/spec/controllers/grids/widgets/news_controller_spec.rb b/modules/overviews/spec/controllers/overviews/widgets/news_controller_spec.rbsimilarity index 97%rename from modules/grids/spec/controllers/grids/widgets/news_controller_spec.rbrename to modules/overviews/spec/controllers/overviews/widgets/news_controller_spec.rbindex dfc408fa2c6..4b66bbe80fe 100644--- a/modules/grids/spec/controllers/grids/widgets/news_controller_spec.rb+++ b/modules/overviews/spec/controllers/overviews/widgets/news_controller_spec.rb@@ -30,7 +30,7 @@require "rails_helper"-RSpec.describe Grids::Widgets::NewsController do+RSpec.describe Overviews::Widgets::NewsController doshared_let(:project) { create(:project) }shared_let(:user) { create(:user, member_with_permissions: { project => %i[view_news] }) }current_user { user }diff --git a/modules/grids/spec/permissions/widgets/news_spec.rb b/modules/overviews/spec/permissions/widgets/news_spec.rbsimilarity index 85%rename from modules/grids/spec/permissions/widgets/news_spec.rbrename to modules/overviews/spec/permissions/widgets/news_spec.rbindex bc5faa44950..494512e8509 100644--- a/modules/grids/spec/permissions/widgets/news_spec.rb+++ b/modules/overviews/spec/permissions/widgets/news_spec.rb@@ -31,8 +31,8 @@require "spec_helper"require "support/permission_specs"-RSpec.describe Grids::Widgets::NewsController, "permissions", type: :controller do # rubocop:disable RSpec/EmptyExampleGroup,RSpec/SpecFilePathFormat+RSpec.describe Overviews::Widgets::NewsController, "permissions", type: :controller do # rubocop:disable RSpec/EmptyExampleGroup,RSpec/SpecFilePathFormatinclude PermissionSpecs- check_permission_required_for("grids/widgets/news#show", :view_news)+ check_permission_required_for("overviews/widgets/news#show", :view_news)enddiff --git a/modules/overviews/spec/routing/widget_routing_spec.rb b/modules/overviews/spec/routing/widget_routing_spec.rbindex e25a6a6e6da..15e6903499b 100644--- a/modules/overviews/spec/routing/widget_routing_spec.rb+++ b/modules/overviews/spec/routing/widget_routing_spec.rb@@ -84,4 +84,40 @@ RSpec.describe Overviews::WidgetController doendendend++ describe "news routing" do+ describe "GET #show" do+ context "for root" do+ it do+ expect(get("/widgets/news"))+ .to route_to(controller: "overviews/widgets/news", action: "show")+ end+ end++ context "with project" do+ it do+ expect(get("/projects/my-project/widgets/news"))+ .to route_to(controller: "overviews/widgets/news", action: "show", project_id: "my-project")+ end+ end+ end+ end++ describe "news named routing" do+ describe "GET #show" do+ context "for root" do+ it do+ expect(get(widgets_news_path))+ .to route_to(controller: "overviews/widgets/news", action: "show")+ end+ end++ context "with project" do+ it do+ expect(get(project_widgets_news_path("my-project")))+ .to route_to(controller: "overviews/widgets/news", action: "show", project_id: "my-project")+ end+ end+ end+ endend