Merge pull request #3564 from gtanzillo/report-hidden-cols-ui

Support for hidden columns in reports and views

app/controllers/application_controller.rb

@@ -967,6 +967,9 @@ def view_to_hash(view, fetch_data = false)
     end
 
     view.headers.each_with_index do |h, i|
+      col = view.col_order[i]
+      next if view.column_is_hidden?(col)
+
       align = [:fixnum, :integer, :Fixnum, :float].include?(column_type(view.db, view.col_order[i])) ? 'right' : 'left'
 
       root[:head] << {:text    => h,
@@ -1025,6 +1028,8 @@ def view_to_hash(view, fetch_data = false)
       end
 
       view.col_order.each_with_index do |col, col_idx|
+        next if view.column_is_hidden?(col)
+
         celltext = nil
 
         case view.col_order[col_idx]

lib/report_formatter/text.rb

@@ -73,6 +73,10 @@ def build_document_header
 
       return if mri.headers.empty?
       c = mri.headers.dup
+      # Remove headers of hidden columns
+      mri.col_order.each_with_index do |f, i|
+        c.delete_at(i) if mri.column_is_hidden?(f)
+      end
       c.each_with_index do |f, i|
         c[i] = f.to_s.center(@max_col_width[i])
       end
@@ -107,6 +111,8 @@ def build_document_body
         end
         mri.col_formats ||= []                 # Backward compat - create empty array for formats
         mri.col_order.each_with_index do |f, i|
+          next if mri.column_is_hidden?(f)
+
           unless ["<compare>", "<drift>"].include?(mri.db)
             data = mri.format(f,
                               r[f],

spec/controllers/host_controller_spec.rb

@@ -12,6 +12,43 @@
       ApplicationController.handle_exceptions = true
     end
 
+    it "renders index" do
+      get :index
+      expect(response.status).to eq(302)
+      expect(response).to redirect_to(:action => 'show_list')
+    end
+
+    it "renders show_list and does not include hidden column" do
+      allow(controller).to receive(:render)
+      report = FactoryGirl.create(:miq_report,
+                                  :name        => 'Hosts',
+                                  :title       => 'Hosts',
+                                  :cols        => %w(name ipaddress v_total_vms),
+                                  :col_order   => %w(name ipaddress v_total_vms),
+                                  :headers     => %w(Name IP\ Address VMs),
+                                  :col_options => {"name" => {:hidden => true}})
+      expect(controller).to receive(:get_db_view).and_return(report)
+      controller.send(:report_data)
+      view_hash = controller.send(:view_to_hash, assigns(:view))
+      expect(view_hash[:head]).not_to include(:text => "Name", :sort => "str", :col_idx => 0, :align => "left")
+      expect(view_hash[:head]).to include(:text => "IP Address", :sort => "str", :col_idx => 1, :align => "left")
+    end
+
+    it "renders show_list and includes all columns" do
+      allow(controller).to receive(:render)
+      report = FactoryGirl.create(:miq_report,
+                                  :name      => 'Hosts',
+                                  :title     => 'Hosts',
+                                  :cols      => %w(name ipaddress v_total_vms),
+                                  :col_order => %w(name ipaddress v_total_vms),
+                                  :headers   => %w(Name IP\ Address VMs))
+      expect(controller).to receive(:get_db_view).and_return(report)
+      controller.send(:report_data)
+      view_hash = controller.send(:view_to_hash, assigns(:view))
+      expect(view_hash[:head]).to include(:text => "Name", :sort => "str", :col_idx => 0, :align => "left")
+      expect(view_hash[:head]).to include(:text => "IP Address", :sort => "str", :col_idx => 1, :align => "left")
+    end
+
     it 'edit renders GTL grid with selected Host records' do
       session[:host_items] = [h1.id, h2.id]
       session[:settings] = {:views     => {:host => 'grid'},