Merge pull request #91 from lexintegritastech/improve-main-ui

Improvements for `doctrines` and `case lists`

app/components/doctrine_index_component/doctrine_index_component.html.erb

@@ -1,14 +1,14 @@
-<div class="row-flex m-3 mt-0 doctrine-content-body clickable-link" href="<%= show_url %>">
+<div class="row-flex m-3 mt-0 doctrine-content-body">
   <div class="container-sm <%= opts[:is_subjects_index].present? ? 'm-0 ps-0' : '' %>">
-    <p class="mb-0"> <%= raw content.html_safe %> </p>
+    <p class="mb-0 clickable-link" href="<%= show_url %>"> <%= raw content.html_safe %> </p>
    
     <div class="container-fluid p-0">
       <% document_title = jurisprudence.short_title || jurisprudence.title %>
       <% date_or_year = jurisprudence.docdate.present? ? jurisprudence.docdate.to_date.strftime("%B %d, %Y") : jurisprudence.year %>
-      <h5 style="color: darkred;"> <%= [document_title, jurisprudence.reference_number, date_or_year].join(", ") %> </h5>
+      <h5 class="clickable-link" style="color: darkred;" href="<%= document_path(jurisprudence, is_index_table: false, subject_ids: params[:subject_ids]) %>"> <%= [document_title, jurisprudence.reference_number, date_or_year].join(", ") %> </h5>
 
       <% annotations.each do |annotation| %>
-        <p class="mb-0 ms-3">
+        <p class="mb-0 ms-3 clickable-link" href="<%= show_url %>">
           <% annotated_documents_title = [] %>
           <% annotation.documents.each do |annotated_document| %>
             <% ad_title = annotated_document.short_title || annotated_document.title %>
@@ -21,7 +21,7 @@
         </p>
 
         <% if annotation.editor_notes.present? %>
-          <div class="row ms-5 mb-2">
+          <div class="row ms-5 mb-2 clickable-link" href="<%= show_url %>">
             <div class="col-sm-2 p-0" style="width: 105px;">
               <span> Editors Note: </span>
             </div>

app/components/document_doctrine_show_component/document_doctrine_show_component.html.erb

@@ -60,8 +60,14 @@
       <div class="col-sm-11 p-2">
         <%= text_field_tag :q, nil, class: "form-control", placeholder: "Search GR Number", data: { target: "document.input" } %>
       </div>
-      <div class="col p-2">
+      <div class="col-sm-1 p-2">
         <%= button_tag "Search", class: "btn btn-success", data: { action: "click->document#search" } %>
+        <a class="show-citer-finder" style="cursor: pointer;" data-bs-toggle="collapse" href="#citation_finder_collapse" role="button" aria-expanded="false" aria-controls="collapseExample"> 
+          <i class="fas fa-angle-double-down" style="font-size: 20px;color: darkred;" data-bs-toggle="tooltip" data-bs-placement="right" title="Open Citation Finder"></i> 
+        </a>
+      </div>
+      <div class="collapse col-sm-11 p-2" id="citation_finder_collapse">
+        <%= text_field_tag :citation_finder, nil, class: "form-control", placeholder: "Citation Finder", data: { target: "document.citation_finder" } %>
       </div>
     </div>
       

app/controllers/doctrines_controller.rb

@@ -70,6 +70,6 @@ class DoctrinesController < ApplicationController
     end
 
     def search_params
-      params.permit(jurisprudence_ids: [], subject_ids: [])
+      params.permit(:page, :per_page, jurisprudence_ids: [], subject_ids: [])
     end
 end

app/javascript/controllers/document_controller.js

@@ -1,6 +1,6 @@
 import ApplicationController from './application_controller'
 export default class extends ApplicationController {
-  static targets = ["input"]
+  static targets = ["input", "citation_finder"]
 
   connect () {
     super.connect()
@@ -8,13 +8,14 @@ export default class extends ApplicationController {
 
   search () {
     this.stimulate("DocumentReflex#render_case_lists_search_results", 
-                   { q: this.inputTarget.value, page: 1 },
+                   { q: this.inputTarget.value, citation_finder: this.element.dataset["citation_finder"], page: 1 },
                      this.element.dataset["doctrineId"])
   }
 
   paginate () {
     this.stimulate("DocumentReflex#render_case_lists_search_results", 
-                   { q: this.element.dataset["q"], page: this.element.dataset["page"] },
+                   { q: this.element.dataset["q"], citation_finder: this.element.dataset["citation_finder"], 
+                     page: this.element.dataset["page"] },
                      this.element.dataset["doctrineId"])
   }
 

app/reflexes/annotation_reflex.rb

@@ -5,7 +5,7 @@ class AnnotationReflex < ApplicationReflex
   include AnnotationSearch
 
   def render_document_search_results(search_params)
-    search = document_search(search_params)
+    search = document_search(search_params.merge(sort_by: %w[reference_number_texts title_texts short_title_texts]))
     @documents = search.results
     opts = { current_page: search_params[:page], q: search_params[:q] }
     morph "#annotatedDocumentsSearchResults", render(partial: "/shared/annotated_documents_search_results", locals: { documents: @documents, opts: opts })

app/reflexes/document_reflex.rb

@@ -4,9 +4,9 @@ class DocumentReflex < ApplicationReflex
   include DocumentSearch
 
   def render_case_lists_search_results(search_params, doctrine_id)
-    search = document_search(search_params)
+    search = document_search(search_params.merge(sort_by: %i[reference_number_texts title_texts short_title_texts]))
     @documents = search.results
-    opts = { doctrine_id: doctrine_id, current_page: search_params[:page], q: search_params[:q] }
+    opts = { doctrine_id: doctrine_id, current_page: search_params[:page], q: search_params[:q], citation_finder: search_params[:citation_finder] }
     morph "#caseListsCollapse", render(partial: "/shared/case_lists_search_results", locals: { documents: @documents, opts: opts })
   end
 

app/views/shared/_case_lists_no_results.html.erb

@@ -4,6 +4,12 @@
   </div>
   <div class="col-sm-1 p-2">
     <%= button_tag "Search", class: "btn btn-success", data: { action: "click->document#search" } %>
+    <a class="show-citer-finder" style="cursor: pointer;" data-bs-toggle="collapse" href="#citation_finder_collapse" role="button" aria-expanded="false" aria-controls="collapseExample"> 
+      <i class="fas fa-angle-double-down" style="font-size: 20px;color: darkred;" data-bs-toggle="tooltip" data-bs-placement="right" title="Open Citation Finder"></i> 
+    </a>
+  </div>
+  <div class="collapse col-sm-11 p-2" id="citation_finder_collapse">
+    <%= text_field_tag :citation_finder, nil, class: "form-control", placeholder: "Citation Finder", data: { target: "document.citation_finder" } %>
   </div>
 </div>
 

app/views/shared/_case_lists_search_results.html.erb

@@ -5,6 +5,12 @@
   </div>
   <div class="col-sm-1 p-2">
     <%= button_tag "Search", class: "btn btn-success", data: { action: "click->document#search" } %>
+    <a class="show-citer-finder" style="cursor: pointer;" data-bs-toggle="collapse" href="#citation_finder_collapse" role="button" aria-expanded="false" aria-controls="collapseExample"> 
+      <i class="fas fa-angle-double-down" style="font-size: 20px;color: darkred;" data-bs-toggle="tooltip" data-bs-placement="right" title="Open Citation Finder"></i> 
+    </a>
+  </div>
+  <div class="collapse col-sm-11 p-2" id="citation_finder_collapse">
+    <%= text_field_tag :citation_finder, opts[:citation_finder], class: "form-control", placeholder: "Citation Finder", data: { target: "document.citation_finder" } %>
   </div>
 </div>