ash-project/ash_phoenix
1
0
Fork 0
mirror of https://github.com/ash-project/ash_phoenix.git synced 2024-09-20 07:12:49 +12:00
Code Issues Projects Releases Packages Wiki Activity

fix: fix some error transforming logic

Browse source
This commit is contained in:
Zach Daniel 2021-10-21 18:42:09 -04:00
parent 8f5b0f9df7
commit be5c0de5f1
1 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
lib/ash_phoenix/form_data/helpers.ex
View file

@ -33,12 +33,23 @@ defmodule AshPhoenix.FormData.Helpers do
|> Macro.underscore()
end
defp match_path_filter?(path, path_filter, form_keys) do
defp match_path_filter?(path, path_filter, form_keys \\ []) do
path == path_filter ||
(List.starts_with?(path, path_filter) &&
!Enum.any?(form_keys, fn {key, _} ->
List.starts_with?(path, path ++ [key])
end))
(!Enum.empty?(form_keys) &&
!form_would_capture?(form_keys, path, path_filter))
end
defp form_would_capture?(form_keys, path, path_filter) do
Enum.any?(form_keys, fn {key, config} ->
key = config[:for] || key
if config[:type] == :list do
List.starts_with?(path, path_filter ++ [key]) &&
is_integer(path |> Enum.drop(Enum.count(path_filter) + 1) |> Enum.at(0))
else
List.starts_with?(path, path_filter ++ [key])
end
end)
end
def transform_errors(form, errors, path_filter \\ nil, form_keys \\ []) do
@ -52,12 +63,10 @@ defmodule AshPhoenix.FormData.Helpers do
errors
|> Enum.filter(fn error ->
if Map.has_key?(error, :path) && path_filter do
Enum.any?(
[path_filter | additional_path_filters],
&match_path_filter?(error.path, &1, form_keys)
)
match_path_filter?(error.path, path_filter, form_keys) ||
Enum.any?(additional_path_filters, &match_path_filter?(error.path, &1))
else
true
false
end
end)
|> Enum.map(fn error ->