shibao/memEx
1
1
Fork 0
Code Issues 1 Pull Requests Projects Releases 21 Wiki Activity

minor code style fixes

Browse Source
This commit is contained in:
shibao
2023-03-18 23:03:15 -04:00
parent 2d0f6eefab
commit a0d3fb09f3
18 changed files with 221 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
lib/memex_web/live/context_live/form_component.ex
View File

@ -1,16 +1,18 @@
defmodule MemexWeb.ContextLive.FormComponent do
use MemexWeb, :live_component
alias Ecto.Changeset
alias Memex.Contexts
@impl true
def update(%{context: context, current_user: current_user} = assigns, socket) do
changeset = Contexts.change_context(context, current_user)
{:ok,
socket
|> assign(assigns)
|> assign(:changeset, changeset)}
socket =
socket
|> assign(assigns)
|> assign(:changeset, changeset)
{:ok, socket}
end
@impl true
@ -19,10 +21,13 @@ defmodule MemexWeb.ContextLive.FormComponent do
%{"context" => context_params},
%{assigns: %{context: context, current_user: current_user}} = socket
) do
changeset = context |> Contexts.change_context(context_params, current_user)
changeset =
context
|> Contexts.change_context(context_params, current_user)
|> Map.put(:action, :validate)
case changeset |> Changeset.apply_action(:validate) do
{:ok, _data} -> changeset
{:error, changeset} -> changeset
end
{:noreply, assign(socket, :changeset, changeset)}
end
@ -37,16 +42,18 @@ defmodule MemexWeb.ContextLive.FormComponent do
:edit,
context_params
) do
case Contexts.update_context(context, context_params, current_user) do
{:ok, %{slug: slug}} ->
{:noreply,
socket
|> put_flash(:info, gettext("%{slug} saved", slug: slug))
|> push_navigate(to: return_to)}
socket =
case Contexts.update_context(context, context_params, current_user) do
{:ok, %{slug: slug}} ->
socket
|> put_flash(:info, gettext("%{slug} saved", slug: slug))
|> push_navigate(to: return_to)
{:error, %Ecto.Changeset{} = changeset} ->
{:noreply, assign(socket, :changeset, changeset)}
end
{:error, %Changeset{} = changeset} ->
assign(socket, :changeset, changeset)
end
{:noreply, socket}
end
defp save_context(
@ -54,15 +61,17 @@ defmodule MemexWeb.ContextLive.FormComponent do
:new,
context_params
) do
case Contexts.create_context(context_params, current_user) do
{:ok, %{slug: slug}} ->
{:noreply,
socket
|> put_flash(:info, gettext("%{slug} created", slug: slug))
|> push_navigate(to: return_to)}
socket =
case Contexts.create_context(context_params, current_user) do
{:ok, %{slug: slug}} ->
socket
|> put_flash(:info, gettext("%{slug} created", slug: slug))
|> push_navigate(to: return_to)
{:error, %Ecto.Changeset{} = changeset} ->
{:noreply, assign(socket, changeset: changeset)}
end
{:error, %Changeset{} = changeset} ->
assign(socket, changeset: changeset)
end
{:noreply, socket}
end
end

4
lib/memex_web/live/context_live/index.ex
View File

@ -64,8 +64,8 @@ defmodule MemexWeb.ContextLive.Index do
end
def handle_event("search", %{"search" => %{"search_term" => search_term}}, socket) do
{:noreply,
socket |> push_patch(to: Routes.context_index_path(Endpoint, :search, search_term))}
redirect_to = Routes.context_index_path(Endpoint, :search, search_term)
{:noreply, socket |> push_patch(to: redirect_to)}
end
defp display_contexts(%{assigns: %{current_user: current_user, search: search}} = socket)

15
lib/memex_web/live/invite_live/form_component.ex
View File

