Improve member view table behavior+style, fix config settings #493

Merged
simon merged 5 commits from bugfix/480-fix-more-minor-bugs into main 2026-05-08 15:04:55 +02:00
16 changed files with 635 additions and 258 deletions

View file

@ -8,6 +8,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased] ## [Unreleased]
### Changed ### Changed
- **Clickable table row highlights** The new hover/focus-visible row highlight behavior is now the CoreComponents default across clickable tables. Sticky-first-column tables keep zebra striping and show selection through the sticky-column accent stripe (checkboxes keep their default style).
- **Members overview scrolling** The members table scrollbar now scrolls inside the table container instead of moving with the full page.
- **Join request display and settings workflow** Improved join request rendering and related settings behavior in one cohesive update: - **Join request display and settings workflow** Improved join request rendering and related settings behavior in one cohesive update:
- Join request fields now respect their configured field types in the details view. - Join request fields now respect their configured field types in the details view.
- Custom field labels in join request views were standardized. - Custom field labels in join request views were standardized.
@ -17,6 +19,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed ### Fixed
- **Runtime ENV handling** Empty or invalid environment variables (e.g. `SMTP_PORT=`, `PORT=`, `POOL_SIZE=`, `DATABASE_PORT=`) no longer cause `ArgumentError` at boot. Instead raises clear errors for required vars set but empty (e.g. DATABASE_HOST, PHX_HOST/DOMAIN, SECRET_KEY_BASE). - **Runtime ENV handling** Empty or invalid environment variables (e.g. `SMTP_PORT=`, `PORT=`, `POOL_SIZE=`, `DATABASE_PORT=`) no longer cause `ArgumentError` at boot. Instead raises clear errors for required vars set but empty (e.g. DATABASE_HOST, PHX_HOST/DOMAIN, SECRET_KEY_BASE).
- **PostgreSQL 18 Docker volume path** Corrected the database volume path to match PostgreSQL 18 expectations. - **PostgreSQL 18 Docker volume path** Corrected the database volume path to match PostgreSQL 18 expectations.
- **Association name ENV handling** `ASSOCIATION_NAME` is now treated as source of truth; the field is read-only in Global Settings when managed via ENV.
- **Association name consistency after updates** Layout now prefers explicitly assigned `club_name` values to avoid stale cached values right after settings changes.
- **SMTP ENV/UI source selection** SMTP now follows a strict single-source policy: ENV-only when `SMTP_HOST` is set, otherwise Settings-only.
- **SMTP settings UI in ENV mode** SMTP fields are read-only, save action is hidden, and missing required ENV keys are shown as a warning.
### Dependency updates ### Dependency updates
- Mix dependencies were updated. - Mix dependencies were updated.

View file

@ -1277,7 +1277,8 @@ mix hex.outdated
**SMTP configuration:** **SMTP configuration:**
- SMTP can be configured via **ENV variables** (`SMTP_HOST`, `SMTP_PORT`, `SMTP_USERNAME`, `SMTP_PASSWORD`, `SMTP_PASSWORD_FILE`, `SMTP_SSL`) or via **Admin Settings** (database: `smtp_host`, `smtp_port`, `smtp_username`, `smtp_password`, `smtp_ssl`). ENV takes priority (same pattern as OIDC/Vereinfacht). - SMTP can be configured via **ENV variables** (`SMTP_HOST`, `SMTP_PORT`, `SMTP_USERNAME`, `SMTP_PASSWORD`, `SMTP_PASSWORD_FILE`, `SMTP_SSL`) or via **Admin Settings** (database: `smtp_host`, `smtp_port`, `smtp_username`, `smtp_password`, `smtp_ssl`).
- **ENV-only policy:** If `SMTP_HOST` is set, SMTP is treated as environment-managed only. All SMTP fields in Settings are read-only, SMTP save action is hidden, and the UI shows a warning when required ENV values are missing (`SMTP_USERNAME`, and `SMTP_PASSWORD` or `SMTP_PASSWORD_FILE`). This keeps one source of truth for transport credentials and avoids mixed ENV/DB SMTP states.
- **Sensitive settings in DB:** `smtp_password` and `oidc_client_secret` are excluded from the default read of the Setting resource; they are loaded only via explicit select when needed (e.g. `Mv.Config.smtp_password/0`, `Mv.Config.oidc_client_secret/0`). This avoids exposing secrets through `get_settings()`. - **Sensitive settings in DB:** `smtp_password` and `oidc_client_secret` are excluded from the default read of the Setting resource; they are loaded only via explicit select when needed (e.g. `Mv.Config.smtp_password/0`, `Mv.Config.oidc_client_secret/0`). This avoids exposing secrets through `get_settings()`.
- **Settings cache:** `Mv.Membership.get_settings/0` uses `Mv.Membership.SettingsCache` when the cache process is running (not in test). Cache has a short TTL and is invalidated on every settings update. This avoids repeated DB reads on hot paths (e.g. `RegistrationEnabled` validation, `Layouts.public_page`). In test, the cache is not started so all callers use `get_settings_uncached/0` in the test process (Ecto Sandbox). - **Settings cache:** `Mv.Membership.get_settings/0` uses `Mv.Membership.SettingsCache` when the cache process is running (not in test). Cache has a short TTL and is invalidated on every settings update. This avoids repeated DB reads on hot paths (e.g. `RegistrationEnabled` validation, `Layouts.public_page`). In test, the cache is not started so all callers use `get_settings_uncached/0` in the test process (Ecto Sandbox).
- **Join emails (domain → web):** The domain calls `Mv.Membership.JoinNotifier` (config `:join_notifier`, default `MvWeb.JoinNotifierImpl`) for sending join confirmation, already-member, and already-pending emails. This keeps the domain independent of the web layer; tests can override the notifier. - **Join emails (domain → web):** The domain calls `Mv.Membership.JoinNotifier` (config `:join_notifier`, default `MvWeb.JoinNotifierImpl`) for sending join confirmation, already-member, and already-pending emails. This keeps the domain independent of the web layer; tests can override the notifier.

View file

@ -247,11 +247,13 @@ If these cannot be met, use `secondary`/`outline` instead of `ghost`.
### 8.1 Default behavior: row click opens details ### 8.1 Default behavior: row click opens details
- **DEFAULT:** Clicking a row navigates to the details page. - **DEFAULT:** Clicking a row navigates to the details page.
- **EXCEPTIONS:** Highly interactive rows may disable row-click (document why). - **EXCEPTIONS:** Highly interactive rows may disable row-click (document why).
- **Row outline (CoreComponents):** When `row_click` is set, rows get a subtle hover and focus-within ring (theme-friendly). Use `selected_row_id` to show a stronger selected outline (e.g. from URL `?highlight=id` or last selection); the Back link from detail can use `?highlight=id` so the row is visually selected when returning to the index. - **Row highlight (CoreComponents):** When `row_click` is set, rows use a neutral background highlight on `hover` and `tr:has(:focus-visible)` (see `assets/css/app.css`), so keyboard focus is visible while mouse-only focus does not appear "stuck". For non-sticky tables, `selected_row_id` can still add a stronger selected ring. For sticky-first-column tables, selection emphasis is handled by the sticky-column accent stripe.
**IMPORTANT (correctness with our `<.table>` CoreComponent):** **IMPORTANT (correctness with our `<.table>` CoreComponent):**
Our table implementation attaches the `phx-click` to the **`<td>`** when `row_click` is set. That means click events bubble from inner elements up to the cell unless we stop propagation. Our table implementation attaches the `phx-click` to the **`<td>`** when `row_click` is set. That means click events bubble from inner elements up to the cell unless we stop propagation.
**LiveStream rows:** Do not enumerate `@rows` with `Enum.with_index` in the table template; streams must be consumed only through `:for`. Sticky-first-column zebra striping for those tables is handled in CSS (`nth-child` under `data-sticky-first-col-rows`), not by assigning odd/even classes from an index.
So, for interactive elements inside a clickable row, you must **stop propagation using `Phoenix.LiveView.JS.stop_propagation/1`**, not a custom attribute. So, for interactive elements inside a clickable row, you must **stop propagation using `Phoenix.LiveView.JS.stop_propagation/1`**, not a custom attribute.
✅ Correct pattern (one click handler that both stops propagation and triggers an event): ✅ Correct pattern (one click handler that both stops propagation and triggers an event):

