Merge branch 'master' into issue-2445

Author: olleolleolle

Gemfile

@@ -49,7 +49,8 @@ gem 'pagy', '~> 43.2'
 gem 'icalendar'
 gem 'tzinfo-data'
 
-gem 'chosen-rails', github: 'olleolleolle/chosen-rails', branch: 'support-rails-8'
+# Chosen JavaScript and CSS loaded from vendor/assets/ instead of gem
+# The chosen-rails gem has broken CoffeeScript compilation on Rails 8.1
 gem 'commonmarker'
 
 gem 'faraday'

Gemfile.lock

@@ -6,16 +6,6 @@ GIT
     sitemap_generator (6.3.0)
       builder (~> 3.0)
 
-GIT
-  remote: https://github.com/olleolleolle/chosen-rails.git
-  revision: cfef31cb30ed6d0dfd65cae0ff6f4a2943812df0
-  branch: support-rails-8
-  specs:
-    chosen-rails (2.0.0)
-      coffee-rails (>= 3.2)
-      dartsass-rails (>= 0.5.0)
-      railties (>= 3.0)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -164,13 +154,6 @@ GEM
       logger (~> 1.5)
     cocoon (1.2.15)
     coderay (1.1.3)
-    coffee-rails (5.0.0)
-      coffee-script (>= 2.2.0)
-      railties (>= 5.2.0)
-    coffee-script (2.4.1)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.12.2)
     commonmarker (2.6.3-aarch64-linux)
     commonmarker (2.6.3-arm64-darwin)
     commonmarker (2.6.3-x86_64-darwin)
@@ -184,9 +167,6 @@ GEM
     css_parser (1.14.0)
       addressable
     csv (3.3.5)
-    dartsass-rails (0.5.1)
-      railties (>= 6.0.0)
-      sass-embedded (~> 1.63)
     database_cleaner (2.1.0)
       database_cleaner-active_record (>= 2, < 3)
     database_cleaner-active_record (2.2.2)
@@ -234,18 +214,6 @@ GEM
       activerecord (>= 4.0.0)
     globalid (1.3.0)
       activesupport (>= 6.1)
-    google-protobuf (4.33.2-aarch64-linux-gnu)
-      bigdecimal
-      rake (>= 13)
-    google-protobuf (4.33.2-arm64-darwin)
-      bigdecimal
-      rake (>= 13)
-    google-protobuf (4.33.2-x86_64-darwin)
-      bigdecimal
-      rake (>= 13)
-    google-protobuf (4.33.2-x86_64-linux-gnu)
-      bigdecimal
-      rake (>= 13)
     haml (7.2.0)
       temple (>= 0.8.2)
       thor
@@ -544,14 +512,6 @@ GEM
     ruby-vips (2.3.0)
       ffi (~> 1.12)
       logger
-    sass-embedded (1.97.0-aarch64-linux-gnu)
-      google-protobuf (~> 4.31)
-    sass-embedded (1.97.0-arm64-darwin)
-      google-protobuf (~> 4.31)
-    sass-embedded (1.97.0-x86_64-darwin)
-      google-protobuf (~> 4.31)
-    sass-embedded (1.97.0-x86_64-linux-gnu)
-      google-protobuf (~> 4.31)
     sassc (2.4.0)
       ffi (~> 1.9)
     sassc-rails (2.1.2)
@@ -655,7 +615,6 @@ DEPENDENCIES
   capybara-playwright-driver
   carrierwave
   carrierwave-aws (~> 1.6)
-  chosen-rails!
   cocoon
   commonmarker
   csv

README.md

@@ -68,6 +68,8 @@ Before you start, you will need to have Docker installed and running. You can [d
 
 Run `bin/dup` to build and create the docker container. This will also set up the Rails application within the container and start the container. You will only have to run this command once. After initial setup, use `bin/dstart` to start an existing container - using `bin/dup` will recreate an existing container and reset the database.
 
+**Note:** The Docker setup includes ImageMagick automatically. If you're using native installation, you must install ImageMagick separately (see [native-installation-instructions.md](./native-installation-instructions.md)).
+
 ### 4. Start the app
 
 Run `bin/dserver` to start the Rails server.

app/assets/javascripts/application.js

@@ -10,12 +10,12 @@
 // Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
 // about supported directives.
 //
+//= require jquery
 //= require popper
 //= require bootstrap
-//= require jquery
 //= require rails-ujs
 //= require activestorage
-//= require chosen-jquery
+//= require chosen.jquery
 //= require 'jsimple-star-rating.min.js'
 //= require pickadate/picker
 //= require pickadate/picker.date
@@ -57,12 +57,12 @@ $(function() {
     }).show();
   });
 
-  $('select').chosen(function(){
-    allow_single_deselect: true
+  $('select').chosen({
+    allow_single_deselect: true,
     no_results_text: 'No results matched'
   });
 
-  $('#member_lookup_id').chosen().change(function(e) {
+  $('#member_lookup_id').change(function(e) {
     $('#view_profile').attr('href', '/admin/members/' + $(this).val())
   });
 

app/views/admin/members/index.html.haml

@@ -4,7 +4,7 @@
       %h1 Members Directory
   .row.mb-4
     .col-12.col-md-6
-      = select_tag 'member_lookup_id', options_for_select(@members.collect{ |u| ["#{u.full_name} (#{u.email})", u.id] }), { class: 'chosen-select' }
+      = select_tag 'member_lookup_id', options_for_select([['Select a member...', '']] + @members.collect{ |u| ["#{u.full_name} (#{u.email})", u.id] }), { class: 'chosen-select' }
   .row
     .col
       = link_to 'View Profile', '#', { class: 'btn btn-primary', id: 'view_profile' }

db/seeds.rb

@@ -1,4 +1,25 @@
 if Rails.env.development?
+  # Check for ImageMagick before seeding
+  imagemagick_available = system('convert --version > /dev/null 2>&1') ||
+                         system('magick --version > /dev/null 2>&1')
+
+  unless imagemagick_available
+    Rails.logger.error "=" * 80
+    Rails.logger.error "ERROR: ImageMagick is required to run db:seed"
+    Rails.logger.error "=" * 80
+    Rails.logger.error ""
+    Rails.logger.error "The seed task processes sponsor logo images, which requires ImageMagick."
+    Rails.logger.error ""
+    Rails.logger.error "Install ImageMagick:"
+    Rails.logger.error "  macOS:         brew install imagemagick"
+    Rails.logger.error "  Ubuntu/Debian: apt-get install imagemagick"
+    Rails.logger.error "  Windows:       https://imagemagick.org/script/download.php"
+    Rails.logger.error ""
+    Rails.logger.error "See native-installation-instructions.md for details."
+    Rails.logger.error "=" * 80
+    exit 1
+  end
+
   begin
     Rails.logger.info 'Running migrations...'
     Rails.application.config.log_level = :info

native-installation-instructions.md

@@ -47,7 +47,7 @@ brew install postgresql
 brew services start postgresql
 ```
 
-Install other dependencies:
+Install required dependencies:
 ```
 brew install imagemagick
 ```