Merge branch 'main' into feat/421_accessibility

lib/mv_web/live/role_live/show.ex

@@ -124,7 +124,7 @@ defmodule MvWeb.RoleLive.Show do
       :ok ->
         {:noreply,
          socket
-         |> put_flash(:info, gettext("Role deleted successfully."))
+         |> put_flash(:success, gettext("Role deleted successfully."))
          |> push_navigate(to: ~p"/admin/roles")}
 
       {:error, error} ->
@@ -161,27 +161,28 @@ defmodule MvWeb.RoleLive.Show do
     ~H"""
     <Layouts.app flash={@flash} current_user={@current_user}>
       <.header>
+        <:leading>
+          <.button
+            navigate={~p"/admin/roles"}
+            variant="neutral"
+            aria-label={gettext("Back to roles list")}
+          >
+            <.icon name="hero-arrow-left" class="size-4" />
+            {gettext("Back")}
+          </.button>
+        </:leading>
         {gettext("Role")} {@role.name}
         <:subtitle>{gettext("Role details and permissions.")}</:subtitle>
 
         <:actions>
-          <.button navigate={~p"/admin/roles"} aria-label={gettext("Back to roles list")}>
-            <.icon name="hero-arrow-left" />
-            <span class="sr-only">{gettext("Back to roles list")}</span>
-          </.button>
           <%= if can?(@current_user, :update, Mv.Authorization.Role) do %>
-            <.button variant="primary" navigate={~p"/admin/roles/#{@role}/edit"}>
-              <.icon name="hero-pencil-square" /> {gettext("Edit Role")}
-            </.button>
-          <% end %>
-          <%= if can?(@current_user, :destroy, Mv.Authorization.Role) and not @role.is_system_role do %>
-            <.link
-              phx-click={JS.push("delete", value: %{id: @role.id})}
-              data-confirm={gettext("Are you sure?")}
-              class="btn btn-error"
+            <.button
+              variant="primary"
+              navigate={~p"/admin/roles/#{@role}/edit"}
+              data-testid="role-show-edit-btn"
             >
-              <.icon name="hero-trash" /> {gettext("Delete Role")}
-            </.link>
+              <.icon name="hero-pencil-square" /> {gettext("Edit role")}
+            </.button>
           <% end %>
         </:actions>
       </.header>
@@ -209,6 +210,37 @@ defmodule MvWeb.RoleLive.Show do
           </.badge>
         </:item>
       </.list>
+
+      <%!-- Danger zone: canonical pattern (same as member show) --%>
+      <%= if can?(@current_user, :destroy, Mv.Authorization.Role) and not @role.is_system_role do %>
+        <section class="mt-8 mb-6" aria-labelledby="danger-zone-heading">
+          <h2 id="danger-zone-heading" class="text-lg font-semibold mb-3 text-error">
+            {gettext("Danger zone")}
+          </h2>
+          <div class="border border-base-300 rounded-lg p-4 bg-base-100">
+            <p class="text-base-content/70 mb-4">
+              {gettext(
+                "Deleting this role cannot be undone. Users assigned to this role must be reassigned first."
+              )}
+            </p>
+            <.button
+              variant="danger"
+              phx-click={JS.push("delete", value: %{id: @role.id})}
+              data-confirm={
+                gettext(
+                  "Are you sure you want to delete the role %{name}? This action cannot be undone.",
+                  name: @role.name
+                )
+              }
+              data-testid="role-delete"
+              aria-label={gettext("Delete role %{name}", name: @role.name)}
+            >
+              <.icon name="hero-trash" class="size-4" />
+              {gettext("Delete role")}
+            </.button>
+          </div>
+        </section>
+      <% end %>
     </Layouts.app>
     """
   end