style: consistent back button and some translations

lib/mv_web/live/user_live/form.ex

@@ -46,8 +46,24 @@ defmodule MvWeb.UserLive.Form do
     ~H"""
     <Layouts.app flash={@flash} current_user={@current_user}>
       <.header>
+        <:leading>
+          <.button navigate={return_path(@return_to, @user)} variant="neutral">
+            <.icon name="hero-arrow-left" class="size-4" />
+            {gettext("Back")}
+          </.button>
+        </:leading>
         {@page_title}
         <:subtitle>{gettext("Use this form to manage user records in your database.")}</:subtitle>
+        <:actions>
+          <.button
+            form="user-form"
+            phx-disable-with={gettext("Saving...")}
+            variant="primary"
+            type="submit"
+          >
+            {gettext("Save User")}
+          </.button>
+        </:actions>
       </.header>
 
       <.form class="max-w-xl" for={@form} id="user-form" phx-change="validate" phx-submit="save">
@@ -300,7 +316,8 @@ defmodule MvWeb.UserLive.Form do
                 phx-click="delete"
                 phx-value-id={@user.id}
                 data-confirm={
-                  gettext("Are you sure you want to delete the user %{email}? This action cannot be undone.",
+                  gettext(
+                    "Are you sure you want to delete the user %{email}? This action cannot be undone.",
                     email: @user.email
                   )
                 }
@@ -442,36 +459,18 @@ defmodule MvWeb.UserLive.Form do
     user = socket.assigns.user
     actor = current_actor(socket)
 
-    if is_nil(user) do
-      {:noreply, put_flash(socket, :error, gettext("User not found"))}
-    else
-      if to_string(id) != to_string(user.id) do
+    cond do
+      is_nil(user) ->
         {:noreply, put_flash(socket, :error, gettext("User not found"))}
-      else
-        if Mv.Helpers.SystemActor.system_user?(user) do
-          {:noreply,
-           put_flash(socket, :error, gettext("System user cannot be deleted."))}
-        else
-          case Ash.destroy(user, domain: Mv.Accounts, actor: actor) do
-            :ok ->
-              {:noreply,
-               socket
-               |> put_flash(:success, gettext("User deleted successfully"))
-               |> push_navigate(to: ~p"/users")}
 
-            {:error, %Ash.Error.Forbidden{}} ->
-              {:noreply,
-               put_flash(
-                 socket,
-                 :error,
-                 gettext("You do not have permission to delete this user")
-               )}
+      to_string(id) != to_string(user.id) ->
+        {:noreply, put_flash(socket, :error, gettext("User not found"))}
 
-            {:error, error} ->
-              {:noreply, put_flash(socket, :error, format_ash_error(error))}
-          end
-        end
-      end
+      Mv.Helpers.SystemActor.system_user?(user) ->
+        {:noreply, put_flash(socket, :error, gettext("System user cannot be deleted."))}
+
+      true ->
+        handle_user_delete_destroy(socket, user, actor)
     end
   end
 
@@ -585,6 +584,23 @@ defmodule MvWeb.UserLive.Form do
     {:noreply, socket}
   end
 
+  defp handle_user_delete_destroy(socket, user, actor) do
+    case Ash.destroy(user, domain: Mv.Accounts, actor: actor) do
+      :ok ->
+        {:noreply,
+         socket
+         |> put_flash(:success, gettext("User deleted successfully"))
+         |> push_navigate(to: ~p"/users")}
+
+      {:error, %Ash.Error.Forbidden{}} ->
+        {:noreply,
+         put_flash(socket, :error, gettext("You do not have permission to delete this user"))}
+
+      {:error, error} ->
+        {:noreply, put_flash(socket, :error, format_ash_error(error))}
+    end
+  end
+
   defp handle_member_linking(socket, user, actor) do
     result = perform_member_link_action(socket, user, actor)
 

lib/mv_web/live/user_live/index.ex

@@ -7,15 +7,10 @@ defmodule MvWeb.UserLive.Index do
   - Sort users by email (default)
   - Navigate to user details (row click) and edit from details header
   - Delete only via Danger zone on user show/edit
-  - Bulk selection for future batch operations
 
   ## Relationships
   Displays linked member information when a user is connected to a member account.
 
-  ## Events
-  - `select_user` - Toggle individual user selection
-  - `select_all` - Toggle selection of all visible users
-
   ## Security
   User deletion requires admin permissions (enforced by Ash policies).
   """
@@ -42,24 +37,7 @@ defmodule MvWeb.UserLive.Index do
      |> assign(:page_title, gettext("Listing Users"))
      |> assign(:sort_field, :email)
      |> assign(:sort_order, :asc)
-     |> assign(:users, sorted)
-     |> assign(:selected_users, [])}
-  end
-
-  # Selects one user in the list of users
-  @impl true
-  def handle_event("select_user", %{"id" => id}, socket) do
-    # Normalize ID to string for consistent comparison
-    id_str = to_string(id)
-
-    selected =
-      if id_str in socket.assigns.selected_users do
-        List.delete(socket.assigns.selected_users, id_str)
-      else
-        [id_str | socket.assigns.selected_users]
-      end
-
-    {:noreply, assign(socket, :selected_users, selected)}
+     |> assign(:users, sorted)}
   end
 
   # Sorts the list of users according to a field, when you click on the column header
