Merge remote-tracking branch 'upstream/main' into rails-8

Author: coalest

.devcontainer/Dockerfile

@@ -1,9 +1,9 @@
 # Installs Ruby 3.2.2. When human-essentials moves to a newer version of ruby,
 # it will be more efficient to change the image.
 # See https://github.com/devcontainers/images/blob/main/src/ruby/history/
-FROM mcr.microsoft.com/devcontainers/ruby:dev-3.2-buster
+FROM mcr.microsoft.com/devcontainers/ruby:dev-3.2
 RUN export DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && apt-get -y install vim curl gpg postgresql postgresql-contrib
 RUN cd /tmp
 RUN wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb \
-    && apt-get -y install ./google-chrome-stable_current_amd64.deb
+    && apt-get -y install ./google-chrome-stable_current_amd64.deb

.devcontainer/post-create.sh

@@ -1,19 +1,28 @@
 RUBY_VERSION="$(cat .ruby-version | tr -d '\n')"
 
 # copy the file only if it doesn't already exist
+echo "*** Creating initial .env and vscode settings, if needed"
 cp -n .devcontainer/.env.codespaces .env
 mkdir -p .vscode && cp -n .devcontainer/launch.json.codespaces .vscode/launch.json
 
 # If the project's required ruby version changes from 3.2.2, this command
 # will download and compile the correct version, but it will take a long time.
 if [ "$RUBY_VERSION" != "3.2.2" ]; then
+  echo "*** Installing Ruby $RUBY_VERSION (this may take a while)"
   rvm install $RUBY_VERSION
   rvm use $RUBY_VERSION
   echo "Ruby $RUBY_VERSION installed"
 fi
 
+echo "*** Setting up node"
 nvm install node
+
+echo "*** Setting up ruby environment"
 rbenv init bash
 rbenv init zsh
 
+# echo "*** Forcing platform version of nokogiri"
+# gem install nokogiri -v 1.18.1 --platform=ruby -- --use-system-libraries
+
+echo "*** Running project bin/setup"
 bin/setup

Gemfile

@@ -32,9 +32,7 @@ gem "paper_trail"
 # Associates users with roles.
 gem "rolify", "~> 6.0"
 # Enforces "safe" migrations.
-# Pinned to 1.8.0 because 2.0.0 no longer support postgres v10
-# And as of now we are using postgres v10 in production
-gem "strong_migrations", "1.8.0"
+gem "strong_migrations"
 # used in events
 gem 'dry-struct'
 # Use solid_cache as a cache store

Gemfile.lock

@@ -686,9 +686,9 @@ GEM
       rubocop-rails (~> 2.25.0)
     stimulus-rails (1.3.4)
       railties (>= 6.0.0)
-    stringio (3.1.5)
-    strong_migrations (1.8.0)
-      activerecord (>= 5.2)
+    stringio (3.1.2)
+    strong_migrations (2.2.0)
+      activerecord (>= 7)
     terser (1.2.5)
       execjs (>= 0.3.0, < 3)
     thor (1.3.2)
@@ -824,11 +824,11 @@ DEPENDENCIES
   standard-performance
   standard-rails
   stimulus-rails
-  strong_migrations (= 1.8.0)
+  strong_migrations
   terser
   turbo-rails
   web-console
   webmock (~> 3.24)
 
 BUNDLED WITH
-   2.6.2
+   2.6.5

app/assets/stylesheets/application.scss

@@ -225,3 +225,7 @@ div.distribution-request-unit {
   margin-right: 20px;
   white-space: nowrap;
 }
+
+.git-version {
+  color: gray;
+}

app/assets/stylesheets/base/_variables.scss

@@ -141,4 +141,4 @@ $diaper-font-family-sans-serif-alt: "Helvetica Neue", Helvetica, Arial, sans-ser
 
 // sizes
 $diaper-navbar-height: 57;
-$diaper-footer-height: 57;
+$diaper-footer-height: 75;

app/controllers/product_drives_controller.rb

@@ -11,6 +11,8 @@ def index
                      .class_filter(filter_params)
                      .within_date_range(@selected_date_range)
                      .order(start_date: :desc)
+    @paginated_product_drives = @product_drives.page(params[:page])
+
     # to be used in the name filter to sort product drives in alpha order
     @product_drives_alphabetical = @product_drives.sort_by { |pd| pd.name.downcase }
     @item_categories = current_organization.item_categories

app/jobs/backup_db_rds.rb

@@ -1,3 +1,5 @@
+require "aws-sdk-s3"
+
 # to be called from Clock
 module BackupDbRds
   def self.run
@@ -10,15 +12,11 @@ def self.run
     backup_filename = "#{current_time}.rds.dump"
     system("PGPASSWORD='#{ENV["DIAPER_DB_PASSWORD"]}' pg_dump -Fc -v --host=#{ENV["DIAPER_DB_HOST"]} --username=#{ENV["DIAPER_DB_USERNAME"]} --dbname=#{ENV["DIAPER_DB_DATABASE"]} -f #{backup_filename}")
 
