From d10f2ecc90046b62841d9399c4efc4df8c1492fd Mon Sep 17 00:00:00 2001
From: carla <carla@local-it.org>
Date: Tue, 2 Dec 2025 08:45:18 +0100
Subject: [PATCH 1/7] chore: adds migration for member field visibility

---
 ...dd_member_field_visibility_to_settings.exs |  21 +++
 .../repo/custom_fields/20251201115939.json    | 144 ++++++++++++++++++
 .../repo/settings/20251201115939.json         |  79 ++++++++++
 3 files changed, 244 insertions(+)
 create mode 100644 priv/repo/migrations/20251201115939_add_member_field_visibility_to_settings.exs
 create mode 100644 priv/resource_snapshots/repo/custom_fields/20251201115939.json
 create mode 100644 priv/resource_snapshots/repo/settings/20251201115939.json

diff --git a/priv/repo/migrations/20251201115939_add_member_field_visibility_to_settings.exs b/priv/repo/migrations/20251201115939_add_member_field_visibility_to_settings.exs
new file mode 100644
index 0000000..6d278fb
--- /dev/null
+++ b/priv/repo/migrations/20251201115939_add_member_field_visibility_to_settings.exs
@@ -0,0 +1,21 @@
+defmodule Mv.Repo.Migrations.AddMemberFieldVisibilityToSettings do
+  @moduledoc """
+  Updates resources based on their most recent snapshots.
+
+  This file was autogenerated with `mix ash_postgres.generate_migrations`
+  """
+
+  use Ecto.Migration
+
+  def up do
+    alter table(:settings) do
+      add :member_field_visibility, :map
+    end
+  end
+
+  def down do
+    alter table(:settings) do
+      remove :member_field_visibility
+    end
+  end
+end
diff --git a/priv/resource_snapshots/repo/custom_fields/20251201115939.json b/priv/resource_snapshots/repo/custom_fields/20251201115939.json
new file mode 100644
index 0000000..fabd84b
--- /dev/null
+++ b/priv/resource_snapshots/repo/custom_fields/20251201115939.json
@@ -0,0 +1,144 @@
+{
+  "attributes": [
+    {
+      "allow_nil?": false,
+      "default": "fragment(\"gen_random_uuid()\")",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": true,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "id",
+      "type": "uuid"
+    },
+    {
+      "allow_nil?": false,
+      "default": "nil",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "name",
+      "type": "text"
+    },
+    {
+      "allow_nil?": false,
+      "default": "nil",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "slug",
+      "type": "text"
+    },
+    {
+      "allow_nil?": false,
+      "default": "nil",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "value_type",
+      "type": "text"
+    },
+    {
+      "allow_nil?": true,
+      "default": "nil",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "description",
+      "type": "text"
+    },
+    {
+      "allow_nil?": false,
+      "default": "false",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "immutable",
+      "type": "boolean"
+    },
+    {
+      "allow_nil?": false,
+      "default": "false",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "required",
+      "type": "boolean"
+    },
+    {
+      "allow_nil?": false,
+      "default": "true",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "show_in_overview",
+      "type": "boolean"
+    }
+  ],
+  "base_filter": null,
+  "check_constraints": [],
+  "custom_indexes": [],
+  "custom_statements": [],
+  "has_create_action": true,
+  "hash": "D31160C95D3D32BA715D493DE2D2B8D6572E0EC68AE14B928D99975BC8A81542",
+  "identities": [
+    {
+      "all_tenants?": false,
+      "base_filter": null,
+      "index_name": "custom_fields_unique_name_index",
+      "keys": [
+        {
+          "type": "atom",
+          "value": "name"
+        }
+      ],
+      "name": "unique_name",
+      "nils_distinct?": true,
+      "where": null
+    },
+    {
+      "all_tenants?": false,
+      "base_filter": null,
+      "index_name": "custom_fields_unique_slug_index",
+      "keys": [
+        {
+          "type": "atom",
+          "value": "slug"
+        }
+      ],
+      "name": "unique_slug",
+      "nils_distinct?": true,
+      "where": null
+    }
+  ],
+  "multitenancy": {
+    "attribute": null,
+    "global": null,
+    "strategy": null
+  },
+  "repo": "Elixir.Mv.Repo",
+  "schema": null,
+  "table": "custom_fields"
+}
\ No newline at end of file
diff --git a/priv/resource_snapshots/repo/settings/20251201115939.json b/priv/resource_snapshots/repo/settings/20251201115939.json
new file mode 100644
index 0000000..4e635c4
--- /dev/null
+++ b/priv/resource_snapshots/repo/settings/20251201115939.json
@@ -0,0 +1,79 @@
+{
+  "attributes": [
+    {
+      "allow_nil?": false,
+      "default": "fragment(\"gen_random_uuid()\")",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": true,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "id",
+      "type": "uuid"
+    },
+    {
+      "allow_nil?": false,
+      "default": "nil",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "club_name",
+      "type": "text"
+    },
+    {
+      "allow_nil?": true,
+      "default": "nil",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "member_field_visibility",
+      "type": "map"
+    },
+    {
+      "allow_nil?": false,
+      "default": "fragment(\"(now() AT TIME ZONE 'utc')\")",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "inserted_at",
+      "type": "utc_datetime_usec"
+    },
+    {
+      "allow_nil?": false,
+      "default": "fragment(\"(now() AT TIME ZONE 'utc')\")",
+      "generated?": false,
+      "precision": null,
+      "primary_key?": false,
+      "references": null,
+      "scale": null,
+      "size": null,
+      "source": "updated_at",
+      "type": "utc_datetime_usec"
+    }
+  ],
+  "base_filter": null,
+  "check_constraints": [],
+  "custom_indexes": [],
+  "custom_statements": [],
+  "has_create_action": true,
+  "hash": "F2823210AA9E6476074A218375F64CD80E7F9E04EECC4E94D4C7FD31A773C016",
+  "identities": [],
+  "multitenancy": {
+    "attribute": null,
+    "global": null,
+    "strategy": null
+  },
+  "repo": "Elixir.Mv.Repo",
+  "schema": null,
+  "table": "settings"
+}
\ No newline at end of file

From 944b868478d37892a31c4a36516711cee4630633 Mon Sep 17 00:00:00 2001
From: carla <carla@local-it.org>
Date: Tue, 2 Dec 2025 09:22:26 +0100
Subject: [PATCH 2/7] tests: adds tests

---
 .../member_field_visibility_test.exs          | 80 +++++++++++++++++++
 .../index_member_fields_display_test.exs      | 75 +++++++++++++++++
 2 files changed, 155 insertions(+)
 create mode 100644 test/membership/member_field_visibility_test.exs
 create mode 100644 test/mv_web/member_live/index_member_fields_display_test.exs

