better code style

This commit is contained in:
shibao 2025-02-15 04:04:10 +00:00
parent 2a8a1d11b8
commit 3e686fa199
32 changed files with 225 additions and 186 deletions

View File

@ -117,7 +117,7 @@ defmodule Memex.Accounts do
Multi.new() Multi.new()
|> Multi.one(:users_count, from(u in User, select: count(u.id), distinct: true)) |> Multi.one(:users_count, from(u in User, select: count(u.id), distinct: true))
|> Multi.run(:use_invite, fn _changes_so_far, _repo -> |> Multi.run(:use_invite, fn _changes_so_far, _repo ->
if allow_registration?() and invite_token |> is_nil() do if allow_registration?() and !invite_token do
{:ok, nil} {:ok, nil}
else else
Invites.use_invite(invite_token) Invites.use_invite(invite_token)

View File

@ -22,7 +22,7 @@ defmodule Memex.Contexts do
@spec list_contexts(search :: String.t() | nil, User.t()) :: [Context.t()] @spec list_contexts(search :: String.t() | nil, User.t()) :: [Context.t()]
def list_contexts(search \\ nil, user) def list_contexts(search \\ nil, user)
def list_contexts(search, %{id: user_id}) when search |> is_nil() or search == "" do def list_contexts(search, %{id: user_id}) when search in [nil, ""] do
Repo.all(from c in Context, where: c.user_id == ^user_id, order_by: c.slug) Repo.all(from c in Context, where: c.user_id == ^user_id, order_by: c.slug)
end end
@ -63,7 +63,7 @@ defmodule Memex.Contexts do
@spec list_public_contexts(search :: String.t() | nil) :: [Context.t()] @spec list_public_contexts(search :: String.t() | nil) :: [Context.t()]
def list_public_contexts(search \\ nil) def list_public_contexts(search \\ nil)
def list_public_contexts(search) when search |> is_nil() or search == "" do def list_public_contexts(search) when search in [nil, ""] do
Repo.all(from c in Context, where: c.visibility == :public, order_by: c.slug) Repo.all(from c in Context, where: c.visibility == :public, order_by: c.slug)
end end

View File

@ -22,11 +22,11 @@ defmodule Memex.Notes do
@spec list_notes(search :: String.t() | nil, User.t()) :: [Note.t()] @spec list_notes(search :: String.t() | nil, User.t()) :: [Note.t()]
def list_notes(search \\ nil, user) def list_notes(search \\ nil, user)
def list_notes(search, %{id: user_id}) when search |> is_nil() or search == "" do def list_notes(search, %{id: user_id}) when user_id |> is_binary() and search in [nil, ""] do
Repo.all(from n in Note, where: n.user_id == ^user_id, order_by: n.slug) Repo.all(from n in Note, order_by: n.slug)
end end
def list_notes(search, %{id: user_id}) when search |> is_binary() do def list_notes(search, %{id: user_id}) when user_id |> is_binary() and search |> is_binary() do
trimmed_search = String.trim(search) trimmed_search = String.trim(search)
Repo.all( Repo.all(
@ -62,7 +62,7 @@ defmodule Memex.Notes do
@spec list_public_notes(search :: String.t() | nil) :: [Note.t()] @spec list_public_notes(search :: String.t() | nil) :: [Note.t()]
def list_public_notes(search \\ nil) def list_public_notes(search \\ nil)
def list_public_notes(search) when search |> is_nil() or search == "" do def list_public_notes(search) when search in [nil, ""] do
Repo.all(from n in Note, where: n.visibility == :public, order_by: n.slug) Repo.all(from n in Note, where: n.visibility == :public, order_by: n.slug)
end end

View File

@ -22,7 +22,7 @@ defmodule Memex.Pipelines do
@spec list_pipelines(search :: String.t() | nil, User.t()) :: [Pipeline.t()] @spec list_pipelines(search :: String.t() | nil, User.t()) :: [Pipeline.t()]
def list_pipelines(search \\ nil, user) def list_pipelines(search \\ nil, user)
def list_pipelines(search, %{id: user_id}) when search |> is_nil() or search == "" do def list_pipelines(search, %{id: user_id}) when search in [nil, ""] do
Repo.all(from p in Pipeline, where: p.user_id == ^user_id, order_by: p.slug) Repo.all(from p in Pipeline, where: p.user_id == ^user_id, order_by: p.slug)
end end
@ -62,7 +62,7 @@ defmodule Memex.Pipelines do
@spec list_public_pipelines(search :: String.t() | nil) :: [Pipeline.t()] @spec list_public_pipelines(search :: String.t() | nil) :: [Pipeline.t()]
def list_public_pipelines(search \\ nil) def list_public_pipelines(search \\ nil)
def list_public_pipelines(search) when search |> is_nil() or search == "" do def list_public_pipelines(search) when search in [nil, ""] do
Repo.all(from p in Pipeline, where: p.visibility == :public, order_by: p.slug) Repo.all(from p in Pipeline, where: p.visibility == :public, order_by: p.slug)
end end

View File

@ -44,6 +44,7 @@ defmodule MemexWeb do
use Gettext, backend: MemexWeb.Gettext use Gettext, backend: MemexWeb.Gettext
import MemexWeb.ControllerHelpers
import Plug.Conn import Plug.Conn
unquote(verified_routes()) unquote(verified_routes())

View File

@ -37,7 +37,7 @@ defmodule MemexWeb.Components.ContextsTableComponent do
} = socket } = socket
) do ) do
columns = columns =
if actions == [] or current_user |> is_nil() do if actions == [] or !current_user do
[] []
else else
[%{label: gettext("actions"), key: :actions, sortable: false}] [%{label: gettext("actions"), key: :actions, sortable: false}]

View File

