diff --git a/.github/workflows/elixir.yml b/.github/workflows/elixir.yml index f88dad0..83b71ec 100644 --- a/.github/workflows/elixir.yml +++ b/.github/workflows/elixir.yml @@ -18,7 +18,7 @@ jobs: matrix: otp: ["23"] elixir: ["1.13.1"] - ash: ["main", "2.0.0-rc.9"] + ash: ["main", "2.4.2"] env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} ASH_VERSION: ${{matrix.ash}} diff --git a/lib/ash_admin/components/resource/form.ex b/lib/ash_admin/components/resource/form.ex index 0c54be9..9880c50 100644 --- a/lib/ash_admin/components/resource/form.ex +++ b/lib/ash_admin/components/resource/form.ex @@ -110,7 +110,9 @@ defmodule AshAdmin.Components.Resource.Form do "[#{elem(kv, 0)}]"} value={elem(kv, 1)} hidden> + "[#{elem(kv, 0)}]"} + value={elem(kv, 1)} + hidden + /> {render_attributes(assigns, @resource, @action, form)}
@@ -215,7 +222,13 @@ defmodule AshAdmin.Components.Resource.Form do
- {render_relationship_input(assigns, Ash.Resource.Info.relationship(form.source.resource, relationship), form, argument, opts)} + {render_relationship_input( + assigns, + Ash.Resource.Info.relationship(form.source.resource, relationship), + form, + argument, + opts + )}
@@ -250,11 +263,7 @@ defmodule AshAdmin.Components.Resource.Form do ~F"""
- +
  • @@ -268,16 +277,22 @@ defmodule AshAdmin.Components.Resource.Form do
{#if hidden?} - "[#{elem(kv, 0)}]"} value={elem(kv, 1)} hidden> + "[#{elem(kv, 0)}]"} + value={elem(kv, 1)} + hidden + /> {/if} {#if inner_form.source.form_keys[:_join]} - + {#if hidden?} - "[#{elem(kv, 0)}]"} value={elem(kv, 1)} hidden> + "[#{elem(kv, 0)}]"} + value={elem(kv, 1)} + hidden + /> {/if} {render_attributes( assigns, @@ -299,15 +314,15 @@ defmodule AshAdmin.Components.Resource.Form do )} + type="button" + :on-click="remove_form" + phx-target={@myself} + :if={can_remove_related?(inner_form, opts)} + phx-value-path={inner_form.name} + class="flex h-6 w-6 mt-2 border-gray-600 hover:bg-gray-400 rounded-md justify-center items-center" + > + +