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

Refactor (DRY up) Overviews module routes

Alexander Brandon Colesfab363a0b31a
diff --git a/modules/overviews/app/components/overviews/project_custom_fields/edit_component.html.erb b/modules/overviews/app/components/overviews/project_custom_fields/edit_component.html.erb
index ad98c9c9742..ca92dca0eb0 100644
--- a/modules/overviews/app/components/overviews/project_custom_fields/edit_component.html.erb
+++ b/modules/overviews/app/components/overviews/project_custom_fields/edit_component.html.erb
@@ -6,7 +6,7 @@
model: @project,
method: :put,
data: { turbo: true, turbo_stream: true, "test-selector": "async-dialog-content" },
- url: update_project_custom_values_path(project_id: @project.id, section_id: @project_custom_field_section.id)
+ url: project_update_custom_values_path(project_id: @project.id, section_id: @project_custom_field_section.id)
) do |f|
render(
Projects::CustomFields::Form.new(
diff --git a/modules/overviews/app/controllers/overviews/overviews_controller.rb b/modules/overviews/app/controllers/overviews/overviews_controller.rb
index bf785b75de9..a87eb8023c9 100644
--- a/modules/overviews/app/controllers/overviews/overviews_controller.rb
+++ b/modules/overviews/app/controllers/overviews/overviews_controller.rb
@@ -47,7 +47,7 @@ module ::Overviews
)
end
- def update_project_custom_values
+ def project_update_custom_values
section = find_project_custom_field_section
service_call = ::Projects::UpdateService
.new(
diff --git a/modules/overviews/config/routes.rb b/modules/overviews/config/routes.rb
index 0c8651b37db..14daac3ea17 100644
--- a/modules/overviews/config/routes.rb
+++ b/modules/overviews/config/routes.rb
@@ -2,21 +2,19 @@
Rails.application.routes.draw do
constraints(project_id: Regexp.new("(?!(#{Project::RESERVED_IDENTIFIERS.join('|')})$)(\\w|-)+"), format: :html) do
- get "projects/:project_id",
- to: "overviews/overviews#show",
- as: :project_overview
- get "projects/:project_id/project_custom_fields_sidebar", to: "overviews/overviews#project_custom_fields_sidebar",
- as: :project_custom_fields_sidebar
- get "projects/:project_id/project_custom_field_section_dialog/:section_id", to: "overviews/overviews#project_custom_field_section_dialog",
- as: :project_custom_field_section_dialog
- put "projects/:project_id/update_project_custom_values/:section_id", to: "overviews/overviews#update_project_custom_values",
- as: :update_project_custom_values
-
- get "projects/:project_id/project_life_cycle_sidebar",
- to: "overviews/overviews#project_life_cycle_sidebar", as: :project_life_cycle_sidebar
-
scope "projects/:project_id", as: "project" do
scope module: "overviews" do
+ resource :overview, path: "/", only: [:show]
+
+ controller :overviews do
+ get "project_custom_fields_sidebar" => :project_custom_fields_sidebar, as: :custom_fields_sidebar
+ get "project_life_cycle_sidebar" => :project_life_cycle_sidebar, as: :life_cycle_sidebar
+
+ get "project_custom_field_section_dialog/:section_id" => :project_custom_field_section_dialog,
+ as: :custom_field_section_dialog
+ put "project_update_custom_values/:section_id" => :project_update_custom_values, as: :update_custom_values
+ end
+
namespace :widgets do
resource :project_status, only: %i[show update]
end
diff --git a/modules/overviews/lib/overviews/engine.rb b/modules/overviews/lib/overviews/engine.rb
index d36f35d8e37..3e32f611fa3 100644
--- a/modules/overviews/lib/overviews/engine.rb
+++ b/modules/overviews/lib/overviews/engine.rb
@@ -67,7 +67,7 @@ module Overviews
.controller_actions
.push(
"overviews/overviews/project_custom_field_section_dialog",
- "overviews/overviews/update_project_custom_values"
+ "overviews/overviews/project_update_custom_values"
)
OpenProject::AccessControl.permission(:view_project_phases)
diff --git a/modules/overviews/spec/routing/overviews_routing_spec.rb b/modules/overviews/spec/routing/overviews_routing_spec.rb
index fa7feca28c5..f8f659f15fa 100644
--- a/modules/overviews/spec/routing/overviews_routing_spec.rb
+++ b/modules/overviews/spec/routing/overviews_routing_spec.rb
@@ -57,10 +57,10 @@ RSpec.describe Overviews::OverviewsController do
end
it do
- expect(put("/projects/my-project/update_project_custom_values/44"))
+ expect(put("/projects/my-project/project_update_custom_values/44"))
.to route_to(
controller: "overviews/overviews",
- action: "update_project_custom_values",
+ action: "project_update_custom_values",
project_id: "my-project",
section_id: "44"
)
@@ -102,10 +102,10 @@ RSpec.describe Overviews::OverviewsController do
end
it do
- expect(put(update_project_custom_values_path("my-project", 44)))
+ expect(put(project_update_custom_values_path("my-project", 44)))
.to route_to(
controller: "overviews/overviews",
- action: "update_project_custom_values",
+ action: "project_update_custom_values",
project_id: "my-project",
section_id: "44"
)
diff --git a/spec/permissions/edit_project_attributes_spec.rb b/spec/permissions/edit_project_attributes_spec.rb
index a86fdae7f4d..cd1cc024291 100644
--- a/spec/permissions/edit_project_attributes_spec.rb
+++ b/spec/permissions/edit_project_attributes_spec.rb
@@ -39,5 +39,5 @@ RSpec.describe Overviews::OverviewsController, "edit_project_attributes permissi
check_permission_required_for("overviews/overviews#project_custom_field_section_dialog", :edit_project_attributes)
# update project attributes with edit_project permission, deeper permission check via contract in place
- check_permission_required_for("overviews/overviews#update_project_custom_values", :edit_project_attributes)
+ check_permission_required_for("overviews/overviews#project_update_custom_values", :edit_project_attributes)
end