effective_search 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d53d74846e3d5e8b6c4b759e88d1362ed4fa18f2305fc80ecdda046b1909e91
-  data.tar.gz: 5f46bbab96941100ce0250041d532a45edf9c328ca7d15c71297feef12a5e9a5
+  metadata.gz: 6fb95bd14c5e9823b0d8830420381d75b5f1c588376ed57438b19280ef9fc6c9
+  data.tar.gz: 25bdabad6a94d4193a6447f792b7fae91240c28d6bf4ec77d5563f084e0f2fb8
 SHA512:
-  metadata.gz: f06e7ee79de96f4a4eedb848c4200a57ef8aa5f24747aef60c5833d5d4a8e4826ab6d1184b1b5b9df011fa726593c0c36fa620e3f861ce4a28447bdbde724b6a
-  data.tar.gz: 3dabcc4fd22ee6f51dbf3ce42390f656616a01d46e93da8c1d569c71fa9fa8571c60fec928f9fd31323bb4326536cebc3ff9a9f3f540a7113e149b78123f058d
+  metadata.gz: 883de44e96a91311e015c6f2b237f3f5d3c09679cf894317ac5d9bfe4723444c752eba65c46d6da9f57c7b5d8889c3720670166ca58cd946d6f8430bab404502
+  data.tar.gz: b7ddca0b8cc5d25349e512d7235faa39c0a698c434de58ff4689c33d221dc5b1ff457f3eff868962cecdb48e398114c1b3ba8edfcd4d34b7fd792f1f44cb9f6a

data/app/models/concerns/effective_search_admin_search.rb

@@ -45,7 +45,19 @@ module EffectiveSearchAdminSearch
   end
 
   def applicants
-    @applicants = EffectiveMemberships.Applicant.where(user: users).order(created_at: :desc)
+    @applicants ||= EffectiveMemberships.Applicant.where(user: users).order(created_at: :desc)
+  end
+
+  def events
+    @events ||= Effective::Resource.new(Effective::Event).search_any(term, columns: [:title]).reorder(start_at: :desc)
+  end
+
+  def pages
+    @pages ||= Effective::Resource.new(Effective::Page).search_any(term, columns: [:title])
+  end
+
+  def posts
+    @posts ||= Effective::Resource.new(Effective::Post).search_any(term, columns: [:title]).reorder(published_start_at: :desc)
   end
 
   # Search and assigns the collection
@@ -56,6 +68,9 @@ module EffectiveSearchAdminSearch
     @orders = orders()
     @applicants = applicants()
     @organizations = organizations()
+    @events = events()
+    @pages = pages()
+    @posts = posts()
   end
 
   # The paginated results
@@ -75,6 +90,18 @@ module EffectiveSearchAdminSearch
     results(organizations, page: page)
   end
 
+  def event_results(page: nil)
+    results(events, page: page)
+  end
+
+  def page_results(page: nil)
+    results(pages, page: page)
+  end
+
+  def post_results(page: nil)
+    results(posts, page: page)
+  end
+
   private
 
   def results(collection, page: nil)

data/app/views/admin/search/_event.html.haml

@@ -0,0 +1,7 @@
+- path = (EffectiveResources.authorized?(self, :edit, event) ? effective_events.edit_admin_event_path(event) : effective_events.admin_event_path(event))
+
+%a.list-group-item.list-group-item-action{href: path, title: event}
+  %strong= event.to_s
+  %small.text-muted
+    - if event.try(:start_at).present?
+      = event.start_at.strftime('%B %d, %Y')

data/app/views/admin/search/_modal.html.haml

@@ -6,4 +6,4 @@
         = render('admin/search/search', search: search, modal: true)
 
       .modal-footer.bg-light.p-1
-        %small.text-muted Search by name, email, or order number. Quick open with /
+        %small.text-muted Search by name, title, email, or order number. Quick open with forward slash.

data/app/views/admin/search/_order.html.haml

@@ -1,7 +1,7 @@
 - path = (EffectiveResources.authorized?(self, :edit, order) ? effective_orders.admin_edit_order_path(order) : effective_orders.admin_order_path(order))
 
 %a.list-group-item.list-group-item-action{href: path, title: order}
