Merge branch 'main' into 4858-add-an-option-to-include-in-kind-values-in-export-of-donations-and-distributions-new

Author: nozomirin

.gitignore

@@ -88,3 +88,4 @@ package-lock.json
 out/
 
 .vscode/
+.aider*

app/controllers/partners/requests_controller.rb

@@ -81,8 +81,11 @@ def fetch_items
       @requestable_items = PartnerFetchRequestableItemsService.new(partner_id: partner.id).call
       if Flipper.enabled?(:enable_packs)
         # hash of (item ID => hash of (request unit name => request unit plural name))
-        @item_units = Item.where(id: @requestable_items.to_h.values).to_h do |i|
-          [i.id, i.request_units.to_h { |u| [u.name, u.name.pluralize] }]
+        item_ids = @requestable_items.to_h.values
+        if item_ids.present?
+          @item_units = Item.where(id: item_ids).to_h do |i|
+            [i.id, i.request_units.to_h { |u| [u.name, u.name.pluralize] }]
+          end
         end
       end
     end

app/helpers/partners/profile_helper.rb

@@ -0,0 +1,20 @@
+module Partners
+  module ProfileHelper
+    # Returns an array of filenames that are attached to the profile but not persisted.
+    # This is to display to the user that the system remembers their file selections
+    # even if there was a form validation error.
+    # The method returns a JSON string (an array of filenames) to be used in a Stimulus controller.
+    def attached_but_not_persisted_file_names(profile)
+      filenames = profile.documents.attachments
+        .select { |att| !att.persisted? }
+        .map { |att| att.blob.filename.to_s }
+
+      filenames.to_json
+    end
+
+    # Returns true if at least one document attachment is actually persisted
+    def has_persisted_documents?(profile)
+      profile.documents.attachments.any?(&:persisted?)
+    end
+  end
+end

app/javascript/controllers/file_input_controller.js

@@ -5,8 +5,9 @@ import { Controller } from "@hotwired/stimulus";
  *
  * This controller:
  * - Listens for file selection on an `<input type="file" multiple="multiple">`
- * - Displays selected file names in a custom list **when multiple files are selected
- * - Defaults to the browser’s built-in display for a single file selection
+ * - Displays selected file names in a custom list when multiple files are selected
+ * - If provided a `filenames` array, displays those file names as if user had just selected them.
+ *   This is useful for displaying previously selected files on page load with validation errors.
  *
  * Expected HTML structure should have a placeholder div for the selected file names:
  *
@@ -20,29 +21,60 @@ import { Controller } from "@hotwired/stimulus";
 export default class extends Controller {
   static targets = ["input", "list"];
 
+  static values = {
+    filenames: Array
+  }
+
   connect() {
     this.inputTarget.addEventListener("change", () => this.updateFileList());
+
+    if (this.hasFilenamesValue && this.filenamesValue.length > 0) {
+      this.updateFileListFromValue();
+    }
+  }
+
+  // Opens the hidden file input when "Choose Files" button is clicked
+  triggerFileSelection() {
+    this.inputTarget.click();
   }
 
+  // native file input selection
   updateFileList() {
     const files = this.inputTarget.files;
-    this.listTarget.innerHTML = ""; // Clear previous list
 
-    // If no files or only one file is selected, let the native UI handle it
-    if (files.length <= 1) {
+    if (files.length === 0) {
       return;
     }
 
+    this.renderFileList(Array.from(files).map(file => file.name));
+  }
+
+  updateFileListFromValue() {
+    this.renderFileList(this.filenamesValue);
+  }
+
+  renderFileList(fileNames) {
+    // Clear previous list
+    this.listTarget.innerHTML = "";
+
+    // Create subheader
+    const header = document.createElement("p");
+    header.textContent = "Selected files:";
+    header.classList.add("font-weight-bold", "mb-1");
+
+    // Create file list
     const ul = document.createElement("ul");
     ul.classList.add("list-unstyled", "mt-2");
 
-    Array.from(files).forEach((file) => {
+    fileNames.forEach((name) => {
       const li = document.createElement("li");
       li.classList.add("p-1", "rounded", "mb-1");
-      li.textContent = file.name;
+      li.textContent = name;
       ul.appendChild(li);
     });
 
+    // Append header and list to target container
+    this.listTarget.appendChild(header);
     this.listTarget.appendChild(ul);
   }
 }

app/javascript/controllers/item_units_controller.js

@@ -43,7 +43,7 @@ export default class extends Controller {
       this.requestSelectTarget.style.display = 'inline';
       this.clearOptions()
       this.addOption('-1', 'Please select a unit')
-      this.addOption('', 'Units')
+      this.addOption('', 'units')
       for (const [index, [name, displayName]] of Object.entries(Object.entries(units))) {
         this.addOption(name, displayName)
       }

app/javascript/controllers/select2_controller.js

@@ -29,5 +29,19 @@ export default class extends Controller {
         }
       }
     });
+
+    /**
+     * This is a workaround to prevent select2 from filling in an existing
+     * value even when you try to remove everything. This solution was found at
+     * https://github.com/select2/select2/issues/3320#issuecomment-1440268574
+     */
+    if ($(this.element).prop('multiple')) {
+      select2.on("select2:unselecting", function (e) {
+          $(this).on("select2:opening", function (ev) {
+              ev.preventDefault();
+              $(this).off("select2:opening");
+          });
+      });
+    }
   }
 }

app/models/partners/item_request.rb

@@ -38,9 +38,9 @@ def request_unit_is_supported
 
     def name_with_unit(quantity_override = nil)
       if Flipper.enabled?(:enable_packs) && request_unit.present?
-        "#{item.name} - #{request_unit.pluralize(quantity_override || quantity.to_i)}"
+        "#{item&.name || name} - #{request_unit.pluralize(quantity_override || quantity.to_i)}"
       else
-        item.name
+        item&.name || name
       end
     end
   end

app/models/unit.rb

@@ -10,5 +10,7 @@
 #
 class Unit < ApplicationRecord
   belongs_to :organization
-  validates :name, uniqueness: {scope: :organization}
+  validates :name,
+    uniqueness: {scope: :organization},
+    format: {without: /\Aunits?\z/i, message: "'unit' is reserved."}
 end

app/pdfs/picklists_pdf.rb

@@ -145,7 +145,7 @@ def data_with_units(line_items)
     data + line_items.map do |line_item|
       [line_item.name,
         line_item.quantity,
-        line_item.request_unit&.capitalize&.pluralize(line_item.quantity),
+        line_item.request_unit&.pluralize(line_item.quantity),
         "[  ]",
         ""]
     end

app/services/organization_update_service.rb

@@ -18,9 +18,10 @@ def update(organization, params)
         org_params["partner_form_fields"] = org_params["partner_form_fields"].compact_blank
       end
 
-      if Flipper.enabled?(:enable_packs) && org_params[:request_unit_names]
+      if Flipper.enabled?(:enable_packs)
+        request_unit_names = org_params[:request_unit_names] || []
         # Find or create units for the organization
-        request_unit_ids = org_params[:request_unit_names].compact_blank.map do |request_unit_name|
+        request_unit_ids = request_unit_names.compact_blank.map do |request_unit_name|
           Unit.find_or_create_by(organization: organization, name: request_unit_name).id
         end
         org_params.delete(:request_unit_names)