<%!-- Status and review (submitted_at, status; if decided: approved/rejected at, reviewed by) --%>
{gettext("Status and review")}
-
- <.field_row
- label={gettext("Submitted at")}
- value={DateFormatter.format_datetime(@join_request.submitted_at, @browser_timezone)}
- />
-
-
{gettext("Status")}:
-
+
+
+ <.field_row
+ label={gettext("Submitted at")}
+ value={DateFormatter.format_datetime(@join_request.submitted_at, @browser_timezone)}
+ />
+ <.field_row label={gettext("Status")}>
<.badge variant={JoinRequestHelpers.status_badge_variant(@join_request.status)}>
{JoinRequestHelpers.format_status(@join_request.status)}
-
-
- <%= if @join_request.status in [:approved, :rejected] do %>
- <%= if @join_request.approved_at do %>
+
+ <%= if @join_request.status in [:approved, :rejected] do %>
+ <%= if @join_request.approved_at do %>
+ <.field_row
+ label={gettext("Approved at")}
+ value={
+ DateFormatter.format_datetime(@join_request.approved_at, @browser_timezone)
+ }
+ />
+ <% end %>
+ <%= if @join_request.rejected_at do %>
+ <.field_row
+ label={gettext("Rejected at")}
+ value={
+ DateFormatter.format_datetime(@join_request.rejected_at, @browser_timezone)
+ }
+ />
+ <% end %>
<.field_row
- label={gettext("Approved at")}
- value={
- DateFormatter.format_datetime(@join_request.approved_at, @browser_timezone)
- }
+ label={gettext("Review by")}
+ value={JoinRequestHelpers.reviewer_display(@join_request)}
+ empty_text="-"
/>
<% end %>
- <%= if @join_request.rejected_at do %>
- <.field_row
- label={gettext("Rejected at")}
- value={
- DateFormatter.format_datetime(@join_request.rejected_at, @browser_timezone)
- }
- />
- <% end %>
- <.field_row
- label={gettext("Review by")}
- value={JoinRequestHelpers.reviewer_display(@join_request)}
- empty_text="-"
- />
- <% end %>
+
@@ -209,28 +224,30 @@ defmodule MvWeb.JoinRequestLive.Show do
attr :label, :string, required: true
attr :value, :any, default: nil
attr :empty_text, :string, default: nil
+ slot :inner_block
defp field_row(assigns) do
~H"""
-
- {@label}:
-
- <%= if @value && @value != "" do %>
+ {@label}:
+
+ <%= cond do %>
+ <% @inner_block != [] -> %>
+ {render_slot(@inner_block)}
+ <% @value && @value != "" -> %>
{@value}
- <% else %>
+ <% true -> %>
{@empty_text || gettext("Not specified")}
- <% end %>
-
-
+ <% end %>
+
"""
end
# 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
# 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)
form_data = join_request.form_data || %{}
@@ -244,8 +261,9 @@ defmodule MvWeb.JoinRequestLive.Show do
ordered_field_ids
|> Enum.map(fn key ->
value = Map.get(typed, key) || Map.get(form_data, key)
- label = field_key_to_label(key, member_field_strings)
- {label, format_applicant_value(value)}
+ label = field_key_to_label(key, member_field_strings, custom_field_by_id)
+ value_type = field_key_to_value_type(key, member_field_strings, custom_field_by_id)
+ {label, format_applicant_value(value, value_type)}
end)
legacy_keys =
@@ -258,34 +276,66 @@ defmodule MvWeb.JoinRequestLive.Show do
legacy_entries =
Enum.map(legacy_keys, fn key ->
- label = field_key_to_label(key, member_field_strings)
- {label, format_applicant_value(form_data[key])}
+ label = field_key_to_label(key, member_field_strings, custom_field_by_id)
+ 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)
in_order ++ legacy_entries
end
- defp format_applicant_value(nil), do: nil
- defp format_applicant_value(""), do: nil
- defp format_applicant_value(%Date{} = date), do: DateFormatter.format_date(date)
+ defp format_applicant_value(nil, _type), do: nil
+ defp format_applicant_value("", _type), do: nil
+ defp format_applicant_value(%Date{} = date, _type), do: DateFormatter.format_date(date)
- defp format_applicant_value(value) when is_map(value),
- do: format_applicant_value_from_map(value)
+ defp format_applicant_value(value, type) when is_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"))
- defp format_applicant_value(value) when is_binary(value) or is_number(value),
- do: to_string(value)
+ defp format_applicant_value(value, type) when is_binary(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")
type = Map.get(value, "_union_type") || Map.get(value, "type")
+ effective_type = type || fallback_type
- if raw && type in ["date", :date] do
- format_applicant_value(raw)
+ if raw && effective_type in ["date", :date, Ash.Type.Date] do
+ format_applicant_value(raw, :date)
else
format_applicant_value_simple(raw, value)
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), do: to_string(value)
- defp field_key_to_label(key, member_field_strings) when is_binary(key) do
- if key in member_field_strings,
- do: MemberFieldsTranslations.label(String.to_existing_atom(key)),
- else: key
+ defp field_key_to_label(key, member_field_strings, custom_field_by_id)
+ when is_binary(key) do
+ if key in member_field_strings do
+ MemberFieldsTranslations.label(String.to_existing_atom(key))
+ else
+ case Map.get(custom_field_by_id, key) do
+ %{name: name} -> name
+ _ -> key
+ 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
diff --git a/lib/mv_web/live/member_live/show/membership_fees_component.ex b/lib/mv_web/live/member_live/show/membership_fees_component.ex
index 370d4aa..e8ddff4 100644
--- a/lib/mv_web/live/member_live/show/membership_fees_component.ex
+++ b/lib/mv_web/live/member_live/show/membership_fees_component.ex
@@ -1291,7 +1291,7 @@ defmodule MvWeb.MemberLive.Show.MembershipFeesComponent do
defp translate_receipt_status("paid"), do: gettext("Paid")
defp translate_receipt_status("unpaid"), do: gettext("Unpaid")
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("draft"), do: gettext("Draft")
defp translate_receipt_status("incompleted"), do: gettext("Incomplete")
diff --git a/mix.exs b/mix.exs
index c037e46..8a455e7 100644
--- a/mix.exs
+++ b/mix.exs
@@ -38,8 +38,8 @@ defmodule Mv.MixProject do
[
{:tidewave, "~> 0.5", only: [:dev]},
{:sourceror, "~> 1.8", only: [:dev, :test]},
- {:live_debugger, "~> 0.8", only: [:dev]},
- {:ash_admin, "~> 0.14"},
+ {:live_debugger, "~> 1.0", only: [:dev]},
+ {:ash_admin, "~> 1.0"},
{:ash_postgres, "~> 2.0"},
{:ash_phoenix, "~> 2.0"},
{:ash, "~> 3.0"},
diff --git a/mix.lock b/mix.lock
index d9ecde7..41d49b8 100644
--- a/mix.lock
+++ b/mix.lock
@@ -1,6 +1,6 @@
%{
- "ash": {:hex, :ash, "3.24.5", "85ed4d834c2fc52a2e5f19b6cdb3d875bea62d32e0d9838f5a8c8d74a6d653a9", [:mix], [{:crux, ">= 0.1.2 and < 1.0.0-0", [hex: :crux, repo: "hexpm", optional: false]}, {:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:ecto, "~> 3.7", [hex: :ecto, repo: "hexpm", optional: false]}, {:ets, "~> 0.8", [hex: :ets, repo: "hexpm", optional: false]}, {:igniter, ">= 0.6.29 and < 1.0.0-0", [hex: :igniter, repo: "hexpm", optional: true]}, {:jason, ">= 1.0.0", [hex: :jason, repo: "hexpm", optional: false]}, {:picosat_elixir, "~> 0.2", [hex: :picosat_elixir, repo: "hexpm", optional: true]}, {:plug, ">= 0.0.0", [hex: :plug, repo: "hexpm", optional: true]}, {:reactor, "~> 1.0", [hex: :reactor, repo: "hexpm", optional: false]}, {:simple_sat, ">= 0.1.1 and < 1.0.0-0", [hex: :simple_sat, repo: "hexpm", optional: true]}, {:spark, ">= 2.6.0", [hex: :spark, repo: "hexpm", optional: false]}, {:splode, "~> 0.3", [hex: :splode, repo: "hexpm", optional: false]}, {:stream_data, "~> 1.0", [hex: :stream_data, repo: "hexpm", optional: false]}, {:telemetry, "~> 1.1", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "596e7da2f488f6b7b43c76be3643cb3fb3ef2d82908d9d79a65b25ab3cf5a4fb"},
- "ash_admin": {:hex, :ash_admin, "0.14.0", "1a8f61f6cef7af757852e94a916a152bd3f3c3620b094de84a008120675adccd", [:mix], [{:ash, ">= 3.4.63 and < 4.0.0-0", [hex: :ash, repo: "hexpm", optional: false]}, {:ash_phoenix, ">= 2.1.8 and < 3.0.0-0", [hex: :ash_phoenix, repo: "hexpm", optional: false]}, {:cinder, "~> 0.9", [hex: :cinder, repo: "hexpm", optional: false]}, {:gettext, "~> 0.26 or ~> 1.0", [hex: :gettext, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.7", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 4.1", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:phoenix_live_view, "~> 1.1-rc", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: false]}], "hexpm", "d3bc34c266491ae3177f2a76ad97bbe916c4d3a41d56196db9d95e76413b3455"},
+ "ash": {:hex, :ash, "3.24.7", "6e2f32011e7c8f0809dae36712ccfb2efaf3c669cbda7443685436e80acdebf7", [:mix], [{:crux, ">= 0.1.2 and < 1.0.0-0", [hex: :crux, repo: "hexpm", optional: false]}, {:decimal, "~> 2.0 or ~> 3.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:ecto, "~> 3.7", [hex: :ecto, repo: "hexpm", optional: false]}, {:ets, "~> 0.8", [hex: :ets, repo: "hexpm", optional: false]}, {:igniter, ">= 0.6.29 and < 1.0.0-0", [hex: :igniter, repo: "hexpm", optional: true]}, {:jason, ">= 1.0.0", [hex: :jason, repo: "hexpm", optional: false]}, {:picosat_elixir, "~> 0.2", [hex: :picosat_elixir, repo: "hexpm", optional: true]}, {:plug, ">= 0.0.0", [hex: :plug, repo: "hexpm", optional: true]}, {:reactor, "~> 1.0", [hex: :reactor, repo: "hexpm", optional: false]}, {:simple_sat, ">= 0.1.1 and < 1.0.0-0", [hex: :simple_sat, repo: "hexpm", optional: true]}, {:spark, ">= 2.6.0", [hex: :spark, repo: "hexpm", optional: false]}, {:splode, "~> 0.3", [hex: :splode, repo: "hexpm", optional: false]}, {:stream_data, "~> 1.0", [hex: :stream_data, repo: "hexpm", optional: false]}, {:telemetry, "~> 1.1", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "c9fb4d21c3c8bb85636338d448afdc283dd98a433d869e4b2210ac57ade00624"},
+ "ash_admin": {:hex, :ash_admin, "1.1.0", "df7c8075347ca9229f132648534a33319f29ae5aceed6c1015d138bba1a4811f", [:mix], [{:ash, ">= 3.4.63 and < 4.0.0-0", [hex: :ash, repo: "hexpm", optional: false]}, {:ash_phoenix, ">= 2.3.20 and < 3.0.0-0", [hex: :ash_phoenix, repo: "hexpm", optional: false]}, {:cinder, "~> 0.9", [hex: :cinder, repo: "hexpm", optional: false]}, {:gettext, "~> 0.26 or ~> 1.0", [hex: :gettext, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.7", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 4.1", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:phoenix_live_view, "~> 1.1-rc", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: false]}], "hexpm", "f8bd6c08b584a315a9574c7bbe9c1c914bc5c51838045994b0e5369871f9b3d8"},
"ash_authentication": {:hex, :ash_authentication, "4.13.7", "421b5ddb516026f6794435980a632109ec116af2afa68a45e15fb48b41c92cfa", [:mix], [{:argon2_elixir, "~> 4.0", [hex: :argon2_elixir, repo: "hexpm", optional: true]}, {:ash, "~> 3.7", [hex: :ash, repo: "hexpm", optional: false]}, {:ash_postgres, ">= 2.6.8 and < 3.0.0-0", [hex: :ash_postgres, repo: "hexpm", optional: true]}, {:assent, "> 0.2.0 and < 0.3.0", [hex: :assent, repo: "hexpm", optional: false]}, {:bcrypt_elixir, "~> 3.0", [hex: :bcrypt_elixir, repo: "hexpm", optional: false]}, {:castore, "~> 1.0", [hex: :castore, repo: "hexpm", optional: false]}, {:finch, "~> 0.19", [hex: :finch, repo: "hexpm", optional: false]}, {:igniter, "~> 0.4", [hex: :igniter, repo: "hexpm", optional: true]}, {:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}, {:joken, "~> 2.5", [hex: :joken, repo: "hexpm", optional: false]}, {:plug, "~> 1.13", [hex: :plug, repo: "hexpm", optional: false]}, {:spark, "~> 2.0", [hex: :spark, repo: "hexpm", optional: false]}, {:splode, "~> 0.2", [hex: :splode, repo: "hexpm", optional: false]}], "hexpm", "0d45ac3fdcca6902dabbe161ce63e9cea8f90583863c2e14261c9309e5837121"},
"ash_authentication_phoenix": {:hex, :ash_authentication_phoenix, "2.16.0", "02045ecde9eeb30ab1bfffbdf693c64426af24902bcd533765eba725b9b9f46f", [:mix], [{:ash, "~> 3.0", [hex: :ash, repo: "hexpm", optional: false]}, {:ash_authentication, "~> 4.10", [hex: :ash_authentication, repo: "hexpm", optional: false]}, {:ash_phoenix, ">= 2.3.11 and < 3.0.0-0", [hex: :ash_phoenix, repo: "hexpm", optional: false]}, {:bcrypt_elixir, "~> 3.0", [hex: :bcrypt_elixir, repo: "hexpm", optional: false]}, {:gettext, "~> 0.26 or ~> 1.0", [hex: :gettext, repo: "hexpm", optional: true]}, {:igniter, ">= 0.5.25 and < 1.0.0-0", [hex: :igniter, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.6", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:phoenix_html_helpers, "~> 1.0", [hex: :phoenix_html_helpers, repo: "hexpm", optional: false]}, {:phoenix_live_view, "~> 1.1", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: false]}, {:slugify, "~> 1.3", [hex: :slugify, repo: "hexpm", optional: false]}], "hexpm", "1107a45af771ee7c02ebe82abcaf9a778096e66b3e6cb2b6e614d22d1fe385f7"},
"ash_phoenix": {:hex, :ash_phoenix, "2.3.22", "f59a347ee09e1fa9973fe1b2faf7f8f793acc14dc09341062783b8eb1a9f5c99", [:mix], [{:ash, ">= 3.5.13 and < 4.0.0-0", [hex: :ash, repo: "hexpm", optional: false]}, {:igniter, "~> 0.6", [hex: :igniter, repo: "hexpm", optional: true]}, {:inertia, "~> 2.3", [hex: :inertia, repo: "hexpm", optional: true]}, {:phoenix, "~> 1.5.6 or ~> 1.6", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:phoenix_live_view, "~> 0.20.3 or ~> 1.0-rc.1", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}, {:spark, ">= 2.2.29 and < 3.0.0-0", [hex: :spark, repo: "hexpm", optional: false]}], "hexpm", "4b34ea84e122c238ad1843888b8fd4d21aec27605b9b1e6e27e1b70329560fbb"},
@@ -13,7 +13,7 @@
"bypass": {:hex, :bypass, "2.1.0", "909782781bf8e20ee86a9cabde36b259d44af8b9f38756173e8f5e2e1fabb9b1", [:mix], [{:plug, "~> 1.7", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.0", [hex: :plug_cowboy, repo: "hexpm", optional: false]}, {:ranch, "~> 1.3", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm", "d9b5df8fa5b7a6efa08384e9bbecfe4ce61c77d28a4282f79e02f1ef78d96b80"},
"castore": {:hex, :castore, "1.0.18", "5e43ef0ec7d31195dfa5a65a86e6131db999d074179d2ba5a8de11fe14570f55", [:mix], [], "hexpm", "f393e4fe6317829b158fb74d86eb681f737d2fe326aa61ccf6293c4104957e34"},
"cc_precompiler": {:hex, :cc_precompiler, "0.1.11", "8c844d0b9fb98a3edea067f94f616b3f6b29b959b6b3bf25fee94ffe34364768", [:mix], [{:elixir_make, "~> 0.7", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm", "3427232caf0835f94680e5bcf082408a70b48ad68a5f5c0b02a3bea9f3a075b9"},
- "cinder": {:hex, :cinder, "0.12.1", "02ae4988e025fb32c37e4e7f2e491586b952918c0dd99d856da13271cd680e16", [:mix], [{:ash, "~> 3.0", [hex: :ash, repo: "hexpm", optional: false]}, {:ash_phoenix, "~> 2.3", [hex: :ash_phoenix, repo: "hexpm", optional: false]}, {:gettext, "~> 1.0.0", [hex: :gettext, repo: "hexpm", optional: false]}, {:phoenix_live_view, "~> 1.0", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}, {:spark, "~> 2.0", [hex: :spark, repo: "hexpm", optional: false]}], "hexpm", "a48b5677c1f57619d9d7564fb2bd7928f93750a2e8c0b1b145852a30ecf2aa20"},
+ "cinder": {:hex, :cinder, "0.13.0", "5ed447df76ee1da7a61fbb5c1069b2baa5a46972e499acc9c971c6deab8a68e1", [:mix], [{:ash, "~> 3.0", [hex: :ash, repo: "hexpm", optional: false]}, {:ash_phoenix, "~> 2.3", [hex: :ash_phoenix, repo: "hexpm", optional: false]}, {:gettext, "~> 1.0.0", [hex: :gettext, repo: "hexpm", optional: false]}, {:phoenix_live_view, "~> 1.0", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}], "hexpm", "82f902eeb41bcbb084b34b7ba9add1c7eabed1d06eccb856d1e83977954abe93"},
"circular_buffer": {:hex, :circular_buffer, "1.0.0", "25c004da0cba7bd8bc1bdabded4f9a902d095e20600fd15faf1f2ffbaea18a07", [:mix], [], "hexpm", "c829ec31c13c7bafd1f546677263dff5bfb006e929f25635878ac3cfba8749e5"},
"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"},
@@ -22,9 +22,9 @@
"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"},
+ "decimal": {:hex, :decimal, "3.0.0", "ce2befbd7218427e4a57d1c6efa6bf50cfc7d0c480c422e70f4fb533074a5f33", [], [], "hexpm", "7a6ab3f806f09738991fc951b2fd2390b3377113feec605a540121aaf772a87b"},
"dns_cluster": {:hex, :dns_cluster, "0.2.0", "aa8eb46e3bd0326bd67b84790c561733b25c5ba2fe3c7e36f28e88f384ebcb33", [:mix], [], "hexpm", "ba6f1893411c69c01b9e8e8f772062535a4cf70f3f35bcc964a324078d8c8240"},
- "ecto": {:hex, :ecto, "3.13.5", "9d4a69700183f33bf97208294768e561f5c7f1ecf417e0fa1006e4a91713a834", [:mix], [{:decimal, "~> 2.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", "df9efebf70cf94142739ba357499661ef5dbb559ef902b68ea1f3c1fabce36de"},
+ "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"},
"ecto_sql": {:hex, :ecto_sql, "3.13.5", "2f8282b2ad97bf0f0d3217ea0a6fff320ead9e2f8770f810141189d182dc304e", [:mix], [{:db_connection, "~> 2.4.1 or ~> 2.5", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.13.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:myxql, "~> 0.7", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.19 or ~> 1.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:tds, "~> 2.1.1 or ~> 2.2", [hex: :tds, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "aa36751f4e6a2b56ae79efb0e088042e010ff4935fc8684e74c23b1f49e25fdc"},
"elixir_make": {:hex, :elixir_make, "0.9.0", "6484b3cd8c0cee58f09f05ecaf1a140a8c97670671a6a0e7ab4dc326c3109726", [:mix], [], "hexpm", "db23d4fd8b757462ad02f8aa73431a426fe6671c80b200d9710caf3d1dd0ffdb"},
@@ -45,12 +45,12 @@
"igniter": {:hex, :igniter, "0.7.9", "8c573440b8127fd80be8220fb197e7422317a81072054fcc0b336029f035a416", [:mix], [{:glob_ex, "~> 0.1.7", [hex: :glob_ex, repo: "hexpm", optional: false]}, {:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}, {:owl, "~> 0.11", [hex: :owl, repo: "hexpm", optional: false]}, {:phx_new, "~> 1.7", [hex: :phx_new, repo: "hexpm", optional: true]}, {:req, "~> 0.5", [hex: :req, repo: "hexpm", optional: false]}, {:rewrite, ">= 1.1.1 and < 2.0.0-0", [hex: :rewrite, repo: "hexpm", optional: false]}, {:sourceror, "~> 1.4", [hex: :sourceror, repo: "hexpm", optional: false]}, {:spitfire, ">= 0.1.3 and < 1.0.0-0", [hex: :spitfire, repo: "hexpm", optional: false]}], "hexpm", "123513d09f3af149db851aad8492b5b49f861d2c466a72031b2a0cbd9f45526f"},
"imprintor": {:hex, :imprintor, "0.6.0", "c6dfeb3c47d15cfb7e8491cf0a40548b3b9e37d0fc33940ca6dd283d36c4bada", [:mix], [{:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}, {:rustler, ">= 0.0.0", [hex: :rustler, repo: "hexpm", optional: true]}, {:rustler_precompiled, "~> 0.8", [hex: :rustler_precompiled, repo: "hexpm", optional: false]}], "hexpm", "9c26b0e665c0ab183860e77c450e0b0a4e390249e8322328dbe1be70d0fbca36"},
"iterex": {:hex, :iterex, "0.1.2", "58f9b9b9a22a55cbfc7b5234a9c9c63eaac26d276b3db80936c0e1c60355a5a6", [:mix], [], "hexpm", "2e103b8bcc81757a9af121f6dc0df312c9a17220f302b1193ef720460d03029d"},
- "jason": {:hex, :jason, "1.4.4", "b9226785a9aa77b6857ca22832cffa5d5011a667207eb2a0ad56adb5db443b8a", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "c5eb0cab91f094599f94d55bc63409236a8ec69a21a67814529e8d5f6cc90b3b"},
+ "jason": {:hex, :jason, "1.4.5", "2e3a008590b0b8d7388c20293e9dcc9cf3e5d642fd2a114e4cbbb52e595d940a", [:mix], [{:decimal, "~> 1.0 or ~> 2.0 or ~> 3.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "b0c823996102bcd0239b3c2444eb00409b72f6a140c1950bc8b457d836b30684"},
"joken": {:hex, :joken, "2.6.2", "5daaf82259ca603af4f0b065475099ada1b2b849ff140ccd37f4b6828ca6892a", [:mix], [{:jose, "~> 1.11.10", [hex: :jose, repo: "hexpm", optional: false]}], "hexpm", "5134b5b0a6e37494e46dbf9e4dad53808e5e787904b7c73972651b51cce3d72b"},
"jose": {:hex, :jose, "1.11.12", "06e62b467b61d3726cbc19e9b5489f7549c37993de846dfb3ee8259f9ed208b3", [:mix, :rebar3], [], "hexpm", "31e92b653e9210b696765cdd885437457de1add2a9011d92f8cf63e4641bab7b"},
"lazy_html": {:hex, :lazy_html, "0.1.11", "136c8e9cd616b4f4e9c1562daa683880891120b759606dc4c3b6b18058ba5d79", [:make, :mix], [{:cc_precompiler, "~> 0.1", [hex: :cc_precompiler, repo: "hexpm", optional: false]}, {:elixir_make, "~> 0.9.0", [hex: :elixir_make, repo: "hexpm", optional: false]}, {:fine, "~> 0.1.0", [hex: :fine, repo: "hexpm", optional: false]}], "hexpm", "3b1be592929c31eca1a21673d25696e5c14cddfe922d9d1a3e3b48be4163883b"},
"libgraph": {:hex, :libgraph, "0.16.0", "3936f3eca6ef826e08880230f806bfea13193e49bf153f93edcf0239d4fd1d07", [:mix], [], "hexpm", "41ca92240e8a4138c30a7e06466acc709b0cbb795c643e9e17174a178982d6bf"},
- "live_debugger": {:hex, :live_debugger, "0.8.0", "02545b5accdf42f48aa9bddabdd7574ddf532d5aa0cb0270d7e35031bc184286", [:mix], [{:file_system, "~> 1.0", [hex: :file_system, repo: "hexpm", optional: false]}, {:igniter, ">= 0.5.40 and < 1.0.0-0", [hex: :igniter, repo: "hexpm", optional: true]}, {:phoenix, "~> 1.7", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_live_view, "~> 0.20.8 or ~> 1.0", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}], "hexpm", "4ecdec3c4267e665afd2266e3cb86239dd457f8c8fc4e63de6e150a2a7665920"},
+ "live_debugger": {:hex, :live_debugger, "1.0.0", "0bbcbdcb3b40b6862b6dfbb76579e7832e2787fee643031e5958f597def6fb32", [:mix], [{:file_system, "~> 1.0", [hex: :file_system, repo: "hexpm", optional: false]}, {:igniter, ">= 0.5.40 and < 1.0.0-0", [hex: :igniter, repo: "hexpm", optional: true]}, {:phoenix, "~> 1.7", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_live_view, ">= 1.1.7 and < 2.0.0-0", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}], "hexpm", "b80f5d9db874d3270eb534738a10982b2b4ce55d58f94544e43b4a36111585fc"},
"luhn": {:hex, :luhn, "0.3.3", "5aa0c6a32c2db4b9db9f9b883ba8301c1ae169d57199b9e6cb1ba2707bc51d96", [:mix], [], "hexpm", "3e823a913a25aab51352c727f135278d22954874d5f0835be81ed4fec3daf78d"},
"mime": {:hex, :mime, "2.0.7", "b8d739037be7cd402aee1ba0306edfdef982687ee7e9859bee6198c1e7e2f128", [:mix], [], "hexpm", "6171188e399ee16023ffc5b76ce445eb6d9672e2e241d2df6050f3c771e80ccd"},
"mint": {:hex, :mint, "1.7.1", "113fdb2b2f3b59e47c7955971854641c61f378549d73e829e1768de90fc1abf1", [:mix], [{:castore, "~> 0.1.0 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:hpax, "~> 0.1.1 or ~> 0.2.0 or ~> 1.0", [hex: :hpax, repo: "hexpm", optional: false]}], "hexpm", "fceba0a4d0f24301ddee3024ae116df1c3f4bb7a563a731f45fdfeb9d39a231b"},
@@ -59,13 +59,13 @@
"nimble_options": {:hex, :nimble_options, "1.1.1", "e3a492d54d85fc3fd7c5baf411d9d2852922f66e69476317787a7b2bb000a61b", [:mix], [], "hexpm", "821b2470ca9442c4b6984882fe9bb0389371b8ddec4d45a9504f00a66f650b44"},
"nimble_pool": {:hex, :nimble_pool, "1.1.0", "bf9c29fbdcba3564a8b800d1eeb5a3c58f36e1e11d7b7fb2e084a643f645f06b", [:mix], [], "hexpm", "af2e4e6b34197db81f7aad230c1118eac993acc0dae6bc83bac0126d4ae0813a"},
"owl": {:hex, :owl, "0.13.0", "26010e066d5992774268f3163506972ddac0a7e77bfe57fa42a250f24d6b876e", [:mix], [{:ucwidth, "~> 0.2", [hex: :ucwidth, repo: "hexpm", optional: true]}], "hexpm", "59bf9d11ce37a4db98f57cb68fbfd61593bf419ec4ed302852b6683d3d2f7475"},
- "phoenix": {:hex, :phoenix, "1.8.5", "919db335247e6d4891764dc3063415b0d2457641c5f9b3751b5df03d8e20bbcf", [:mix], [{:bandit, "~> 1.0", [hex: :bandit, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.1", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: true]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.7", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:plug_crypto, "~> 1.2 or ~> 2.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}, {:websock_adapter, "~> 0.5.3", [hex: :websock_adapter, repo: "hexpm", optional: false]}], "hexpm", "83b2bb125127e02e9f475c8e3e92736325b5b01b0b9b05407bcb4083b7a32485"},
+ "phoenix": {:hex, :phoenix, "1.8.7", "d8d755b4ff4b449f610223dd706b4ae64155cb720d3dc09c706c079ecea189e4", [:mix], [{:bandit, "~> 1.0", [hex: :bandit, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.1", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: true]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.7", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:plug_crypto, "~> 1.2 or ~> 2.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}, {:websock_adapter, "~> 0.5.3", [hex: :websock_adapter, repo: "hexpm", optional: false]}], "hexpm", "47352f72d6ab31009ef77516b1b3a14745be97b54061fd458031b9d8294869d5"},
"phoenix_ecto": {:hex, :phoenix_ecto, "4.7.0", "75c4b9dfb3efdc42aec2bd5f8bccd978aca0651dbcbc7a3f362ea5d9d43153c6", [:mix], [{:ecto, "~> 3.5", [hex: :ecto, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.14.2 or ~> 3.0 or ~> 4.1", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:plug, "~> 1.9", [hex: :plug, repo: "hexpm", optional: false]}, {:postgrex, "~> 0.16 or ~> 1.0", [hex: :postgrex, repo: "hexpm", optional: true]}], "hexpm", "1d75011e4254cb4ddf823e81823a9629559a1be93b4321a6a5f11a5306fbf4cc"},
"phoenix_html": {:hex, :phoenix_html, "4.3.0", "d3577a5df4b6954cd7890c84d955c470b5310bb49647f0a114a6eeecc850f7ad", [:mix], [], "hexpm", "3eaa290a78bab0f075f791a46a981bbe769d94bc776869f4f3063a14f30497ad"},
"phoenix_html_helpers": {:hex, :phoenix_html_helpers, "1.0.1", "7eed85c52eff80a179391036931791ee5d2f713d76a81d0d2c6ebafe1e11e5ec", [:mix], [{:phoenix_html, "~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "cffd2385d1fa4f78b04432df69ab8da63dc5cf63e07b713a4dcf36a3740e3090"},
"phoenix_live_dashboard": {:hex, :phoenix_live_dashboard, "0.8.7", "405880012cb4b706f26dd1c6349125bfc903fb9e44d1ea668adaf4e04d4884b7", [:mix], [{:ecto, "~> 3.6.2 or ~> 3.7", [hex: :ecto, repo: "hexpm", optional: true]}, {:ecto_mysql_extras, "~> 0.5", [hex: :ecto_mysql_extras, repo: "hexpm", optional: true]}, {:ecto_psql_extras, "~> 0.7", [hex: :ecto_psql_extras, repo: "hexpm", optional: true]}, {:ecto_sqlite3_extras, "~> 1.1.7 or ~> 1.2.0", [hex: :ecto_sqlite3_extras, repo: "hexpm", optional: true]}, {:mime, "~> 1.6 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:phoenix_live_view, "~> 0.19 or ~> 1.0", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}, {:telemetry_metrics, "~> 0.6 or ~> 1.0", [hex: :telemetry_metrics, repo: "hexpm", optional: false]}], "hexpm", "3a8625cab39ec261d48a13b7468dc619c0ede099601b084e343968309bd4d7d7"},
"phoenix_live_reload": {:hex, :phoenix_live_reload, "1.6.2", "b18b0773a1ba77f28c52decbb0f10fd1ac4d3ae5b8632399bbf6986e3b665f62", [:mix], [{:file_system, "~> 0.2.10 or ~> 1.0", [hex: :file_system, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.4", [hex: :phoenix, repo: "hexpm", optional: false]}], "hexpm", "d1f89c18114c50d394721365ffb428cce24f1c13de0467ffa773e2ff4a30d5b9"},
- "phoenix_live_view": {:hex, :phoenix_live_view, "1.1.28", "8a8e123d018025f756605a2fb02a4854f0d3cd7b207f710fef1fd5d9d72d0254", [:mix], [{:igniter, ">= 0.6.16 and < 1.0.0-0", [hex: :igniter, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:lazy_html, "~> 0.1.0", [hex: :lazy_html, repo: "hexpm", optional: true]}, {:phoenix, "~> 1.6.15 or ~> 1.7.0 or ~> 1.8.0-rc", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 3.3 or ~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: true]}, {:plug, "~> 1.15", [hex: :plug, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.2 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "24faad535b65089642c3a7d84088109dc58f49c1f1c5a978659855d643466353"},
+ "phoenix_live_view": {:hex, :phoenix_live_view, "1.1.30", "a84af1610755dc208da35d4d45564485edbf18c3f3c77373c4a650dc994cdcdb", [:mix], [{:igniter, ">= 0.6.16 and < 1.0.0-0", [hex: :igniter, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:lazy_html, "~> 0.1.0", [hex: :lazy_html, repo: "hexpm", optional: true]}, {:phoenix, "~> 1.6.15 or ~> 1.7.0 or ~> 1.8.0-rc", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 3.3 or ~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: true]}, {:plug, "~> 1.15", [hex: :plug, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.2 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "a353c51ac1e3190910f01a6100c7d5cc02c5e22e7374fd817bd3aedd21149039"},
"phoenix_pubsub": {:hex, :phoenix_pubsub, "2.2.0", "ff3a5616e1bed6804de7773b92cbccfc0b0f473faf1f63d7daf1206c7aeaaa6f", [:mix], [], "hexpm", "adc313a5bf7136039f63cfd9668fde73bba0765e0614cba80c06ac9460ff3e96"},
"phoenix_swoosh": {:hex, :phoenix_swoosh, "1.2.1", "b74ccaa8046fbc388a62134360ee7d9742d5a8ae74063f34eb050279de7a99e1", [:mix], [{:finch, "~> 0.8", [hex: :finch, repo: "hexpm", optional: true]}, {:hackney, "~> 1.10", [hex: :hackney, repo: "hexpm", optional: true]}, {:phoenix, "~> 1.6", [hex: :phoenix, repo: "hexpm", optional: true]}, {:phoenix_html, "~> 3.0 or ~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:phoenix_view, "~> 1.0 or ~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: false]}, {:swoosh, "~> 1.5", [hex: :swoosh, repo: "hexpm", optional: false]}], "hexpm", "4000eeba3f9d7d1a6bf56d2bd56733d5cadf41a7f0d8ffe5bb67e7d667e204a2"},
"phoenix_template": {:hex, :phoenix_template, "1.0.4", "e2092c132f3b5e5b2d49c96695342eb36d0ed514c5b252a77048d5969330d639", [:mix], [{:phoenix_html, "~> 2.14.2 or ~> 3.0 or ~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}], "hexpm", "2c0c81f0e5c6753faf5cca2f229c9709919aba34fab866d3bc05060c9c444206"},
@@ -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.0", "fb027b58b6eab1f6de5396a2abcdaaeb168f9ed4eccbb594e6ac393b02078cbd", [:mix], [{:db_connection, "~> 2.9", [hex: :db_connection, repo: "hexpm", optional: false]}, {:decimal, "~> 1.5 or ~> 2.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", "a68c4261e299597909e03e6f8ff5a13876f5caadaddd0d23af0d0a61afcc5d84"},
+ "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"},
"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"},
@@ -83,7 +83,7 @@
"slugify": {:hex, :slugify, "1.3.1", "0d3b8b7e5c1eeaa960e44dce94382bee34a39b3ea239293e457a9c5b47cc6fd3", [:mix], [], "hexpm", "cb090bbeb056b312da3125e681d98933a360a70d327820e4b7f91645c4d8be76"},
"sobelow": {:hex, :sobelow, "0.14.1", "2f81e8632f15574cba2402bcddff5497b413c01e6f094bc0ab94e83c2f74db81", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "8fac9a2bd90fdc4b15d6fca6e1608efb7f7c600fa75800813b794ee9364c87f2"},
"sourceror": {:hex, :sourceror, "1.12.0", "da354c5f35aad3cc1132f5d5b0d8437d865e2661c263260480bab51b5eedb437", [:mix], [], "hexpm", "755703683bd014ebcd5de9acc24b68fb874a660a568d1d63f8f98cd8a6ef9cd0"},
- "spark": {:hex, :spark, "2.6.1", "b0100216d3883c6a281cb2434af45afbd808695aadb034923cbaf7d8a2ba46ab", [:mix], [{:igniter, ">= 0.3.64 and < 1.0.0-0", [hex: :igniter, repo: "hexpm", optional: true]}, {:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: true]}, {:sourceror, "~> 1.2", [hex: :sourceror, repo: "hexpm", optional: true]}], "hexpm", "77bbefa5263bb6b70e1195bc0fc662ddb8ef5937a356a77ae072e56983ad13f0"},
+ "spark": {:hex, :spark, "2.7.0", "e685b33c038f12851993880bb7e3b326117612eb746fe15828678c152f8321c6", [:mix], [{:igniter, ">= 0.3.64 and < 1.0.0-0", [hex: :igniter, repo: "hexpm", optional: true]}, {:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: true]}, {:sourceror, "~> 1.2", [hex: :sourceror, repo: "hexpm", optional: true]}], "hexpm", "e2f675fbda32375b01d9ee7c652671531027fd043bf4a91bafdb2ab716aa1122"},
"spitfire": {:hex, :spitfire, "0.3.11", "79dfcb033762470de472c1c26ea2b4e3aca74700c685dbffd9a13466272c323d", [:mix], [], "hexpm", "eb6e2dadf63214e8bfe65ca9788cef2b03b01027365d78d3c0e3d9ebd3d5b7b4"},
"splode": {:hex, :splode, "0.3.1", "9843c54f84f71b7833fec3f0be06c3cfb5be6b35960ee195ea4fad84b1c25030", [:mix], [], "hexpm", "8f2309b6ec2ecbb01435656429ed1d9ed04ba28797a3280c3b0d1217018ecfbd"},
"stream_data": {:hex, :stream_data, "1.3.0", "bde37905530aff386dea1ddd86ecbf00e6642dc074ceffc10b7d4e41dfd6aac9", [:mix], [], "hexpm", "3cc552e286e817dca43c98044c706eec9318083a1480c52ae2688b08e2936e3c"},
diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po
index 383fb1c..52270cc 100644
--- a/priv/gettext/de/LC_MESSAGES/default.po
+++ b/priv/gettext/de/LC_MESSAGES/default.po
@@ -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."
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
#, elixir-autogen, elixir-format
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
msgid "Only sign-in via Single Sign-On (SSO) is allowed."
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"
diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot
index 3e2eb5d..5d48691 100644
--- a/priv/gettext/default.pot
+++ b/priv/gettext/default.pot
@@ -2397,11 +2397,6 @@ msgstr ""
msgid "Only possible if no members are assigned to this type."
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
#, elixir-autogen, elixir-format
msgid "Open email program with BCC recipients"
@@ -3905,3 +3900,20 @@ msgstr ""
#, elixir-autogen, elixir-format
msgid "Only sign-in via Single Sign-On (SSO) is allowed."
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 ""
diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po
index 21314a5..ec6f305 100644
--- a/priv/gettext/en/LC_MESSAGES/default.po
+++ b/priv/gettext/en/LC_MESSAGES/default.po
@@ -2397,11 +2397,6 @@ msgstr ""
msgid "Only possible if no members are assigned to this type."
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
#, elixir-autogen, elixir-format
msgid "Open email program with BCC recipients"
@@ -3905,3 +3900,20 @@ msgstr ""
#, elixir-autogen, elixir-format
msgid "Only sign-in via Single Sign-On (SSO) is allowed."
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"
diff --git a/test/membership/member_groups_relationship_test.exs b/test/membership/member_groups_relationship_test.exs
index a72c8bc..5ecddbd 100644
--- a/test/membership/member_groups_relationship_test.exs
+++ b/test/membership/member_groups_relationship_test.exs
@@ -16,9 +16,13 @@ defmodule Mv.Membership.MemberGroupsRelationshipTest do
describe "Relationships" 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, group1} = Membership.create_group(%{name: "Group One"}, actor: actor)
- {:ok, group2} = Membership.create_group(%{name: "Group Two"}, actor: actor)
+ {:ok, member} = Membership.create_member(%{email: unique_email("member")}, 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} =
Membership.create_member_group(%{member_id: member.id, group_id: group1.id},
@@ -40,9 +44,11 @@ defmodule Mv.Membership.MemberGroupsRelationshipTest do
end
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, member2} = Membership.create_member(%{email: "member2@test.com"}, actor: actor)
- {:ok, group} = Membership.create_group(%{name: "Test Group"}, actor: actor)
+ {:ok, member1} = Membership.create_member(%{email: unique_email("member1")}, actor: actor)
+ {:ok, member2} = Membership.create_member(%{email: unique_email("member2")}, actor: actor)
+
+ {:ok, group} =
+ Membership.create_group(%{name: unique_group_name("Test Group")}, actor: actor)
{:ok, _mg1} =
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
test "add member to group via Ash API", %{actor: actor} do
- {:ok, member} = Membership.create_member(%{email: "test@test.com"}, actor: actor)
- {:ok, group} = Membership.create_group(%{name: "Test Group"}, actor: actor)
+ {:ok, member} = Membership.create_member(%{email: unique_email("member")}, actor: actor)
+
+ {:ok, group} =
+ Membership.create_group(%{name: unique_group_name("Test Group")}, actor: actor)
assert {:ok, member_group} =
Membership.create_member_group(%{member_id: member.id, group_id: group.id},
@@ -83,8 +91,10 @@ defmodule Mv.Membership.MemberGroupsRelationshipTest do
end
test "remove member from group via Ash API", %{actor: actor} do
- {:ok, member} = Membership.create_member(%{email: "test@test.com"}, actor: actor)
- {:ok, group} = Membership.create_group(%{name: "Test Group"}, actor: actor)
+ {:ok, member} = Membership.create_member(%{email: unique_email("member")}, actor: actor)
+
+ {:ok, group} =
+ Membership.create_group(%{name: unique_group_name("Test Group")}, actor: actor)
{:ok, member_group} =
Membership.create_member_group(%{member_id: member.id, group_id: group.id},
@@ -107,10 +117,16 @@ defmodule Mv.Membership.MemberGroupsRelationshipTest do
end
test "add member to multiple groups in single operation", %{actor: actor} do
- {:ok, member} = Membership.create_member(%{email: "test@test.com"}, actor: actor)
- {:ok, group1} = Membership.create_group(%{name: "Group One"}, actor: actor)
- {:ok, group2} = Membership.create_group(%{name: "Group Two"}, actor: actor)
- {:ok, group3} = Membership.create_group(%{name: "Group Three"}, actor: actor)
+ {:ok, member} = Membership.create_member(%{email: unique_email("member")}, 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, group3} =
+ Membership.create_group(%{name: unique_group_name("Group Three")}, actor: actor)
# Add to all groups
{:ok, _mg1} =
@@ -138,8 +154,10 @@ defmodule Mv.Membership.MemberGroupsRelationshipTest do
describe "Edge Cases" 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, group} = Membership.create_group(%{name: "Test Group"}, actor: actor)
+ {:ok, member} = Membership.create_member(%{email: unique_email("member")}, actor: actor)
+
+ {:ok, group} =
+ Membership.create_group(%{name: unique_group_name("Test Group")}, actor: actor)
{:ok, _mg1} =
Membership.create_member_group(%{member_id: member.id, group_id: group.id},
@@ -154,8 +172,10 @@ defmodule Mv.Membership.MemberGroupsRelationshipTest do
end
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, group} = Membership.create_group(%{name: "Test Group"}, actor: actor)
+ {:ok, member} = Membership.create_member(%{email: unique_email("member")}, actor: actor)
+
+ {:ok, group} =
+ Membership.create_group(%{name: unique_group_name("Test Group")}, actor: actor)
# Verify no association exists
{:ok, nil} =
@@ -194,4 +214,12 @@ defmodule Mv.Membership.MemberGroupsRelationshipTest do
assert result == :ok || match?({:error, _}, result)
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
diff --git a/test/mv_web/live/global_settings_live_test.exs b/test/mv_web/live/global_settings_live_test.exs
index 92da11b..2edaf74 100644
--- a/test/mv_web/live/global_settings_live_test.exs
+++ b/test/mv_web/live/global_settings_live_test.exs
@@ -64,6 +64,21 @@ defmodule MvWeb.GlobalSettingsLiveTest do
assert html =~ "must be present"
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
describe "SMTP / E-Mail section" do
diff --git a/test/mv_web/live/join_live_test.exs b/test/mv_web/live/join_live_test.exs
index 4772e48..d0efee9 100644
--- a/test/mv_web/live/join_live_test.exs
+++ b/test/mv_web/live/join_live_test.exs
@@ -12,10 +12,9 @@ defmodule MvWeb.JoinLiveTest do
# async: false → shared sandbox; all processes (including LiveView) share the DB connection.
use MvWeb.ConnCase, async: false
import Phoenix.LiveViewTest
- import Ecto.Query
alias Mv.Membership
- alias Mv.Repo
+ alias Mv.Membership.JoinRequest
describe "GET /join" do
@tag role: :unauthenticated
@@ -55,11 +54,12 @@ defmodule MvWeb.JoinLiveTest do
})
|> render_submit()
- # Anti-enumeration delay is applied in LiveView via send_after (100–300 ms); wait for success UI.
- Process.sleep(400)
+ assert_eventually(fn -> count_join_requests() == count_before + 1 end)
+
+ 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) =~ "click the link"
end
@@ -135,6 +135,181 @@ defmodule MvWeb.JoinLiveTest do
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
{:ok, settings} = Membership.get_settings()
{:ok, _} = Membership.update_settings(settings, %{join_form_enabled: enabled})
@@ -154,7 +329,40 @@ defmodule MvWeb.JoinLiveTest do
end
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
defp reset_rate_limiter do
diff --git a/test/mv_web/live/join_request_live/show_test.exs b/test/mv_web/live/join_request_live/show_test.exs
new file mode 100644
index 0000000..40d5d5d
--- /dev/null
+++ b/test/mv_web/live/join_request_live/show_test.exs
@@ -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