View file

@ -708,3 +708,68 @@
background-color: transparent !important; background-color: transparent !important;
color: inherit; color: inherit;
} }
/*
* Default interactive table rows: neutral hover/focus-visible fill for clickable rows.
* Uses :has(:focus-visible) so keyboard navigation highlights the row without sticky mouse-focus artifacts.
*/
.table.table-zebra tbody tr[data-row-interactive="true"]:is(:hover, :has(:focus-visible)) > td {
background-color: var(--color-base-300);
}
/*
* Sticky first column in zebra tables: opaque backgrounds per row.
* Use nth-child (not HEEx row index) so LiveStream rows stay iterable only via :for (Phoenix LV requirement).
*/
[data-sticky-first-col-rows="true"] .table.table-zebra tbody tr:nth-child(odd) > td.sticky-first-col-cell {
background-color: var(--color-base-100);
}
[data-sticky-first-col-rows="true"] .table.table-zebra tbody tr:nth-child(even) > td.sticky-first-col-cell {
background-color: var(--color-base-200);
}
/*
* Checkbox-selected rows: keep zebra backgrounds; only accent the sticky checkbox column.
*/
[data-sticky-first-col-rows="true"]
.table.table-zebra
tbody
tr[data-selected="true"]
> td.sticky-first-col-cell {
box-shadow: inset 2px 0 0 var(--color-primary);
}
[data-sticky-first-col-rows="true"]
.table.table-zebra
tbody
tr[data-row-interactive="true"]:is(:hover, :has(:focus-visible))
> td.sticky-first-col-cell {
background-color: var(--color-base-300);
/* Left accent only; keep the familiar orange primary accent. */
box-shadow: inset 2px 0 0 var(--color-primary);
}
/*
* Sticky member selection table: drop mouse-only focus outlines that read like a thin frame around the row;
* keyboard :focus-visible keeps DaisyUI control outlines (checkbox / tabindex cell).
*/
[data-sticky-first-col-rows="true"] .table.table-zebra tbody tr {
outline: none;
}
[data-sticky-first-col-rows="true"]
.table.table-zebra
tbody
tr[data-row-interactive="true"]:is(:hover, :has(:focus-visible)):not(:last-child) {
/* DaisyUI draws a bottom border on each row; hiding it while highlighted avoids a boxy “frame”. */
border-bottom-color: transparent;
}
[data-sticky-first-col-rows="true"] .table.table-zebra tbody tr td:focus:not(:focus-visible) {
outline: none;
}
[data-sticky-first-col-rows="true"] .table.table-zebra tbody tr input.checkbox:focus:not(:focus-visible) {
outline: none;
}

View file

