fix linting

lib/mv/membership/member_export/build.ex

@@ -272,11 +272,22 @@ defmodule Mv.Membership.MemberExport.Build do
     if field == "groups" do
       sort_members_by_groups_export(members, order)
     else
+      sort_by_custom_field_value(members, field, order, custom_fields)
+    end
+  end
+
+  defp sort_by_custom_field_value(members, field, order, custom_fields) do
     id_str = String.trim_leading(field, @custom_field_prefix)
     custom_field = Enum.find(custom_fields, fn cf -> to_string(cf.id) == id_str end)
 
-      if is_nil(custom_field), do: members
+    if is_nil(custom_field) do
+      members
+    else
+      sort_members_with_custom_field(members, custom_field, order)
+    end
+  end
 
+  defp sort_members_with_custom_field(members, custom_field, order) do
     key_fn = fn member ->
       cfv = find_cfv(member, custom_field)
       raw = if cfv, do: cfv.value, else: nil
@@ -288,7 +299,6 @@ defmodule Mv.Membership.MemberExport.Build do
     |> Enum.sort(fn {_, ka}, {_, kb} -> MemberExportSort.key_lt(ka, kb, order) end)
     |> Enum.map(fn {m, _} -> m end)
   end
-  end
 
   defp sort_members_by_groups_export(members, order) do
     # Members with groups first, then by first group name alphabetically (min = first by sort order)

lib/mv_web/controllers/member_export_controller.ex

@@ -380,6 +380,11 @@ defmodule MvWeb.MemberExportController do
     if field == "groups" do
       sort_members_by_groups_export(members, order)
     else
+      sort_by_custom_field_value(members, field, order, custom_fields)
+    end
+  end
+
+  defp sort_by_custom_field_value(members, field, order, custom_fields) do
     id_str = String.trim_leading(field, @custom_field_prefix)
 
     custom_field =
@@ -408,7 +413,6 @@ defmodule MvWeb.MemberExportController do
       sorted_with_values ++ without_values
     end
   end
-  end
 
   defp sort_members_by_groups_export(members, order) do
     # Members with groups first, then by first group name alphabetically (min = first by sort order)

lib/mv_web/live/member_live/index.ex

@@ -686,6 +686,7 @@ defmodule MvWeb.MemberLive.Index do
     socket =
       if socket.assigns[:sort_needs_update] do
         old_field = socket.assigns[:previous_sort_field] || socket.assigns.sort_field
+
         socket
         |> update_sort_components(old_field, socket.assigns.sort_field, socket.assigns.sort_order)
         |> assign(:sort_needs_update, false)
@@ -1066,7 +1067,6 @@ defmodule MvWeb.MemberLive.Index do
     end
   end
 
-
   defp apply_sort_to_query(query, field, order) do
     cond do
       # Groups sort -> after load (in memory)