mirror of
https://github.com/ash-project/ash_admin.git
synced 2024-09-20 05:12:54 +12:00
fix: ensure table columsn are loaded, bypassing (as yet) unknown bug
This commit is contained in:
parent
110a54c4d9
commit
d58198b5e3
1 changed files with 10 additions and 5 deletions
|
@ -153,8 +153,7 @@ defmodule AshAdmin.Components.Resource.DataTable do
|
||||||
domain: socket.assigns[:domain],
|
domain: socket.assigns[:domain],
|
||||||
actor: socket.assigns[:actor],
|
actor: socket.assigns[:actor],
|
||||||
tenant: socket.assigns[:tenant],
|
tenant: socket.assigns[:tenant],
|
||||||
authorize?: socket.assigns[:authorizing],
|
authorize?: socket.assigns[:authorizing]
|
||||||
prepare_source: &load_fields/1
|
|
||||||
)
|
)
|
||||||
|
|
||||||
{query, run_now?} =
|
{query, run_now?} =
|
||||||
|
@ -205,8 +204,14 @@ defmodule AshAdmin.Components.Resource.DataTable do
|
||||||
end
|
end
|
||||||
|
|
||||||
case AshPhoenix.Form.submit(socket.assigns.query, action_opts: action_opts) do
|
case AshPhoenix.Form.submit(socket.assigns.query, action_opts: action_opts) do
|
||||||
{:ok, data} -> assign(socket, :data, {:ok, data})
|
{:ok, data} ->
|
||||||
{:error, query} -> assign(socket, data: {:error, all_errors(query)}, query: query)
|
data =
|
||||||
|
Ash.load!(data, AshAdmin.Resource.table_columns(query.resource))
|
||||||
|
|
||||||
|
assign(socket, :data, {:ok, data})
|
||||||
|
|
||||||
|
{:error, query} ->
|
||||||
|
assign(socket, data: {:error, all_errors(query)}, query: query)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
|
@ -222,7 +227,7 @@ defmodule AshAdmin.Components.Resource.DataTable do
|
||||||
defp load_fields(query) do
|
defp load_fields(query) do
|
||||||
query
|
query
|
||||||
|> Ash.Query.select([])
|
|> Ash.Query.select([])
|
||||||
|> Ash.Query.load(AshAdmin.Resource.table_columns(query.resource))
|
|> Ash.Query.load()
|
||||||
end
|
end
|
||||||
|
|
||||||
defp all_errors(form) do
|
defp all_errors(form) do
|
||||||
|
|
Loading…
Reference in a new issue