@ -25,7 +25,11 @@ Enable configurable SMTP for sending transactional emails (join confirmation, us
| ENV | 1 | Production, Docker, 12-factor | | ENV | 1 | Production, Docker, 12-factor |
| Settings | 2 | Admin UI, dev without ENV | | Settings | 2 | Admin UI, dev without ENV |
When an ENV variable is set, the corresponding Settings field is read-only in the UI (with hint "Set by environment"). When `SMTP_HOST` is set, SMTP runs in **ENV-only mode**:
- all SMTP fields in Settings are read-only,
- saving SMTP settings in the UI is disabled,
- and the UI shows a warning block if required SMTP ENV values are missing.
- the UI displays the effective ENV-driven SMTP values in disabled fields so admins can verify what is active.
--- ---
@ -63,6 +67,14 @@ Support **SMTP_PASSWORD_FILE** (path to file containing the password), same patt
- Show a warning in the Settings UI. - Show a warning in the Settings UI.
- Delivery attempts silently fall back to the Local adapter (no crash). - Delivery attempts silently fall back to the Local adapter (no crash).
### 6.1 Behaviour in ENV-only mode (`SMTP_HOST` set)
- The SMTP source of truth is environment variables only.
- The UI does not allow editing SMTP fields in this mode.
- The Settings page shows a warning block when required values are missing:
- `SMTP_USERNAME`
- `SMTP_PASSWORD` or `SMTP_PASSWORD_FILE`
--- ---
## 7. Test Email (Settings UI) ## 7. Test Email (Settings UI)

View file

@ -470,56 +470,77 @@ defmodule Mv.Config do
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
@doc """ @doc """
Returns SMTP host. ENV `SMTP_HOST` overrides Settings. Returns SMTP host.
Policy:
- ENV-only mode (`SMTP_HOST` set): read from ENV `SMTP_HOST`
- Settings mode: read from Settings only
""" """
@spec smtp_host() :: String.t() | nil @spec smtp_host() :: String.t() | nil
def smtp_host do def smtp_host do
smtp_env_or_setting("SMTP_HOST", :smtp_host) if smtp_env_mode?() do
System.get_env("SMTP_HOST") |> trim_nil()
else
get_from_settings(:smtp_host)
end
end end
@doc """ @doc """
Returns SMTP port as integer. ENV `SMTP_PORT` (parsed) overrides Settings. Returns SMTP port as integer.
Returns nil when neither ENV nor Settings provide a valid port.
Policy:
- ENV-only mode (`SMTP_HOST` set): read from ENV `SMTP_PORT`
- Settings mode: read from Settings only
""" """
@spec smtp_port() :: non_neg_integer() | nil @spec smtp_port() :: non_neg_integer() | nil
def smtp_port do def smtp_port do
case System.get_env("SMTP_PORT") do if smtp_env_mode?() do
nil -> parse_smtp_port_env(System.get_env("SMTP_PORT"))
else
get_from_settings_integer(:smtp_port) get_from_settings_integer(:smtp_port)
value when is_binary(value) ->
case Integer.parse(String.trim(value)) do
{port, _} when port > 0 -> port
_ -> nil
end
end end
end end
@doc """ @doc """
Returns SMTP username. ENV `SMTP_USERNAME` overrides Settings. Returns SMTP username.
Policy:
- ENV-only mode (`SMTP_HOST` set): read from ENV `SMTP_USERNAME`
- Settings mode: read from Settings only
""" """
@spec smtp_username() :: String.t() | nil @spec smtp_username() :: String.t() | nil
def smtp_username do def smtp_username do
smtp_env_or_setting("SMTP_USERNAME", :smtp_username) if smtp_env_mode?() do
System.get_env("SMTP_USERNAME") |> trim_nil()
else
get_from_settings(:smtp_username)
end
end end
@doc """ @doc """
Returns SMTP password. Returns SMTP password.
Priority: `SMTP_PASSWORD` ENV > `SMTP_PASSWORD_FILE` (file contents) > Settings. Policy:
- ENV-only mode (`SMTP_HOST` set): `SMTP_PASSWORD` > `SMTP_PASSWORD_FILE`
- Settings mode: read from Settings only
Strips trailing whitespace/newlines from file contents. Strips trailing whitespace/newlines from file contents.
""" """
@spec smtp_password() :: String.t() | nil @spec smtp_password() :: String.t() | nil
def smtp_password do def smtp_password do
if smtp_env_mode?() do
case System.get_env("SMTP_PASSWORD") do case System.get_env("SMTP_PASSWORD") do
nil -> smtp_password_from_file_or_settings() nil -> smtp_password_from_file()
value -> trim_nil(value) value -> trim_nil(value)
end end
else
get_smtp_password_from_settings()
end
end end
defp smtp_password_from_file_or_settings do defp smtp_password_from_file do
case System.get_env("SMTP_PASSWORD_FILE") do case System.get_env("SMTP_PASSWORD_FILE") do
nil -> get_smtp_password_from_settings() nil -> nil
path -> read_smtp_password_file(path) path -> read_smtp_password_file(path)
end end
end end
@ -533,11 +554,18 @@ defmodule Mv.Config do
@doc """ @doc """
Returns SMTP TLS/SSL mode string (e.g. 'tls', 'ssl', 'none'). Returns SMTP TLS/SSL mode string (e.g. 'tls', 'ssl', 'none').
ENV `SMTP_SSL` overrides Settings.
Policy:
- ENV-only mode (`SMTP_HOST` set): read from ENV `SMTP_SSL`
- Settings mode: read from Settings only
""" """
@spec smtp_ssl() :: String.t() | nil @spec smtp_ssl() :: String.t() | nil
def smtp_ssl do def smtp_ssl do
smtp_env_or_setting("SMTP_SSL", :smtp_ssl) if smtp_env_mode?() do
System.get_env("SMTP_SSL") |> trim_nil()
else
get_from_settings(:smtp_ssl)
end
end end
@doc """ @doc """
@ -549,12 +577,32 @@ defmodule Mv.Config do
end end
@doc """ @doc """
Returns true when any SMTP ENV variable is set (used in Settings UI for hints). Returns true when SMTP is managed by environment variables.
Policy: if `SMTP_HOST` is set, SMTP is treated as ENV-only.
""" """
@spec smtp_env_configured?() :: boolean() @spec smtp_env_mode?() :: boolean()
def smtp_env_configured? do def smtp_env_mode? do
smtp_host_env_set?() or smtp_port_env_set?() or smtp_username_env_set?() or smtp_host_env_set?()
smtp_password_env_set?() or smtp_ssl_env_set?() end
@doc """
Returns missing required SMTP ENV keys for ENV-only mode warnings.
Required in ENV-only mode:
- `SMTP_USERNAME`
- one of `SMTP_PASSWORD` or `SMTP_PASSWORD_FILE`
"""
@spec smtp_missing_required_env_keys() :: [String.t()]
def smtp_missing_required_env_keys do
if smtp_env_mode?() do
[]
|> maybe_add_missing("SMTP_USERNAME", smtp_username_env_set?())
|> maybe_add_missing("SMTP_PASSWORD/SMTP_PASSWORD_FILE", smtp_password_env_set?())
|> Enum.reverse()
else
[]
end
end end
@doc "Returns true if SMTP_HOST ENV is set." @doc "Returns true if SMTP_HOST ENV is set."
@ -618,14 +666,18 @@ defmodule Mv.Config do
@spec mail_from_email_env_set?() :: boolean() @spec mail_from_email_env_set?() :: boolean()
def mail_from_email_env_set?, do: env_set?("MAIL_FROM_EMAIL") def mail_from_email_env_set?, do: env_set?("MAIL_FROM_EMAIL")
# Reads a plain string SMTP setting: ENV first, then Settings. defp parse_smtp_port_env(value) when is_binary(value) do
defp smtp_env_or_setting(env_key, setting_key) do case Integer.parse(String.trim(value)) do
case System.get_env(env_key) do {port, _} when port > 0 -> port
nil -> get_from_settings(setting_key) _ -> nil
value -> trim_nil(value)
end end
end end
defp parse_smtp_port_env(_), do: nil
defp maybe_add_missing(acc, _label, true), do: acc
defp maybe_add_missing(acc, label, false), do: [label | acc]
# Reads an integer setting attribute from Settings. # Reads an integer setting attribute from Settings.
defp get_from_settings_integer(key) do defp get_from_settings_integer(key) do
case Mv.Membership.get_settings() do case Mv.Membership.get_settings() do

View file

@ -938,6 +938,16 @@ defmodule MvWeb.CoreComponents do
doc: doc:
"when true, thead th get lg:sticky lg:top-0 bg-base-100 z-10 for use inside a scroll container on desktop" "when true, thead th get lg:sticky lg:top-0 bg-base-100 z-10 for use inside a scroll container on desktop"
attr :wrapper_overflow_class, :string,
default: "overflow-x-auto",
doc:
"overflow class for the table wrapper; set to overflow-visible when outer container owns scrolling"
attr :sticky_first_col, :boolean,
default: false,
doc:
"when true, first header/body column gets sticky left positioning to keep selection controls visible"
slot :col, required: true do slot :col, required: true do
attr :label, :string attr :label, :string
attr :class, :string attr :class, :string
@ -974,15 +984,19 @@ defmodule MvWeb.CoreComponents do
~H""" ~H"""
<div <div
id={@row_click && "#{@id}-keyboard"} id={@row_click && "#{@id}-keyboard"}
class="overflow-auto" class={@wrapper_overflow_class}
data-sticky-first-col-rows={@sticky_first_col && "true"}
phx-hook={@row_click && "TableRowKeydown"} phx-hook={@row_click && "TableRowKeydown"}
> >
<table class="table table-zebra"> <table class="table table-zebra">
<thead> <thead>
<tr> <tr>
<th <th
:for={col <- @col} :for={{col, col_idx} <- Enum.with_index(@col)}
class={table_th_class(col, @sticky_header)} class={[
table_th_class(col, @sticky_header),
@sticky_first_col && col_idx == 0 && "sticky left-0 z-30 bg-base-100"
]}
aria-sort={table_th_aria_sort(col, @sort_field, @sort_order)} aria-sort={table_th_aria_sort(col, @sort_field, @sort_order)}
> >
{col[:label]} {col[:label]}
@ -1006,7 +1020,13 @@ defmodule MvWeb.CoreComponents do
<tr <tr
:for={row <- @rows} :for={row <- @rows}
id={@row_id && @row_id.(row)} id={@row_id && @row_id.(row)}
class={table_row_tr_class(@row_click, table_row_selected?(assigns, row))} class={[
table_row_tr_class(
table_row_selected?(assigns, row),
@sticky_first_col
)
]}
data-row-interactive={@row_click && "true"}
data-selected={table_row_selected?(assigns, row) && "true"} data-selected={table_row_selected?(assigns, row) && "true"}
title={@row_click && @row_tooltip} title={@row_click && @row_tooltip}
> >
@ -1026,6 +1046,13 @@ defmodule MvWeb.CoreComponents do
has_click = col[:col_click] || @row_click has_click = col[:col_click] || @row_click
classes = ["max-w-xs"] classes = ["max-w-xs"]
classes =
if @sticky_first_col && col_idx == 0 do
["sticky-first-col-cell sticky left-0 z-20" | classes]
else
classes
end
classes = classes =
if col_class == nil || (col_class && !String.contains?(col_class, "text-center")) do if col_class == nil || (col_class && !String.contains?(col_class, "text-center")) do
["truncate" | classes] ["truncate" | classes]
@ -1040,7 +1067,7 @@ defmodule MvWeb.CoreComponents do
classes classes
end end
# WCAG: no focus ring on the cell itself; row shows focus via focus-within # WCAG: no focus ring on the cell itself; sticky zebra rows show keyboard focus via CSS :has(:focus-visible)
classes = classes =
if @row_click && @first_row_click_col_idx == col_idx do if @row_click && @first_row_click_col_idx == col_idx do
[ [
@ -1111,30 +1138,11 @@ defmodule MvWeb.CoreComponents do
end end
end end
# Returns CSS classes for table row: hover/focus-within outline when row_click is set, # Returns CSS classes for table row selection styles.
# and stronger selected outline when selected (WCAG: not color-only). # Hover/focus row highlighting is CSS-driven via [data-row-interactive] selectors in app.css.
# Hover/focus-within are omitted for the selected row so the selected ring stays visible. # Sticky-first-column zebra tables use CSS accents and omit selected row ring classes.
defp table_row_tr_class(row_click, selected?) do defp table_row_tr_class(true, false), do: "ring-2 ring-inset ring-primary"
has_row_click? = not is_nil(row_click) defp table_row_tr_class(_, _), do: ""
base = []
base =
if has_row_click? and not selected?,
do:
base ++
[
"hover:ring-2",
"hover:ring-inset",
"hover:ring-base-content/10",
"focus-within:ring-2",
"focus-within:ring-inset",
"focus-within:ring-base-content/10"
],
else: base
base = if selected?, do: base ++ ["ring-2", "ring-inset", "ring-primary"], else: base
Enum.join(base, " ")
end
defp table_th_aria_sort(col, sort_field, sort_order) do defp table_th_aria_sort(col, sort_field, sort_order) do
col_sort = Map.get(col, :sort_field) col_sort = Map.get(col, :sort_field)

View file

@ -85,14 +85,8 @@ defmodule MvWeb.GlobalSettingsLive do
|> assign(:oidc_configured, Mv.Config.oidc_configured?()) |> assign(:oidc_configured, Mv.Config.oidc_configured?())
|> assign(:oidc_client_secret_set, Mv.Config.oidc_client_secret_set?()) |> assign(:oidc_client_secret_set, Mv.Config.oidc_client_secret_set?())
|> assign(:registration_enabled, settings.registration_enabled != false) |> assign(:registration_enabled, settings.registration_enabled != false)
|> assign(:smtp_env_configured, Mv.Config.smtp_env_configured?()) |> assign(:smtp_env_mode, Mv.Config.smtp_env_mode?())
|> assign(:smtp_host_env_set, Mv.Config.smtp_host_env_set?()) |> assign(:smtp_missing_required_env_keys, Mv.Config.smtp_missing_required_env_keys())
|> assign(:smtp_port_env_set, Mv.Config.smtp_port_env_set?())
|> assign(:smtp_username_env_set, Mv.Config.smtp_username_env_set?())
|> assign(:smtp_password_env_set, Mv.Config.smtp_password_env_set?())
|> assign(:smtp_ssl_env_set, Mv.Config.smtp_ssl_env_set?())
|> assign(:smtp_from_name_env_set, Mv.Config.mail_from_name_env_set?())
|> assign(:smtp_from_email_env_set, Mv.Config.mail_from_email_env_set?())
|> assign(:smtp_password_set, present?(Mv.Config.smtp_password())) |> assign(:smtp_password_set, present?(Mv.Config.smtp_password()))
|> assign(:smtp_configured, Mv.Config.smtp_configured?()) |> assign(:smtp_configured, Mv.Config.smtp_configured?())
|> assign(:smtp_test_result, nil) |> assign(:smtp_test_result, nil)
@ -321,12 +315,25 @@ defmodule MvWeb.GlobalSettingsLive do
</.form_section> </.form_section>
<%!-- SMTP / E-Mail Section --%> <%!-- SMTP / E-Mail Section --%>
<.form_section title={gettext("SMTP / E-Mail")}> <.form_section title={gettext("SMTP / E-Mail")}>
<%= if @smtp_env_configured do %> <%= if @smtp_env_mode do %>
<p class="text-sm text-base-content/70 mb-4"> <p class="text-sm text-base-content/70 mb-4">
{gettext("Some values are set via environment variables. Those fields are read-only.")} {gettext(
"SMTP is fully managed via environment variables. All SMTP fields are read-only."
)}
</p> </p>
<% end %> <% end %>
<%= if @smtp_env_mode and @smtp_missing_required_env_keys != [] do %>
<div class="mb-4 flex items-start gap-2 p-3 rounded-lg border border-warning bg-warning/10 text-warning-aa text-sm">
<.icon name="hero-exclamation-triangle" class="size-5 shrink-0 mt-0.5" />
<span>
{gettext("SMTP environment configuration appears incomplete. Missing: %{keys}",
keys: Enum.join(@smtp_missing_required_env_keys, ", ")
)}
</span>
</div>
<% end %>
<%= if @environment == :prod and not @smtp_configured do %> <%= if @environment == :prod and not @smtp_configured do %>
<div class="mb-4 flex items-start gap-2 p-3 rounded-lg border border-warning bg-warning/10 text-warning-aa text-sm"> <div class="mb-4 flex items-start gap-2 p-3 rounded-lg border border-warning bg-warning/10 text-warning-aa text-sm">
<.icon name="hero-exclamation-triangle" class="size-5 shrink-0 mt-0.5" /> <.icon name="hero-exclamation-triangle" class="size-5 shrink-0 mt-0.5" />
@ -345,32 +352,26 @@ defmodule MvWeb.GlobalSettingsLive do
field={@form[:smtp_host]} field={@form[:smtp_host]}
type="text" type="text"
label={gettext("Host")} label={gettext("Host")}
disabled={@smtp_host_env_set} disabled={@smtp_env_mode}
placeholder={ placeholder="smtp.example.com"
if(@smtp_host_env_set,
do: gettext("From SMTP_HOST"),
else: "smtp.example.com"
)
}
/> />
<.input <.input
field={@form[:smtp_port]} field={@form[:smtp_port]}
type="number" type="number"
label={gettext("Port")} label={gettext("Port")}
disabled={@smtp_port_env_set} disabled={@smtp_env_mode}
placeholder={if(@smtp_port_env_set, do: gettext("From SMTP_PORT"), else: "587")} placeholder="587"
/> />
<.input <.input
field={@form[:smtp_ssl]} field={@form[:smtp_ssl]}
type="select" type="select"
label={gettext("TLS/SSL")} label={gettext("TLS/SSL")}
disabled={@smtp_ssl_env_set} disabled={@smtp_env_mode}
options={[ options={[
{gettext("TLS (port 587, recommended)"), "tls"}, {gettext("TLS (port 587, recommended)"), "tls"},
{gettext("SSL (port 465)"), "ssl"}, {gettext("SSL (port 465)"), "ssl"},
{gettext("None (port 25, insecure)"), "none"} {gettext("None (port 25, insecure)"), "none"}
]} ]}
placeholder={if(@smtp_ssl_env_set, do: gettext("From SMTP_SSL"), else: nil)}
/> />
</div> </div>
@ -379,28 +380,20 @@ defmodule MvWeb.GlobalSettingsLive do
field={@form[:smtp_username]} field={@form[:smtp_username]}
type="text" type="text"
label={gettext("Username")} label={gettext("Username")}
disabled={@smtp_username_env_set} disabled={@smtp_env_mode}
placeholder={ placeholder="user@example.com"
if(@smtp_username_env_set,
do: gettext("From SMTP_USERNAME"),
else: "user@example.com"
)
}
/> />
<.input <.input
field={@form[:smtp_password]} field={@form[:smtp_password]}
type="password" type="password"
label={gettext("Password")} label={gettext("Password")}
disabled={@smtp_password_env_set} disabled={@smtp_env_mode}
placeholder={ placeholder={
if(@smtp_password_env_set, if @smtp_env_mode do
do: gettext("From SMTP_PASSWORD"), gettext("From SMTP_PASSWORD")
else: else
if(@smtp_password_set, if @smtp_password_set, do: gettext("Leave blank to keep current"), else: nil
do: gettext("Leave blank to keep current"), end
else: nil
)
)
} }
/> />
</div> </div>
@ -410,22 +403,15 @@ defmodule MvWeb.GlobalSettingsLive do
field={@form[:smtp_from_email]} field={@form[:smtp_from_email]}
type="email" type="email"
label={gettext("Sender email (From)")} label={gettext("Sender email (From)")}
disabled={@smtp_from_email_env_set} disabled={@smtp_env_mode}
placeholder={ placeholder="noreply@example.com"
if(@smtp_from_email_env_set,
do: gettext("From MAIL_FROM_EMAIL"),
else: "noreply@example.com"
)
}
/> />
<.input <.input
field={@form[:smtp_from_name]} field={@form[:smtp_from_name]}
type="text" type="text"
label={gettext("Sender name (From)")} label={gettext("Sender name (From)")}
disabled={@smtp_from_name_env_set} disabled={@smtp_env_mode}
placeholder={ placeholder="Mila"
if(@smtp_from_name_env_set, do: gettext("From MAIL_FROM_NAME"), else: "Mila")
}
/> />
</div> </div>
</div> </div>
@ -435,11 +421,7 @@ defmodule MvWeb.GlobalSettingsLive do
)} )}
</p> </p>
<.button <.button
:if={ :if={not @smtp_env_mode}
not (@smtp_host_env_set and @smtp_port_env_set and @smtp_username_env_set and
@smtp_password_env_set and @smtp_ssl_env_set and @smtp_from_email_env_set and
@smtp_from_name_env_set)
}
phx-disable-with={gettext("Saving...")} phx-disable-with={gettext("Saving...")}
variant="primary" variant="primary"
class="mt-2" class="mt-2"
@ -925,9 +907,9 @@ defmodule MvWeb.GlobalSettingsLive do
|> assign(:oidc_only, Mv.Config.oidc_only?()) |> assign(:oidc_only, Mv.Config.oidc_only?())
|> assign(:oidc_configured, Mv.Config.oidc_configured?()) |> assign(:oidc_configured, Mv.Config.oidc_configured?())
|> assign(:smtp_configured, Mv.Config.smtp_configured?()) |> assign(:smtp_configured, Mv.Config.smtp_configured?())
|> assign(:smtp_env_mode, Mv.Config.smtp_env_mode?())
|> assign(:smtp_missing_required_env_keys, Mv.Config.smtp_missing_required_env_keys())
|> assign(:smtp_password_set, present?(Mv.Config.smtp_password())) |> assign(:smtp_password_set, present?(Mv.Config.smtp_password()))
|> assign(:smtp_from_name_env_set, Mv.Config.mail_from_name_env_set?())
|> assign(:smtp_from_email_env_set, Mv.Config.mail_from_email_env_set?())
|> assign(:vereinfacht_test_result, test_result) |> assign(:vereinfacht_test_result, test_result)
|> put_flash(:success, gettext("Settings updated successfully")) |> put_flash(:success, gettext("Settings updated successfully"))
|> assign_form() |> assign_form()
@ -1267,25 +1249,17 @@ defmodule MvWeb.GlobalSettingsLive do
end end
defp merge_smtp_env_values(s) do defp merge_smtp_env_values(s) do
if Mv.Config.smtp_env_mode?() do
s s
|> put_if_env_set(:smtp_host, Mv.Config.smtp_host_env_set?(), Mv.Config.smtp_host()) |> Map.put(:smtp_host, Mv.Config.smtp_host())
|> put_if_env_set(:smtp_port, Mv.Config.smtp_port_env_set?(), Mv.Config.smtp_port()) |> Map.put(:smtp_port, Mv.Config.smtp_port())
|> put_if_env_set( |> Map.put(:smtp_username, Mv.Config.smtp_username())
:smtp_username, |> Map.put(:smtp_ssl, Mv.Config.smtp_ssl())
Mv.Config.smtp_username_env_set?(), |> Map.put(:smtp_from_email, Mv.Config.mail_from_email())
Mv.Config.smtp_username() |> Map.put(:smtp_from_name, Mv.Config.mail_from_name())
) else
|> put_if_env_set(:smtp_ssl, Mv.Config.smtp_ssl_env_set?(), Mv.Config.smtp_ssl()) s
|> put_if_env_set( end
:smtp_from_email,
Mv.Config.mail_from_email_env_set?(),
Mv.Config.mail_from_email()
)
|> put_if_env_set(
:smtp_from_name,
Mv.Config.mail_from_name_env_set?(),
Mv.Config.mail_from_name()
)
end end
defp enrich_sync_errors([]), do: [] defp enrich_sync_errors([]), do: []