-  = order.to_s
+  %strong= order.to_s
   %small.text-muted
     = order.billing_name
     •

data/app/views/admin/search/_organization.html.haml

@@ -1,5 +1,5 @@
 %a.list-group-item.list-group-item-action{href: effective_memberships.edit_admin_organization_path(organization), title: organization}
-  %p.mb-0= organization
+  %strong= organization
   %small.text-muted
     - if organization.class.try(:effective_memberships_organization_owner?)
       - if (membership = organization.try(:membership)).present?

data/app/views/admin/search/_page.html.haml

@@ -0,0 +1,9 @@
+- path = (EffectiveResources.authorized?(self, :edit, page) ? effective_pages.edit_admin_page_path(page) : effective_pages.admin_page_path(page))
+
+%a.list-group-item.list-group-item-action{href: path, title: page}
+  %strong= page.to_s
+  %small.text-muted
+    = badge(page.try(:draft?) ? :draft : :published)
+    - if page.try(:slug).present?
+      •
+      = page.slug

data/app/views/admin/search/_post.html.haml

@@ -0,0 +1,12 @@
+- path = (EffectiveResources.authorized?(self, :edit, post) ? effective_posts.edit_admin_post_path(post) : effective_posts.admin_post_path(post))
+
+%a.list-group-item.list-group-item-action{href: path, title: post}
+  %strong= post.to_s
+  %small.text-muted
+    - if post.try(:published_at).present?
+      = post.published_at.strftime('%B %d, %Y')
+      •
+    = badge(post.try(:draft?) ? :draft : :published)
+    - if post.try(:category).present?
+      •
+      = post.category

data/app/views/admin/search/_search.html.haml

@@ -5,7 +5,7 @@
 
     .d-flex.align-items-center.mb-3
       .flex-grow-1
-        = f.text_field :term, placeholder: 'Search users, companies, applicants, and orders', label: false, autofocus: true, autocomplete: 'off',
+        = f.text_field :term, placeholder: 'Search users, companies, applicants, orders, events, pages, and posts', label: false, autofocus: true, autocomplete: 'off',
           'data-load-ajax-url': effective_search.admin_search_path,
           'data-load-ajax-div': '#effective-search-results',
           'data-load-ajax-all': true,
@@ -36,3 +36,18 @@
         - if search.applicant_results.present?
           %small.font-weight-bold Applicants (#{search.applicants.count})
           .list-group.list-group-flush= render(collection: search.applicant_results, partial: 'admin/search/applicant')
+          %hr
+
+        - if search.event_results.present?
+          %small.font-weight-bold Events (#{search.events.count})
+          .list-group.list-group-flush= render(collection: search.event_results, partial: 'admin/search/event')
+          %hr
+
+        - if search.page_results.present?
+          %small.font-weight-bold Pages (#{search.pages.count})
+          .list-group.list-group-flush= render(collection: search.page_results, partial: 'admin/search/page')
+          %hr
+
+        - if search.post_results.present?
+          %small.font-weight-bold Posts (#{search.posts.count})
+          .list-group.list-group-flush= render(collection: search.post_results, partial: 'admin/search/post')

data/lib/effective_search/version.rb

@@ -1,3 +1,3 @@
 module EffectiveSearch
-  VERSION = '0.4.1'.freeze
+  VERSION = '0.4.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_search
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Code and Effect
@@ -178,11 +178,14 @@ files:
 - app/models/effective/search.rb
 - app/models/effective/search_content.rb
 - app/views/admin/search/_applicant.html.haml
+- app/views/admin/search/_event.html.haml
 - app/views/admin/search/_form_nav_icon.html.haml
 - app/views/admin/search/_layout.html.haml
 - app/views/admin/search/_modal.html.haml
 - app/views/admin/search/_order.html.haml
 - app/views/admin/search/_organization.html.haml
+- app/views/admin/search/_page.html.haml
+- app/views/admin/search/_post.html.haml
 - app/views/admin/search/_search.html.haml
 - app/views/admin/search/_user.html.haml
 - app/views/admin/search/index.html.haml