diff --git a/elixir/apps/web/lib/web/live/actors/index.ex b/elixir/apps/web/lib/web/live/actors/index.ex index 834eef09b..345ced74b 100644 --- a/elixir/apps/web/lib/web/live/actors/index.ex +++ b/elixir/apps/web/lib/web/live/actors/index.ex @@ -26,20 +26,14 @@ defmodule Web.Actors.Index do def handle_actors_update!(socket, list_opts) do list_opts = Keyword.put(list_opts, :preload, [:last_seen_at, identities: :provider]) - with {:ok, actors, metadata} <- Actors.list_actors(socket.assigns.subject, list_opts) do - {:ok, actor_groups} = Actors.peek_actor_groups(actors, 3, socket.assigns.subject) - - assign(socket, - actors: actors, - actors_metadata: metadata, - actor_groups: actor_groups - ) - else - {:error, :invalid_cursor} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:unknown_filter, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:invalid_type, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:invalid_value, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, _reason} -> raise Web.LiveErrors.NotFoundError + with {:ok, actors, metadata} <- Actors.list_actors(socket.assigns.subject, list_opts), + {:ok, actor_groups} <- Actors.peek_actor_groups(actors, 3, socket.assigns.subject) do + {:ok, + assign(socket, + actors: actors, + actors_metadata: metadata, + actor_groups: actor_groups + )} end end diff --git a/elixir/apps/web/lib/web/live/actors/show.ex b/elixir/apps/web/lib/web/live/actors/show.ex index 676b02682..7ee0852b7 100644 --- a/elixir/apps/web/lib/web/live/actors/show.ex +++ b/elixir/apps/web/lib/web/live/actors/show.ex @@ -59,16 +59,11 @@ defmodule Web.Actors.Show do with {:ok, identities, metadata} <- Auth.list_identities_for(socket.assigns.actor, socket.assigns.subject, list_opts) do - assign(socket, - identities: identities, - identities_metadata: metadata - ) - else - {:error, :invalid_cursor} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:unknown_filter, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:invalid_type, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:invalid_value, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, _reason} -> raise Web.LiveErrors.NotFoundError + {:ok, + assign(socket, + identities: identities, + identities_metadata: metadata + )} end end @@ -82,16 +77,11 @@ defmodule Web.Actors.Show do with {:ok, tokens, metadata} <- Tokens.list_tokens_for(socket.assigns.actor, socket.assigns.subject, list_opts) do - assign(socket, - tokens: tokens, - tokens_metadata: metadata - ) - else - {:error, :invalid_cursor} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:unknown_filter, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:invalid_type, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:invalid_value, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, _reason} -> raise Web.LiveErrors.NotFoundError + {:ok, + assign(socket, + tokens: tokens, + tokens_metadata: metadata + )} end end @@ -100,16 +90,11 @@ defmodule Web.Actors.Show do with {:ok, clients, metadata} <- Clients.list_clients_for(socket.assigns.actor, socket.assigns.subject, list_opts) do - assign(socket, - clients: clients, - clients_metadata: metadata - ) - else - {:error, :invalid_cursor} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:unknown_filter, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:invalid_type, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:invalid_value, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, _reason} -> raise Web.LiveErrors.NotFoundError + {:ok, + assign(socket, + clients: clients, + clients_metadata: metadata + )} end end @@ -123,16 +108,11 @@ defmodule Web.Actors.Show do with {:ok, flows, metadata} <- Flows.list_flows_for(socket.assigns.actor, socket.assigns.subject, list_opts) do - assign(socket, - flows: flows, - flows_metadata: metadata - ) - else - {:error, :invalid_cursor} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:unknown_filter, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:invalid_type, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:invalid_value, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, _reason} -> raise Web.LiveErrors.NotFoundError + {:ok, + assign(socket, + flows: flows, + flows_metadata: metadata + )} end end diff --git a/elixir/apps/web/lib/web/live/clients/index.ex b/elixir/apps/web/lib/web/live/clients/index.ex index 5ff1af8c9..1121860eb 100644 --- a/elixir/apps/web/lib/web/live/clients/index.ex +++ b/elixir/apps/web/lib/web/live/clients/index.ex @@ -30,16 +30,11 @@ defmodule Web.Clients.Index do list_opts = Keyword.put(list_opts, :preload, [:actor, :online?]) with {:ok, clients, metadata} <- Clients.list_clients(socket.assigns.subject, list_opts) do - assign(socket, - clients: clients, - clients_metadata: metadata - ) - else - {:error, :invalid_cursor} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:unknown_filter, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:invalid_type, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:invalid_value, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, _reason} -> raise Web.LiveErrors.NotFoundError + {:ok, + assign(socket, + clients: clients, + clients_metadata: metadata + )} end end diff --git a/elixir/apps/web/lib/web/live/clients/show.ex b/elixir/apps/web/lib/web/live/clients/show.ex index 6861c2295..e50c66e7c 100644 --- a/elixir/apps/web/lib/web/live/clients/show.ex +++ b/elixir/apps/web/lib/web/live/clients/show.ex @@ -47,16 +47,11 @@ defmodule Web.Clients.Show do with {:ok, flows, metadata} <- Flows.list_flows_for(socket.assigns.client, socket.assigns.subject, list_opts) do - assign(socket, - flows: flows, - flows_metadata: metadata - ) - else - {:error, :invalid_cursor} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:unknown_filter, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:invalid_type, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:invalid_value, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, _reason} -> raise Web.LiveErrors.NotFoundError + {:ok, + assign(socket, + flows: flows, + flows_metadata: metadata + )} end end diff --git a/elixir/apps/web/lib/web/live/groups/edit_actors.ex b/elixir/apps/web/lib/web/live/groups/edit_actors.ex index 15a8e171c..6bfb1670d 100644 --- a/elixir/apps/web/lib/web/live/groups/edit_actors.ex +++ b/elixir/apps/web/lib/web/live/groups/edit_actors.ex @@ -48,16 +48,11 @@ defmodule Web.Groups.EditActors do list_opts = Keyword.put(list_opts, :preload, identities: :provider) with {:ok, actors, metadata} <- Actors.list_actors(socket.assigns.subject, list_opts) do - assign(socket, - actors: actors, - actors_metadata: metadata - ) - else - {:error, :invalid_cursor} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:unknown_filter, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:invalid_type, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:invalid_value, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, _reason} -> raise Web.LiveErrors.NotFoundError + {:ok, + assign(socket, + actors: actors, + actors_metadata: metadata + )} end end diff --git a/elixir/apps/web/lib/web/live/groups/index.ex b/elixir/apps/web/lib/web/live/groups/index.ex index 460b7919e..b53929c8f 100644 --- a/elixir/apps/web/lib/web/live/groups/index.ex +++ b/elixir/apps/web/lib/web/live/groups/index.ex @@ -26,20 +26,14 @@ defmodule Web.Groups.Index do def handle_groups_update!(socket, list_opts) do list_opts = Keyword.put(list_opts, :preload, [:provider, created_by_identity: [:actor]]) - with {:ok, groups, metadata} <- Actors.list_groups(socket.assigns.subject, list_opts) do - {:ok, group_actors} = Actors.peek_group_actors(groups, 3, socket.assigns.subject) - - assign(socket, - groups: groups, - groups_metadata: metadata, - group_actors: group_actors - ) - else - {:error, :invalid_cursor} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:unknown_filter, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:invalid_type, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:invalid_value, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, _reason} -> raise Web.LiveErrors.NotFoundError + with {:ok, groups, metadata} <- Actors.list_groups(socket.assigns.subject, list_opts), + {:ok, group_actors} <- Actors.peek_group_actors(groups, 3, socket.assigns.subject) do + {:ok, + assign(socket, + groups: groups, + groups_metadata: metadata, + group_actors: group_actors + )} end end diff --git a/elixir/apps/web/lib/web/live/groups/show.ex b/elixir/apps/web/lib/web/live/groups/show.ex index f29063ea0..33b7b5c29 100644 --- a/elixir/apps/web/lib/web/live/groups/show.ex +++ b/elixir/apps/web/lib/web/live/groups/show.ex @@ -50,16 +50,11 @@ defmodule Web.Groups.Show do list_opts = Keyword.put(list_opts, :preload, [:last_seen_at, identities: :provider]) with {:ok, actors, metadata} <- Actors.list_actors(socket.assigns.subject, list_opts) do - assign(socket, - actors: actors, - actors_metadata: metadata - ) - else - {:error, :invalid_cursor} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:unknown_filter, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:invalid_type, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:invalid_value, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, _reason} -> raise Web.LiveErrors.NotFoundError + {:ok, + assign(socket, + actors: actors, + actors_metadata: metadata + )} end end @@ -67,16 +62,11 @@ defmodule Web.Groups.Show do list_opts = Keyword.put(list_opts, :preload, :resource) with {:ok, policies, metadata} <- Policies.list_policies(socket.assigns.subject, list_opts) do - assign(socket, - policies: policies, - policies_metadata: metadata - ) - else - {:error, :invalid_cursor} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:unknown_filter, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:invalid_type, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:invalid_value, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, _reason} -> raise Web.LiveErrors.NotFoundError + {:ok, + assign(socket, + policies: policies, + policies_metadata: metadata + )} end end diff --git a/elixir/apps/web/lib/web/live/policies/index.ex b/elixir/apps/web/lib/web/live/policies/index.ex index 2a8ba470a..1d8e2e3b6 100644 --- a/elixir/apps/web/lib/web/live/policies/index.ex +++ b/elixir/apps/web/lib/web/live/policies/index.ex @@ -29,16 +29,11 @@ defmodule Web.Policies.Index do list_opts = Keyword.put(list_opts, :preload, actor_group: [:provider], resource: []) with {:ok, policies, metadata} <- Policies.list_policies(socket.assigns.subject, list_opts) do - assign(socket, - policies: policies, - policies_metadata: metadata - ) - else - {:error, :invalid_cursor} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:unknown_filter, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:invalid_type, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:invalid_value, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, _reason} -> raise Web.LiveErrors.NotFoundError + {:ok, + assign(socket, + policies: policies, + policies_metadata: metadata + )} end end diff --git a/elixir/apps/web/lib/web/live/policies/show.ex b/elixir/apps/web/lib/web/live/policies/show.ex index d48537eca..0da97c651 100644 --- a/elixir/apps/web/lib/web/live/policies/show.ex +++ b/elixir/apps/web/lib/web/live/policies/show.ex @@ -45,16 +45,11 @@ defmodule Web.Policies.Show do with {:ok, flows, metadata} <- Flows.list_flows_for(socket.assigns.policy, socket.assigns.subject, list_opts) do - assign(socket, - flows: flows, - flows_metadata: metadata - ) - else - {:error, :invalid_cursor} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:unknown_filter, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:invalid_type, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:invalid_value, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, _reason} -> raise Web.LiveErrors.NotFoundError + {:ok, + assign(socket, + flows: flows, + flows_metadata: metadata + )} end end diff --git a/elixir/apps/web/lib/web/live/relay_groups/index.ex b/elixir/apps/web/lib/web/live/relay_groups/index.ex index be8936093..f010da13c 100644 --- a/elixir/apps/web/lib/web/live/relay_groups/index.ex +++ b/elixir/apps/web/lib/web/live/relay_groups/index.ex @@ -33,16 +33,11 @@ defmodule Web.RelayGroups.Index do list_opts = Keyword.put(list_opts, :preload, relays: [:online?]) with {:ok, groups, metadata} <- Relays.list_groups(socket.assigns.subject, list_opts) do - assign(socket, - groups: groups, - groups_metadata: metadata - ) - else - {:error, :invalid_cursor} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:unknown_filter, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:invalid_type, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:invalid_value, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, _reason} -> raise Web.LiveErrors.NotFoundError + {:ok, + assign(socket, + groups: groups, + groups_metadata: metadata + )} end end diff --git a/elixir/apps/web/lib/web/live/relay_groups/show.ex b/elixir/apps/web/lib/web/live/relay_groups/show.ex index 5670fb03d..8b99cc499 100644 --- a/elixir/apps/web/lib/web/live/relay_groups/show.ex +++ b/elixir/apps/web/lib/web/live/relay_groups/show.ex @@ -49,16 +49,11 @@ defmodule Web.RelayGroups.Show do list_opts = Keyword.put(list_opts, :preload, [:online?]) with {:ok, relays, metadata} <- Relays.list_relays(socket.assigns.subject, list_opts) do - assign(socket, - relays: relays, - relays_metadata: metadata - ) - else - {:error, :invalid_cursor} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:unknown_filter, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:invalid_type, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:invalid_value, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, _reason} -> raise Web.LiveErrors.NotFoundError + {:ok, + assign(socket, + relays: relays, + relays_metadata: metadata + )} end end diff --git a/elixir/apps/web/lib/web/live/resources/index.ex b/elixir/apps/web/lib/web/live/resources/index.ex index 81e5c6962..0e762d1a5 100644 --- a/elixir/apps/web/lib/web/live/resources/index.ex +++ b/elixir/apps/web/lib/web/live/resources/index.ex @@ -31,21 +31,15 @@ defmodule Web.Resources.Index do list_opts = Keyword.put(list_opts, :preload, [:gateway_groups]) with {:ok, resources, metadata} <- - Resources.list_resources(socket.assigns.subject, list_opts) do - {:ok, resource_actor_groups_peek} = - Resources.peek_resource_actor_groups(resources, 3, socket.assigns.subject) - - assign(socket, - resources: resources, - resource_actor_groups_peek: resource_actor_groups_peek, - resources_metadata: metadata - ) - else - {:error, :invalid_cursor} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:unknown_filter, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:invalid_type, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:invalid_value, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, _reason} -> raise Web.LiveErrors.NotFoundError + Resources.list_resources(socket.assigns.subject, list_opts), + {:ok, resource_actor_groups_peek} <- + Resources.peek_resource_actor_groups(resources, 3, socket.assigns.subject) do + {:ok, + assign(socket, + resources: resources, + resource_actor_groups_peek: resource_actor_groups_peek, + resources_metadata: metadata + )} end end diff --git a/elixir/apps/web/lib/web/live/resources/show.ex b/elixir/apps/web/lib/web/live/resources/show.ex index b0def70b5..49b043e17 100644 --- a/elixir/apps/web/lib/web/live/resources/show.ex +++ b/elixir/apps/web/lib/web/live/resources/show.ex @@ -55,16 +55,11 @@ defmodule Web.Resources.Show do list_opts = Keyword.put(list_opts, :preload, actor_group: [:provider], resource: []) with {:ok, policies, metadata} <- Policies.list_policies(socket.assigns.subject, list_opts) do - assign(socket, - policies: policies, - policies_metadata: metadata - ) - else - {:error, :invalid_cursor} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:unknown_filter, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:invalid_type, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:invalid_value, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, _reason} -> raise Web.LiveErrors.NotFoundError + {:ok, + assign(socket, + policies: policies, + policies_metadata: metadata + )} end end @@ -78,16 +73,11 @@ defmodule Web.Resources.Show do with {:ok, flows, metadata} <- Flows.list_flows_for(socket.assigns.resource, socket.assigns.subject, list_opts) do - assign(socket, - flows: flows, - flows_metadata: metadata - ) - else - {:error, :invalid_cursor} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:unknown_filter, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:invalid_type, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:invalid_value, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, _reason} -> raise Web.LiveErrors.NotFoundError + {:ok, + assign(socket, + flows: flows, + flows_metadata: metadata + )} end end diff --git a/elixir/apps/web/lib/web/live/settings/identity_providers/index.ex b/elixir/apps/web/lib/web/live/settings/identity_providers/index.ex index aefbc4101..5d7ce86f7 100644 --- a/elixir/apps/web/lib/web/live/settings/identity_providers/index.ex +++ b/elixir/apps/web/lib/web/live/settings/identity_providers/index.ex @@ -36,16 +36,11 @@ defmodule Web.Settings.IdentityProviders.Index do def handle_providers_update!(socket, list_opts) do with {:ok, providers, metadata} <- Auth.list_providers(socket.assigns.subject, list_opts) do - assign(socket, - providers: providers, - providers_metadata: metadata - ) - else - {:error, :invalid_cursor} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:unknown_filter, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:invalid_type, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:invalid_value, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, _reason} -> raise Web.LiveErrors.NotFoundError + {:ok, + assign(socket, + providers: providers, + providers_metadata: metadata + )} end end diff --git a/elixir/apps/web/lib/web/live/sites/gateways/index.ex b/elixir/apps/web/lib/web/live/sites/gateways/index.ex index ef688a046..b149c16de 100644 --- a/elixir/apps/web/lib/web/live/sites/gateways/index.ex +++ b/elixir/apps/web/lib/web/live/sites/gateways/index.ex @@ -41,16 +41,11 @@ defmodule Web.Sites.Gateways.Index do list_opts = Keyword.put(list_opts, :preload, [:online?]) with {:ok, gateways, metadata} <- Gateways.list_gateways(socket.assigns.subject, list_opts) do - assign(socket, - gateways: gateways, - gateways_metadata: metadata - ) - else - {:error, :invalid_cursor} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:unknown_filter, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:invalid_type, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:invalid_value, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, _reason} -> raise Web.LiveErrors.NotFoundError + {:ok, + assign(socket, + gateways: gateways, + gateways_metadata: metadata + )} end end diff --git a/elixir/apps/web/lib/web/live/sites/index.ex b/elixir/apps/web/lib/web/live/sites/index.ex index b83afc2b6..7a4054d75 100644 --- a/elixir/apps/web/lib/web/live/sites/index.ex +++ b/elixir/apps/web/lib/web/live/sites/index.ex @@ -31,16 +31,11 @@ defmodule Web.Sites.Index do with {:ok, groups, metadata} <- Gateways.list_groups(socket.assigns.subject, list_opts) do - assign(socket, - groups: groups, - groups_metadata: metadata - ) - else - {:error, :invalid_cursor} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:unknown_filter, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:invalid_type, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:invalid_value, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, _reason} -> raise Web.LiveErrors.NotFoundError + {:ok, + assign(socket, + groups: groups, + groups_metadata: metadata + )} end end diff --git a/elixir/apps/web/lib/web/live/sites/show.ex b/elixir/apps/web/lib/web/live/sites/show.ex index fd73b7e25..9c663948b 100644 --- a/elixir/apps/web/lib/web/live/sites/show.ex +++ b/elixir/apps/web/lib/web/live/sites/show.ex @@ -63,36 +63,25 @@ defmodule Web.Sites.Show do end) with {:ok, gateways, metadata} <- Gateways.list_gateways(socket.assigns.subject, list_opts) do - assign(socket, - gateways: gateways, - gateways_metadata: metadata - ) - else - {:error, :invalid_cursor} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:unknown_filter, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:invalid_type, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:invalid_value, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, _reason} -> raise Web.LiveErrors.NotFoundError + {:ok, + assign(socket, + gateways: gateways, + gateways_metadata: metadata + )} end end def handle_resources_update!(socket, list_opts) do with {:ok, resources, metadata} <- - Resources.list_resources(socket.assigns.subject, list_opts) do - {:ok, resource_actor_groups_peek} = - Resources.peek_resource_actor_groups(resources, 3, socket.assigns.subject) - - assign(socket, - resources: resources, - resources_metadata: metadata, - resource_actor_groups_peek: resource_actor_groups_peek - ) - else - {:error, :invalid_cursor} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:unknown_filter, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:invalid_type, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, {:invalid_value, _metadata}} -> raise Web.LiveErrors.InvalidRequestError - {:error, _reason} -> raise Web.LiveErrors.NotFoundError + Resources.list_resources(socket.assigns.subject, list_opts), + {:ok, resource_actor_groups_peek} <- + Resources.peek_resource_actor_groups(resources, 3, socket.assigns.subject) do + {:ok, + assign(socket, + resources: resources, + resources_metadata: metadata, + resource_actor_groups_peek: resource_actor_groups_peek + )} end end diff --git a/elixir/apps/web/lib/web/live_table.ex b/elixir/apps/web/lib/web/live_table.ex index ecd2412f7..507192818 100644 --- a/elixir/apps/web/lib/web/live_table.ex +++ b/elixir/apps/web/lib/web/live_table.ex @@ -82,7 +82,13 @@ defmodule Web.LiveTable do defp resource_filter(assigns) do ~H""" - <.form id={"#{@live_table_id}-filters"} for={@form} phx-change="filter" phx-debounce="100"> + <.form + :if={@filters != []} + id={"#{@live_table_id}-filters"} + for={@form} + phx-change="filter" + phx-debounce="100" + > <.input type="hidden" name="table_id" value={@live_table_id} />