View file

@ -105,7 +105,9 @@
<.table <.table
id="members" id="members"
rows={@members} rows={@members}
wrapper_overflow_class="overflow-visible"
sticky_header={true} sticky_header={true}
sticky_first_col={true}
row_id={fn member -> "row-#{member.id}" end} row_id={fn member -> "row-#{member.id}" end}
row_click={fn member -> JS.push("select_row_and_navigate", value: %{id: member.id}) end} row_click={fn member -> JS.push("select_row_and_navigate", value: %{id: member.id}) end}
row_tooltip={gettext("Click for member details")} row_tooltip={gettext("Click for member details")}

View file

@ -1384,16 +1384,6 @@ msgstr "Festgelegt nach der Erstellung. Mitglieder können nur zwischen Beitrags
msgid "From %{first} to %{last} (relevant years with membership data)" msgid "From %{first} to %{last} (relevant years with membership data)"
msgstr "Von %{first} bis %{last} (Jahre mit Mitgliederdaten)" msgstr "Von %{first} bis %{last} (Jahre mit Mitgliederdaten)"
#: lib/mv_web/live/global_settings_live.ex
#, elixir-autogen, elixir-format
msgid "From MAIL_FROM_EMAIL"
msgstr "Aus MAIL_FROM_EMAIL"
#: lib/mv_web/live/global_settings_live.ex
#, elixir-autogen, elixir-format
msgid "From MAIL_FROM_NAME"
msgstr "Aus MAIL_FROM_NAME"
#: lib/mv_web/live/global_settings_live.ex #: lib/mv_web/live/global_settings_live.ex
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "From OIDC_ADMIN_GROUP_NAME" msgid "From OIDC_ADMIN_GROUP_NAME"
@ -1429,31 +1419,11 @@ msgstr "Aus OIDC_ONLY"
msgid "From OIDC_REDIRECT_URI" msgid "From OIDC_REDIRECT_URI"
msgstr "Aus OIDC_REDIRECT_URI" msgstr "Aus OIDC_REDIRECT_URI"
#: lib/mv_web/live/global_settings_live.ex
#, elixir-autogen, elixir-format
msgid "From SMTP_HOST"
msgstr "Von SMTP_HOST"
#: lib/mv_web/live/global_settings_live.ex #: lib/mv_web/live/global_settings_live.ex
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "From SMTP_PASSWORD" msgid "From SMTP_PASSWORD"
msgstr "Von SMTP_PASSWORD" msgstr "Von SMTP_PASSWORD"
#: lib/mv_web/live/global_settings_live.ex
#, elixir-autogen, elixir-format
msgid "From SMTP_PORT"
msgstr "Von SMTP_PORT"
#: lib/mv_web/live/global_settings_live.ex
#, elixir-autogen, elixir-format
msgid "From SMTP_SSL"
msgstr "Von SMTP_SSL"
#: lib/mv_web/live/global_settings_live.ex
#, elixir-autogen, elixir-format
msgid "From SMTP_USERNAME"
msgstr "Von SMTP_USERNAME"
#: lib/mv_web/live/global_settings_live.ex #: lib/mv_web/live/global_settings_live.ex
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "From VEREINFACHT_API_KEY" msgid "From VEREINFACHT_API_KEY"
@ -3917,3 +3887,13 @@ msgstr "Offen"
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "join page URL in a new tab" msgid "join page URL in a new tab"
msgstr "Beitrittslink in einem neuen Tab" msgstr "Beitrittslink in einem neuen Tab"
#: lib/mv_web/live/global_settings_live.ex
#, elixir-autogen, elixir-format
msgid "SMTP environment configuration appears incomplete. Missing: %{keys}"
msgstr "Die SMTP-Umgebungs-Konfiguration ist unvollständig. Fehlend: %{keys}"
#: lib/mv_web/live/global_settings_live.ex
#, elixir-autogen, elixir-format
msgid "SMTP is fully managed via environment variables. All SMTP fields are read-only."
msgstr "SMTP wird vollständig über Umgebungsvariablen verwaltet. Alle SMTP-Felder sind schreibgeschützt."

