Split delivery cycles collection helpers for selects vs checkboxes

The grouped-by-visibility format works well for select dropdowns (optgroups)
but checkboxes need a flat list. Added admin_delivery_cycles_collection_by_visibility
for selects/filters, while admin_delivery_cycles_collection returns a flat list
for checkbox inputs.

Author: thibaudgg

app/admin/depot.rb

@@ -16,7 +16,7 @@
     as: :string
   filter :delivery_cycles,
     as: :select,
-    collection: -> { admin_delivery_cycles_collection }
+    collection: -> { admin_delivery_cycles_collection_by_visibility }
 
   includes :memberships, :delivery_cycles
   index do

app/admin/member.rb

@@ -587,7 +587,7 @@
         f.input :waiting_delivery_cycle,
           label: DeliveryCycle.model_name.human,
           as: :select,
-          collection: admin_delivery_cycles_collection
+          collection: admin_delivery_cycles_collection_by_visibility
         f.input :waiting_billing_year_division,
           label: Membership.human_attribute_name(:billing_year_division),
           as: :select,

app/admin/membership.rb

@@ -47,7 +47,7 @@
   filter :depot, as: :select, collection: -> { admin_depots_collection }
   filter :delivery_cycle,
     as: :select,
-    collection: -> { admin_delivery_cycles_collection }
+    collection: -> { admin_delivery_cycles_collection_by_visibility }
   filter :absences_included,
     if: proc { feature?("absence") }
   filter :renewal_state,
@@ -859,7 +859,7 @@
       end
       ol "data-controller" => "form-reset", class: "mt-6" do
         f.input :delivery_cycle,
-          collection: admin_delivery_cycles_collection,
+          collection: admin_delivery_cycles_collection_by_visibility,
           as: :select,
           prompt: true,
           input_html: {
@@ -913,7 +913,7 @@
           ff.input :quantity
           ff.input :delivery_cycle,
             as: :select,
-            collection: admin_delivery_cycles_collection,
+            collection: admin_delivery_cycles_collection_by_visibility,
             include_blank: true,
             hint: true
         end

app/helpers/admin_helper.rb

@@ -25,25 +25,27 @@ def admin_basket_complements_collection(options = nil)
     grouped_by_visibility(admin_basket_complements, options)
   end
 
+  def admin_delivery_cycles
+    DeliveryCycle.kept.ordered
+  end
+
   def admin_delivery_cycles_collection
-    cycles = DeliveryCycle.kept.ordered
-    if DeliveryCycle.visible?
-      [
-        [ t("active_admin.scopes.visible"), cycles_option_for_select(cycles.visible) ],
-        [ t("active_admin.scopes.hidden"), cycles_option_for_select(cycles.where.not(id: cycles.visible)) ]
-      ]
-    else
-      cycles_option_for_select(cycles)
-    end
+    delivery_cycles_option_for_select(admin_delivery_cycles)
   end
 
-  def cycles_option_for_select(cycles)
-    cycles.map { |cycle|
+  def admin_delivery_cycles_collection_by_visibility
+    cycles = admin_delivery_cycles
+    visible_cycles = cycles.visible.to_a
+    hidden_cycles = cycles.to_a - visible_cycles
+
+    if hidden_cycles.empty?
+      delivery_cycles_option_for_select(cycles)
+    else
       [
-        "#{cycle.name} (#{t('helpers.deliveries_count', count: cycle.deliveries_count)})",
-        cycle.id
+        [ t("active_admin.scopes.visible"), delivery_cycles_option_for_select(visible_cycles) ],
+        [ t("active_admin.scopes.hidden"), delivery_cycles_option_for_select(hidden_cycles) ]
       ]
-    }
+    end
   end
 
   def member_cities_collection
@@ -84,6 +86,15 @@ def grouped_by_visibility(relation, options)
 
   private
 
+  def delivery_cycles_option_for_select(cycles)
+    cycles.map { |cycle|
+      [
+        "#{cycle.name} (#{t('helpers.deliveries_count', count: cycle.deliveries_count)})",
+        cycle.id
+      ]
+    }
+  end
+
   def option_for_select(records, options = nil)
     records.map { |a| [ a.display_name, a.id, options&.call(a) ].compact }
   end