Compare commits
10 commits
bugfix/480
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 264a585d44 | |||
| 85e9d40f79 | |||
| 1e639f7e77 | |||
| fa9cd0a35b | |||
| ca1600d019 | |||
| 8062b2fd27 | |||
| fb59ef99c1 | |||
| d549e6878c | |||
| efb9faf537 | |||
| a12888de2f |
26 changed files with 469 additions and 440 deletions
4
.gitignore
vendored
4
.gitignore
vendored
|
|
@ -45,3 +45,7 @@ npm-debug.log
|
|||
# Docker secrets directory (generated by `just init-secrets`)
|
||||
/secrets/
|
||||
notes.md
|
||||
|
||||
# Do NOT commit these — they are local to the dev machine
|
||||
.pipeline/
|
||||
.claude/
|
||||
|
|
|
|||
|
|
@ -5,9 +5,11 @@ All notable changes to this project will be documented in this file.
|
|||
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
|
||||
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||
|
||||
## [Unreleased]
|
||||
## [1.2.0] - 2026-05-08
|
||||
|
||||
### 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 fields now respect their configured field types in the details view.
|
||||
- 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
|
||||
- **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.
|
||||
- **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
|
||||
- Mix dependencies were updated.
|
||||
|
|
|
|||
|
|
@ -1278,7 +1278,7 @@ mix hex.outdated
|
|||
**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-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`).
|
||||
- **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()`.
|
||||
- **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.
|
||||
|
|
|
|||
|
|
@ -247,11 +247,13 @@ If these cannot be met, use `secondary`/`outline` instead of `ghost`.
|
|||
### 8.1 Default behavior: row click opens details
|
||||
- **DEFAULT:** Clicking a row navigates to the details page.
|
||||
- **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):**
|
||||
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.
|
||||
|
||||
✅ Correct pattern (one click handler that both stops propagation and triggers an event):
|
||||
|
|
|
|||
10
Justfile
10
Justfile
|
|
@ -1,6 +1,12 @@
|
|||
set dotenv-load := true
|
||||
set export := true
|
||||
|
||||
# Non-interactive shells do not source .bashrc,
|
||||
# PATH includes asdf shims so that mix / elixir / iex resolve without per-shell
|
||||
# `source ~/.asdf/asdf.sh`. Recipes inherit this via `set export := true`.
|
||||
home := env_var('HOME')
|
||||
PATH := home + "/.asdf/shims:" + home + "/.asdf:" + home + "/.local/bin:/usr/local/bin:/usr/bin:/bin"
|
||||
|
||||
MIX_QUIET := "1"
|
||||
|
||||
run: install-dependencies start-database migrate-database seed-database
|
||||
|
|
@ -69,6 +75,10 @@ test-all *args: install-dependencies
|
|||
format:
|
||||
mix format
|
||||
|
||||
# Catch-all wrapper for arbitrary mix commands not exposed as their own recipe.
|
||||
mix *args:
|
||||
mix {{args}}
|
||||
|
||||
build-docker-container:
|
||||
docker build --tag mitgliederverwaltung .
|
||||
|
||||
|
|
|
|||
|
|
@ -708,3 +708,68 @@
|
|||
background-color: transparent !important;
|
||||
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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -188,7 +188,6 @@ Settings (1) → MembershipFeeType (0..1)
|
|||
### Member Constraints
|
||||
- First name and last name required (min 1 char)
|
||||
- Email unique, validated format (5-254 chars)
|
||||
- Join date cannot be in future
|
||||
- Exit date must be after join date
|
||||
- Phone: `+?[0-9\- ]{6,20}`
|
||||
- Postal code: optional (no format validation)
|
||||
|
|
|
|||
|
|
@ -124,7 +124,7 @@ Table members {
|
|||
first_name text [null, note: 'Member first name (min length: 1 if present)']
|
||||
last_name text [null, note: 'Member last name (min length: 1 if present)']
|
||||
email text [not null, unique, note: 'Member email address (5-254 chars, validated)']
|
||||
join_date date [null, note: 'Date when member joined club (cannot be in future)']
|
||||
join_date date [null, note: 'Date when member joined club']
|
||||
exit_date date [null, note: 'Date when member left club (must be after join_date)']
|
||||
notes text [null, note: 'Additional notes about member']
|
||||
city text [null, note: 'City of residence']
|
||||
|
|
@ -187,7 +187,6 @@ Table members {
|
|||
**Validation Rules:**
|
||||
- first_name, last_name: optional, but if present min 1 character
|
||||
- email: 5-254 characters, valid email format (required)
|
||||
- join_date: cannot be in future
|
||||
- exit_date: must be after join_date (if both present)
|
||||
- postal_code: optional (no format validation)
|
||||
- country: optional
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@ 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.
|
||||
|
||||
---
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ defmodule Mv.Membership.Member do
|
|||
## Validations
|
||||
- Required: email (all other fields are optional)
|
||||
- Email format validation (using EctoCommons.EmailValidator)
|
||||
- Date validations: join_date not in future, exit_date after join_date
|
||||
- Date validations: exit_date after join_date
|
||||
- Email uniqueness: prevents conflicts with unlinked users
|
||||
- Linked member email change: only admins or the linked user may change a linked member's email (see `Mv.Membership.Member.Validations.EmailChangePermission`)
|
||||
|
||||
|
|
@ -473,11 +473,6 @@ defmodule Mv.Membership.Member do
|
|||
end
|
||||
end
|
||||
|
||||
# Join date not in future
|
||||
validate compare(:join_date, less_than_or_equal_to: &Date.utc_today/0),
|
||||
where: [present(:join_date)],
|
||||
message: "cannot be in the future"
|
||||
|
||||
# Exit date not before join date
|
||||
validate compare(:exit_date, greater_than: :join_date),
|
||||
where: [present([:join_date, :exit_date])],
|
||||
|
|
|
|||
|
|
@ -178,18 +178,6 @@ defmodule Mv.Membership do
|
|||
end
|
||||
end
|
||||
|
||||
@doc """
|
||||
Invalidates the global settings cache.
|
||||
|
||||
This should be used by callers that update settings through paths outside of
|
||||
`update_settings/2` (for example, custom form submit flows) to keep reads via
|
||||
`get_settings/0` consistent across views.
|
||||
"""
|
||||
@spec invalidate_settings_cache() :: :ok
|
||||
def invalidate_settings_cache do
|
||||
SettingsCache.invalidate()
|
||||
end
|
||||
|
||||
@doc """
|
||||
Lists only required custom fields.
|
||||
|
||||
|
|
|
|||
|
|
@ -143,27 +143,6 @@ defmodule Mv.Config do
|
|||
|> parse_and_validate_integer(default)
|
||||
end
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Association name
|
||||
# ENV variable takes priority; fallback to Settings from database.
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
@doc """
|
||||
Returns the association name.
|
||||
|
||||
Reads from `ASSOCIATION_NAME` env first, then from Settings.
|
||||
"""
|
||||
@spec association_name() :: String.t() | nil
|
||||
def association_name do
|
||||
env_or_setting("ASSOCIATION_NAME", :club_name)
|
||||
end
|
||||
|
||||
@doc """
|
||||
Returns true if ASSOCIATION_NAME is set (field is read-only in Settings).
|
||||
"""
|
||||
@spec association_name_env_set?() :: boolean()
|
||||
def association_name_env_set?, do: env_set?("ASSOCIATION_NAME")
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Vereinfacht accounting software integration
|
||||
# ENV variables take priority; fallback to Settings from database.
|
||||
|
|
@ -491,11 +470,19 @@ defmodule Mv.Config do
|
|||
# ---------------------------------------------------------------------------
|
||||
|
||||
@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
|
||||
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
|
||||
|
||||
@doc """
|
||||
|
|
@ -543,7 +530,7 @@ defmodule Mv.Config do
|
|||
def smtp_password do
|
||||
if smtp_env_mode?() do
|
||||
case System.get_env("SMTP_PASSWORD") do
|
||||
nil -> smtp_password_from_file_or_settings()
|
||||
nil -> smtp_password_from_file()
|
||||
value -> trim_nil(value)
|
||||
end
|
||||
else
|
||||
|
|
@ -551,7 +538,7 @@ defmodule Mv.Config do
|
|||
end
|
||||
end
|
||||
|
||||
defp smtp_password_from_file_or_settings do
|
||||
defp smtp_password_from_file do
|
||||
case System.get_env("SMTP_PASSWORD_FILE") do
|
||||
nil -> nil
|
||||
path -> read_smtp_password_file(path)
|
||||
|
|
@ -589,14 +576,6 @@ defmodule Mv.Config do
|
|||
present?(smtp_host())
|
||||
end
|
||||
|
||||
@doc """
|
||||
Returns true when SMTP ENV mode is active.
|
||||
"""
|
||||
@spec smtp_env_configured?() :: boolean()
|
||||
def smtp_env_configured? do
|
||||
smtp_env_mode?()
|
||||
end
|
||||
|
||||
@doc """
|
||||
Returns true when SMTP is managed by environment variables.
|
||||
|
||||
|
|
@ -620,6 +599,7 @@ defmodule Mv.Config 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
|
||||
|
|
@ -686,8 +666,6 @@ defmodule Mv.Config do
|
|||
@spec mail_from_email_env_set?() :: boolean()
|
||||
def mail_from_email_env_set?, do: env_set?("MAIL_FROM_EMAIL")
|
||||
|
||||
defp parse_smtp_port_env(nil), do: nil
|
||||
|
||||
defp parse_smtp_port_env(value) when is_binary(value) do
|
||||
case Integer.parse(String.trim(value)) do
|
||||
{port, _} when port > 0 -> port
|
||||
|
|
@ -697,16 +675,8 @@ defmodule Mv.Config do
|
|||
|
||||
defp parse_smtp_port_env(_), do: nil
|
||||
|
||||
# Reads a plain string SMTP setting: ENV first, then Settings.
|
||||
defp smtp_env_or_setting(env_key, setting_key) do
|
||||
case System.get_env(env_key) do
|
||||
nil -> get_from_settings(setting_key)
|
||||
value -> trim_nil(value)
|
||||
end
|
||||
end
|
||||
|
||||
defp maybe_add_missing(acc, _label, true), do: acc
|
||||
defp maybe_add_missing(acc, label, false), do: acc ++ [label]
|
||||
defp maybe_add_missing(acc, label, false), do: [label | acc]
|
||||
|
||||
# Reads an integer setting attribute from Settings.
|
||||
defp get_from_settings_integer(key) do
|
||||
|
|
|
|||
|
|
@ -938,6 +938,16 @@ defmodule MvWeb.CoreComponents do
|
|||
doc:
|
||||
"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
|
||||
attr :label, :string
|
||||
attr :class, :string
|
||||
|
|
@ -974,15 +984,19 @@ defmodule MvWeb.CoreComponents do
|
|||
~H"""
|
||||
<div
|
||||
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"}
|
||||
>
|
||||
<table class="table table-zebra">
|
||||
<thead>
|
||||
<tr>
|
||||
<th
|
||||
:for={col <- @col}
|
||||
class={table_th_class(col, @sticky_header)}
|
||||
:for={{col, col_idx} <- Enum.with_index(@col)}
|
||||
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)}
|
||||
>
|
||||
{col[:label]}
|
||||
|
|
@ -1006,7 +1020,13 @@ defmodule MvWeb.CoreComponents do
|
|||
<tr
|
||||
:for={row <- @rows}
|
||||
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"}
|
||||
title={@row_click && @row_tooltip}
|
||||
>
|
||||
|
|
@ -1026,6 +1046,13 @@ defmodule MvWeb.CoreComponents do
|
|||
has_click = col[:col_click] || @row_click
|
||||
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 =
|
||||
if col_class == nil || (col_class && !String.contains?(col_class, "text-center")) do
|
||||
["truncate" | classes]
|
||||
|
|
@ -1040,7 +1067,7 @@ defmodule MvWeb.CoreComponents do
|
|||
classes
|
||||
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 =
|
||||
if @row_click && @first_row_click_col_idx == col_idx do
|
||||
[
|
||||
|
|
@ -1111,30 +1138,11 @@ defmodule MvWeb.CoreComponents do
|
|||
end
|
||||
end
|
||||
|
||||
# Returns CSS classes for table row: hover/focus-within outline when row_click is set,
|
||||
# and stronger selected outline when selected (WCAG: not color-only).
|
||||
# Hover/focus-within are omitted for the selected row so the selected ring stays visible.
|
||||
defp table_row_tr_class(row_click, selected?) do
|
||||
has_row_click? = not is_nil(row_click)
|
||||
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
|
||||
# Returns CSS classes for table row selection styles.
|
||||
# Hover/focus row highlighting is CSS-driven via [data-row-interactive] selectors in app.css.
|
||||
# Sticky-first-column zebra tables use CSS accents and omit selected row ring classes.
|
||||
defp table_row_tr_class(true, false), do: "ring-2 ring-inset ring-primary"
|
||||
defp table_row_tr_class(_, _), do: ""
|
||||
|
||||
defp table_th_aria_sort(col, sort_field, sort_order) do
|
||||
col_sort = Map.get(col, :sort_field)
|
||||
|
|
|
|||
|
|
@ -135,11 +135,8 @@ defmodule MvWeb.Layouts do
|
|||
slot :inner_block, required: true
|
||||
|
||||
def app(assigns) do
|
||||
# Single settings read for layout defaults.
|
||||
# Use an explicitly provided club_name as source of truth to avoid stale
|
||||
# values from cache reads immediately after a settings update in LiveViews.
|
||||
%{club_name: fallback_club_name, join_form_enabled: join_form_enabled} = get_layout_settings()
|
||||
club_name = assigns[:club_name] || fallback_club_name
|
||||
# Single get_settings() for layout; derive club_name and join_form_enabled to avoid duplicate query.
|
||||
%{club_name: club_name, join_form_enabled: join_form_enabled} = get_layout_settings()
|
||||
|
||||
# NOTE: Unprocessed count runs on every page load when join form is enabled; consider
|
||||
# loading only on navigation or caching briefly if performance becomes an issue.
|
||||
|
|
|
|||
|
|
@ -65,7 +65,6 @@ defmodule MvWeb.GlobalSettingsLive do
|
|||
|> assign(:settings, settings)
|
||||
|> assign(:locale, locale)
|
||||
|> assign(:environment, environment)
|
||||
|> assign(:association_name_env_set, Mv.Config.association_name_env_set?())
|
||||
|> assign(:vereinfacht_env_configured, Mv.Config.vereinfacht_env_configured?())
|
||||
|> assign(:vereinfacht_api_url_env_set, Mv.Config.vereinfacht_api_url_env_set?())
|
||||
|> assign(:vereinfacht_api_key_env_set, Mv.Config.vereinfacht_api_key_env_set?())
|
||||
|
|
@ -86,16 +85,8 @@ defmodule MvWeb.GlobalSettingsLive do
|
|||
|> assign(:oidc_configured, Mv.Config.oidc_configured?())
|
||||
|> assign(:oidc_client_secret_set, Mv.Config.oidc_client_secret_set?())
|
||||
|> 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_missing_required_env_keys, Mv.Config.smtp_missing_required_env_keys())
|
||||
|> assign(:smtp_host_env_set, Mv.Config.smtp_host_env_set?())
|
||||
|> 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_configured, Mv.Config.smtp_configured?())
|
||||
|> assign(:smtp_test_result, nil)
|
||||
|
|
@ -126,13 +117,6 @@ defmodule MvWeb.GlobalSettingsLive do
|
|||
<div class="mt-6 space-y-6 max-w-4xl px-4">
|
||||
<%!-- Club Settings Section --%>
|
||||
<.form_section title={gettext("Club Settings")}>
|
||||
<%= if @association_name_env_set do %>
|
||||
<p class="text-sm text-base-content/70 mb-4">
|
||||
{gettext(
|
||||
"Association name is set via environment variable ASSOCIATION_NAME. This field is read-only."
|
||||
)}
|
||||
</p>
|
||||
<% end %>
|
||||
<.form for={@form} id="settings-form" phx-change="validate" phx-submit="save">
|
||||
<div class="w-100">
|
||||
<.input
|
||||
|
|
@ -140,18 +124,10 @@ defmodule MvWeb.GlobalSettingsLive do
|
|||
type="text"
|
||||
label={gettext("Association Name")}
|
||||
required
|
||||
disabled={@association_name_env_set}
|
||||
placeholder={
|
||||
if(@association_name_env_set, do: gettext("From ASSOCIATION_NAME"), else: nil)
|
||||
}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<.button
|
||||
:if={not @association_name_env_set}
|
||||
phx-disable-with={gettext("Saving...")}
|
||||
variant="primary"
|
||||
>
|
||||
<.button phx-disable-with={gettext("Saving...")} variant="primary">
|
||||
{gettext("Save Name")}
|
||||
</.button>
|
||||
</.form>
|
||||
|
|
@ -377,19 +353,14 @@ defmodule MvWeb.GlobalSettingsLive do
|
|||
type="text"
|
||||
label={gettext("Host")}
|
||||
disabled={@smtp_env_mode}
|
||||
placeholder={
|
||||
if(@smtp_host_env_set,
|
||||
do: gettext("From SMTP_HOST"),
|
||||
else: "smtp.example.com"
|
||||
)
|
||||
}
|
||||
placeholder="smtp.example.com"
|
||||
/>
|
||||
<.input
|
||||
field={@form[:smtp_port]}
|
||||
type="number"
|
||||
label={gettext("Port")}
|
||||
disabled={@smtp_env_mode}
|
||||
placeholder={if(@smtp_port_env_set, do: gettext("From SMTP_PORT"), else: "587")}
|
||||
placeholder="587"
|
||||
/>
|
||||
<.input
|
||||
field={@form[:smtp_ssl]}
|
||||
|
|
@ -401,7 +372,6 @@ defmodule MvWeb.GlobalSettingsLive do
|
|||
{gettext("SSL (port 465)"), "ssl"},
|
||||
{gettext("None (port 25, insecure)"), "none"}
|
||||
]}
|
||||
placeholder={if(@smtp_ssl_env_set, do: gettext("From SMTP_SSL"), else: nil)}
|
||||
/>
|
||||
</div>
|
||||
|
||||
|
|
@ -411,12 +381,7 @@ defmodule MvWeb.GlobalSettingsLive do
|
|||
type="text"
|
||||
label={gettext("Username")}
|
||||
disabled={@smtp_env_mode}
|
||||
placeholder={
|
||||
if(@smtp_username_env_set,
|
||||
do: gettext("From SMTP_USERNAME"),
|
||||
else: "user@example.com"
|
||||
)
|
||||
}
|
||||
placeholder="user@example.com"
|
||||
/>
|
||||
<.input
|
||||
field={@form[:smtp_password]}
|
||||
|
|
@ -424,14 +389,11 @@ defmodule MvWeb.GlobalSettingsLive do
|
|||
label={gettext("Password")}
|
||||
disabled={@smtp_env_mode}
|
||||
placeholder={
|
||||
if(@smtp_password_env_set,
|
||||
do: gettext("From SMTP_PASSWORD"),
|
||||
else:
|
||||
if(@smtp_password_set,
|
||||
do: gettext("Leave blank to keep current"),
|
||||
else: nil
|
||||
)
|
||||
)
|
||||
if @smtp_env_mode do
|
||||
gettext("From SMTP_PASSWORD")
|
||||
else
|
||||
if @smtp_password_set, do: gettext("Leave blank to keep current"), else: nil
|
||||
end
|
||||
}
|
||||
/>
|
||||
</div>
|
||||
|
|
@ -442,21 +404,14 @@ defmodule MvWeb.GlobalSettingsLive do
|
|||
type="email"
|
||||
label={gettext("Sender email (From)")}
|
||||
disabled={@smtp_env_mode}
|
||||
placeholder={
|
||||
if(@smtp_from_email_env_set,
|
||||
do: gettext("From MAIL_FROM_EMAIL"),
|
||||
else: "noreply@example.com"
|
||||
)
|
||||
}
|
||||
placeholder="noreply@example.com"
|
||||
/>
|
||||
<.input
|
||||
field={@form[:smtp_from_name]}
|
||||
type="text"
|
||||
label={gettext("Sender name (From)")}
|
||||
disabled={@smtp_env_mode}
|
||||
placeholder={
|
||||
if(@smtp_from_name_env_set, do: gettext("From MAIL_FROM_NAME"), else: "Mila")
|
||||
}
|
||||
placeholder="Mila"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -466,12 +421,7 @@ defmodule MvWeb.GlobalSettingsLive do
|
|||
)}
|
||||
</p>
|
||||
<.button
|
||||
:if={
|
||||
not @smtp_env_mode and
|
||||
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)
|
||||
}
|
||||
:if={not @smtp_env_mode}
|
||||
phx-disable-with={gettext("Saving...")}
|
||||
variant="primary"
|
||||
class="mt-2"
|
||||
|
|
@ -935,7 +885,6 @@ defmodule MvWeb.GlobalSettingsLive do
|
|||
# Never send blank API key / client secret / smtp password so we do not overwrite stored secrets
|
||||
setting_params_clean =
|
||||
setting_params
|
||||
|> drop_env_managed_association_name()
|
||||
|> drop_blank_vereinfacht_api_key()
|
||||
|> drop_blank_oidc_client_secret()
|
||||
|> drop_blank_smtp_password()
|
||||
|
|
@ -944,10 +893,6 @@ defmodule MvWeb.GlobalSettingsLive do
|
|||
|
||||
case MvWeb.LiveHelpers.submit_form(socket.assigns.form, setting_params_clean, actor) do
|
||||
{:ok, updated_settings} ->
|
||||
# Keep cross-view reads consistent after settings updates (layouts/sidebar
|
||||
# read via Membership.get_settings/0).
|
||||
Membership.invalidate_settings_cache()
|
||||
|
||||
# Use the returned record for the form so saved values show immediately;
|
||||
# get_settings() can return cached data without the new attribute until reload.
|
||||
test_result =
|
||||
|
|
@ -962,9 +907,9 @@ defmodule MvWeb.GlobalSettingsLive do
|
|||
|> assign(:oidc_only, Mv.Config.oidc_only?())
|
||||
|> assign(:oidc_configured, Mv.Config.oidc_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_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)
|
||||
|> put_flash(:success, gettext("Settings updated successfully"))
|
||||
|> assign_form()
|
||||
|
|
@ -1216,19 +1161,10 @@ defmodule MvWeb.GlobalSettingsLive do
|
|||
end
|
||||
end
|
||||
|
||||
defp drop_env_managed_association_name(params) when is_map(params) do
|
||||
if Mv.Config.association_name_env_set?() do
|
||||
Map.delete(params, "club_name")
|
||||
else
|
||||
params
|
||||
end
|
||||
end
|
||||
|
||||
defp assign_form(%{assigns: %{settings: settings}} = socket) do
|
||||
# Show ENV values in disabled fields (Association Name, Vereinfacht, OIDC, SMTP); never expose secrets in form
|
||||
# Show ENV values in disabled fields (Vereinfacht, OIDC, SMTP); never expose secrets in form
|
||||
settings_display =
|
||||
settings
|
||||
|> merge_association_env_values()
|
||||
|> merge_vereinfacht_env_values()
|
||||
|> merge_oidc_env_values()
|
||||
|> merge_smtp_env_values()
|
||||
|
|
@ -1255,15 +1191,6 @@ defmodule MvWeb.GlobalSettingsLive do
|
|||
defp put_if_env_set(map, _key, false, _value), do: map
|
||||
defp put_if_env_set(map, key, true, value), do: Map.put(map, key, value)
|
||||
|
||||
defp merge_association_env_values(s) do
|
||||
put_if_env_set(
|
||||
s,
|
||||
:club_name,
|
||||
Mv.Config.association_name_env_set?(),
|
||||
Mv.Config.association_name()
|
||||
)
|
||||
end
|
||||
|
||||
defp merge_vereinfacht_env_values(s) do
|
||||
s
|
||||
|> put_if_env_set(
|
||||
|
|
@ -1322,25 +1249,17 @@ defmodule MvWeb.GlobalSettingsLive do
|
|||
end
|
||||
|
||||
defp merge_smtp_env_values(s) do
|
||||
s
|
||||
|> put_if_env_set(:smtp_host, Mv.Config.smtp_host_env_set?(), Mv.Config.smtp_host())
|
||||
|> put_if_env_set(:smtp_port, Mv.Config.smtp_port_env_set?(), Mv.Config.smtp_port())
|
||||
|> put_if_env_set(
|
||||
:smtp_username,
|
||||
Mv.Config.smtp_username_env_set?(),
|
||||
Mv.Config.smtp_username()
|
||||
)
|
||||
|> put_if_env_set(:smtp_ssl, Mv.Config.smtp_ssl_env_set?(), Mv.Config.smtp_ssl())
|
||||
|> put_if_env_set(
|
||||
: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()
|
||||
)
|
||||
if Mv.Config.smtp_env_mode?() do
|
||||
s
|
||||
|> Map.put(:smtp_host, Mv.Config.smtp_host())
|
||||
|> Map.put(:smtp_port, Mv.Config.smtp_port())
|
||||
|> Map.put(:smtp_username, Mv.Config.smtp_username())
|
||||
|> Map.put(:smtp_ssl, Mv.Config.smtp_ssl())
|
||||
|> Map.put(:smtp_from_email, Mv.Config.mail_from_email())
|
||||
|> Map.put(:smtp_from_name, Mv.Config.mail_from_name())
|
||||
else
|
||||
s
|
||||
end
|
||||
end
|
||||
|
||||
defp enrich_sync_errors([]), do: []
|
||||
|
|
|
|||
|
|
@ -105,7 +105,9 @@
|
|||
<.table
|
||||
id="members"
|
||||
rows={@members}
|
||||
wrapper_overflow_class="overflow-visible"
|
||||
sticky_header={true}
|
||||
sticky_first_col={true}
|
||||
row_id={fn member -> "row-#{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")}
|
||||
|
|
|
|||
10
mix.lock
10
mix.lock
|
|
@ -18,11 +18,11 @@
|
|||
"comeonin": {:hex, :comeonin, "5.5.1", "5113e5f3800799787de08a6e0db307133850e635d34e9fab23c70b6501669510", [:mix], [], "hexpm", "65aac8f19938145377cee73973f192c5645873dcf550a8a6b18187d17c13ccdb"},
|
||||
"cowboy": {:hex, :cowboy, "2.14.2", "4008be1df6ade45e4f2a4e9e2d22b36d0b5aba4e20b0a0d7049e28d124e34847", [:make, :rebar3], [{:cowlib, ">= 2.16.0 and < 3.0.0", [hex: :cowlib, repo: "hexpm", optional: false]}, {:ranch, ">= 1.8.0 and < 3.0.0", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm", "569081da046e7b41b5df36aa359be71a0c8874e5b9cff6f747073fc57baf1ab9"},
|
||||
"cowboy_telemetry": {:hex, :cowboy_telemetry, "0.4.0", "f239f68b588efa7707abce16a84d0d2acf3a0f50571f8bb7f56a15865aae820c", [:rebar3], [{:cowboy, "~> 2.7", [hex: :cowboy, repo: "hexpm", optional: false]}, {:telemetry, "~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "7d98bac1ee4565d31b62d59f8823dfd8356a169e7fcbb83831b8a5397404c9de"},
|
||||
"cowlib": {:hex, :cowlib, "2.16.0", "54592074ebbbb92ee4746c8a8846e5605052f29309d3a873468d76cdf932076f", [:make, :rebar3], [], "hexpm", "7f478d80d66b747344f0ea7708c187645cfcc08b11aa424632f78e25bf05db51"},
|
||||
"cowlib": {:hex, :cowlib, "2.16.1", "318d385d55f657e9a5005838c4e426e13dcd724a691438384b6165a69687e531", [:make, :rebar3], [], "hexpm", "58f1e425a9e04176f1d30e20116f57c4e90ef0e187552e9741c465bdf4044f70"},
|
||||
"credo": {:hex, :credo, "1.7.18", "5c5596bf7aedf9c8c227f13272ac499fe8eae6237bd326f2f07dfc173786f042", [:mix], [{:bunt, "~> 0.2.1 or ~> 1.0", [hex: :bunt, repo: "hexpm", optional: false]}, {:file_system, "~> 0.2 or ~> 1.0", [hex: :file_system, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "a189d164685fd945809e862fe76a7420c4398fa288d76257662aecb909d6b3e5"},
|
||||
"crux": {:hex, :crux, "0.1.2", "4441c9e3a34f1e340954ce96b9ad5a2de13ceb4f97b3f910211227bb92e2ca90", [:mix], [{:picosat_elixir, "~> 0.2", [hex: :picosat_elixir, repo: "hexpm", optional: true]}, {:simple_sat, ">= 0.1.1 and < 1.0.0-0", [hex: :simple_sat, repo: "hexpm", optional: true]}, {:stream_data, "~> 1.0", [hex: :stream_data, repo: "hexpm", optional: true]}], "hexpm", "563ea3748ebfba9cc078e6d198a1d6a06015a8fae503f0b721363139f0ddb350"},
|
||||
"db_connection": {:hex, :db_connection, "2.10.0", "8ff756471e41765bd5563b633f73e9a94bbc138816e8644bb17d0d91bf260a95", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "02cdd01b45efb1b550e68edbbea41be32de9b24bb07e1ea0e9cbc522ac377e54"},
|
||||
"decimal": {:hex, :decimal, "2.3.0", "3ad6255aa77b4a3c4f818171b12d237500e63525c2fd056699967a3e7ea20f62", [:mix], [], "hexpm", "a4d66355cb29cb47c3cf30e71329e58361cfcb37c34235ef3bf1d7bf3773aeac"},
|
||||
"db_connection": {:hex, :db_connection, "2.10.1", "d5465f6bcc125c1b8981c1dbf23c193ca16f446ec0b25832dc174f74f18be510", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "18ed94c6e627b4bf452dbd4df61b69a35a1e768525140bc1917b7a685026a6a3"},
|
||||
"decimal": {:hex, :decimal, "3.1.0", "9ede268cff827e6f0c4fb1b34747c82630dce5d7b877dfb22ec8f0cb25855fce", [:mix], [], "hexpm", "e8b3efb3bb3a13cb5e4268ffe128569067b1972e9dee013537c71a5b073168f9"},
|
||||
"dns_cluster": {:hex, :dns_cluster, "0.2.0", "aa8eb46e3bd0326bd67b84790c561733b25c5ba2fe3c7e36f28e88f384ebcb33", [:mix], [], "hexpm", "ba6f1893411c69c01b9e8e8f772062535a4cf70f3f35bcc964a324078d8c8240"},
|
||||
"ecto": {:hex, :ecto, "3.13.6", "352135b474f91d1ab99a1b502171d207e9db60421c9e3d0ecab4c7ab96b24d14", [:mix], [{:decimal, "~> 2.0 or ~> 3.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "8afa059bc16cd2c94739ec0a11e3e5df69d828125119109bef35f20a21a76af2"},
|
||||
"ecto_commons": {:hex, :ecto_commons, "0.3.7", "f33c162a6f63695d5939af02c65a0e76aa6e7278b82c7bfc357ffbfea353bf0f", [:mix], [{:burnex, "~> 3.0", [hex: :burnex, repo: "hexpm", optional: true]}, {:ecto, "~> 3.4", [hex: :ecto, repo: "hexpm", optional: false]}, {:ex_phone_number, "~> 0.4", [hex: :ex_phone_number, repo: "hexpm", optional: false]}, {:luhn, "~> 0.3.0", [hex: :luhn, repo: "hexpm", optional: false]}], "hexpm", "9c33771ebd38cd83d3f90fab6069826ba9d4f7580f1481b3c0913f8b9795c5fd"},
|
||||
|
|
@ -74,7 +74,7 @@
|
|||
"plug": {:hex, :plug, "1.19.1", "09bac17ae7a001a68ae393658aa23c7e38782be5c5c00c80be82901262c394c0", [:mix], [{:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.1.1 or ~> 1.2 or ~> 2.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.3 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "560a0017a8f6d5d30146916862aaf9300b7280063651dd7e532b8be168511e62"},
|
||||
"plug_cowboy": {:hex, :plug_cowboy, "2.8.1", "5aa391a5e8d1ac3192e36a3bcaff12b5fd6ef6c7e29b53a38e63a860783e77d0", [:mix], [{:cowboy, "~> 2.7", [hex: :cowboy, repo: "hexpm", optional: false]}, {:cowboy_telemetry, "~> 0.3", [hex: :cowboy_telemetry, repo: "hexpm", optional: false]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "4c200288673d5bc86a0ab7dc6a2a069176a74e5d573ef62740a1c517458a5f26"},
|
||||
"plug_crypto": {:hex, :plug_crypto, "2.1.1", "19bda8184399cb24afa10be734f84a16ea0a2bc65054e23a62bb10f06bc89491", [:mix], [], "hexpm", "6470bce6ffe41c8bd497612ffde1a7e4af67f36a15eea5f921af71cf3e11247c"},
|
||||
"postgrex": {:hex, :postgrex, "0.22.1", "b3665ad17e15441557da8f45eeebfcd56e4a2b0b98538b855679a13d05e5cc5d", [:mix], [{:db_connection, "~> 2.9", [hex: :db_connection, repo: "hexpm", optional: false]}, {:decimal, "~> 1.5 or ~> 2.0 or ~> 3.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:table, "~> 0.1.0", [hex: :table, repo: "hexpm", optional: true]}], "hexpm", "df59f828b167b49a5853f645b65f57eb1bc5f3b230497ceaca7af5d8ac05afef"},
|
||||
"postgrex": {:hex, :postgrex, "0.22.2", "4aec14df2a72722aee92492566edbeeb44e233ecb86b1915d03136297ef1385d", [:mix], [{:db_connection, "~> 2.9", [hex: :db_connection, repo: "hexpm", optional: false]}, {:decimal, "~> 1.5 or ~> 2.0 or ~> 3.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:table, "~> 0.1.0", [hex: :table, repo: "hexpm", optional: true]}], "hexpm", "8946382ddb06294f56026ac4278b3cc212bac8a2c82ed68b4087819ed1abc53b"},
|
||||
"ranch": {:hex, :ranch, "1.8.1", "208169e65292ac5d333d6cdbad49388c1ae198136e4697ae2f474697140f201c", [:make, :rebar3], [], "hexpm", "aed58910f4e21deea992a67bf51632b6d60114895eb03bb392bb733064594dd0"},
|
||||
"reactor": {:hex, :reactor, "1.0.1", "ca3b5cf3c04ec8441e67ea2625d0294939822060b1bfd00ffdaaf75b7682d991", [:mix], [{:igniter, "~> 0.4", [hex: :igniter, repo: "hexpm", optional: true]}, {:iterex, "~> 0.1", [hex: :iterex, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:libgraph, "~> 0.16", [hex: :libgraph, repo: "hexpm", optional: false]}, {:spark, ">= 2.3.3 and < 3.0.0-0", [hex: :spark, repo: "hexpm", optional: false]}, {:splode, "~> 0.2", [hex: :splode, repo: "hexpm", optional: false]}, {:telemetry, "~> 1.2", [hex: :telemetry, repo: "hexpm", optional: false]}, {:yaml_elixir, "~> 2.11", [hex: :yaml_elixir, repo: "hexpm", optional: false]}, {:ymlr, "~> 5.0", [hex: :ymlr, repo: "hexpm", optional: false]}], "hexpm", "3497db2b204c9a3cabdaf1b26d2405df1dfbb138ce0ce50e616e9db19fec0043"},
|
||||
"req": {:hex, :req, "0.5.17", "0096ddd5b0ed6f576a03dde4b158a0c727215b15d2795e59e0916c6971066ede", [:mix], [{:brotli, "~> 0.3.1", [hex: :brotli, repo: "hexpm", optional: true]}, {:ezstd, "~> 1.0", [hex: :ezstd, repo: "hexpm", optional: true]}, {:finch, "~> 0.17", [hex: :finch, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:mime, "~> 2.0.6 or ~> 2.1", [hex: :mime, repo: "hexpm", optional: false]}, {:nimble_csv, "~> 1.0", [hex: :nimble_csv, repo: "hexpm", optional: true]}, {:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "0b8bc6ffdfebbc07968e59d3ff96d52f2202d0536f10fef4dc11dc02a2a43e39"},
|
||||
|
|
@ -90,7 +90,7 @@
|
|||
"sweet_xml": {:hex, :sweet_xml, "0.7.5", "803a563113981aaac202a1dbd39771562d0ad31004ddbfc9b5090bdcd5605277", [:mix], [], "hexpm", "193b28a9b12891cae351d81a0cead165ffe67df1b73fe5866d10629f4faefb12"},
|
||||
"swoosh": {:hex, :swoosh, "1.25.1", "569fcff34817da8a03f28775146b3c8b71b4c9b14f8f78d37ff3ef422862a18b", [:mix], [{:bandit, ">= 1.0.0", [hex: :bandit, repo: "hexpm", optional: true]}, {:cowboy, "~> 1.1 or ~> 2.4", [hex: :cowboy, repo: "hexpm", optional: true]}, {:ex_aws, "~> 2.1", [hex: :ex_aws, repo: "hexpm", optional: true]}, {:finch, "~> 0.6", [hex: :finch, repo: "hexpm", optional: true]}, {:gen_smtp, "~> 0.13 or ~> 1.0", [hex: :gen_smtp, repo: "hexpm", optional: true]}, {:hackney, "~> 1.9", [hex: :hackney, repo: "hexpm", optional: true]}, {:idna, "~> 6.0", [hex: :idna, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:mail, "~> 0.2", [hex: :mail, repo: "hexpm", optional: true]}, {:mime, "~> 1.1 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:mua, "~> 0.2.3", [hex: :mua, repo: "hexpm", optional: true]}, {:multipart, "~> 0.4", [hex: :multipart, repo: "hexpm", optional: true]}, {:plug, "~> 1.9", [hex: :plug, repo: "hexpm", optional: true]}, {:plug_cowboy, ">= 1.0.0", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:req, "~> 0.5.10 or ~> 0.6 or ~> 1.0", [hex: :req, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.2 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "58b3e8db6406fe417a89b5042358d2e8f15d32a3317d4f8581d7a3ae501e410b"},
|
||||
"tailwind": {:hex, :tailwind, "0.4.1", "e7bcc222fe96a1e55f948e76d13dd84a1a7653fb051d2a167135db3b4b08d3e9", [:mix], [], "hexpm", "6249d4f9819052911120dbdbe9e532e6bd64ea23476056adb7f730aa25c220d1"},
|
||||
"telemetry": {:hex, :telemetry, "1.4.1", "ab6de178e2b29b58e8256b92b382ea3f590a47152ca3651ea857a6cae05ac423", [:rebar3], [], "hexpm", "2172e05a27531d3d31dd9782841065c50dd5c3c7699d95266b2edd54c2dafa1c"},
|
||||
"telemetry": {:hex, :telemetry, "1.4.2", "a0cb522801dffb1c49fe6e30561badffc7b6d0e180db1300df759faa22062855", [:rebar3], [], "hexpm", "928f6495066506077862c0d1646609eed891a4326bee3126ba54b60af61febb1"},
|
||||
"telemetry_metrics": {:hex, :telemetry_metrics, "1.1.0", "5bd5f3b5637e0abea0426b947e3ce5dd304f8b3bc6617039e2b5a008adc02f8f", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "e7b79e8ddfde70adb6db8a6623d1778ec66401f366e9a8f5dd0955c56bc8ce67"},
|
||||
"telemetry_poller": {:hex, :telemetry_poller, "1.3.0", "d5c46420126b5ac2d72bc6580fb4f537d35e851cc0f8dbd571acf6d6e10f5ec7", [:rebar3], [{:telemetry, "~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "51f18bed7128544a50f75897db9974436ea9bfba560420b646af27a9a9b35211"},
|
||||
"text_diff": {:hex, :text_diff, "0.1.0", "1caf3175e11a53a9a139bc9339bd607c47b9e376b073d4571c031913317fecaa", [:mix], [], "hexpm", "d1ffaaecab338e49357b6daa82e435f877e0649041ace7755583a0ea3362dbd7"},
|
||||
|
|
|
|||
|
|
@ -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)"
|
||||
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
|
||||
#, elixir-autogen, elixir-format
|
||||
msgid "From OIDC_ADMIN_GROUP_NAME"
|
||||
|
|
@ -1429,31 +1419,11 @@ msgstr "Aus OIDC_ONLY"
|
|||
msgid "From 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
|
||||
#, elixir-autogen, elixir-format
|
||||
msgid "From 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
|
||||
#, elixir-autogen, elixir-format
|
||||
msgid "From VEREINFACHT_API_KEY"
|
||||
|
|
@ -3927,13 +3897,3 @@ msgstr "Die SMTP-Umgebungs-Konfiguration ist unvollständig. Fehlend: %{keys}"
|
|||
#, 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."
|
||||
|
||||
#: lib/mv_web/live/global_settings_live.ex
|
||||
#, elixir-autogen, elixir-format
|
||||
msgid "Association name is set via environment variable ASSOCIATION_NAME. This field is read-only."
|
||||
msgstr "Der Vereinsname wird über die Umgebungsvariable ASSOCIATION_NAME gesetzt. Dieses Feld ist schreibgeschützt."
|
||||
|
||||
#: lib/mv_web/live/global_settings_live.ex
|
||||
#, elixir-autogen, elixir-format
|
||||
msgid "From ASSOCIATION_NAME"
|
||||
msgstr "Aus ASSOCIATION_NAME"
|
||||
|
|
|
|||
|
|
@ -1385,16 +1385,6 @@ msgstr ""
|
|||
msgid "From %{first} to %{last} (relevant years with membership data)"
|
||||
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
|
||||
#, elixir-autogen, elixir-format
|
||||
msgid "From OIDC_ADMIN_GROUP_NAME"
|
||||
|
|
@ -1430,31 +1420,11 @@ msgstr ""
|
|||
msgid "From OIDC_REDIRECT_URI"
|
||||
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
|
||||
#, elixir-autogen, elixir-format
|
||||
msgid "From SMTP_PASSWORD"
|
||||
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
|
||||
#, elixir-autogen, elixir-format
|
||||
msgid "From VEREINFACHT_API_KEY"
|
||||
|
|
@ -3927,13 +3897,3 @@ msgstr ""
|
|||
#, elixir-autogen, elixir-format
|
||||
msgid "SMTP is fully managed via environment variables. All SMTP fields are read-only."
|
||||
msgstr ""
|
||||
|
||||
#: lib/mv_web/live/global_settings_live.ex
|
||||
#, elixir-autogen, elixir-format
|
||||
msgid "Association name is set via environment variable ASSOCIATION_NAME. This field is read-only."
|
||||
msgstr ""
|
||||
|
||||
#: lib/mv_web/live/global_settings_live.ex
|
||||
#, elixir-autogen, elixir-format
|
||||
msgid "From ASSOCIATION_NAME"
|
||||
msgstr ""
|
||||
|
|
|
|||
|
|
@ -1385,16 +1385,6 @@ msgstr ""
|
|||
msgid "From %{first} to %{last} (relevant years with membership data)"
|
||||
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
|
||||
#, elixir-autogen, elixir-format
|
||||
msgid "From OIDC_ADMIN_GROUP_NAME"
|
||||
|
|
@ -1430,31 +1420,11 @@ msgstr ""
|
|||
msgid "From OIDC_REDIRECT_URI"
|
||||
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
|
||||
#, elixir-autogen, elixir-format
|
||||
msgid "From SMTP_PASSWORD"
|
||||
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
|
||||
#, elixir-autogen, elixir-format
|
||||
msgid "From VEREINFACHT_API_KEY"
|
||||
|
|
@ -3926,14 +3896,4 @@ 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 ""
|
||||
|
||||
#: lib/mv_web/live/global_settings_live.ex
|
||||
#, elixir-autogen, elixir-format
|
||||
msgid "Association name is set via environment variable ASSOCIATION_NAME. This field is read-only."
|
||||
msgstr "Association name is set via environment variable ASSOCIATION_NAME. This field is read-only."
|
||||
|
||||
#: lib/mv_web/live/global_settings_live.ex
|
||||
#, elixir-autogen, elixir-format
|
||||
msgid "From ASSOCIATION_NAME"
|
||||
msgstr "From ASSOCIATION_NAME"
|
||||
msgstr "SMTP is fully managed via environment variables. All SMTP fields are read-only."
|
||||
|
|
|
|||
|
|
@ -49,12 +49,43 @@ defmodule Mv.Membership.MemberTest do
|
|||
assert error_message(errors, :email) =~ "is not a valid email"
|
||||
end
|
||||
|
||||
test "Join date cannot be in the future", %{actor: actor} do
|
||||
test "Join date can be in the future", %{actor: actor} do
|
||||
attrs = Map.put(@valid_attrs, :join_date, Date.utc_today() |> Date.add(1))
|
||||
|
||||
assert {:error,
|
||||
%Ash.Error.Invalid{errors: [%Ash.Error.Changes.InvalidAttribute{field: :join_date}]}} =
|
||||
assert {:ok, _member} = Membership.create_member(attrs, actor: actor)
|
||||
end
|
||||
|
||||
test "Join date far in the future (2099) is accepted", %{actor: actor} do
|
||||
attrs = Map.put(@valid_attrs, :join_date, ~D[2099-12-31])
|
||||
|
||||
assert {:ok, _member} = Membership.create_member(attrs, actor: actor)
|
||||
end
|
||||
|
||||
test "Join date today is accepted", %{actor: actor} do
|
||||
attrs = Map.put(@valid_attrs, :join_date, Date.utc_today())
|
||||
|
||||
assert {:ok, _member} = Membership.create_member(attrs, actor: actor)
|
||||
end
|
||||
|
||||
test "Join date in the future is accepted on update", %{actor: actor} do
|
||||
{:ok, member} = Membership.create_member(@valid_attrs, actor: actor)
|
||||
|
||||
assert {:ok, _updated} =
|
||||
Membership.update_member(member, %{join_date: Date.utc_today() |> Date.add(30)},
|
||||
actor: actor
|
||||
)
|
||||
end
|
||||
|
||||
test "Exit date before future join date is rejected", %{actor: actor} do
|
||||
attrs =
|
||||
@valid_attrs
|
||||
|> Map.put(:join_date, Date.utc_today() |> Date.add(10))
|
||||
|> Map.put(:exit_date, Date.utc_today() |> Date.add(5))
|
||||
|
||||
assert {:error, %Ash.Error.Invalid{errors: errors}} =
|
||||
Membership.create_member(attrs, actor: actor)
|
||||
|
||||
assert error_message(errors, :exit_date) =~ "cannot be before join date"
|
||||
end
|
||||
|
||||
test "Exit date is optional but must not be before join date if both are specified", %{
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ defmodule Mv.ConfigSmtpTest do
|
|||
@moduledoc """
|
||||
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
|
||||
we mutate ENV.
|
||||
"""
|
||||
|
|
@ -52,10 +52,10 @@ defmodule Mv.ConfigSmtpTest do
|
|||
end
|
||||
end
|
||||
|
||||
describe "smtp_env_configured?/0" do
|
||||
describe "smtp_env_mode?/0" do
|
||||
test "returns true when SMTP_HOST is set" do
|
||||
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
|
||||
|
|
@ -63,14 +63,14 @@ defmodule Mv.ConfigSmtpTest do
|
|||
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_configured?()
|
||||
refute Mv.Config.smtp_env_mode?()
|
||||
after
|
||||
clear_smtp_env()
|
||||
end
|
||||
|
||||
test "returns false when no SMTP ENV variables are set" do
|
||||
clear_smtp_env()
|
||||
refute Mv.Config.smtp_env_configured?()
|
||||
refute Mv.Config.smtp_env_mode?()
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ defmodule MvWeb.Components.CoreComponentsTableTest do
|
|||
alias MvWeb.CoreComponents
|
||||
|
||||
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"}]
|
||||
|
||||
assigns = %{
|
||||
|
|
@ -31,12 +31,12 @@ defmodule MvWeb.Components.CoreComponentsTableTest do
|
|||
|
||||
html = render_component(&CoreComponents.table/1, assigns)
|
||||
|
||||
assert html =~ "hover:ring-2"
|
||||
assert html =~ "focus-within:ring-2"
|
||||
assert html =~ "hover:ring-base-content/10"
|
||||
assert html =~ ~s(data-row-interactive="true")
|
||||
refute html =~ "hover:ring-2"
|
||||
refute html =~ "focus-within:ring-2"
|
||||
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"}]
|
||||
|
||||
assigns = %{
|
||||
|
|
@ -58,8 +58,7 @@ defmodule MvWeb.Components.CoreComponentsTableTest do
|
|||
|
||||
html = render_component(&CoreComponents.table/1, assigns)
|
||||
|
||||
refute html =~ "hover:ring-2"
|
||||
refute html =~ "focus-within:ring-2"
|
||||
refute html =~ ~s(data-row-interactive="true")
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -151,4 +150,183 @@ defmodule MvWeb.Components.CoreComponentsTableTest do
|
|||
assert html =~ "ring-primary"
|
||||
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
|
||||
|
|
|
|||
|
|
@ -1,26 +0,0 @@
|
|||
defmodule MvWeb.LayoutsTest do
|
||||
use MvWeb.ConnCase, async: false
|
||||
|
||||
import Phoenix.LiveViewTest
|
||||
|
||||
alias Mv.Membership
|
||||
alias MvWeb.Layouts
|
||||
|
||||
describe "app/1" do
|
||||
test "prefers provided club_name over settings fallback" do
|
||||
{:ok, settings} = Membership.get_settings()
|
||||
{:ok, _} = Membership.update_settings(settings, %{club_name: "Settings Club Name"})
|
||||
|
||||
html =
|
||||
render_component(&Layouts.app/1, %{
|
||||
flash: %{},
|
||||
current_user: nil,
|
||||
club_name: "Provided Club Name",
|
||||
inner_block: [%{inner_block: fn _, _ -> "content" end}]
|
||||
})
|
||||
|
||||
assert html =~ "Provided Club Name"
|
||||
refute html =~ "Settings Club Name"
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
@ -3,17 +3,19 @@ defmodule MvWeb.GlobalSettingsLiveTest do
|
|||
import Phoenix.LiveViewTest
|
||||
alias Mv.Membership
|
||||
|
||||
@smtp_env_keys [
|
||||
"SMTP_HOST",
|
||||
"SMTP_PORT",
|
||||
"SMTP_USERNAME",
|
||||
"SMTP_PASSWORD",
|
||||
"SMTP_PASSWORD_FILE",
|
||||
"SMTP_SSL",
|
||||
"MAIL_FROM_NAME",
|
||||
"MAIL_FROM_EMAIL"
|
||||
]
|
||||
@association_env_key "ASSOCIATION_NAME"
|
||||
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
|
||||
setup %{conn: conn} do
|
||||
|
|
@ -52,17 +54,6 @@ defmodule MvWeb.GlobalSettingsLiveTest do
|
|||
assert render(view) =~ "Updated Club Name"
|
||||
end
|
||||
|
||||
test "updated club name is shown after remount", %{conn: conn} do
|
||||
{:ok, view, _html} = live(conn, ~p"/settings")
|
||||
|
||||
assert view
|
||||
|> form("#settings-form", %{setting: %{club_name: "Remount Club Name"}})
|
||||
|> render_submit()
|
||||
|
||||
{:ok, _view_after_remount, html_after_remount} = live(conn, ~p"/settings")
|
||||
assert html_after_remount =~ "Remount Club Name"
|
||||
end
|
||||
|
||||
test "shows error when club_name is empty", %{conn: conn} do
|
||||
{:ok, view, _html} = live(conn, ~p"/settings")
|
||||
|
||||
|
|
@ -102,34 +93,6 @@ defmodule MvWeb.GlobalSettingsLiveTest do
|
|||
"Open"
|
||||
)
|
||||
end
|
||||
|
||||
@tag :ui
|
||||
test "disables association name input when ASSOCIATION_NAME is set", %{conn: conn} do
|
||||
clear_association_name_env()
|
||||
System.put_env(@association_env_key, "Association Name from ENV")
|
||||
on_exit(fn -> clear_association_name_env() end)
|
||||
|
||||
{:ok, view, _html} = live(conn, ~p"/settings")
|
||||
|
||||
assert has_element?(view, "#setting_club_name[disabled]")
|
||||
assert has_element?(view, "#setting_club_name[placeholder='From ASSOCIATION_NAME']")
|
||||
refute has_element?(view, "#settings-form button", "Save Name")
|
||||
assert render(view) =~ "Association name is set via environment variable ASSOCIATION_NAME"
|
||||
end
|
||||
|
||||
@tag :ui
|
||||
test "keeps association name input editable when ASSOCIATION_NAME is not set", %{conn: conn} do
|
||||
clear_association_name_env()
|
||||
on_exit(fn -> clear_association_name_env() end)
|
||||
|
||||
{:ok, view, _html} = live(conn, ~p"/settings")
|
||||
|
||||
refute has_element?(view, "#setting_club_name[disabled]")
|
||||
assert has_element?(view, "#settings-form button", "Save Name")
|
||||
|
||||
refute render(view) =~
|
||||
"Association name is set via environment variable ASSOCIATION_NAME"
|
||||
end
|
||||
end
|
||||
|
||||
describe "SMTP / E-Mail section" do
|
||||
|
|
@ -240,6 +203,20 @@ defmodule MvWeb.GlobalSettingsLiveTest do
|
|||
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
|
||||
|
||||
describe "Authentication section when OIDC-only is enabled" do
|
||||
|
|
@ -306,12 +283,4 @@ defmodule MvWeb.GlobalSettingsLiveTest do
|
|||
end
|
||||
end
|
||||
end
|
||||
|
||||
defp clear_smtp_env do
|
||||
Enum.each(@smtp_env_keys, &System.delete_env/1)
|
||||
end
|
||||
|
||||
defp clear_association_name_env do
|
||||
System.delete_env(@association_env_key)
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -78,6 +78,37 @@ defmodule MvWeb.MemberLive.IndexTest do
|
|||
assert html =~ "lg:top-0"
|
||||
assert html =~ "bg-base-100"
|
||||
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
|
||||
|
||||
describe "translations" do
|
||||
|
|
@ -339,10 +370,12 @@ defmodule MvWeb.MemberLive.IndexTest do
|
|||
assert_redirect(view, ~p"/members/#{member}")
|
||||
end
|
||||
|
||||
describe "table row outline (hover and selected)" do
|
||||
describe "table row highlight (hover and selected)" do
|
||||
@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()
|
||||
|
||||
{:ok, _member} =
|
||||
|
|
@ -354,10 +387,9 @@ defmodule MvWeb.MemberLive.IndexTest do
|
|||
conn = conn_with_oidc_user(conn)
|
||||
{:ok, _view, html} = live(conn, "/members")
|
||||
|
||||
# CoreComponents table adds hover and focus-within ring when row_click is set
|
||||
assert html =~ "hover:ring-2"
|
||||
assert html =~ "focus-within:ring-2"
|
||||
assert html =~ "hover:ring-base-content/10"
|
||||
# Sticky-first-column tables: hover/focus fills live in CSS; wrapper is marked for tests.
|
||||
assert html =~ ~s(data-sticky-first-col-rows="true")
|
||||
refute html =~ "hover:ring-2"
|
||||
end
|
||||
|
||||
test "selected outline only from checkbox selection, not from highlight param", %{conn: conn} do
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue