WIP: Improved search

Includes kaminari for pagination

Author: rsmithlal

app/controllers/better_together/search_controller.rb

@@ -5,11 +5,42 @@ module BetterTogether
   class SearchController < ApplicationController
     def search
       @query = params[:q]
-      @results = if @query.present?
-                   BetterTogether::Page.search(@query).records
-                 else
-                   []
-                 end
+
+      if @query.present?
+        search_response = BetterTogether::Page.search({
+          query: {
+            bool: {
+              must: [
+                {
+                  multi_match: {
+                    query: @query,
+                    fields: ['title^2', 'content', 'blocks.rich_text_content.body'],
+                    type: 'best_fields'
+                  }
+                }
+              ]
+            }
+          },
+          highlight: {
+            fields: {
+              title: {},
+              content: {},
+              'blocks.rich_text_content.body': {
+                fragment_size: 150,
+                number_of_fragments: 3
+              }
+            }
+          }
+        })
+
+        # Use Kaminari for pagination
+        @results = Kaminari.paginate_array(search_response.records.to_a).page(params[:page]).per(10)
+        @highlights = search_response.response['hits']['hits']
+      else
+        @results = BetterTogether::Page.none.page(params[:page]).per(10)
+        @highlights = []
+      end
     end
+
   end
 end

app/models/better_together/content/block.rb

@@ -85,6 +85,41 @@ def to_s
                              'new'
                            end}"
       end
+
+       # Method to return the content used for Elasticsearch indexing
+       def cached_content
+        {
+          id: id,
+          type: type,
+          content: block_content,
+          translations: translated_content
+        }
+      end
+
+      protected
+
+      # Define how to extract the main content from the block
+      def block_content
+        if respond_to?(:rich_text_content)
+          rich_text_content&.body&.to_plain_text
+        elsif respond_to?(:background_image_file)
+          background_image_file.filename.to_s
+        else
+          ''
+        end
+      end
+
+      # Extract translations if available
+      def translated_content
+        return {} unless respond_to?(:mobility_attributes)
+
+        I18n.available_locales.each_with_object({}) do |locale, translations|
+          translations[locale] = {}
+          mobility_attributes.each do |attr|
+            translations[locale][attr] = send("#{attr}_#{locale}")
+          end
+        end
+      end
     end
   end
 end

app/models/better_together/page.rb

@@ -35,6 +35,7 @@ class Page < ApplicationRecord
         indexes :title, as: 'title'
 
         indexes :blocks, type: 'nested' do
+          indexes :type, type: 'keyword'
           indexes :rich_text_content, type: 'nested' do
             indexes :body, type: 'text'
           end

app/models/concerns/better_together/searchable.rb

@@ -18,8 +18,8 @@ module Searchable
 
       # Need to create another way to access elasticsearch import.
       # class.import is using by activerecord-import, I think
-      def self.elastic_import
-        __elasticsearch__.import unless Rails.env.test?
+      def self.elastic_import args={}
+        __elasticsearch__.import(args) unless Rails.env.test?
       end
     end
 

app/views/better_together/search/search.html.erb

@@ -1,29 +1,41 @@
-<!-- app/views/pages/search.html.erb -->
-
-<div class="container mt-4">
-  <!-- Search Results -->
+<div class="container mt-5">
   <% if @query.present? %>
-    <h2>Search Results for "<%= @query %>"</h2>
+    <h2 class="mb-4">Search Results for "<%= @query %>"</h2>
 
     <% if @results.any? %>
-      <table class="table table-striped mt-3">
-        <thead>
-          <tr>
-            <th>Title</th>
-            <th>Content</th>
-          </tr>
-        </thead>
-        <tbody>
-          <% @results.each do |result| %>
-            <tr>
-              <td><%= link_to result.title, render_page_path(result.slug) %></td>
-              <td><%= truncate(strip_tags(result.content.to_s), length: 100) %></td>
-            </tr>
-          <% end %>
-        </tbody>
-      </table>
+      <div class="row">
+        <% @results.each_with_index do |result, index| %>
+          <% highlight = @highlights[index]['highlight'] || {} %>
+          <div class="col-md-6 mb-4">
+            <div class="card shadow-sm">
+              <div class="card-body">
+                <h5 class="card-title">
+                  <%= link_to result.title, render_page_path(result.slug), class: "text-decoration-none" %>
+                </h5>
+
+                <p class="card-text">
+                  <% if highlight['title'] %>
+                    <%= highlight['title'].first.html_safe %>
+                  <% elsif highlight['content'] %>
+                    <%= highlight['content'].first.html_safe %>
+                  <% elsif highlight['blocks.rich_text_content.body'] %>
+                    <%= highlight['blocks.rich_text_content.body'].first.html_safe %>
+                  <% else %>
+                    <%= truncate(strip_tags(result.content.to_s), length: 150) %>
+                  <% end %>
+                </p>
+
+                <a href="<%= render_page_path(result.slug) %>" class="btn btn-primary mt-2">View More</a>
+              </div>
+            </div>
+          </div>
+        <% end %>
+      </div>
+      <%= paginate @results %>
     <% else %>
-      <p>No results found for "<%= @query %>". Please try another search term.</p>
+      <div class="alert alert-warning mt-4">
+        <p>No results found for "<%= @query %>". Please try another search term.</p>
+      </div>
     <% end %>
   <% end %>
 </div>

better_together.gemspec

@@ -49,6 +49,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'image_processing', '~> 1.2'
   spec.add_dependency 'importmap-rails', '~> 2.0'
   spec.add_dependency 'jsonapi-resources', '>= 0.10.0'
+  spec.add_dependency 'kaminari'
   spec.add_dependency 'memory_profiler'
   spec.add_dependency 'mobility', '>= 1.0.1', '< 2.0'
   spec.add_dependency 'mobility-actiontext', '~> 1.1'

lib/better_together/engine.rb

@@ -22,6 +22,7 @@
 require 'humanize_boolean'
 require 'i18n-timezones'
 require 'importmap-rails'
+require 'kaminari'
 require 'noticed'
 require 'premailer/rails'
 require 'reform/rails'