Merge pull request #1091 from workarea-commerce/verify-mongoid8-any-of-1083

WA-VERIFY-091: Audit and fix Mongoid 8 any_of scoping semantics

Author: kitcommerce

admin/app/controllers/workarea/admin/help_controller.rb

@@ -27,7 +27,11 @@ def show
         search = Search::RelatedHelp.new(ids: [@help_article.id])
         @related = Admin::HelpSearchViewModel.new(search, view_model_options)
         @article_body = Redcarpet::Markdown.new(
-          Redcarpet::Render::HTML.new(hard_wrap: true)
+          Redcarpet::Render::HTML.new(
+            hard_wrap: true,
+            filter_html: true,
+            safe_links_only: true
+          )
         ).render(@help_article.body.to_s)
       end
 

admin/app/view_models/workarea/admin/activity_view_model.rb

@@ -60,12 +60,13 @@ def scoped_entries
         end
 
         if options[:id].present?
-          Array(options[:id]).each do |id|
-            criteria = criteria.any_of(
+          clauses = Array(options[:id]).flat_map do |id|
+            [
               { audited_id: id },
               { 'document_path.id' => convert_to_object_id(id) }
-            )
+            ]
           end
+          criteria = criteria.any_of(*clauses) unless clauses.empty?
         end
 
         if options[:created_at_greater_than].present?

core/app/models/workarea/tax/rate.rb

@@ -43,7 +43,7 @@ def self.search(query)
         clauses = [{ region: regex }, { postal_code: regex }]
         clauses << { country: country } if country.present?
 
-        any_of(clauses)
+        any_of(*clauses)
       end
 
       def self.sorts