@@ -86,24 +64,6 @@ defmodule MvWeb.UserLive.Index do
      |> assign(:users, sorted_users)}
   end
 
-  # Selects all users in the list of users
-  @impl true
-  def handle_event("select_all", _params, socket) do
-    users = socket.assigns.users
-
-    # Normalize IDs to strings for consistent comparison
-    all_ids = Enum.map(users, &to_string(&1.id))
-
-    selected =
-      if Enum.sort(socket.assigns.selected_users) == Enum.sort(all_ids) do
-        []
-      else
-        all_ids
-      end
-
-    {:noreply, assign(socket, :selected_users, selected)}
-  end
-
   defp toggle_order(:asc), do: :desc
   defp toggle_order(:desc), do: :asc
   defp sort_fun(:asc), do: &<=/2

lib/mv_web/live/user_live/index.html.heex

@@ -19,33 +19,6 @@
     sort_field={@sort_field}
     sort_order={@sort_order}
   >
-    <:col
-      :let={user}
-      label={
-        ~H"""
-        <.input
-          type="checkbox"
-          name="select_all"
-          phx-click="select_all"
-          checked={Enum.sort(@selected_users) == Enum.map(@users, &to_string(&1.id)) |> Enum.sort()}
-          aria-label={gettext("Select all users")}
-          role="checkbox"
-        />
-        """
-      }
-    >
-      <.input
-        type="checkbox"
-        name={to_string(user.id)}
-        phx-click="select_user"
-        phx-value-id={to_string(user.id)}
-        checked={to_string(user.id) in @selected_users}
-        phx-capture-click
-        phx-stop-propagation
-        aria-label={gettext("Select user")}
-        role="checkbox"
-      />
-    </:col>
     <:col
       :let={user}
       sort_field={:email}

lib/mv_web/live/user_live/show.ex

@@ -34,14 +34,20 @@ defmodule MvWeb.UserLive.Show do
     ~H"""
     <Layouts.app flash={@flash} current_user={@current_user}>
       <.header>
+        <:leading>
+          <.button
+            navigate={~p"/users"}
+            variant="neutral"
+            aria-label={gettext("Back to users list")}
+          >
+            <.icon name="hero-arrow-left" class="size-4" />
+            {gettext("Back")}
+          </.button>
+        </:leading>
         {gettext("User")} {@user.email}
         <:subtitle>{gettext("This is a user record from your database.")}</:subtitle>
 
         <:actions>
-          <.button navigate={~p"/users"} variant="neutral" aria-label={gettext("Back to users list")}>
-            <.icon name="hero-arrow-left" />
-            <span class="sr-only">{gettext("Back to users list")}</span>
-          </.button>
           <%= if can?(@current_user, :update, @user) do %>
             <.button
               variant="primary"
@@ -99,7 +105,8 @@ defmodule MvWeb.UserLive.Show do
               phx-click="delete"
               phx-value-id={@user.id}
               data-confirm={
-                gettext("Are you sure you want to delete the user %{email}? This action cannot be undone.",
+                gettext(
+                  "Are you sure you want to delete the user %{email}? This action cannot be undone.",
                   email: @user.email
                 )
               }
@@ -141,33 +148,32 @@ defmodule MvWeb.UserLive.Show do
     user = socket.assigns.user
     actor = current_actor(socket)
 
-    if to_string(id) != to_string(user.id) do
-      {:noreply, put_flash(socket, :error, gettext("User not found"))}
-    else
-      if Mv.Helpers.SystemActor.system_user?(user) do
+    cond do
+      to_string(id) != to_string(user.id) ->
+        {:noreply, put_flash(socket, :error, gettext("User not found"))}
+
+      Mv.Helpers.SystemActor.system_user?(user) ->
+        {:noreply, put_flash(socket, :error, gettext("System user cannot be deleted."))}
+
+      true ->
+        handle_user_delete_destroy(socket, user, actor)
+    end
+  end
+
+  defp handle_user_delete_destroy(socket, user, actor) do
+    case Ash.destroy(user, domain: Mv.Accounts, actor: actor) do
+      :ok ->
         {:noreply,
-         put_flash(socket, :error, gettext("System user cannot be deleted."))}
-      else
-        case Ash.destroy(user, domain: Mv.Accounts, actor: actor) do
-          :ok ->
-            {:noreply,
-             socket
-             |> put_flash(:success, gettext("User deleted successfully"))
-             |> push_navigate(to: ~p"/users")}
+         socket
+         |> put_flash(:success, gettext("User deleted successfully"))
+         |> push_navigate(to: ~p"/users")}
 
-          {:error, %Ash.Error.Forbidden{}} ->
-            {:noreply,
-             put_flash(
-               socket,
-               :error,
-               gettext("You do not have permission to delete this user")
-             )}
+      {:error, %Ash.Error.Forbidden{}} ->
+        {:noreply,
+         put_flash(socket, :error, gettext("You do not have permission to delete this user"))}
 
-          {:error, error} ->
-            {:noreply,
-             put_flash(socket, :error, format_ash_error(error))}
-        end
-      end
+      {:error, error} ->
+        {:noreply, put_flash(socket, :error, format_ash_error(error))}
     end
   end
 end