diff --git a/test/membership/member_field_visibility_test.exs b/test/membership/member_field_visibility_test.exs
new file mode 100644
index 0000000..46bdb74
--- /dev/null
+++ b/test/membership/member_field_visibility_test.exs
@@ -0,0 +1,80 @@
+defmodule Mv.Membership.MemberFieldVisibilityTest do
+  @moduledoc """
+  Tests for member field visibility configuration.
+
+  Tests cover:
+  - Member fields are visible by default (show_in_overview: true)
+  - Member fields can be hidden (show_in_overview: false)
+  - Checking if a specific field is visible
+  - Configuration is stored in Settings resource
+  """
+  use Mv.DataCase, async: true
+
+  alias Mv.Membership.Member
+
+  describe "show_in_overview?/1" do
+    test "returns true for all member fields by default" do
+      # When no settings exist or member_field_visibility is not configured
+      # Test with fields from constants
+      member_fields = Mv.Constants.member_fields()
+
+      Enum.each(member_fields, fn field ->
+        assert Member.show_in_overview?(field) == true,
+               "Field #{field} should be visible by default"
+      end)
+    end
+
+    test "returns false for fields with show_in_overview: false in settings" do
+      # Get or create settings
+      {:ok, settings} = Mv.Membership.get_settings()
+
+      # Use a field that exists in member fields
+      member_fields = Mv.Constants.member_fields()
+      field_to_hide = List.first(member_fields)
+      field_to_show = List.last(member_fields)
+
+      # Update settings to hide a field
+      {:ok, _updated_settings} =
+        Mv.Membership.update_settings(settings, %{
+          member_field_visibility: %{field_to_hide => false}
+        })
+
+      # JSONB may convert atom keys to string keys, so we check via show_in_overview? instead
+      assert Member.show_in_overview?(field_to_hide) == false
+      assert Member.show_in_overview?(field_to_show) == true
+    end
+
+    test "returns true for non-configured fields (default)" do
+      # Get or create settings
+      {:ok, settings} = Mv.Membership.get_settings()
+
+      # Use fields that exist in member fields
+      member_fields = Mv.Constants.member_fields()
+      fields_to_hide = Enum.take(member_fields, 2)
+      fields_to_show = Enum.take(member_fields, -2)
+
+      # Update settings to hide some fields
+      visibility_config =
+        Enum.reduce(fields_to_hide, %{}, fn field, acc ->
+          Map.put(acc, field, false)
+        end)
+
+      {:ok, _updated_settings} =
+        Mv.Membership.update_settings(settings, %{
+          member_field_visibility: visibility_config
+        })
+
+      # Hidden fields should be false
+      Enum.each(fields_to_hide, fn field ->
+        assert Member.show_in_overview?(field) == false,
+               "Field #{field} should be hidden"
+      end)
+
+      # Unconfigured fields should still be true (default)
+      Enum.each(fields_to_show, fn field ->
+        assert Member.show_in_overview?(field) == true,
+               "Field #{field} should be visible by default"
+      end)
+    end
+  end
+end
diff --git a/test/mv_web/member_live/index_member_fields_display_test.exs b/test/mv_web/member_live/index_member_fields_display_test.exs
new file mode 100644
index 0000000..a0e519a
--- /dev/null
+++ b/test/mv_web/member_live/index_member_fields_display_test.exs
@@ -0,0 +1,75 @@
+defmodule MvWeb.MemberLive.IndexMemberFieldsDisplayTest do
+  use MvWeb.ConnCase, async: true
+  import Phoenix.LiveViewTest
+  require Ash.Query
+
+  alias Mv.Membership.Member
+
+  setup do
+    {:ok, member1} =
+      Member
+      |> Ash.Changeset.for_create(:create_member, %{
+        first_name: "Alice",
+        last_name: "Anderson",
+        email: "alice@example.com",
+        street: "Main Street",
+        house_number: "123",
+        postal_code: "12345",
+        city: "Berlin",
+        phone_number: "+49123456789",
+        join_date: ~D[2020-01-15]
+      })
+      |> Ash.create()
+
+    {:ok, member2} =
+      Member
+      |> Ash.Changeset.for_create(:create_member, %{
+        first_name: "Bob",
+        last_name: "Brown",
+        email: "bob@example.com"
+      })
+      |> Ash.create()
+
+    %{
+      member1: member1,
+      member2: member2
+    }
+  end
+
+
+  test "shows multiple members correctly", %{conn: conn, member1: m1, member2: m2} do
+    conn = conn_with_oidc_user(conn)
+    {:ok, _view, html} = live(conn, "/members")
+
+    for m <- [m1, m2], field <- [m.first_name, m.last_name, m.email] do
+      assert html =~ field
+    end
+  end
+
+  test "respects show_in_overview config", %{conn: conn, member1: m} do
+    {:ok, settings} = Mv.Membership.get_settings()
+    fields_to_hide = [:street, :house_number]
+
+    {:ok, _} =
+      Mv.Membership.update_settings(settings, %{
+        member_field_visibility: Map.new(fields_to_hide, &{&1, false})
+      })
+
+    conn = conn_with_oidc_user(conn)
+    {:ok, _view, html} = live(conn, "/members")
+
+    assert html =~ "Email"
+    assert html =~ m.email
+    refute html =~ m.street
+  end
+
+  defp get_field_label(:street), do: "Street"
+  defp get_field_label(:house_number), do: "House Number"
+  defp get_field_label(:postal_code), do: "Postal Code"
+  defp get_field_label(:city), do: "City"
+  defp get_field_label(:phone_number), do: "Phone Number"
+  defp get_field_label(:join_date), do: "Join Date"
+  defp get_field_label(:email), do: "Email"
+  defp get_field_label(:first_name), do: "First name"
+  defp get_field_label(:last_name), do: "Last name"
+end

From 831149f46331032c27b8497908e647651572538d Mon Sep 17 00:00:00 2001
From: carla <carla@local-it.org>
Date: Tue, 2 Dec 2025 09:22:49 +0100
Subject: [PATCH 3/7] chore: adds constant for member_fields

---
 lib/mv/constants.ex | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 lib/mv/constants.ex

diff --git a/lib/mv/constants.ex b/lib/mv/constants.ex
new file mode 100644
index 0000000..0725d60
--- /dev/null
+++ b/lib/mv/constants.ex
@@ -0,0 +1,9 @@
+defmodule Mv.Constants do
+  @moduledoc """
+  Module for defining constants and atoms.
+  """
+
+  @member_fields [:first_name, :last_name, :email, :birth_date, :paid, :phone_number, :join_date, :exit_date, :notes, :city, :street, :house_number, :postal_code]
+
+  def member_fields, do: @member_fields
+end

From 397cbde9d6555c665c4ab0e9443eaa19ff885801 Mon Sep 17 00:00:00 2001
From: carla <carla@local-it.org>
Date: Tue, 2 Dec 2025 09:23:23 +0100
Subject: [PATCH 4/7] feat: adds member visibility settings

---
 lib/membership/member.ex     | 64 ++++++++++++++++++++++++++++
 lib/membership/membership.ex | 34 +++++++++++++++
 lib/membership/setting.ex    | 82 +++++++++++++++++++++++++++++++++++-
 3 files changed, 178 insertions(+), 2 deletions(-)

diff --git a/lib/membership/member.ex b/lib/membership/member.ex
index da69861..f91cb0b 100644
--- a/lib/membership/member.ex
+++ b/lib/membership/member.ex
@@ -434,6 +434,70 @@ defmodule Mv.Membership.Member do
     identity :unique_email, [:email]
   end
 
+  @doc """
+  Checks if a member field should be shown in the overview.
+
+  Reads the visibility configuration from Settings resource. If a field is not
+  configured in settings, it defaults to `true` (visible).
+
+  ## Parameters
+    - `field` - Atom representing the member field name (e.g., `:email`, `:street`)
+
+  ## Returns
+    - `true` if the field should be shown in overview (default)
+    - `false` if the field is configured as hidden in settings
+
+  ## Examples
+
+      iex> Member.show_in_overview?(:email)
+      true
+
+      iex> Member.show_in_overview?(:street)
+      true  # or false if configured in settings
+
+  """
+  @spec show_in_overview?(atom()) :: boolean()
+  def show_in_overview?(field) when is_atom(field) do
+    case Mv.Membership.get_settings() do
+      {:ok, settings} ->
+        visibility_config = settings.member_field_visibility || %{}
+        # Normalize map keys to atoms (JSONB may return string keys)
+        normalized_config = normalize_visibility_config(visibility_config)
+
+        # Get value from normalized config, default to true
+        Map.get(normalized_config, field, true)
+
+      {:error, _} ->
+        # If settings can't be loaded, default to visible
+        true
+    end
+  end
+
+  def show_in_overview?(_), do: true
+
+  # Normalizes visibility config map keys from strings to atoms.
+  # JSONB in PostgreSQL converts atom keys to string keys when storing.
+  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: %{}
+
   @doc """
   Performs fuzzy search on members using PostgreSQL trigram similarity.
 
diff --git a/lib/membership/membership.ex b/lib/membership/membership.ex
index cb3691b..516448c 100644
--- a/lib/membership/membership.ex
+++ b/lib/membership/membership.ex
@@ -53,6 +53,7 @@ defmodule Mv.Membership do
       # It's only used internally as fallback in get_settings/0
       # Settings should be created via seed script
       define :update_settings, action: :update
+      define :update_member_field_visibility, action: :update_member_field_visibility
     end
   end
 
@@ -123,4 +124,37 @@ defmodule Mv.Membership do
     |> Ash.Changeset.for_update(:update, attrs)
     |> Ash.update(domain: __MODULE__)
   end
+
+  @doc """
+  Updates the member field visibility configuration.
+
+  This is a specialized action for updating only the member field visibility settings.
+  It validates that all keys are valid member fields and all values are booleans.
+
+  ## Parameters
+
+    - `settings` - The settings record to update
+    - `visibility_config` - A map of member field names (atoms) to boolean visibility values
+      (e.g., `%{street: false, house_number: false}`)
+
+  ## Returns
+
+    - `{:ok, updated_settings}` - Successfully updated settings
+    - `{:error, error}` - Validation or update error
+
+  ## Examples
+
+      iex> {:ok, settings} = Mv.Membership.get_settings()
+      iex> {:ok, updated} = Mv.Membership.update_member_field_visibility(settings, %{street: false, house_number: false})
+      iex> updated.member_field_visibility
+      %{street: false, house_number: false}
+
+  """
+  def update_member_field_visibility(settings, visibility_config) do
+    settings
+    |> Ash.Changeset.for_update(:update_member_field_visibility, %{
+      member_field_visibility: visibility_config
+    })
+    |> Ash.update(domain: __MODULE__)
+  end
 end
diff --git a/lib/membership/setting.ex b/lib/membership/setting.ex
index 38624dc..0bd9212 100644
--- a/lib/membership/setting.ex
+++ b/lib/membership/setting.ex
@@ -9,6 +9,8 @@ defmodule Mv.Membership.Setting do
 
   ## Attributes
   - `club_name` - The name of the association/club (required, cannot be empty)
+  - `member_field_visibility` - JSONB map storing visibility configuration for member fields
+    (e.g., `%{street: false, house_number: false}`). Fields not in the map default to `true`.
 
   ## Singleton Pattern
   This resource uses a singleton pattern - there should only be one settings record.
@@ -28,6 +30,9 @@ defmodule Mv.Membership.Setting do
 
       # Update club name
       {:ok, updated} = Mv.Membership.update_settings(settings, %{club_name: "New Name"})
+
+      # Update member field visibility
+      {:ok, updated} = Mv.Membership.update_member_field_visibility(settings, %{street: false, house_number: false})
   """
   use Ash.Resource,
     domain: Mv.Membership,
@@ -49,18 +54,86 @@ defmodule Mv.Membership.Setting do
     # Used only as fallback in get_settings/0 if settings don't exist
     # Settings should normally be created via seed script
     create :create do
-      accept [:club_name]
+      accept [:club_name, :member_field_visibility]
     end
 
     update :update do
       primary? true
-      accept [:club_name]
+      require_atomic? false
+      accept [:club_name, :member_field_visibility]
+    end
+
+    update :update_member_field_visibility do
+      description "Updates the visibility configuration for member fields in the overview"
+      require_atomic? false
+      accept [:member_field_visibility]
+
+      change fn changeset, _context ->
+        visibility = Ash.Changeset.get_attribute(changeset, :member_field_visibility)
+
+        if visibility && is_map(visibility) do
+          valid_fields = Mv.Constants.member_fields()
+          # Normalize keys to atoms (JSONB may return string keys)
+          invalid_keys =
+            Enum.filter(visibility, fn {key, _value} ->
+              atom_key =
+                if is_atom(key) do
+                  key
+                else
+                  try do
+                    String.to_existing_atom(key)
+                  rescue
+                    ArgumentError -> nil
+                  end
+                end
+
+              atom_key && atom_key not in valid_fields
+            end)
+            |> Enum.map(fn {key, _value} -> key end)
+
+          if Enum.empty?(invalid_keys) do
+            changeset
+          else
+            Ash.Changeset.add_error(
+              changeset,
+              field: :member_field_visibility,
+              message: "Invalid member field keys: #{inspect(invalid_keys)}"
+            )
+          end
+        else
+          changeset
+        end
+      end
     end
   end
 
   validations do
     validate present(:club_name), on: [:create, :update]
     validate string_length(:club_name, min: 1), on: [:create, :update]
+
+    # Validate that member_field_visibility map contains only boolean values
+    # This allows dynamic fields without hardcoding specific field names
+    validate fn changeset, _context ->
+      visibility = Ash.Changeset.get_attribute(changeset, :member_field_visibility)
+
+      if visibility && is_map(visibility) do
+        invalid_entries =
+          Enum.filter(visibility, fn {_key, value} ->
+            not is_boolean(value)
+          end)
+
+        if Enum.empty?(invalid_entries) do
+          :ok
+        else
+          {:error,
+           field: :member_field_visibility,
+           message: "All values in member_field_visibility must be booleans"}
+        end
+      else
+        :ok
+      end
+    end,
+    on: [:create, :update]
   end
 
   attributes do
@@ -75,6 +148,11 @@ defmodule Mv.Membership.Setting do
         min_length: 1
       ]
 
+    attribute :member_field_visibility, :map,
+      allow_nil?: true,
+      public?: true,
+      description: "Configuration for member field visibility in overview (JSONB map). Keys are member field names (atoms), values are booleans."
+
     timestamps()
   end
 end

From e81aecce48a90e6bef4d282f737024c9e8ea2ba1 Mon Sep 17 00:00:00 2001
From: carla <carla@local-it.org>
Date: Tue, 2 Dec 2025 09:23:37 +0100
Subject: [PATCH 5/7] feat: adds member visibility to live view

