torienyart · torienyart · Jul 28, 2023 · Jul 28, 2023 · Jul 28, 2023 · Jul 28, 2023
diff --git a/Gemfile b/Gemfile
@@ -34,12 +34,12 @@ gem "paper_trail"
 # Associates users with roles.
 gem "rolify", "~> 6.0"
 # Enforces "safe" migrations.
-gem "strong_migrations", "1.6.2"
+gem "strong_migrations", "1.6.3"
 
 ##### JAVSCRIPT/CSS/ASSETS #######
 
 # Bootstrap is a library for HTML, CSS and JS.
-gem 'bootstrap', '~> 4.6.0'
+gem 'bootstrap', '~> 5.2'
 # SASS CSS framework (nested selectors, variables, etc.)
 gem "sass-rails"
 # Used to verify that the user is a human.
@@ -199,8 +199,8 @@ group :test do
   gem 'simplecov'
   # More concise test ("should") matchers
   gem 'shoulda-matchers', '~> 5.3'
-  # Nice interface to Chrome, handles updates itself now
-  gem 'selenium-webdriver'
+  # Selenium webdriver automatic installation and update.
+  gem 'selenium-webdriver', '~> 4.10'
   # Mock HTTP requests and ensure they are not called during tests.
   gem "webmock", "~> 3.19"
 end

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -72,7 +72,7 @@ GEM
       activerecord (>= 3.2, < 8.0)
       rake (>= 10.4, < 14.0)
     ast (2.4.2)
-    autoprefixer-rails (10.3.3.0)
+    autoprefixer-rails (10.4.13.0)
       execjs (~> 2)
     awesome_print (1.9.2)
     azure-storage-blob (2.0.3)
@@ -84,17 +84,17 @@ GEM
       net-http-persistent (~> 4.0)
       nokogiri (~> 1, >= 1.10.8)
     base64 (0.1.1)
-    bcrypt (3.1.18)
+    bcrypt (3.1.19)
     better_errors (2.10.1)
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
       rouge (>= 1.0.0)
     bindex (0.8.1)
     binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)
-    bootstrap (4.6.1)
+    bootstrap (5.2.3)
       autoprefixer-rails (>= 9.1.0)
-      popper_js (>= 1.14.3, < 2)
+      popper_js (>= 2.11.6, < 3)
       sassc-rails (>= 2.0.0)
     brakeman (6.0.1)
     brow (0.4.1)
@@ -135,7 +135,7 @@ GEM
     database_cleaner-core (2.0.1)
     date (3.3.3)
     debug_inspector (1.1.0)
-    delayed_job (4.1.10)
+    delayed_job (4.1.11)
       activesupport (>= 3.0, < 8.0)
     delayed_job_active_record (4.1.7)
       activerecord (>= 3.0, < 8.0)
@@ -166,14 +166,14 @@ GEM
     et-orbi (1.2.7)
       tzinfo
     execjs (2.8.1)
-    factory_bot (6.2.0)
+    factory_bot (6.2.1)
       activesupport (>= 5.0.0)
     factory_bot_rails (6.2.0)
       factory_bot (~> 6.2.0)
       railties (>= 5.0.0)
     faker (3.2.1)
       i18n (>= 1.8.11, < 2)
