workarea-core 3.4.28 → 3.4.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8439c1a91cb856c912b1d2e905b0febc658cfa4d8aa2e0d284783f52e4b02e0
-  data.tar.gz: ec47357ec28e16a43e06dbbfa1ad1323767dae291c199d715d5241fa5d54d611
+  metadata.gz: 293a8eac548e651d077a238236f6e127e2bd136ec50139fbe8ad18dcda7adfb7
+  data.tar.gz: f8173cfae95ed2e11933669e4c4aedd086edc1dff489e18ed69c2bf0aeddcede
 SHA512:
-  metadata.gz: 1b7801af7aa2e4f98ac24a0e8f53fae358e0ebdbd8504766144c5dc6df7c0e478fd3c73fbf2b0996fb38ad131f72137466cecec2cfa8c6ee3ff0b098dce465df
-  data.tar.gz: 0de8df6aae608882554a3280eaa2d6f473ac181c68b8356aa9bf4ac9fefc0443d98172c85af55e8de71f0ea96e0cb36acd2000b94b1ebbb9f3c46956b9c6b0f9
+  metadata.gz: 2cb7c1571e058e31fef6d5cce6d65e3e3afe1f3830175bb086c735eabf54e70f71399a757c5312196cfe9321b0cad0b1241dca1745d2ad99a21601079353e8ff
+  data.tar.gz: 72164a859e0a2cf841ecb12fac24ea670b0057209d1fab1e31d45d91399729727ad9eb06212a21f5adc3c917b2d1df33c6a1518d23b4a0c8bf9f7dd33d19887a

data/app/models/workarea/search/admin.rb

@@ -5,27 +5,39 @@ module Workarea
 
       def self.jump_to(params, size = Workarea.config.default_admin_jump_to_result_count)
         query = {
-          query: {
-            match_phrase_prefix: {
-              jump_to_search_text: {
-                query: params[:q],
-                max_expansions: 10
+          aggs: {
+            grouped_by_type: {
+              filter: {
+                match_phrase_prefix: {
+                  jump_to_search_text: {
+                    query: params[:q],
+                    max_expansions: 10
+                  }
+                }
+              },
+              aggs: {
+                type: {
+                  terms: { field: 'facets.type', size: Workarea.config.jump_to_type_limit },
+                  aggs: { top: { top_hits: { size: Workarea.config.jump_to_results_per_type } } }
+                }
               }
             }
-          },
-          size: size,
-          sort: [{ jump_to_position: :asc }]
+          }
         }
 
-        search(query)['hits']['hits'].map do |result|
-          {
-            label: result['_source']['jump_to_text'],
-            type: result['_source']['facets']['type'],
-            model_class: result['_source']['model_class'],
-            route_helper: result['_source']['jump_to_route_helper'],
-            to_param: result['_source']['jump_to_param']
-          }
-        end
+        aggregation = search(query)['aggregations']['grouped_by_type']['type']
+        aggregation['buckets']
+          .reduce([]) { |m, b| m + b['top']['hits']['hits'] }
+          .sort_by { |r| [r['_source']['jump_to_position'], r['_score']] }
+          .map do |result|
+            {
+              label: result['_source']['jump_to_text'],
+              type: result['_source']['facets']['type'],
+              model_class: result['_source']['model_class'],
+              route_helper: result['_source']['jump_to_route_helper'],
+              to_param: result['_source']['jump_to_param']
+            }
+          end
       end
 
       def self.for(model)

data/lib/workarea/configuration.rb

@@ -1283,6 +1283,12 @@ module Workarea
         'Workarea::Catalog::Category' => 7,
         'Workarea::Navigation::Menu' => 1_000
       }
+
+      # The max number of types of results that will show in the admin jump to
+      config.jump_to_type_limit = 5
+
+      # The number of results that will show per-type in the admin jump to
+      config.jump_to_results_per_type = 5
     end
   end
 end

data/lib/workarea/version.rb

@@ -2,7 +2,7 @@ module Workarea
   module VERSION
     MAJOR = 3
     MINOR = 4
-    PATCH = 28
+    PATCH = 29
     PRE   = nil
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-core
 version: !ruby/object:Gem::Version
-  version: 3.4.28
+  version: 3.4.29
 platform: ruby
 authors:
 - Ben Crouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-03 00:00:00.000000000 Z
+date: 2020-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler