Improve UX of join requests and fix minor bugs (#492)
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
## Description of the implemented changes The changes were: - [x] Bugfixing - [x] New Feature - [ ] Breaking Change - [ ] Refactoring This PR improves the join-request flow and presentation quality, fixes several data-display issues in join/join-request screens, and adds a usability improvement in global settings (directly opening the join link). It also includes dependency updates and changelog maintenance. ## What has been changed? - Join form (`JoinLive`) now renders inputs based on actual field types (including checkbox/date/number/email behavior instead of generic text-only handling). - Join form custom-field labels are resolved from configured custom fields (fallback remains safe if lookup fails). - Join-request details page (`JoinRequestLive.Show`) now: - resolves and shows custom field names instead of raw IDs, - formats boolean-like values (`on/true/1`, `off/false/0`) as localized `Yes/No`, - formats ISO date strings for better readability, - keeps legacy field handling while improving output consistency. - Join-request detail layout was improved semantically and visually (`dl/dt/dd` structure for label/value rows). - Global settings page now includes an **Open** button for the join URL (`target="_blank"`, `rel="noopener noreferrer"`, ARIA label). - Added/updated tests around: - join field type rendering, - custom field labels in join-request views, - related auth/global-settings behavior. - Updated translations (`default.pot`, `en`, `de`) for new UI strings. - Updated dependencies/tooling (`mix.lock`, `mix.exs`, CI/renovate-related updates). - Updated `CHANGELOG.md` entries for unreleased changes. ## Definition of Done ### Code Quality - [x] No new technical depths - [x] Linting passed - [x] Documentation is added were needed ### Accessibility - [x] New elements are properly defined with html-tags - [x] Colour contrast follows WCAG criteria - [x] Aria labels are added when needed - [x] Everything is accessible by keyboard - [x] Tab-Order is comprehensible - [x] All interactive elements have a visible focus ### Testing - [x] Tests for new code are written - [ ] All tests pass - [ ] axe-core dev tools show no critical or major issues ## Additional Notes - Reviewer focus areas: - `lib/mv_web/live/join_live.ex`: input type derivation and custom field lookup strategy (`authorize?: false` read path used intentionally for field metadata). - `lib/mv_web/live/join_request_live/show.ex`: value-formatting logic (especially backward compatibility for legacy `form_data` payloads). - `lib/mv_web/live/global_settings_live.ex`: external-link behavior and accessibility attributes. - The branch also contains dependency update commits; please review lockfile and CI-related changes separately from functional join/join-request changes. Reviewed-on: #492 Co-authored-by: Simon <s.thiessen@local-it.org> Co-committed-by: Simon <s.thiessen@local-it.org>
This commit is contained in:
parent
bfa33dcae2
commit
2bb01bd201
14 changed files with 781 additions and 135 deletions
14
CHANGELOG.md
14
CHANGELOG.md
|
|
@ -7,8 +7,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
||||||
|
|
||||||
## [Unreleased]
|
## [Unreleased]
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
- **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.
|
||||||
|
- Join request field formatting was corrected for more consistent output.
|
||||||
|
- Join link settings now include a direct "Open" action in addition to copy/share workflows.
|
||||||
|
|
||||||
### 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.
|
||||||
|
|
||||||
|
### Dependency updates
|
||||||
|
- Mix dependencies were updated.
|
||||||
|
- Renovate Docker image was updated to `v43.165`.
|
||||||
|
- Rauthy Docker image was updated to `v0.35.1`.
|
||||||
|
- `just` was updated to `v1.50.0`.
|
||||||
|
|
||||||
## [1.1.1] - 2026-03-16
|
## [1.1.1] - 2026-03-16
|
||||||
|
|
||||||
|
|
|
||||||
56
lib/mv/membership/custom_field_lookup.ex
Normal file
56
lib/mv/membership/custom_field_lookup.ex
Normal file
|
|
@ -0,0 +1,56 @@
|
||||||
|
defmodule Mv.Membership.CustomFieldLookup do
|
||||||
|
@moduledoc """
|
||||||
|
Shared helper for loading custom fields by ID.
|
||||||
|
"""
|
||||||
|
|
||||||
|
alias Mv.Constants
|
||||||
|
alias Mv.Membership
|
||||||
|
|
||||||
|
@spec fetch_map_by_ids([String.t()], keyword()) :: map()
|
||||||
|
def fetch_map_by_ids(field_ids, opts \\ []) when is_list(field_ids) do
|
||||||
|
member_field_strings = Constants.member_fields() |> Enum.map(&Atom.to_string/1)
|
||||||
|
|
||||||
|
custom_field_ids =
|
||||||
|
field_ids
|
||||||
|
|> Enum.uniq()
|
||||||
|
|> Enum.reject(&(&1 in member_field_strings))
|
||||||
|
|
||||||
|
if custom_field_ids == [] do
|
||||||
|
%{}
|
||||||
|
else
|
||||||
|
select = Keyword.get(opts, :select, [:id, :name, :value_type])
|
||||||
|
|
||||||
|
query =
|
||||||
|
Membership.CustomField
|
||||||
|
|> Ash.Query.select(select)
|
||||||
|
|
||||||
|
read_opts =
|
||||||
|
[domain: Membership]
|
||||||
|
|> maybe_put_actor(opts)
|
||||||
|
|> maybe_put_authorize(opts)
|
||||||
|
|
||||||
|
case Ash.read(query, read_opts) do
|
||||||
|
{:ok, fields} ->
|
||||||
|
allowed_ids = MapSet.new(custom_field_ids)
|
||||||
|
fields |> Enum.filter(&MapSet.member?(allowed_ids, &1.id)) |> Map.new(&{&1.id, &1})
|
||||||
|
|
||||||
|
{:error, _} ->
|
||||||
|
%{}
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
defp maybe_put_actor(opts, read_opts) do
|
||||||
|
case Keyword.fetch(read_opts, :actor) do
|
||||||
|
{:ok, actor} -> Keyword.put(opts, :actor, actor)
|
||||||
|
:error -> opts
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
defp maybe_put_authorize(opts, read_opts) do
|
||||||
|
case Keyword.fetch(read_opts, :authorize?) do
|
||||||
|
{:ok, authorize?} -> Keyword.put(opts, :authorize?, authorize?)
|
||||||
|
:error -> opts
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
@ -138,7 +138,7 @@ defmodule MvWeb.Layouts do
|
||||||
# Single get_settings() for layout; derive club_name and join_form_enabled to avoid duplicate query.
|
# 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()
|
%{club_name: club_name, join_form_enabled: join_form_enabled} = get_layout_settings()
|
||||||
|
|
||||||
# TODO: unprocessed count runs on every page load when join form enabled; consider
|
# 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.
|
# loading only on navigation or caching briefly if performance becomes an issue.
|
||||||
unprocessed_join_requests_count =
|
unprocessed_join_requests_count =
|
||||||
get_unprocessed_join_requests_count(assigns.current_user, join_form_enabled)
|
get_unprocessed_join_requests_count(assigns.current_user, join_form_enabled)
|
||||||
|
|
|
||||||
|
|
@ -186,6 +186,16 @@ defmodule MvWeb.GlobalSettingsLive do
|
||||||
<.icon name="hero-clipboard-document" class="size-4" />
|
<.icon name="hero-clipboard-document" class="size-4" />
|
||||||
{gettext("Copy")}
|
{gettext("Copy")}
|
||||||
</.button>
|
</.button>
|
||||||
|
<.link
|
||||||
|
href={@join_url}
|
||||||
|
target="_blank"
|
||||||
|
rel="noopener noreferrer"
|
||||||
|
class="btn btn-secondary btn-sm"
|
||||||
|
>
|
||||||
|
<.icon name="hero-arrow-top-right-on-square" class="size-4" aria-hidden="true" />
|
||||||
|
{pgettext("action", "Open")}
|
||||||
|
<span class="sr-only">{gettext("join page URL in a new tab")}</span>
|
||||||
|
</.link>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,9 @@ defmodule MvWeb.JoinLive do
|
||||||
"""
|
"""
|
||||||
use MvWeb, :live_view
|
use MvWeb, :live_view
|
||||||
|
|
||||||
|
alias Ash.Resource.Info
|
||||||
alias Mv.Membership
|
alias Mv.Membership
|
||||||
|
alias Mv.Membership.CustomFieldLookup
|
||||||
alias MvWeb.JoinRateLimit
|
alias MvWeb.JoinRateLimit
|
||||||
alias MvWeb.Translations.MemberFields
|
alias MvWeb.Translations.MemberFields
|
||||||
|
|
||||||
|
|
@ -54,10 +56,6 @@ defmodule MvWeb.JoinLive do
|
||||||
{gettext("Become a member")}
|
{gettext("Become a member")}
|
||||||
</.header>
|
</.header>
|
||||||
|
|
||||||
<p class="text-base-content/80">
|
|
||||||
{gettext("Please enter your details for the membership application here.")}
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<%= if @submitted do %>
|
<%= if @submitted do %>
|
||||||
<div data-testid="join-success-message" class="alert alert-success">
|
<div data-testid="join-success-message" class="alert alert-success">
|
||||||
<p class="font-medium">
|
<p class="font-medium">
|
||||||
|
|
@ -67,6 +65,9 @@ defmodule MvWeb.JoinLive do
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
<% else %>
|
<% else %>
|
||||||
|
<p class="text-base-content/80">
|
||||||
|
{gettext("Please enter your details for the membership application here.")}
|
||||||
|
</p>
|
||||||
<.form
|
<.form
|
||||||
for={@form}
|
for={@form}
|
||||||
id="join-form"
|
id="join-form"
|
||||||
|
|
@ -80,12 +81,33 @@ defmodule MvWeb.JoinLive do
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<%= for field <- @join_fields do %>
|
<%= for field <- @join_fields do %>
|
||||||
|
<%= if field.input_type == "checkbox" do %>
|
||||||
|
<input type="hidden" name={field.id} value="off" />
|
||||||
|
<label
|
||||||
|
for={"join-field-#{field.id}"}
|
||||||
|
class="label cursor-pointer justify-start gap-3"
|
||||||
|
>
|
||||||
|
<input
|
||||||
|
type="checkbox"
|
||||||
|
name={field.id}
|
||||||
|
id={"join-field-#{field.id}"}
|
||||||
|
checked={checkbox_checked?(@form.params[field.id])}
|
||||||
|
required={field.required}
|
||||||
|
class="checkbox checkbox-sm"
|
||||||
|
/>
|
||||||
|
<span class="label-text">
|
||||||
|
{field.label}<span :if={field.required} aria-hidden="true"> *</span>
|
||||||
|
</span>
|
||||||
|
</label>
|
||||||
|
<% else %>
|
||||||
<div>
|
<div>
|
||||||
<label for={"join-field-#{field.id}"} class="label">
|
<label for={"join-field-#{field.id}"} class="label">
|
||||||
<span class="label-text">{field.label}{if field.required, do: " *"}</span>
|
<span class="label-text">
|
||||||
|
{field.label}<span :if={field.required} aria-hidden="true"> *</span>
|
||||||
|
</span>
|
||||||
</label>
|
</label>
|
||||||
<input
|
<input
|
||||||
type={input_type(field.id)}
|
type={field.input_type}
|
||||||
name={field.id}
|
name={field.id}
|
||||||
id={"join-field-#{field.id}"}
|
id={"join-field-#{field.id}"}
|
||||||
value={@form.params[field.id]}
|
value={@form.params[field.id]}
|
||||||
|
|
@ -94,6 +116,7 @@ defmodule MvWeb.JoinLive do
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
<% end %>
|
||||||
|
|
||||||
<%!--
|
<%!--
|
||||||
Honeypot (best practice): legit field name "website", type="text", no inline CSS,
|
Honeypot (best practice): legit field name "website", type="text", no inline CSS,
|
||||||
|
|
@ -216,17 +239,30 @@ defmodule MvWeb.JoinLive do
|
||||||
|
|
||||||
defp build_join_fields_with_labels(allowlist) do
|
defp build_join_fields_with_labels(allowlist) do
|
||||||
member_field_strings = Mv.Constants.member_fields() |> Enum.map(&Atom.to_string/1)
|
member_field_strings = Mv.Constants.member_fields() |> Enum.map(&Atom.to_string/1)
|
||||||
|
custom_field_by_id = custom_field_map(allowlist, member_field_strings)
|
||||||
|
|
||||||
Enum.map(allowlist, fn %{id: id, required: required} ->
|
Enum.map(allowlist, fn %{id: id, required: required} ->
|
||||||
label =
|
build_join_field(id, required, member_field_strings, custom_field_by_id)
|
||||||
if id in member_field_strings do
|
end)
|
||||||
MemberFields.label(String.to_existing_atom(id))
|
|
||||||
else
|
|
||||||
gettext("Field")
|
|
||||||
end
|
end
|
||||||
|
|
||||||
%{id: id, label: label, required: required}
|
defp build_join_field(id, required, member_field_strings, custom_field_by_id) do
|
||||||
end)
|
if id in member_field_strings do
|
||||||
|
label = MemberFields.label(String.to_existing_atom(id))
|
||||||
|
%{id: id, label: label, required: required, input_type: member_field_input_type(id)}
|
||||||
|
else
|
||||||
|
custom_field = Map.get(custom_field_by_id, id)
|
||||||
|
label = if custom_field, do: custom_field.name, else: gettext("Field")
|
||||||
|
input_type = custom_field_input_type(custom_field && custom_field.value_type)
|
||||||
|
|
||||||
|
%{id: id, label: label, required: required, input_type: input_type}
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
defp custom_field_map(allowlist, _member_field_strings) do
|
||||||
|
allowlist
|
||||||
|
|> Enum.map(& &1.id)
|
||||||
|
|> CustomFieldLookup.fetch_map_by_ids(authorize?: false, select: [:id, :name, :value_type])
|
||||||
end
|
end
|
||||||
|
|
||||||
defp initial_form_params(join_fields) do
|
defp initial_form_params(join_fields) do
|
||||||
|
|
@ -236,8 +272,42 @@ defmodule MvWeb.JoinLive do
|
||||||
|> Map.put(@honeypot_field, "")
|
|> Map.put(@honeypot_field, "")
|
||||||
end
|
end
|
||||||
|
|
||||||
defp input_type("email"), do: "email"
|
defp member_field_input_type("email"), do: "email"
|
||||||
defp input_type(_), do: "text"
|
|
||||||
|
defp member_field_input_type(field_id) when is_binary(field_id) do
|
||||||
|
case member_field_atom(field_id) do
|
||||||
|
nil ->
|
||||||
|
"text"
|
||||||
|
|
||||||
|
field_atom ->
|
||||||
|
Mv.Membership.Member
|
||||||
|
|> Info.attribute(field_atom)
|
||||||
|
|> Map.get(:type)
|
||||||
|
|> input_type_for()
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
defp member_field_input_type(_), do: "text"
|
||||||
|
|
||||||
|
defp member_field_atom(field_id) when is_binary(field_id) do
|
||||||
|
Mv.Constants.member_fields()
|
||||||
|
|> Enum.find(&(Atom.to_string(&1) == field_id))
|
||||||
|
end
|
||||||
|
|
||||||
|
defp custom_field_input_type(type), do: input_type_for(type)
|
||||||
|
|
||||||
|
defp input_type_for(:date), do: "date"
|
||||||
|
defp input_type_for(Ash.Type.Date), do: "date"
|
||||||
|
defp input_type_for(:integer), do: "number"
|
||||||
|
defp input_type_for(Ash.Type.Integer), do: "number"
|
||||||
|
defp input_type_for(:boolean), do: "checkbox"
|
||||||
|
defp input_type_for(Ash.Type.Boolean), do: "checkbox"
|
||||||
|
defp input_type_for(:email), do: "email"
|
||||||
|
defp input_type_for(Mv.Membership.Email), do: "email"
|
||||||
|
defp input_type_for(_), do: "text"
|
||||||
|
|
||||||
|
defp checkbox_checked?(value) when value in [true, "true", "on", "1"], do: true
|
||||||
|
defp checkbox_checked?(_), do: false
|
||||||
|
|
||||||
defp build_submit_attrs(params, join_fields) do
|
defp build_submit_attrs(params, join_fields) do
|
||||||
allowlist_ids = MapSet.new(Enum.map(join_fields, & &1.id))
|
allowlist_ids = MapSet.new(Enum.map(join_fields, & &1.id))
|
||||||
|
|
@ -257,9 +327,12 @@ defmodule MvWeb.JoinLive do
|
||||||
}
|
}
|
||||||
|
|
||||||
form_data =
|
form_data =
|
||||||
params
|
join_fields
|
||||||
|> Enum.filter(fn {key, _} -> key in allowlist_ids and key not in typed end)
|
|> Enum.filter(&(&1.id not in typed))
|
||||||
|> Map.new(fn {k, v} -> {k, String.trim(to_string(v))} end)
|
|> Map.new(fn field ->
|
||||||
|
{field.id, normalize_join_field_value(params[field.id], field.input_type)}
|
||||||
|
end)
|
||||||
|
|> Map.take(MapSet.to_list(allowlist_ids))
|
||||||
|
|
||||||
attrs = %{attrs | form_data: form_data}
|
attrs = %{attrs | form_data: form_data}
|
||||||
{:ok, attrs}
|
{:ok, attrs}
|
||||||
|
|
@ -271,6 +344,10 @@ defmodule MvWeb.JoinLive do
|
||||||
if is_binary(v), do: String.trim(v), else: nil
|
if is_binary(v), do: String.trim(v), else: nil
|
||||||
end
|
end
|
||||||
|
|
||||||
|
defp normalize_join_field_value(raw, _input_type) when is_binary(raw), do: String.trim(raw)
|
||||||
|
defp normalize_join_field_value(_raw, "checkbox"), do: "off"
|
||||||
|
defp normalize_join_field_value(_raw, _input_type), do: ""
|
||||||
|
|
||||||
# Prefer X-Forwarded-For / X-Real-IP when behind a reverse proxy; fall back to peer_data.
|
# Prefer X-Forwarded-For / X-Real-IP when behind a reverse proxy; fall back to peer_data.
|
||||||
# Uses :inet.ntoa/1 for correct IPv4 and IPv6 string representation.
|
# Uses :inet.ntoa/1 for correct IPv4 and IPv6 string representation.
|
||||||
defp client_ip_from_socket(socket) do
|
defp client_ip_from_socket(socket) do
|
||||||
|
|
|
||||||
|
|
@ -21,6 +21,7 @@ defmodule MvWeb.JoinRequestLive.Show do
|
||||||
|
|
||||||
alias Mv.Constants
|
alias Mv.Constants
|
||||||
alias Mv.Membership
|
alias Mv.Membership
|
||||||
|
alias Mv.Membership.CustomFieldLookup
|
||||||
alias MvWeb.Helpers.DateFormatter
|
alias MvWeb.Helpers.DateFormatter
|
||||||
alias MvWeb.JoinRequestLive.Helpers, as: JoinRequestHelpers
|
alias MvWeb.JoinRequestLive.Helpers, as: JoinRequestHelpers
|
||||||
alias MvWeb.Translations.MemberFields, as: MemberFieldsTranslations
|
alias MvWeb.Translations.MemberFields, as: MemberFieldsTranslations
|
||||||
|
|
@ -31,6 +32,7 @@ defmodule MvWeb.JoinRequestLive.Show do
|
||||||
{:ok,
|
{:ok,
|
||||||
socket
|
socket
|
||||||
|> assign(:join_request, nil)
|
|> assign(:join_request, nil)
|
||||||
|
|> assign(:custom_field_by_id, %{})
|
||||||
|> assign(:join_form_field_ids, [])
|
|> assign(:join_form_field_ids, [])
|
||||||
|> Layouts.assign_page_title(gettext("Join request"))}
|
|> Layouts.assign_page_title(gettext("Join request"))}
|
||||||
else
|
else
|
||||||
|
|
@ -53,9 +55,16 @@ defmodule MvWeb.JoinRequestLive.Show do
|
||||||
{:ok, request} ->
|
{:ok, request} ->
|
||||||
field_ids = Membership.get_join_form_allowlist() |> Enum.map(& &1.id)
|
field_ids = Membership.get_join_form_allowlist() |> Enum.map(& &1.id)
|
||||||
|
|
||||||
|
custom_field_by_id =
|
||||||
|
CustomFieldLookup.fetch_map_by_ids(field_ids ++ Map.keys(request.form_data || %{}),
|
||||||
|
actor: actor,
|
||||||
|
select: [:id, :name, :value_type]
|
||||||
|
)
|
||||||
|
|
||||||
{:noreply,
|
{:noreply,
|
||||||
socket
|
socket
|
||||||
|> assign(:join_request, request)
|
|> assign(:join_request, request)
|
||||||
|
|> assign(:custom_field_by_id, custom_field_by_id)
|
||||||
|> assign(:join_form_field_ids, field_ids)
|
|> assign(:join_form_field_ids, field_ids)
|
||||||
|> Layouts.assign_page_title(gettext("Join request – %{email}", email: request.email))}
|
|> Layouts.assign_page_title(gettext("Join request – %{email}", email: request.email))}
|
||||||
|
|
||||||
|
|
@ -131,29 +140,34 @@ defmodule MvWeb.JoinRequestLive.Show do
|
||||||
<%!-- Single block: all applicant-provided data in join form order --%>
|
<%!-- Single block: all applicant-provided data in join form order --%>
|
||||||
<div>
|
<div>
|
||||||
<h2 class="text-lg font-semibold mb-2">{gettext("Applicant data")}</h2>
|
<h2 class="text-lg font-semibold mb-2">{gettext("Applicant data")}</h2>
|
||||||
<div class="border border-base-300 rounded-lg p-4 bg-base-100 space-y-2">
|
<div class="border border-base-300 rounded-lg p-4 bg-base-100">
|
||||||
<%= for {label, value} <- applicant_data_rows(@join_request, @join_form_field_ids || []) do %>
|
<dl class="grid gap-1 md:grid-cols-[14rem_minmax(0,1fr)] md:gap-2">
|
||||||
|
<%= for {label, value} <-
|
||||||
|
applicant_data_rows(
|
||||||
|
@join_request,
|
||||||
|
@join_form_field_ids || [],
|
||||||
|
@custom_field_by_id || %{}
|
||||||
|
) do %>
|
||||||
<.field_row label={label} value={value} empty_text={gettext("Not specified")} />
|
<.field_row label={label} value={value} empty_text={gettext("Not specified")} />
|
||||||
<% end %>
|
<% end %>
|
||||||
|
</dl>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<%!-- Status and review (submitted_at, status; if decided: approved/rejected at, reviewed by) --%>
|
<%!-- Status and review (submitted_at, status; if decided: approved/rejected at, reviewed by) --%>
|
||||||
<div>
|
<div>
|
||||||
<h2 class="text-lg font-semibold mb-2">{gettext("Status and review")}</h2>
|
<h2 class="text-lg font-semibold mb-2">{gettext("Status and review")}</h2>
|
||||||
<div class="border border-base-300 rounded-lg p-4 bg-base-100 space-y-2">
|
<div class="border border-base-300 rounded-lg p-4 bg-base-100">
|
||||||
|
<dl class="grid gap-1 md:grid-cols-[14rem_minmax(0,1fr)] md:gap-2">
|
||||||
<.field_row
|
<.field_row
|
||||||
label={gettext("Submitted at")}
|
label={gettext("Submitted at")}
|
||||||
value={DateFormatter.format_datetime(@join_request.submitted_at, @browser_timezone)}
|
value={DateFormatter.format_datetime(@join_request.submitted_at, @browser_timezone)}
|
||||||
/>
|
/>
|
||||||
<div class="flex gap-2">
|
<.field_row label={gettext("Status")}>
|
||||||
<span class="text-base-content/60 min-w-32 shrink-0">{gettext("Status")}:</span>
|
|
||||||
<span>
|
|
||||||
<.badge variant={JoinRequestHelpers.status_badge_variant(@join_request.status)}>
|
<.badge variant={JoinRequestHelpers.status_badge_variant(@join_request.status)}>
|
||||||
{JoinRequestHelpers.format_status(@join_request.status)}
|
{JoinRequestHelpers.format_status(@join_request.status)}
|
||||||
</.badge>
|
</.badge>
|
||||||
</span>
|
</.field_row>
|
||||||
</div>
|
|
||||||
<%= if @join_request.status in [:approved, :rejected] do %>
|
<%= if @join_request.status in [:approved, :rejected] do %>
|
||||||
<%= if @join_request.approved_at do %>
|
<%= if @join_request.approved_at do %>
|
||||||
<.field_row
|
<.field_row
|
||||||
|
|
@ -177,6 +191,7 @@ defmodule MvWeb.JoinRequestLive.Show do
|
||||||
empty_text="-"
|
empty_text="-"
|
||||||
/>
|
/>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
</dl>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
@ -209,28 +224,30 @@ defmodule MvWeb.JoinRequestLive.Show do
|
||||||
attr :label, :string, required: true
|
attr :label, :string, required: true
|
||||||
attr :value, :any, default: nil
|
attr :value, :any, default: nil
|
||||||
attr :empty_text, :string, default: nil
|
attr :empty_text, :string, default: nil
|
||||||
|
slot :inner_block
|
||||||
|
|
||||||
defp field_row(assigns) do
|
defp field_row(assigns) do
|
||||||
~H"""
|
~H"""
|
||||||
<div class="flex gap-2">
|
<dt class="m-0 text-base-content/60 whitespace-normal break-words">{@label}:</dt>
|
||||||
<span class="text-base-content/60 min-w-32 shrink-0">{@label}:</span>
|
<dd class="m-0 min-w-0">
|
||||||
<span>
|
<%= cond do %>
|
||||||
<%= if @value && @value != "" do %>
|
<% @inner_block != [] -> %>
|
||||||
|
{render_slot(@inner_block)}
|
||||||
|
<% @value && @value != "" -> %>
|
||||||
{@value}
|
{@value}
|
||||||
<% else %>
|
<% true -> %>
|
||||||
<span class="text-base-content/40 italic">
|
<span class="text-base-content/40 italic">
|
||||||
{@empty_text || gettext("Not specified")}
|
{@empty_text || gettext("Not specified")}
|
||||||
</span>
|
</span>
|
||||||
<% end %>
|
<% end %>
|
||||||
</span>
|
</dd>
|
||||||
</div>
|
|
||||||
"""
|
"""
|
||||||
end
|
end
|
||||||
|
|
||||||
# Builds a single list of {label, display_value} for all applicant-provided data in join form
|
# Builds a single list of {label, display_value} for all applicant-provided data in join form
|
||||||
# order. Typed fields (email, first_name, last_name) and form_data are merged; legacy
|
# order. Typed fields (email, first_name, last_name) and form_data are merged; legacy
|
||||||
# form_data keys (not in current join form config) are appended at the end.
|
# form_data keys (not in current join form config) are appended at the end.
|
||||||
defp applicant_data_rows(join_request, ordered_field_ids) do
|
defp applicant_data_rows(join_request, ordered_field_ids, custom_field_by_id) do
|
||||||
member_field_strings = Constants.member_fields() |> Enum.map(&Atom.to_string/1)
|
member_field_strings = Constants.member_fields() |> Enum.map(&Atom.to_string/1)
|
||||||
form_data = join_request.form_data || %{}
|
form_data = join_request.form_data || %{}
|
||||||
|
|
||||||
|
|
@ -244,8 +261,9 @@ defmodule MvWeb.JoinRequestLive.Show do
|
||||||
ordered_field_ids
|
ordered_field_ids
|
||||||
|> Enum.map(fn key ->
|
|> Enum.map(fn key ->
|
||||||
value = Map.get(typed, key) || Map.get(form_data, key)
|
value = Map.get(typed, key) || Map.get(form_data, key)
|
||||||
label = field_key_to_label(key, member_field_strings)
|
label = field_key_to_label(key, member_field_strings, custom_field_by_id)
|
||||||
{label, format_applicant_value(value)}
|
value_type = field_key_to_value_type(key, member_field_strings, custom_field_by_id)
|
||||||
|
{label, format_applicant_value(value, value_type)}
|
||||||
end)
|
end)
|
||||||
|
|
||||||
legacy_keys =
|
legacy_keys =
|
||||||
|
|
@ -258,34 +276,66 @@ defmodule MvWeb.JoinRequestLive.Show do
|
||||||
|
|
||||||
legacy_entries =
|
legacy_entries =
|
||||||
Enum.map(legacy_keys, fn key ->
|
Enum.map(legacy_keys, fn key ->
|
||||||
label = field_key_to_label(key, member_field_strings)
|
label = field_key_to_label(key, member_field_strings, custom_field_by_id)
|
||||||
{label, format_applicant_value(form_data[key])}
|
value_type = field_key_to_value_type(key, member_field_strings, custom_field_by_id)
|
||||||
|
{label, format_applicant_value(form_data[key], value_type)}
|
||||||
end)
|
end)
|
||||||
|
|
||||||
in_order ++ legacy_entries
|
in_order ++ legacy_entries
|
||||||
end
|
end
|
||||||
|
|
||||||
defp format_applicant_value(nil), do: nil
|
defp format_applicant_value(nil, _type), do: nil
|
||||||
defp format_applicant_value(""), do: nil
|
defp format_applicant_value("", _type), do: nil
|
||||||
defp format_applicant_value(%Date{} = date), do: DateFormatter.format_date(date)
|
defp format_applicant_value(%Date{} = date, _type), do: DateFormatter.format_date(date)
|
||||||
|
|
||||||
defp format_applicant_value(value) when is_map(value),
|
defp format_applicant_value(value, type) when is_map(value),
|
||||||
do: format_applicant_value_from_map(value)
|
do: format_applicant_value_from_map(value, type)
|
||||||
|
|
||||||
defp format_applicant_value(value) when is_boolean(value),
|
defp format_applicant_value(value, _type) when is_boolean(value),
|
||||||
do: if(value, do: gettext("Yes"), else: gettext("No"))
|
do: if(value, do: gettext("Yes"), else: gettext("No"))
|
||||||
|
|
||||||
defp format_applicant_value(value) when is_binary(value) or is_number(value),
|
defp format_applicant_value(value, type) when is_binary(value),
|
||||||
do: to_string(value)
|
do: format_binary_applicant_value(value, type)
|
||||||
|
|
||||||
defp format_applicant_value(value), do: to_string(value)
|
defp format_applicant_value(value, _type) when is_number(value), do: to_string(value)
|
||||||
|
|
||||||
defp format_applicant_value_from_map(value) do
|
defp format_applicant_value(value, _type), do: to_string(value)
|
||||||
|
|
||||||
|
defp format_binary_applicant_value(value, type) do
|
||||||
|
trimmed_value = String.trim(value)
|
||||||
|
|
||||||
|
cond do
|
||||||
|
trimmed_value == "" ->
|
||||||
|
nil
|
||||||
|
|
||||||
|
String.downcase(trimmed_value) in ["on", "true", "1"] ->
|
||||||
|
gettext("Yes")
|
||||||
|
|
||||||
|
String.downcase(trimmed_value) in ["off", "false", "0"] ->
|
||||||
|
gettext("No")
|
||||||
|
|
||||||
|
type in [:date, Ash.Type.Date] ->
|
||||||
|
format_iso_date_string(trimmed_value)
|
||||||
|
|
||||||
|
true ->
|
||||||
|
trimmed_value
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
defp format_iso_date_string(value) do
|
||||||
|
case Date.from_iso8601(value) do
|
||||||
|
{:ok, date} -> DateFormatter.format_date(date)
|
||||||
|
_ -> value
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
defp format_applicant_value_from_map(value, fallback_type) do
|
||||||
raw = Map.get(value, "_union_value") || Map.get(value, "value")
|
raw = Map.get(value, "_union_value") || Map.get(value, "value")
|
||||||
type = Map.get(value, "_union_type") || Map.get(value, "type")
|
type = Map.get(value, "_union_type") || Map.get(value, "type")
|
||||||
|
effective_type = type || fallback_type
|
||||||
|
|
||||||
if raw && type in ["date", :date] do
|
if raw && effective_type in ["date", :date, Ash.Type.Date] do
|
||||||
format_applicant_value(raw)
|
format_applicant_value(raw, :date)
|
||||||
else
|
else
|
||||||
format_applicant_value_simple(raw, value)
|
format_applicant_value_simple(raw, value)
|
||||||
end
|
end
|
||||||
|
|
@ -299,11 +349,39 @@ defmodule MvWeb.JoinRequestLive.Show do
|
||||||
defp format_applicant_value_simple(raw, _value) when is_integer(raw), do: to_string(raw)
|
defp format_applicant_value_simple(raw, _value) when is_integer(raw), do: to_string(raw)
|
||||||
defp format_applicant_value_simple(_raw, value), do: to_string(value)
|
defp format_applicant_value_simple(_raw, value), do: to_string(value)
|
||||||
|
|
||||||
defp field_key_to_label(key, member_field_strings) when is_binary(key) do
|
defp field_key_to_label(key, member_field_strings, custom_field_by_id)
|
||||||
if key in member_field_strings,
|
when is_binary(key) do
|
||||||
do: MemberFieldsTranslations.label(String.to_existing_atom(key)),
|
if key in member_field_strings do
|
||||||
else: key
|
MemberFieldsTranslations.label(String.to_existing_atom(key))
|
||||||
|
else
|
||||||
|
case Map.get(custom_field_by_id, key) do
|
||||||
|
%{name: name} -> name
|
||||||
|
_ -> key
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
defp field_key_to_label(key, _), do: to_string(key)
|
defp field_key_to_label(key, _, _), do: to_string(key)
|
||||||
|
|
||||||
|
defp field_key_to_value_type("email", _member_field_strings, _custom_field_by_id), do: :string
|
||||||
|
|
||||||
|
defp field_key_to_value_type("first_name", _member_field_strings, _custom_field_by_id),
|
||||||
|
do: :string
|
||||||
|
|
||||||
|
defp field_key_to_value_type("last_name", _member_field_strings, _custom_field_by_id),
|
||||||
|
do: :string
|
||||||
|
|
||||||
|
defp field_key_to_value_type(key, member_field_strings, custom_field_by_id)
|
||||||
|
when is_binary(key) do
|
||||||
|
if key in member_field_strings do
|
||||||
|
:string
|
||||||
|
else
|
||||||
|
case Map.get(custom_field_by_id, key) do
|
||||||
|
%{value_type: value_type} -> value_type
|
||||||
|
_ -> nil
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
defp field_key_to_value_type(_key, _member_field_strings, _custom_field_by_id), do: nil
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -1291,7 +1291,7 @@ defmodule MvWeb.MemberLive.Show.MembershipFeesComponent do
|
||||||
defp translate_receipt_status("paid"), do: gettext("Paid")
|
defp translate_receipt_status("paid"), do: gettext("Paid")
|
||||||
defp translate_receipt_status("unpaid"), do: gettext("Unpaid")
|
defp translate_receipt_status("unpaid"), do: gettext("Unpaid")
|
||||||
defp translate_receipt_status("suspended"), do: gettext("Suspended")
|
defp translate_receipt_status("suspended"), do: gettext("Suspended")
|
||||||
defp translate_receipt_status("open"), do: gettext("Open")
|
defp translate_receipt_status("open"), do: pgettext("status", "Open")
|
||||||
defp translate_receipt_status("cancelled"), do: gettext("Cancelled")
|
defp translate_receipt_status("cancelled"), do: gettext("Cancelled")
|
||||||
defp translate_receipt_status("draft"), do: gettext("Draft")
|
defp translate_receipt_status("draft"), do: gettext("Draft")
|
||||||
defp translate_receipt_status("incompleted"), do: gettext("Incomplete")
|
defp translate_receipt_status("incompleted"), do: gettext("Incomplete")
|
||||||
|
|
|
||||||
|
|
@ -2396,11 +2396,6 @@ msgstr "Nur Administrator*innen oder die verknüpfte*n Benutzer*in(nen) können
|
||||||
msgid "Only possible if no members are assigned to this type."
|
msgid "Only possible if no members are assigned to this type."
|
||||||
msgstr "Nur möglich, wenn diesem Typ keine Mitglieder zugewiesen sind."
|
msgstr "Nur möglich, wenn diesem Typ keine Mitglieder zugewiesen sind."
|
||||||
|
|
||||||
#: lib/mv_web/live/member_live/show/membership_fees_component.ex
|
|
||||||
#, elixir-autogen, elixir-format
|
|
||||||
msgid "Open"
|
|
||||||
msgstr "Offen"
|
|
||||||
|
|
||||||
#: lib/mv_web/live/member_live/index.html.heex
|
#: lib/mv_web/live/member_live/index.html.heex
|
||||||
#, elixir-autogen, elixir-format
|
#, elixir-autogen, elixir-format
|
||||||
msgid "Open email program with BCC recipients"
|
msgid "Open email program with BCC recipients"
|
||||||
|
|
@ -3905,3 +3900,20 @@ msgstr "Nur OIDC-Anmeldung ist aktiv. Diese Option ist deaktiviert."
|
||||||
#, elixir-autogen, elixir-format
|
#, elixir-autogen, elixir-format
|
||||||
msgid "Only sign-in via Single Sign-On (SSO) is allowed."
|
msgid "Only sign-in via Single Sign-On (SSO) is allowed."
|
||||||
msgstr "Nur Anmeldung per Single Sign-On (SSO) ist erlaubt."
|
msgstr "Nur Anmeldung per Single Sign-On (SSO) ist erlaubt."
|
||||||
|
|
||||||
|
#: lib/mv_web/live/global_settings_live.ex
|
||||||
|
#, elixir-autogen, elixir-format
|
||||||
|
msgctxt "action"
|
||||||
|
msgid "Open"
|
||||||
|
msgstr "Öffnen"
|
||||||
|
|
||||||
|
#: lib/mv_web/live/member_live/show/membership_fees_component.ex
|
||||||
|
#, elixir-autogen, elixir-format
|
||||||
|
msgctxt "status"
|
||||||
|
msgid "Open"
|
||||||
|
msgstr "Offen"
|
||||||
|
|
||||||
|
#: lib/mv_web/live/global_settings_live.ex
|
||||||
|
#, elixir-autogen, elixir-format
|
||||||
|
msgid "join page URL in a new tab"
|
||||||
|
msgstr "Beitrittslink in einem neuen Tab"
|
||||||
|
|
|
||||||
|
|
@ -2397,11 +2397,6 @@ msgstr ""
|
||||||
msgid "Only possible if no members are assigned to this type."
|
msgid "Only possible if no members are assigned to this type."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: lib/mv_web/live/member_live/show/membership_fees_component.ex
|
|
||||||
#, elixir-autogen, elixir-format
|
|
||||||
msgid "Open"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
#: lib/mv_web/live/member_live/index.html.heex
|
#: lib/mv_web/live/member_live/index.html.heex
|
||||||
#, elixir-autogen, elixir-format
|
#, elixir-autogen, elixir-format
|
||||||
msgid "Open email program with BCC recipients"
|
msgid "Open email program with BCC recipients"
|
||||||
|
|
@ -3905,3 +3900,20 @@ msgstr ""
|
||||||
#, elixir-autogen, elixir-format
|
#, elixir-autogen, elixir-format
|
||||||
msgid "Only sign-in via Single Sign-On (SSO) is allowed."
|
msgid "Only sign-in via Single Sign-On (SSO) is allowed."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
#: lib/mv_web/live/global_settings_live.ex
|
||||||
|
#, elixir-autogen, elixir-format
|
||||||
|
msgctxt "action"
|
||||||
|
msgid "Open"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: lib/mv_web/live/member_live/show/membership_fees_component.ex
|
||||||
|
#, elixir-autogen, elixir-format
|
||||||
|
msgctxt "status"
|
||||||
|
msgid "Open"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: lib/mv_web/live/global_settings_live.ex
|
||||||
|
#, elixir-autogen, elixir-format
|
||||||
|
msgid "join page URL in a new tab"
|
||||||
|
msgstr ""
|
||||||
|
|
|
||||||
|
|
@ -2397,11 +2397,6 @@ msgstr ""
|
||||||
msgid "Only possible if no members are assigned to this type."
|
msgid "Only possible if no members are assigned to this type."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: lib/mv_web/live/member_live/show/membership_fees_component.ex
|
|
||||||
#, elixir-autogen, elixir-format
|
|
||||||
msgid "Open"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
#: lib/mv_web/live/member_live/index.html.heex
|
#: lib/mv_web/live/member_live/index.html.heex
|
||||||
#, elixir-autogen, elixir-format
|
#, elixir-autogen, elixir-format
|
||||||
msgid "Open email program with BCC recipients"
|
msgid "Open email program with BCC recipients"
|
||||||
|
|
@ -3905,3 +3900,20 @@ msgstr ""
|
||||||
#, elixir-autogen, elixir-format
|
#, elixir-autogen, elixir-format
|
||||||
msgid "Only sign-in via Single Sign-On (SSO) is allowed."
|
msgid "Only sign-in via Single Sign-On (SSO) is allowed."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
#: lib/mv_web/live/global_settings_live.ex
|
||||||
|
#, elixir-autogen, elixir-format
|
||||||
|
msgctxt "action"
|
||||||
|
msgid "Open"
|
||||||
|
msgstr "Open"
|
||||||
|
|
||||||
|
#: lib/mv_web/live/member_live/show/membership_fees_component.ex
|
||||||
|
#, elixir-autogen, elixir-format
|
||||||
|
msgctxt "status"
|
||||||
|
msgid "Open"
|
||||||
|
msgstr "Open"
|
||||||
|
|
||||||
|
#: lib/mv_web/live/global_settings_live.ex
|
||||||
|
#, elixir-autogen, elixir-format
|
||||||
|
msgid "join page URL in a new tab"
|
||||||
|
msgstr "join page URL in a new tab"
|
||||||
|
|
|
||||||
|
|
@ -16,9 +16,13 @@ defmodule Mv.Membership.MemberGroupsRelationshipTest do
|
||||||
|
|
||||||
describe "Relationships" do
|
describe "Relationships" do
|
||||||
test "member has many_to_many groups relationship (load with preloading)", %{actor: actor} do
|
test "member has many_to_many groups relationship (load with preloading)", %{actor: actor} do
|
||||||
{:ok, member} = Membership.create_member(%{email: "test@test.com"}, actor: actor)
|
{:ok, member} = Membership.create_member(%{email: unique_email("member")}, actor: actor)
|
||||||
{:ok, group1} = Membership.create_group(%{name: "Group One"}, actor: actor)
|
|
||||||
{:ok, group2} = Membership.create_group(%{name: "Group Two"}, actor: actor)
|
{:ok, group1} =
|
||||||
|
Membership.create_group(%{name: unique_group_name("Group One")}, actor: actor)
|
||||||
|
|
||||||
|
{:ok, group2} =
|
||||||
|
Membership.create_group(%{name: unique_group_name("Group Two")}, actor: actor)
|
||||||
|
|
||||||
{:ok, _mg1} =
|
{:ok, _mg1} =
|
||||||
Membership.create_member_group(%{member_id: member.id, group_id: group1.id},
|
Membership.create_member_group(%{member_id: member.id, group_id: group1.id},
|
||||||
|
|
@ -40,9 +44,11 @@ defmodule Mv.Membership.MemberGroupsRelationshipTest do
|
||||||
end
|
end
|
||||||
|
|
||||||
test "load multiple members with groups preloaded (N+1 prevention)", %{actor: actor} do
|
test "load multiple members with groups preloaded (N+1 prevention)", %{actor: actor} do
|
||||||
{:ok, member1} = Membership.create_member(%{email: "member1@test.com"}, actor: actor)
|
{:ok, member1} = Membership.create_member(%{email: unique_email("member1")}, actor: actor)
|
||||||
{:ok, member2} = Membership.create_member(%{email: "member2@test.com"}, actor: actor)
|
{:ok, member2} = Membership.create_member(%{email: unique_email("member2")}, actor: actor)
|
||||||
{:ok, group} = Membership.create_group(%{name: "Test Group"}, actor: actor)
|
|
||||||
|
{:ok, group} =
|
||||||
|
Membership.create_group(%{name: unique_group_name("Test Group")}, actor: actor)
|
||||||
|
|
||||||
{:ok, _mg1} =
|
{:ok, _mg1} =
|
||||||
Membership.create_member_group(%{member_id: member1.id, group_id: group.id},
|
Membership.create_member_group(%{member_id: member1.id, group_id: group.id},
|
||||||
|
|
@ -70,8 +76,10 @@ defmodule Mv.Membership.MemberGroupsRelationshipTest do
|
||||||
|
|
||||||
describe "Member-Group Association Operations" do
|
describe "Member-Group Association Operations" do
|
||||||
test "add member to group via Ash API", %{actor: actor} do
|
test "add member to group via Ash API", %{actor: actor} do
|
||||||
{:ok, member} = Membership.create_member(%{email: "test@test.com"}, actor: actor)
|
{:ok, member} = Membership.create_member(%{email: unique_email("member")}, actor: actor)
|
||||||
{:ok, group} = Membership.create_group(%{name: "Test Group"}, actor: actor)
|
|
||||||
|
{:ok, group} =
|
||||||
|
Membership.create_group(%{name: unique_group_name("Test Group")}, actor: actor)
|
||||||
|
|
||||||
assert {:ok, member_group} =
|
assert {:ok, member_group} =
|
||||||
Membership.create_member_group(%{member_id: member.id, group_id: group.id},
|
Membership.create_member_group(%{member_id: member.id, group_id: group.id},
|
||||||
|
|
@ -83,8 +91,10 @@ defmodule Mv.Membership.MemberGroupsRelationshipTest do
|
||||||
end
|
end
|
||||||
|
|
||||||
test "remove member from group via Ash API", %{actor: actor} do
|
test "remove member from group via Ash API", %{actor: actor} do
|
||||||
{:ok, member} = Membership.create_member(%{email: "test@test.com"}, actor: actor)
|
{:ok, member} = Membership.create_member(%{email: unique_email("member")}, actor: actor)
|
||||||
{:ok, group} = Membership.create_group(%{name: "Test Group"}, actor: actor)
|
|
||||||
|
{:ok, group} =
|
||||||
|
Membership.create_group(%{name: unique_group_name("Test Group")}, actor: actor)
|
||||||
|
|
||||||
{:ok, member_group} =
|
{:ok, member_group} =
|
||||||
Membership.create_member_group(%{member_id: member.id, group_id: group.id},
|
Membership.create_member_group(%{member_id: member.id, group_id: group.id},
|
||||||
|
|
@ -107,10 +117,16 @@ defmodule Mv.Membership.MemberGroupsRelationshipTest do
|
||||||
end
|
end
|
||||||
|
|
||||||
test "add member to multiple groups in single operation", %{actor: actor} do
|
test "add member to multiple groups in single operation", %{actor: actor} do
|
||||||
{:ok, member} = Membership.create_member(%{email: "test@test.com"}, actor: actor)
|
{:ok, member} = Membership.create_member(%{email: unique_email("member")}, actor: actor)
|
||||||
{:ok, group1} = Membership.create_group(%{name: "Group One"}, actor: actor)
|
|
||||||
{:ok, group2} = Membership.create_group(%{name: "Group Two"}, actor: actor)
|
{:ok, group1} =
|
||||||
{:ok, group3} = Membership.create_group(%{name: "Group Three"}, actor: actor)
|
Membership.create_group(%{name: unique_group_name("Group One")}, actor: actor)
|
||||||
|
|
||||||
|
{:ok, group2} =
|
||||||
|
Membership.create_group(%{name: unique_group_name("Group Two")}, actor: actor)
|
||||||
|
|
||||||
|
{:ok, group3} =
|
||||||
|
Membership.create_group(%{name: unique_group_name("Group Three")}, actor: actor)
|
||||||
|
|
||||||
# Add to all groups
|
# Add to all groups
|
||||||
{:ok, _mg1} =
|
{:ok, _mg1} =
|
||||||
|
|
@ -138,8 +154,10 @@ defmodule Mv.Membership.MemberGroupsRelationshipTest do
|
||||||
|
|
||||||
describe "Edge Cases" do
|
describe "Edge Cases" do
|
||||||
test "adding member to same group twice fails (duplicate prevention)", %{actor: actor} do
|
test "adding member to same group twice fails (duplicate prevention)", %{actor: actor} do
|
||||||
{:ok, member} = Membership.create_member(%{email: "test@test.com"}, actor: actor)
|
{:ok, member} = Membership.create_member(%{email: unique_email("member")}, actor: actor)
|
||||||
{:ok, group} = Membership.create_group(%{name: "Test Group"}, actor: actor)
|
|
||||||
|
{:ok, group} =
|
||||||
|
Membership.create_group(%{name: unique_group_name("Test Group")}, actor: actor)
|
||||||
|
|
||||||
{:ok, _mg1} =
|
{:ok, _mg1} =
|
||||||
Membership.create_member_group(%{member_id: member.id, group_id: group.id},
|
Membership.create_member_group(%{member_id: member.id, group_id: group.id},
|
||||||
|
|
@ -154,8 +172,10 @@ defmodule Mv.Membership.MemberGroupsRelationshipTest do
|
||||||
end
|
end
|
||||||
|
|
||||||
test "removing member from group they're not in (idempotent, no error)", %{actor: actor} do
|
test "removing member from group they're not in (idempotent, no error)", %{actor: actor} do
|
||||||
{:ok, member} = Membership.create_member(%{email: "test@test.com"}, actor: actor)
|
{:ok, member} = Membership.create_member(%{email: unique_email("member")}, actor: actor)
|
||||||
{:ok, group} = Membership.create_group(%{name: "Test Group"}, actor: actor)
|
|
||||||
|
{:ok, group} =
|
||||||
|
Membership.create_group(%{name: unique_group_name("Test Group")}, actor: actor)
|
||||||
|
|
||||||
# Verify no association exists
|
# Verify no association exists
|
||||||
{:ok, nil} =
|
{:ok, nil} =
|
||||||
|
|
@ -194,4 +214,12 @@ defmodule Mv.Membership.MemberGroupsRelationshipTest do
|
||||||
assert result == :ok || match?({:error, _}, result)
|
assert result == :ok || match?({:error, _}, result)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
defp unique_email(prefix) do
|
||||||
|
"#{prefix}-#{System.unique_integer([:positive])}@test.com"
|
||||||
|
end
|
||||||
|
|
||||||
|
defp unique_group_name(prefix) do
|
||||||
|
"#{prefix} #{System.unique_integer([:positive])}"
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -64,6 +64,21 @@ defmodule MvWeb.GlobalSettingsLiveTest do
|
||||||
|
|
||||||
assert html =~ "must be present"
|
assert html =~ "must be present"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
test "shows open button for join page URL in same row as copy", %{conn: conn} do
|
||||||
|
{:ok, settings} = Membership.get_settings()
|
||||||
|
{:ok, _} = Membership.update_settings(settings, %{join_form_enabled: true})
|
||||||
|
|
||||||
|
{:ok, view, _html} = live(conn, ~p"/settings")
|
||||||
|
|
||||||
|
assert has_element?(view, "#copy-join-url-btn")
|
||||||
|
|
||||||
|
assert has_element?(
|
||||||
|
view,
|
||||||
|
"a[href][target=\"_blank\"][rel=\"noopener noreferrer\"]",
|
||||||
|
"Open"
|
||||||
|
)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe "SMTP / E-Mail section" do
|
describe "SMTP / E-Mail section" do
|
||||||
|
|
|
||||||
|
|
@ -12,10 +12,9 @@ defmodule MvWeb.JoinLiveTest do
|
||||||
# async: false → shared sandbox; all processes (including LiveView) share the DB connection.
|
# async: false → shared sandbox; all processes (including LiveView) share the DB connection.
|
||||||
use MvWeb.ConnCase, async: false
|
use MvWeb.ConnCase, async: false
|
||||||
import Phoenix.LiveViewTest
|
import Phoenix.LiveViewTest
|
||||||
import Ecto.Query
|
|
||||||
|
|
||||||
alias Mv.Membership
|
alias Mv.Membership
|
||||||
alias Mv.Repo
|
alias Mv.Membership.JoinRequest
|
||||||
|
|
||||||
describe "GET /join" do
|
describe "GET /join" do
|
||||||
@tag role: :unauthenticated
|
@tag role: :unauthenticated
|
||||||
|
|
@ -55,11 +54,12 @@ defmodule MvWeb.JoinLiveTest do
|
||||||
})
|
})
|
||||||
|> render_submit()
|
|> render_submit()
|
||||||
|
|
||||||
# Anti-enumeration delay is applied in LiveView via send_after (100–300 ms); wait for success UI.
|
assert_eventually(fn -> count_join_requests() == count_before + 1 end)
|
||||||
Process.sleep(400)
|
|
||||||
|
assert_eventually(fn ->
|
||||||
|
view |> element("[data-testid='join-success-message']") |> has_element?()
|
||||||
|
end)
|
||||||
|
|
||||||
assert count_join_requests() == count_before + 1
|
|
||||||
assert view |> element("[data-testid='join-success-message']") |> has_element?()
|
|
||||||
assert render(view) =~ "saved your details"
|
assert render(view) =~ "saved your details"
|
||||||
assert render(view) =~ "click the link"
|
assert render(view) =~ "click the link"
|
||||||
end
|
end
|
||||||
|
|
@ -135,6 +135,181 @@ defmodule MvWeb.JoinLiveTest do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
describe "join field labels" do
|
||||||
|
@tag role: :unauthenticated
|
||||||
|
test "renders custom field name as label for custom field IDs", %{conn: conn} do
|
||||||
|
{:ok, settings} = Membership.get_settings()
|
||||||
|
system_actor = Mv.Helpers.SystemActor.get_system_actor()
|
||||||
|
|
||||||
|
{:ok, custom_field} =
|
||||||
|
Membership.create_custom_field(
|
||||||
|
%{
|
||||||
|
name: "Preferred Pronouns",
|
||||||
|
value_type: :string
|
||||||
|
},
|
||||||
|
actor: system_actor
|
||||||
|
)
|
||||||
|
|
||||||
|
{:ok, _} =
|
||||||
|
Membership.update_settings(settings, %{
|
||||||
|
join_form_enabled: true,
|
||||||
|
join_form_field_ids: ["email", custom_field.id],
|
||||||
|
join_form_field_required: %{"email" => true, custom_field.id => false}
|
||||||
|
})
|
||||||
|
|
||||||
|
{:ok, view, _html} = live(conn, "/join")
|
||||||
|
|
||||||
|
assert has_element?(
|
||||||
|
view,
|
||||||
|
"label[for='join-field-#{custom_field.id}'] .label-text",
|
||||||
|
custom_field.name
|
||||||
|
)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
describe "join field input types" do
|
||||||
|
@tag role: :unauthenticated
|
||||||
|
test "renders boolean custom field as checkbox input", %{conn: conn} do
|
||||||
|
system_actor = Mv.Helpers.SystemActor.get_system_actor()
|
||||||
|
{:ok, settings} = Membership.get_settings()
|
||||||
|
|
||||||
|
{:ok, boolean_field} =
|
||||||
|
Membership.create_custom_field(
|
||||||
|
%{
|
||||||
|
name: "Subscribe to newsletter",
|
||||||
|
value_type: :boolean
|
||||||
|
},
|
||||||
|
actor: system_actor
|
||||||
|
)
|
||||||
|
|
||||||
|
{:ok, _} =
|
||||||
|
Membership.update_settings(settings, %{
|
||||||
|
join_form_enabled: true,
|
||||||
|
join_form_field_ids: ["email", boolean_field.id],
|
||||||
|
join_form_field_required: %{"email" => true, boolean_field.id => false}
|
||||||
|
})
|
||||||
|
|
||||||
|
{:ok, view, _html} = live(conn, "/join")
|
||||||
|
|
||||||
|
assert has_element?(view, "#join-form")
|
||||||
|
|
||||||
|
assert has_element?(
|
||||||
|
view,
|
||||||
|
"input#join-field-#{boolean_field.id}[name='#{boolean_field.id}']"
|
||||||
|
)
|
||||||
|
|
||||||
|
assert has_element?(view, "input#join-field-#{boolean_field.id}[type='checkbox']")
|
||||||
|
refute has_element?(view, "input#join-field-#{boolean_field.id}[type='text']")
|
||||||
|
end
|
||||||
|
|
||||||
|
@tag role: :unauthenticated
|
||||||
|
test "renders typed custom fields with matching HTML input types", %{conn: conn} do
|
||||||
|
system_actor = Mv.Helpers.SystemActor.get_system_actor()
|
||||||
|
{:ok, settings} = Membership.get_settings()
|
||||||
|
|
||||||
|
{:ok, integer_field} =
|
||||||
|
Membership.create_custom_field(%{name: "Lucky number", value_type: :integer},
|
||||||
|
actor: system_actor
|
||||||
|
)
|
||||||
|
|
||||||
|
{:ok, date_field} =
|
||||||
|
Membership.create_custom_field(%{name: "Birth date", value_type: :date},
|
||||||
|
actor: system_actor
|
||||||
|
)
|
||||||
|
|
||||||
|
{:ok, email_field} =
|
||||||
|
Membership.create_custom_field(%{name: "Secondary email", value_type: :email},
|
||||||
|
actor: system_actor
|
||||||
|
)
|
||||||
|
|
||||||
|
{:ok, _} =
|
||||||
|
Membership.update_settings(settings, %{
|
||||||
|
join_form_enabled: true,
|
||||||
|
join_form_field_ids: ["email", integer_field.id, date_field.id, email_field.id],
|
||||||
|
join_form_field_required: %{
|
||||||
|
"email" => true,
|
||||||
|
integer_field.id => false,
|
||||||
|
date_field.id => false,
|
||||||
|
email_field.id => false
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
{:ok, view, _html} = live(conn, "/join")
|
||||||
|
|
||||||
|
assert has_element?(view, "input#join-field-#{integer_field.id}[type='number']")
|
||||||
|
assert has_element?(view, "input#join-field-#{date_field.id}[type='date']")
|
||||||
|
assert has_element?(view, "input#join-field-#{email_field.id}[type='email']")
|
||||||
|
end
|
||||||
|
|
||||||
|
@tag role: :unauthenticated
|
||||||
|
test "renders standard date member fields with date input type", %{conn: conn} do
|
||||||
|
{:ok, settings} = Membership.get_settings()
|
||||||
|
|
||||||
|
{:ok, _} =
|
||||||
|
Membership.update_settings(settings, %{
|
||||||
|
join_form_enabled: true,
|
||||||
|
join_form_field_ids: ["email", "join_date"],
|
||||||
|
join_form_field_required: %{"email" => true, "join_date" => false}
|
||||||
|
})
|
||||||
|
|
||||||
|
{:ok, view, _html} = live(conn, "/join")
|
||||||
|
|
||||||
|
assert has_element?(view, "input#join-field-join_date[type='date']")
|
||||||
|
refute has_element?(view, "input#join-field-join_date[type='text']")
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
describe "submit join form with typed custom fields" do
|
||||||
|
setup do
|
||||||
|
reset_rate_limiter()
|
||||||
|
:ok
|
||||||
|
end
|
||||||
|
|
||||||
|
@tag role: :unauthenticated
|
||||||
|
test "persists checked boolean custom field and ignores non-allowlisted field", %{conn: conn} do
|
||||||
|
system_actor = Mv.Helpers.SystemActor.get_system_actor()
|
||||||
|
{:ok, settings} = Membership.get_settings()
|
||||||
|
|
||||||
|
{:ok, boolean_field} =
|
||||||
|
Membership.create_custom_field(
|
||||||
|
%{
|
||||||
|
name: "Receive announcements",
|
||||||
|
value_type: :boolean
|
||||||
|
},
|
||||||
|
actor: system_actor
|
||||||
|
)
|
||||||
|
|
||||||
|
{:ok, _} =
|
||||||
|
Membership.update_settings(settings, %{
|
||||||
|
join_form_enabled: true,
|
||||||
|
join_form_field_ids: ["email", boolean_field.id],
|
||||||
|
join_form_field_required: %{"email" => true, boolean_field.id => false}
|
||||||
|
})
|
||||||
|
|
||||||
|
count_before = count_join_requests()
|
||||||
|
{:ok, view, _html} = live(conn, "/join")
|
||||||
|
|
||||||
|
view
|
||||||
|
|> element("#join-form")
|
||||||
|
|> render_submit(%{
|
||||||
|
"email" => "typed#{System.unique_integer([:positive])}@example.com",
|
||||||
|
"website" => "",
|
||||||
|
boolean_field.id => "on",
|
||||||
|
"not_allowlisted" => "should-not-be-persisted"
|
||||||
|
})
|
||||||
|
|
||||||
|
assert_eventually(fn -> count_join_requests() == count_before + 1 end)
|
||||||
|
|
||||||
|
assert_eventually(fn ->
|
||||||
|
view |> element("[data-testid='join-success-message']") |> has_element?()
|
||||||
|
end)
|
||||||
|
|
||||||
|
form_data = latest_join_request_form_data()
|
||||||
|
assert Map.get(form_data, boolean_field.id) == "on"
|
||||||
|
refute Map.has_key?(form_data, "not_allowlisted")
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
defp enable_join_form(enabled) do
|
defp enable_join_form(enabled) do
|
||||||
{:ok, settings} = Membership.get_settings()
|
{:ok, settings} = Membership.get_settings()
|
||||||
{:ok, _} = Membership.update_settings(settings, %{join_form_enabled: enabled})
|
{:ok, _} = Membership.update_settings(settings, %{join_form_enabled: enabled})
|
||||||
|
|
@ -154,7 +329,40 @@ defmodule MvWeb.JoinLiveTest do
|
||||||
end
|
end
|
||||||
|
|
||||||
defp count_join_requests do
|
defp count_join_requests do
|
||||||
Repo.one(from j in "join_requests", select: count(j.id)) || 0
|
case Ash.count(JoinRequest, domain: Membership, authorize?: false) do
|
||||||
|
{:ok, count} -> count
|
||||||
|
_ -> 0
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
defp latest_join_request_form_data do
|
||||||
|
query =
|
||||||
|
JoinRequest
|
||||||
|
|> Ash.Query.sort(inserted_at: :desc)
|
||||||
|
|> Ash.Query.limit(1)
|
||||||
|
|
||||||
|
case Ash.read(query, domain: Membership, authorize?: false) do
|
||||||
|
{:ok, [request]} -> request.form_data || %{}
|
||||||
|
_ -> %{}
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
defp assert_eventually(fun, timeout_ms \\ 1500) when is_function(fun, 0) do
|
||||||
|
deadline = System.monotonic_time(:millisecond) + timeout_ms
|
||||||
|
do_assert_eventually(fun, deadline)
|
||||||
|
end
|
||||||
|
|
||||||
|
defp do_assert_eventually(fun, deadline) do
|
||||||
|
if fun.() do
|
||||||
|
true
|
||||||
|
else
|
||||||
|
if System.monotonic_time(:millisecond) < deadline do
|
||||||
|
Process.sleep(25)
|
||||||
|
do_assert_eventually(fun, deadline)
|
||||||
|
else
|
||||||
|
assert fun.()
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
defp reset_rate_limiter do
|
defp reset_rate_limiter do
|
||||||
|
|
|
||||||
124
test/mv_web/live/join_request_live/show_test.exs
Normal file
124
test/mv_web/live/join_request_live/show_test.exs
Normal file
|
|
@ -0,0 +1,124 @@
|
||||||
|
defmodule MvWeb.JoinRequestLive.ShowTest do
|
||||||
|
@moduledoc """
|
||||||
|
Tests for join request detail view label rendering.
|
||||||
|
|
||||||
|
Focus: applicant data labels for custom fields should use custom field names,
|
||||||
|
not raw UUIDs.
|
||||||
|
"""
|
||||||
|
use MvWeb.ConnCase, async: false
|
||||||
|
|
||||||
|
import Phoenix.LiveViewTest
|
||||||
|
|
||||||
|
alias Mv.Fixtures
|
||||||
|
alias Mv.Membership
|
||||||
|
alias MvWeb.Helpers.DateFormatter
|
||||||
|
|
||||||
|
setup do
|
||||||
|
{:ok, settings} = Membership.get_settings()
|
||||||
|
|
||||||
|
saved = %{
|
||||||
|
join_form_enabled: settings.join_form_enabled,
|
||||||
|
join_form_field_ids: settings.join_form_field_ids,
|
||||||
|
join_form_field_required: settings.join_form_field_required
|
||||||
|
}
|
||||||
|
|
||||||
|
on_exit(fn ->
|
||||||
|
{:ok, current_settings} = Membership.get_settings()
|
||||||
|
|
||||||
|
Membership.update_settings(current_settings, %{
|
||||||
|
join_form_enabled: saved.join_form_enabled,
|
||||||
|
join_form_field_ids: saved.join_form_field_ids || [],
|
||||||
|
join_form_field_required: saved.join_form_field_required || %{}
|
||||||
|
})
|
||||||
|
end)
|
||||||
|
|
||||||
|
:ok
|
||||||
|
end
|
||||||
|
|
||||||
|
describe "custom field labels in applicant data" do
|
||||||
|
@tag role: :normal_user
|
||||||
|
test "renders custom field name instead of custom field UUID", %{conn: conn} do
|
||||||
|
system_actor = Mv.Helpers.SystemActor.get_system_actor()
|
||||||
|
{:ok, settings} = Membership.get_settings()
|
||||||
|
|
||||||
|
{:ok, custom_field} =
|
||||||
|
Membership.create_custom_field(
|
||||||
|
%{
|
||||||
|
name: "Emergency contact",
|
||||||
|
value_type: :string
|
||||||
|
},
|
||||||
|
actor: system_actor
|
||||||
|
)
|
||||||
|
|
||||||
|
{:ok, _} =
|
||||||
|
Membership.update_settings(settings, %{
|
||||||
|
join_form_enabled: true,
|
||||||
|
join_form_field_ids: ["email", custom_field.id],
|
||||||
|
join_form_field_required: %{"email" => true, custom_field.id => false}
|
||||||
|
})
|
||||||
|
|
||||||
|
join_request =
|
||||||
|
Fixtures.submitted_join_request_fixture(%{
|
||||||
|
form_data: %{custom_field.id => "Alice Example"}
|
||||||
|
})
|
||||||
|
|
||||||
|
{:ok, view, _html} = live(conn, "/join_requests/#{join_request.id}")
|
||||||
|
|
||||||
|
assert has_element?(view, "dt", "#{custom_field.name}:")
|
||||||
|
assert has_element?(view, "dd", "Alice Example")
|
||||||
|
refute has_element?(view, "dt", "#{custom_field.id}:")
|
||||||
|
end
|
||||||
|
|
||||||
|
@tag role: :normal_user
|
||||||
|
test "formats boolean/date values and renders status in aligned row", %{conn: conn} do
|
||||||
|
system_actor = Mv.Helpers.SystemActor.get_system_actor()
|
||||||
|
{:ok, settings} = Membership.get_settings()
|
||||||
|
|
||||||
|
{:ok, boolean_field} =
|
||||||
|
Membership.create_custom_field(
|
||||||
|
%{
|
||||||
|
name: "Privacy accepted",
|
||||||
|
value_type: :boolean
|
||||||
|
},
|
||||||
|
actor: system_actor
|
||||||
|
)
|
||||||
|
|
||||||
|
{:ok, date_field} =
|
||||||
|
Membership.create_custom_field(
|
||||||
|
%{
|
||||||
|
name: "Birth date",
|
||||||
|
value_type: :date
|
||||||
|
},
|
||||||
|
actor: system_actor
|
||||||
|
)
|
||||||
|
|
||||||
|
{:ok, _} =
|
||||||
|
Membership.update_settings(settings, %{
|
||||||
|
join_form_enabled: true,
|
||||||
|
join_form_field_ids: ["email", boolean_field.id, date_field.id],
|
||||||
|
join_form_field_required: %{
|
||||||
|
"email" => true,
|
||||||
|
boolean_field.id => false,
|
||||||
|
date_field.id => false
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
join_request =
|
||||||
|
Fixtures.submitted_join_request_fixture(%{
|
||||||
|
form_data: %{
|
||||||
|
boolean_field.id => "on",
|
||||||
|
date_field.id => "2000-01-12"
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
{:ok, view, _html} = live(conn, "/join_requests/#{join_request.id}")
|
||||||
|
|
||||||
|
assert has_element?(view, "dt", "Privacy accepted:")
|
||||||
|
assert has_element?(view, "dd", "Yes")
|
||||||
|
assert has_element?(view, "dt", "Birth date:")
|
||||||
|
assert has_element?(view, "dd", DateFormatter.format_date(~D[2000-01-12]))
|
||||||
|
assert has_element?(view, "dt", "Status:")
|
||||||
|
assert has_element?(view, "dd", "Submitted")
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
Loading…
Add table
Add a link
Reference in a new issue