View file

@ -1385,16 +1385,6 @@ msgstr ""
msgid "From %{first} to %{last} (relevant years with membership data)" msgid "From %{first} to %{last} (relevant years with membership data)"
msgstr "" msgstr ""
#: lib/mv_web/live/global_settings_live.ex
#, elixir-autogen, elixir-format
msgid "From MAIL_FROM_EMAIL"
msgstr ""
#: lib/mv_web/live/global_settings_live.ex
#, elixir-autogen, elixir-format
msgid "From MAIL_FROM_NAME"
msgstr ""
#: lib/mv_web/live/global_settings_live.ex #: lib/mv_web/live/global_settings_live.ex
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "From OIDC_ADMIN_GROUP_NAME" msgid "From OIDC_ADMIN_GROUP_NAME"
@ -1430,31 +1420,11 @@ msgstr ""
msgid "From OIDC_REDIRECT_URI" msgid "From OIDC_REDIRECT_URI"
msgstr "" msgstr ""
#: lib/mv_web/live/global_settings_live.ex
#, elixir-autogen, elixir-format
msgid "From SMTP_HOST"
msgstr ""
#: lib/mv_web/live/global_settings_live.ex #: lib/mv_web/live/global_settings_live.ex
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "From SMTP_PASSWORD" msgid "From SMTP_PASSWORD"
msgstr "" msgstr ""
#: lib/mv_web/live/global_settings_live.ex
#, elixir-autogen, elixir-format
msgid "From SMTP_PORT"
msgstr ""
#: lib/mv_web/live/global_settings_live.ex
#, elixir-autogen, elixir-format
msgid "From SMTP_SSL"
msgstr ""
#: lib/mv_web/live/global_settings_live.ex
#, elixir-autogen, elixir-format
msgid "From SMTP_USERNAME"
msgstr ""
#: lib/mv_web/live/global_settings_live.ex #: lib/mv_web/live/global_settings_live.ex
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "From VEREINFACHT_API_KEY" msgid "From VEREINFACHT_API_KEY"
@ -3917,3 +3887,13 @@ msgstr ""
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "join page URL in a new tab" msgid "join page URL in a new tab"
msgstr "" msgstr ""
#: lib/mv_web/live/global_settings_live.ex
#, elixir-autogen, elixir-format
msgid "SMTP environment configuration appears incomplete. Missing: %{keys}"
msgstr ""
#: lib/mv_web/live/global_settings_live.ex
#, elixir-autogen, elixir-format
msgid "SMTP is fully managed via environment variables. All SMTP fields are read-only."
msgstr ""

