From d01b3c06378f701b59034279a898c05756e4bc1f Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Wed, 24 Aug 2022 13:37:58 -0500
Subject: [PATCH] wiki pages: remove /wiki_pages/search page.

This page is unnecessary since you can already search wiki pages from the /wiki_pages listing.
---
 app/controllers/wiki_pages_controller.rb       | 5 -----
 app/views/static/site_map.html.erb             | 1 -
 app/views/wiki_pages/_secondary_links.html.erb | 3 +--
 app/views/wiki_pages/search.html.erb           | 7 -------
 config/routes.rb                               | 1 -
 test/functional/wiki_pages_controller_test.rb  | 7 -------
 6 files changed, 1 insertion(+), 23 deletions(-)
 delete mode 100644 app/views/wiki_pages/search.html.erb

diff --git a/app/controllers/wiki_pages_controller.rb b/app/controllers/wiki_pages_controller.rb
index 6830ae89b..44abc8c5f 100644
--- a/app/controllers/wiki_pages_controller.rb
+++ b/app/controllers/wiki_pages_controller.rb
@@ -24,11 +24,6 @@ class WikiPagesController < ApplicationController
     end
   end
 
-  def search
-    authorize WikiPage
-    render layout: "default"
-  end
-
   def show
     @wiki_page, found_by = WikiPage.find_by_id_or_title(params[:id])
     raise PageRemovedError if request.format.html? && @wiki_page&.artist.present? && @wiki_page.artist.is_banned? && !policy(@wiki_page.artist).can_view_banned?
diff --git a/app/views/static/site_map.html.erb b/app/views/static/site_map.html.erb
index 27e90aa8b..24cd35eb4 100644
--- a/app/views/static/site_map.html.erb
+++ b/app/views/static/site_map.html.erb
@@ -102,7 +102,6 @@
         <li><h2>Wiki</h2></li>
         <li><%= link_to_wiki "Help", "help:wiki" %></li>
         <li><%= link_to("Listing", wiki_pages_path) %></li>
-        <li><%= link_to("Search", search_wiki_pages_path) %></li>
         <li><%= link_to("Changes", wiki_page_versions_path) %></li>
       </ul>
       <ul>
diff --git a/app/views/wiki_pages/_secondary_links.html.erb b/app/views/wiki_pages/_secondary_links.html.erb
index 683438372..291cdc0e3 100644
--- a/app/views/wiki_pages/_secondary_links.html.erb
+++ b/app/views/wiki_pages/_secondary_links.html.erb
@@ -1,7 +1,6 @@
 <% content_for(:secondary_links) do %>
   <%= quick_search_form_for(:title_normalize, wiki_pages_path, "wiki pages", autocomplete: "wiki-page", redirect: true) %>
-  <%= subnav_link_to "Listing", wiki_pages_path %>
-  <%= subnav_link_to "Search", search_wiki_pages_path %>
+  <%= subnav_link_to "Search", wiki_pages_path %>
   <% if policy(WikiPage).new? %>
     <%= subnav_link_to "New", new_wiki_page_path %>
   <% end %>
diff --git a/app/views/wiki_pages/search.html.erb b/app/views/wiki_pages/search.html.erb
deleted file mode 100644
index c21832632..000000000
--- a/app/views/wiki_pages/search.html.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<div id="c-wiki-pages">
-  <div id="a-search">
-    <%= render "search" %>
-  </div>
-</div>
-
-<%= render "secondary_links" %>
diff --git a/config/routes.rb b/config/routes.rb
index 4827ef5d4..2a1c48316 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -297,7 +297,6 @@ Rails.application.routes.draw do
   end
   resources :wiki_pages, id: /.+?(?=\.json|\.xml|\.html)|.+/ do
     put :revert, on: :member
-    get :search, on: :collection
     get :show_or_new, on: :collection
   end
   resources :wiki_page_versions, :only => [:index, :show, :diff] do
diff --git a/test/functional/wiki_pages_controller_test.rb b/test/functional/wiki_pages_controller_test.rb
index 267cefcc9..3fdeb990b 100644
--- a/test/functional/wiki_pages_controller_test.rb
+++ b/test/functional/wiki_pages_controller_test.rb
@@ -66,13 +66,6 @@ class WikiPagesControllerTest < ActionDispatch::IntegrationTest
       end
     end
 
-    context "search action" do
-      should "work" do
-        get search_wiki_pages_path
-        assert_response :success
-      end
-    end
-
     context "show action" do
       setup do
         @wiki_page = as(@user) { create(:wiki_page) }