invent_report_includes now properly returns tags and sortby

The goal is to ensure that the invented includes matches those generated by reports.

- It was missing the "include" section
- It was not adding acknowledging tags
- It was not adding sort columns

Still does not support virtual_custm attributes

Author: kbrock

app/models/miq_report/generator.rb

@@ -103,16 +103,14 @@ def invent_includes
   # would like this format to go away
   # will go away when we drop build_reportable_data
   def invent_report_includes
-    return {} unless col_order
-
-    col_order.each_with_object({}) do |col, ret|
-      next unless col.include?(".")
+    (Array(col_order) + Array(sortby)).each_with_object({}) do |col, ret|
+      next if !col.include?(".") || col.include?("virtual_custom")
 
       *rels, column = col.split(".")
-      if col !~ /managed\./ && col !~ /virtual_custom/
-        (rels.inject(ret) { |h, rel| h[rel] ||= {} }["columns"] ||= []) << column
-      end
-    end
+      dest = rels.inject(ret) { |h, rel| (h["include"] ||= {})[rel] ||= {} }["columns"] ||= []
+      # sortby tends to be a duplicate. So suppress duplicates for all
+      dest << column unless dest.include?(column)
+    end["include"]
   end
 
   def include_as_hash(includes = include, klass = db_class, klass_cols = cols)