-    account_name = ENV["AZURE_STORAGE_ACCOUNT_NAME"]
-    account_key = ENV["AZURE_STORAGE_ACCESS_KEY"]
-
-    blob_client = Azure::Storage::Blob::BlobService.create(
-      storage_account_name: account_name,
-      storage_access_key: account_key
-    )
+    client = Aws::S3::Client.new(region: "us-east-2")
 
     logger.info("Uploading #{backup_filename}")
-    blob_client.create_block_blob("backups", backup_filename, File.read(backup_filename))
+    client.put_object(key: "backups/#{backup_filename}",
+      body: File.read(backup_filename),
+      bucket: "human-essentials-backups")
   end
 end

app/views/layouts/application.html.erb

@@ -98,6 +98,7 @@
     <div class="pull-right hidden-xs">
     </div>
     <strong>Human Essentials was built with <i class="fa fa-heart fa-beat" style="color:red;"></i> by <a href="http://rubyforgood.org">Ruby for Good</a>.</strong>
+    <br><span class="git-version">Version: <%= ENV['GIT_SHA'] %></span>
   </footer>
 
   </aside>

app/views/partners/_show_header.html.erb

@@ -42,11 +42,6 @@
     </div>
   </div>
   <!-- /.card-body -->
-  <div class="card-footer">
-    <span class="float-right">
-      <%= download_button_to(partner_path(partner, format: :csv, filters: filter_params.merge(date_range: date_range_params)), {text: "Export Partner Distributions", size: "md"}) if partner_distributions.any? %>
-    </span>
-  </div>
 </div>
 <div id="seeZipcodes" class="modal fade">
   <div class="modal-dialog">

app/views/partners/profiles/step/_attached_documents_form.html.erb

@@ -4,7 +4,10 @@
       <strong>Attached files:</strong>
       <ul>
         <% profile.documents.each do |doc| %>
-          <li><%= link_to doc.blob['filename'], rails_blob_path(doc), class: "font-weight-bold" %></li>
+          <% if doc.persisted? %>
+            <li><%= link_to doc.blob['filename'], rails_blob_path(doc), class: "font-weight-bold" %></li>
+            <%= pf.hidden_field :documents, multiple: true, value: doc.signed_id %>
+          <% end %>
         <% end %>
       </ul>
       <%= pf.file_field :documents, multiple: true, class: "form-control-file" %>

app/views/partners/show.html.erb

@@ -222,6 +222,9 @@
         <!-- Default box -->
         <div class="card card-primary card-outline">
           <div class="card-header">
+            <span class="float-right">
+              <%= download_button_to(partner_path(@partner, format: :csv, filters: filter_params.merge(date_range: date_range_params)), {text: "Export Partner Distributions", size: "md"}) if @partner_distributions.any? %>
+            </span>
             <h2 class="card-title fs-3">Prior Distributions</h2>
           </div>
           <div class="card-body p-0">

app/views/product_drives/index.html.erb

@@ -102,7 +102,7 @@
               </tr>
               </thead>
               <tbody>
-              <% @product_drives.each do |product_drive| %>
+              <% @paginated_product_drives.each do |product_drive| %>
                 <tr>
                   <td><%= product_drive.name %></td>
                   <td><%= product_drive.start_date.strftime("%m-%d-%Y") %></td>
@@ -119,9 +119,9 @@
             </table>
           </div>
           <!-- /.card-body -->
-          <!--          <div class="card-footer clearfix">-->
-          <%#= paginate @paginated_requests %>
-          <!--          </div>-->
+          <div class="card-footer clearfix">
+            <%= paginate @paginated_product_drives %>
+          </div>
           <!-- /.card-footer-->
         </div>
         <!-- /.card -->

app/views/product_drives/show.html.erb

@@ -61,6 +61,10 @@
     <div class="row">
       <div class="col-12">
         <!-- Default box -->
+        <div class="card-footer clearfix">
+          <%= edit_button_to edit_product_drive_path(@product_drive), { text: "Make a correction", size: "md" } %>
+          <%= delete_button_to product_drive_path(@product_drive), { confirm: "Are you sure you want to permanently remove this product drive?", size: "md" } if current_user.has_cached_role?(Role::ORG_ADMIN, current_organization) %>
+        </div>
         <div class="card">
           <div class="card-body p-0">
             <table class="table">
@@ -90,10 +94,6 @@
           <p style="text-align: center">
             To add additional donations to this product drive, please edit that donation and select this product drive from the appropriate dropdown.
           </p>
-          <div class="card-footer clearfix">
-            <%= edit_button_to edit_product_drive_path(@product_drive), { text: "Make a correction", size: "md" } %>
-            <%= delete_button_to product_drive_path(@product_drive), { confirm: "Are you sure you want to permanently remove this product drive?", size: "md" } if current_user.has_cached_role?(Role::ORG_ADMIN, current_organization) %>
-          </div>
           <!-- /.card-footer-->
         </div>
         <!-- /.card -->

bin/setup

@@ -40,7 +40,7 @@ FileUtils.chdir APP_ROOT do
   #
   # Validate that the ruby version requirement is met.
   #