@ -1,12 +1,13 @@
<div class="px-8 py-4 flex flex-col justify-center items-center space-y-4 <div class="flex flex-col justify-center items-center px-8 py-4 space-y-4 rounded-lg border border-gray-400 shadow-lg transition-all duration-300 ease-in-out bg-primary-900 hover:shadow-md">
bg-primary-900 <h1 class="text-xl title">
border border-gray-400 rounded-lg shadow-lg hover:shadow-md
transition-all duration-300 ease-in-out">
<h1 class="title text-xl">
<%= @invite.name %> <%= @invite.name %>
</h1> </h1>
<%= if @invite.disabled_at |> is_nil() do %> <%= if @invite.disabled_at do %>
<h2 class="title text-md">
<%= gettext("invite disabled") %>
</h2>
<% else %>
<h2 class="title text-md"> <h2 class="title text-md">
<%= if @invite.uses_left do %> <%= if @invite.uses_left do %>
<%= gettext( <%= gettext(
@ -17,10 +18,6 @@
<%= gettext("uses left: unlimited") %> <%= gettext("uses left: unlimited") %>
<% end %> <% end %>
</h2> </h2>
<% else %>
<h2 class="title text-md">
<%= gettext("invite disabled") %>
</h2>
<% end %> <% end %>
<.qr_code <.qr_code
@ -35,14 +32,13 @@
<div class="flex flex-row flex-wrap justify-center items-center"> <div class="flex flex-row flex-wrap justify-center items-center">
<code <code
id={"code-#{@invite.id}"} id={"code-#{@invite.id}"}
class="mx-2 my-1 text-xs px-4 py-2 rounded-lg text-center break-all class="px-4 py-2 mx-2 my-1 text-xs text-center break-all rounded-lg text-primary-400 bg-primary-800"
text-primary-400 bg-primary-800"
phx-no-format phx-no-format
><%= url(MemexWeb.Endpoint, ~p"/users/register?invite=#{@invite.token}") %></code> ><%= url(MemexWeb.Endpoint, ~p"/users/register?invite=#{@invite.token}") %></code>
<%= if @code_actions, do: render_slot(@code_actions) %> <%= if @code_actions, do: render_slot(@code_actions) %>
</div> </div>
<div :if={@inner_block} class="flex space-x-4 justify-center items-center"> <div :if={@inner_block} class="flex justify-center items-center space-x-4">
<%= render_slot(@inner_block) %> <%= render_slot(@inner_block) %>
</div> </div>
</div> </div>

View File

@ -37,7 +37,7 @@ defmodule MemexWeb.Components.NotesTableComponent do
} = socket } = socket
) do ) do
columns = columns =
if actions == [] or current_user |> is_nil() do if actions == [] or !current_user do
[] []
else else
[%{label: gettext("actions"), key: :actions, sortable: false}] [%{label: gettext("actions"), key: :actions, sortable: false}]

View File

@ -37,7 +37,7 @@ defmodule MemexWeb.Components.PipelinesTableComponent do
} = socket } = socket
) do ) do
columns = columns =
if actions == [] or current_user |> is_nil() do if actions == [] or !current_user do
[] []
else else
[%{label: gettext("actions"), key: :actions, sortable: false}] [%{label: gettext("actions"), key: :actions, sortable: false}]
@ -101,7 +101,7 @@ defmodule MemexWeb.Components.PipelinesTableComponent do
defp get_value_for_key(:description, %{description: description} = assigns, _additional_data) do defp get_value_for_key(:description, %{description: description} = assigns, _additional_data) do
description_block = ~H""" description_block = ~H"""
<div class="truncate max-w-sm"> <div class="max-w-sm truncate">
<%= @description %> <%= @description %>
</div> </div>
""" """

View File

@ -0,0 +1,13 @@
defmodule MemexWeb.ControllerHelpers do
@moduledoc """
Implements controller helpers
"""
import Plug.Conn, only: [assign: 3]
def assign(conn, assigns) do
assigns
|> Map.new()
|> Enum.reduce(conn, fn {key, value}, conn -> conn |> assign(key, value) end)
end
end

View File

@ -42,7 +42,7 @@ defmodule MemexWeb.UserConfirmationController do
# by some automation or by the user themselves, so we redirect without # by some automation or by the user themselves, so we redirect without
# a warning message. # a warning message.
case conn.assigns do case conn.assigns do
%{current_user: %{confirmed_at: confirmed_at}} when not is_nil(confirmed_at) -> %{current_user: %{confirmed_at: %{}}} ->
redirect(conn, to: ~p"/") redirect(conn, to: ~p"/")
%{} -> %{} ->

View File

