Skip to content

Adds support for parameterized Ecto types #331

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Adds support for parameterized Ecto types #331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions lib/kaffy/resource_form.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,6 +384,7 @@ defmodule Kaffy.ResourceForm do
disabled: opts[:readonly],
aria_describedby: field
)

_ ->
text_input(form, field,
class: "form-control",
Expand Down Expand Up @@ -456,6 +457,7 @@ defmodule Kaffy.ResourceForm do
case type do
:id ->
number_input(form, field, opts)

_ ->
text_input(form, field, opts)
end
Expand Down Expand Up @@ -501,11 +503,8 @@ defmodule Kaffy.ResourceForm do
def kaffy_input(conn, changeset, form, field, options) do
ft = Kaffy.ResourceSchema.field_type(changeset.data.__struct__, field)

case Kaffy.Utils.is_module(ft) && Keyword.has_key?(ft.__info__(:functions), :render_form) do
true ->
ft.render_form(conn, changeset, form, field, options)

false ->
case custom_field_type(ft) do
{:ok, :default_type} ->
{error_msg, error_class} = get_field_error(changeset, field)
help_text = form_help_text({field, options})

Expand All @@ -529,10 +528,23 @@ defmodule Kaffy.ResourceForm do

[label_tag, field_tag, field_feeback]
end

{:ok, ft} ->
ft.render_form(conn, changeset, form, field, options)
end
end

defp add_class(opts, class) do
Keyword.update(opts, :class, class, &"#{&1} #{class}")
end

defp custom_field_type({:parameterized, {ft, _opts}}), do: custom_field_type(ft)

defp custom_field_type(ft) do
if Kaffy.Utils.is_module(ft) && Keyword.has_key?(ft.__info__(:functions), :render_form) do
{:ok, ft}
else
{:ok, :default_type}
end
end
end
9 changes: 9 additions & 0 deletions lib/kaffy/resource_schema.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,14 +179,21 @@ defmodule Kaffy.ResourceSchema do
cond do
value.__struct__ in [NaiveDateTime, DateTime, Date, Time] ->
value

value.__struct__ in [Geo.Point] ->
Kaffy.Utils.json().encode!(value, escape: :html_safe, pretty: true)

true ->
Map.from_struct(value)
|> Map.drop([:__meta__])
|> Kaffy.Utils.json().encode!(escape: :html_safe, pretty: true)
end

is_tuple(ft) && elem(ft, 0) == :parameterized &&
Keyword.has_key?(elem(elem(ft, 1), 0).__info__(:functions), :render_index) ->
{:parameterized, {pt, _opts}} = ft
pt.render_index(conn, schema, field, options)

Kaffy.Utils.is_module(ft) && Keyword.has_key?(ft.__info__(:functions), :render_index) ->
ft.render_index(conn, schema, field, options)

Expand Down Expand Up @@ -216,8 +223,10 @@ defmodule Kaffy.ResourceSchema do
cond do
value.__struct__ in [NaiveDateTime, DateTime, Date, Time] ->
value

value.__struct__ in [Geo.Point] ->
Kaffy.Utils.json().encode!(value, escape: :html_safe, pretty: true)

true ->
Map.from_struct(value)
|> Map.drop([:__meta__])
Expand Down
Loading