@ -19,7 +19,7 @@ defmodule MemexWeb.InviteLive.FormComponent do
@impl true
def handle_event("validate", %{"invite" => invite_params}, socket) do
{:noreply, socket |> assign_changeset(invite_params)}
{:noreply, socket |> assign_changeset(invite_params, :validate)}
end
def handle_event("save", %{"invite" => invite_params}, %{assigns: %{action: action}} = socket) do
@ -28,22 +28,23 @@ defmodule MemexWeb.InviteLive.FormComponent do
defp assign_changeset(
%{assigns: %{action: action, current_user: user, invite: invite}} = socket,
invite_params
invite_params,
changeset_action \\ nil
) do
changeset_action =
default_action =
case action do
:new -> :insert
:edit -> :update
end
changeset =
case action do
:new -> Invite.create_changeset(user, "example_token", invite_params)
:edit -> invite |> Invite.update_changeset(invite_params)
case default_action do
:insert -> Invite.create_changeset(user, "example_token", invite_params)
:update -> invite |> Invite.update_changeset(invite_params)
end
changeset =
case changeset |> Changeset.apply_action(changeset_action) do
case changeset |> Changeset.apply_action(changeset_action || default_action) do
{:ok, _data} -> changeset
{:error, changeset} -> changeset
end

6
lib/memex_web/live/invite_live/form_component.html.heex
View File

@ -26,12 +26,12 @@
<%= number_input(f, :uses_left, min: 0, class: "input input-primary col-span-2") %>
<%= error_tag(f, :uses_left, "col-span-3") %>
<span class="col-span-3 text-primary-500 italic text-center">
<%= gettext(~s/Leave "Uses left" blank to make invite unlimited/) %>
<%= gettext(~s/leave "uses left" blank to make invite unlimited/) %>
</span>
<%= submit(dgettext("actions", "Save"),
<%= submit(dgettext("actions", "save"),
class: "mx-auto btn btn-primary col-span-3",
phx_disable_with: dgettext("prompts", "Saving...")
phx_disable_with: dgettext("prompts", "saving...")
) %>
</.form>
</div>

3
lib/memex_web/live/invite_live/index.ex
View File

@ -133,9 +133,7 @@ defmodule MemexWeb.InviteLive.Index do
%{assigns: %{current_user: current_user}} = socket
) do
%{email: user_email} = Accounts.get_user!(id) |> Accounts.delete_user!(current_user)
prompt = dgettext("prompts", "%{user_email} deleted succesfully", user_email: user_email)
{:noreply, socket |> put_flash(:info, prompt) |> display_invites()}
end
@ -150,7 +148,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)
end
end

61
lib/memex_web/live/note_live/form_component.ex
View File

@ -1,16 +1,18 @@
defmodule MemexWeb.NoteLive.FormComponent do
use MemexWeb, :live_component
alias Ecto.Changeset
alias Memex.Notes
@impl true
def update(%{note: note, current_user: current_user} = assigns, socket) do
changeset = Notes.change_note(note, current_user)
{:ok,
socket
|> assign(assigns)
|> assign(:changeset, changeset)}
socket =
socket
|> assign(assigns)
|> assign(:changeset, changeset)
{:ok, socket}
end
@impl true
@ -19,10 +21,13 @@ defmodule MemexWeb.NoteLive.FormComponent do
%{"note" => note_params},
%{assigns: %{note: note, current_user: current_user}} = socket
) do
changeset = note |> Notes.change_note(note_params, current_user)
changeset =
note
|> Notes.change_note(note_params, current_user)
|> Map.put(:action, :validate)
case changeset |> Changeset.apply_action(:validate) do
{:ok, _data} -> changeset
{:error, changeset} -> changeset
end
{:noreply, assign(socket, :changeset, changeset)}
end
@ -36,16 +41,18 @@ defmodule MemexWeb.NoteLive.FormComponent do
:edit,
note_params
) do
case Notes.update_note(note, note_params, current_user) do
{:ok, %{slug: slug}} ->
{:noreply,
socket
|> put_flash(:info, gettext("%{slug} saved", slug: slug))
|> push_navigate(to: return_to)}
socket =
case Notes.update_note(note, note_params, current_user) do
{:ok, %{slug: slug}} ->
socket
|> put_flash(:info, gettext("%{slug} saved", slug: slug))
|> push_navigate(to: return_to)
{:error, %Ecto.Changeset{} = changeset} ->
{:noreply, assign(socket, :changeset, changeset)}
end
{:error, %Changeset{} = changeset} ->
assign(socket, :changeset, changeset)
end
{:noreply, socket}
end
defp save_note(
@ -53,15 +60,17 @@ defmodule MemexWeb.NoteLive.FormComponent do
:new,
note_params
) do
case Notes.create_note(note_params, current_user) do
{:ok, %{slug: slug}} ->
{:noreply,
socket
|> put_flash(:info, gettext("%{slug} created", slug: slug))
|> push_navigate(to: return_to)}
socket =
case Notes.create_note(note_params, current_user) do
{:ok, %{slug: slug}} ->
socket
|> put_flash(:info, gettext("%{slug} created", slug: slug))
|> push_navigate(to: return_to)
{:error, %Ecto.Changeset{} = changeset} ->
{:noreply, assign(socket, changeset: changeset)}
end
{:error, %Changeset{} = changeset} ->
assign(socket, changeset: changeset)
end
{:noreply, socket}
end
end

