Eager load relations in elements trash

This should speed up large trashes.
AlchemyCMS · Feb 24, 2020 · 4d93f2c · 4d93f2c
1 parent 6e5180d
commit 4d93f2c
Showing 1 changed file with 20 additions and 1 deletion.
diff --git a/app/controllers/alchemy/admin/trash_controller.rb b/app/controllers/alchemy/admin/trash_controller.rb
@@ -8,7 +8,7 @@ class TrashController < Alchemy::Admin::BaseController
       authorize_resource class: false
 
       def index
-        @elements = Element.trashed
+        @elements = Element.trashed.includes(*element_includes)
         @page = Page.find(params[:page_id])
         @allowed_elements = @page.available_element_definitions
       end
@@ -18,6 +18,25 @@ def clear
         @elements = Element.trashed
         @elements.map(&:destroy)
       end
+
+      private
+
+      def element_includes
+        [
+          {
+            contents: {
+              essence: :ingredient_association
+            },
+            all_nested_elements: [
+              {
+                contents: {
+                  essence: :ingredient_association
+                }
+              }
+            ]
+          }
+        ]
+      end
     end
   end
 end