diff --git a/lib/ash_admin/components/resource/data_table.ex b/lib/ash_admin/components/resource/data_table.ex index 07231dd..7796cf6 100644 --- a/lib/ash_admin/components/resource/data_table.ex +++ b/lib/ash_admin/components/resource/data_table.ex @@ -254,7 +254,7 @@ defmodule AshAdmin.Components.Resource.DataTable do push_redirect(socket, to: ash_action_path( - socket, + socket.assigns.prefix, socket.assigns.api, socket.assigns.resource, socket.assigns.action.type, diff --git a/lib/ash_admin/components/resource/form.ex b/lib/ash_admin/components/resource/form.ex index fb2f39b..037fd15 100644 --- a/lib/ash_admin/components/resource/form.ex +++ b/lib/ash_admin/components/resource/form.ex @@ -807,7 +807,7 @@ defmodule AshAdmin.Components.Resource.Form do {:ok, created} -> redirect_to(socket, created) - {:error, %{changeset: changeset} = error} -> + {:error, %{changeset: changeset}} -> {:noreply, assign(socket, :changeset, changeset)} end diff --git a/lib/ash_admin/components/resource/show.ex b/lib/ash_admin/components/resource/show.ex index 0be6d29..8b3e9ef 100644 --- a/lib/ash_admin/components/resource/show.ex +++ b/lib/ash_admin/components/resource/show.ex @@ -188,7 +188,7 @@ defmodule AshAdmin.Components.Resource.Show do ~H""" {{ {attributes, flags, bottom_attributes} = AshAdmin.Components.Resource.Form.attributes(resource, :show) - + nil }}
1.36 and >= 1.36.18"}, - # {:ash_phoenix, "~> 0.4 and >= 0.4.4"}, - {:ash_phoenix, path: "../ash_phoenix"}, + {:ash, "~> 1.36 and >= 1.36.19"}, + {:ash_phoenix, "~> 0.4 and >= 0.4.5"}, {:surface, "~> 0.3.1"}, {:phoenix_live_view, "~> 0.15.4"}, {:phoenix_html, "~> 2.14.1 or ~> 2.15"}, diff --git a/mix.lock b/mix.lock index 7e2a8e6..a4e6f40 100644 --- a/mix.lock +++ b/mix.lock @@ -1,6 +1,6 @@ %{ - "ash": {:hex, :ash, "1.36.18", "608f62c676646fa4e37df1726e06c6f48e0637c1a2fc3b9c591443cf6caac7da", [:mix], [{:comparable, "~> 1.0", [hex: :comparable, repo: "hexpm", optional: false]}, {:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:ecto, "~> 3.4", [hex: :ecto, repo: "hexpm", optional: false]}, {:ets, "~> 0.8.0", [hex: :ets, repo: "hexpm", optional: false]}, {:jason, ">= 1.0.0", [hex: :jason, repo: "hexpm", optional: false]}, {:nimble_options, "~> 0.3.5", [hex: :nimble_options, repo: "hexpm", optional: false]}, {:picosat_elixir, "~> 0.1.5", [hex: :picosat_elixir, repo: "hexpm", optional: false]}, {:timex, ">= 3.0.0", [hex: :timex, repo: "hexpm", optional: false]}], "hexpm", "953f8a89dd7350224bacd8de0aca0c3682640b15284ebe99bc8318739c957286"}, - "ash_phoenix": {:hex, :ash_phoenix, "0.4.4", "a08f10109f2e9a84f5ff3ec5944a8f2c9824cdefe27d2887600c5bf9cffb4e9c", [:mix], [{:ash, "~> 1.36 and >= 1.36.12", [hex: :ash, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.5.6", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.14", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:phoenix_live_view, "~> 0.15", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}], "hexpm", "714f228c8b5b0407e1c56e0aa586b899d0bab6e82cb2a80a987c09dbba309b82"}, + "ash": {:hex, :ash, "1.36.19", "eb9d3317fe970b5291cf390fb0460e8f0fb9b8eb8fd314b80fdb92d83676b7e0", [:mix], [{:comparable, "~> 1.0", [hex: :comparable, repo: "hexpm", optional: false]}, {:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:ecto, "~> 3.4", [hex: :ecto, repo: "hexpm", optional: false]}, {:ets, "~> 0.8.0", [hex: :ets, repo: "hexpm", optional: false]}, {:jason, ">= 1.0.0", [hex: :jason, repo: "hexpm", optional: false]}, {:nimble_options, "~> 0.3.5", [hex: :nimble_options, repo: "hexpm", optional: false]}, {:picosat_elixir, "~> 0.1.5", [hex: :picosat_elixir, repo: "hexpm", optional: false]}, {:timex, ">= 3.0.0", [hex: :timex, repo: "hexpm", optional: false]}], "hexpm", "1b80d0dda18b9855c9ff60829da23bd8ec007627a1165ca752b1cac5300e24d8"}, + "ash_phoenix": {:hex, :ash_phoenix, "0.4.5", "9c7c4c5ad461473d2b5c095241023af40ac0ec370501f2e197411dbb2dbaef16", [:mix], [{:ash, "~> 1.36 and >= 1.36.12", [hex: :ash, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.5.6", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.14", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:phoenix_live_view, "~> 0.15", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}], "hexpm", "19a9c21f5d6c4a467b9672b23668ab2c993acea414233148cc3027328dc551e4"}, "ash_policy_authorizer": {:hex, :ash_policy_authorizer, "0.16.0", "18b2352facf8f860458bf81aeed481ced9a7e13e8eb2826e7ae714bf0fbd4792", [:mix], [{:ash, "~> 1.35 and >= 1.35.1", [hex: :ash, repo: "hexpm", optional: false]}], "hexpm", "40b2fd1071a60da1404c5a133f43bf416f5cb2c4f7313a7949b638340f482a61"}, "ash_postgres": {:hex, :ash_postgres, "0.35.4", "f72b0780c839f588888985578aa0a03ae027f4e460fbeab4ddf209f97f794c77", [:mix], [{:ash, "~> 1.34 and >= 1.34.6", [hex: :ash, repo: "hexpm", optional: false]}, {:ecto_sql, "~> 3.5", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:postgrex, ">= 0.0.0", [hex: :postgrex, repo: "hexpm", optional: false]}], "hexpm", "cba9e3ad50b1888dbb4623d80b88b75997f94912e088e69554259f9f00543a98"}, "bunt": {:hex, :bunt, "0.2.0", "951c6e801e8b1d2cbe58ebbd3e616a869061ddadcc4863d0a2182541acae9a38", [:mix], [], "hexpm", "7af5c7e09fe1d40f76c8e4f9dd2be7cebd83909f31fee7cd0e9eadc567da8353"},