Merge pull request consuldemocracy#3819 from consul/remove_csv

Remove new CSV report generation

app/assets/javascripts/application.js

@@ -83,7 +83,6 @@
 //= require i18n
 //= require globalize
 //= require send_admin_notification_alert
-//= require modal_download
 //= require settings
 //= require cookies
 //= require columns_selector
@@ -137,7 +136,6 @@ var initialize_modules = function() {
  App.Managers.initialize();
  App.Globalize.initialize();
  App.SendAdminNotificationAlert.initialize();
- App.ModalDownload.initialize();
  App.Settings.initialize();
  if ($("#js-columns-selector").length) {
  App.ColumnsSelector.initialize();

app/controllers/admin/budget_investments_controller.rb

@@ -1,7 +1,6 @@
 class Admin::BudgetInvestmentsController < Admin::BaseController
  include FeatureFlags
  include CommentableActions
- include DownloadSettingsHelper
  include Translatable
 
  feature_flag :budgets
@@ -21,9 +20,7 @@ def index
  format.html
  format.js
  format.csv do
- send_data to_csv(@investments, Budget::Investment),
- type: "text/csv",
- disposition: "attachment",
+ send_data Budget::Investment::Exporter.new(@investments).to_csv,
  filename: "budget_investments.csv"
  end
  end

app/controllers/admin/comments_controller.rb

@@ -1,18 +1,5 @@
 class Admin::CommentsController < Admin::BaseController
- include DownloadSettingsHelper
-
  def index
  @comments = Comment.sort_by_newest.page(params[:page])
-
- respond_to do |format|
- format.html
-
- format.csv do
- send_data to_csv(Comment.sort_by_newest, Comment),
- type: "text/csv",
- disposition: "attachment",
- filename: "comments.csv"
- end
- end
  end
 end

app/controllers/admin/legislation/processes_controller.rb

@@ -1,7 +1,6 @@
 class Admin::Legislation::ProcessesController < Admin::Legislation::BaseController
  include Translatable
  include ImageAttributes
- include DownloadSettingsHelper
 
  has_filters %w[active all], only: :index
 
@@ -10,15 +9,6 @@ class Admin::Legislation::ProcessesController < Admin::Legislation::BaseControll
  def index
  @processes = ::Legislation::Process.send(@current_filter).order(start_date: :desc)
  .page(params[:page])
- respond_to do |format|
- format.html
- format.csv do
- send_data to_csv(process_for_download, Legislation::Process),
- type: "text/csv",
- disposition: "attachment",
- filename: "legislation_processes.csv"
- end
- end
  end
 
  def create
@@ -53,10 +43,6 @@ def destroy
 
  private
 
- def process_for_download
- ::Legislation::Process.send(@current_filter).order(start_date: :desc)
- end
-
  def process_params
  params.require(:legislation_process).permit(allowed_params)
  end

app/controllers/admin/proposals_controller.rb

@@ -3,7 +3,6 @@ class Admin::ProposalsController < Admin::BaseController
  include CommentableActions
  include FeatureFlags
  feature_flag :proposals
- helper DownloadSettingsHelper
 
  has_orders %w[created_at]
 

app/controllers/budgets/executions_controller.rb

@@ -1,6 +1,5 @@
 module Budgets
  class ExecutionsController < ApplicationController
- include DownloadSettingsHelper
  before_action :load_budget
 
  load_and_authorize_resource :budget
@@ -9,19 +8,6 @@ def show
  authorize! :read_executions, @budget
  @statuses = Milestone::Status.all
  @investments_by_heading = investments_by_heading_ordered_alphabetically.to_h
- downloadables = []
- investments_by_heading_ordered_alphabetically
- .map { |heading| downloadables.concat heading[1] }
-
- respond_to do |format|
- format.html
- format.csv do
- send_data to_csv(downloadables, Budget::Investment, 1),
- type: "text/csv",
- disposition: "attachment",
- filename: "budget_investment_milestones.csv"
- end
- end
  end
 
  private

app/controllers/budgets/results_controller.rb

@@ -2,24 +2,13 @@ module Budgets
  class ResultsController < ApplicationController
  before_action :load_budget
  before_action :load_heading
- include DownloadSettingsHelper
 
  load_and_authorize_resource :budget
 
  def show
  authorize! :read_results, @budget
  @investments = Budget::Result.new(@budget, @heading).investments
  @headings = @budget.headings.sort_by_name
-
- respond_to do |format|
- format.html
- format.csv do
- send_data to_csv(@investments.compatible, Budget::Investment),
- type: "text/csv",
- disposition: "attachment",
- filename: "budget_investment_results.csv"
- end
- end
  end
 
  private

app/controllers/concerns/commentable_actions.rb

@@ -2,7 +2,6 @@ module CommentableActions
  extend ActiveSupport::Concern
  include Polymorphic
  include Search
- include DownloadSettingsHelper
  include RemotelyTranslatable
 
  def index
@@ -12,7 +11,6 @@ def index
  @resources = @resources.search(@search_terms) if @search_terms.present?
  @resources = @advanced_search_terms.present? ? @resources.filter(@advanced_search_terms) : @resources
  @resources = @resources.tagged_with(@tag_filter) if @tag_filter
- resources_csv = @resources
 
  @resources = @resources.page(params[:page]).send("sort_by_#{@current_order}")
 
@@ -25,16 +23,6 @@ def index
 
  set_resources_instance
  @remote_translations = detect_remote_translations(@resources, featured_proposals)
-
- respond_to do |format|
- format.html
- format.csv do
- send_data to_csv(resources_csv, resource_model),
- type: "text/csv",
- disposition: "attachment",
- filename: "#{get_resource(resource_model)}.csv"
- end
- end
  end
 
  def show

app/controllers/legislation/processes_controller.rb

@@ -1,6 +1,5 @@
 class Legislation::ProcessesController < Legislation::BaseController
  include RandomSeed
- include DownloadSettingsHelper
 
  has_filters %w[open past], only: :index
  has_filters %w[random winners], only: :proposals
@@ -14,16 +13,6 @@ def index
  @current_filter ||= "open"
  @processes = ::Legislation::Process.send(@current_filter).published
  .not_in_draft.order(start_date: :desc).page(params[:page])
-
- respond_to do |format|
- format.html
- format.csv do
- send_data to_csv(process_for_download, Legislation::Process),
- type: "text/csv",
- disposition: "attachment",
- filename: "legislation_processes.csv"
- end
- end
  end
 
  def show
@@ -149,10 +138,6 @@ def proposals
 
  private
 
- def process_for_download
- Legislation::Process.send(@current_filter).order(start_date: :desc)
- end
-
  def member_method?
  params[:id].present?
  end

app/models/abilities/administrator.rb

@@ -101,8 +101,6 @@ def initialize(user)
  can [:deliver], Newsletter, hidden_at: nil
  can [:manage], Dashboard::AdministratorTask
 
- can [:edit, :update], DownloadSetting
-
  can :manage, LocalCensusRecord
  can [:create, :read], LocalCensusRecords::Import
  end

app/models/budget/investment.rb

@@ -1,5 +1,4 @@
 class Budget
- require "csv"
  class Investment < ApplicationRecord
  SORTING_OPTIONS = { id: "id", supports: "cached_votes_up" }.freeze
 
@@ -26,8 +25,6 @@ class Investment < ApplicationRecord
  include Milestoneable
  include Randomizable
 
- extend DownloadSettings::BudgetInvestmentCsv
-
  translates :title, touch: true
  translates :description, touch: true
  include Globalizable
@@ -57,8 +54,6 @@ class Investment < ApplicationRecord
  inverse_of: :commentable,
  class_name: "Comment"
 
- delegate :name, :email, to: :author, prefix: true
-
  validates_translation :title, presence: true, length: { in: 4..Budget::Investment.title_max_length }
  validates_translation :description, presence: true, length: { maximum: Budget::Investment.description_max_length }
 

app/models/comment.rb

@@ -1,11 +1,8 @@
-require "csv"
-
 class Comment < ApplicationRecord
  include Flaggable
  include HasPublicAuthor
  include Graphqlable
  include Notifiable
- extend DownloadSettings::CommentCsv
 
  COMMENTABLE_TYPES = %w[Debate Proposal Budget::Investment Poll Topic
  Legislation::Question Legislation::Annotation