61
lib/memex_web/live/pipeline_live/form_component.ex
View File

@ -1,16 +1,18 @@
defmodule MemexWeb.PipelineLive.FormComponent do
use MemexWeb, :live_component
alias Ecto.Changeset
alias Memex.Pipelines
@impl true
def update(%{pipeline: pipeline, current_user: current_user} = assigns, socket) do
changeset = Pipelines.change_pipeline(pipeline, current_user)
{:ok,
socket
|> assign(assigns)
|> assign(:changeset, changeset)}
socket =
socket
|> assign(assigns)
|> assign(:changeset, changeset)
{:ok, socket}
end
@impl true
@ -19,10 +21,13 @@ defmodule MemexWeb.PipelineLive.FormComponent do
%{"pipeline" => pipeline_params},
%{assigns: %{pipeline: pipeline, current_user: current_user}} = socket
) do
changeset = pipeline |> Pipelines.change_pipeline(pipeline_params, current_user)
changeset =
pipeline
|> Pipelines.change_pipeline(pipeline_params, current_user)
|> Map.put(:action, :validate)
case changeset |> Changeset.apply_action(:validate) do
{:ok, _data} -> changeset
{:error, changeset} -> changeset
end
{:noreply, assign(socket, :changeset, changeset)}
end
@ -41,16 +46,18 @@ defmodule MemexWeb.PipelineLive.FormComponent do
:edit,
pipeline_params
) do
case Pipelines.update_pipeline(pipeline, pipeline_params, current_user) do
{:ok, %{slug: slug}} ->
{:noreply,
socket
|> put_flash(:info, gettext("%{slug} saved", slug: slug))
|> push_navigate(to: return_to)}
socket =
case Pipelines.update_pipeline(pipeline, pipeline_params, current_user) do
{:ok, %{slug: slug}} ->
socket
|> put_flash(:info, gettext("%{slug} saved", slug: slug))
|> push_navigate(to: return_to)
{:error, %Ecto.Changeset{} = changeset} ->
{:noreply, assign(socket, :changeset, changeset)}
end
{:error, %Changeset{} = changeset} ->
assign(socket, :changeset, changeset)
end
{:noreply, socket}
end
defp save_pipeline(
@ -58,15 +65,17 @@ defmodule MemexWeb.PipelineLive.FormComponent do
:new,
pipeline_params
) do
case Pipelines.create_pipeline(pipeline_params, current_user) do
{:ok, %{slug: slug}} ->
{:noreply,
socket
|> put_flash(:info, gettext("%{slug} created", slug: slug))
|> push_navigate(to: return_to)}
socket =
case Pipelines.create_pipeline(pipeline_params, current_user) do
{:ok, %{slug: slug}} ->
socket
|> put_flash(:info, gettext("%{slug} created", slug: slug))
|> push_navigate(to: return_to)
{:error, %Ecto.Changeset{} = changeset} ->
{:noreply, assign(socket, changeset: changeset)}
end
{:error, %Changeset{} = changeset} ->
assign(socket, changeset: changeset)
end
{:noreply, socket}
end
end