-    faraday (1.10.2)
+    faraday (1.10.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -213,7 +213,7 @@ GEM
       rack-protection (>= 1.5.3, <= 4.0.0)
       sanitize (< 7)
     foreman (0.87.2)
-    formatador (0.3.0)
+    formatador (1.1.0)
     fugit (1.8.1)
       et-orbi (~> 1, >= 1.2.7)
       raabro (~> 1.4)
@@ -269,11 +269,11 @@ GEM
       activerecord
       kaminari-core (= 1.2.2)
     kaminari-core (1.2.2)
-    knapsack_pro (5.6.0)
+    knapsack_pro (5.7.0)
       rake
     language_server-protocol (3.17.0.3)
-    launchy (2.5.0)
-      addressable (~> 2.7)
+    launchy (2.5.2)
+      addressable (~> 2.8)
     letter_opener (1.8.1)
       launchy (>= 2.2, < 3)
     libv8-node (18.16.0.0-arm64-darwin)
@@ -291,7 +291,7 @@ GEM
     loofah (2.21.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
-    lumberjack (1.2.8)
+    lumberjack (1.2.9)
     magic_test (0.0.9)
       capybara (>= 3.0)
       pry
@@ -310,7 +310,8 @@ GEM
     mini_racer (0.8.0)
       libv8-node (~> 18.16.0.0)
     minitest (5.20.0)
-    monetize (1.11.0)
+      money (~> 6.12)
+    monetize (1.12.0)
       money (~> 6.12)
     money (6.16.0)
       i18n (>= 0.6.4, <= 2)
@@ -320,11 +321,11 @@ GEM
       money (~> 6.13)
       railties (>= 3.0)
     multi_xml (0.6.0)
-    multipart-post (2.2.3)
-    mustermann (1.1.1)
+    multipart-post (2.3.0)
+    mustermann (3.0.0)
       ruby2_keywords (~> 0.0.1)
     nenv (0.3.0)
-    net-http-persistent (4.0.1)
+    net-http-persistent (4.0.2)
       connection_pool (~> 2.2)
     net-imap (0.3.7)
       date
@@ -346,11 +347,11 @@ GEM
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    oauth2 (2.0.8)
+    oauth2 (2.0.9)
       faraday (>= 0.17.3, < 3.0)
       jwt (>= 1.0, < 3.0)
       multi_xml (~> 0.5)
-      rack (>= 1.2, < 3)
+      rack (>= 1.2, < 4)
       snaky_hash (~> 2.0)
       version_gem (~> 1.1)
     omniauth (2.1.1)
@@ -381,7 +382,7 @@ GEM
       racc
     pdf-core (0.9.0)
     pg (1.5.4)
-    popper_js (1.16.0)
+    popper_js (2.11.8)
     prawn (2.4.0)
       pdf-core (~> 0.9.0)
       ttfunk (~> 1.7)
@@ -408,13 +409,13 @@ GEM
       binding_of_caller (~> 1.0)
       pry (~> 0.13)
     public_suffix (5.0.3)
-    puma (6.3.1)
+    puma (6.4.0)
       nio4r (~> 2.0)
     raabro (1.4.0)
     racc (1.7.1)
     rack (2.2.8)
-    rack-protection (2.1.0)
-      rack
+    rack-protection (3.1.0)
+      rack (~> 2.2, >= 2.2.4)
     rack-test (2.1.0)
       rack (>= 1.3)
     rails (7.0.8)
@@ -482,7 +483,7 @@ GEM
     rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.5)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-rails (6.0.3)
@@ -495,7 +496,7 @@ GEM
       rspec-support (~> 3.12)
     rspec-retry (0.6.2)
       rspec-core (> 3.3)
-    rspec-support (3.12.0)
+    rspec-support (3.12.1)
     rubocop (1.56.3)
       base64 (~> 0.1.1)
       json (~> 2.3)
@@ -510,7 +511,7 @@ GEM
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.29.0)
       parser (>= 3.2.1.0)
-    rubocop-performance (1.19.0)
+    rubocop-performance (1.19.1)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     rubocop-rails (2.20.2)
@@ -555,15 +556,15 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    sinatra (2.1.0)
-      mustermann (~> 1.0)
-      rack (~> 2.2)
-      rack-protection (= 2.1.0)
+    sinatra (3.1.0)
+      mustermann (~> 3.0)
+      rack (~> 2.2, >= 2.2.4)
+      rack-protection (= 3.1.0)
       tilt (~> 2.0)
     slop (3.6.0)
-    snaky_hash (2.0.0)
+    snaky_hash (2.0.1)
       hashie
-      version_gem (~> 1.1)
+      version_gem (~> 1.1, >= 1.1.1)
     sprockets (4.2.1)
       concurrent-ruby (~> 1.0)
       rack (>= 2.2.4, < 4)
@@ -585,12 +586,12 @@ GEM
       rubocop-performance (~> 1.19.0)
     stimulus-rails (1.2.2)
       railties (>= 6.0.0)
-    strong_migrations (1.6.2)
+    strong_migrations (1.6.3)
       activerecord (>= 5.2)
     terser (1.1.18)
       execjs (>= 0.3.0, < 3)
     thor (1.2.2)
-    tilt (2.0.10)
+    tilt (2.2.0)
     timeout (0.4.0)
     ttfunk (1.7.0)
     turbo-rails (1.4.0)
@@ -601,7 +602,7 @@ GEM
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.4.2)
     uniform_notifier (1.16.0)
-    version_gem (1.1.0)
+    version_gem (1.1.3)
     warden (1.2.9)
       rack (>= 2.0.9)
     web-console (4.2.1)
