+ {{/if}}
+ {{#load-more selector=".fps-result" action="loadMore"}}
{{#each model.posts as |result|}}
@@ -124,11 +115,30 @@
{{/each}}
- {{#if hasResults}}
-
- {{/if}}
+ {{#conditional-loading-spinner condition=loading }}
+ {{#unless hasResults}}
+
+ {{#if searchActive}}
+ {{i18n "search.no_results"}}
+ {{/if}}
+
+ {{/unless}}
+
+ {{#if hasResults}}
+ {{#unless loading}}
+
+ {{/unless}}
+ {{/if}}
+ {{/conditional-loading-spinner}}
+
+ {{/load-more}}
- {{/conditional-loading-spinner}}
{{/d-section}}
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index a348ac7505b..a07df59f57b 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -13,7 +13,10 @@ class SearchController < ApplicationController
type_filter: 'topic',
guardian: guardian,
include_blurbs: true,
- blurb_length: 300
+ blurb_length: 300,
+ page: if params[:page].to_i <= 10
+ [params[:page].to_i, 1].max
+ end
}
context, type = lookup_search_context
diff --git a/app/serializers/grouped_search_result_serializer.rb b/app/serializers/grouped_search_result_serializer.rb
index e3cfbe855f0..bc4a5a6a7e3 100644
--- a/app/serializers/grouped_search_result_serializer.rb
+++ b/app/serializers/grouped_search_result_serializer.rb
@@ -2,7 +2,7 @@ class GroupedSearchResultSerializer < ApplicationSerializer
has_many :posts, serializer: SearchPostSerializer
has_many :users, serializer: SearchResultUserSerializer
has_many :categories, serializer: BasicCategorySerializer
- attributes :more_posts, :more_users, :more_categories, :term, :search_log_id
+ attributes :more_posts, :more_users, :more_categories, :term, :search_log_id, :more_full_page_results
def search_log_id
object.search_log_id
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 56db23ec91f..0d08df5c566 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1341,6 +1341,7 @@ en:
searching: "Searching ..."
post_format: "#{{post_number}} by {{username}}"
results_page: "Search Results"
+ more_results: "There are more results. Please narrow your search criteria."
context:
user: "Search posts by @{{username}}"
diff --git a/lib/search.rb b/lib/search.rb
index 67f8a239936..9d5002ffeff 100644
--- a/lib/search.rb
+++ b/lib/search.rb
@@ -155,8 +155,8 @@ class Search
@search_context = @opts[:search_context]
@include_blurbs = @opts[:include_blurbs] || false
@blurb_length = @opts[:blurb_length]
- @limit = Search.per_facet
@valid = true
+ @page = @opts[:page]
# Removes any zero-width characters from search terms
term.to_s.gsub!(/[\u200B-\u200D\uFEFF]/, '')
@@ -174,10 +174,6 @@ class Search
@search_context = @guardian.user
end
- if @opts[:type_filter].present?
- @limit = Search.per_filter
- end
-
@results = GroupedSearchResults.new(
@opts[:type_filter],
clean_term,
@@ -187,6 +183,22 @@ class Search
)
end
+ def limit
+ if @opts[:type_filter].present?
+ Search.per_filter + 1
+ else
+ Search.per_facet + 1
+ end
+ end
+
+ def offset
+ if @page && @opts[:type_filter].present?
+ (@page - 1) * Search.per_filter
+ else
+ 0
+ end
+ end
+
def valid?
@valid
end
@@ -557,7 +569,6 @@ class Search
raise Discourse::InvalidAccess.new("invalid type filter") unless Search.facets.include?(@results.type_filter)
send("#{@results.type_filter}_search")
else
- @limit = Search.per_facet + 1
unless @search_context
user_search if @term.present?
category_search if @term.present?
@@ -753,6 +764,7 @@ class Search
posts = posts.where("(categories.id IS NULL) OR (NOT categories.read_restricted)").references(:categories)
end
+ posts = posts.offset(offset)
posts.limit(limit)
end
@@ -795,10 +807,10 @@ class Search
query =
if @order == :likes
# likes are a pain to aggregate so skip
- posts_query(@limit, private_messages: opts[:private_messages])
+ posts_query(limit, private_messages: opts[:private_messages])
.select('topics.id', "posts.post_number")
else
- posts_query(@limit, aggregate_search: true, private_messages: opts[:private_messages])
+ posts_query(limit, aggregate_search: true, private_messages: opts[:private_messages])
.select('topics.id', "#{min_or_max}(posts.post_number) post_number")
.group('topics.id')
end
@@ -846,7 +858,7 @@ class Search
def topic_search
if @search_context.is_a?(Topic)
- posts = posts_eager_loads(posts_query(@limit))
+ posts = posts_eager_loads(posts_query(limit))
.where('posts.topic_id = ?', @search_context.id)
posts.each do |post|
diff --git a/lib/search/grouped_search_results.rb b/lib/search/grouped_search_results.rb
index 90ca05f229f..787c279c04a 100644
--- a/lib/search/grouped_search_results.rb
+++ b/lib/search/grouped_search_results.rb
@@ -19,7 +19,8 @@ class Search
:more_users,
:term,
:search_context,
- :include_blurbs
+ :include_blurbs,
+ :more_full_page_results
)
attr_accessor :search_log_id
@@ -50,7 +51,9 @@ class Search
def add(object)
type = object.class.to_s.downcase.pluralize
- if !@type_filter.present? && send(type).length == Search.per_facet
+ if @type_filter.present? && send(type).length == Search.per_filter
+ @more_full_page_results = true
+ elsif !@type_filter.present? && send(type).length == Search.per_facet
instance_variable_set("@more_#{type}".to_sym, true)
else
(send type) << object
diff --git a/spec/components/search_spec.rb b/spec/components/search_spec.rb
index 7700bdb077e..124f84b1250 100644
--- a/spec/components/search_spec.rb
+++ b/spec/components/search_spec.rb
@@ -843,4 +843,39 @@ describe Search do
end
end
+ context 'pagination' do
+ let(:number_of_results) { 2 }
+ let!(:post1) { Fabricate(:post, raw: 'hello hello hello hello hello')}
+ let!(:post2) { Fabricate(:post, raw: 'hello hello hello hello')}
+ let!(:post3) { Fabricate(:post, raw: 'hello hello hello')}
+ let!(:post4) { Fabricate(:post, raw: 'hello hello')}
+ let!(:post5) { Fabricate(:post, raw: 'hello')}
+ before do
+ Search.stubs(:per_filter).returns(number_of_results)
+ end
+
+ it 'returns more results flag' do
+ results = Search.execute('hello', type_filter: 'topic')
+ results2 = Search.execute('hello', type_filter: 'topic', page: 2)
+
+ expect(results.posts.length).to eq(number_of_results)
+ expect(results.posts.map(&:id)).to eq([post1.id, post2.id])
+ expect(results.more_full_page_results).to eq(true)
+ expect(results2.posts.length).to eq(number_of_results)
+ expect(results2.posts.map(&:id)).to eq([post3.id, post4.id])
+ expect(results2.more_full_page_results).to eq(true)
+ end
+
+ it 'correctly search with page parameter' do
+ search = Search.new('hello', type_filter: 'topic', page: 3)
+ results = search.execute
+
+ expect(search.offset).to eq(2 * number_of_results)
+ expect(results.posts.length).to eq(1)
+ expect(results.posts).to eq([post5])
+ expect(results.more_full_page_results).to eq(nil)
+ end
+
+ end
+
end