View file

@ -1385,16 +1385,6 @@ msgstr ""
msgid "From %{first} to %{last} (relevant years with membership data)" msgid "From %{first} to %{last} (relevant years with membership data)"
msgstr "" msgstr ""
#: lib/mv_web/live/global_settings_live.ex
#, elixir-autogen, elixir-format
msgid "From MAIL_FROM_EMAIL"
msgstr ""
#: lib/mv_web/live/global_settings_live.ex
#, elixir-autogen, elixir-format
msgid "From MAIL_FROM_NAME"
msgstr ""
#: lib/mv_web/live/global_settings_live.ex #: lib/mv_web/live/global_settings_live.ex
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "From OIDC_ADMIN_GROUP_NAME" msgid "From OIDC_ADMIN_GROUP_NAME"
@ -1430,31 +1420,11 @@ msgstr ""
msgid "From OIDC_REDIRECT_URI" msgid "From OIDC_REDIRECT_URI"
msgstr "" msgstr ""
#: lib/mv_web/live/global_settings_live.ex
#, elixir-autogen, elixir-format
msgid "From SMTP_HOST"
msgstr ""
#: lib/mv_web/live/global_settings_live.ex #: lib/mv_web/live/global_settings_live.ex
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "From SMTP_PASSWORD" msgid "From SMTP_PASSWORD"
msgstr "" msgstr ""
#: lib/mv_web/live/global_settings_live.ex
#, elixir-autogen, elixir-format
msgid "From SMTP_PORT"
msgstr ""
#: lib/mv_web/live/global_settings_live.ex
#, elixir-autogen, elixir-format
msgid "From SMTP_SSL"
msgstr ""
#: lib/mv_web/live/global_settings_live.ex
#, elixir-autogen, elixir-format
msgid "From SMTP_USERNAME"
msgstr ""
#: lib/mv_web/live/global_settings_live.ex #: lib/mv_web/live/global_settings_live.ex
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "From VEREINFACHT_API_KEY" msgid "From VEREINFACHT_API_KEY"
@ -3917,3 +3887,13 @@ msgstr "Open"
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "join page URL in a new tab" msgid "join page URL in a new tab"
msgstr "join page URL in a new tab" msgstr "join page URL in a new tab"
#: lib/mv_web/live/global_settings_live.ex
#, elixir-autogen, elixir-format
msgid "SMTP environment configuration appears incomplete. Missing: %{keys}"
msgstr ""
#: lib/mv_web/live/global_settings_live.ex
#, elixir-autogen, elixir-format
msgid "SMTP is fully managed via environment variables. All SMTP fields are read-only."
msgstr "SMTP is fully managed via environment variables. All SMTP fields are read-only."

View file

@ -2,7 +2,7 @@ defmodule Mv.ConfigSmtpTest do
@moduledoc """ @moduledoc """
Unit tests for Mv.Config SMTP-related helpers. Unit tests for Mv.Config SMTP-related helpers.
ENV overrides Settings (same pattern as OIDC/Vereinfacht). Uses real ENV and SMTP uses ENV-only mode when SMTP_HOST is set. Uses real ENV and
Settings; no mocking so we test the actual precedence. async: false because Settings; no mocking so we test the actual precedence. async: false because
we mutate ENV. we mutate ENV.
""" """
@ -23,7 +23,8 @@ defmodule Mv.ConfigSmtpTest do
end end
describe "smtp_port/0" do describe "smtp_port/0" do
test "returns parsed integer when SMTP_PORT ENV is set" do test "returns parsed integer when SMTP_PORT ENV is set in ENV-only mode" do
set_smtp_env("SMTP_HOST", "smtp.example.com")
set_smtp_env("SMTP_PORT", "587") set_smtp_env("SMTP_PORT", "587")
assert Mv.Config.smtp_port() == 587 assert Mv.Config.smtp_port() == 587
after after
@ -51,30 +52,40 @@ defmodule Mv.ConfigSmtpTest do
end end
end end
describe "smtp_env_configured?/0" do describe "smtp_env_mode?/0" do
test "returns true when any SMTP ENV variable is set" do test "returns true when SMTP_HOST is set" do
set_smtp_env("SMTP_HOST", "smtp.example.com") set_smtp_env("SMTP_HOST", "smtp.example.com")
assert Mv.Config.smtp_env_configured?() == true assert Mv.Config.smtp_env_mode?() == true
after
clear_smtp_env()
end
test "returns false when SMTP_HOST is not set even if other SMTP ENV variables are set" do
set_smtp_env("SMTP_USERNAME", "user@example.com")
set_smtp_env("SMTP_PASSWORD", "secret")
refute Mv.Config.smtp_env_mode?()
after after
clear_smtp_env() clear_smtp_env()
end end
test "returns false when no SMTP ENV variables are set" do test "returns false when no SMTP ENV variables are set" do
clear_smtp_env() clear_smtp_env()
refute Mv.Config.smtp_env_configured?() refute Mv.Config.smtp_env_mode?()
end end
end end
describe "smtp_password/0 and SMTP_PASSWORD_FILE" do describe "smtp_password/0 and SMTP_PASSWORD_FILE" do
test "returns value from SMTP_PASSWORD when set" do test "returns value from SMTP_PASSWORD when set in ENV-only mode" do
set_smtp_env("SMTP_HOST", "smtp.example.com")
set_smtp_env("SMTP_PASSWORD", "env-secret") set_smtp_env("SMTP_PASSWORD", "env-secret")
assert Mv.Config.smtp_password() == "env-secret" assert Mv.Config.smtp_password() == "env-secret"
after after
clear_smtp_env() clear_smtp_env()
end end
test "returns content of file when SMTP_PASSWORD_FILE is set and SMTP_PASSWORD is not" do test "returns content of file when SMTP_PASSWORD_FILE is set in ENV-only mode and SMTP_PASSWORD is not" do
clear_smtp_env() clear_smtp_env()
set_smtp_env("SMTP_HOST", "smtp.example.com")
path = Path.join(System.tmp_dir!(), "mv_smtp_test_#{System.unique_integer([:positive])}") path = Path.join(System.tmp_dir!(), "mv_smtp_test_#{System.unique_integer([:positive])}")
File.write!(path, "file-secret\n") File.write!(path, "file-secret\n")
Process.put(:smtp_password_file_path, path) Process.put(:smtp_password_file_path, path)
@ -85,7 +96,8 @@ defmodule Mv.ConfigSmtpTest do
if path = Process.get(:smtp_password_file_path), do: File.rm(path) if path = Process.get(:smtp_password_file_path), do: File.rm(path)
end end
test "SMTP_PASSWORD overrides SMTP_PASSWORD_FILE when both are set" do test "SMTP_PASSWORD overrides SMTP_PASSWORD_FILE in ENV-only mode when both are set" do
set_smtp_env("SMTP_HOST", "smtp.example.com")
path = Path.join(System.tmp_dir!(), "mv_smtp_test_#{System.unique_integer([:positive])}") path = Path.join(System.tmp_dir!(), "mv_smtp_test_#{System.unique_integer([:positive])}")
File.write!(path, "file-secret") File.write!(path, "file-secret")
Process.put(:smtp_password_file_path, path) Process.put(:smtp_password_file_path, path)

View file

@ -9,7 +9,7 @@ defmodule MvWeb.Components.CoreComponentsTableTest do
alias MvWeb.CoreComponents alias MvWeb.CoreComponents
describe "table row_click styling" do describe "table row_click styling" do
test "when row_click is set, table rows have hover and focus-within ring classes" do test "when row_click is set, rows are marked interactive and omit ring hover classes" do
rows = [%{id: "1", name: "Alice"}, %{id: "2", name: "Bob"}] rows = [%{id: "1", name: "Alice"}, %{id: "2", name: "Bob"}]
assigns = %{ assigns = %{
@ -31,12 +31,12 @@ defmodule MvWeb.Components.CoreComponentsTableTest do
html = render_component(&CoreComponents.table/1, assigns) html = render_component(&CoreComponents.table/1, assigns)
assert html =~ "hover:ring-2" assert html =~ ~s(data-row-interactive="true")
assert html =~ "focus-within:ring-2" refute html =~ "hover:ring-2"
assert html =~ "hover:ring-base-content/10" refute html =~ "focus-within:ring-2"
end end
test "when row_click is nil, table rows do not have hover ring classes" do test "when row_click is nil, rows are not marked interactive" do
rows = [%{id: "1", name: "Alice"}] rows = [%{id: "1", name: "Alice"}]
assigns = %{ assigns = %{
@ -58,8 +58,7 @@ defmodule MvWeb.Components.CoreComponentsTableTest do
html = render_component(&CoreComponents.table/1, assigns) html = render_component(&CoreComponents.table/1, assigns)
refute html =~ "hover:ring-2" refute html =~ ~s(data-row-interactive="true")
refute html =~ "focus-within:ring-2"
end end
end end
@ -151,4 +150,183 @@ defmodule MvWeb.Components.CoreComponentsTableTest do
assert html =~ "ring-primary" assert html =~ "ring-primary"
end end
end end
describe "table scroll wrapper contract" do
test "sticky header table uses horizontal-only overflow wrapper" do
rows = [%{id: "1", name: "Alice"}]
assigns = %{
id: "test-table",
rows: rows,
row_id: fn r -> "row-#{r.id}" end,
row_click: nil,
sticky_header: true,
row_item: &Function.identity/1,
col: [
%{
__slot__: :col,
label: "Name",
inner_block: fn _socket, item -> [item[:name] || ""] end
}
],
dynamic_cols: [],
action: []
}
html = render_component(&CoreComponents.table/1, assigns)
assert html =~ ~s(class="overflow-x-auto")
refute html =~ ~s(class="overflow-auto")
end
test "table wrapper does not enable vertical overflow by default" do
rows = [%{id: "1", name: "Alice"}]
assigns = %{
id: "test-table",
rows: rows,
row_id: fn r -> "row-#{r.id}" end,
row_click: nil,
row_item: &Function.identity/1,
col: [
%{
__slot__: :col,
label: "Name",
inner_block: fn _socket, item -> [item[:name] || ""] end
}
],
dynamic_cols: [],
action: []
}
html = render_component(&CoreComponents.table/1, assigns)
assert html =~ ~s(class="overflow-x-auto")
refute html =~ ~s(class="overflow-auto")
end
test "table wrapper overflow class can be overridden by caller" do
rows = [%{id: "1", name: "Alice"}]
assigns = %{
id: "test-table",
rows: rows,
row_id: fn r -> "row-#{r.id}" end,
row_click: nil,
wrapper_overflow_class: "overflow-visible",
row_item: &Function.identity/1,
col: [
%{
__slot__: :col,
label: "Name",
inner_block: fn _socket, item -> [item[:name] || ""] end
}
],
dynamic_cols: [],
action: []
}
html = render_component(&CoreComponents.table/1, assigns)
assert html =~ ~s(class="overflow-visible")
refute html =~ ~s(class="overflow-x-auto")
end
end
describe "sticky first column contract" do
test "when sticky_first_col is enabled, first header and body cells render sticky-left classes" do
rows = [%{id: "1", selected: true, name: "Alice"}]
assigns = %{
id: "test-table",
rows: rows,
row_id: fn r -> "row-#{r.id}" end,
row_click: nil,
sticky_first_col: true,
row_item: &Function.identity/1,
col: [
%{
__slot__: :col,
label: "Select",
inner_block: fn _socket, item -> [if(item[:selected], do: "x", else: "")] end
},
%{
__slot__: :col,
label: "Name",
inner_block: fn _socket, item -> [item[:name] || ""] end
}
],
dynamic_cols: [],
action: []
}
html = render_component(&CoreComponents.table/1, assigns)
assert html =~ "sticky"
assert html =~ "left-0"
assert html =~ "z-20"
assert html =~ "z-30"
end
test "sticky first column marks wrapper and uses CSS row backgrounds instead of row ring classes" do
rows = [%{id: "1", name: "Alice"}]
assigns = %{
id: "test-table",
rows: rows,
row_id: fn r -> "row-#{r.id}" end,
row_click: fn _ -> nil end,
sticky_first_col: true,
row_item: &Function.identity/1,
col: [
%{
__slot__: :col,
label: "Select",
inner_block: fn _socket, _item -> ["x"] end
},
%{
__slot__: :col,
label: "Name",
inner_block: fn _socket, item -> [item[:name] || ""] end
}
],
dynamic_cols: [],
action: []
}
html = render_component(&CoreComponents.table/1, assigns)
assert html =~ ~s(data-sticky-first-col-rows="true")
assert html =~ "sticky-first-col-cell"
refute html =~ "hover:ring-2"
end
test "sticky first column with selection sets data-selected without ring-primary" do
rows = [%{id: "one", name: "Alice"}, %{id: "two", name: "Bob"}]
assigns = %{
id: "test-table",
rows: rows,
row_id: fn r -> "row-#{r.id}" end,
row_click: fn _ -> nil end,
sticky_first_col: true,
selected_row_id: "two",
row_item: &Function.identity/1,
col: [
%{
__slot__: :col,
label: "Name",
inner_block: fn _socket, item -> [item[:name] || ""] end
}
],
dynamic_cols: [],
action: []
}
html = render_component(&CoreComponents.table/1, assigns)
assert html =~ ~s(data-selected="true")
refute html =~ "ring-primary"
end
end
end end

View file

@ -1,8 +1,22 @@
defmodule MvWeb.GlobalSettingsLiveTest do defmodule MvWeb.GlobalSettingsLiveTest do
use MvWeb.ConnCase, async: true use MvWeb.ConnCase, async: false
import Phoenix.LiveViewTest import Phoenix.LiveViewTest
alias Mv.Membership alias Mv.Membership
defp clear_smtp_env do
[
"SMTP_HOST",
"SMTP_PORT",
"SMTP_SSL",
"SMTP_USERNAME",
"SMTP_PASSWORD",
"SMTP_PASSWORD_FILE",
"MAIL_FROM_EMAIL",
"MAIL_FROM_NAME"
]
|> Enum.each(&System.delete_env/1)
end
describe "Global Settings LiveView" do describe "Global Settings LiveView" do
setup %{conn: conn} do setup %{conn: conn} do
user = create_test_user(%{email: "admin@example.com"}) user = create_test_user(%{email: "admin@example.com"})
@ -124,6 +138,85 @@ defmodule MvWeb.GlobalSettingsLiveTest do
{:ok, _view, html} = live(conn, ~p"/settings") {:ok, _view, html} = live(conn, ~p"/settings")
assert html =~ "SMTP" or html =~ "E-Mail" or html =~ "Settings" assert html =~ "SMTP" or html =~ "E-Mail" or html =~ "Settings"
end end
@tag :ui
test "disables all SMTP inputs when SMTP_HOST is set", %{conn: conn} do
clear_smtp_env()
System.put_env("SMTP_HOST", "smtp.env-only.example")
on_exit(fn -> clear_smtp_env() end)
{:ok, view, _html} = live(conn, ~p"/settings")
assert has_element?(view, "#setting_smtp_host[disabled]")
assert has_element?(view, "#setting_smtp_port[disabled]")
assert has_element?(view, "#setting_smtp_ssl[disabled]")
assert has_element?(view, "#setting_smtp_username[disabled]")
assert has_element?(view, "#setting_smtp_password[disabled]")
assert has_element?(view, "#setting_smtp_from_email[disabled]")
assert has_element?(view, "#setting_smtp_from_name[disabled]")
end
@tag :ui
test "does not render SMTP save action when SMTP_HOST is set", %{conn: conn} do
clear_smtp_env()
System.put_env("SMTP_HOST", "smtp.env-only.example")
on_exit(fn -> clear_smtp_env() end)
{:ok, view, _html} = live(conn, ~p"/settings")
refute has_element?(view, "#smtp-form button", "Save SMTP Settings")
end
@tag :ui
test "shows explicit ENV-only mode hint when SMTP_HOST is set", %{conn: conn} do
clear_smtp_env()
System.put_env("SMTP_HOST", "smtp.env-only.example")
on_exit(fn -> clear_smtp_env() end)
{:ok, _view, html} = live(conn, ~p"/settings")
assert html =~ "SMTP is fully managed via environment variables"
end
@tag :ui
test "shows warning block for missing required SMTP ENV values in ENV-only mode", %{
conn: conn
} do
clear_smtp_env()
System.put_env("SMTP_HOST", "smtp.env-only.example")
on_exit(fn -> clear_smtp_env() end)
{:ok, _view, html} = live(conn, ~p"/settings")
assert html =~ "SMTP environment configuration appears incomplete"
assert html =~ "SMTP_USERNAME"
assert html =~ "SMTP_PASSWORD/SMTP_PASSWORD_FILE"
end
@tag :ui
test "does not enter ENV-only mode when SMTP_HOST is not set", %{conn: conn} do
clear_smtp_env()
System.put_env("SMTP_USERNAME", "leftover@example.com")
on_exit(fn -> clear_smtp_env() end)
{:ok, view, html} = live(conn, ~p"/settings")
refute html =~ "SMTP is fully managed via environment variables"
refute html =~ "SMTP environment configuration appears incomplete"
refute has_element?(view, "#setting_smtp_host[disabled]")
refute has_element?(view, "#setting_smtp_username[disabled]")
end
@tag :ui
test "shows effective ENV SMTP host value in disabled field", %{conn: conn} do
clear_smtp_env()
System.put_env("SMTP_HOST", "smtp.env-active.example")
on_exit(fn -> clear_smtp_env() end)
{:ok, settings} = Membership.get_settings()
{:ok, _} = Membership.update_settings(settings, %{smtp_host: "smtp.db-legacy.example"})
{:ok, _view, html} = live(conn, ~p"/settings")
assert html =~ ~s(value="smtp.env-active.example")
refute html =~ ~s(value="smtp.db-legacy.example")
end
end end
describe "Authentication section when OIDC-only is enabled" do describe "Authentication section when OIDC-only is enabled" do

View file

@ -78,6 +78,37 @@ defmodule MvWeb.MemberLive.IndexTest do
assert html =~ "lg:top-0" assert html =~ "lg:top-0"
assert html =~ "bg-base-100" assert html =~ "bg-base-100"
end end
test "members page does not nest a second overflow wrapper inside members-table-scroll", %{
conn: conn
} do
conn = conn_with_oidc_user(conn)
{:ok, _view, html} = live(conn, ~p"/members")
assert html =~ ~s(id="members-keyboard")
assert html =~ ~s(class="overflow-visible")
refute html =~ ~s(id="members-keyboard" class="overflow-x-auto")
refute html =~ ~s(id="members-keyboard" class="overflow-auto")
end
test "members table keeps checkbox column sticky while horizontally scrolling", %{conn: conn} do
system_actor = SystemActor.get_system_actor()
{:ok, _member} =
Membership.create_member(
%{first_name: "Sticky", last_name: "Column", email: "sticky-column@example.com"},
actor: system_actor
)
conn = conn_with_oidc_user(conn)
{:ok, _view, html} = live(conn, ~p"/members")
# Contract: first column (select-all header + row checkbox cells) is sticky on the left
assert html =~ "left-0"
assert html =~ "sticky"
assert html =~ "z-30"
assert html =~ "z-20"
end
end end
describe "translations" do describe "translations" do
@ -339,10 +370,12 @@ defmodule MvWeb.MemberLive.IndexTest do
assert_redirect(view, ~p"/members/#{member}") assert_redirect(view, ~p"/members/#{member}")
end end
describe "table row outline (hover and selected)" do describe "table row highlight (hover and selected)" do
@describetag :ui @describetag :ui
test "clickable rows have hover and focus-within ring classes", %{conn: conn} do test "clickable rows with sticky first column use hover/focus background highlight", %{
conn: conn
} do
system_actor = SystemActor.get_system_actor() system_actor = SystemActor.get_system_actor()
{:ok, _member} = {:ok, _member} =
@ -354,10 +387,9 @@ defmodule MvWeb.MemberLive.IndexTest do
conn = conn_with_oidc_user(conn) conn = conn_with_oidc_user(conn)
{:ok, _view, html} = live(conn, "/members") {:ok, _view, html} = live(conn, "/members")
# CoreComponents table adds hover and focus-within ring when row_click is set # Sticky-first-column tables: hover/focus fills live in CSS; wrapper is marked for tests.
assert html =~ "hover:ring-2" assert html =~ ~s(data-sticky-first-col-rows="true")
assert html =~ "focus-within:ring-2" refute html =~ "hover:ring-2"
assert html =~ "hover:ring-base-content/10"
end end
test "selected outline only from checkbox selection, not from highlight param", %{conn: conn} do test "selected outline only from checkbox selection, not from highlight param", %{conn: conn} do