Fix Credo Design (AliasUsage): add aliases in lib
Add module aliases at top and use short names instead of fully qualified nested modules across lib/.
This commit is contained in:
parent
cfc8900c5c
commit
7a8b069834
25 changed files with 176 additions and 109 deletions
|
|
@ -35,7 +35,14 @@ defmodule MvWeb.UserLive.Form do
|
|||
|
||||
require Jason
|
||||
|
||||
alias Mv.Accounts
|
||||
alias Mv.Accounts.User, as: UserResource
|
||||
alias Mv.Authorization
|
||||
alias Mv.Authorization.Role, as: RoleResource
|
||||
alias Mv.Helpers.SystemActor
|
||||
alias Mv.Membership
|
||||
alias Mv.Membership.Member, as: MemberResource
|
||||
alias MvWeb.Helpers.MemberHelpers
|
||||
|
||||
import MvWeb.LiveHelpers, only: [current_actor: 1, submit_form: 3]
|
||||
import MvWeb.Authorization, only: [can?: 3]
|
||||
|
|
@ -303,7 +310,7 @@ defmodule MvWeb.UserLive.Form do
|
|||
<% end %>
|
||||
|
||||
<%!-- Danger zone: canonical pattern (same as member form) --%>
|
||||
<%= if @user && can?(@current_user, :destroy, @user) && !Mv.Helpers.SystemActor.system_user?(@user) do %>
|
||||
<%= if @user && can?(@current_user, :destroy, @user) && !SystemActor.system_user?(@user) 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")}
|
||||
|
|
@ -402,9 +409,9 @@ defmodule MvWeb.UserLive.Form do
|
|||
defp load_user_or_redirect(nil, _actor, _socket), do: {:ok, nil}
|
||||
|
||||
defp load_user_or_redirect(id, actor, socket) do
|
||||
user = Ash.get!(Mv.Accounts.User, id, domain: Mv.Accounts, load: [:member], actor: actor)
|
||||
user = Ash.get!(UserResource, id, domain: Accounts, load: [:member], actor: actor)
|
||||
|
||||
if Mv.Helpers.SystemActor.system_user?(user) do
|
||||
if SystemActor.system_user?(user) do
|
||||
{:redirect,
|
||||
socket
|
||||
|> put_flash(:error, gettext("This user cannot be edited."))
|
||||
|
|
@ -420,9 +427,9 @@ defmodule MvWeb.UserLive.Form do
|
|||
page_title = action <> " " <> gettext("User")
|
||||
|
||||
# Only admins can link/unlink users to members (permission docs; prevents privilege escalation).
|
||||
can_manage_member_linking = can?(actor, :destroy, Mv.Accounts.User)
|
||||
can_manage_member_linking = can?(actor, :destroy, UserResource)
|
||||
# Only admins can assign user roles (Role update permission).
|
||||
can_assign_role = can?(actor, :update, Mv.Authorization.Role)
|
||||
can_assign_role = can?(actor, :update, RoleResource)
|
||||
roles = if can_assign_role, do: load_roles(actor), else: []
|
||||
|
||||
{:ok,
|
||||
|
|
@ -541,7 +548,7 @@ defmodule MvWeb.UserLive.Form do
|
|||
|> put_flash(:error, gettext("User not found"))
|
||||
|> assign(:show_delete_modal, false)}
|
||||
|
||||
Mv.Helpers.SystemActor.system_user?(user) ->
|
||||
SystemActor.system_user?(user) ->
|
||||
{:noreply,
|
||||
socket
|
||||
|> put_flash(:error, gettext("System user cannot be deleted."))
|
||||
|
|
@ -634,7 +641,7 @@ defmodule MvWeb.UserLive.Form do
|
|||
|
||||
member_name =
|
||||
if selected_member,
|
||||
do: MvWeb.Helpers.MemberHelpers.display_name(selected_member),
|
||||
do: MemberHelpers.display_name(selected_member),
|
||||
else: ""
|
||||
|
||||
# Store the selected member ID and name in socket state and clear unlink flag
|
||||
|
|
@ -704,17 +711,17 @@ defmodule MvWeb.UserLive.Form do
|
|||
|
||||
defp perform_member_link_action(socket, user, actor) do
|
||||
# Only admins may link/unlink (backend policy also restricts update_user; UI must not call it).
|
||||
if can?(actor, :destroy, Mv.Accounts.User) do
|
||||
if can?(actor, :destroy, UserResource) do
|
||||
cond do
|
||||
# Selected member ID takes precedence (new link)
|
||||
socket.assigns.selected_member_id ->
|
||||
Mv.Accounts.update_user(user, %{member: %{id: socket.assigns.selected_member_id}},
|
||||
Accounts.update_user(user, %{member: %{id: socket.assigns.selected_member_id}},
|
||||
actor: actor
|
||||
)
|
||||
|
||||
# Unlink flag is set
|
||||
socket.assigns[:unlink_member] ->
|
||||
Mv.Accounts.update_user(user, %{member: nil}, actor: actor)
|
||||
Accounts.update_user(user, %{member: nil}, actor: actor)
|
||||
|
||||
# No changes to member relationship
|
||||
true ->
|
||||
|
|
@ -831,8 +838,8 @@ defmodule MvWeb.UserLive.Form do
|
|||
# For new users, use password registration if password fields are shown
|
||||
action = if show_password_fields, do: :register_with_password, else: :create_user
|
||||
|
||||
AshPhoenix.Form.for_create(Mv.Accounts.User, action,
|
||||
domain: Mv.Accounts,
|
||||
AshPhoenix.Form.for_create(UserResource, action,
|
||||
domain: Accounts,
|
||||
as: "user",
|
||||
actor: actor
|
||||
)
|
||||
|
|
@ -878,7 +885,7 @@ defmodule MvWeb.UserLive.Form do
|
|||
search_query_str = if search_query && search_query != "", do: search_query, else: nil
|
||||
|
||||
query =
|
||||
Mv.Membership.Member
|
||||
MemberResource
|
||||
|> Ash.Query.for_read(:available_for_linking, %{
|
||||
user_email: user_email_str,
|
||||
search_query: search_query_str
|
||||
|
|
@ -890,7 +897,7 @@ defmodule MvWeb.UserLive.Form do
|
|||
if is_nil(actor) do
|
||||
[]
|
||||
else
|
||||
case Ash.read(query, domain: Mv.Membership, actor: actor) do
|
||||
case Ash.read(query, domain: Membership, actor: actor) do
|
||||
{:ok, members} -> apply_email_filter(members, user_email_str)
|
||||
{:error, _} -> []
|
||||
end
|
||||
|
|
@ -902,7 +909,7 @@ defmodule MvWeb.UserLive.Form do
|
|||
defp apply_email_filter(members, nil), do: members
|
||||
|
||||
defp apply_email_filter(members, user_email_str) when is_binary(user_email_str) do
|
||||
Mv.Membership.Member.filter_by_email_match(members, user_email_str)
|
||||
MemberResource.filter_by_email_match(members, user_email_str)
|
||||
end
|
||||
|
||||
@spec load_roles(any()) :: [Mv.Authorization.Role.t()]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue