workarea-core 3.5.6 → 3.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb5020f2786f93ffc74cafd5726c8c279950df5645b73a4de0e53b8e5347bf12
-  data.tar.gz: f1f6c1f0e95915279dbd825021d1ac4ed6461d99f6f3746daadcdd28ef89a2a7
+  metadata.gz: 26dc982f98d5ae00a8d3299b322cd6eb897329888c169a7a035e0bafad3be1e8
+  data.tar.gz: f3b5ae6b3bddb68b0e3d5b5c303e565e69ff812e165371e35285cd3ce04d334e
 SHA512:
-  metadata.gz: 97c8c17c68a43238a384073d9b9f3365635cf4577cd7e2d11fae11476548b69840eb903bcb4aabcffe07b23b8f93e12fc7724a5b809df5ed772415050ac41125
-  data.tar.gz: 395b8ae08cb06235e4a60e7a9cbac02c30b9db5022863903ae8b3affee561ecc5b204e0c492f41983df5ac0b224c17fce79cb1f0225f5ea518b4f47428f6dfdd
+  metadata.gz: 31ad3ba0206fb6c815e6af2d4af9b572dbefec26460adfa14191279f9bd8098c462eb21b61139a0003ba775ae0b6e65294745b312ba776cd44cb55931221d40f
+  data.tar.gz: 8ffe28be251fddeba16e2f4964ca716ea8f759d171154529414e3b826accc1a709acb15f0374916d4ff2260f64c21acdd1a44b71687bb93fadec4bc626e81e11

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

@@ -1291,6 +1291,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 = 5
-    PATCH = 6
+    PATCH = 7
     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.5.6
+  version: 3.5.7
 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