Merge pull request #2063 from alphagov/tidy-up-reports-page

Tidy up reports page to only use design system and remove toggle
alphagov · Feb 16, 2024 · cd4f167 · cd4f167
2 parents 9d7847f + f27a0df
commit cd4f167
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 313 deletions.
diff --git a/app/controllers/legacy_reports_controller.rb b/app/controllers/legacy_reports_controller.rb
diff --git a/app/views/legacy_reports/index.html.erb b/app/views/legacy_reports/index.html.erb
diff --git a/config/brakeman.ignore b/config/brakeman.ignore
@@ -1,51 +1,5 @@
 {
   "ignored_warnings": [
-    {
-      "warning_type": "Redirect",
-      "warning_code": 18,
-      "fingerprint": "17210c84682f1087da739d7c48998ec063833a0ead94cab74161f376a02902c8",
-      "check_name": "Redirect",
-      "message": "Possible unprotected redirect",
-      "file": "app/controllers/legacy_reports_controller.rb",
-      "line": 25,
-      "link": "https://brakemanscanner.org/docs/warning_types/redirect/",
-      "code": "redirect_to(Report.new(\"content_workflow\").url, :allow_other_host => true)",
-      "render_path": null,
-      "location": {
-        "type": "method",
-        "class": "LegacyReportsController",
-        "method": "content_workflow"
-      },
-      "user_input": "Report.new(\"content_workflow\").url",
-      "confidence": "Weak",
-      "cwe_id": [
-        601
-      ],
-      "note": ""
-    },
-    {
-      "warning_type": "Redirect",
-      "warning_code": 18,
-      "fingerprint": "21d15a1dedb4e98b76dd4206d5d9755c0c2fbb5ac22a3845342390fb14f32405",
-      "check_name": "Redirect",
-      "message": "Possible unprotected redirect",
-      "file": "app/controllers/legacy_reports_controller.rb",
-      "line": 9,
-      "link": "https://brakemanscanner.org/docs/warning_types/redirect/",
-      "code": "redirect_to(Report.new(\"editorial_progress\").url, :allow_other_host => true)",
-      "render_path": null,
-      "location": {
-        "type": "method",
-        "class": "LegacyReportsController",
-        "method": "progress"
-      },
-      "user_input": "Report.new(\"editorial_progress\").url",
-      "confidence": "Weak",
-      "cwe_id": [
-        601
-      ],
-      "note": ""
-    },
     {
       "warning_type": "Redirect",
       "warning_code": 18,
@@ -69,29 +23,6 @@
       ],
       "note": ""
     },
-    {
-      "warning_type": "Redirect",
-      "warning_code": 18,
-      "fingerprint": "547dd1ed93af0f3b1b537207879e41d3acc5d30344b527cfe61a7fa99e8bcfe2",
-      "check_name": "Redirect",
-      "message": "Possible unprotected redirect",
-      "file": "app/controllers/legacy_reports_controller.rb",
-      "line": 33,
-      "link": "https://brakemanscanner.org/docs/warning_types/redirect/",
-      "code": "redirect_to(Report.new(\"all_urls\").url, :allow_other_host => true)",
-      "render_path": null,
-      "location": {
-        "type": "method",
-        "class": "LegacyReportsController",
-        "method": "all_urls"
-      },
-      "user_input": "Report.new(\"all_urls\").url",
-      "confidence": "Weak",
-      "cwe_id": [
-        601
-      ],
-      "note": ""
-    },
     {
       "warning_type": "Dangerous Send",
       "warning_code": 23,
@@ -126,29 +57,6 @@
       ],
       "note": ""
     },