4
lib/memex_web/live/pipeline_live/index.ex
View File

@ -64,8 +64,8 @@ defmodule MemexWeb.PipelineLive.Index do
end
def handle_event("search", %{"search" => %{"search_term" => search_term}}, socket) do
{:noreply,
socket |> push_patch(to: Routes.pipeline_index_path(Endpoint, :search, search_term))}
redirect_to = Routes.pipeline_index_path(Endpoint, :search, search_term)
{:noreply, socket |> push_patch(to: redirect_to)}
end
defp display_pipelines(%{assigns: %{current_user: current_user, search: search}} = socket)

61
lib/memex_web/live/step_live/form_component.ex
View File

@ -1,16 +1,18 @@
defmodule MemexWeb.StepLive.FormComponent do
use MemexWeb, :live_component
alias Ecto.Changeset
alias Memex.Pipelines.Steps
@impl true
def update(%{step: step, current_user: current_user, pipeline: _pipeline} = assigns, socket) do
changeset = Steps.change_step(step, current_user)
{:ok,
socket
|> assign(assigns)
|> assign(:changeset, changeset)}
socket =
socket
|> assign(assigns)
|> assign(:changeset, changeset)
{:ok, socket}
end
@impl true
@ -19,10 +21,13 @@ defmodule MemexWeb.StepLive.FormComponent do
%{"step" => step_params},
%{assigns: %{step: step, current_user: current_user}} = socket
) do
changeset = step |> Steps.change_step(step_params, current_user)
changeset =
step
|> Steps.change_step(step_params, current_user)
|> Map.put(:action, :validate)
case changeset |> Changeset.apply_action(:validate) do
{:ok, _data} -> changeset
{:error, changeset} -> changeset
end
{:noreply, assign(socket, :changeset, changeset)}
end
@ -36,16 +41,18 @@ defmodule MemexWeb.StepLive.FormComponent do
:edit_step,
step_params
) do
case Steps.update_step(step, step_params, current_user) do
{:ok, %{title: title}} ->
{:noreply,
socket
|> put_flash(:info, gettext("%{title} saved", title: title))
|> push_navigate(to: return_to)}
socket =
case Steps.update_step(step, step_params, current_user) do
{:ok, %{title: title}} ->
socket
|> put_flash(:info, gettext("%{title} saved", title: title))
|> push_navigate(to: return_to)
{:error, %Ecto.Changeset{} = changeset} ->
{:noreply, assign(socket, :changeset, changeset)}
end
{:error, %Changeset{} = changeset} ->
assign(socket, :changeset, changeset)
end
{:noreply, socket}
end
defp save_step(
@ -60,15 +67,17 @@ defmodule MemexWeb.StepLive.FormComponent do
:add_step,
step_params
) do
case Steps.create_step(step_params, position, pipeline, current_user) do
{:ok, %{title: title}} ->
{:noreply,
socket
|> put_flash(:info, gettext("%{title} created", title: title))
|> push_navigate(to: return_to)}
socket =
case Steps.create_step(step_params, position, pipeline, current_user) do
{:ok, %{title: title}} ->
socket
|> put_flash(:info, gettext("%{title} created", title: title))
|> push_navigate(to: return_to)
{:error, %Ecto.Changeset{} = changeset} ->
{:noreply, assign(socket, changeset: changeset)}
end
{:error, %Changeset{} = changeset} ->
assign(socket, changeset: changeset)
end
{:noreply, socket}
end
end