---
 lib/mv_web/live/member_live/index.ex        | 37 ++++++++++++++++
 lib/mv_web/live/member_live/index.html.heex | 49 ++++++---------------
 2 files changed, 51 insertions(+), 35 deletions(-)

diff --git a/lib/mv_web/live/member_live/index.ex b/lib/mv_web/live/member_live/index.ex
index b0a9bc2..830cfd9 100644
--- a/lib/mv_web/live/member_live/index.ex
+++ b/lib/mv_web/live/member_live/index.ex
@@ -61,6 +61,8 @@ defmodule MvWeb.MemberLive.Index do
       |> assign_new(:sort_order, fn -> :asc end)
       |> assign(:selected_members, MapSet.new())
       |> assign(:custom_fields_visible, custom_fields_visible)
+      |> assign(:member_field_configurations, get_member_field_configurations())
+      |> assign(:member_fields_visible, get_visible_member_fields())
 
     # We call handle params to use the query from the URL
     {:ok, socket}
@@ -796,4 +798,39 @@ defmodule MvWeb.MemberLive.Index do
       "#{name} <#{member.email}>"
     end
   end
+
+  # Gets the configuration for all member fields with their show_in_overview values.
+  #
+  # Reads the visibility configuration from Settings and returns a map with all member fields
+  # and their show_in_overview values (true or false). Fields not configured in settings
+  # default to true.
+  #
+  # Returns a map: %{field_name => show_in_overview}
+  #
+  # This can be used for:
+  # - Rendering the overview (filtering visible fields)
+  # - UI configuration dropdowns (showing all fields with their current state)
+  # - Dynamic field management
+  #
+  # Fields are read from the global Constants module.
+  defp get_member_field_configurations do
+    # Get all eligible fields from the global constants
+    all_fields = Mv.Constants.member_fields()
+
+    Enum.reduce(all_fields, %{}, fn field, acc ->
+      show_in_overview = Mv.Membership.Member.show_in_overview?(field)
+      Map.put(acc, field, show_in_overview)
+    end)
+  end
+
+  # Gets the list of member fields that should be visible in the overview.
+  #
+  # Filters the member field configurations to return only fields with show_in_overview: true.
+  #
+  # Returns a list of atoms representing visible member field names.
+  defp get_visible_member_fields do
+    get_member_field_configurations()
+    |> Enum.filter(fn {_field, show_in_overview} -> show_in_overview end)
+    |> Enum.map(fn {field, _show_in_overview} -> field end)
+  end
 end
diff --git a/lib/mv_web/live/member_live/index.html.heex b/lib/mv_web/live/member_live/index.html.heex
index 633dd9c..41536e3 100644
--- a/lib/mv_web/live/member_live/index.html.heex
+++ b/lib/mv_web/live/member_live/index.html.heex
@@ -87,9 +87,7 @@
     >
       {member.first_name} {member.last_name}
     </:col>
-    <:col
-      :let={member}
-      label={
+    <:col :if={:email in @member_fields_visible} :let={member} label={
         ~H"""
         <.live_component
           module={MvWeb.Components.SortHeaderComponent}
@@ -100,13 +98,10 @@
           sort_order={@sort_order}
         />
         """
-      }
-    >
+      }>
       {member.email}
     </:col>
-    <:col
-      :let={member}
-      label={
+    <:col :if={:street in @member_fields_visible} :let={member} label={
         ~H"""
         <.live_component
           module={MvWeb.Components.SortHeaderComponent}
@@ -117,13 +112,10 @@
           sort_order={@sort_order}
         />
         """
-      }
-    >
+      }>
       {member.street}
     </:col>
-    <:col
-      :let={member}
-      label={
+    <:col :if={:house_number in @member_fields_visible} :let={member} label={
         ~H"""
         <.live_component
           module={MvWeb.Components.SortHeaderComponent}
@@ -134,13 +126,10 @@
           sort_order={@sort_order}
         />
         """
-      }
-    >
+      }>
       {member.house_number}
     </:col>
-    <:col
-      :let={member}
-      label={
+    <:col :if={:postal_code in @member_fields_visible} :let={member} label={
         ~H"""
         <.live_component
           module={MvWeb.Components.SortHeaderComponent}
@@ -151,13 +140,10 @@
           sort_order={@sort_order}
         />
         """
-      }
-    >
+      }>
       {member.postal_code}
     </:col>
-    <:col
-      :let={member}
-      label={
+    <:col :if={:city in @member_fields_visible} :let={member} label={
         ~H"""
         <.live_component
           module={MvWeb.Components.SortHeaderComponent}
@@ -168,13 +154,10 @@
           sort_order={@sort_order}
         />
         """
-      }
-    >
+      }>
       {member.city}
     </:col>
-    <:col
-      :let={member}
-      label={
+    <:col :if={:phone_number in @member_fields_visible} :let={member} label={
         ~H"""
         <.live_component
           module={MvWeb.Components.SortHeaderComponent}
@@ -185,13 +168,10 @@
           sort_order={@sort_order}
         />
         """
-      }
-    >
+      }>
       {member.phone_number}
     </:col>
-    <:col
-      :let={member}
-      label={
+    <:col :if={:join_date in @member_fields_visible} :let={member} label={
         ~H"""
         <.live_component
           module={MvWeb.Components.SortHeaderComponent}
@@ -202,8 +182,7 @@
           sort_order={@sort_order}
         />
         """
-      }
-    >
+      }>
       {member.join_date}
     </:col>
     <:action :let={member}>

From dce2053ce7ca07755f507437a9c83700ea29a3b1 Mon Sep 17 00:00:00 2001
From: carla <carla@local-it.org>
Date: Tue, 2 Dec 2025 10:02:52 +0100
Subject: [PATCH 6/7] formatting and refactor member fields constant

---
 lib/membership/member.ex                      | 36 ++-----
 lib/membership/setting.ex                     | 39 ++++----
 lib/mv/constants.ex                           | 16 +++-
 lib/mv_web/live/member_live/index.ex          | 95 +++++++++++++------
 lib/mv_web/live/member_live/index.html.heex   | 56 ++++++++---
 .../index_member_fields_display_test.exs      | 11 ---
 6 files changed, 149 insertions(+), 104 deletions(-)

diff --git a/lib/membership/member.ex b/lib/membership/member.ex
index f91cb0b..31a825b 100644
--- a/lib/membership/member.ex
+++ b/lib/membership/member.ex
@@ -42,6 +42,10 @@ defmodule Mv.Membership.Member do
   @member_search_limit 10
   @default_similarity_threshold 0.2
 
+  # Use constants from Mv.Constants for member fields
+  # This ensures consistency across the codebase
+  @member_fields Mv.Constants.member_fields()
+
   postgres do
     table "members"
     repo Mv.Repo
@@ -58,21 +62,7 @@ defmodule Mv.Membership.Member do
       # user_id is NOT in accept list to prevent direct foreign key manipulation
       argument :user, :map, allow_nil?: true
 
-      accept [
-        :first_name,
-        :last_name,
-        :email,
-        :birth_date,
-        :paid,
-        :phone_number,
-        :join_date,
-        :exit_date,
-        :notes,
-        :city,
-        :street,
-        :house_number,
-        :postal_code
-      ]
+      accept @member_fields
 
       change manage_relationship(:custom_field_values, type: :create)
 
@@ -105,21 +95,7 @@ defmodule Mv.Membership.Member do
       # user_id is NOT in accept list to prevent direct foreign key manipulation
       argument :user, :map, allow_nil?: true
 
-      accept [
-        :first_name,
-        :last_name,
-        :email,
-        :birth_date,
-        :paid,
-        :phone_number,
-        :join_date,
-        :exit_date,
-        :notes,
-        :city,
-        :street,
-        :house_number,
-        :postal_code
-      ]
+      accept @member_fields
 
       change manage_relationship(:custom_field_values, on_match: :update, on_no_match: :create)
 
diff --git a/lib/membership/setting.ex b/lib/membership/setting.ex
index 0bd9212..3405a3f 100644
--- a/lib/membership/setting.ex
+++ b/lib/membership/setting.ex
@@ -114,26 +114,26 @@ defmodule Mv.Membership.Setting do
     # Validate that member_field_visibility map contains only boolean values
     # This allows dynamic fields without hardcoding specific field names
     validate fn changeset, _context ->
-      visibility = Ash.Changeset.get_attribute(changeset, :member_field_visibility)
+               visibility = Ash.Changeset.get_attribute(changeset, :member_field_visibility)
 
-      if visibility && is_map(visibility) do
-        invalid_entries =
-          Enum.filter(visibility, fn {_key, value} ->
-            not is_boolean(value)
-          end)
+               if visibility && is_map(visibility) do
+                 invalid_entries =
+                   Enum.filter(visibility, fn {_key, value} ->
+                     not is_boolean(value)
+                   end)
 
-        if Enum.empty?(invalid_entries) do
-          :ok
-        else
-          {:error,
-           field: :member_field_visibility,
-           message: "All values in member_field_visibility must be booleans"}
-        end
-      else
-        :ok
-      end
-    end,
-    on: [:create, :update]
+                 if Enum.empty?(invalid_entries) do
+                   :ok
+                 else
+                   {:error,
+                    field: :member_field_visibility,
+                    message: "All values in member_field_visibility must be booleans"}
+                 end
+               else
+                 :ok
+               end
+             end,
+             on: [:create, :update]
   end
 
   attributes do
@@ -151,7 +151,8 @@ defmodule Mv.Membership.Setting do
     attribute :member_field_visibility, :map,
       allow_nil?: true,
       public?: true,
-      description: "Configuration for member field visibility in overview (JSONB map). Keys are member field names (atoms), values are booleans."
+      description:
+        "Configuration for member field visibility in overview (JSONB map). Keys are member field names (atoms), values are booleans."
 
     timestamps()
   end
diff --git a/lib/mv/constants.ex b/lib/mv/constants.ex
index 0725d60..cd8d3a4 100644
--- a/lib/mv/constants.ex
+++ b/lib/mv/constants.ex
@@ -3,7 +3,21 @@ defmodule Mv.Constants do
   Module for defining constants and atoms.
   """
 
-  @member_fields [:first_name, :last_name, :email, :birth_date, :paid, :phone_number, :join_date, :exit_date, :notes, :city, :street, :house_number, :postal_code]
+  @member_fields [
+    :first_name,
+    :last_name,
+    :email,
+    :birth_date,
+    :paid,
+    :phone_number,
+    :join_date,
+    :exit_date,
+    :notes,
+    :city,
+    :street,
+    :house_number,
+    :postal_code
+  ]
 
   def member_fields, do: @member_fields
 end
diff --git a/lib/mv_web/live/member_live/index.ex b/lib/mv_web/live/member_live/index.ex
index 830cfd9..a15063e 100644
--- a/lib/mv_web/live/member_live/index.ex
+++ b/lib/mv_web/live/member_live/index.ex
@@ -30,11 +30,18 @@ defmodule MvWeb.MemberLive.Index do
   require Ash.Query
   import Ash.Expr
 
+  alias Mv.Membership
   alias MvWeb.MemberLive.Index.Formatter
 
   # Prefix used in sort field names for custom fields (e.g., "custom_field_<id>")
   @custom_field_prefix "custom_field_"
 
+  # Member fields that are loaded for the overview
+  # Uses constants from Mv.Constants to ensure consistency
+  # Note: :id is always included for member identification
+  # All member fields are loaded, but visibility is controlled via settings
+  @overview_fields [:id | Mv.Constants.member_fields()]
+
   @doc """
   Initializes the LiveView state.
 
@@ -53,6 +60,14 @@ defmodule MvWeb.MemberLive.Index do
       |> Ash.Query.sort(name: :asc)
       |> Ash.read!()
 
+    # Load settings once to avoid N+1 queries
+    settings =
+      case Membership.get_settings() do
+        {:ok, s} -> s
+        # Fallback if settings can't be loaded
+        {:error, _} -> %{member_field_visibility: %{}}
+      end
+
     socket =
       socket
       |> assign(:page_title, gettext("Members"))
@@ -61,8 +76,8 @@ defmodule MvWeb.MemberLive.Index do
       |> assign_new(:sort_order, fn -> :asc end)
       |> assign(:selected_members, MapSet.new())
       |> assign(:custom_fields_visible, custom_fields_visible)
-      |> assign(:member_field_configurations, get_member_field_configurations())
-      |> assign(:member_fields_visible, get_visible_member_fields())
+      |> assign(:member_field_configurations, get_member_field_configurations(settings))
+      |> assign(:member_fields_visible, get_visible_member_fields(settings))
 
     # We call handle params to use the query from the URL
     {:ok, socket}
@@ -360,18 +375,7 @@ defmodule MvWeb.MemberLive.Index do
     query =
       Mv.Membership.Member
       |> Ash.Query.new()
-      |> Ash.Query.select([
-        :id,
-        :first_name,
-        :last_name,
-        :email,
-        :street,
-        :house_number,
-        :postal_code,
-        :city,
-        :phone_number,
-        :join_date
-      ])
+      |> Ash.Query.select(@overview_fields)
 
     # Load custom field values for visible custom fields
     custom_field_ids_list = Enum.map(socket.assigns.custom_fields_visible, & &1.id)
@@ -480,18 +484,13 @@ defmodule MvWeb.MemberLive.Index do
   defp maybe_sort(query, _, _, _), do: {query, false}
 
   # Validate that a field is sortable
+  # Uses member fields from constants, but excludes fields that don't make sense to sort
+  # (e.g., :notes is too long, :paid is boolean and not very useful for sorting)
   defp valid_sort_field?(field) when is_atom(field) do
-    valid_fields = [
-      :first_name,
-      :last_name,
-      :email,
-      :street,
-      :house_number,
-      :postal_code,
-      :city,
-      :phone_number,
-      :join_date
-    ]
+    # All member fields are sortable, but we exclude some that don't make sense
+    # :id is not in member_fields, but we don't want to sort by it anyway
+    non_sortable_fields = [:notes, :paid]
+    valid_fields = Mv.Constants.member_fields() -- non_sortable_fields
 
     field in valid_fields or custom_field_sort?(field)
   end
@@ -805,6 +804,12 @@ defmodule MvWeb.MemberLive.Index do
   # and their show_in_overview values (true or false). Fields not configured in settings
   # default to true.
   #
+  # Performance: This function uses the already-loaded settings to avoid N+1 queries.
+  # Settings should be loaded once in mount/3 and passed to this function.
+  #
+  # Parameters:
+  #   - `settings` - The settings struct loaded from the database
+  #
   # Returns a map: %{field_name => show_in_overview}
   #
   # This can be used for:
@@ -813,12 +818,16 @@ defmodule MvWeb.MemberLive.Index do
   # - Dynamic field management
   #
   # Fields are read from the global Constants module.
-  defp get_member_field_configurations do
+  @spec get_member_field_configurations(map()) :: %{atom() => boolean()}
+  defp get_member_field_configurations(settings) do
     # Get all eligible fields from the global constants
     all_fields = Mv.Constants.member_fields()
 
+    # Normalize visibility config (JSONB may return string keys)
+    visibility_config = normalize_visibility_config(settings.member_field_visibility || %{})
+
     Enum.reduce(all_fields, %{}, fn field, acc ->
-      show_in_overview = Mv.Membership.Member.show_in_overview?(field)
+      show_in_overview = Map.get(visibility_config, field, true)
       Map.put(acc, field, show_in_overview)
     end)
   end
@@ -827,10 +836,38 @@ defmodule MvWeb.MemberLive.Index do
   #
   # Filters the member field configurations to return only fields with show_in_overview: true.
   #
+  # Parameters:
+  #   - `settings` - The settings struct loaded from the database
+  #
   # Returns a list of atoms representing visible member field names.
-  defp get_visible_member_fields do
-    get_member_field_configurations()
+  @spec get_visible_member_fields(map()) :: [atom()]
+  defp get_visible_member_fields(settings) do
+    get_member_field_configurations(settings)
     |> Enum.filter(fn {_field, show_in_overview} -> show_in_overview end)
     |> Enum.map(fn {field, _show_in_overview} -> field end)
   end
+
+  # Normalizes visibility config map keys from strings to atoms.
+  # JSONB in PostgreSQL converts atom keys to string keys when storing.
+  # This is a local helper to avoid N+1 queries by reusing the normalization logic.
+  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: %{}
 end
diff --git a/lib/mv_web/live/member_live/index.html.heex b/lib/mv_web/live/member_live/index.html.heex
index 41536e3..55b0a20 100644
--- a/lib/mv_web/live/member_live/index.html.heex
+++ b/lib/mv_web/live/member_live/index.html.heex
@@ -87,7 +87,10 @@
     >
       {member.first_name} {member.last_name}
     </:col>
-    <:col :if={:email in @member_fields_visible} :let={member} label={
+    <:col
+      :let={member}
+      :if={:email in @member_fields_visible}
+      label={
         ~H"""
         <.live_component
           module={MvWeb.Components.SortHeaderComponent}
@@ -98,10 +101,14 @@
           sort_order={@sort_order}
         />
         """
-      }>
+      }
+    >
       {member.email}
     </:col>
-    <:col :if={:street in @member_fields_visible} :let={member} label={
+    <:col
+      :let={member}
+      :if={:street in @member_fields_visible}
+      label={
         ~H"""
         <.live_component
           module={MvWeb.Components.SortHeaderComponent}
@@ -112,10 +119,14 @@
           sort_order={@sort_order}
         />
         """
-      }>
+      }
+    >
       {member.street}
     </:col>
-    <:col :if={:house_number in @member_fields_visible} :let={member} label={
+    <:col
+      :let={member}
+      :if={:house_number in @member_fields_visible}
+      label={
         ~H"""
         <.live_component
           module={MvWeb.Components.SortHeaderComponent}
@@ -126,10 +137,14 @@
           sort_order={@sort_order}
         />
         """
-      }>
+      }
+    >
       {member.house_number}
     </:col>
-    <:col :if={:postal_code in @member_fields_visible} :let={member} label={
+    <:col
+      :let={member}
+      :if={:postal_code in @member_fields_visible}
+      label={
         ~H"""
         <.live_component
           module={MvWeb.Components.SortHeaderComponent}
@@ -140,10 +155,14 @@
           sort_order={@sort_order}
         />
         """
-      }>
+      }
+    >
       {member.postal_code}
     </:col>
-    <:col :if={:city in @member_fields_visible} :let={member} label={
+    <:col
+      :let={member}
+      :if={:city in @member_fields_visible}
+      label={
         ~H"""
         <.live_component
           module={MvWeb.Components.SortHeaderComponent}
@@ -154,10 +173,14 @@
           sort_order={@sort_order}
         />
         """
-      }>
+      }
+    >
       {member.city}
     </:col>
-    <:col :if={:phone_number in @member_fields_visible} :let={member} label={
+    <:col
+      :let={member}
+      :if={:phone_number in @member_fields_visible}
+      label={
         ~H"""
         <.live_component
           module={MvWeb.Components.SortHeaderComponent}
@@ -168,10 +191,14 @@
           sort_order={@sort_order}
         />
         """
-      }>
+      }
+    >
       {member.phone_number}
     </:col>
-    <:col :if={:join_date in @member_fields_visible} :let={member} label={
+    <:col
+      :let={member}
+      :if={:join_date in @member_fields_visible}
+      label={
         ~H"""
         <.live_component
           module={MvWeb.Components.SortHeaderComponent}
@@ -182,7 +209,8 @@
           sort_order={@sort_order}
         />
         """
-      }>
+      }
+    >
       {member.join_date}
     </:col>
     <:action :let={member}>
diff --git a/test/mv_web/member_live/index_member_fields_display_test.exs b/test/mv_web/member_live/index_member_fields_display_test.exs
index a0e519a..c4a5b9f 100644
--- a/test/mv_web/member_live/index_member_fields_display_test.exs
+++ b/test/mv_web/member_live/index_member_fields_display_test.exs
@@ -36,7 +36,6 @@ defmodule MvWeb.MemberLive.IndexMemberFieldsDisplayTest do
     }
   end
 
-
   test "shows multiple members correctly", %{conn: conn, member1: m1, member2: m2} do
     conn = conn_with_oidc_user(conn)
     {:ok, _view, html} = live(conn, "/members")
@@ -62,14 +61,4 @@ defmodule MvWeb.MemberLive.IndexMemberFieldsDisplayTest do
     assert html =~ m.email
     refute html =~ m.street
   end
-
-  defp get_field_label(:street), do: "Street"
-  defp get_field_label(:house_number), do: "House Number"
-  defp get_field_label(:postal_code), do: "Postal Code"
-  defp get_field_label(:city), do: "City"
-  defp get_field_label(:phone_number), do: "Phone Number"
-  defp get_field_label(:join_date), do: "Join Date"
-  defp get_field_label(:email), do: "Email"
-  defp get_field_label(:first_name), do: "First name"
-  defp get_field_label(:last_name), do: "Last name"
 end

From 13f77b5c0ae190dac2ce7de4ee9e4fc74d357b6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Eppl=C3=A9e?= <hello@rafa.ee>
Date: Tue, 2 Dec 2025 12:16:02 +0100
Subject: [PATCH 7/7] Refactor column visibility logic

---
 lib/membership/member.ex                      | 64 ----------------
 lib/membership/membership.ex                  |  8 +-
 lib/membership/setting.ex                     | 75 +++++++------------
 lib/mv_web/live/member_live/index.ex          | 68 +++--------------
 .../member_field_visibility_test.exs          | 66 ----------------
 .../index_member_fields_display_test.exs      |  2 +-
 6 files changed, 43 insertions(+), 240 deletions(-)

diff --git a/lib/membership/member.ex b/lib/membership/member.ex
index 31a825b..bcd505e 100644
--- a/lib/membership/member.ex
+++ b/lib/membership/member.ex
@@ -410,70 +410,6 @@ defmodule Mv.Membership.Member do
     identity :unique_email, [:email]
   end
 
-  @doc """
-  Checks if a member field should be shown in the overview.
-
-  Reads the visibility configuration from Settings resource. If a field is not
-  configured in settings, it defaults to `true` (visible).
-
-  ## Parameters
-    - `field` - Atom representing the member field name (e.g., `:email`, `:street`)
-
-  ## Returns
-    - `true` if the field should be shown in overview (default)
-    - `false` if the field is configured as hidden in settings
-
-  ## Examples
-
-      iex> Member.show_in_overview?(:email)
-      true
-
-      iex> Member.show_in_overview?(:street)
-      true  # or false if configured in settings
-
-  """
-  @spec show_in_overview?(atom()) :: boolean()
-  def show_in_overview?(field) when is_atom(field) do
-    case Mv.Membership.get_settings() do
-      {:ok, settings} ->
-        visibility_config = settings.member_field_visibility || %{}
-        # Normalize map keys to atoms (JSONB may return string keys)
-        normalized_config = normalize_visibility_config(visibility_config)
-
-        # Get value from normalized config, default to true
-        Map.get(normalized_config, field, true)
-
-      {:error, _} ->
-        # If settings can't be loaded, default to visible
-        true
-    end
-  end
-
-  def show_in_overview?(_), do: true
-
-  # Normalizes visibility config map keys from strings to atoms.
-  # JSONB in PostgreSQL converts atom keys to string keys when storing.
-  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: %{}
-
   @doc """
   Performs fuzzy search on members using PostgreSQL trigram similarity.
 
diff --git a/lib/membership/membership.ex b/lib/membership/membership.ex
index 516448c..f5a708b 100644
--- a/lib/membership/membership.ex
+++ b/lib/membership/membership.ex
@@ -134,8 +134,8 @@ defmodule Mv.Membership do
   ## Parameters
 
     - `settings` - The settings record to update
-    - `visibility_config` - A map of member field names (atoms) to boolean visibility values
-      (e.g., `%{street: false, house_number: false}`)
+    - `visibility_config` - A map of member field names (strings) to boolean visibility values
+      (e.g., `%{"street" => false, "house_number" => false}`)
 
   ## Returns
 
@@ -145,9 +145,9 @@ defmodule Mv.Membership do
   ## Examples
 
       iex> {:ok, settings} = Mv.Membership.get_settings()
-      iex> {:ok, updated} = Mv.Membership.update_member_field_visibility(settings, %{street: false, house_number: false})
+      iex> {:ok, updated} = Mv.Membership.update_member_field_visibility(settings, %{"street" => false, "house_number" => false})
       iex> updated.member_field_visibility
-      %{street: false, house_number: false}
+      %{"street" => false, "house_number" => false}
 
   """
   def update_member_field_visibility(settings, visibility_config) do
diff --git a/lib/membership/setting.ex b/lib/membership/setting.ex
index 3405a3f..52c0328 100644
--- a/lib/membership/setting.ex
+++ b/lib/membership/setting.ex
@@ -10,7 +10,7 @@ defmodule Mv.Membership.Setting do
   ## Attributes
   - `club_name` - The name of the association/club (required, cannot be empty)
   - `member_field_visibility` - JSONB map storing visibility configuration for member fields
-    (e.g., `%{street: false, house_number: false}`). Fields not in the map default to `true`.
+    (e.g., `%{"street" => false, "house_number" => false}`). Fields not in the map default to `true`.
 
   ## Singleton Pattern
   This resource uses a singleton pattern - there should only be one settings record.
@@ -32,7 +32,7 @@ defmodule Mv.Membership.Setting do
       {:ok, updated} = Mv.Membership.update_settings(settings, %{club_name: "New Name"})
 
       # Update member field visibility
-      {:ok, updated} = Mv.Membership.update_member_field_visibility(settings, %{street: false, house_number: false})
+      {:ok, updated} = Mv.Membership.update_member_field_visibility(settings, %{"street" => false, "house_number" => false})
   """
   use Ash.Resource,
     domain: Mv.Membership,
@@ -67,43 +67,6 @@ defmodule Mv.Membership.Setting do
       description "Updates the visibility configuration for member fields in the overview"
       require_atomic? false
       accept [:member_field_visibility]
-
-      change fn changeset, _context ->
-        visibility = Ash.Changeset.get_attribute(changeset, :member_field_visibility)
-
-        if visibility && is_map(visibility) do
-          valid_fields = Mv.Constants.member_fields()
-          # Normalize keys to atoms (JSONB may return string keys)
-          invalid_keys =
-            Enum.filter(visibility, fn {key, _value} ->
-              atom_key =
-                if is_atom(key) do
-                  key
-                else
-                  try do
-                    String.to_existing_atom(key)
-                  rescue
-                    ArgumentError -> nil
-                  end
-                end
-
-              atom_key && atom_key not in valid_fields
-            end)
-            |> Enum.map(fn {key, _value} -> key end)
-
-          if Enum.empty?(invalid_keys) do
-            changeset
-          else
-            Ash.Changeset.add_error(
-              changeset,
-              field: :member_field_visibility,
-              message: "Invalid member field keys: #{inspect(invalid_keys)}"
-            )
-          end
-        else
-          changeset
-        end
-      end
     end
   end
 
@@ -111,23 +74,39 @@ defmodule Mv.Membership.Setting do
     validate present(:club_name), on: [:create, :update]
     validate string_length(:club_name, min: 1), on: [:create, :update]
 
-    # Validate that member_field_visibility map contains only boolean values
-    # This allows dynamic fields without hardcoding specific field names
+    # Validate member_field_visibility map structure and content
     validate fn changeset, _context ->
                visibility = Ash.Changeset.get_attribute(changeset, :member_field_visibility)
 
                if visibility && is_map(visibility) do
-                 invalid_entries =
+                 # Validate all values are booleans
+                 invalid_values =
                    Enum.filter(visibility, fn {_key, value} ->
                      not is_boolean(value)
                    end)
 
-                 if Enum.empty?(invalid_entries) do
-                   :ok
-                 else
-                   {:error,
-                    field: :member_field_visibility,
-                    message: "All values in member_field_visibility must be booleans"}
+                 # Validate all keys are valid member fields
+                 valid_field_strings = Mv.Constants.member_fields() |> Enum.map(&Atom.to_string/1)
+
+                 invalid_keys =
+                   Enum.filter(visibility, fn {key, _value} ->
+                     key not in valid_field_strings
+                   end)
+                   |> Enum.map(fn {key, _value} -> key end)
+
+                 cond do
+                   not Enum.empty?(invalid_values) ->
+                     {:error,
+                      field: :member_field_visibility,
+                      message: "All values in member_field_visibility must be booleans"}
+
+                   not Enum.empty?(invalid_keys) ->
+                     {:error,
+                      field: :member_field_visibility,
+                      message: "Invalid member field keys: #{inspect(invalid_keys)}"}
+
+                   true ->
+                     :ok
                  end
                else
                  :ok
diff --git a/lib/mv_web/live/member_live/index.ex b/lib/mv_web/live/member_live/index.ex
index a15063e..4d444b9 100644
--- a/lib/mv_web/live/member_live/index.ex
+++ b/lib/mv_web/live/member_live/index.ex
@@ -76,7 +76,6 @@ defmodule MvWeb.MemberLive.Index do
       |> assign_new(:sort_order, fn -> :asc end)
       |> assign(:selected_members, MapSet.new())
       |> assign(:custom_fields_visible, custom_fields_visible)
-      |> assign(:member_field_configurations, get_member_field_configurations(settings))
       |> assign(:member_fields_visible, get_visible_member_fields(settings))
 
     # We call handle params to use the query from the URL
@@ -798,11 +797,10 @@ defmodule MvWeb.MemberLive.Index do
     end
   end
 
-  # Gets the configuration for all member fields with their show_in_overview values.
+  # Gets the list of member fields that should be visible in the overview.
   #
-  # Reads the visibility configuration from Settings and returns a map with all member fields
-  # and their show_in_overview values (true or false). Fields not configured in settings
-  # default to true.
+  # Reads the visibility configuration from Settings and returns only the fields
+  # where show_in_overview is true. Fields not configured in settings default to true.
   #
   # Performance: This function uses the already-loaded settings to avoid N+1 queries.
   # Settings should be loaded once in mount/3 and passed to this function.
@@ -810,64 +808,20 @@ defmodule MvWeb.MemberLive.Index do
   # Parameters:
   #   - `settings` - The settings struct loaded from the database
   #
-  # Returns a map: %{field_name => show_in_overview}
-  #
-  # This can be used for:
-  # - Rendering the overview (filtering visible fields)
-  # - UI configuration dropdowns (showing all fields with their current state)
-  # - Dynamic field management
+  # Returns a list of atoms representing visible member field names.
   #
   # Fields are read from the global Constants module.
-  @spec get_member_field_configurations(map()) :: %{atom() => boolean()}
-  defp get_member_field_configurations(settings) do
+  @spec get_visible_member_fields(map()) :: [atom()]
+  defp get_visible_member_fields(settings) do
     # Get all eligible fields from the global constants
     all_fields = Mv.Constants.member_fields()
 
-    # Normalize visibility config (JSONB may return string keys)
-    visibility_config = normalize_visibility_config(settings.member_field_visibility || %{})
+    # JSONB stores keys as strings
+    visibility_config = settings.member_field_visibility || %{}
 
-    Enum.reduce(all_fields, %{}, fn field, acc ->
-      show_in_overview = Map.get(visibility_config, field, true)
-      Map.put(acc, field, show_in_overview)
+    # Filter to only return visible fields
+    Enum.filter(all_fields, fn field ->
+      Map.get(visibility_config, Atom.to_string(field), true)
     end)
   end
-
-  # Gets the list of member fields that should be visible in the overview.
-  #
-  # Filters the member field configurations to return only fields with show_in_overview: true.
-  #
-  # Parameters:
-  #   - `settings` - The settings struct loaded from the database
-  #
-  # Returns a list of atoms representing visible member field names.
-  @spec get_visible_member_fields(map()) :: [atom()]
-  defp get_visible_member_fields(settings) do
-    get_member_field_configurations(settings)
-    |> Enum.filter(fn {_field, show_in_overview} -> show_in_overview end)
-    |> Enum.map(fn {field, _show_in_overview} -> field end)
-  end
-
-  # Normalizes visibility config map keys from strings to atoms.
-  # JSONB in PostgreSQL converts atom keys to string keys when storing.
-  # This is a local helper to avoid N+1 queries by reusing the normalization logic.
-  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: %{}
 end
diff --git a/test/membership/member_field_visibility_test.exs b/test/membership/member_field_visibility_test.exs
index 46bdb74..9963169 100644
--- a/test/membership/member_field_visibility_test.exs
+++ b/test/membership/member_field_visibility_test.exs
@@ -11,70 +11,4 @@ defmodule Mv.Membership.MemberFieldVisibilityTest do
   use Mv.DataCase, async: true
 
   alias Mv.Membership.Member
-
-  describe "show_in_overview?/1" do
-    test "returns true for all member fields by default" do
-      # When no settings exist or member_field_visibility is not configured
-      # Test with fields from constants
-      member_fields = Mv.Constants.member_fields()
-
-      Enum.each(member_fields, fn field ->
-        assert Member.show_in_overview?(field) == true,
-               "Field #{field} should be visible by default"
-      end)
-    end
-
-    test "returns false for fields with show_in_overview: false in settings" do
-      # Get or create settings
-      {:ok, settings} = Mv.Membership.get_settings()
-
-      # Use a field that exists in member fields
-      member_fields = Mv.Constants.member_fields()
-      field_to_hide = List.first(member_fields)
-      field_to_show = List.last(member_fields)
-
-      # Update settings to hide a field
-      {:ok, _updated_settings} =
-        Mv.Membership.update_settings(settings, %{
-          member_field_visibility: %{field_to_hide => false}
-        })
-
-      # JSONB may convert atom keys to string keys, so we check via show_in_overview? instead
-      assert Member.show_in_overview?(field_to_hide) == false
-      assert Member.show_in_overview?(field_to_show) == true
-    end
-
-    test "returns true for non-configured fields (default)" do
-      # Get or create settings
-      {:ok, settings} = Mv.Membership.get_settings()
-
-      # Use fields that exist in member fields
-      member_fields = Mv.Constants.member_fields()
-      fields_to_hide = Enum.take(member_fields, 2)
-      fields_to_show = Enum.take(member_fields, -2)
-
-      # Update settings to hide some fields
-      visibility_config =
-        Enum.reduce(fields_to_hide, %{}, fn field, acc ->
-          Map.put(acc, field, false)
-        end)
-
-      {:ok, _updated_settings} =
-        Mv.Membership.update_settings(settings, %{
-          member_field_visibility: visibility_config
-        })
-
-      # Hidden fields should be false
-      Enum.each(fields_to_hide, fn field ->
-        assert Member.show_in_overview?(field) == false,
-               "Field #{field} should be hidden"
-      end)
-
-      # Unconfigured fields should still be true (default)
-      Enum.each(fields_to_show, fn field ->
-        assert Member.show_in_overview?(field) == true,
-               "Field #{field} should be visible by default"
-      end)
-    end
-  end
 end
diff --git a/test/mv_web/member_live/index_member_fields_display_test.exs b/test/mv_web/member_live/index_member_fields_display_test.exs
index c4a5b9f..6b4f50c 100644
--- a/test/mv_web/member_live/index_member_fields_display_test.exs
+++ b/test/mv_web/member_live/index_member_fields_display_test.exs
@@ -51,7 +51,7 @@ defmodule MvWeb.MemberLive.IndexMemberFieldsDisplayTest do
 
     {:ok, _} =
       Mv.Membership.update_settings(settings, %{
-        member_field_visibility: Map.new(fields_to_hide, &{&1, false})
+        member_field_visibility: Map.new(fields_to_hide, &{Atom.to_string(&1), false})
       })
 
     conn = conn_with_oidc_user(conn)