-    {
-      "warning_type": "Redirect",
-      "warning_code": 18,
-      "fingerprint": "8b9b1897c23071c0620b3b89373e4b67c9c018f55d2bf9c9b10139194112876e",
-      "check_name": "Redirect",
-      "message": "Possible unprotected redirect",
-      "file": "app/controllers/legacy_reports_controller.rb",
-      "line": 29,
-      "link": "https://brakemanscanner.org/docs/warning_types/redirect/",
-      "code": "redirect_to(Report.new(\"all_content_workflow\").url, :allow_other_host => true)",
-      "render_path": null,
-      "location": {
-        "type": "method",
-        "class": "LegacyReportsController",
-        "method": "all_content_workflow"
-      },
-      "user_input": "Report.new(\"all_content_workflow\").url",
-      "confidence": "Weak",
-      "cwe_id": [
-        601
-      ],
-      "note": ""
-    },
     {
       "warning_type": "Redirect",
       "warning_code": 18,
@@ -172,29 +80,6 @@
       ],
       "note": ""
     },
-    {
-      "warning_type": "Redirect",
-      "warning_code": 18,
-      "fingerprint": "907123917bfc82d11454ff52d42cccf5a906b3340f2bd0e67e48b4a02e326254",
-      "check_name": "Redirect",
-      "message": "Possible unprotected redirect",
-      "file": "app/controllers/legacy_reports_controller.rb",
-      "line": 13,
-      "link": "https://brakemanscanner.org/docs/warning_types/redirect/",
-      "code": "redirect_to(Report.new(\"organisation_content\").url, :allow_other_host => true)",
-      "render_path": null,
-      "location": {
-        "type": "method",
-        "class": "LegacyReportsController",
-        "method": "organisation_content"
-      },
-      "user_input": "Report.new(\"organisation_content\").url",
-      "confidence": "Weak",
-      "cwe_id": [
-        601
-      ],
-      "note": ""
-    },
     {
       "warning_type": "Dynamic Render Path",
       "warning_code": 15,
@@ -295,29 +180,6 @@
       ],
       "note": ""
     },
-    {
-      "warning_type": "Redirect",
-      "warning_code": 18,
-      "fingerprint": "a9dfe519dba7fb86018e3cf55f2aa7184127d83afa1c6db8b15b788aab813ad0",
-      "check_name": "Redirect",
-      "message": "Possible unprotected redirect",
-      "file": "app/controllers/legacy_reports_controller.rb",
-      "line": 21,
-      "link": "https://brakemanscanner.org/docs/warning_types/redirect/",
-      "code": "redirect_to(Report.new(\"all_edition_churn\").url, :allow_other_host => true)",
-      "render_path": null,
-      "location": {
-        "type": "method",
-        "class": "LegacyReportsController",
-        "method": "all_edition_churn"
-      },
-      "user_input": "Report.new(\"all_edition_churn\").url",
-      "confidence": "Weak",
-      "cwe_id": [
-        601
-      ],
-      "note": ""
-    },
     {
       "warning_type": "Redirect",
       "warning_code": 18,
@@ -386,29 +248,6 @@
         601
       ],
       "note": ""
-    },
-    {
-      "warning_type": "Redirect",
-      "warning_code": 18,
-      "fingerprint": "df4a142e2b4cccb80d2434a4195dd33a2873dfd4f1f7cac0f021c14fab463e3f",
-      "check_name": "Redirect",
-      "message": "Possible unprotected redirect",
-      "file": "app/controllers/legacy_reports_controller.rb",
-      "line": 17,
-      "link": "https://brakemanscanner.org/docs/warning_types/redirect/",
-      "code": "redirect_to(Report.new(\"edition_churn\").url, :allow_other_host => true)",
-      "render_path": null,
-      "location": {
-        "type": "method",
-        "class": "LegacyReportsController",
-        "method": "edition_churn"
-      },
-      "user_input": "Report.new(\"edition_churn\").url",
-      "confidence": "Weak",
-      "cwe_id": [
-        601
-      ],
-      "note": ""
     }
   ],
   "updated": "2024-01-24 11:41:24 +0000",