@ -54,7 +54,7 @@ defmodule MemexWeb.UserResetPasswordController do
%{"token" => token} = conn.params %{"token" => token} = conn.params
if user = Accounts.get_user_by_reset_password_token(token) do if user = Accounts.get_user_by_reset_password_token(token) do
conn |> assign(:user, user) |> assign(:token, token) conn |> assign(user: user, token: token)
else else
conn conn
|> put_flash( |> put_flash(

View File

@ -103,8 +103,10 @@ defmodule MemexWeb.UserSettingsController do
defp assign_email_and_password_changesets(%{assigns: %{current_user: user}} = conn, _opts) do defp assign_email_and_password_changesets(%{assigns: %{current_user: user}} = conn, _opts) do
conn conn
|> assign(:email_changeset, Accounts.change_user_email(user)) |> assign(
|> assign(:password_changeset, Accounts.change_user_password(user)) email_changeset: Accounts.change_user_email(user),
|> assign(:locale_changeset, Accounts.change_user_locale(user)) locale_changeset: Accounts.change_user_locale(user),
password_changeset: Accounts.change_user_password(user)
)
end end
end end

View File

@ -69,7 +69,7 @@ defmodule MemexWeb.ContextLive.FormComponent do
|> push_navigate(to: return_to) |> push_navigate(to: return_to)
{:error, %Changeset{} = changeset} -> {:error, %Changeset{} = changeset} ->
assign(socket, changeset: changeset) assign(socket, :changeset, changeset)
end end
{:noreply, socket} {:noreply, socket}

View File

@ -20,29 +20,37 @@ defmodule MemexWeb.ContextLive.Index do
%{slug: slug} = context = Contexts.get_context_by_slug(slug, current_user) %{slug: slug} = context = Contexts.get_context_by_slug(slug, current_user)
socket socket
|> assign(page_title: gettext("edit %{slug}", slug: slug)) |> assign(
|> assign(context: context) context: context,
page_title: gettext("edit %{slug}", slug: slug)
)
end end
defp apply_action(%{assigns: %{current_user: %{id: current_user_id}}} = socket, :new, _params) do defp apply_action(%{assigns: %{current_user: %{id: current_user_id}}} = socket, :new, _params) do
socket socket
|> assign(page_title: gettext("new context")) |> assign(
|> assign(context: %Context{visibility: :private, user_id: current_user_id}) context: %Context{visibility: :private, user_id: current_user_id},
page_title: gettext("new context")
)
end end
defp apply_action(socket, :index, _params) do defp apply_action(socket, :index, _params) do
socket socket
|> assign(page_title: gettext("contexts")) |> assign(
|> assign(search: nil) context: nil,
|> assign(context: nil) page_title: gettext("contexts"),
search: nil
)
|> display_contexts() |> display_contexts()
end end
defp apply_action(socket, :search, %{"search" => search}) do defp apply_action(socket, :search, %{"search" => search}) do
socket socket
|> assign(page_title: gettext("contexts")) |> assign(
|> assign(search: search) context: nil,
|> assign(context: nil) page_title: gettext("contexts"),
search: search
)
|> display_contexts() |> display_contexts()
end end
@ -68,8 +76,7 @@ defmodule MemexWeb.ContextLive.Index do
{:noreply, socket |> push_patch(to: redirect_to)} {:noreply, socket |> push_patch(to: redirect_to)}
end end
defp display_contexts(%{assigns: %{current_user: current_user, search: search}} = socket) defp display_contexts(%{assigns: %{current_user: %{} = current_user, search: search}} = socket) do
when not (current_user |> is_nil()) do
socket |> assign(contexts: Contexts.list_contexts(search, current_user)) socket |> assign(contexts: Contexts.list_contexts(search, current_user))
end end

View File

@ -21,8 +21,10 @@ defmodule MemexWeb.ContextLive.Show do
socket = socket =
socket socket
|> assign(:page_title, page_title(live_action, context)) |> assign(
|> assign(:context, context) context: context,
page_title: page_title(live_action, context)
)
{:noreply, socket} {:noreply, socket}
end end

View File

@ -11,6 +11,6 @@ defmodule MemexWeb.HomeLive do
@impl true @impl true
def mount(_params, _session, socket) do def mount(_params, _session, socket) do
admins = Accounts.list_users_by_role(:admin) 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
end end

View File

@ -82,7 +82,7 @@ defmodule MemexWeb.InviteLive.FormComponent do
socket |> put_flash(:info, prompt) |> push_navigate(to: return_to) socket |> put_flash(:info, prompt) |> push_navigate(to: return_to)
{:error, %Changeset{} = changeset} -> {:error, %Changeset{} = changeset} ->
socket |> assign(changeset: changeset) socket |> assign(:changeset, changeset)
end end
{:noreply, socket} {:noreply, socket}

View File

@ -20,15 +20,15 @@ defmodule MemexWeb.InviteLive.Index do
defp apply_action(%{assigns: %{current_user: current_user}} = socket, :edit, %{"id" => id}) do defp apply_action(%{assigns: %{current_user: current_user}} = socket, :edit, %{"id" => id}) do
socket 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 end
defp apply_action(socket, :new, _params) do 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 end
defp apply_action(socket, :index, _params) do defp apply_action(socket, :index, _params) do
socket |> assign(page_title: gettext("invites"), invite: nil) socket |> assign(invite: nil, page_title: gettext("invites"))
end end
@impl true @impl true
@ -138,6 +138,6 @@ defmodule MemexWeb.InviteLive.Index do
use_counts = invites |> Invites.get_use_counts(current_user) use_counts = invites |> Invites.get_use_counts(current_user)
users = all_users |> Map.get(: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
end end

View File

@ -71,7 +71,7 @@
</.link> </.link>
<.link <.link
:if={invite.disabled_at |> is_nil() and not (invite.uses_left |> is_nil())} :if={!invite.disabled_at and !!invite.uses_left}
href="#" href="#"
class="btn btn-secondary" class="btn btn-secondary"
phx-click="set_unlimited" phx-click="set_unlimited"

View File

@ -68,7 +68,7 @@ defmodule MemexWeb.NoteLive.FormComponent do
|> push_navigate(to: return_to) |> push_navigate(to: return_to)
{:error, %Changeset{} = changeset} -> {:error, %Changeset{} = changeset} ->
assign(socket, changeset: changeset) assign(socket, :changeset, changeset)
end end
{:noreply, socket} {:noreply, socket}

View File

@ -4,11 +4,11 @@ defmodule MemexWeb.NoteLive.Index do
@impl true @impl true
def mount(%{"search" => search}, _session, socket) do def mount(%{"search" => search}, _session, socket) do
{:ok, socket |> assign(search: search) |> display_notes()} {:ok, socket |> assign(:search, search) |> display_notes()}
end end
def mount(_params, _session, socket) do def mount(_params, _session, socket) do
{:ok, socket |> assign(search: nil) |> display_notes()} {:ok, socket |> assign(:search, nil) |> display_notes()}
end end
@impl true @impl true
@ -20,29 +20,37 @@ defmodule MemexWeb.NoteLive.Index do
%{slug: slug} = note = Notes.get_note_by_slug(slug, current_user) %{slug: slug} = note = Notes.get_note_by_slug(slug, current_user)
socket socket
|> assign(page_title: gettext("edit %{slug}", slug: slug)) |> assign(
|> assign(note: note) note: note,
page_title: gettext("edit %{slug}", slug: slug)
)
end end
defp apply_action(%{assigns: %{current_user: %{id: current_user_id}}} = socket, :new, _params) do defp apply_action(%{assigns: %{current_user: %{id: current_user_id}}} = socket, :new, _params) do
socket socket
|> assign(page_title: gettext("new note")) |> assign(
|> assign(note: %Note{visibility: :private, user_id: current_user_id}) note: %Note{visibility: :private, user_id: current_user_id},
page_title: gettext("new note")
)
end end
defp apply_action(socket, :index, _params) do defp apply_action(socket, :index, _params) do
socket socket
|> assign(page_title: gettext("notes")) |> assign(
|> assign(search: nil) note: nil,
|> assign(note: nil) page_title: gettext("notes"),
search: nil
)
|> display_notes() |> display_notes()
end end
defp apply_action(socket, :search, %{"search" => search}) do defp apply_action(socket, :search, %{"search" => search}) do
socket socket
|> assign(page_title: gettext("notes")) |> assign(
|> assign(search: search) note: nil,
|> assign(note: nil) page_title: gettext("notes"),
search: search
)
|> display_notes() |> display_notes()
end end
@ -53,7 +61,7 @@ defmodule MemexWeb.NoteLive.Index do
socket = socket =
socket socket
|> assign(notes: Notes.list_notes(current_user)) |> assign(:notes, Notes.list_notes(current_user))
|> put_flash(:info, gettext("%{slug} deleted", slug: slug)) |> put_flash(:info, gettext("%{slug} deleted", slug: slug))
{:noreply, socket} {:noreply, socket}
@ -67,12 +75,11 @@ defmodule MemexWeb.NoteLive.Index do
{:noreply, socket |> push_patch(to: ~p"/notes/#{search_term}")} {:noreply, socket |> push_patch(to: ~p"/notes/#{search_term}")}
end end
defp display_notes(%{assigns: %{current_user: current_user, search: search}} = socket) defp display_notes(%{assigns: %{current_user: %{} = current_user, search: search}} = socket) do
when not (current_user |> is_nil()) do socket |> assign(:notes, Notes.list_notes(search, current_user))
socket |> assign(notes: Notes.list_notes(search, current_user))
end end
defp display_notes(%{assigns: %{search: search}} = socket) do 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
end end

View File

@ -21,8 +21,10 @@ defmodule MemexWeb.NoteLive.Show do
socket = socket =
socket socket
|> assign(:page_title, page_title(live_action, note)) |> assign(
|> assign(:note, note) note: note,
page_title: page_title(live_action, note)
)
{:noreply, socket} {:noreply, socket}
end end

View File

@ -73,7 +73,7 @@ defmodule MemexWeb.PipelineLive.FormComponent do
|> push_navigate(to: return_to) |> push_navigate(to: return_to)
{:error, %Changeset{} = changeset} -> {:error, %Changeset{} = changeset} ->
assign(socket, changeset: changeset) assign(socket, :changeset, changeset)
end end
{:noreply, socket} {:noreply, socket}

View File

@ -4,11 +4,11 @@ defmodule MemexWeb.PipelineLive.Index do
@impl true @impl true
def mount(%{"search" => search}, _session, socket) do def mount(%{"search" => search}, _session, socket) do
{:ok, socket |> assign(search: search) |> display_pipelines()} {:ok, socket |> assign(:search, search) |> display_pipelines()}
end end
def mount(_params, _session, socket) do def mount(_params, _session, socket) do
{:ok, socket |> assign(search: nil) |> display_pipelines()} {:ok, socket |> assign(:search, nil) |> display_pipelines()}
end end
@impl true @impl true
@ -20,29 +20,37 @@ defmodule MemexWeb.PipelineLive.Index do
%{slug: slug} = pipeline = Pipelines.get_pipeline_by_slug(slug, current_user) %{slug: slug} = pipeline = Pipelines.get_pipeline_by_slug(slug, current_user)
socket socket
|> assign(page_title: gettext("edit %{slug}", slug: slug)) |> assign(
|> assign(pipeline: pipeline) page_title: gettext("edit %{slug}", slug: slug),
pipeline: pipeline
)
end end
defp apply_action(%{assigns: %{current_user: %{id: current_user_id}}} = socket, :new, _params) do defp apply_action(%{assigns: %{current_user: %{id: current_user_id}}} = socket, :new, _params) do
socket socket
|> assign(page_title: gettext("new pipeline")) |> assign(
|> assign(pipeline: %Pipeline{visibility: :private, user_id: current_user_id}) page_title: gettext("new pipeline"),
pipeline: %Pipeline{visibility: :private, user_id: current_user_id}
)
end end
defp apply_action(socket, :index, _params) do defp apply_action(socket, :index, _params) do
socket socket
|> assign(page_title: gettext("pipelines")) |> assign(
|> assign(search: nil) page_title: gettext("pipelines"),
|> assign(pipeline: nil) pipeline: nil,
search: nil
)
|> display_pipelines() |> display_pipelines()
end end
defp apply_action(socket, :search, %{"search" => search}) do defp apply_action(socket, :search, %{"search" => search}) do
socket socket
|> assign(page_title: gettext("pipelines")) |> assign(
|> assign(search: search) page_title: gettext("pipelines"),
|> assign(pipeline: nil) pipeline: nil,
search: search
)
|> display_pipelines() |> display_pipelines()
end end
@ -53,7 +61,7 @@ defmodule MemexWeb.PipelineLive.Index do
socket = socket =
socket socket
|> assign(pipelines: Pipelines.list_pipelines(current_user)) |> assign(:pipelines, Pipelines.list_pipelines(current_user))
|> put_flash(:info, gettext("%{slug} deleted", slug: slug)) |> put_flash(:info, gettext("%{slug} deleted", slug: slug))
{:noreply, socket} {:noreply, socket}
@ -67,12 +75,11 @@ defmodule MemexWeb.PipelineLive.Index do
{:noreply, socket |> push_patch(to: ~p"/pipelines/#{search_term}")} {:noreply, socket |> push_patch(to: ~p"/pipelines/#{search_term}")}
end end
defp display_pipelines(%{assigns: %{current_user: current_user, search: search}} = socket) defp display_pipelines(%{assigns: %{current_user: %{} = current_user, search: search}} = socket) do
when not (current_user |> is_nil()) do socket |> assign(:pipelines, Pipelines.list_pipelines(search, current_user))
socket |> assign(pipelines: Pipelines.list_pipelines(search, current_user))
end end
defp display_pipelines(%{assigns: %{search: search}} = socket) do 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
end end

View File

@ -21,9 +21,11 @@ defmodule MemexWeb.PipelineLive.Show do
socket = socket =
socket socket
|> assign(:page_title, page_title(live_action, pipeline)) |> assign(
|> assign(:pipeline, pipeline) page_title: page_title(live_action, pipeline),
|> assign(:steps, pipeline |> Steps.list_steps(current_user)) pipeline: pipeline,
steps: pipeline |> Steps.list_steps(current_user)
)
|> apply_action(live_action, params) |> apply_action(live_action, params)
{:noreply, socket} {:noreply, socket}
@ -47,8 +49,8 @@ defmodule MemexWeb.PipelineLive.Show do
socket socket
|> assign( |> assign(
step: %Step{ step: %Step{
position: steps |> Enum.count(),
pipeline_id: pipeline_id, pipeline_id: pipeline_id,
position: steps |> Enum.count(),
user_id: current_user_id user_id: current_user_id
} }
) )
@ -59,7 +61,7 @@ defmodule MemexWeb.PipelineLive.Show do
:edit_step, :edit_step,
%{"step_id" => step_id} %{"step_id" => step_id}
) do ) do
socket |> assign(step: step_id |> Steps.get_step!(current_user)) socket |> assign(:step, step_id |> Steps.get_step!(current_user))
end end
@impl true @impl true

View File

@ -75,7 +75,7 @@ defmodule MemexWeb.StepLive.FormComponent do
|> push_navigate(to: return_to) |> push_navigate(to: return_to)
{:error, %Changeset{} = changeset} -> {:error, %Changeset{} = changeset} ->
assign(socket, changeset: changeset) assign(socket, :changeset, changeset)
end end
{:noreply, socket} {:noreply, socket}

View File

@ -46,8 +46,8 @@ msgid "confirm new password"
msgstr "" msgstr ""
#: lib/memex_web/components/core_components/topbar.html.heex:28 #: lib/memex_web/components/core_components/topbar.html.heex:28
#: lib/memex_web/live/context_live/index.ex:35 #: lib/memex_web/live/context_live/index.ex:41
#: lib/memex_web/live/context_live/index.ex:43 #: lib/memex_web/live/context_live/index.ex:51
#: lib/memex_web/live/context_live/index.html.heex:3 #: lib/memex_web/live/context_live/index.html.heex:3
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "contexts" msgid "contexts"
@ -128,7 +128,7 @@ msgstr ""
msgid "instance information" msgid "instance information"
msgstr "" msgstr ""
#: lib/memex_web/components/core_components/invite_card.html.heex:22 #: lib/memex_web/components/core_components/invite_card.html.heex:8
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "invite disabled" msgid "invite disabled"
msgstr "" msgstr ""
@ -177,8 +177,8 @@ msgid "no notes found"
msgstr "" msgstr ""
#: lib/memex_web/components/core_components/topbar.html.heex:22 #: lib/memex_web/components/core_components/topbar.html.heex:22
#: lib/memex_web/live/note_live/index.ex:35 #: lib/memex_web/live/note_live/index.ex:41
#: lib/memex_web/live/note_live/index.ex:43 #: lib/memex_web/live/note_live/index.ex:51
#: lib/memex_web/live/note_live/index.html.heex:3 #: lib/memex_web/live/note_live/index.html.heex:3
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "notes" msgid "notes"
@ -190,8 +190,8 @@ msgid "notes:"
msgstr "" msgstr ""
#: lib/memex_web/components/core_components/topbar.html.heex:34 #: lib/memex_web/components/core_components/topbar.html.heex:34
#: lib/memex_web/live/pipeline_live/index.ex:35 #: lib/memex_web/live/pipeline_live/index.ex:40
#: lib/memex_web/live/pipeline_live/index.ex:43 #: lib/memex_web/live/pipeline_live/index.ex:50
#: lib/memex_web/live/pipeline_live/index.html.heex:3 #: lib/memex_web/live/pipeline_live/index.html.heex:3
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "pipelines" msgid "pipelines"
@ -305,7 +305,7 @@ msgstr ""
msgid "visibility" msgid "visibility"
msgstr "" msgstr ""
#: lib/memex_web/live/note_live/index.ex:29 #: lib/memex_web/live/note_live/index.ex:33
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "new note" msgid "new note"
msgstr "" msgstr ""
@ -317,7 +317,7 @@ msgstr ""
msgid "search" msgid "search"
msgstr "" msgstr ""
#: lib/memex_web/live/context_live/index.ex:29 #: lib/memex_web/live/context_live/index.ex:33
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "new context" msgid "new context"
msgstr "" msgstr ""
@ -332,7 +332,7 @@ msgstr ""
msgid "description" msgid "description"
msgstr "" msgstr ""
#: lib/memex_web/live/pipeline_live/index.ex:29 #: lib/memex_web/live/pipeline_live/index.ex:32
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "new pipeline" msgid "new pipeline"
msgstr "" msgstr ""
@ -349,12 +349,12 @@ msgstr ""
msgid "%{slug} created" msgid "%{slug} created"
msgstr "" msgstr ""
#: lib/memex_web/live/context_live/index.ex:57 #: lib/memex_web/live/context_live/index.ex:65
#: lib/memex_web/live/context_live/show.ex:40 #: lib/memex_web/live/context_live/show.ex:42
#: lib/memex_web/live/note_live/index.ex:57 #: lib/memex_web/live/note_live/index.ex:65
#: lib/memex_web/live/note_live/show.ex:40 #: lib/memex_web/live/note_live/show.ex:42
#: lib/memex_web/live/pipeline_live/index.ex:57 #: lib/memex_web/live/pipeline_live/index.ex:65
#: lib/memex_web/live/pipeline_live/show.ex:75 #: lib/memex_web/live/pipeline_live/show.ex:77
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "%{slug} deleted" msgid "%{slug} deleted"
msgstr "" msgstr ""
@ -366,12 +366,12 @@ msgstr ""
msgid "%{slug} saved" msgid "%{slug} saved"
msgstr "" msgstr ""
#: lib/memex_web/live/context_live/index.ex:23 #: lib/memex_web/live/context_live/index.ex:25
#: lib/memex_web/live/context_live/show.ex:47 #: lib/memex_web/live/context_live/show.ex:49
#: lib/memex_web/live/note_live/index.ex:23 #: lib/memex_web/live/note_live/index.ex:25
#: lib/memex_web/live/note_live/show.ex:47 #: lib/memex_web/live/note_live/show.ex:49
#: lib/memex_web/live/pipeline_live/index.ex:23 #: lib/memex_web/live/pipeline_live/index.ex:24
#: lib/memex_web/live/pipeline_live/show.ex:121 #: lib/memex_web/live/pipeline_live/show.ex:123
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "edit %{slug}" msgid "edit %{slug}"
msgstr "" msgstr ""
@ -432,7 +432,7 @@ msgstr ""
msgid "%{title} created" msgid "%{title} created"
msgstr "" msgstr ""
#: lib/memex_web/live/pipeline_live/show.ex:93 #: lib/memex_web/live/pipeline_live/show.ex:95
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "%{title} deleted" msgid "%{title} deleted"
msgstr "" msgstr ""
@ -442,7 +442,7 @@ msgstr ""
msgid "%{title} saved" msgid "%{title} saved"
msgstr "" msgstr ""
#: lib/memex_web/live/pipeline_live/show.ex:123 #: lib/memex_web/live/pipeline_live/show.ex:125
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "add step to %{slug}" msgid "add step to %{slug}"
msgstr "" msgstr ""
@ -578,7 +578,7 @@ msgstr ""
msgid "user registered on%{registered_datetime}" msgid "user registered on%{registered_datetime}"
msgstr "" msgstr ""
#: lib/memex_web/components/core_components/invite_card.html.heex:17 #: lib/memex_web/components/core_components/invite_card.html.heex:18
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "uses left: unlimited" msgid "uses left: unlimited"
msgstr "" msgstr ""
@ -588,12 +588,12 @@ msgstr ""
msgid "read more on how to use memEx" msgid "read more on how to use memEx"
msgstr "" msgstr ""
#: lib/memex_web/components/core_components/invite_card.html.heex:12 #: lib/memex_web/components/core_components/invite_card.html.heex:13
#, elixir-autogen, elixir-format, fuzzy #, elixir-autogen, elixir-format, fuzzy
msgid "uses left: %{uses_left_count}" msgid "uses left: %{uses_left_count}"
msgstr "" msgstr ""
#: lib/memex_web/components/core_components/invite_card.html.heex:32 #: lib/memex_web/components/core_components/invite_card.html.heex:29
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "uses: %{uses_count}" msgid "uses: %{uses_count}"
msgstr "" msgstr ""

View File

@ -44,8 +44,8 @@ msgid "confirm new password"
msgstr "" msgstr ""
#: lib/memex_web/components/core_components/topbar.html.heex:28 #: lib/memex_web/components/core_components/topbar.html.heex:28
#: lib/memex_web/live/context_live/index.ex:35 #: lib/memex_web/live/context_live/index.ex:41
#: lib/memex_web/live/context_live/index.ex:43 #: lib/memex_web/live/context_live/index.ex:51
#: lib/memex_web/live/context_live/index.html.heex:3 #: lib/memex_web/live/context_live/index.html.heex:3
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "contexts" msgid "contexts"
@ -126,7 +126,7 @@ msgstr ""
msgid "instance information" msgid "instance information"
msgstr "" msgstr ""
#: lib/memex_web/components/core_components/invite_card.html.heex:22 #: lib/memex_web/components/core_components/invite_card.html.heex:8
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "invite disabled" msgid "invite disabled"
msgstr "" msgstr ""
@ -175,8 +175,8 @@ msgid "no notes found"
msgstr "" msgstr ""
#: lib/memex_web/components/core_components/topbar.html.heex:22 #: lib/memex_web/components/core_components/topbar.html.heex:22
#: lib/memex_web/live/note_live/index.ex:35 #: lib/memex_web/live/note_live/index.ex:41
#: lib/memex_web/live/note_live/index.ex:43 #: lib/memex_web/live/note_live/index.ex:51
#: lib/memex_web/live/note_live/index.html.heex:3 #: lib/memex_web/live/note_live/index.html.heex:3
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "notes" msgid "notes"
@ -188,8 +188,8 @@ msgid "notes:"
msgstr "" msgstr ""
#: lib/memex_web/components/core_components/topbar.html.heex:34 #: lib/memex_web/components/core_components/topbar.html.heex:34
#: lib/memex_web/live/pipeline_live/index.ex:35 #: lib/memex_web/live/pipeline_live/index.ex:40
#: lib/memex_web/live/pipeline_live/index.ex:43 #: lib/memex_web/live/pipeline_live/index.ex:50
#: lib/memex_web/live/pipeline_live/index.html.heex:3 #: lib/memex_web/live/pipeline_live/index.html.heex:3
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "pipelines" msgid "pipelines"
@ -303,7 +303,7 @@ msgstr ""
msgid "visibility" msgid "visibility"
msgstr "" msgstr ""
#: lib/memex_web/live/note_live/index.ex:29 #: lib/memex_web/live/note_live/index.ex:33
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "new note" msgid "new note"
msgstr "" msgstr ""
@ -315,7 +315,7 @@ msgstr ""
msgid "search" msgid "search"
msgstr "" msgstr ""
#: lib/memex_web/live/context_live/index.ex:29 #: lib/memex_web/live/context_live/index.ex:33
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "new context" msgid "new context"
msgstr "" msgstr ""
@ -330,7 +330,7 @@ msgstr ""
msgid "description" msgid "description"
msgstr "" msgstr ""
#: lib/memex_web/live/pipeline_live/index.ex:29 #: lib/memex_web/live/pipeline_live/index.ex:32
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "new pipeline" msgid "new pipeline"
msgstr "" msgstr ""
@ -347,12 +347,12 @@ msgstr ""
msgid "%{slug} created" msgid "%{slug} created"
msgstr "" msgstr ""
#: lib/memex_web/live/context_live/index.ex:57 #: lib/memex_web/live/context_live/index.ex:65
#: lib/memex_web/live/context_live/show.ex:40 #: lib/memex_web/live/context_live/show.ex:42
#: lib/memex_web/live/note_live/index.ex:57 #: lib/memex_web/live/note_live/index.ex:65
#: lib/memex_web/live/note_live/show.ex:40 #: lib/memex_web/live/note_live/show.ex:42
#: lib/memex_web/live/pipeline_live/index.ex:57 #: lib/memex_web/live/pipeline_live/index.ex:65
#: lib/memex_web/live/pipeline_live/show.ex:75 #: lib/memex_web/live/pipeline_live/show.ex:77
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "%{slug} deleted" msgid "%{slug} deleted"
msgstr "" msgstr ""
@ -364,12 +364,12 @@ msgstr ""
msgid "%{slug} saved" msgid "%{slug} saved"
msgstr "" msgstr ""
#: lib/memex_web/live/context_live/index.ex:23 #: lib/memex_web/live/context_live/index.ex:25
#: lib/memex_web/live/context_live/show.ex:47 #: lib/memex_web/live/context_live/show.ex:49
#: lib/memex_web/live/note_live/index.ex:23 #: lib/memex_web/live/note_live/index.ex:25
#: lib/memex_web/live/note_live/show.ex:47 #: lib/memex_web/live/note_live/show.ex:49
#: lib/memex_web/live/pipeline_live/index.ex:23 #: lib/memex_web/live/pipeline_live/index.ex:24
#: lib/memex_web/live/pipeline_live/show.ex:121 #: lib/memex_web/live/pipeline_live/show.ex:123
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "edit %{slug}" msgid "edit %{slug}"
msgstr "" msgstr ""
@ -430,7 +430,7 @@ msgstr ""
msgid "%{title} created" msgid "%{title} created"
msgstr "" msgstr ""
#: lib/memex_web/live/pipeline_live/show.ex:93 #: lib/memex_web/live/pipeline_live/show.ex:95
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "%{title} deleted" msgid "%{title} deleted"
msgstr "" msgstr ""
@ -440,7 +440,7 @@ msgstr ""
msgid "%{title} saved" msgid "%{title} saved"
msgstr "" msgstr ""
#: lib/memex_web/live/pipeline_live/show.ex:123 #: lib/memex_web/live/pipeline_live/show.ex:125
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "add step to %{slug}" msgid "add step to %{slug}"
msgstr "" msgstr ""
@ -576,7 +576,7 @@ msgstr ""
msgid "user registered on%{registered_datetime}" msgid "user registered on%{registered_datetime}"
msgstr "" msgstr ""
#: lib/memex_web/components/core_components/invite_card.html.heex:17 #: lib/memex_web/components/core_components/invite_card.html.heex:18
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "uses left: unlimited" msgid "uses left: unlimited"
msgstr "" msgstr ""
@ -586,12 +586,12 @@ msgstr ""
msgid "read more on how to use memEx" msgid "read more on how to use memEx"
msgstr "" msgstr ""
#: lib/memex_web/components/core_components/invite_card.html.heex:12 #: lib/memex_web/components/core_components/invite_card.html.heex:13
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "uses left: %{uses_left_count}" msgid "uses left: %{uses_left_count}"
msgstr "" msgstr ""
#: lib/memex_web/components/core_components/invite_card.html.heex:32 #: lib/memex_web/components/core_components/invite_card.html.heex:29
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "uses: %{uses_count}" msgid "uses: %{uses_count}"
msgstr "" msgstr ""

View File

@ -45,8 +45,8 @@ msgid "confirm new password"
msgstr "" msgstr ""
#: lib/memex_web/components/core_components/topbar.html.heex:28 #: lib/memex_web/components/core_components/topbar.html.heex:28
#: lib/memex_web/live/context_live/index.ex:35 #: lib/memex_web/live/context_live/index.ex:41
#: lib/memex_web/live/context_live/index.ex:43 #: lib/memex_web/live/context_live/index.ex:51
#: lib/memex_web/live/context_live/index.html.heex:3 #: lib/memex_web/live/context_live/index.html.heex:3
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "contexts" msgid "contexts"
@ -127,7 +127,7 @@ msgstr ""
msgid "instance information" msgid "instance information"
msgstr "" msgstr ""
#: lib/memex_web/components/core_components/invite_card.html.heex:22 #: lib/memex_web/components/core_components/invite_card.html.heex:8
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "invite disabled" msgid "invite disabled"
msgstr "" msgstr ""
@ -176,8 +176,8 @@ msgid "no notes found"
msgstr "" msgstr ""
#: lib/memex_web/components/core_components/topbar.html.heex:22 #: lib/memex_web/components/core_components/topbar.html.heex:22
#: lib/memex_web/live/note_live/index.ex:35 #: lib/memex_web/live/note_live/index.ex:41
#: lib/memex_web/live/note_live/index.ex:43 #: lib/memex_web/live/note_live/index.ex:51
#: lib/memex_web/live/note_live/index.html.heex:3 #: lib/memex_web/live/note_live/index.html.heex:3
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "notes" msgid "notes"
@ -189,8 +189,8 @@ msgid "notes:"
msgstr "" msgstr ""
#: lib/memex_web/components/core_components/topbar.html.heex:34 #: lib/memex_web/components/core_components/topbar.html.heex:34
#: lib/memex_web/live/pipeline_live/index.ex:35 #: lib/memex_web/live/pipeline_live/index.ex:40
#: lib/memex_web/live/pipeline_live/index.ex:43 #: lib/memex_web/live/pipeline_live/index.ex:50
#: lib/memex_web/live/pipeline_live/index.html.heex:3 #: lib/memex_web/live/pipeline_live/index.html.heex:3
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "pipelines" msgid "pipelines"
@ -304,7 +304,7 @@ msgstr ""
msgid "visibility" msgid "visibility"
msgstr "" msgstr ""
#: lib/memex_web/live/note_live/index.ex:29 #: lib/memex_web/live/note_live/index.ex:33
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "new note" msgid "new note"
msgstr "" msgstr ""
@ -316,7 +316,7 @@ msgstr ""
msgid "search" msgid "search"
msgstr "" msgstr ""
#: lib/memex_web/live/context_live/index.ex:29 #: lib/memex_web/live/context_live/index.ex:33
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "new context" msgid "new context"
msgstr "" msgstr ""
@ -331,7 +331,7 @@ msgstr ""
msgid "description" msgid "description"
msgstr "" msgstr ""
#: lib/memex_web/live/pipeline_live/index.ex:29 #: lib/memex_web/live/pipeline_live/index.ex:32
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "new pipeline" msgid "new pipeline"
msgstr "" msgstr ""
@ -348,12 +348,12 @@ msgstr ""
msgid "%{slug} created" msgid "%{slug} created"
msgstr "" msgstr ""
#: lib/memex_web/live/context_live/index.ex:57 #: lib/memex_web/live/context_live/index.ex:65
#: lib/memex_web/live/context_live/show.ex:40 #: lib/memex_web/live/context_live/show.ex:42
#: lib/memex_web/live/note_live/index.ex:57 #: lib/memex_web/live/note_live/index.ex:65
#: lib/memex_web/live/note_live/show.ex:40 #: lib/memex_web/live/note_live/show.ex:42
#: lib/memex_web/live/pipeline_live/index.ex:57 #: lib/memex_web/live/pipeline_live/index.ex:65
#: lib/memex_web/live/pipeline_live/show.ex:75 #: lib/memex_web/live/pipeline_live/show.ex:77
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "%{slug} deleted" msgid "%{slug} deleted"
msgstr "" msgstr ""
@ -365,12 +365,12 @@ msgstr ""
msgid "%{slug} saved" msgid "%{slug} saved"
msgstr "" msgstr ""
#: lib/memex_web/live/context_live/index.ex:23 #: lib/memex_web/live/context_live/index.ex:25
#: lib/memex_web/live/context_live/show.ex:47 #: lib/memex_web/live/context_live/show.ex:49
#: lib/memex_web/live/note_live/index.ex:23 #: lib/memex_web/live/note_live/index.ex:25
#: lib/memex_web/live/note_live/show.ex:47 #: lib/memex_web/live/note_live/show.ex:49
#: lib/memex_web/live/pipeline_live/index.ex:23 #: lib/memex_web/live/pipeline_live/index.ex:24
#: lib/memex_web/live/pipeline_live/show.ex:121 #: lib/memex_web/live/pipeline_live/show.ex:123
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "edit %{slug}" msgid "edit %{slug}"
msgstr "" msgstr ""
@ -431,7 +431,7 @@ msgstr ""
msgid "%{title} created" msgid "%{title} created"
msgstr "" msgstr ""
#: lib/memex_web/live/pipeline_live/show.ex:93 #: lib/memex_web/live/pipeline_live/show.ex:95
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "%{title} deleted" msgid "%{title} deleted"
msgstr "" msgstr ""
@ -441,7 +441,7 @@ msgstr ""
msgid "%{title} saved" msgid "%{title} saved"
msgstr "" msgstr ""
#: lib/memex_web/live/pipeline_live/show.ex:123 #: lib/memex_web/live/pipeline_live/show.ex:125
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "add step to %{slug}" msgid "add step to %{slug}"
msgstr "" msgstr ""
@ -577,7 +577,7 @@ msgstr ""
msgid "user registered on%{registered_datetime}" msgid "user registered on%{registered_datetime}"
msgstr "" msgstr ""
#: lib/memex_web/components/core_components/invite_card.html.heex:17 #: lib/memex_web/components/core_components/invite_card.html.heex:18
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "uses left: unlimited" msgid "uses left: unlimited"
msgstr "" msgstr ""
@ -587,12 +587,12 @@ msgstr ""
msgid "read more on how to use memEx" msgid "read more on how to use memEx"
msgstr "" msgstr ""
#: lib/memex_web/components/core_components/invite_card.html.heex:12 #: lib/memex_web/components/core_components/invite_card.html.heex:13
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "uses left: %{uses_left_count}" msgid "uses left: %{uses_left_count}"
msgstr "" msgstr ""
#: lib/memex_web/components/core_components/invite_card.html.heex:32 #: lib/memex_web/components/core_components/invite_card.html.heex:29
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "uses: %{uses_count}" msgid "uses: %{uses_count}"
msgstr "" msgstr ""

View File

@ -126,7 +126,7 @@ defmodule Memex.InvitesTest do
%{invite: %{token: token} = invite, current_user: current_user} do %{invite: %{token: token} = invite, current_user: current_user} do
{:ok, _invite} = Invites.update_invite(invite, %{uses_left: 1}, current_user) {:ok, _invite} = Invites.update_invite(invite, %{uses_left: 1}, current_user)
assert {:ok, %{uses_left: 0, disabled_at: disabled_at}} = Invites.use_invite(token) assert {:ok, %{uses_left: 0, disabled_at: disabled_at}} = Invites.use_invite(token)
assert not is_nil(disabled_at) assert not (disabled_at |> is_nil())
end end
test "use_invite/1 does not work on disactivated invite", test "use_invite/1 does not work on disactivated invite",

View File

@ -96,9 +96,9 @@ defmodule Memex.AccountsTest do
Accounts.register_user(%{"email" => email, "password" => valid_user_password()}) Accounts.register_user(%{"email" => email, "password" => valid_user_password()})
assert user.email == email assert user.email == email
assert is_binary(user.hashed_password) assert user.hashed_password |> is_binary()
assert is_nil(user.confirmed_at) assert user.confirmed_at |> is_nil()
assert is_nil(user.password) assert user.password |> is_nil()
end end
test "records used invite during registration" do test "records used invite during registration" do
@ -128,7 +128,7 @@ defmodule Memex.AccountsTest do
assert changeset.valid? assert changeset.valid?
assert get_change(changeset, :email) == email assert get_change(changeset, :email) == email
assert get_change(changeset, :password) == password assert get_change(changeset, :password) == password
assert is_nil(get_change(changeset, :hashed_password)) assert get_change(changeset, :hashed_password) |> is_nil()
end end
end end
@ -265,7 +265,7 @@ defmodule Memex.AccountsTest do
assert changeset.valid? assert changeset.valid?
assert get_change(changeset, :password) == "new valid password" assert get_change(changeset, :password) == "new valid password"
assert is_nil(get_change(changeset, :hashed_password)) assert get_change(changeset, :hashed_password) |> is_nil()
end end
end end
@ -309,7 +309,7 @@ defmodule Memex.AccountsTest do
"password" => "new valid password" "password" => "new valid password"
}) })
assert is_nil(user.password) assert user.password |> is_nil()
assert Accounts.get_user_by_email_and_password(user.email, "new valid password") assert Accounts.get_user_by_email_and_password(user.email, "new valid password")
end end
@ -506,7 +506,7 @@ defmodule Memex.AccountsTest do
{:ok, updated_user} = {:ok, updated_user} =
Accounts.reset_user_password(user, %{"password" => "new valid password"}) Accounts.reset_user_password(user, %{"password" => "new valid password"})
assert is_nil(updated_user.password) assert updated_user.password |> is_nil()
assert Accounts.get_user_by_email_and_password(user.email, "new valid password") assert Accounts.get_user_by_email_and_password(user.email, "new valid password")
end end