@@ -613,15 +614,13 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    webrick (1.7.0)
     websocket (1.2.9)
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    yard (0.9.28)
-      webrick (~> 1.7.0)
+    yard (0.9.34)
     zeitwerk (2.6.11)
 
 PLATFORMS
@@ -639,7 +638,7 @@ DEPENDENCIES
   azure-storage-blob
   better_errors
   binding_of_caller
-  bootstrap (~> 4.6.0)
+  bootstrap (~> 5.2)
   brakeman
   bugsnag
   bullet
@@ -707,14 +706,14 @@ DEPENDENCIES
   rubocop-rails (~> 2.20.1)
   rufus-scheduler
   sass-rails
-  selenium-webdriver
+  selenium-webdriver (~> 4.10)
   shoulda-matchers (~> 5.3)
   simple_form
   simplecov
   sprockets (~> 4.2.1)
   standard (~> 1.31)
   stimulus-rails
-  strong_migrations (= 1.6.2)
+  strong_migrations (= 1.6.3)
   terser
   turbo-rails
   web-console
@@ -724,4 +723,4 @@ RUBY VERSION
    ruby 3.1.2p20
 
 BUNDLED WITH
-   2.4.19
+   2.4.20
diff --git a/README.md b/README.md
@@ -93,7 +93,7 @@ You can sign up [here](https://rubyforgood.slack.com/join/shared_invite/zt-1kfei
 
   ```
     Organization Admin
-    Email: org_admin1@example.com
+       Email: org_admin1@example.com
     Password: password!
 
     User

diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js
@@ -1,4 +1,5 @@
 //= link filterrific/filterrific-spinner.gif
+//= link bootstrap.min.js
 //= link_tree ../images
 //= link_directory ../stylesheets .css
 //= link_tree ../../javascript .js

diff --git a/app/assets/stylesheets/AdminLTE.css b/app/assets/stylesheets/AdminLTE.css
diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
@@ -87,6 +87,8 @@ def authorize_user
   end
 
   def organization_params
+    request_type_formatter(params)
+
     params.require(:organization).permit(
       :name, :short_name, :street, :city, :state,
       :zipcode, :email, :url, :logo, :intake_location,
@@ -99,6 +101,22 @@ def organization_params
     )
   end
 
+  def request_type_formatter(params)
+    if params[:organization][:enable_individual_requests] == "false"
+      params[:organization][:enable_child_based_requests] = false
+    end
+
+    if params[:organization][:enable_child_based_requests] == "false"
+      params[:organization][:enable_individual_requests] = false
+    end
+
+    if params[:organization][:enable_quantity_based_requests] == "false"
+      params[:organization][:enable_quantity_based_requests] = false
+    end
+
+    params
+  end
+
   def user_update_redirect_path
     if current_user.has_role?(Role::SUPER_ADMIN)
       admin_organization_path(current_organization.id)

diff --git a/app/helpers/partners_helper.rb b/app/helpers/partners_helper.rb
@@ -22,11 +22,11 @@ def humanize_boolean_3state(boolean)
 
   def partner_status_badge(partner)
     if partner.status == "approved"
-      tag.span partner.display_status, class: %w(badge badge-pill badge-primary float-right)
+      tag.span partner.display_status, class: %w(badge badge-pill badge-primary bg-primary float-right)
     elsif partner.status == "recertification_required"
-      tag.span partner.display_status, class: %w(badge badge-pill badge-danger float-right)
+      tag.span partner.display_status, class: %w(badge badge-pill badge-danger bg-danger float-right)
     else
-      tag.span partner.display_status, class: %w(badge badge-pill badge-info float-right)
+      tag.span partner.display_status, class: %w(badge badge-pill badge-info bg-info float-right)
     end
   end
 end
diff --git a/app/helpers/ui_helper.rb b/app/helpers/ui_helper.rb
@@ -62,7 +62,7 @@ def dropdown_button(id, options = {})
     options[:id] = id
     additional_properties = {
       data: {
-        toggle: "dropdown"
+        "bs-toggle": "dropdown"
       },
       "aria-haspopup": true,
       "aria-expanded": true
@@ -97,7 +97,7 @@ def js_button(options = {}, properties = {})
   end
 
   def modal_button_to(target_id, options = {})
-    properties = { data: { toggle: "modal" } }
+    properties = { data: { "bs-toggle": "modal" } }
     _link_to target_id, { icon: "dot-circle-o", type: "outline-primary", text: "Set 'text' option", size: "md" }.merge(options), properties
   end