diff --git a/config/features.rb b/config/features.rb
@@ -9,10 +9,6 @@
             description: "A feature only used by tests; not to be used for any actual features."
   end
 
-  feature :design_system_reports_page,
-          default: true,
-          description: "A transition of the reports page to use the GOV.UK Design System"
-
   feature :design_system_downtime_new,
           default: false,
           description: "A transition of the add downtime page to use the GOV.UK Design System"

diff --git a/config/routes.rb b/config/routes.rb
@@ -54,24 +54,14 @@
     resource :downtime, only: %i[new create edit update destroy], controller: "legacy_downtimes"
   end
 
-  constraints FeatureConstraint.new("design_system_reports_page") do
-    get "reports" => "reports#index", as: :reports
-    get "reports/progress" => "reports#progress", as: :progress_report
-    get "reports/organisation-content" => "reports#organisation_content", :as => :organisation_content_report
-    get "reports/edition-churn" => "reports#edition_churn", as: "edition_churn_report"
-    get "reports/all-edition-churn" => "reports#all_edition_churn", as: "all_edition_churn_report"
-    get "reports/content-workflow" => "reports#content_workflow", as: "content_workflow_report"
-    get "reports/all-content-workflow" => "reports#all_content_workflow", as: "all_content_workflow_report"
-    get "reports/all-urls" => "reports#all_urls", as: "all_urls_report"
-  end
-  get "reports" => "legacy_reports#index"
-  get "reports/progress" => "legacy_reports#progress"
-  get "reports/organisation-content" => "legacy_reports#organisation_content"
-  get "reports/edition-churn" => "legacy_reports#edition_churn"
-  get "reports/all-edition-churn" => "legacy_reports#all_edition_churn"
-  get "reports/content-workflow" => "legacy_reports#content_workflow"
-  get "reports/all-content-workflow" => "legacy_reports#all_content_workflow"
-  get "reports/all-urls" => "legacy_reports#all_urls"
+  get "reports" => "reports#index", as: :reports
+  get "reports/progress" => "reports#progress", as: :progress_report
+  get "reports/organisation-content" => "reports#organisation_content", :as => :organisation_content_report
+  get "reports/edition-churn" => "reports#edition_churn", as: "edition_churn_report"
+  get "reports/all-edition-churn" => "reports#all_edition_churn", as: "all_edition_churn_report"
+  get "reports/content-workflow" => "reports#content_workflow", as: "content_workflow_report"
+  get "reports/all-content-workflow" => "reports#all_content_workflow", as: "all_content_workflow_report"
+  get "reports/all-urls" => "reports#all_urls", as: "all_urls_report"
 
   get "user_search" => "user_search#index"
 

diff --git a/test/functional/legacy_reports_controller_test.rb b/test/functional/legacy_reports_controller_test.rb
diff --git a/test/integration/routes_test.rb b/test/integration/routes_test.rb
@@ -1,21 +1,7 @@
 require "integration_test_helper"
 
 class RoutesTest < ActionDispatch::IntegrationTest
-  should "route to new reports controller when 'design_system_reports_page' toggle is enabled" do
-    test_strategy = Flipflop::FeatureSet.current.test!
-    test_strategy.switch!(:design_system_reports_page, true)
-
-    assert_routing("/reports", controller: "reports", action: "index")
-  end
-
-  should "route to legacy reports controller when 'design_system_reports_page' toggle is disabled" do
-    test_strategy = Flipflop::FeatureSet.current.test!
-    test_strategy.switch!(:design_system_reports_page, false)
-
-    assert_routing("/reports", controller: "legacy_reports", action: "index")
-  end
-
-  should "route to legacy reports controller when 'design_system_downtime_edit' toggle is enabled" do
+  should "route to downtimes controller when 'design_system_downtime_edit' toggle is enabled" do
     test_strategy = Flipflop::FeatureSet.current.test!
     test_strategy.switch!(:design_system_downtime_edit, true)
     edition = FactoryBot.create(:edition)