better code style
This commit is contained in:
@ -69,7 +69,7 @@ defmodule MemexWeb.ContextLive.FormComponent do
|
||||
|> push_navigate(to: return_to)
|
||||
|
||||
{:error, %Changeset{} = changeset} ->
|
||||
assign(socket, changeset: changeset)
|
||||
assign(socket, :changeset, changeset)
|
||||
end
|
||||
|
||||
{:noreply, socket}
|
||||
|
@ -20,29 +20,37 @@ defmodule MemexWeb.ContextLive.Index do
|
||||
%{slug: slug} = context = Contexts.get_context_by_slug(slug, current_user)
|
||||
|
||||
socket
|
||||
|> assign(page_title: gettext("edit %{slug}", slug: slug))
|
||||
|> assign(context: context)
|
||||
|> assign(
|
||||
context: context,
|
||||
page_title: gettext("edit %{slug}", slug: slug)
|
||||
)
|
||||
end
|
||||
|
||||
defp apply_action(%{assigns: %{current_user: %{id: current_user_id}}} = socket, :new, _params) do
|
||||
socket
|
||||
|> assign(page_title: gettext("new context"))
|
||||
|> assign(context: %Context{visibility: :private, user_id: current_user_id})
|
||||
|> assign(
|
||||
context: %Context{visibility: :private, user_id: current_user_id},
|
||||
page_title: gettext("new context")
|
||||
)
|
||||
end
|
||||
|
||||
defp apply_action(socket, :index, _params) do
|
||||
socket
|
||||
|> assign(page_title: gettext("contexts"))
|
||||
|> assign(search: nil)
|
||||
|> assign(context: nil)
|
||||
|> assign(
|
||||
context: nil,
|
||||
page_title: gettext("contexts"),
|
||||
search: nil
|
||||
)
|
||||
|> display_contexts()
|
||||
end
|
||||
|
||||
defp apply_action(socket, :search, %{"search" => search}) do
|
||||
socket
|
||||
|> assign(page_title: gettext("contexts"))
|
||||
|> assign(search: search)
|
||||
|> assign(context: nil)
|
||||
|> assign(
|
||||
context: nil,
|
||||
page_title: gettext("contexts"),
|
||||
search: search
|
||||
)
|
||||
|> display_contexts()
|
||||
end
|
||||
|
||||
@ -68,8 +76,7 @@ defmodule MemexWeb.ContextLive.Index do
|
||||
{:noreply, socket |> push_patch(to: redirect_to)}
|
||||
end
|
||||
|
||||
defp display_contexts(%{assigns: %{current_user: current_user, search: search}} = socket)
|
||||
when not (current_user |> is_nil()) do
|
||||
defp display_contexts(%{assigns: %{current_user: %{} = current_user, search: search}} = socket) do
|
||||
socket |> assign(contexts: Contexts.list_contexts(search, current_user))
|
||||
end
|
||||
|
||||
|
@ -21,8 +21,10 @@ defmodule MemexWeb.ContextLive.Show do
|
||||
|
||||
socket =
|
||||
socket
|
||||
|> assign(:page_title, page_title(live_action, context))
|
||||
|> assign(:context, context)
|
||||
|> assign(
|
||||
context: context,
|
||||
page_title: page_title(live_action, context)
|
||||
)
|
||||
|
||||
{:noreply, socket}
|
||||
end
|
||||
|
@ -11,6 +11,6 @@ defmodule MemexWeb.HomeLive do
|
||||
@impl true
|
||||
def mount(_params, _session, socket) do
|
||||
admins = Accounts.list_users_by_role(:admin)
|
||||
{:ok, socket |> assign(page_title: gettext("home"), admins: admins, version: @version)}
|
||||
{:ok, socket |> assign(admins: admins, page_title: gettext("home"), version: @version)}
|
||||
end
|
||||
end
|
||||
|
@ -82,7 +82,7 @@ defmodule MemexWeb.InviteLive.FormComponent do
|
||||
socket |> put_flash(:info, prompt) |> push_navigate(to: return_to)
|
||||
|
||||
{:error, %Changeset{} = changeset} ->
|
||||
socket |> assign(changeset: changeset)
|
||||
socket |> assign(:changeset, changeset)
|
||||
end
|
||||
|
||||
{:noreply, socket}
|
||||
|
@ -20,15 +20,15 @@ defmodule MemexWeb.InviteLive.Index do
|
||||
|
||||
defp apply_action(%{assigns: %{current_user: current_user}} = socket, :edit, %{"id" => id}) do
|
||||
socket
|
||||
|> assign(page_title: gettext("edit invite"), invite: Invites.get_invite!(id, current_user))
|
||||
|> assign(invite: Invites.get_invite!(id, current_user), page_title: gettext("edit invite"))
|
||||
end
|
||||
|
||||
defp apply_action(socket, :new, _params) do
|
||||
socket |> assign(page_title: gettext("new invite"), invite: %Invite{})
|
||||
socket |> assign(invite: %Invite{}, page_title: gettext("new invite"))
|
||||
end
|
||||
|
||||
defp apply_action(socket, :index, _params) do
|
||||
socket |> assign(page_title: gettext("invites"), invite: nil)
|
||||
socket |> assign(invite: nil, page_title: gettext("invites"))
|
||||
end
|
||||
|
||||
@impl true
|
||||
@ -138,6 +138,6 @@ defmodule MemexWeb.InviteLive.Index do
|
||||
|
||||
use_counts = invites |> Invites.get_use_counts(current_user)
|
||||
users = all_users |> Map.get(:user, [])
|
||||
socket |> assign(invites: invites, use_counts: use_counts, admins: admins, users: users)
|
||||
socket |> assign(admins: admins, invites: invites, use_counts: use_counts, users: users)
|
||||
end
|
||||
end
|
||||
|
@ -71,7 +71,7 @@
|
||||
</.link>
|
||||
|
||||
<.link
|
||||
:if={invite.disabled_at |> is_nil() and not (invite.uses_left |> is_nil())}
|
||||
:if={!invite.disabled_at and !!invite.uses_left}
|
||||
href="#"
|
||||
class="btn btn-secondary"
|
||||
phx-click="set_unlimited"
|
||||
|
@ -68,7 +68,7 @@ defmodule MemexWeb.NoteLive.FormComponent do
|
||||
|> push_navigate(to: return_to)
|
||||
|
||||
{:error, %Changeset{} = changeset} ->
|
||||
assign(socket, changeset: changeset)
|
||||
assign(socket, :changeset, changeset)
|
||||
end
|
||||
|
||||
{:noreply, socket}
|
||||
|
@ -4,11 +4,11 @@ defmodule MemexWeb.NoteLive.Index do
|
||||
|
||||
@impl true
|
||||
def mount(%{"search" => search}, _session, socket) do
|
||||
{:ok, socket |> assign(search: search) |> display_notes()}
|
||||
{:ok, socket |> assign(:search, search) |> display_notes()}
|
||||
end
|
||||
|
||||
def mount(_params, _session, socket) do
|
||||
{:ok, socket |> assign(search: nil) |> display_notes()}
|
||||
{:ok, socket |> assign(:search, nil) |> display_notes()}
|
||||
end
|
||||
|
||||
@impl true
|
||||
@ -20,29 +20,37 @@ defmodule MemexWeb.NoteLive.Index do
|
||||
%{slug: slug} = note = Notes.get_note_by_slug(slug, current_user)
|
||||
|
||||
socket
|
||||
|> assign(page_title: gettext("edit %{slug}", slug: slug))
|
||||
|> assign(note: note)
|
||||
|> assign(
|
||||
note: note,
|
||||
page_title: gettext("edit %{slug}", slug: slug)
|
||||
)
|
||||
end
|
||||
|
||||
defp apply_action(%{assigns: %{current_user: %{id: current_user_id}}} = socket, :new, _params) do
|
||||
socket
|
||||
|> assign(page_title: gettext("new note"))
|
||||
|> assign(note: %Note{visibility: :private, user_id: current_user_id})
|
||||
|> assign(
|
||||
note: %Note{visibility: :private, user_id: current_user_id},
|
||||
page_title: gettext("new note")
|
||||
)
|
||||
end
|
||||
|
||||
defp apply_action(socket, :index, _params) do
|
||||
socket
|
||||
|> assign(page_title: gettext("notes"))
|
||||
|> assign(search: nil)
|
||||
|> assign(note: nil)
|
||||
|> assign(
|
||||
note: nil,
|
||||
page_title: gettext("notes"),
|
||||
search: nil
|
||||
)
|
||||
|> display_notes()
|
||||
end
|
||||
|
||||
defp apply_action(socket, :search, %{"search" => search}) do
|
||||
socket
|
||||
|> assign(page_title: gettext("notes"))
|
||||
|> assign(search: search)
|
||||
|> assign(note: nil)
|
||||
|> assign(
|
||||
note: nil,
|
||||
page_title: gettext("notes"),
|
||||
search: search
|
||||
)
|
||||
|> display_notes()
|
||||
end
|
||||
|
||||
@ -53,7 +61,7 @@ defmodule MemexWeb.NoteLive.Index do
|
||||
|
||||
socket =
|
||||
socket
|
||||
|> assign(notes: Notes.list_notes(current_user))
|
||||
|> assign(:notes, Notes.list_notes(current_user))
|
||||
|> put_flash(:info, gettext("%{slug} deleted", slug: slug))
|
||||
|
||||
{:noreply, socket}
|
||||
@ -67,12 +75,11 @@ defmodule MemexWeb.NoteLive.Index do
|
||||
{:noreply, socket |> push_patch(to: ~p"/notes/#{search_term}")}
|
||||
end
|
||||
|
||||
defp display_notes(%{assigns: %{current_user: current_user, search: search}} = socket)
|
||||
when not (current_user |> is_nil()) do
|
||||
socket |> assign(notes: Notes.list_notes(search, current_user))
|
||||
defp display_notes(%{assigns: %{current_user: %{} = current_user, search: search}} = socket) do
|
||||
socket |> assign(:notes, Notes.list_notes(search, current_user))
|
||||
end
|
||||
|
||||
defp display_notes(%{assigns: %{search: search}} = socket) do
|
||||
socket |> assign(notes: Notes.list_public_notes(search))
|
||||
socket |> assign(:notes, Notes.list_public_notes(search))
|
||||
end
|
||||
end
|
||||
|
@ -21,8 +21,10 @@ defmodule MemexWeb.NoteLive.Show do
|
||||
|
||||
socket =
|
||||
socket
|
||||
|> assign(:page_title, page_title(live_action, note))
|
||||
|> assign(:note, note)
|
||||
|> assign(
|
||||
note: note,
|
||||
page_title: page_title(live_action, note)
|
||||
)
|
||||
|
||||
{:noreply, socket}
|
||||
end
|
||||
|
@ -73,7 +73,7 @@ defmodule MemexWeb.PipelineLive.FormComponent do
|
||||
|> push_navigate(to: return_to)
|
||||
|
||||
{:error, %Changeset{} = changeset} ->
|
||||
assign(socket, changeset: changeset)
|
||||
assign(socket, :changeset, changeset)
|
||||
end
|
||||
|
||||
{:noreply, socket}
|
||||
|
@ -4,11 +4,11 @@ defmodule MemexWeb.PipelineLive.Index do
|
||||
|
||||
@impl true
|
||||
def mount(%{"search" => search}, _session, socket) do
|
||||
{:ok, socket |> assign(search: search) |> display_pipelines()}
|
||||
{:ok, socket |> assign(:search, search) |> display_pipelines()}
|
||||
end
|
||||
|
||||
def mount(_params, _session, socket) do
|
||||
{:ok, socket |> assign(search: nil) |> display_pipelines()}
|
||||
{:ok, socket |> assign(:search, nil) |> display_pipelines()}
|
||||
end
|
||||
|
||||
@impl true
|
||||
@ -20,29 +20,37 @@ defmodule MemexWeb.PipelineLive.Index do
|
||||
%{slug: slug} = pipeline = Pipelines.get_pipeline_by_slug(slug, current_user)
|
||||
|
||||
socket
|
||||
|> assign(page_title: gettext("edit %{slug}", slug: slug))
|
||||
|> assign(pipeline: pipeline)
|
||||
|> assign(
|
||||
page_title: gettext("edit %{slug}", slug: slug),
|
||||
pipeline: pipeline
|
||||
)
|
||||
end
|
||||
|
||||
defp apply_action(%{assigns: %{current_user: %{id: current_user_id}}} = socket, :new, _params) do
|
||||
socket
|
||||
|> assign(page_title: gettext("new pipeline"))
|
||||
|> assign(pipeline: %Pipeline{visibility: :private, user_id: current_user_id})
|
||||
|> assign(
|
||||
page_title: gettext("new pipeline"),
|
||||
pipeline: %Pipeline{visibility: :private, user_id: current_user_id}
|
||||
)
|
||||
end
|
||||
|
||||
defp apply_action(socket, :index, _params) do
|
||||
socket
|
||||
|> assign(page_title: gettext("pipelines"))
|
||||
|> assign(search: nil)
|
||||
|> assign(pipeline: nil)
|
||||
|> assign(
|
||||
page_title: gettext("pipelines"),
|
||||
pipeline: nil,
|
||||
search: nil
|
||||
)
|
||||
|> display_pipelines()
|
||||
end
|
||||
|
||||
defp apply_action(socket, :search, %{"search" => search}) do
|
||||
socket
|
||||
|> assign(page_title: gettext("pipelines"))
|
||||
|> assign(search: search)
|
||||
|> assign(pipeline: nil)
|
||||
|> assign(
|
||||
page_title: gettext("pipelines"),
|
||||
pipeline: nil,
|
||||
search: search
|
||||
)
|
||||
|> display_pipelines()
|
||||
end
|
||||
|
||||
@ -53,7 +61,7 @@ defmodule MemexWeb.PipelineLive.Index do
|
||||
|
||||
socket =
|
||||
socket
|
||||
|> assign(pipelines: Pipelines.list_pipelines(current_user))
|
||||
|> assign(:pipelines, Pipelines.list_pipelines(current_user))
|
||||
|> put_flash(:info, gettext("%{slug} deleted", slug: slug))
|
||||
|
||||
{:noreply, socket}
|
||||
@ -67,12 +75,11 @@ defmodule MemexWeb.PipelineLive.Index do
|
||||
{:noreply, socket |> push_patch(to: ~p"/pipelines/#{search_term}")}
|
||||
end
|
||||
|
||||
defp display_pipelines(%{assigns: %{current_user: current_user, search: search}} = socket)
|
||||
when not (current_user |> is_nil()) do
|
||||
socket |> assign(pipelines: Pipelines.list_pipelines(search, current_user))
|
||||
defp display_pipelines(%{assigns: %{current_user: %{} = current_user, search: search}} = socket) do
|
||||
socket |> assign(:pipelines, Pipelines.list_pipelines(search, current_user))
|
||||
end
|
||||
|
||||
defp display_pipelines(%{assigns: %{search: search}} = socket) do
|
||||
socket |> assign(pipelines: Pipelines.list_public_pipelines(search))
|
||||
socket |> assign(:pipelines, Pipelines.list_public_pipelines(search))
|
||||
end
|
||||
end
|
||||
|
@ -21,9 +21,11 @@ defmodule MemexWeb.PipelineLive.Show do
|
||||
|
||||
socket =
|
||||
socket
|
||||
|> assign(:page_title, page_title(live_action, pipeline))
|
||||
|> assign(:pipeline, pipeline)
|
||||
|> assign(:steps, pipeline |> Steps.list_steps(current_user))
|
||||
|> assign(
|
||||
page_title: page_title(live_action, pipeline),
|
||||
pipeline: pipeline,
|
||||
steps: pipeline |> Steps.list_steps(current_user)
|
||||
)
|
||||
|> apply_action(live_action, params)
|
||||
|
||||
{:noreply, socket}
|
||||
@ -47,8 +49,8 @@ defmodule MemexWeb.PipelineLive.Show do
|
||||
socket
|
||||
|> assign(
|
||||
step: %Step{
|
||||
position: steps |> Enum.count(),
|
||||
pipeline_id: pipeline_id,
|
||||
position: steps |> Enum.count(),
|
||||
user_id: current_user_id
|
||||
}
|
||||
)
|
||||
@ -59,7 +61,7 @@ defmodule MemexWeb.PipelineLive.Show do
|
||||
:edit_step,
|
||||
%{"step_id" => step_id}
|
||||
) do
|
||||
socket |> assign(step: step_id |> Steps.get_step!(current_user))
|
||||
socket |> assign(:step, step_id |> Steps.get_step!(current_user))
|
||||
end
|
||||
|
||||
@impl true
|
||||
|
@ -75,7 +75,7 @@ defmodule MemexWeb.StepLive.FormComponent do
|
||||
|> push_navigate(to: return_to)
|
||||
|
||||
{:error, %Changeset{} = changeset} ->
|
||||
assign(socket, changeset: changeset)
|
||||
assign(socket, :changeset, changeset)
|
||||
end
|
||||
|
||||
{:noreply, socket}
|
||||
|
Reference in New Issue
Block a user