Merge remote-tracking branch 'origin/main' into sidebar

lib/mv_web/authorization.ex

@@ -0,0 +1,206 @@
+defmodule MvWeb.Authorization do
+  @moduledoc """
+  UI-level authorization helpers for LiveView templates.
+
+  These functions check if the current user has permission to perform actions
+  or access pages. They use the same PermissionSets module as the backend policies,
+  ensuring UI and backend authorization are consistent.
+
+  ## Usage in Templates
+
+      <!-- Conditional button rendering -->
+      <%= if can?(@current_user, :create, Mv.Membership.Member) do %>
+        <.link patch={~p"/members/new"}>New Member</.link>
+      <% end %>
+
+      <!-- Record-level check -->
+      <%= if can?(@current_user, :update, @member) do %>
+        <.button>Edit</.button>
+      <% end %>
+
+      <!-- Page access check -->
+      <%= if can_access_page?(@current_user, "/admin/roles") do %>
+        <.link navigate="/admin/roles">Manage Roles</.link>
+      <% end %>
+
+  ## Performance
+
+  All checks are pure function calls using the hardcoded PermissionSets module.
+  No database queries, < 1 microsecond per check.
+  """
+
+  alias Mv.Authorization.PermissionSets
+
+  @doc """
+  Checks if user has permission for an action on a resource.
+
+  This function has two variants:
+  1. Resource atom: Checks if user has permission for action on resource type
+  2. Record struct: Checks if user has permission for action on specific record (with scope checking)
+
+  ## Examples
+
+      # Resource-level check (atom)
+      iex> admin = %{role: %{permission_set_name: "admin"}}
+      iex> can?(admin, :create, Mv.Membership.Member)
+      true
+
+      iex> mitglied = %{role: %{permission_set_name: "own_data"}}
+      iex> can?(mitglied, :create, Mv.Membership.Member)
+      false
+
+      # Record-level check (struct with scope)
+      iex> user = %{id: "user-123", role: %{permission_set_name: "own_data"}}
+      iex> member = %Member{id: "member-456", user: %User{id: "user-123"}}
+      iex> can?(user, :update, member)
+      true
+  """
+  @spec can?(map() | nil, atom(), atom() | struct()) :: boolean()
+  def can?(nil, _action, _resource), do: false
+
+  def can?(user, action, resource) when is_atom(action) and is_atom(resource) do
+    with %{role: %{permission_set_name: ps_name}} when not is_nil(ps_name) <- user,
+         {:ok, ps_atom} <- PermissionSets.permission_set_name_to_atom(ps_name),
+         permissions <- PermissionSets.get_permissions(ps_atom) do
+      resource_name = get_resource_name(resource)
+
+      Enum.any?(permissions.resources, fn perm ->
+        perm.resource == resource_name and perm.action == action and perm.granted
+      end)
+    else
+      _ -> false
+    end
+  end
+
+  def can?(user, action, %resource{} = record) when is_atom(action) do
+    with %{role: %{permission_set_name: ps_name}} when not is_nil(ps_name) <- user,
+         {:ok, ps_atom} <- PermissionSets.permission_set_name_to_atom(ps_name),
+         permissions <- PermissionSets.get_permissions(ps_atom) do
+      resource_name = get_resource_name(resource)
+
+      # Find matching permission
+      matching_perm =
+        Enum.find(permissions.resources, fn perm ->
+          perm.resource == resource_name and perm.action == action and perm.granted
+        end)
+
+      case matching_perm do
+        nil -> false
+        perm -> check_scope(perm.scope, user, record, resource_name)
+      end
+    else
+      _ -> false
+    end
+  end
+
+  @doc """
+  Checks if user can access a specific page.
+
+  ## Examples
+
+      iex> admin = %{role: %{permission_set_name: "admin"}}
+      iex> can_access_page?(admin, "/admin/roles")
+      true
+
+      iex> mitglied = %{role: %{permission_set_name: "own_data"}}
+      iex> can_access_page?(mitglied, "/members")
+      false
+  """
+  @spec can_access_page?(map() | nil, String.t() | Phoenix.VerifiedRoutes.unverified_path()) ::
+          boolean()
+  def can_access_page?(nil, _page_path), do: false
+
+  def can_access_page?(user, page_path) do
+    # Convert verified route to string if needed
+    page_path_str = if is_binary(page_path), do: page_path, else: to_string(page_path)
+
+    with %{role: %{permission_set_name: ps_name}} when not is_nil(ps_name) <- user,
+         {:ok, ps_atom} <- PermissionSets.permission_set_name_to_atom(ps_name),
+         permissions <- PermissionSets.get_permissions(ps_atom) do
+      page_matches?(permissions.pages, page_path_str)
+    else
+      _ -> false
+    end
+  end
+
+  # Check if scope allows access to record
+  defp check_scope(:all, _user, _record, _resource_name), do: true
+
+  defp check_scope(:own, user, record, _resource_name) do
+    record.id == user.id
+  end
+
+  defp check_scope(:linked, user, record, resource_name) do
+    case resource_name do
+      "Member" -> check_member_linked(user, record)
+      "CustomFieldValue" -> check_custom_field_value_linked(user, record)
+      _ -> check_fallback_linked(user, record)
+    end
+  end
+
+  defp check_member_linked(user, record) do
+    # Member has_one :user (inverse of User belongs_to :member)
+    # Check if member.user.id == user.id (user must be preloaded)
+    case Map.get(record, :user) do
+      %{id: user_id} -> user_id == user.id
+      _ -> false
+    end
+  end
+
+  defp check_custom_field_value_linked(user, record) do
+    # Need to traverse: custom_field_value.member.user.id
+    # Note: In UI, custom_field_value should have member.user preloaded
+    case Map.get(record, :member) do
+      %{user: %{id: member_user_id}} -> member_user_id == user.id
+      _ -> false
+    end
+  end
+
+  defp check_fallback_linked(user, record) do
+    # Fallback: try user_id or user relationship
+    case Map.get(record, :user_id) do
+      nil -> check_user_relationship_linked(user, record)
+      user_id -> user_id == user.id
+    end
+  end
+
+  defp check_user_relationship_linked(user, record) do
+    # Try user relationship
+    case Map.get(record, :user) do
+      %{id: user_id} -> user_id == user.id
+      _ -> false
+    end
+  end
+
+  # Check if page path matches any allowed pattern
+  defp page_matches?(allowed_pages, requested_path) do
+    Enum.any?(allowed_pages, fn pattern ->
+      cond do
+        pattern == "*" -> true
+        pattern == requested_path -> true
+        String.contains?(pattern, ":") -> match_pattern?(pattern, requested_path)
+        true -> false
+      end
+    end)
+  end
+
+  # Match dynamic route pattern
+  defp match_pattern?(pattern, path) do
+    pattern_segments = String.split(pattern, "/", trim: true)
+    path_segments = String.split(path, "/", trim: true)
+
+    if length(pattern_segments) == length(path_segments) do
+      Enum.zip(pattern_segments, path_segments)
+      |> Enum.all?(fn {pattern_seg, path_seg} ->
+        String.starts_with?(pattern_seg, ":") or pattern_seg == path_seg
+      end)
+    else
+      false
+    end
+  end
+
+  # Extract resource name from module
+  defp get_resource_name(resource) when is_atom(resource) do
+    resource |> Module.split() |> List.last()
+  end
+end

lib/mv_web/components/core_components.ex

@@ -692,7 +692,7 @@ defmodule MvWeb.CoreComponents do
   """
   attr :name, :string, required: true
   attr :class, :string, default: "size-4"
-  attr :rest, :global, include: ~w[aria-hidden]
+  attr :rest, :global, include: ~w(aria-hidden)
 
   def icon(%{name: "hero-" <> _} = assigns) do
     ~H"""

lib/mv_web/components/layouts/navbar.ex

@@ -3,6 +3,7 @@ defmodule MvWeb.Layouts.Navbar do
   Navbar that is used in the rootlayout shown on every page
   """
   use MvWeb, :html
+  import MvWeb.Authorization
 
   attr :current_user, :map,
     required: true,
@@ -22,12 +23,26 @@ defmodule MvWeb.Layouts.Navbar do
         <a href="/members" class="btn btn-ghost text-xl">{@club_name}</a>
         <ul class="menu menu-horizontal bg-base-200">
           <li><.link navigate="/members">{gettext("Members")}</.link></li>
-          <li><.link navigate="/settings">{gettext("Settings")}</.link></li>
+          <li>
+            <details>
+              <summary>{gettext("Settings")}</summary>
+              <ul class="bg-base-200 rounded-t-none p-2 z-10 w-48">
+                <li>
+                  <.link navigate="/settings">{gettext("Global Settings")}</.link>
+                </li>
+                <%= if can_access_page?(@current_user, ~p"/admin/roles") do %>
+                  <li>
+                    <.link navigate={~p"/admin/roles"}>{gettext("Roles")}</.link>
+                  </li>
+                <% end %>
+              </ul>
+            </details>
+          </li>
           <li><.link navigate="/users">{gettext("Users")}</.link></li>
           <li>
             <details>
               <summary>{gettext("Contributions")}</summary>
-              <ul class="bg-base-200 rounded-t-none p-2 z-10 w-48">
+              <ul class="bg-base-200 rounded-t-none p-2 z-10">
                 <li>
                   <.link navigate="/membership_fee_types">{gettext("Membership Fee Types")}</.link>
                 </li>

lib/mv_web/controllers/auth_controller.ex

@@ -78,6 +78,12 @@ defmodule MvWeb.AuthController do
     end
   end
 
+  # Catch-all clause for any other error types
+  defp handle_rauthy_failure(conn, reason) do
+    Logger.warning("Unhandled Rauthy failure reason: #{inspect(reason)}")
+    redirect_with_error(conn, gettext("Unable to authenticate with OIDC. Please try again."))
+  end
+
   # Handle generic AuthenticationFailed errors
   defp handle_authentication_failed(conn, %Ash.Error.Forbidden{errors: errors}) do
     if Enum.any?(errors, &match?(%AshAuthentication.Errors.CannotConfirmUnconfirmedUser{}, &1)) do

lib/mv_web/helpers/field_type_formatter.ex

@@ -0,0 +1,59 @@
+defmodule MvWeb.Helpers.FieldTypeFormatter do
+  @moduledoc """
+  Helper functions for formatting field types for display.
+
+  Handles both Ash type modules (e.g., `Ash.Type.String`) and simple atoms (e.g., `:string`).
+  """
+
+  alias MvWeb.Translations.FieldTypes
+
+  @doc """
+  Formats an Ash type for display.
+
+  Handles both Ash type modules (e.g., `Ash.Type.String`) and simple atoms (e.g., `:string`).
+
+  ## Parameters
+
+    - `type` - An atom or module representing the field type
+
+  ## Returns
+
+    A human-readable string representation of the type
+
+  ## Examples
+
+      iex> format(:string)
+      "String"
+
+      iex> format(Ash.Type.String)
+      "String"
+
+      iex> format(Ash.Type.Date)
+      "Date"
+  """
+  @spec format(atom() | module()) :: String.t()
+  def format(type) when is_atom(type) do
+    type_string = to_string(type)
+
+    if String.contains?(type_string, "Ash.Type.") do
+      type_string
+      |> String.split(".")
+      |> List.last()
+      |> String.downcase()
+      |> then(fn type_name ->
+        try do
+          type_atom = String.to_existing_atom(type_name)
+          FieldTypes.label(type_atom)
+        rescue
+          ArgumentError -> FieldTypes.label(:string)
+        end
+      end)
+    else
+      FieldTypes.label(type)
+    end
+  end
+
+  def format(type) do
+    to_string(type)
+  end
+end

lib/mv_web/helpers/member_helpers.ex

@@ -0,0 +1,64 @@
+defmodule MvWeb.Helpers.MemberHelpers do
+  @moduledoc """
+  Helper functions for member-related operations in the web layer.
+
+  Provides utilities for formatting and displaying member information.
+  """
+
+  alias Mv.Membership.Member
+
+  @doc """
+  Returns a display name for a member.
+
+  Combines first_name and last_name if available, otherwise falls back to email.
+  This ensures that members without names still have a meaningful display name.
+
+  ## Examples
+
+      iex> member = %Member{first_name: "John", last_name: "Doe", email: "john@example.com"}
+      iex> MvWeb.Helpers.MemberHelpers.display_name(member)
+      "John Doe"
+
+      iex> member = %Member{first_name: nil, last_name: nil, email: "john@example.com"}
+      iex> MvWeb.Helpers.MemberHelpers.display_name(member)
+      "john@example.com"
+
+      iex> member = %Member{first_name: "John", last_name: nil, email: "john@example.com"}
+      iex> MvWeb.Helpers.MemberHelpers.display_name(member)
+      "John"
+  """
+  def display_name(%Member{} = member) do
+    name_parts =
+      [member.first_name, member.last_name]
+      |> Enum.reject(&blank?/1)
+      |> Enum.map_join(" ", &String.trim/1)
+
+    if name_parts == "" do
+      member.email
+    else
+      name_parts
+    end
+  end
+
+  @doc """
+  Checks if a value is blank (nil, empty string, or only whitespace).
+
+  ## Examples
+
+      iex> MvWeb.Helpers.MemberHelpers.blank?(nil)
+      true
+
+      iex> MvWeb.Helpers.MemberHelpers.blank?("")
+      true
+
+      iex> MvWeb.Helpers.MemberHelpers.blank?("   ")
+      true
+
+      iex> MvWeb.Helpers.MemberHelpers.blank?("John")
+      false
+  """
+  def blank?(nil), do: true
+  def blank?(""), do: true
+  def blank?(value) when is_binary(value), do: String.trim(value) == ""
+  def blank?(_), do: false
+end

lib/mv_web/helpers/membership_fee_helpers.ex

@@ -8,9 +8,9 @@ defmodule MvWeb.Helpers.MembershipFeeHelpers do
 
   use Gettext, backend: MvWeb.Gettext
 
+  alias Mv.Membership.Member
   alias Mv.MembershipFees.CalendarCycles
   alias Mv.MembershipFees.MembershipFeeCycle
-  alias Mv.Membership.Member
 
   @doc """
   Formats a decimal amount as currency string.

lib/mv_web/live/components/field_visibility_dropdown_component.ex

@@ -18,6 +18,8 @@ defmodule MvWeb.Components.FieldVisibilityDropdownComponent do
 
   use MvWeb, :live_component
 
+  alias MvWeb.Translations.MemberFields
+
   # ---------------------------------------------------------------------------
   # UPDATE
   # ---------------------------------------------------------------------------
@@ -66,7 +68,7 @@ defmodule MvWeb.Components.FieldVisibilityDropdownComponent do
       <.dropdown_menu
         id="field-visibility-menu"
         icon="hero-adjustments-horizontal"
-        button_label={gettext("Columns")}
+        button_label={gettext("Show/Hide Columns")}
         items={@all_items}
         checkboxes={true}
         selected={@selected_fields}
@@ -153,12 +155,12 @@ defmodule MvWeb.Components.FieldVisibilityDropdownComponent do
   defp field_to_string(field) when is_binary(field), do: field
 
   defp format_field_label(field) when is_atom(field) do
-    MvWeb.Translations.MemberFields.label(field)
+    MemberFields.label(field)
   end
 
   defp format_field_label(field) when is_binary(field) do
     case safe_to_existing_atom(field) do
-      {:ok, atom} -> MvWeb.Translations.MemberFields.label(atom)
+      {:ok, atom} -> MemberFields.label(atom)
       :error -> fallback_label(field)
     end
   end

lib/mv_web/live/contribution_period_live/show.ex

@@ -36,7 +36,7 @@ defmodule MvWeb.ContributionPeriodLive.Show do
       <.mockup_warning />
 
       <.header>
-        {gettext("Contributions for %{name}", name: "#{@member.first_name} #{@member.last_name}")}
+        {gettext("Contributions for %{name}", name: MvWeb.Helpers.MemberHelpers.display_name(@member))}
         <:subtitle>
           {gettext("Contribution type")}:
           <span class="font-semibold">{@member.contribution_type}</span>

lib/mv_web/live/contribution_type_live/index.ex

@@ -115,7 +115,7 @@ defmodule MvWeb.ContributionTypeLive.Index do
         <div class="prose prose-sm max-w-none">
           <p>
             {gettext(
-              "Contribution types define different membership fee structures. Each type has a fixed interval (monthly, quarterly, half-yearly, yearly) that cannot be changed after creation."
+              "Contribution types define different membership fee structures. Each type has a fixed cycle (monthly, quarterly, half-yearly, yearly) that cannot be changed after creation."
             )}
           </p>
           <ul>

lib/mv_web/live/custom_field_live/form_component.ex

@@ -26,12 +26,12 @@ defmodule MvWeb.CustomFieldLive.FormComponent do
             type="button"
             phx-click="cancel"
             phx-target={@myself}
-            aria-label={gettext("Back to custom field overview")}
+            aria-label={gettext("Back to settings")}
           >
             <.icon name="hero-arrow-left" class="w-4 h-4" />
           </.button>
           <h3 class="card-title">
-            {if @custom_field, do: gettext("Edit Custom Field"), else: gettext("New Custom Field")}
+            {if @custom_field, do: gettext("Edit Data Field"), else: gettext("New Data Field")}
           </h3>
         </div>
 
@@ -66,7 +66,7 @@ defmodule MvWeb.CustomFieldLive.FormComponent do
               {gettext("Cancel")}
             </.button>
             <.button phx-disable-with={gettext("Saving...")} variant="primary">
-              {gettext("Save Custom Field")}
+              {gettext("Save Data Field")}
             </.button>
           </div>
         </.form>

lib/mv_web/live/custom_field_live/index_component.ex

@@ -17,158 +17,170 @@ defmodule MvWeb.CustomFieldLive.IndexComponent do
     assigns = assign(assigns, :field_type_label, &MvWeb.Translations.FieldTypes.label/1)
 
     ~H"""
-    <div id={@id}>
-      <.form_section title={gettext("Custom Fields")}>
-        <div class="flex">
-          <p class="text-sm text-base-content/70">
-            {gettext("These will appear in addition to other data when adding new members.")}
-          </p>
-          <div class="ml-auto">
-            <.button
-              class="ml-auto"
-              variant="primary"
-              phx-click="new_custom_field"
-              phx-target={@myself}
-            >
-              <.icon name="hero-plus" /> {gettext("New Custom Field")}
-            </.button>
-          </div>
-        </div>
-        <%!-- Show form when creating or editing --%>
-        <div :if={@show_form} class="mb-8">
-          <.live_component
-            module={MvWeb.CustomFieldLive.FormComponent}
-            id={@form_id}
-            custom_field={@editing_custom_field}
-            on_save={
-              fn custom_field, action -> send(self(), {:custom_field_saved, custom_field, action}) end
-            }
-            on_cancel={fn -> send_update(__MODULE__, id: @id, show_form: false) end}
-          />
-        </div>
-
-        <%!-- Hide table when form is visible --%>
-        <.table
-          :if={!@show_form}
-          id="custom_fields"
-          rows={@streams.custom_fields}
-          row_click={
-            fn {_id, custom_field} ->
-              JS.push("edit_custom_field", value: %{id: custom_field.id}, target: @myself)
-            end
-          }
-        >
-          <:col :let={{_id, custom_field}} label={gettext("Name")}>{custom_field.name}</:col>
-
-          <:col :let={{_id, custom_field}} label={gettext("Value Type")}>
-            {@field_type_label.(custom_field.value_type)}
-          </:col>
-
-          <:col :let={{_id, custom_field}} label={gettext("Description")}>
-            {custom_field.description}
-          </:col>
-
-          <:col
-            :let={{_id, custom_field}}
-            label={gettext("Show in overview")}
-            class="max-w-[9.375rem] text-center"
+    <div id={@id} class="mt-8">
+      <div class="flex">
+        <p class="text-sm text-base-content/70">
+          {gettext("These will appear in addition to other data when adding new members.")}
+        </p>
+        <div class="ml-auto">
+          <.button
+            class="ml-auto"
+            variant="primary"
+            phx-click="new_custom_field"
+            phx-target={@myself}
           >
-            <span :if={custom_field.show_in_overview} class="badge badge-success">
-              {gettext("Yes")}
-            </span>
-            <span :if={!custom_field.show_in_overview} class="badge badge-ghost">
-              {gettext("No")}
-            </span>
-          </:col>
+            <.icon name="hero-plus" /> {gettext("New Data Field")}
+          </.button>
+        </div>
+      </div>
+      <%!-- Show form when creating or editing --%>
+      <div :if={@show_form} class="mb-8">
+        <.live_component
+          module={MvWeb.CustomFieldLive.FormComponent}
+          id={@form_id}
+          custom_field={@editing_custom_field}
+          on_save={
+            fn custom_field, action -> send(self(), {:custom_field_saved, custom_field, action}) end
+          }
+          on_cancel={fn -> send_update(__MODULE__, id: @id, show_form: false) end}
+        />
+      </div>
 
-          <:action :let={{_id, custom_field}}>
-            <.link phx-click={
-              JS.push("edit_custom_field", value: %{id: custom_field.id}, target: @myself)
-            }>
-              {gettext("Edit")}
-            </.link>
-          </:action>
+      <%!-- Hide table when form is visible --%>
+      <.table
+        :if={!@show_form}
+        id="custom_fields"
+        rows={@streams.custom_fields}
+        row_click={
+          fn {_id, custom_field} ->
+            JS.push("edit_custom_field", value: %{id: custom_field.id}, target: @myself)
+          end
+        }
+      >
+        <:col :let={{_id, custom_field}} label={gettext("Name")}>{custom_field.name}</:col>
 
-          <:action :let={{_id, custom_field}}>
-            <.link phx-click={
-              JS.push("prepare_delete", value: %{id: custom_field.id}, target: @myself)
-            }>
-              {gettext("Delete")}
-            </.link>
-          </:action>
-        </.table>
+        <:col :let={{_id, custom_field}} label={gettext("Value Type")}>
+          {@field_type_label.(custom_field.value_type)}
+        </:col>
 
-        <%!-- Delete Confirmation Modal --%>
-        <dialog :if={@show_delete_modal} id="delete-custom-field-modal" class="modal modal-open">
-          <div class="modal-box">
-            <h3 class="text-lg font-bold">{gettext("Delete Custom Field")}</h3>
+        <:col :let={{_id, custom_field}} label={gettext("Description")}>
+          {custom_field.description}
+        </:col>
 
-            <div class="py-4 space-y-4">
-              <div class="alert alert-warning">
-                <.icon name="hero-exclamation-triangle" class="w-5 h-5" />
-                <div>
-                  <p class="font-semibold">
-                    {ngettext(
-                      "%{count} member has a value assigned for this custom field.",
-                      "%{count} members have values assigned for this custom field.",
-                      @custom_field_to_delete.assigned_members_count,
-                      count: @custom_field_to_delete.assigned_members_count
-                    )}
-                  </p>
-                  <p class="mt-2 text-sm">
-                    {gettext(
-                      "All custom field values will be permanently deleted when you delete this custom field."
-                    )}
-                  </p>
-                </div>
-              </div>
+        <:col
+          :let={{_id, custom_field}}
+          label={gettext("Required")}
+          class="max-w-[9.375rem] text-center"
+        >
+          <span :if={custom_field.required} class="text-base-content font-semibold">
+            {gettext("Required")}
+          </span>
+          <span :if={!custom_field.required} class="text-base-content/70">
+            {gettext("Optional")}
+          </span>
+        </:col>
 
+        <:col
+          :let={{_id, custom_field}}
+          label={gettext("Show in overview")}
+          class="max-w-[9.375rem] text-center"
+        >
+          <span :if={custom_field.show_in_overview} class="badge badge-success">
+            {gettext("Yes")}
+          </span>
+          <span :if={!custom_field.show_in_overview} class="badge badge-ghost">
+            {gettext("No")}
+          </span>
+        </:col>
+
+        <:action :let={{_id, custom_field}}>
+          <.link phx-click={
+            JS.push("edit_custom_field", value: %{id: custom_field.id}, target: @myself)
+          }>
+            {gettext("Edit")}
+          </.link>
+        </:action>
+
+        <:action :let={{_id, custom_field}}>
+          <.link phx-click={JS.push("prepare_delete", value: %{id: custom_field.id}, target: @myself)}>
+            {gettext("Delete")}
+          </.link>
+        </:action>
+      </.table>
+
+      <%!-- Delete Confirmation Modal --%>
+      <dialog :if={@show_delete_modal} id="delete-custom-field-modal" class="modal modal-open">
+        <div class="modal-box">
+          <h3 class="text-lg font-bold">{gettext("Delete Data Field")}</h3>
+
+          <div class="py-4 space-y-4">
+            <div class="alert alert-warning">
+              <.icon name="hero-exclamation-triangle" class="w-5 h-5" />
               <div>
-                <label for="slug-confirmation" class="label">
-                  <span class="label-text">
-                    {gettext("To confirm deletion, please enter this text:")}
-                  </span>
-                </label>
-                <div class="p-2 mb-2 font-mono text-lg font-bold break-all rounded bg-base-200">
-                  {@custom_field_to_delete.slug}
-                </div>
-                <form phx-change="update_slug_confirmation" phx-target={@myself}>
-                  <input
-                    id="slug-confirmation"
-                    name="slug"
-                    type="text"
-                    value={@slug_confirmation}
-                    placeholder={gettext("Enter the text above to confirm")}
-                    autocomplete="off"
-                    phx-mounted={JS.focus()}
-                    class="w-full input input-bordered"
-                  />
-                </form>
+                <p class="font-semibold">
+                  {ngettext(
+                    "%{count} member has a value assigned for this custom field.",
+                    "%{count} members have values assigned for this custom field.",
+                    @custom_field_to_delete.assigned_members_count,
+                    count: @custom_field_to_delete.assigned_members_count
+                  )}
+                </p>
+                <p class="mt-2 text-sm">
+                  {gettext(
+                    "All custom field values will be permanently deleted when you delete this custom field."
+                  )}
+                </p>
               </div>
             </div>
 
-            <div class="modal-action">
-              <button phx-click="cancel_delete" phx-target={@myself} class="btn">
-                {gettext("Cancel")}
-              </button>
-              <button
-                phx-click="confirm_delete"
-                phx-target={@myself}
-                class="btn btn-error"
-                disabled={@slug_confirmation != @custom_field_to_delete.slug}
-              >
-                {gettext("Delete Custom Field and All Values")}
-              </button>
+            <div>
+              <label for="slug-confirmation" class="label">
+                <span class="label-text">
+                  {gettext("To confirm deletion, please enter this text:")}
+                </span>
+              </label>
+              <div class="p-2 mb-2 font-mono text-lg font-bold break-all rounded bg-base-200">
+                {@custom_field_to_delete.slug}
+              </div>
+              <form phx-change="update_slug_confirmation" phx-target={@myself}>
+                <input
+                  id="slug-confirmation"
+                  name="slug"
+                  type="text"
+                  value={@slug_confirmation}
+                  placeholder={gettext("Enter the text above to confirm")}
+                  autocomplete="off"
+                  phx-mounted={JS.focus()}
+                  class="w-full input input-bordered"
+                />
+              </form>
             </div>
           </div>
-        </dialog>
-      </.form_section>
+
+          <div class="modal-action">
+            <button phx-click="cancel_delete" phx-target={@myself} class="btn">
+              {gettext("Cancel")}
+            </button>
+            <button
+              phx-click="confirm_delete"
+              phx-target={@myself}
+              class="btn btn-error"
+              disabled={@slug_confirmation != @custom_field_to_delete.slug}
+            >
+              {gettext("Delete Custom Field and All Values")}
+            </button>
+          </div>
+        </div>
+      </dialog>
     </div>
     """
   end
 
   @impl true
   def update(assigns, socket) do
+    # Track previous show_form state to detect when form is closed
+    previous_show_form = Map.get(socket.assigns, :show_form, false)
+
     # If show_form is explicitly provided in assigns, reset editing state
     socket =
       if Map.has_key?(assigns, :show_form) and assigns.show_form == false do
@@ -179,6 +191,13 @@ defmodule MvWeb.CustomFieldLive.IndexComponent do
         socket
       end
 
+    # Detect when form is closed (show_form changes from true to false)
+    new_show_form = Map.get(assigns, :show_form, false)
+
+    if previous_show_form and not new_show_form do
+      send(self(), {:editing_section_changed, nil})
+    end
+
     {:ok,
      socket
      |> assign(assigns)
@@ -193,6 +212,11 @@ defmodule MvWeb.CustomFieldLive.IndexComponent do
 
   @impl true
   def handle_event("new_custom_field", _params, socket) do
+    # Only send event if form was not already open
+    if not socket.assigns[:show_form] do
+      send(self(), {:editing_section_changed, :custom_fields})
+    end
+
     {:noreply,
      socket
      |> assign(:show_form, true)
@@ -204,6 +228,11 @@ defmodule MvWeb.CustomFieldLive.IndexComponent do
   def handle_event("edit_custom_field", %{"id" => id}, socket) do
     custom_field = Ash.get!(Mv.Membership.CustomField, id)
 
+    # Only send event if form was not already open
+    if not socket.assigns[:show_form] do
+      send(self(), {:editing_section_changed, :custom_fields})
+    end
+
     {:noreply,
      socket
      |> assign(:show_form, true)

lib/mv_web/live/custom_field_value_live/form.ex

@@ -289,6 +289,6 @@ defmodule MvWeb.CustomFieldValueLive.Form do
   end
 
   defp member_options(members) do
-    Enum.map(members, &{"#{&1.first_name} #{&1.last_name}", &1.id})
+    Enum.map(members, &{MvWeb.Helpers.MemberHelpers.display_name(&1), &1.id})
   end
 end

lib/mv_web/live/custom_field_value_live/show.ex

@@ -26,7 +26,7 @@ defmodule MvWeb.CustomFieldValueLive.Show do
     ~H"""
     <Layouts.app flash={@flash} current_user={@current_user}>
       <.header>
-        Custom field value {@custom_field_value.id}
+        Data field value {@custom_field_value.id}
         <:subtitle>This is a custom_field_value record from your database.</:subtitle>
 
         <:actions>
@@ -62,6 +62,6 @@ defmodule MvWeb.CustomFieldValueLive.Show do
      |> assign(:custom_field_value, Ash.get!(Mv.Membership.CustomFieldValue, id))}
   end
 
-  defp page_title(:show), do: "Show Custom field value"
-  defp page_title(:edit), do: "Edit Custom field value"
+  defp page_title(:show), do: "Show data field value"
+  defp page_title(:edit), do: "Edit data field value"
 end

lib/mv_web/live/global_settings_live.ex

@@ -31,6 +31,7 @@ defmodule MvWeb.GlobalSettingsLive do
      socket
      |> assign(:page_title, gettext("Settings"))
      |> assign(:settings, settings)
+     |> assign(:active_editing_section, nil)
      |> assign_form()}
   end
 
@@ -62,11 +63,21 @@ defmodule MvWeb.GlobalSettingsLive do
           </.button>
         </.form>
       </.form_section>
-      <%!-- Custom Fields Section --%>
-      <.live_component
-        module={MvWeb.CustomFieldLive.IndexComponent}
-        id="custom-fields-component"
-      />
+      <%!-- Memberdata Section --%>
+      <.form_section title={gettext("Memberdata")}>
+        <.live_component
+          :if={@active_editing_section != :custom_fields}
+          module={MvWeb.MemberFieldLive.IndexComponent}
+          id="member-fields-component"
+          settings={@settings}
+        />
+        <%!-- Custom Fields Section --%>
+        <.live_component
+          :if={@active_editing_section != :member_fields}
+          module={MvWeb.CustomFieldLive.IndexComponent}
+          id="custom-fields-component"
+        />
+      </.form_section>
     </Layouts.app>
     """
   end
@@ -105,12 +116,14 @@ defmodule MvWeb.GlobalSettingsLive do
     )
 
     {:noreply,
-     put_flash(socket, :info, gettext("Custom field %{action} successfully", action: action))}
+     socket
+     |> assign(:active_editing_section, nil)
+     |> put_flash(:info, gettext("Data field %{action} successfully", action: action))}
   end
 
   @impl true
   def handle_info({:custom_field_deleted, _custom_field}, socket) do
-    {:noreply, put_flash(socket, :info, gettext("Custom field deleted successfully"))}
+    {:noreply, put_flash(socket, :info, gettext("Data field deleted successfully"))}
   end
 
   @impl true
@@ -119,7 +132,7 @@ defmodule MvWeb.GlobalSettingsLive do
      put_flash(
        socket,
        :error,
-       gettext("Failed to delete custom field: %{error}", error: inspect(error))
+       gettext("Failed to delete data field: %{error}", error: inspect(error))
      )}
   end
 
@@ -128,6 +141,43 @@ defmodule MvWeb.GlobalSettingsLive do
     {:noreply, put_flash(socket, :error, gettext("Slug does not match. Deletion cancelled."))}
   end
 
+  @impl true
+  def handle_info({:editing_section_changed, section}, socket) do
+    {:noreply, assign(socket, :active_editing_section, section)}
+  end
+
+  @impl true
+  def handle_info({:member_field_saved, _member_field, action}, socket) do
+    # Reload settings to get updated member_field_visibility
+    {:ok, updated_settings} = Membership.get_settings()
+
+    # Send update to member fields component to close form
+    send_update(MvWeb.MemberFieldLive.IndexComponent,
+      id: "member-fields-component",
+      show_form: false,
+      settings: updated_settings
+    )
+
+    {:noreply,
+     socket
+     |> assign(:settings, updated_settings)
+     |> assign(:active_editing_section, nil)
+     |> put_flash(:info, gettext("Member field %{action} successfully", action: action))}
+  end
+
+  @impl true
+  def handle_info({:member_field_visibility_updated}, socket) do
+    # Legacy event - reload settings and update component
+    {:ok, updated_settings} = Membership.get_settings()
+
+    send_update(MvWeb.MemberFieldLive.IndexComponent,
+      id: "member-fields-component",
+      settings: updated_settings
+    )
+
+    {:noreply, assign(socket, :settings, updated_settings)}
+  end
+
   defp assign_form(%{assigns: %{settings: settings}} = socket) do
     form =
       AshPhoenix.Form.for_update(

lib/mv_web/live/member_field_live/form_component.ex

@@ -0,0 +1,338 @@
+defmodule MvWeb.MemberFieldLive.FormComponent do
+  @moduledoc """
+  LiveComponent form for editing member field properties (embedded in settings).
+
+  ## Features
+  - Edit member field visibility (show_in_overview)
+  - Display member field information from Member Resource (read-only)
+  - Restrict editing for email field (only show_in_overview can be changed)
+  - Real-time validation
+  - Updates Settings.member_field_visibility atomically
+
+  ## Props
+  - `member_field` - The member field atom to edit (e.g., :first_name, :email)
+  - `settings` - The current Settings resource
+  - `on_save` - Callback function to call when form is saved
+  - `on_cancel` - Callback function to call when form is cancelled
+
+  ## Note
+  Member fields are technical fields that cannot be changed (name, value_type, description, required).
+  Only the visibility (show_in_overview) can be modified.
+  """
+  use MvWeb, :live_component
+
+  alias Mv.Helpers.TypeParsers
+  alias Mv.Membership
+  alias Mv.Membership.Helpers.VisibilityConfig
+  alias MvWeb.Helpers.FieldTypeFormatter
+  alias MvWeb.Translations.MemberFields
+
+  @required_fields [:first_name, :last_name, :email]
+
+  @impl true
+  def render(assigns) do
+    assigns =
+      assigns
+      |> assign(:field_attributes, get_field_attributes(assigns.member_field))
+      |> assign(:is_email_field?, assigns.member_field == :email)
+      |> assign(:field_label, MemberFields.label(assigns.member_field))
+
+    ~H"""
+    <div id={@id} class="mb-8 border shadow-xl card border-base-300">
+      <div class="card-body">
+        <div class="flex items-center gap-4 mb-4">
+          <.button
+            type="button"
+            phx-click="cancel"
+            phx-target={@myself}
+            aria-label={gettext("Back to Settings")}
+          >
+            <.icon name="hero-arrow-left" class="w-4 h-4" />
+          </.button>
+          <h3 class="card-title">
+            {gettext("Edit Field: %{field}", field: @field_label)}
+          </h3>
+        </div>
+
+        <.form
+          for={@form}
+          id={@id <> "-form"}
+          phx-change="validate"
+          phx-submit="save"
+          phx-target={@myself}
+        >
+          <div
+            class="tooltip tooltip-right"
+            data-tip={gettext("This is a technical field and cannot be changed")}
+            aria-label={gettext("This is a technical field and cannot be changed")}
+          >
+            <fieldset class="mb-2 fieldset">
+              <label>
+                <span class="mb-1 label flex items-center gap-2">
+                  {gettext("Name")}
+                  <.icon
+                    name="hero-information-circle"
+                    class="w-4 h-4 text-base-content/60 cursor-help"
+                    aria-hidden="true"
+                  />
+                </span>
+                <input
+                  type="text"
+                  name={@form[:name].name}
+                  id={@form[:name].id}
+                  value={@field_label}
+                  disabled
+                  readonly
+                  class="w-full input"
+                />
+              </label>
+            </fieldset>
+          </div>
+
+          <div
+            class="tooltip tooltip-right"
+            data-tip={gettext("This is a technical field and cannot be changed")}
+            aria-label={gettext("This is a technical field and cannot be changed")}
+          >
+            <fieldset class="mb-2 fieldset">
+              <label>
+                <span class="mb-1 label flex items-center gap-2">
+                  {gettext("Value type")}
+                  <.icon
+                    name="hero-information-circle"
+                    class="w-4 h-4 text-base-content/60 cursor-help"
+                    aria-hidden="true"
+                  />
+                </span>
+                <input
+                  type="text"
+                  name={@form[:value_type].name}
+                  id={@form[:value_type].id}
+                  value={FieldTypeFormatter.format(@field_attributes.value_type)}
+                  disabled
+                  readonly
+                  class="w-full input"
+                />
+              </label>
+            </fieldset>
+          </div>
+
+          <div
+            :if={@is_email_field?}
+            class="tooltip tooltip-right"
+            data-tip={gettext("This is a technical field and cannot be changed")}
+            aria-label={gettext("This is a technical field and cannot be changed")}
+          >
+            <fieldset class="mb-2 fieldset">
+              <label>
+                <span class="mb-1 label flex items-center gap-2">
+                  {gettext("Description")}
+                  <.icon
+                    name="hero-information-circle"
+                    class="w-4 h-4 text-base-content/60 cursor-help"
+                    aria-hidden="true"
+                  />
+                </span>
+                <input
+                  type="text"
+                  name={@form[:description].name}
+                  id={@form[:description].id}
+                  value={@form[:description].value}
+                  disabled
+                  readonly
+                  class="w-full input"
+                />
+              </label>
+            </fieldset>
+          </div>
+          <.input
+            :if={not @is_email_field?}
+            field={@form[:description]}
+            type="text"
+            label={gettext("Description")}
+            disabled={@is_email_field?}
+            readonly={@is_email_field?}
+          />
+
+          <div
+            :if={@is_email_field?}
+            class="tooltip tooltip-right"
+            data-tip={gettext("This is a technical field and cannot be changed")}
+            aria-label={gettext("This is a technical field and cannot be changed")}
+          >
+            <fieldset class="mb-2 fieldset">
+              <label>
+                <input type="hidden" name={@form[:required].name} value="false" disabled />
+                <span class="label flex items-center gap-2">
+                  <input
+                    type="checkbox"
+                    name={@form[:required].name}
+                    id={@form[:required].id}
+                    value="true"
+                    checked={@form[:required].value}
+                    disabled
+                    readonly
+                    class="checkbox checkbox-sm"
+                  />
+                  <span class="flex items-center gap-2">
+                    {gettext("Required")}
+                    <.icon
+                      name="hero-information-circle"
+                      class="w-4 h-4 text-base-content/60 cursor-help"
+                      aria-hidden="true"
+                    />
+                  </span>
+                </span>
+              </label>
+            </fieldset>
+          </div>
+          <.input
+            :if={not @is_email_field?}
+            field={@form[:required]}
+            type="checkbox"
+            label={gettext("Required")}
+            disabled={@is_email_field?}
+            readonly={@is_email_field?}
+          />
+
+          <.input
+            field={@form[:show_in_overview]}
+            type="checkbox"
+            label={gettext("Show in overview")}
+          />
+
+          <div class="justify-end mt-4 card-actions">
+            <.button type="button" phx-click="cancel" phx-target={@myself}>
+              {gettext("Cancel")}
+            </.button>
+            <.button phx-disable-with={gettext("Saving...")} variant="primary">
+              {gettext("Save Field")}
+            </.button>
+          </div>
+        </.form>
+      </div>
+    </div>
+    """
+  end
+
+  @impl true
+  def update(assigns, socket) do
+    {:ok,
+     socket
+     |> assign(assigns)
+     |> assign_form()}
+  end
+
+  @impl true
+  def handle_event("validate", %{"member_field" => member_field_params}, socket) do
+    # For member fields, we only validate show_in_overview
+    # Other fields are read-only or derived from the Member Resource
+    form = socket.assigns.form
+
+    updated_params =
+      member_field_params
+      |> Map.put(
+        "show_in_overview",
+        TypeParsers.parse_boolean(member_field_params["show_in_overview"])
+      )
+      |> Map.put("name", form.source["name"])
+      |> Map.put("value_type", form.source["value_type"])
+      |> Map.put("description", form.source["description"])
+      |> Map.put("required", form.source["required"])
+
+    updated_form =
+      form
+      |> Map.put(:value, updated_params)
+      |> Map.put(:errors, [])
+
+    {:noreply, assign(socket, form: updated_form)}
+  end
+
+  @impl true
+  def handle_event("save", %{"member_field" => member_field_params}, socket) do
+    # Only show_in_overview can be changed for member fields
+    show_in_overview = TypeParsers.parse_boolean(member_field_params["show_in_overview"])
+    field_string = Atom.to_string(socket.assigns.member_field)
+
+    # Use atomic action to update only this single field
+    # This prevents lost updates in concurrent scenarios
+    case Membership.update_single_member_field_visibility(
+           socket.assigns.settings,
+           field: field_string,
+           show_in_overview: show_in_overview
+         ) do
+      {:ok, _updated_settings} ->
+        socket.assigns.on_save.(socket.assigns.member_field, "update")
+        {:noreply, socket}
+
+      {:error, error} ->
+        # Add error to form
+        form =
+          socket.assigns.form
+          |> Map.put(:errors, [
+            %{field: :show_in_overview, message: format_error(error)}
+          ])
+
+        {:noreply, assign(socket, form: form)}
+    end
+  end
+
+  @impl true
+  def handle_event("cancel", _params, socket) do
+    socket.assigns.on_cancel.()
+    {:noreply, socket}
+  end
+
+  # Helper functions
+
+  defp assign_form(%{assigns: %{member_field: member_field, settings: settings}} = socket) do
+    field_attributes = get_field_attributes(member_field)
+    visibility_config = settings.member_field_visibility || %{}
+    normalized_config = VisibilityConfig.normalize(visibility_config)
+    show_in_overview = Map.get(normalized_config, member_field, true)
+
+    # Create a manual form structure with string keys
+    # Note: immutable is not included as it's not editable for member fields
+    form_data = %{
+      "name" => MemberFields.label(member_field),
+      "value_type" => FieldTypeFormatter.format(field_attributes.value_type),
+      "description" => field_attributes.description || "",
+      "required" => field_attributes.required,
+      "show_in_overview" => show_in_overview
+    }
+
+    form = to_form(form_data, as: "member_field")
+
+    assign(socket, form: form)
+  end
+
+  defp get_field_attributes(field) when is_atom(field) do
+    # Get attribute info from Member Resource
+    alias Ash.Resource.Info
+
+    case Info.attribute(Mv.Membership.Member, field) do
+      nil ->
+        # Fallback for fields not in resource (shouldn't happen with Constants)
+        %{
+          value_type: :string,
+          description: nil,
+          required: field in @required_fields
+        }
+
+      attribute ->
+        %{
+          value_type: attribute.type,
+          description: nil,
+          required: not attribute.allow_nil?
+        }
+    end
+  end
+
+  defp format_error(%Ash.Error.Invalid{} = error) do
+    Ash.ErrorKind.message(error)
+  end
+
+  defp format_error(error) do
+    inspect(error)
+  end
+end

lib/mv_web/live/member_field_live/index_component.ex

@@ -0,0 +1,219 @@
+defmodule MvWeb.MemberFieldLive.IndexComponent do
+  @moduledoc """
+  LiveComponent for managing member field visibility in overview (embedded in settings).
+
+  ## Features
+  - List all member fields from Mv.Constants.member_fields()
+  - Display show_in_overview status as badge (Yes/No)
+  - Display required status based on actual attribute definitions (allow_nil? false)
+  - Edit member field properties (expandable form like custom fields)
+  - Updates Settings.member_field_visibility
+  """
+  use MvWeb, :live_component
+
+  alias Ash.Resource.Info
+  alias Mv.Membership
+  alias Mv.Membership.Helpers.VisibilityConfig
+  alias MvWeb.Helpers.FieldTypeFormatter
+  alias MvWeb.Translations.MemberFields
+
+  @impl true
+  def render(assigns) do
+    assigns =
+      assigns
+      |> assign(:member_fields, get_member_fields_with_visibility(assigns.settings))
+      |> assign(:required?, &required?/1)
+
+    ~H"""
+    <div id={@id}>
+      <p class="text-sm text-base-content/70 mb-4">
+        {gettext(
+          "These fields are neccessary for MILA to handle member identification and payment calculations in the future. Thus you cannot delete these fields but hide them in the member overview."
+        )}
+      </p>
+
+      <%!-- Show form when editing --%>
+      <div :if={@show_form} class="mb-8">
+        <.live_component
+          module={MvWeb.MemberFieldLive.FormComponent}
+          id={@form_id}
+          member_field={@editing_member_field}
+          settings={@settings}
+          on_save={
+            fn member_field, action ->
+              send(self(), {:member_field_saved, member_field, action})
+            end
+          }
+          on_cancel={fn -> send_update(__MODULE__, id: @id, show_form: false) end}
+        />
+      </div>
+
+      <%!-- Hide table when form is visible --%>
+      <.table
+        :if={!@show_form}
+        id="member_fields"
+        rows={@member_fields}
+      >
+        <:col :let={{_field_name, field_data}} label={gettext("Name")}>
+          {MemberFields.label(field_data.field)}
+        </:col>
+
+        <:col :let={{_field_name, field_data}} label={gettext("Value Type")}>
+          {format_value_type(field_data.field)}
+        </:col>
+
+        <:col :let={{_field_name, field_data}} label={gettext("Description")}>
+          {field_data.description || ""}
+        </:col>
+
+        <:col
+          :let={{_field_name, field_data}}
+          label={gettext("Required")}
+          class="max-w-[9.375rem] text-center"
+        >
+          <span
+            :if={@required?.(field_data.field)}
+            class="text-base-content font-semibold"
+          >
+            {gettext("Required")}
+          </span>
+          <span :if={!@required?.(field_data.field)} class="text-base-content/70">
+            {gettext("Optional")}
+          </span>
+        </:col>
+
+        <:col
+          :let={{_field_name, field_data}}
+          label={gettext("Show in overview")}
+          class="max-w-[9.375rem] text-center"
+        >
+          <span :if={field_data.show_in_overview} class="badge badge-success">
+            {gettext("Yes")}
+          </span>
+          <span :if={!field_data.show_in_overview} class="badge badge-ghost">
+            {gettext("No")}
+          </span>
+        </:col>
+
+        <:action :let={{_field_name, field_data}}>
+          <.link
+            phx-click="edit_member_field"
+            phx-value-field={Atom.to_string(field_data.field)}
+            phx-target={@myself}
+          >
+            {gettext("Edit")}
+          </.link>
+        </:action>
+      </.table>
+    </div>
+    """
+  end
+
+  @impl true
+  def update(assigns, socket) do
+    # Track previous show_form state to detect when form is closed
+    previous_show_form = Map.get(socket.assigns, :show_form, false)
+
+    # If show_form is explicitly provided in assigns, reset editing state
+    socket =
+      if Map.has_key?(assigns, :show_form) and assigns.show_form == false do
+        socket
+        |> assign(:editing_member_field, nil)
+        |> assign(:form_id, "member-field-form-new")
+      else
+        socket
+      end
+
+    # Detect when form is closed (show_form changes from true to false)
+    new_show_form = Map.get(assigns, :show_form, false)
+
+    if previous_show_form and not new_show_form do
+      send(self(), {:editing_section_changed, nil})
+    end
+
+    {:ok,
+     socket
+     |> assign(assigns)
+     |> assign_new(:settings, fn -> get_settings() end)
+     |> assign_new(:show_form, fn -> false end)
+     |> assign_new(:form_id, fn -> "member-field-form-new" end)
+     |> assign_new(:editing_member_field, fn -> nil end)}
+  end
+
+  @impl true
+  def handle_event("edit_member_field", %{"field" => field_string}, socket) do
+    # Validate that the field is a valid member field before converting to atom
+    valid_fields = Mv.Constants.member_fields() |> Enum.map(&Atom.to_string/1)
+
+    if field_string in valid_fields do
+      field_atom = String.to_existing_atom(field_string)
+
+      # Only send event if form was not already open
+      if not socket.assigns[:show_form] do
+        send(self(), {:editing_section_changed, :member_fields})
+      end
+
+      {:noreply,
+       socket
+       |> assign(:show_form, true)
+       |> assign(:editing_member_field, field_atom)
+       |> assign(:form_id, "member-field-form-#{field_string}")}
+    else
+      {:noreply, socket}
+    end
+  end
+
+  # Helper functions
+
+  defp get_settings do
+    case Membership.get_settings() do
+      {:ok, settings} ->
+        settings
+
+      {:error, _} ->
+        # Return a minimal struct-like map for fallback
+        # This is only used for initial rendering, actual settings will be loaded properly
+        %{member_field_visibility: %{}}
+    end
+  end
+
+  defp get_member_fields_with_visibility(settings) do
+    member_fields = Mv.Constants.member_fields()
+    visibility_config = settings.member_field_visibility || %{}
+
+    # Normalize visibility config keys to atoms
+    normalized_config = VisibilityConfig.normalize(visibility_config)
+
+    Enum.map(member_fields, fn field ->
+      show_in_overview = Map.get(normalized_config, field, true)
+      attribute = Info.attribute(Mv.Membership.Member, field)
+
+      %{
+        field: field,
+        show_in_overview: show_in_overview,
+        value_type: (attribute && attribute.type) || :string,
+        description: nil
+      }
+    end)
+    |> Enum.map(fn field_data ->
+      {Atom.to_string(field_data.field), field_data}
+    end)
+  end
+
+  defp format_value_type(field) when is_atom(field) do
+    case Info.attribute(Mv.Membership.Member, field) do
+      nil -> FieldTypeFormatter.format(:string)
+      attribute -> FieldTypeFormatter.format(attribute.type)
+    end
+  end
+
+  # Check if a field is required by checking the actual attribute definition
+  defp required?(field) when is_atom(field) do
+    case Info.attribute(Mv.Membership.Member, field) do
+      nil -> false
+      attribute -> not attribute.allow_nil?
+    end
+  end
+
+  defp required?(_), do: false
+end

lib/mv_web/live/member_live/form.ex

@@ -43,7 +43,7 @@ defmodule MvWeb.MemberLive.Form do
 
           <h1 class="text-2xl font-bold text-center flex-1">
             <%= if @member do %>
-              {@member.first_name} {@member.last_name}
+              {MvWeb.Helpers.MemberHelpers.display_name(@member)}
             <% else %>
               {gettext("New Member")}
             <% end %>
@@ -82,10 +82,10 @@ defmodule MvWeb.MemberLive.Form do
                 <%!-- Name Row --%>
                 <div class="flex gap-4">
                   <div class="w-48">
-                    <.input field={@form[:first_name]} label={gettext("First Name")} required />
+                    <.input field={@form[:first_name]} label={gettext("First Name")} />
                   </div>
                   <div class="w-48">
-                    <.input field={@form[:last_name]} label={gettext("Last Name")} required />
+                    <.input field={@form[:last_name]} label={gettext("Last Name")} />
                   </div>
                 </div>
 
@@ -110,11 +110,6 @@ defmodule MvWeb.MemberLive.Form do
                   <.input field={@form[:email]} label={gettext("Email")} required type="email" />
                 </div>
 
-                <%!-- Phone --%>
-                <div>
-                  <.input field={@form[:phone_number]} label={gettext("Phone")} type="tel" />
-                </div>
-
                 <%!-- Membership Dates Row --%>
                 <div class="flex gap-4">
                   <div class="w-36">

lib/mv_web/live/member_live/index.ex

@@ -31,10 +31,10 @@ defmodule MvWeb.MemberLive.Index do
   import Ash.Expr
 
   alias Mv.Membership
-  alias MvWeb.MemberLive.Index.Formatter
   alias MvWeb.Helpers.DateFormatter
   alias MvWeb.MemberLive.Index.FieldSelection
   alias MvWeb.MemberLive.Index.FieldVisibility
+  alias MvWeb.MemberLive.Index.Formatter
   alias MvWeb.MemberLive.Index.MembershipFeeStatus
 
   # Prefix used in sort field names for custom fields (e.g., "custom_field_<id>")

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

@@ -239,24 +239,6 @@
     >
       {member.city}
     </:col>
-    <:col
-      :let={member}
-      :if={:phone_number in @member_fields_visible}
-      label={
-        ~H"""
-        <.live_component
-          module={MvWeb.Components.SortHeaderComponent}
-          id={:sort_phone_number}
-          field={:phone_number}
-          label={gettext("Phone Number")}
-          sort_field={@sort_field}
-          sort_order={@sort_order}
-        />
-        """
-      }
-    >
-      {member.phone_number}
-    </:col>
     <:col
       :let={member}
       :if={:join_date in @member_fields_visible}
@@ -275,6 +257,24 @@
     >
       {MvWeb.MemberLive.Index.format_date(member.join_date)}
     </:col>
+    <:col
+      :let={member}
+      :if={:exit_date in @member_fields_visible}
+      label={
+        ~H"""
+        <.live_component
+          module={MvWeb.Components.SortHeaderComponent}
+          id={:sort_exit_date}
+          field={:exit_date}
+          label={gettext("Exit Date")}
+          sort_field={@sort_field}
+          sort_order={@sort_order}
+        />
+        """
+      }
+    >
+      {MvWeb.MemberLive.Index.format_date(member.exit_date)}
+    </:col>
     <:col
       :let={member}
       label={gettext("Membership Fee Status")}

lib/mv_web/live/member_live/index/field_visibility.ex

@@ -20,6 +20,8 @@ defmodule MvWeb.MemberLive.Index.FieldVisibility do
   3. Default (all fields visible)
   """
 
+  alias Mv.Membership.Helpers.VisibilityConfig
+
   @doc """
   Gets all available fields for selection.
 
@@ -177,13 +179,15 @@ defmodule MvWeb.MemberLive.Index.FieldVisibility do
   # Gets member field visibility from settings
   defp get_member_field_visibility_from_settings(settings) do
     visibility_config =
-      normalize_visibility_config(Map.get(settings, :member_field_visibility, %{}))
+      VisibilityConfig.normalize(Map.get(settings, :member_field_visibility, %{}))
 
     member_fields = Mv.Constants.member_fields()
 
     Enum.reduce(member_fields, %{}, fn field, acc ->
       field_string = Atom.to_string(field)
-      show_in_overview = Map.get(visibility_config, field, true)
+      # exit_date defaults to false (hidden), all other fields default to true
+      default_visibility = if field == :exit_date, do: false, else: true
+      show_in_overview = Map.get(visibility_config, field, default_visibility)
       Map.put(acc, field_string, show_in_overview)
     end)
   end
@@ -199,27 +203,6 @@ defmodule MvWeb.MemberLive.Index.FieldVisibility do
     end)
   end
 
-  # Normalizes visibility config map keys from strings to atoms
-  defp normalize_visibility_config(config) when is_map(config) do
-    Enum.reduce(config, %{}, fn
-      {key, value}, acc when is_atom(key) ->
-        Map.put(acc, key, value)
-
-      {key, value}, acc when is_binary(key) ->
-        try do
-          atom_key = String.to_existing_atom(key)
-          Map.put(acc, atom_key, value)
-        rescue
-          ArgumentError -> acc
-        end
-
-      _, acc ->
-        acc
-    end)
-  end
-
-  defp normalize_visibility_config(_), do: %{}
-
   # Converts field string to atom (for member fields) or keeps as string (for custom fields)
   defp to_field_identifier(field_string) when is_binary(field_string) do
     if String.starts_with?(field_string, Mv.Constants.custom_field_prefix()) do

lib/mv_web/live/member_live/show.ex

@@ -35,7 +35,7 @@ defmodule MvWeb.MemberLive.Show do
         </.button>
 
         <h1 class="text-2xl font-bold text-center flex-1">
-          {@member.first_name} {@member.last_name}
+          {MvWeb.Helpers.MemberHelpers.display_name(@member)}
         </h1>
 
         <.button variant="primary" navigate={~p"/members/#{@member}/edit?return_to=show"}>
@@ -104,11 +104,6 @@ defmodule MvWeb.MemberLive.Show do
                   </.data_field>
                 </div>
 
-                <%!-- Phone --%>
-                <div>
-                  <.data_field label={gettext("Phone")} value={@member.phone_number} />
-                </div>
-
                 <%!-- Membership Dates Row --%>
                 <div class="flex gap-6">
                   <.data_field

lib/mv_web/live/member_live/show/membership_fees_component.ex

@@ -15,10 +15,10 @@ defmodule MvWeb.MemberLive.Show.MembershipFeesComponent do
   require Ash.Query
 
   alias Mv.Membership
-  alias Mv.MembershipFees.MembershipFeeType
-  alias Mv.MembershipFees.MembershipFeeCycle
-  alias Mv.MembershipFees.CycleGenerator
   alias Mv.MembershipFees.CalendarCycles
+  alias Mv.MembershipFees.CycleGenerator
+  alias Mv.MembershipFees.MembershipFeeCycle
+  alias Mv.MembershipFees.MembershipFeeType
   alias MvWeb.Helpers.MembershipFeeHelpers
 
   @impl true
@@ -63,7 +63,7 @@ defmodule MvWeb.MemberLive.Show.MembershipFeesComponent do
             phx-click="delete_all_cycles"
             phx-target={@myself}
             class="btn btn-sm btn-error btn-outline"
-            title={gettext("Delete all cycles")}
+            title={gettext("Delete All Cycles")}
           >
             <.icon name="hero-trash" class="size-4" />
             {gettext("Delete All Cycles")}
@@ -168,7 +168,7 @@ defmodule MvWeb.MemberLive.Show.MembershipFeesComponent do
                   phx-value-cycle_id={cycle.id}
                   phx-target={@myself}
                   class="btn btn-sm btn-error btn-outline"
-                  title={gettext("Delete cycle")}
+                  title={gettext("Delete Cycle")}
                 >
                   <.icon name="hero-trash" class="size-4" />
                   {gettext("Delete")}
@@ -329,16 +329,14 @@ defmodule MvWeb.MemberLive.Show.MembershipFeesComponent do
                 />
                 <label class="label">
                   <span class="label-text-alt">
-                    {gettext(
-                      "The cycle period will be calculated based on this date and the interval."
-                    )}
+                    {gettext("The cycle will be calculated based on this date and the interval.")}
                   </span>
                 </label>
               </div>
               <%= if @create_cycle_date do %>
                 <div class="form-control w-full mt-4">
                   <label class="label">
-                    <span class="label-text">{gettext("Cycle Period")}</span>
+                    <span class="label-text">{gettext("Cycle")}</span>
                   </label>
                   <div class="text-sm text-base-content/70">
                     {format_create_cycle_period(

lib/mv_web/live/membership_fee_type_live/form.ex

@@ -15,9 +15,9 @@ defmodule MvWeb.MembershipFeeTypeLive.Form do
 
   require Ash.Query
 
+  alias Mv.Membership.Member
   alias Mv.MembershipFees
   alias Mv.MembershipFees.MembershipFeeType
-  alias Mv.Membership.Member
   alias MvWeb.Helpers.MembershipFeeHelpers
 
   @impl true

lib/mv_web/live/membership_fee_type_live/index.ex

@@ -16,10 +16,10 @@ defmodule MvWeb.MembershipFeeTypeLive.Index do
 
   require Ash.Query
 
-  alias Mv.MembershipFees
-  alias Mv.MembershipFees.MembershipFeeType
   alias Mv.Membership
   alias Mv.Membership.Member
+  alias Mv.MembershipFees
+  alias Mv.MembershipFees.MembershipFeeType
   alias MvWeb.Helpers.MembershipFeeHelpers
 
   @impl true
@@ -115,7 +115,7 @@ defmodule MvWeb.MembershipFeeTypeLive.Index do
             phx-value-id={mft.id}
             data-confirm={gettext("Are you sure?")}
             class="btn btn-ghost btn-xs text-error"
-            aria-label={gettext("Delete membership fee type")}
+            aria-label={gettext("Delete Membership Fee Type")}
           >
             <.icon name="hero-trash" class="size-4" />
           </button>

lib/mv_web/live/role_live/form.ex

@@ -0,0 +1,237 @@
+defmodule MvWeb.RoleLive.Form do
+  @moduledoc """
+  LiveView form for creating and editing roles.
+
+  ## Features
+  - Create new roles
+  - Edit existing roles (name, description, permission_set_name)
+  - Custom dropdown for permission_set_name with badges
+  - Form validation
+
+  ## Security
+  Only admins can access this page (enforced by authorization).
+  """
+  use MvWeb, :live_view
+
+  alias Mv.Authorization.PermissionSets
+
+  import MvWeb.RoleLive.Helpers, only: [format_error: 1]
+
+  on_mount {MvWeb.LiveHelpers, :ensure_user_role_loaded}
+
+  @impl true
+  def render(assigns) do
+    ~H"""
+    <Layouts.app flash={@flash} current_user={@current_user}>
+      <.header>
+        {@page_title}
+        <:subtitle>{gettext("Use this form to manage roles in your database.")}</:subtitle>
+      </.header>
+
+      <.form class="max-w-xl" for={@form} id="role-form" phx-change="validate" phx-submit="save">
+        <.input field={@form[:name]} type="text" label={gettext("Name")} required />
+
+        <.input
+          field={@form[:description]}
+          type="textarea"
+          label={gettext("Description")}
+          rows="3"
+        />
+
+        <div class="form-control">
+          <label class="label" for="role-form_permission_set_name">
+            <span class="label-text font-semibold">
+              {gettext("Permission Set")}
+              <span class="text-red-700">*</span>
+            </span>
+          </label>
+          <select
+            class={[
+              "select select-bordered w-full",
+              @form.errors[:permission_set_name] && "select-error"
+            ]}
+            name="role[permission_set_name]"
+            id="role-form_permission_set_name"
+            required
+            aria-label={gettext("Permission Set")}
+          >
+            <option value="">{gettext("Select permission set")}</option>
+            <%= for permission_set <- all_permission_sets() do %>
+              <option
+                value={permission_set}
+                selected={@form[:permission_set_name].value == permission_set}
+              >
+                {format_permission_set_option(permission_set)}
+              </option>
+            <% end %>
+          </select>
+          <%= if @form.errors[:permission_set_name] do %>
+            <%= for error <- List.wrap(@form.errors[:permission_set_name]) do %>
+              <% {msg, _opts} = if is_tuple(error), do: error, else: {error, []} %>
+              <p class="mt-1.5 flex gap-2 items-center text-sm text-error">
+                <.icon name="hero-exclamation-circle" class="size-5" />
+                {msg}
+              </p>
+            <% end %>
+          <% end %>
+        </div>
+
+        <div class="mt-4">
+          <.button phx-disable-with={gettext("Saving...")} variant="primary" type="submit">
+            {gettext("Save Role")}
+          </.button>
+          <.button navigate={return_path(@return_to, @role)} type="button">
+            {gettext("Cancel")}
+          </.button>
+        </div>
+      </.form>
+    </Layouts.app>
+    """
+  end
+
+  @impl true
+  def mount(params, _session, socket) do
+    case params["id"] do
+      nil ->
+        action = gettext("New")
+        page_title = action <> " " <> gettext("Role")
+
+        {:ok,
+         socket
+         |> assign(:return_to, return_to(params["return_to"]))
+         |> assign(:role, nil)
+         |> assign(:page_title, page_title)
+         |> assign_form()}
+
+      id ->
+        try do
+          case Ash.get(
+                 Mv.Authorization.Role,
+                 id,
+                 domain: Mv.Authorization,
+                 actor: socket.assigns[:current_user]
+               ) do
+            {:ok, role} ->
+              action = gettext("Edit")
+              page_title = action <> " " <> gettext("Role")
+
+              {:ok,
+               socket
+               |> assign(:return_to, return_to(params["return_to"]))
+               |> assign(:role, role)
+               |> assign(:page_title, page_title)
+               |> assign_form()}
+
+            {:error, %Ash.Error.Invalid{errors: [%Ash.Error.Query.NotFound{} | _]}} ->
+              {:ok,
+               socket
+               |> put_flash(:error, gettext("Role not found."))
+               |> redirect(to: ~p"/admin/roles")}
+
+            {:error, error} ->
+              {:ok,
+               socket
+               |> put_flash(:error, format_error(error))
+               |> redirect(to: ~p"/admin/roles")}
+          end
+        rescue
+          e in [Ash.Error.Invalid] ->
+            # Handle exceptions that Ash.get might throw (e.g., policy violations)
+            case e do
+              %Ash.Error.Invalid{errors: [%Ash.Error.Query.NotFound{} | _]} ->
+                {:ok,
+                 socket
+                 |> put_flash(:error, gettext("Role not found."))
+                 |> redirect(to: ~p"/admin/roles")}
+
+              _ ->
+                reraise e, __STACKTRACE__
+            end
+        end
+    end
+  end
+
+  @spec return_to(String.t() | nil) :: String.t()
+  defp return_to("show"), do: "show"
+  defp return_to(_), do: "index"
+
+  @impl true
+  def handle_event("validate", %{"role" => role_params}, socket) do
+    validated_form = AshPhoenix.Form.validate(socket.assigns.form, role_params)
+    {:noreply, assign(socket, form: validated_form)}
+  end
+
+  def handle_event("save", %{"role" => role_params}, socket) do
+    case AshPhoenix.Form.submit(socket.assigns.form, params: role_params) do
+      {:ok, role} ->
+        notify_parent({:saved, role})
+
+        redirect_path =
+          if socket.assigns.return_to == "show" do
+            ~p"/admin/roles/#{role.id}"
+          else
+            ~p"/admin/roles"
+          end
+
+        socket =
+          socket
+          |> put_flash(:info, gettext("Role saved successfully."))
+          |> push_navigate(to: redirect_path)
+
+        {:noreply, socket}
+
+      {:error, form} ->
+        {:noreply, assign(socket, form: form)}
+    end
+  end
+
+  @spec notify_parent(any()) :: any()
+  defp notify_parent(msg), do: send(self(), {__MODULE__, msg})
+
+  @spec assign_form(Phoenix.LiveView.Socket.t()) :: Phoenix.LiveView.Socket.t()
+  defp assign_form(%{assigns: %{role: role, current_user: actor}} = socket) do
+    form =
+      if role do
+        AshPhoenix.Form.for_update(role, :update_role,
+          domain: Mv.Authorization,
+          as: "role",
+          actor: actor
+        )
+      else
+        AshPhoenix.Form.for_create(
+          Mv.Authorization.Role,
+          :create_role,
+          domain: Mv.Authorization,
+          as: "role",
+          actor: actor
+        )
+      end
+
+    assign(socket, form: to_form(form))
+  end
+
+  defp all_permission_sets do
+    PermissionSets.all_permission_sets() |> Enum.map(&Atom.to_string/1)
+  end
+
+  defp format_permission_set_option("own_data"),
+    do: gettext("own_data - Access only to own data")
+
+  defp format_permission_set_option("read_only"),
+    do: gettext("read_only - Read access to all data")
+
+  defp format_permission_set_option("normal_user"),
+    do: gettext("normal_user - Create/Read/Update access")
+
+  defp format_permission_set_option("admin"),
+    do: gettext("admin - Unrestricted access")
+
+  defp format_permission_set_option(set), do: set
+
+  @spec return_path(String.t(), Mv.Authorization.Role.t() | nil) :: String.t()
+  defp return_path("index", _role), do: ~p"/admin/roles"
+  defp return_path("show", role) when not is_nil(role), do: ~p"/admin/roles/#{role.id}"
+  defp return_path("show", _role), do: ~p"/admin/roles"
+  defp return_path(_, role) when not is_nil(role), do: ~p"/admin/roles/#{role.id}"
+  defp return_path(_, _role), do: ~p"/admin/roles"
+end

lib/mv_web/live/role_live/helpers.ex

@@ -0,0 +1,44 @@
+defmodule MvWeb.RoleLive.Helpers do
+  @moduledoc """
+  Shared helper functions for RoleLive modules.
+  """
+  use Gettext, backend: MvWeb.Gettext
+
+  @doc """
+  Formats an error for display to the user.
+  Extracts error messages from Ash.Error.Invalid and joins them.
+  """
+  @spec format_error(Ash.Error.Invalid.t() | String.t() | any()) :: String.t()
+  def format_error(%Ash.Error.Invalid{} = error) do
+    Enum.map_join(error.errors, ", ", fn e -> e.message end)
+  end
+
+  def format_error(error) when is_binary(error), do: error
+  def format_error(_error), do: gettext("An error occurred")
+
+  @doc """
+  Returns the CSS badge class for a permission set name.
+  """
+  @spec permission_set_badge_class(String.t()) :: String.t()
+  def permission_set_badge_class("own_data"), do: "badge badge-neutral badge-sm"
+  def permission_set_badge_class("read_only"), do: "badge badge-info badge-sm"
+  def permission_set_badge_class("normal_user"), do: "badge badge-success badge-sm"
+  def permission_set_badge_class("admin"), do: "badge badge-error badge-sm"
+  def permission_set_badge_class(_), do: "badge badge-ghost badge-sm"
+
+  @doc """
+  Builds Ash options with actor and domain, ensuring actor is never nil in real paths.
+  """
+  @spec opts_with_actor(keyword(), map() | nil, atom()) :: keyword()
+  def opts_with_actor(base_opts \\ [], actor, domain) do
+    opts = Keyword.put(base_opts, :domain, domain)
+
+    if actor do
+      Keyword.put(opts, :actor, actor)
+    else
+      require Logger
+      Logger.warning("opts_with_actor called with nil actor - this may bypass policies")
+      opts
+    end
+  end
+end

lib/mv_web/live/role_live/index.ex

@@ -0,0 +1,170 @@
+defmodule MvWeb.RoleLive.Index do
+  @moduledoc """
+  LiveView for displaying and managing the role list.
+
+  ## Features
+  - List all roles with name, description, permission_set_name, is_system_role
+  - Create new roles
+  - Navigate to role details and edit forms
+  - Delete non-system roles
+
+  ## Events
+  - `delete` - Remove a role from the database (only non-system roles)
+
+  ## Security
+  Only admins can access this page (enforced by authorization).
+  """
+  use MvWeb, :live_view
+
+  alias Mv.Accounts
+  alias Mv.Authorization
+
+  require Ash.Query
+
+  import MvWeb.RoleLive.Helpers,
+    only: [format_error: 1, permission_set_badge_class: 1, opts_with_actor: 3]
+
+  on_mount {MvWeb.LiveHelpers, :ensure_user_role_loaded}
+
+  @impl true
+  def mount(_params, _session, socket) do
+    actor = socket.assigns[:current_user]
+    roles = load_roles(actor)
+    user_counts = load_user_counts(roles, actor)
+
+    {:ok,
+     socket
+     |> assign(:page_title, gettext("Listing Roles"))
+     |> assign(:roles, roles)
+     |> assign(:user_counts, user_counts)}
+  end
+
+  @impl true
+  def handle_event("delete", %{"id" => id}, socket) do
+    case Authorization.get_role(id, actor: socket.assigns.current_user) do
+      {:ok, role} ->
+        handle_delete_role(role, id, socket)
+
+      {:error, %Ash.Error.Query.NotFound{}} ->
+        {:noreply,
+         put_flash(
+           socket,
+           :error,
+           gettext("Role not found.")
+         )}
+
+      {:error, error} ->
+        error_message = format_error(error)
+
+        {:noreply,
+         put_flash(
+           socket,
+           :error,
+           gettext("Failed to delete role: %{error}", error: error_message)
+         )}
+    end
+  end
+
+  defp handle_delete_role(role, id, socket) do
+    if role.is_system_role do
+      {:noreply,
+       put_flash(
+         socket,
+         :error,
+         gettext("System roles cannot be deleted.")
+       )}
+    else
+      user_count = recalculate_user_count(role, socket.assigns.current_user)
+
+      if user_count > 0 do
+        {:noreply,
+         put_flash(
+           socket,
+           :error,
+           gettext(
+             "Cannot delete role. %{count} user(s) are still assigned to this role. Please assign them to another role first.",
+             count: user_count
+           )
+         )}
+      else
+        perform_role_deletion(role, id, socket)
+      end
+    end
+  end
+
+  defp perform_role_deletion(role, id, socket) do
+    case Authorization.destroy_role(role, actor: socket.assigns.current_user) do
+      :ok ->
+        updated_roles = Enum.reject(socket.assigns.roles, &(&1.id == id))
+        updated_counts = Map.delete(socket.assigns.user_counts, id)
+
+        {:noreply,
+         socket
+         |> assign(:roles, updated_roles)
+         |> assign(:user_counts, updated_counts)
+         |> put_flash(:info, gettext("Role deleted successfully."))}
+
+      {:error, error} ->
+        error_message = format_error(error)
+
+        {:noreply,
+         put_flash(
+           socket,
+           :error,
+           gettext("Failed to delete role: %{error}", error: error_message)
+         )}
+    end
+  end
+
+  @spec load_roles(map() | nil) :: [Mv.Authorization.Role.t()]
+  defp load_roles(actor) do
+    opts = if actor, do: [actor: actor], else: []
+
+    case Authorization.list_roles(opts) do
+      {:ok, roles} -> Enum.sort_by(roles, & &1.name)
+      {:error, _} -> []
+    end
+  end
+
+  # Loads all user counts for roles using DB-side aggregation for better performance
+  @spec load_user_counts([Mv.Authorization.Role.t()], map() | nil) :: %{
+          Ecto.UUID.t() => non_neg_integer()
+        }
+  defp load_user_counts(roles, _actor) do
+    role_ids = Enum.map(roles, & &1.id)
+
+    # Use Ecto directly for efficient GROUP BY COUNT query
+    # This is much more performant than loading all users and counting in Elixir
+    # Note: We bypass Ash here for performance, but this is a simple read-only query
+    import Ecto.Query
+
+    query =
+      from u in Accounts.User,
+        where: u.role_id in ^role_ids,
+        group_by: u.role_id,
+        select: {u.role_id, count(u.id)}
+
+    results = Mv.Repo.all(query)
+
+    results
+    |> Enum.into(%{}, fn {role_id, count} -> {role_id, count} end)
+  end
+
+  # Gets user count from preloaded assigns map
+  @spec get_user_count(Mv.Authorization.Role.t(), %{Ecto.UUID.t() => non_neg_integer()}) ::
+          non_neg_integer()
+  defp get_user_count(role, user_counts) do
+    Map.get(user_counts, role.id, 0)
+  end
+
+  # Recalculates user count for a specific role (used before deletion)
+  @spec recalculate_user_count(Mv.Authorization.Role.t(), map() | nil) :: non_neg_integer()
+  defp recalculate_user_count(role, actor) do
+    opts = opts_with_actor([], actor, Mv.Accounts)
+
+    case Ash.count(Accounts.User |> Ash.Query.filter(role_id == ^role.id), opts) do
+      {:ok, count} -> count
+      _ -> 0
+    end
+  end
+end

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

@@ -0,0 +1,97 @@
+<Layouts.app flash={@flash} current_user={@current_user}>
+  <.header>
+    {gettext("Listing Roles")}
+    <:subtitle>
+      {gettext("Manage user roles and their permission sets.")}
+    </:subtitle>
+    <:actions>
+      <%= if can?(@current_user, :create, Mv.Authorization.Role) do %>
+        <.button variant="primary" navigate={~p"/admin/roles/new"}>
+          <.icon name="hero-plus" /> {gettext("New Role")}
+        </.button>
+      <% end %>
+    </:actions>
+  </.header>
+
+  <.table
+    id="roles"
+    rows={@roles}
+    row_click={fn role -> JS.navigate(~p"/admin/roles/#{role}") end}
+  >
+    <:col :let={role} label={gettext("Name")}>
+      <div class="flex items-center gap-2">
+        <span class="font-medium">{role.name}</span>
+        <%= if role.is_system_role do %>
+          <span class="badge badge-warning badge-sm">{gettext("System Role")}</span>
+        <% end %>
+      </div>
+    </:col>
+
+    <:col :let={role} label={gettext("Description")}>
+      <%= if role.description do %>
+        <span class="text-sm">{role.description}</span>
+      <% else %>
+        <span class="text-base-content/70">{gettext("No description")}</span>
+      <% end %>
+    </:col>
+
+    <:col :let={role} label={gettext("Permission Set")}>
+      <span class={permission_set_badge_class(role.permission_set_name)}>
+        {role.permission_set_name}
+      </span>
+    </:col>
+
+    <:col :let={role} label={gettext("Type")}>
+      <%= if role.is_system_role do %>
+        <span class="badge badge-warning badge-sm">{gettext("System")}</span>
+      <% else %>
+        <span class="badge badge-ghost badge-sm">{gettext("Custom")}</span>
+      <% end %>
+    </:col>
+
+    <:col :let={role} label={gettext("Users")}>
+      <span class="badge badge-ghost">{get_user_count(role, @user_counts)}</span>
+    </:col>
+
+    <:action :let={role}>
+      <div class="sr-only">
+        <.link navigate={~p"/admin/roles/#{role}"}>{gettext("Show")}</.link>
+      </div>
+
+      <%= if can?(@current_user, :update, Mv.Authorization.Role) do %>
+        <.link navigate={~p"/admin/roles/#{role}/edit"} class="btn btn-ghost btn-sm">
+          <.icon name="hero-pencil" class="size-4" />
+          {gettext("Edit")}
+        </.link>
+      <% end %>
+    </:action>
+
+    <:action :let={role}>
+      <%= 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}) |> hide("#row-#{role.id}")}
+          data-confirm={gettext("Are you sure?")}
+          class="btn btn-ghost btn-sm text-error"
+        >
+          <.icon name="hero-trash" class="size-4" />
+          {gettext("Delete")}
+        </.link>
+      <% else %>
+        <div
+          :if={role.is_system_role}
+          class="tooltip tooltip-left"
+          data-tip={gettext("System roles cannot be deleted")}
+        >
+          <button
+            class="btn btn-ghost btn-sm text-error opacity-50 cursor-not-allowed"
+            disabled={true}
+            aria-label={gettext("Cannot delete system role")}
+          >
+            <.icon name="hero-trash" class="size-4" />
+            {gettext("Delete")}
+          </button>
+        </div>
+      <% end %>
+    </:action>
+  </.table>
+</Layouts.app>

lib/mv_web/live/role_live/show.ex

@@ -0,0 +1,216 @@
+defmodule MvWeb.RoleLive.Show do
+  @moduledoc """
+  LiveView for displaying a single role's details.
+
+  ## Features
+  - Display role information (name, description, permission_set_name, is_system_role)
+  - Navigate to edit form
+  - Return to role list
+
+  ## Security
+  Only admins can access this page (enforced by authorization).
+  """
+  use MvWeb, :live_view
+
+  alias Mv.Accounts
+
+  require Ash.Query
+
+  import MvWeb.RoleLive.Helpers,
+    only: [format_error: 1, permission_set_badge_class: 1, opts_with_actor: 3]
+
+  on_mount {MvWeb.LiveHelpers, :ensure_user_role_loaded}
+
+  @impl true
+  def mount(%{"id" => id}, _session, socket) do
+    try do
+      case Ash.get(
+             Mv.Authorization.Role,
+             id,
+             domain: Mv.Authorization,
+             actor: socket.assigns[:current_user]
+           ) do
+        {:ok, role} ->
+          user_count = load_user_count(role, socket.assigns[:current_user])
+
+          {:ok,
+           socket
+           |> assign(:page_title, gettext("Show Role"))
+           |> assign(:role, role)
+           |> assign(:user_count, user_count)}
+
+        {:error, %Ash.Error.Invalid{errors: [%Ash.Error.Query.NotFound{} | _]}} ->
+          {:ok,
+           socket
+           |> put_flash(:error, gettext("Role not found."))
+           |> redirect(to: ~p"/admin/roles")}
+
+        {:error, error} ->
+          {:ok,
+           socket
+           |> put_flash(:error, format_error(error))
+           |> redirect(to: ~p"/admin/roles")}
+      end
+    rescue
+      e in [Ash.Error.Invalid] ->
+        # Handle exceptions that Ash.get might throw (e.g., policy violations)
+        case e do
+          %Ash.Error.Invalid{errors: [%Ash.Error.Query.NotFound{} | _]} ->
+            {:ok,
+             socket
+             |> put_flash(:error, gettext("Role not found."))
+             |> redirect(to: ~p"/admin/roles")}
+
+          _ ->
+            reraise e, __STACKTRACE__
+        end
+    end
+  end
+
+  @impl true
+  def handle_event("delete", %{"id" => id}, socket) do
+    case Mv.Authorization.get_role(id, actor: socket.assigns.current_user) do
+      {:ok, role} ->
+        handle_delete_role(role, socket)
+
+      {:error, %Ash.Error.Query.NotFound{}} ->
+        {:noreply,
+         put_flash(
+           socket,
+           :error,
+           gettext("Role not found.")
+         )
+         |> push_navigate(to: ~p"/admin/roles")}
+
+      {:error, error} ->
+        error_message = format_error(error)
+
+        {:noreply,
+         put_flash(
+           socket,
+           :error,
+           gettext("Failed to delete role: %{error}", error: error_message)
+         )}
+    end
+  end
+
+  defp handle_delete_role(role, socket) do
+    if role.is_system_role do
+      {:noreply,
+       put_flash(
+         socket,
+         :error,
+         gettext("System roles cannot be deleted.")
+       )}
+    else
+      user_count = recalculate_user_count(role, socket.assigns.current_user)
+
+      if user_count > 0 do
+        {:noreply,
+         put_flash(
+           socket,
+           :error,
+           gettext(
+             "Cannot delete role. %{count} user(s) are still assigned to this role. Please assign them to another role first.",
+             count: user_count
+           )
+         )}
+      else
+        perform_role_deletion(role, socket)
+      end
+    end
+  end
+
+  defp perform_role_deletion(role, socket) do
+    case Mv.Authorization.destroy_role(role, actor: socket.assigns.current_user) do
+      :ok ->
+        {:noreply,
+         socket
+         |> put_flash(:info, gettext("Role deleted successfully."))
+         |> push_navigate(to: ~p"/admin/roles")}
+
+      {:error, error} ->
+        error_message = format_error(error)
+
+        {:noreply,
+         put_flash(
+           socket,
+           :error,
+           gettext("Failed to delete role: %{error}", error: error_message)
+         )}
+    end
+  end
+
+  # Recalculates user count for a specific role (used before deletion)
+  @spec recalculate_user_count(Mv.Authorization.Role.t(), map() | nil) :: non_neg_integer()
+  defp recalculate_user_count(role, actor) do
+    opts = opts_with_actor([], actor, Mv.Accounts)
+
+    case Ash.count(Accounts.User |> Ash.Query.filter(role_id == ^role.id), opts) do
+      {:ok, count} -> count
+      _ -> 0
+    end
+  end
+
+  # Loads user count for initial display (uses same logic as recalculate)
+  @spec load_user_count(Mv.Authorization.Role.t(), map() | nil) :: non_neg_integer()
+  defp load_user_count(role, actor) do
+    recalculate_user_count(role, actor)
+  end
+
+  @impl true
+  def render(assigns) do
+    ~H"""
+    <Layouts.app flash={@flash} current_user={@current_user}>
+      <.header>
+        {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"
+            >
+              <.icon name="hero-trash" /> {gettext("Delete Role")}
+            </.link>
+          <% end %>
+        </:actions>
+      </.header>
+
+      <.list>
+        <:item title={gettext("Name")}>{@role.name}</:item>
+        <:item title={gettext("Description")}>
+          <%= if @role.description do %>
+            {@role.description}
+          <% else %>
+            <span class="text-base-content/70 italic">{gettext("No description")}</span>
+          <% end %>
+        </:item>
+        <:item title={gettext("Permission Set")}>
+          <span class={permission_set_badge_class(@role.permission_set_name)}>
+            {@role.permission_set_name}
+          </span>
+        </:item>
+        <:item title={gettext("System Role")}>
+          <%= if @role.is_system_role do %>
+            <span class="badge badge-warning">{gettext("Yes")}</span>
+          <% else %>
+            <span class="badge badge-ghost">{gettext("No")}</span>
+          <% end %>
+        </:item>
+      </.list>
+    </Layouts.app>
+    """
+  end
+end

lib/mv_web/live/user_live/form.ex

@@ -131,7 +131,7 @@ defmodule MvWeb.UserLive.Form do
               <div class="flex items-center justify-between">
                 <div>
                   <p class="font-medium text-green-900">
-                    {@user.member.first_name} {@user.member.last_name}
+                    {MvWeb.Helpers.MemberHelpers.display_name(@user.member)}
                   </p>
                   <p class="text-sm text-green-700">{@user.member.email}</p>
                 </div>
@@ -210,7 +210,7 @@ defmodule MvWeb.UserLive.Form do
                           )
                         ]}
                       >
-                        <p class="font-medium">{member.first_name} {member.last_name}</p>
+                        <p class="font-medium">{MvWeb.Helpers.MemberHelpers.display_name(member)}</p>
                         <p class="text-sm text-base-content/70">{member.email}</p>
                       </div>
                     <% end %>
@@ -438,7 +438,7 @@ defmodule MvWeb.UserLive.Form do
 
     member_name =
       if selected_member,
-        do: "#{selected_member.first_name} #{selected_member.last_name}",
+        do: MvWeb.Helpers.MemberHelpers.display_name(selected_member),
         else: ""
 
     # Store the selected member ID and name in socket state and clear unlink flag

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

@@ -51,7 +51,7 @@
     </:col>
     <:col :let={user} label={gettext("Linked Member")}>
       <%= if user.member do %>
-        {user.member.first_name} {user.member.last_name}
+        {MvWeb.Helpers.MemberHelpers.display_name(user.member)}
       <% else %>
         <span class="text-base-content/50">{gettext("No member linked")}</span>
       <% end %>

lib/mv_web/live/user_live/show.ex

@@ -57,7 +57,7 @@ defmodule MvWeb.UserLive.Show do
               class="text-blue-600 underline hover:text-blue-800"
             >
               <.icon name="hero-users" class="inline w-4 h-4 mr-1" />
-              {@user.member.first_name} {@user.member.last_name}
+              {MvWeb.Helpers.MemberHelpers.display_name(@user.member)}
             </.link>
           <% else %>
             <span class="italic text-gray-500">{gettext("No member linked")}</span>

lib/mv_web/live_helpers.ex

@@ -4,16 +4,59 @@ defmodule MvWeb.LiveHelpers do
 
   ## on_mount Hooks
   - `:default` - Sets the user's locale from session (defaults to "de")
+  - `:ensure_user_role_loaded` - Ensures current_user has role relationship loaded
 
   ## Usage
   Add to LiveView modules via:
   ```elixir
   on_mount {MvWeb.LiveHelpers, :default}
+  on_mount {MvWeb.LiveHelpers, :ensure_user_role_loaded}
   ```
   """
+  import Phoenix.Component
+
   def on_mount(:default, _params, session, socket) do
     locale = session["locale"] || "de"
     Gettext.put_locale(locale)
     {:cont, socket}
   end
+
+  def on_mount(:ensure_user_role_loaded, _params, _session, socket) do
+    socket = ensure_user_role_loaded(socket)
+    {:cont, socket}
+  end
+
+  defp ensure_user_role_loaded(socket) do
+    if socket.assigns[:current_user] do
+      user = socket.assigns.current_user
+      user_with_role = load_user_role(user)
+      assign(socket, :current_user, user_with_role)
+    else
+      socket
+    end
+  end
+
+  defp load_user_role(user) do
+    case Map.get(user, :role) do
+      %Ash.NotLoaded{} -> load_role_safely(user)
+      nil -> load_role_safely(user)
+      _role -> user
+    end
+  end
+
+  defp load_role_safely(user) do
+    # Use self as actor for loading own role relationship
+    opts = [domain: Mv.Accounts, actor: user]
+
+    case Ash.load(user, :role, opts) do
+      {:ok, loaded_user} ->
+        loaded_user
+
+      {:error, error} ->
+        # Log warning if role loading fails - this can cause authorization issues
+        require Logger
+        Logger.warning("Failed to load role for user #{user.id}: #{inspect(error)}")
+        user
+    end
+  end
 end

lib/mv_web/router.ex

@@ -46,7 +46,10 @@ defmodule MvWeb.Router do
     AshAuthentication-specific: We define that all routes can only be accessed when the user is signed in.
     """
     ash_authentication_live_session :authentication_required,
-      on_mount: {MvWeb.LiveUserAuth, :live_user_required} do
+      on_mount: [
+        {MvWeb.LiveUserAuth, :live_user_required},
+        {MvWeb.LiveHelpers, :ensure_user_role_loaded}
+      ] do
       live "/", MemberLive.Index, :index
 
       live "/members", MemberLive.Index, :index
@@ -81,6 +84,12 @@ defmodule MvWeb.Router do
       live "/contribution_types", ContributionTypeLive.Index, :index
       live "/contributions/member/:id", ContributionPeriodLive.Show, :show
 
+      # Role Management (Admin only)
+      live "/admin/roles", RoleLive.Index, :index
+      live "/admin/roles/new", RoleLive.Form, :new
+      live "/admin/roles/:id", RoleLive.Show, :show
+      live "/admin/roles/:id/edit", RoleLive.Form, :edit
+
       post "/set_locale", LocaleController, :set_locale
     end
 

lib/mv_web/translations/member_fields.ex

@@ -20,7 +20,6 @@ defmodule MvWeb.Translations.MemberFields do
   def label(:first_name), do: gettext("First Name")
   def label(:last_name), do: gettext("Last Name")
   def label(:email), do: gettext("Email")
-  def label(:phone_number), do: gettext("Phone")
   def label(:join_date), do: gettext("Join Date")
   def label(:exit_date), do: gettext("Exit Date")
   def label(:notes), do: gettext("Notes")
@@ -28,6 +27,7 @@ defmodule MvWeb.Translations.MemberFields do
   def label(:street), do: gettext("Street")
   def label(:house_number), do: gettext("House Number")
   def label(:postal_code), do: gettext("Postal Code")
+  def label(:membership_fee_start_date), do: gettext("Membership Fee Start Date")
 
   # Fallback for unknown fields
   def label(field) do