feat: Datafields page, merge fee types into membership_fee_settings, sidebar

- Add /admin/datafields (DatafieldsLive) for member and custom field config
- Remove Memberdata block from GlobalSettingsLive
- Router: drop /membership_fee_types, add new_fee_type and edit_fee_type under membership_fee_settings
- MembershipFeeSettingsLive: fee types table, collapsible examples; Index links updated
- PagePaths: admin_datafields, admin_import; remove membership_fee_types
- Sidebar: order and labels (Basic settings, Datafields, Membership fee settings, Import, Users, Roles)
- Gettext: German translations for sidebar and OIDC
- Tests: datafields and fee routes, permission and form tests updated

lib/mv_web/components/layouts/sidebar.ex

@@ -80,11 +80,11 @@ defmodule MvWeb.Layouts.Sidebar do
         />
       <% end %>
 
-      <%= if can_access_page?(@current_user, PagePaths.membership_fee_types()) do %>
+      <%= if can_access_page?(@current_user, PagePaths.groups()) do %>
         <.menu_item
-          href={~p"/membership_fee_types"}
-          icon="hero-currency-euro"
-          label={gettext("Fee Types")}
+          href={~p"/groups"}
+          icon="hero-user-group"
+          label={gettext("Groups")}
         />
       <% end %>
 
@@ -102,24 +102,26 @@ defmodule MvWeb.Layouts.Sidebar do
           label={gettext("Administration")}
           testid="sidebar-administration"
         >
-          <%= if can_access_page?(@current_user, PagePaths.users()) do %>
-            <.menu_subitem href={~p"/users"} label={gettext("Users")} />
+          <%= if can_access_page?(@current_user, PagePaths.settings()) do %>
+            <.menu_subitem href={~p"/settings"} label={gettext("Basic settings")} />
           <% end %>
-          <%= if can_access_page?(@current_user, PagePaths.groups()) do %>
-            <.menu_subitem href={~p"/groups"} label={gettext("Groups")} />
-          <% end %>
-          <%= if can_access_page?(@current_user, PagePaths.admin_roles()) do %>
-            <.menu_subitem href={~p"/admin/roles"} label={gettext("Roles")} />
+          <%= if can_access_page?(@current_user, PagePaths.admin_datafields()) do %>
+            <.menu_subitem href={~p"/admin/datafields"} label={gettext("Datafields")} />
           <% end %>
           <%= if can_access_page?(@current_user, PagePaths.membership_fee_settings()) do %>
             <.menu_subitem
               href={~p"/membership_fee_settings"}
-              label={gettext("Fee Settings")}
+              label={gettext("Membership fee settings")}
             />
           <% end %>
-          <%= if can_access_page?(@current_user, PagePaths.settings()) do %>
+          <%= if can_access_page?(@current_user, PagePaths.admin_import()) do %>
             <.menu_subitem href={~p"/admin/import"} label={gettext("Import")} />
-            <.menu_subitem href={~p"/settings"} label={gettext("Settings")} />
+          <% end %>
+          <%= if can_access_page?(@current_user, PagePaths.users()) do %>
+            <.menu_subitem href={~p"/users"} label={gettext("Users")} />
+          <% end %>
+          <%= if can_access_page?(@current_user, PagePaths.admin_roles()) do %>
+            <.menu_subitem href={~p"/admin/roles"} label={gettext("Roles")} />
           <% end %>
         </.menu_group>
       <% end %>

lib/mv_web/live/datafields_live.ex

@@ -0,0 +1,132 @@
+defmodule MvWeb.DatafieldsLive do
+  @moduledoc """
+  LiveView for managing member field visibility/required and custom fields (datafields).
+
+  Renders MemberFieldLive.IndexComponent and CustomFieldLive.IndexComponent.
+  Moved from GlobalSettingsLive (Memberdata section) to a dedicated page.
+  """
+  use MvWeb, :live_view
+
+  alias Mv.Membership
+
+  on_mount {MvWeb.LiveHelpers, :ensure_user_role_loaded}
+
+  @impl true
+  def mount(_params, _session, socket) do
+    {:ok, settings} = Membership.get_settings()
+
+    {:ok,
+     socket
+     |> assign(:page_title, gettext("Datafields"))
+     |> assign(:settings, settings)
+     |> assign(:active_editing_section, nil)}
+  end
+
+  @impl true
+  def render(assigns) do
+    ~H"""
+    <Layouts.app flash={@flash} current_user={@current_user} club_name={@settings.club_name}>
+      <.header>
+        {gettext("Datafields")}
+        <:subtitle>
+          {gettext("Configure member fields and custom data fields.")}
+        </:subtitle>
+      </.header>
+
+      <.form_section title={gettext("Member fields")}>
+        <.live_component
+          :if={@active_editing_section != :custom_fields}
+          module={MvWeb.MemberFieldLive.IndexComponent}
+          id="member-fields-component"
+          settings={@settings}
+        />
+      </.form_section>
+
+      <.form_section title={gettext("Custom fields")}>
+        <.live_component
+          :if={@active_editing_section != :member_fields}
+          module={MvWeb.CustomFieldLive.IndexComponent}
+          id="custom-fields-component"
+          actor={@current_user}
+        />
+      </.form_section>
+    </Layouts.app>
+    """
+  end
+
+  @impl true
+  def handle_info({:custom_field_saved, _custom_field, action}, socket) do
+    send_update(MvWeb.CustomFieldLive.IndexComponent,
+      id: "custom-fields-component",
+      show_form: false
+    )
+
+    {:noreply,
+     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("Data field deleted successfully"))}
+  end
+
+  @impl true
+  def handle_info({:custom_field_delete_error, error}, socket) do
+    {:noreply,
+     put_flash(
+       socket,
+       :error,
+       gettext("Failed to delete data field: %{error}", error: inspect(error))
+     )}
+  end
+
+  @impl true
+  def handle_info(:custom_field_slug_mismatch, socket) do
+    {:noreply, put_flash(socket, :error, gettext("Slug does not match. Deletion cancelled."))}
+  end
+
+  def handle_info({:custom_fields_load_error, _error}, socket) do
+    {:noreply,
+     put_flash(
+       socket,
+       :error,
+       gettext("Could not load data fields. Please check your permissions.")
+     )}
+  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
+    {:ok, updated_settings} = Membership.get_settings()
+
+    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
+    {: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
+end

lib/mv_web/live/membership_fee_settings_live.ex

@@ -1,17 +1,23 @@
 defmodule MvWeb.MembershipFeeSettingsLive do
   @moduledoc """
-  LiveView for managing membership fee settings (Admin).
+  LiveView for membership fee settings and fee types (Admin).
 
-  Allows administrators to configure:
-  - Default membership fee type for new members
-  - Whether to include the joining cycle in membership fee generation
+  Combines:
+  - Global settings (default fee type, include joining cycle)
+  - Membership fee types table (CRUD links to new/edit routes; delete inline)
+  Examples and info are collapsible to save space.
   """
   use MvWeb, :live_view
 
+  require Ash.Query
+
   import MvWeb.LiveHelpers, only: [current_actor: 1]
 
   alias Mv.Membership
+  alias Mv.Membership.Member
+  alias Mv.MembershipFees
   alias Mv.MembershipFees.MembershipFeeType
+  alias MvWeb.Helpers.MembershipFeeHelpers
 
   @impl true
   def mount(_params, _session, socket) do
@@ -23,11 +29,14 @@ defmodule MvWeb.MembershipFeeSettingsLive do
       |> Ash.Query.sort(name: :asc)
       |> Ash.read!(domain: Mv.MembershipFees, actor: actor)
 
+    member_counts = load_member_counts(membership_fee_types, actor)
+
     {:ok,
      socket
      |> assign(:page_title, gettext("Membership Fee Settings"))
      |> assign(:settings, settings)
      |> assign(:membership_fee_types, membership_fee_types)
+     |> assign(:member_counts, member_counts)
      |> assign_form()}
   end
 
@@ -81,6 +90,51 @@ defmodule MvWeb.MembershipFeeSettingsLive do
     end
   end
 
+  @impl true
+  def handle_event("delete", %{"id" => id}, socket) do
+    actor = current_actor(socket)
+
+    case Ash.get(MembershipFeeType, id, domain: MembershipFees, actor: actor) do
+      {:ok, fee_type} ->
+        case Ash.destroy(fee_type, domain: MembershipFees, actor: actor) do
+          :ok ->
+            updated_types = Enum.reject(socket.assigns.membership_fee_types, &(&1.id == id))
+            updated_counts = Map.delete(socket.assigns.member_counts, id)
+
+            {:noreply,
+             socket
+             |> assign(:membership_fee_types, updated_types)
+             |> assign(:member_counts, updated_counts)
+             |> put_flash(:info, gettext("Membership fee type deleted"))}
+
+          {:error, %Ash.Error.Forbidden{}} ->
+            {:noreply,
+             put_flash(
+               socket,
+               :error,
+               gettext("You do not have permission to delete this membership fee type")
+             )}
+
+          {:error, error} ->
+            {:noreply, put_flash(socket, :error, format_error(error))}
+        end
+
+      {:error, %Ash.Error.Query.NotFound{}} ->
+        {:noreply, put_flash(socket, :error, gettext("Membership fee type not found"))}
+
+      {:error, %Ash.Error.Forbidden{}} ->
+        {:noreply,
+         put_flash(
+           socket,
+           :error,
+           gettext("You do not have permission to access this membership fee type")
+         )}
+
+      {:error, error} ->
+        {:noreply, put_flash(socket, :error, format_error(error))}
+    end
+  end
+
   @impl true
   def render(assigns) do
     ~H"""
@@ -88,8 +142,13 @@ defmodule MvWeb.MembershipFeeSettingsLive do
       <.header>
         {gettext("Membership Fee Settings")}
         <:subtitle>
-          {gettext("Configure global settings for membership fees.")}
+          {gettext("Configure global settings and fee types for membership fees.")}
         </:subtitle>
+        <:actions>
+          <.button variant="primary" navigate={~p"/membership_fee_settings/new_fee_type"}>
+            <.icon name="hero-plus" /> {gettext("New Membership Fee Type")}
+          </.button>
+        </:actions>
       </.header>
 
       <div class="grid gap-6 lg:grid-cols-2">
@@ -188,58 +247,169 @@ defmodule MvWeb.MembershipFeeSettingsLive do
           </div>
         </div>
 
-        <%!-- Examples Card --%>
+        <%!-- Examples Card (collapsible) --%>
         <div class="card bg-base-200">
           <div class="card-body">
-            <h2 class="card-title">
-              <.icon name="hero-light-bulb" class="size-5" />
-              {gettext("Examples")}
-            </h2>
+            <details class="group">
+              <summary class="card-title cursor-pointer list-none flex items-center gap-2">
+                <.icon name="hero-chevron-right" class="size-5 transition group-open:rotate-90" />
+                <.icon name="hero-light-bulb" class="size-5" />
+                {gettext("Examples")}
+              </summary>
 
-            <.example_section
-              title={gettext("Yearly Interval - Joining Cycle Included")}
-              joining_date="15.03.2023"
-              include_joining={true}
-              start_date="01.01.2023"
-              periods={["2023", "2024", "2025"]}
-              note={gettext("Member pays for the year they joined")}
-            />
+              <div class="pt-4 space-y-4">
+                <.example_section
+                  title={gettext("Yearly Interval - Joining Cycle Included")}
+                  joining_date="15.03.2023"
+                  include_joining={true}
+                  start_date="01.01.2023"
+                  periods={["2023", "2024", "2025"]}
+                  note={gettext("Member pays for the year they joined")}
+                />
 
-            <div class="divider"></div>
+                <div class="divider"></div>
 
-            <.example_section
-              title={gettext("Yearly Interval - Joining Cycle Excluded")}
-              joining_date="15.03.2023"
-              include_joining={false}
-              start_date="01.01.2024"
-              periods={["2024", "2025"]}
-              note={gettext("Member pays from the next full year")}
-            />
+                <.example_section
+                  title={gettext("Yearly Interval - Joining Cycle Excluded")}
+                  joining_date="15.03.2023"
+                  include_joining={false}
+                  start_date="01.01.2024"
+                  periods={["2024", "2025"]}
+                  note={gettext("Member pays from the next full year")}
+                />
 
-            <div class="divider"></div>
+                <div class="divider"></div>
 
-            <.example_section
-              title={gettext("Quarterly Interval - Joining Cycle Excluded")}
-              joining_date="15.05.2024"
-              include_joining={false}
-              start_date="01.07.2024"
-              periods={["Q3/2024", "Q4/2024", "Q1/2025"]}
-              note={gettext("Member pays from the next full quarter")}
-            />
+                <.example_section
+                  title={gettext("Quarterly Interval - Joining Cycle Excluded")}
+                  joining_date="15.05.2024"
+                  include_joining={false}
+                  start_date="01.07.2024"
+                  periods={["Q3/2024", "Q4/2024", "Q1/2025"]}
+                  note={gettext("Member pays from the next full quarter")}
+                />
 
-            <div class="divider"></div>
+                <div class="divider"></div>
 
-            <.example_section
-              title={gettext("Monthly Interval - Joining Cycle Included")}
-              joining_date="15.03.2024"
-              include_joining={true}
-              start_date="01.03.2024"
-              periods={["03/2024", "04/2024", "05/2024", "..."]}
-              note={gettext("Member pays from the joining month")}
-            />
+                <.example_section
+                  title={gettext("Monthly Interval - Joining Cycle Included")}
+                  joining_date="15.03.2024"
+                  include_joining={true}
+                  start_date="01.03.2024"
+                  periods={["03/2024", "04/2024", "05/2024", "..."]}
+                  note={gettext("Member pays from the joining month")}
+                />
+              </div>
+            </details>
           </div>
         </div>
       </div>
+
+      <%!-- Fee Types Table --%>
+      <div class="mt-8">
+        <h2 class="text-lg font-semibold mb-4">{gettext("Membership Fee Types")}</h2>
+        <.table
+          id="membership_fee_types"
+          rows={@membership_fee_types}
+          row_id={fn mft -> "mft-#{mft.id}" end}
+        >
+          <:col :let={mft} label={gettext("Name")}>
+            <span class="font-medium">{mft.name}</span>
+            <p :if={mft.description} class="text-sm text-base-content/70">{mft.description}</p>
+          </:col>
+
+          <:col :let={mft} label={gettext("Amount")}>
+            <span class="font-mono">{MembershipFeeHelpers.format_currency(mft.amount)}</span>
+          </:col>
+
+          <:col :let={mft} label={gettext("Interval")}>
+            <span class="badge badge-outline">
+              {MembershipFeeHelpers.format_interval(mft.interval)}
+            </span>
+          </:col>
+
+          <:col :let={mft} label={gettext("Members")}>
+            <span class="badge badge-ghost">{get_member_count(mft, @member_counts)}</span>
+          </:col>
+
+          <:action :let={mft}>
+            <.link
+              navigate={~p"/membership_fee_settings/#{mft.id}/edit_fee_type"}
+              class="btn btn-ghost btn-xs"
+              aria-label={gettext("Edit membership fee type")}
+            >
+              <.icon name="hero-pencil" class="size-4" />
+            </.link>
+          </:action>
+
+          <:action :let={mft}>
+            <div
+              :if={get_member_count(mft, @member_counts) > 0}
+              class="tooltip tooltip-left"
+              data-tip={
+                gettext("Cannot delete - %{count} member(s) assigned",
+                  count: get_member_count(mft, @member_counts)
+                )
+              }
+            >
+              <button
+                phx-click="delete"
+                phx-value-id={mft.id}
+                data-confirm={gettext("Are you sure?")}
+                class="btn btn-ghost btn-xs text-error opacity-50 cursor-not-allowed"
+                aria-label={
+                  gettext("Cannot delete - %{count} member(s) assigned",
+                    count: get_member_count(mft, @member_counts)
+                  )
+                }
+                disabled={true}
+              >
+                <.icon name="hero-trash" class="size-4" />
+              </button>
+            </div>
+            <button
+              :if={get_member_count(mft, @member_counts) == 0}
+              phx-click="delete"
+              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")}
+            >
+              <.icon name="hero-trash" class="size-4" />
+            </button>
+          </:action>
+        </.table>
+
+        <details class="mt-6 card bg-base-200">
+          <summary class="card-body cursor-pointer list-none card-title">
+            <.icon name="hero-information-circle" class="size-5" />
+            {gettext("About Membership Fee Types")}
+          </summary>
+          <div class="card-body pt-0 prose prose-sm max-w-none">
+            <p>
+              {gettext(
+                "Membership fee types define different membership fee structures. Each type has a fixed interval (monthly, quarterly, half-yearly, yearly) that cannot be changed after creation."
+              )}
+            </p>
+            <ul>
+              <li>
+                <strong>{gettext("Name & Amount")}</strong>
+                - {gettext("Can be changed at any time. Amount changes affect future periods only.")}
+              </li>
+              <li>
+                <strong>{gettext("Interval")}</strong>
+                - {gettext(
+                  "Fixed after creation. Members can only switch between types with the same interval."
+                )}
+              </li>
+              <li>
+                <strong>{gettext("Deletion")}</strong>
+                - {gettext("Only possible if no members are assigned to this type.")}
+              </li>
+            </ul>
+          </div>
+        </details>
+      </div>
     </Layouts.app>
     """
   end
@@ -286,6 +456,32 @@ defmodule MvWeb.MembershipFeeSettingsLive do
   defp format_interval(:half_yearly), do: gettext("Half-yearly")
   defp format_interval(:yearly), do: gettext("Yearly")
 
+  defp load_member_counts(fee_types, actor) do
+    fee_type_ids = Enum.map(fee_types, & &1.id)
+
+    members =
+      Member
+      |> Ash.Query.filter(membership_fee_type_id in ^fee_type_ids)
+      |> Ash.Query.select([:membership_fee_type_id])
+      |> Ash.read!(domain: Membership, actor: actor)
+
+    members
+    |> Enum.group_by(& &1.membership_fee_type_id)
+    |> Enum.map(fn {fee_type_id, members_list} -> {fee_type_id, length(members_list)} end)
+    |> Map.new()
+  end
+
+  defp get_member_count(fee_type, member_counts) do
+    Map.get(member_counts, fee_type.id, 0)
+  end
+
+  defp format_error(%Ash.Error.Invalid{} = error) do
+    Enum.map_join(error.errors, ", ", fn e -> e.message end)
+  end
+
+  defp format_error(error) when is_binary(error), do: error
+  defp format_error(_error), do: gettext("An error occurred")
+
   defp assign_form(%{assigns: %{settings: settings}} = socket) do
     form =
       AshPhoenix.Form.for_update(

lib/mv_web/live/membership_fee_type_live/form.ex

@@ -384,7 +384,8 @@ defmodule MvWeb.MembershipFeeTypeLive.Form do
   defp format_interval_value(value), do: to_string(value)
 
   @spec return_path(String.t(), MembershipFeeType.t() | nil) :: String.t()
-  defp return_path("index", _membership_fee_type), do: ~p"/membership_fee_types"
+  defp return_path("index", _membership_fee_type), do: ~p"/membership_fee_settings"
+  defp return_path(_, _), do: ~p"/membership_fee_settings"
 
   @spec get_affected_member_count(String.t(), Mv.Accounts.User.t() | nil) :: non_neg_integer()
   # Checks if amount changed and updates socket assigns accordingly

lib/mv_web/live/membership_fee_type_live/index.ex

@@ -47,7 +47,7 @@ defmodule MvWeb.MembershipFeeTypeLive.Index do
           {gettext("Manage membership fee types for membership fees.")}
         </:subtitle>
         <:actions>
-          <.button variant="primary" navigate={~p"/membership_fee_types/new"}>
+          <.button variant="primary" navigate={~p"/membership_fee_settings/new_fee_type"}>
             <.icon name="hero-plus" /> {gettext("New Membership Fee Type")}
           </.button>
         </:actions>
@@ -79,7 +79,7 @@ defmodule MvWeb.MembershipFeeTypeLive.Index do
 
         <:action :let={mft}>
           <.link
-            navigate={~p"/membership_fee_types/#{mft.id}/edit"}
+            navigate={~p"/membership_fee_settings/#{mft.id}/edit_fee_type"}
             class="btn btn-ghost btn-xs"
             aria-label={gettext("Edit membership fee type")}
           >

lib/mv_web/page_paths.ex

@@ -8,30 +8,30 @@ defmodule MvWeb.PagePaths do
 
   # Sidebar top-level menu paths
   @members "/members"
-  @membership_fee_types "/membership_fee_types"
   @statistics "/statistics"
 
   # Administration submenu paths (all must match router)
   @users "/users"
   @groups "/groups"
   @admin_roles "/admin/roles"
+  @admin_datafields "/admin/datafields"
   @membership_fee_settings "/membership_fee_settings"
+  @admin_import "/admin/import"
   @settings "/settings"
 
   @admin_page_paths [
     @users,
     @groups,
     @admin_roles,
+    @admin_datafields,
     @membership_fee_settings,
+    @admin_import,
     @settings
   ]
 
   @doc "Path for Members index (sidebar and page permission check)."
   def members, do: @members
 
-  @doc "Path for Membership Fee Types index (sidebar and page permission check)."
-  def membership_fee_types, do: @membership_fee_types
-
   @doc "Path for Statistics page (sidebar and page permission check)."
   def statistics, do: @statistics
 
@@ -41,6 +41,8 @@ defmodule MvWeb.PagePaths do
   def users, do: @users
   def groups, do: @groups
   def admin_roles, do: @admin_roles
+  def admin_datafields, do: @admin_datafields
   def membership_fee_settings, do: @membership_fee_settings
+  def admin_import, do: @admin_import
   def settings, do: @settings
 end

lib/mv_web/router.ex

@@ -68,16 +68,13 @@ defmodule MvWeb.Router do
 
       live "/settings", GlobalSettingsLive
 
-      # Membership Fee Settings
+      # Membership Fee Settings (includes fee types list; new/edit under sub-routes)
       live "/membership_fee_settings", MembershipFeeSettingsLive
-
-      # Membership Fee Types Management
-      live "/membership_fee_types", MembershipFeeTypeLive.Index, :index
+      live "/membership_fee_settings/new_fee_type", MembershipFeeTypeLive.Form, :new
+      live "/membership_fee_settings/:id/edit_fee_type", MembershipFeeTypeLive.Form, :edit
 
       # Statistics
       live "/statistics", StatisticsLive, :index
-      live "/membership_fee_types/new", MembershipFeeTypeLive.Form, :new
-      live "/membership_fee_types/:id/edit", MembershipFeeTypeLive.Form, :edit
 
       # Groups Management
       live "/groups", GroupLive.Index, :index
@@ -91,6 +88,9 @@ defmodule MvWeb.Router do
       live "/admin/roles/:id", RoleLive.Show, :show
       live "/admin/roles/:id/edit", RoleLive.Form, :edit
 
+      # Datafields (member fields + custom fields)
+      live "/admin/datafields", DatafieldsLive
+
       # Import (Admin only)
       live "/admin/import", ImportLive