Feature search function (#753)

* adding search button function in the index page to query serach terms against the Site Name,Fits_id and Subnet CIDR * updated site controller to return sites in the order of the fits id --------- Co-authored-by: Jahir <[email protected]>
ministryofjustice · Nov 24, 2023 · 0a10c7c · 0a10c7c
1 parent 45a5b99
commit 0a10c7c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/app/controllers/sites_controller.rb b/app/controllers/sites_controller.rb
@@ -4,6 +4,16 @@ class SitesController < ApplicationController
   def index
     @sites = Site.order(:fits_id).all
     @navigation_crumbs = [["Home", root_path]]
+    @sites = if params[:query].present?
+               Site.where('name LIKE ? OR fits_id LIKE ? OR id IN (
+               SELECT sn.site_id
+               FROM subnets s
+               INNER JOIN shared_networks sn ON s.shared_network_id = sn.id
+               WHERE s.cidr_block LIKE ?
+             )', "%#{params[:query]}%", "%#{params[:query]}%", "%#{params[:query]}%")
+             else
+               Site.order(:fits_id).all
+             end
   end
 
   def show

diff --git a/app/views/sites/index.html.erb b/app/views/sites/index.html.erb
@@ -5,7 +5,13 @@
   <%= link_to "Client classes", client_classes_path, class: "govuk-button govuk-button--secondary" %>
 
   <h3 class="govuk-heading-m">Sites</h3>
-
+  <!-- Adding the search form -->
+  <div style="text-align: right;class="govuk-grid-column-one-half search_bar">
+    <%= form_tag(dhcp_path, method: :get, class: "govuk-form") do %>
+      <%= text_field_tag :query, params[:query], placeholder: "Search sites by FITS ID or name...", class: 'govuk-input govuk-input--width-10' %>
+      <%= submit_tag "Search", class: "govuk-button", "data-module" => "govuk-button" %>
+    <% end %>
+  </div>
   <% if can? :create, Site %>
     <%= link_to "Create a new site", new_site_path, class: "govuk-button" %>
   <% end %>