Skip to content

Commit

Permalink
VFEP-1175: fix order of columns in institution export (#1030)
Browse files Browse the repository at this point in the history 
* fix order of columns in institution export

* fix dependabot gem issue

* fix next dependabot issue

* add bundler-audit.yml

* change bundler-audit.yml

* remove not working bundler-audit solution, add codeclimate solution'

* try another code-climate solution

* try another code-climate solution

* try another code-climate solution

* try another code-climate solution

* remove from codeclimate and put in security.rake

---------

Co-authored-by: nfstern02 <[email protected]>
  • Loading branch information
@GcioGregg @nfstern02
GcioGregg and nfstern02 authored Feb 27, 2024
1 parent 6b7e46a commit ede161b
Show file tree
Hide file tree
Showing 8 changed files with 117 additions and 107 deletions.
4 changes: 2 additions & 2 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ ruby '3.2.2'
# Puma was chosen because it handles load of 40+ concurrent users better than Unicorn and Passenger
# Discussion: https://github.com/18F/college-choice/issues/597#issuecomment-139034834
gem 'puma', '~> 5.6.8'
gem 'rails', '~> 6.1.7'
gem 'rails', '~> 6.1.7.7'

# Gems with special version/repo needs

Expand Down Expand Up @@ -56,7 +56,7 @@ gem 'rack-cors', require: 'rack/cors'
gem 'rainbow'

# Use ActiveModel has_secure_password
gem 'rack', '>= 2.2.3.1'
gem 'rack', '>= 2.2.8.1'
gem 'rails-html-sanitizer', '>= 1.4.4'
gem 'ruby-saml'
gem 'sitemap_generator'
Expand Down
152 changes: 79 additions & 73 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,43 +7,51 @@ GIT
multi_json (~> 1.0)
script_utils (= 0.0.4)

GIT
remote: https://github.com/jquery-ui-rails/jquery-ui-rails
revision: c7460b447589eb04aa948ecaf0d1245c88f6ff45
branch: master
specs:
jquery-ui-rails (7.0.0)
railties (>= 3.2.16)

GEM
remote: https://rubygems.org/
specs:
actioncable (6.1.7.6)
actionpack (= 6.1.7.6)
activesupport (= 6.1.7.6)
actioncable (6.1.7.7)
actionpack (= 6.1.7.7)
activesupport (= 6.1.7.7)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (6.1.7.6)
actionpack (= 6.1.7.6)
activejob (= 6.1.7.6)
activerecord (= 6.1.7.6)
activestorage (= 6.1.7.6)
activesupport (= 6.1.7.6)
actionmailbox (6.1.7.7)
actionpack (= 6.1.7.7)
activejob (= 6.1.7.7)
activerecord (= 6.1.7.7)
activestorage (= 6.1.7.7)
activesupport (= 6.1.7.7)
mail (>= 2.7.1)
actionmailer (6.1.7.6)
actionpack (= 6.1.7.6)
actionview (= 6.1.7.6)
activejob (= 6.1.7.6)
activesupport (= 6.1.7.6)
actionmailer (6.1.7.7)
actionpack (= 6.1.7.7)
actionview (= 6.1.7.7)
activejob (= 6.1.7.7)
activesupport (= 6.1.7.7)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (6.1.7.6)
actionview (= 6.1.7.6)
activesupport (= 6.1.7.6)
actionpack (6.1.7.7)
actionview (= 6.1.7.7)
activesupport (= 6.1.7.7)
rack (~> 2.0, >= 2.0.9)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (6.1.7.6)
actionpack (= 6.1.7.6)
activerecord (= 6.1.7.6)
activestorage (= 6.1.7.6)
activesupport (= 6.1.7.6)
actiontext (6.1.7.7)
actionpack (= 6.1.7.7)
activerecord (= 6.1.7.7)
activestorage (= 6.1.7.7)
activesupport (= 6.1.7.7)
nokogiri (>= 1.8.5)
actionview (6.1.7.6)
activesupport (= 6.1.7.6)
actionview (6.1.7.7)
activesupport (= 6.1.7.7)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
Expand All @@ -53,14 +61,14 @@ GEM
activemodel (>= 4.1, < 7.1)
case_transform (>= 0.2)
jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
activejob (6.1.7.6)
activesupport (= 6.1.7.6)
activejob (6.1.7.7)
activesupport (= 6.1.7.7)
globalid (>= 0.3.6)
activemodel (6.1.7.6)
activesupport (= 6.1.7.6)
activerecord (6.1.7.6)
activemodel (= 6.1.7.6)
activesupport (= 6.1.7.6)
activemodel (6.1.7.7)
activesupport (= 6.1.7.7)
activerecord (6.1.7.7)
activemodel (= 6.1.7.7)
activesupport (= 6.1.7.7)
activerecord-import (1.4.1)
activerecord (>= 4.2)
activerecord-session_store (2.0.0)
Expand All @@ -69,14 +77,14 @@ GEM
multi_json (~> 1.11, >= 1.11.2)
rack (>= 2.0.8, < 3)
railties (>= 5.2.4.1)
activestorage (6.1.7.6)
actionpack (= 6.1.7.6)
activejob (= 6.1.7.6)
activerecord (= 6.1.7.6)
activesupport (= 6.1.7.6)
activestorage (6.1.7.7)
actionpack (= 6.1.7.7)
activejob (= 6.1.7.7)
activerecord (= 6.1.7.7)
activesupport (= 6.1.7.7)
marcel (~> 1.0)
mini_mime (>= 1.1.0)
activesupport (6.1.7.6)
activesupport (6.1.7.7)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
Expand Down Expand Up @@ -112,7 +120,7 @@ GEM
coderay (1.1.3)
coercible (1.0.0)
descendants_tracker (~> 0.0.1)
concurrent-ruby (1.2.2)
concurrent-ruby (1.2.3)
config (4.1.0)
deep_merge (~> 1.2, >= 1.2.1)
dry-validation (~> 1.0, >= 1.0.0)
Expand All @@ -123,7 +131,7 @@ GEM
activerecord (>= 5.a)
database_cleaner-core (~> 2.0.0)
database_cleaner-core (2.0.1)
date (3.3.3)
date (3.3.4)
debug_inspector (1.1.0)
deep_merge (1.2.2)
descendants_tracker (0.0.4)
Expand Down Expand Up @@ -189,8 +197,8 @@ GEM
railties (>= 3.2, < 6.2)
formatador (1.1.0)
geocoder (1.8.1)
globalid (1.1.0)
activesupport (>= 5.0)
globalid (1.2.1)
activesupport (>= 6.1)
govdelivery-tms (2.8.4)
activesupport
faraday
Expand Down Expand Up @@ -218,8 +226,6 @@ GEM
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
jquery-ui-rails (6.0.1)
railties (>= 3.2.16)
json (2.6.3)
json_matchers (0.11.1)
json_schema
Expand All @@ -229,7 +235,7 @@ GEM
listen (3.8.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
loofah (2.21.3)
loofah (2.22.0)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
lumberjack (1.2.8)
Expand All @@ -246,18 +252,18 @@ GEM
mini_mime (1.1.5)
mini_racer (0.6.3)
libv8-node (~> 16.10.0.0)
minitest (5.19.0)
minitest (5.22.2)
multi_json (1.15.0)
multipart-post (2.3.0)
nenv (0.3.0)
net-imap (0.3.7)
net-imap (0.4.10)
date
net-protocol
net-pop (0.1.2)
net-protocol
net-protocol (0.2.1)
net-protocol (0.2.2)
timeout
net-smtp (0.3.3)
net-smtp (0.4.0.1)
net-protocol
newrelic_rpm (9.2.0)
nio4r (2.7.0)
Expand All @@ -283,25 +289,25 @@ GEM
puma (5.6.8)
nio4r (~> 2.0)
racc (1.7.3)
rack (2.2.8)
rack (2.2.8.1)
rack-cors (2.0.1)
rack (>= 2.0.0)
rack-test (2.1.0)
rack (>= 1.3)
rails (6.1.7.6)
actioncable (= 6.1.7.6)
actionmailbox (= 6.1.7.6)
actionmailer (= 6.1.7.6)
actionpack (= 6.1.7.6)
actiontext (= 6.1.7.6)
actionview (= 6.1.7.6)
activejob (= 6.1.7.6)
activemodel (= 6.1.7.6)
activerecord (= 6.1.7.6)
activestorage (= 6.1.7.6)
activesupport (= 6.1.7.6)
rails (6.1.7.7)
actioncable (= 6.1.7.7)
actionmailbox (= 6.1.7.7)
actionmailer (= 6.1.7.7)
actionpack (= 6.1.7.7)
actiontext (= 6.1.7.7)
actionview (= 6.1.7.7)
activejob (= 6.1.7.7)
activemodel (= 6.1.7.7)
activerecord (= 6.1.7.7)
activestorage (= 6.1.7.7)
activesupport (= 6.1.7.7)
bundler (>= 1.15.0)
railties (= 6.1.7.6)
railties (= 6.1.7.7)
sprockets-rails (>= 2.0.0)
rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1)
Expand All @@ -314,14 +320,14 @@ GEM
rails-html-sanitizer (1.6.0)
loofah (~> 2.21)
nokogiri (~> 1.14)
railties (6.1.7.6)
actionpack (= 6.1.7.6)
activesupport (= 6.1.7.6)
railties (6.1.7.7)
actionpack (= 6.1.7.7)
activesupport (= 6.1.7.7)
method_source
rake (>= 12.2)
thor (~> 1.0)
rainbow (3.1.1)
rake (13.0.6)
rake (13.1.0)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
Expand Down Expand Up @@ -424,7 +430,7 @@ GEM
spreadsheet (1.3.0)
ruby-ole
spring (4.1.1)
sprockets (4.2.0)
sprockets (4.2.1)
concurrent-ruby (~> 1.0)
rack (>= 2.2.4, < 4)
sprockets-rails (3.4.2)
Expand All @@ -435,10 +441,10 @@ GEM
activerecord (>= 5.2)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
thor (1.2.2)
thor (1.3.1)
thread_safe (0.3.6)
tilt (2.1.0)
timeout (0.4.0)
timeout (0.4.1)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
uglifier (4.2.0)
Expand Down Expand Up @@ -469,7 +475,7 @@ GEM
will_paginate (3.3.1)
xpath (2.1.0)
nokogiri (~> 1.3)
zeitwerk (2.6.11)
zeitwerk (2.6.13)

PLATFORMS
x86_64-linux
Expand Down Expand Up @@ -498,7 +504,7 @@ DEPENDENCIES
guard-rspec
headless (~> 2.3.1)
jquery-rails
jquery-ui-rails
jquery-ui-rails!
json (>= 2.3.0)
json_matchers
libv8-node (= 16.10.0.0)
Expand All @@ -510,9 +516,9 @@ DEPENDENCIES
pg
pry-nav
puma (~> 5.6.8)
rack (>= 2.2.3.1)
rack (>= 2.2.8.1)
rack-cors
rails (~> 6.1.7)
rails (~> 6.1.7.7)
rails-controller-testing
rails-html-sanitizer (>= 1.4.4)
rainbow
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/archives_controller.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def index
def export
respond_to do |format|
format.csv do
send_data csv_model(params[:csv_type]).export_by_version(params[:number]),
send_data csv_model(params[:csv_type]).export_by_version,
type: 'text/csv',
filename: "#{params[:csv_type]}_version_#{params[:number]}.csv"
end
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/dashboards_controller.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def export
def export_version
respond_to do |format|
format.csv do
send_data Institution.export_by_version(params[:number]),
send_data Institution.export_by_version,
type: 'text/csv',
filename: "institutions_version_#{params[:number]}.csv"
end
Expand Down
Loading

0 comments on commit ede161b

Please sign in to comment.