shibao/cannery
1
2
Fork 1
Code Issues 15 Pull Requests Projects 1 Releases 38 Wiki Activity

improve table route navigation

Browse Source
This commit is contained in:
shibao
2022-11-19 14:05:29 -05:00
parent 25d4f1916a
commit 5ffa627beb
20 changed files with 63 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
lib/cannery_web/live/ammo_type_live/show.ex
View File

@ -5,7 +5,7 @@ defmodule CanneryWeb.AmmoTypeLive.Show do
use CanneryWeb, :live_view
import CanneryWeb.Components.AmmoGroupCard
alias Cannery.Ammo
alias Cannery.{Ammo, Ammo.AmmoType}
alias CanneryWeb.Endpoint
@fields_list [
@ -31,17 +31,16 @@ defmodule CanneryWeb.AmmoTypeLive.Show do
]
@impl true
def mount(_params, _session, socket),
do: {:ok, socket |> assign(show_used: false, view_table: false)}
def mount(_params, _session, %{assigns: %{live_action: live_action}} = socket),
do: {:ok, socket |> assign(show_used: false, view_table: live_action == :table)}
@impl true
def handle_params(
%{"id" => id},
_params,
%{assigns: %{current_user: current_user, live_action: live_action}} = socket
) do
ammo_type = Ammo.get_ammo_type!(id, current_user)
socket = socket |> assign(view_table: live_action == :table) |> display_ammo_type(ammo_type)
def handle_params(%{"id" => id}, _params, %{assigns: %{live_action: live_action}} = socket) do
socket =
socket
|> assign(view_table: live_action == :table)
|> display_ammo_type(id)
{:noreply, socket}
end
@ -75,13 +74,13 @@ defmodule CanneryWeb.AmmoTypeLive.Show do
do: Routes.ammo_type_show_path(Endpoint, :show, ammo_type),
else: Routes.ammo_type_show_path(Endpoint, :table, ammo_type)
{:noreply, socket |> assign(view_table: !view_table) |> push_patch(to: new_path)}
{:noreply, socket |> push_patch(to: new_path)}
end
defp display_ammo_type(
%{assigns: %{live_action: live_action, current_user: current_user, show_used: show_used}} =
socket,
ammo_type
%AmmoType{} = ammo_type
) do
fields_to_display =
@fields_list
@ -106,6 +105,10 @@ defmodule CanneryWeb.AmmoTypeLive.Show do
)
end
defp display_ammo_type(%{assigns: %{current_user: current_user}} = socket, ammo_type_id) do
socket |> display_ammo_type(Ammo.get_ammo_type!(ammo_type_id, current_user))
end
defp display_ammo_type(%{assigns: %{ammo_type: ammo_type}} = socket) do
socket |> display_ammo_type(ammo_type)
end

10
lib/cannery_web/live/container_live/show.ex
View File

@ -11,8 +11,8 @@ defmodule CanneryWeb.ContainerLive.Show do
alias Phoenix.LiveView.Socket
@impl true
def mount(_params, _session, socket),
do: {:ok, socket |> assign(show_used: false, view_table: false)}
def mount(_params, _session, %{assigns: %{live_action: live_action}} = socket),
do: {:ok, socket |> assign(show_used: false, view_table: live_action == :table)}
@impl true
def handle_params(
@ -21,7 +21,9 @@ defmodule CanneryWeb.ContainerLive.Show do
%{assigns: %{current_user: current_user, live_action: live_action}} = socket
) do
socket =
socket |> assign(view_table: live_action == :table) |> render_container(id, current_user)
socket
|> assign(view_table: live_action == :table)
|> render_container(id, current_user)
{:noreply, socket}
end
@ -102,7 +104,7 @@ defmodule CanneryWeb.ContainerLive.Show do
do: Routes.container_show_path(Endpoint, :show, container),
else: Routes.container_show_path(Endpoint, :table, container)
{:noreply, socket |> assign(view_table: !view_table) |> push_patch(to: new_path)}
{:noreply, socket |> push_patch(to: new_path)}
end
@spec render_container(Socket.t(), Container.id(), User.t()) :: Socket.t()