-  expected_ruby_version = `cat .ruby-version`.chomp
+  expected_ruby_version = `cat .ruby-version`.chomp.gsub(/\.\d+\z/, "")
   current_ruby_version = `ruby -v`.chomp
   unless current_ruby_version.include?(expected_ruby_version)
     log "Ruby version must be #{expected_ruby_version}. You are on #{current_ruby_version}", color: :red

config/initializers/git_sha.rb

@@ -0,0 +1 @@
+ENV['GIT_SHA'] = `cat #{Rails.root}/REVISION`

config/initializers/strong_migrations.rb

@@ -12,7 +12,7 @@
 
 # Set the version of the production database
 # so the right checks are run in development
-StrongMigrations.target_version = 10
+StrongMigrations.target_version = 16.3
 
 # Add custom checks
 # StrongMigrations.add_check do |method, args|

lib/tasks/fetch_latest_db.rake

@@ -59,7 +59,7 @@ def fetch_latest_backups
   # Retrieve the most up to date version of the DB dump
   #
   backup = backups.contents.select { |b| b.key.match?(".rds.dump") }.sort do |a,b|
-    Time.parse(a.last_modified) <=> Time.parse(b.last_modified)
+    a.last_modified <=> b.last_modified
   end.reverse.first
 
   #

spec/fixtures/files/document1.md

@@ -0,0 +1,13 @@
+# Food Pantry Program Overview
+
+Our food pantry serves families in need within the community.
+
+## Services Provided
+
+- Weekly food distribution
+- Emergency food assistance
+
+## Contact Information
+
+Email: [email protected]
+Phone: (555) 123-4567

spec/fixtures/files/document2.md

@@ -0,0 +1,9 @@
+# Delivery Guidelines
+
+Please follow these guidelines when delivering goods:
+
+1. Ensure all packages are labeled.
+2. Deliveries must be completed by 5 PM.
+3. Contact us immediately if there are delays.
+
+Thank you for your cooperation!

spec/requests/product_drives_requests_spec.rb

@@ -159,6 +159,40 @@
           end
         end
       end
+
+      describe "pagination" do
+        around do |ex|
+          Kaminari.config.default_per_page = 2
+          ex.run
+          Kaminari.config.default_per_page = 5
+        end
+
+        before do
+          # Create a list of Product Drives to exceed pagination limit
+          create_list(:product_drive, 10, organization: organization)
+
+          # Fetch Product Drives before assertions
+          get product_drives_path
+        end
+
+        it "displays pagination controls when there are more product drives than default per page" do
+          expect(response).to be_successful
+
+          parsed_html = Nokogiri::HTML(response.body)
+
+          # Select the Product Drives table, which is the only table in the view
+          # and count the rows
+          product_drives_table = parsed_html.at_css("table.table")
+          row_count = product_drives_table.css("tbody tr").size
+
+          # There should be 2 rows on the first page--the default per page configured above
+          expect(row_count).to eq(2)
+
+          # Check that pagination controls (e.g., "Next" button) appear
+          next_button = parsed_html.at_css('a, button') { |el| el.text.strip == 'Next' }
+          expect(next_button).not_to be_nil
+        end
+      end
     end
 
     describe "GET #new" do

spec/system/partners/profile_edit_system_spec.rb

@@ -99,6 +99,44 @@
       expect(page).to have_css("#partner_settings.accordion-collapse.collapse.show", visible: true)
     end
 
+    it "preserves previously uploaded documents when adding new attachments" do
+      # Upload the first document
+      find("button[data-bs-target='#attached_documents']").click
+      expect(page).to have_css("#attached_documents.accordion-collapse.collapse.show", visible: true)
+
+      within "#attached_documents" do
+        attach_file("partner_profile_documents", Rails.root.join("spec/fixtures/files/document1.md"), make_visible: true)
+      end
+
+      # Save Progress
+      all("input[type='submit'][value='Save Progress']").last.click
+      expect(page).to have_css(".alert-success", text: "Details were successfully updated.")
+
+      # Verify the document is listed
+      visit edit_partners_profile_path
+      find("button[data-bs-target='#attached_documents']").click
+      within "#attached_documents" do
+        expect(page).to have_link("document1.md")
+      end
+
+      # Upload a second document
+      within "#attached_documents" do
+        attach_file("partner_profile_documents", Rails.root.join("spec/fixtures/files/document2.md"), make_visible: true)
+      end
+
+      # Save Progress
+      all("input[type='submit'][value='Save Progress']").last.click
+      expect(page).to have_css(".alert-success", text: "Details were successfully updated.")
+
+      # Verify both documents are listed
+      visit edit_partners_profile_path
+      find("button[data-bs-target='#attached_documents']").click
+      within "#attached_documents" do
+        expect(page).to have_link("document1.md")
+        expect(page).to have_link("document2.md")
+      end
+    end
+
     it "persists file upload when there are validation errors" do
       # Open up Agency Information section and upload proof-of-status letter
       find("button[data-bs-target='#agency_information']").click