From 8441f3fa5b3b92619bb4f2d3d6c5d2bd2bfb8fa0 Mon Sep 17 00:00:00 2001 From: JannikStreek Date: Mon, 11 Nov 2024 15:44:51 +0100 Subject: [PATCH] add comments (#454) --- README.md | 3 +- assets/scss/_bootstrap_custom.scss | 2 +- lib/mindwendel/brainstormings.ex | 3 +- lib/mindwendel/brainstormings/comment.ex | 23 ++ lib/mindwendel/brainstormings/idea.ex | 6 +- lib/mindwendel/comments.ex | 122 +++++++++ lib/mindwendel/ideas.ex | 44 +++- .../live/brainstorming_live/show.ex | 29 +++ .../live/brainstorming_live/show.html.heex | 28 +- .../live/comment_live/form_component.ex | 119 +++++++++ .../comment_live/form_component.html.heex | 43 ++++ .../live/comment_live/show_component.ex | 19 ++ .../comment_live/show_component.html.heex | 49 ++++ .../live/idea_live/show_component.ex | 3 + .../live/idea_live/show_component.html.heex | 63 +++++ .../live/lane_live/index_component.ex | 4 - .../live/lane_live/index_component.html.heex | 17 +- lib/mindwendel_web/live/live_helpers.ex | 9 +- lib/mindwendel_web/router.ex | 11 +- priv/gettext/de/LC_MESSAGES/default.po | 82 ++++-- priv/gettext/default.pot | 80 ++++-- priv/gettext/en/LC_MESSAGES/default.po | 80 ++++-- .../migrate_add_position_order_to_ideas.exs | 64 ++++- .../20241025074220_add_comments_for_ideas.exs | 22 ++ test/mindwendel/brainstormings_test.exs | 19 ++ test/mindwendel/comments_test.exs | 30 +++ test/mindwendel/ideas_test.exs | 21 ++ .../show_idea_comment_test.exs | 243 ++++++++++++++++++ .../live/brainstorming_live_test.exs | 6 +- test/support/factory.ex | 5 + 30 files changed, 1160 insertions(+), 89 deletions(-) create mode 100644 lib/mindwendel/brainstormings/comment.ex create mode 100644 lib/mindwendel/comments.ex create mode 100644 lib/mindwendel_web/live/comment_live/form_component.ex create mode 100644 lib/mindwendel_web/live/comment_live/form_component.html.heex create mode 100644 lib/mindwendel_web/live/comment_live/show_component.ex create mode 100644 lib/mindwendel_web/live/comment_live/show_component.html.heex create mode 100644 lib/mindwendel_web/live/idea_live/show_component.ex create mode 100644 lib/mindwendel_web/live/idea_live/show_component.html.heex create mode 100644 priv/repo/migrations/20241025074220_add_comments_for_ideas.exs create mode 100644 test/mindwendel/comments_test.exs create mode 100644 test/mindwendel_web/live/brainstorming_live/show_idea_comment_test.exs diff --git a/README.md b/README.md index bea05be6..6c1be0af 100644 --- a/README.md +++ b/README.md @@ -24,12 +24,13 @@ Create a challenge. Ready? Brainstorm. mindwendel helps you to easily brainstorm ## Features - 5 minute setup (It is not a joke) -- Anonymously invite people to your brainstormings - no registration needed. Usernames are optional +- Anonymously invite people to your brainstormings - no registration needed. Usernames are optional! - Easily create and upvote ideas, with live updates from your mindwendel members - Cluster or filter your ideas with custom labels - Preview of links to ease URL sharing - Add automatically encrypted file attachments which are uploaded to an S3 compatible storage backend - Add lanes, use drag & drop to order ideas +- Add comments to ideas - Export your generated ideas to html or csv (currently comma separated) - German & English Translation files - By default, brainstormings are deleted after 30 days to ensure GDPR compliancy diff --git a/assets/scss/_bootstrap_custom.scss b/assets/scss/_bootstrap_custom.scss index b794a1d1..f1ae4911 100644 --- a/assets/scss/_bootstrap_custom.scss +++ b/assets/scss/_bootstrap_custom.scss @@ -6,7 +6,7 @@ padding: 0.5rem 0.5rem; } -.card-footer-mindwendel-idea { +.card-footer-mindwendel { @extend .card-footer; padding: 0.5rem 0.5rem; background-color: inherit; diff --git a/lib/mindwendel/brainstormings.ex b/lib/mindwendel/brainstormings.ex index 56a9ca85..642778e8 100644 --- a/lib/mindwendel/brainstormings.ex +++ b/lib/mindwendel/brainstormings.ex @@ -308,7 +308,8 @@ defmodule Mindwendel.Brainstormings do :link, :likes, :idea_labels, - :files + :files, + :comments ]) } ) diff --git a/lib/mindwendel/brainstormings/comment.ex b/lib/mindwendel/brainstormings/comment.ex new file mode 100644 index 00000000..866207dd --- /dev/null +++ b/lib/mindwendel/brainstormings/comment.ex @@ -0,0 +1,23 @@ +defmodule Mindwendel.Brainstormings.Comment do + use Mindwendel.Schema + + import Ecto.Changeset + alias Mindwendel.Brainstormings.Idea + alias Mindwendel.Accounts.User + + schema "idea_comments" do + belongs_to :idea, Idea + belongs_to :user, User + field :body, :string + field :username, :string, default: "Anonymous" + + timestamps() + end + + @doc false + def changeset(comment, attrs) do + comment + |> cast(attrs, [:idea_id, :user_id, :body, :username]) + |> validate_required([:idea_id, :body, :username]) + end +end diff --git a/lib/mindwendel/brainstormings/idea.ex b/lib/mindwendel/brainstormings/idea.ex index 1b742216..6c208bb7 100644 --- a/lib/mindwendel/brainstormings/idea.ex +++ b/lib/mindwendel/brainstormings/idea.ex @@ -7,6 +7,7 @@ defmodule Mindwendel.Brainstormings.Idea do alias Mindwendel.Brainstormings.IdeaIdeaLabel alias Mindwendel.Brainstormings.Like alias Mindwendel.Brainstormings.Lane + alias Mindwendel.Brainstormings.Comment alias Mindwendel.Ideas alias Mindwendel.Attachments alias Mindwendel.Attachments.Link @@ -21,10 +22,12 @@ defmodule Mindwendel.Brainstormings.Idea do field :body, :string field :position_order, :integer field :username, :string, default: "Anonymous" + field :comments_count, :integer field :deprecated_label, Ecto.Enum, source: :label, values: @label_values has_one :link, Link belongs_to :user, User has_many :likes, Like + has_many :comments, Comment, preload_order: [desc: :inserted_at] has_many :files, File belongs_to :brainstorming, Brainstorming belongs_to :label, IdeaLabel, on_replace: :nilify @@ -45,7 +48,8 @@ defmodule Mindwendel.Brainstormings.Idea do :deprecated_label, :label_id, :user_id, - :position_order + :position_order, + :comments_count ]) |> validate_required([:username, :body, :brainstorming_id]) |> maybe_put_idea_labels(attrs) diff --git a/lib/mindwendel/comments.ex b/lib/mindwendel/comments.ex new file mode 100644 index 00000000..2e60bbeb --- /dev/null +++ b/lib/mindwendel/comments.ex @@ -0,0 +1,122 @@ +defmodule Mindwendel.Comments do + import Ecto.Query, warn: false + alias Mindwendel.Repo + alias Mindwendel.Brainstormings.Comment + alias Mindwendel.Brainstormings + alias Mindwendel.Ideas + + require Logger + + @doc """ + Gets a single comment + + ## Examples + + iex> get_comment!("0323906b-b496-4778-ae67-1dd779d3de3c") + %Comment{ ... } + + """ + def get_comment!(id) do + Repo.get!(Comment, id) + end + + @doc """ + Returns an `%Ecto.Changeset{}` for tracking comment changes. + + ## Examples + + iex> change_comment(comment) + %Ecto.Changeset(data: %Comment{}) + + """ + def change_comment(%Comment{} = comment, attrs \\ %{}) do + Comment.changeset(comment, attrs) + end + + @doc """ + Creates a comment. + + ## Examples + + iex> create_comment(%{field: value}) + {:ok, %Comment{}} + + iex> create_comment(%{field: bad_value}) + {:error, %Ecto.Changeset{}} + + """ + def create_comment(attrs \\ %{}) do + result = + %Comment{} + |> Comment.changeset(attrs) + |> Repo.insert() + + case result do + {:ok, comment} -> Ideas.increment_comment_count(comment.idea_id) + {:error, _} -> nil + end + + handle_result_for_broadcast(result) + result + end + + @doc """ + Updates a comment. + + ## Examples + + iex> update_comment(comment, %{field: new_value}) + {:ok, %Comment{}} + + iex> update_comment(comment, %{field: bad_value}) + {:error, %Ecto.Changeset{}} + + """ + def update_comment(%Comment{} = comment, attrs) do + result = + comment + |> Comment.changeset(attrs) + |> Repo.update() + + handle_result_for_broadcast(result) + result + end + + @doc """ + Deletes a comment. + + ## Examples + + iex> delete_comment(comment) + {:ok, %Comment{}} + + iex> delete_comment(comment) + {:error, %Ecto.Changeset{}} + + """ + def delete_comment(%Comment{} = comment) do + result = Repo.delete(comment) + + case result do + {:ok, comment} -> Ideas.decrement_comment_count(comment.idea_id) + end + + handle_result_for_broadcast(result) + result + end + + defp handle_result_for_broadcast(result) do + case result do + {:ok, comment} -> + idea = Ideas.get_idea!(comment.idea_id) + + Brainstormings.broadcast( + {:ok, idea}, + :idea_updated + ) + + {:error, changeset} -> + {:error, changeset} + end + end +end diff --git a/lib/mindwendel/ideas.ex b/lib/mindwendel/ideas.ex index f62b75f3..d581ee7e 100644 --- a/lib/mindwendel/ideas.ex +++ b/lib/mindwendel/ideas.ex @@ -88,7 +88,8 @@ defmodule Mindwendel.Ideas do :link, :likes, :label, - :idea_labels + :idea_labels, + :comments ]) end @@ -283,7 +284,8 @@ defmodule Mindwendel.Ideas do ** (Ecto.NoResultsError) """ - def get_idea!(id), do: Repo.get!(Idea, id) |> Repo.preload([:idea_labels, :files]) + def get_idea!(id), + do: Repo.get!(Idea, id) |> Repo.preload([:idea_labels, :files, :link, :comments]) @doc """ Creates a idea. @@ -355,6 +357,42 @@ defmodule Mindwendel.Ideas do result end + @doc """ + Increments the comment count of an idea. + + ## Examples + + iex> increment_comment_count(idea_id) + {:ok, %Idea{}} + + iex> increment_comment_count(idea_id) + {:error, %Ecto.Changeset{}} + + """ + def increment_comment_count(idea_id) do + idea = Repo.get!(Idea, idea_id) + changeset = Idea.changeset(idea, %{comments_count: idea.comments_count + 1}) + Repo.update(changeset) + end + + @doc """ + Decrements the comment count of an idea. + + ## Examples + + iex> decrement_comment_count(idea_id) + {:ok, %Idea{}} + + iex> decrement_comment_count(idea_id) + {:error, %Ecto.Changeset{}} + + """ + def decrement_comment_count(idea_id) do + idea = Repo.get!(Idea, idea_id) + changeset = Idea.changeset(idea, %{comments_count: idea.comments_count - 1}) + Repo.update(changeset) + end + @doc """ Deletes a idea. @@ -389,6 +427,6 @@ defmodule Mindwendel.Ideas do """ def change_idea(%Idea{} = idea, attrs \\ %{}) do - Repo.preload(idea, [:link, :idea_labels]) |> Idea.changeset(attrs) + Repo.preload(idea, [:link, :idea_labels, :comments, :files]) |> Idea.changeset(attrs) end end diff --git a/lib/mindwendel_web/live/brainstorming_live/show.ex b/lib/mindwendel_web/live/brainstorming_live/show.ex index e5b6360f..34cee437 100644 --- a/lib/mindwendel_web/live/brainstorming_live/show.ex +++ b/lib/mindwendel_web/live/brainstorming_live/show.ex @@ -67,6 +67,26 @@ defmodule MindwendelWeb.BrainstormingLive.Show do {:noreply, assign(socket, :lanes, lanes)} end + def handle_info({:lane_updated, lane}, socket) do + new_lanes = + Enum.map(socket.assigns.lanes, fn existing_lane -> + if lane.id == existing_lane.id, do: lane, else: existing_lane + end) + + {:noreply, assign(socket, :lanes, new_lanes)} + end + + # idea updated - only relevant if the show modal of the idea is opened + def handle_info({:idea_updated, idea}, socket) do + if socket.assigns.live_action == :show_idea and socket.assigns.idea.id == idea.id do + # update the idea modal with new content + send_update(MindwendelWeb.IdeaLive.ShowComponent, id: :show, idea: idea) + {:noreply, socket} + else + {:noreply, socket} + end + end + def handle_info({:brainstorming_filter_updated, brainstorming, lanes}, socket) do {:noreply, push_patch( @@ -102,6 +122,15 @@ defmodule MindwendelWeb.BrainstormingLive.Show do |> assign(:idea, Ideas.get_idea!(idea_id)) end + defp apply_action( + socket, + :show_idea, + %{"brainstorming_id" => _brainstorming_id, "idea_id" => idea_id} + ) do + socket + |> assign(:idea, Ideas.get_idea!(idea_id)) + end + defp apply_action( socket, :edit_lane, diff --git a/lib/mindwendel_web/live/brainstorming_live/show.html.heex b/lib/mindwendel_web/live/brainstorming_live/show.html.heex index 0c2ec320..6b2c68be 100644 --- a/lib/mindwendel_web/live/brainstorming_live/show.html.heex +++ b/lib/mindwendel_web/live/brainstorming_live/show.html.heex @@ -21,7 +21,7 @@
<%= if has_moderating_permission(@brainstorming, @current_user) do %> <.link - patch={~p"/brainstormings/#{@brainstorming.id}/show/new_lane"} + patch={~p"/brainstormings/#{@brainstorming.id}/new_lane"} class="btn btn-primary m-1 d-inline-flex align-items-center" title={gettext("New lane")} > @@ -30,7 +30,7 @@ <% end %> <.link - patch={~p"/brainstormings/#{@brainstorming.id}/show/share"} + patch={~p"/brainstormings/#{@brainstorming.id}/share"} class="btn btn-secondary m-1" title={gettext("Share")} > @@ -73,31 +73,33 @@ /> <.modal - :if={@live_action in [:edit]} - id="brainstorming-modal" + :if={@live_action in [:new_idea]} + id="idea-modal" show on_cancel={JS.patch(~p"/brainstormings/#{@brainstorming.id}")} - title={@page_title} + title={gettext("New idea")} > <.live_component - module={MindwendelWeb.BrainstormingLive.FormComponent} - id={@brainstorming.id} - action={@live_action} + module={MindwendelWeb.IdeaLive.FormComponent} + id={:new} + action={:new} brainstorming={@brainstorming} + current_user={@current_user} + idea={@idea} /> <.modal - :if={@live_action in [:new_idea]} + :if={@live_action in [:show_idea]} id="idea-modal" show on_cancel={JS.patch(~p"/brainstormings/#{@brainstorming.id}")} - title={gettext("New idea")} + title={gettext("Show idea")} > <.live_component - module={MindwendelWeb.IdeaLive.FormComponent} - id={:new} - action={:new} + module={MindwendelWeb.IdeaLive.ShowComponent} + id={:show} + action={:show} brainstorming={@brainstorming} current_user={@current_user} idea={@idea} diff --git a/lib/mindwendel_web/live/comment_live/form_component.ex b/lib/mindwendel_web/live/comment_live/form_component.ex new file mode 100644 index 00000000..65ef1a0a --- /dev/null +++ b/lib/mindwendel_web/live/comment_live/form_component.ex @@ -0,0 +1,119 @@ +defmodule MindwendelWeb.CommentLive.FormComponent do + use MindwendelWeb, :live_component + alias Mindwendel.Comments + alias Mindwendel.Brainstormings.Comment + + @impl true + def update( + %{comment: comment} = + assigns, + socket + ) do + {:ok, + socket + |> assign(assigns) + |> assign_new(:form, fn -> + to_form(Comments.change_comment(comment)) + end)} + end + + def update( + %{idea: idea, current_user: current_user} = assigns, + socket + ) do + comment = %Comment{ + idea_id: idea.id, + username: current_user.username + } + + {:ok, + socket + |> assign(assigns) + |> assign_new(:comment, fn -> comment end) + |> assign_new(:form, fn -> + to_form(Comments.change_comment(comment)) + end)} + end + + @impl true + def handle_event("close", _, socket) do + # The close button is either pressed inside the comment component, where a comment might be edited, or inside the "new comment" form. + # Depending on the location, either patch back to the brainstorming or simply change back to view mode inside the comment. + %{brainstorming: brainstorming, comment: comment} = socket.assigns + + case socket.assigns.action do + :new -> + {:noreply, + push_patch( + socket + |> assign(:brainstorming, brainstorming), + to: "/brainstormings/#{brainstorming.id}" + )} + + :update -> + send_update(MindwendelWeb.CommentLive.ShowComponent, id: comment.id, live_action: :show) + {:noreply, socket} + end + end + + def handle_event("validate", %{"comment" => comment_params}, socket) do + changeset = Comments.change_comment(socket.assigns.comment, comment_params) + + {:noreply, assign(socket, form: to_form(changeset, action: :validate))} + end + + def handle_event("save", %{"comment" => comment_params}, socket) do + save_comment(socket, socket.assigns.action, comment_params) + end + + defp save_comment(socket, :update, comment_params) do + %{current_user: current_user, comment: comment, brainstorming: brainstorming} = socket.assigns + + if has_moderating_or_ownership_permission(brainstorming, comment, current_user) do + comment_params_merged = + comment_params + |> Map.put("user_id", comment.user_id || current_user.id) + |> Map.put("idea_id", socket.assigns.idea.id) + + case Comments.update_comment( + comment, + comment_params_merged + ) do + {:ok, _comment} -> + {:noreply, + socket + |> put_flash(:info, gettext("Comment updated"))} + + {:error, %Ecto.Changeset{} = changeset} -> + {:noreply, assign(socket, form: to_form(changeset))} + end + else + {:noreply, socket} + end + end + + defp save_comment(socket, :new, comment_params) do + comment_params_merged = + comment_params + |> Map.put("user_id", socket.assigns.current_user.id) + |> Map.put("idea_id", socket.assigns.idea.id) + + case Comments.create_comment(comment_params_merged) do + {:ok, _comment} -> + # reset the form + new_comment = %Comment{ + idea_id: socket.assigns.idea.id, + username: socket.assigns.current_user.username + } + + {:noreply, + socket + |> assign(comment: new_comment) + |> assign(form: to_form(Comments.change_comment(new_comment))) + |> put_flash(:info, gettext("Comment created successfully"))} + + {:error, %Ecto.Changeset{} = changeset} -> + {:noreply, assign(socket, form: to_form(changeset))} + end + end +end diff --git a/lib/mindwendel_web/live/comment_live/form_component.html.heex b/lib/mindwendel_web/live/comment_live/form_component.html.heex new file mode 100644 index 00000000..8638ae3d --- /dev/null +++ b/lib/mindwendel_web/live/comment_live/form_component.html.heex @@ -0,0 +1,43 @@ +
+ <.simple_form + for={@form} + id={"comment-form-#{@comment.id || :new}"} + phx-target={@myself} + phx-change="validate" + phx-submit="save" + > + <.input + field={@form[:username]} + type="text" + label={gettext("Username")} + phx-debounce={300} + id={"comment-form-username-#{@comment.id || :new}"} + /> + <.input + field={@form[:body]} + type="textarea" + id={"comment-form-body-#{@comment.id || :new}"} + label={gettext("Your comment")} + phx-debounce={300} + /> + <.input field={@form[:id]} type="hidden" id={"comment-form-id-#{@comment.id || :new}"} /> + <.input + field={@form[:idea_id]} + type="hidden" + id={"comment-form-idea-id-#{@comment.id || :new}"} + /> + <:actions> + <.link + phx-click={:close} + phx-target={@myself} + class="btn btn-secondary form-cancel me-2" + title={gettext("Close")} + > + <%= gettext("Close") %> + + <.button class="btn-primary" phx-disable-with={gettext("Saving...")}> + <%= gettext("Save") %> + + + +
diff --git a/lib/mindwendel_web/live/comment_live/show_component.ex b/lib/mindwendel_web/live/comment_live/show_component.ex new file mode 100644 index 00000000..758b4130 --- /dev/null +++ b/lib/mindwendel_web/live/comment_live/show_component.ex @@ -0,0 +1,19 @@ +defmodule MindwendelWeb.CommentLive.ShowComponent do + use MindwendelWeb, :live_component + alias Mindwendel.Comments + + @impl true + def handle_event("edit_comment", _value, socket) do + {:noreply, assign(socket, :live_action, :edit)} + end + + def handle_event("delete_comment", _, socket) do + %{brainstorming: brainstorming, comment: comment, current_user: current_user} = socket.assigns + + if has_moderating_or_ownership_permission(brainstorming, comment, current_user) do + Comments.delete_comment(socket.assigns.comment) + end + + {:noreply, socket} + end +end diff --git a/lib/mindwendel_web/live/comment_live/show_component.html.heex b/lib/mindwendel_web/live/comment_live/show_component.html.heex new file mode 100644 index 00000000..02246ed8 --- /dev/null +++ b/lib/mindwendel_web/live/comment_live/show_component.html.heex @@ -0,0 +1,49 @@ +
+
+ <%= if @live_action == :edit do %> + <.live_component + module={MindwendelWeb.CommentLive.FormComponent} + id={"comment-form-#{@comment.id}"} + brainstorming={@brainstorming} + current_user={@current_user} + comment={@comment} + idea={@idea} + action={:update} + /> + <% else %> +
+ <%= if has_moderating_or_ownership_permission(@brainstorming, @comment, @current_user) do %> + <.link + class="float-end ms-3 mb-3" + phx-click="delete_comment" + phx-target={@myself} + phx-value-id={@comment.id} + title={gettext("Delete comment")} + data-confirm={gettext("Are you sure you want to delete this idea?")} + > + + + <.link + phx-click="edit_comment" + phx-target={@myself} + class="float-end ms-3 mb-3" + title={gettext("Delete idea")} + > + + + <% end %> +
+ <%= @comment.body %> + +
+ + <%= gettext("By") %> <%= Gettext.gettext(MindwendelWeb.Gettext, @comment.username) %> <%= Timex.format!( + @comment.inserted_at, + "{relative}", + :relative + ) %> + +
+ <% end %> +
+
diff --git a/lib/mindwendel_web/live/idea_live/show_component.ex b/lib/mindwendel_web/live/idea_live/show_component.ex new file mode 100644 index 00000000..a2435454 --- /dev/null +++ b/lib/mindwendel_web/live/idea_live/show_component.ex @@ -0,0 +1,3 @@ +defmodule MindwendelWeb.IdeaLive.ShowComponent do + use MindwendelWeb, :live_component +end diff --git a/lib/mindwendel_web/live/idea_live/show_component.html.heex b/lib/mindwendel_web/live/idea_live/show_component.html.heex new file mode 100644 index 00000000..e769f26e --- /dev/null +++ b/lib/mindwendel_web/live/idea_live/show_component.html.heex @@ -0,0 +1,63 @@ +
+ <%= unless @idea.link do %> +

<%= raw(@idea.body) %>

+ <% end %> + + <%= if @idea.link do %> + <.link href={@idea.link.url}> + <%= raw(@idea.body) %> + +
+
+
+ +
+
+

<%= @idea.link.title %>

+

<%= @idea.link.description %>

+
+
+ <% end %> + + <%= if length(@idea.files) > 0 do %> + <%= for attachment <- @idea.files do %> + +

+ <.link href={~p"/files/#{attachment.id}"} download={attachment.name}> + <%= attachment.name || gettext("No filename") %> + +

+ <% end %> + <% end %> + +
+

<%= gettext("Comments") %>

+ <%= for comment <- @idea.comments do %> + <.live_component + module={MindwendelWeb.CommentLive.ShowComponent} + id={comment.id} + comment={comment} + idea={@idea} + brainstorming={@brainstorming} + current_user={@current_user} + live_action={:show} + /> + <% end %> + <%= if length(@idea.comments) == 0 do %> + <%= gettext("No comments available") %> + <% end %> +
+ +
+

<%= gettext("Add a new comment") %>

+ + <.live_component + module={MindwendelWeb.CommentLive.FormComponent} + id={:new} + brainstorming={@brainstorming} + current_user={@current_user} + idea={@idea} + action={:new} + /> +
+
diff --git a/lib/mindwendel_web/live/lane_live/index_component.ex b/lib/mindwendel_web/live/lane_live/index_component.ex index 6821e3c3..b8602112 100644 --- a/lib/mindwendel_web/live/lane_live/index_component.ex +++ b/lib/mindwendel_web/live/lane_live/index_component.ex @@ -22,7 +22,6 @@ defmodule MindwendelWeb.LaneLive.IndexComponent do {:noreply, socket} end - @impl true def handle_event("delete_lane", %{"id" => id}, socket) do lane = Lanes.get_lane!(id) @@ -36,14 +35,12 @@ defmodule MindwendelWeb.LaneLive.IndexComponent do {:noreply, socket} end - @impl true def handle_event("like", %{"id" => id}, socket) do Likes.add_like(id, socket.assigns.current_user.id) {:noreply, socket} end - @impl true def handle_event("unlike", %{"id" => id}, socket) do Likes.delete_like(id, socket.assigns.current_user.id) @@ -131,7 +128,6 @@ defmodule MindwendelWeb.LaneLive.IndexComponent do end end - @impl true def handle_event("sort_by_likes", %{"id" => id, "lane-id" => lane_id}, socket) do brainstorming = Brainstormings.get_brainstorming!(id) diff --git a/lib/mindwendel_web/live/lane_live/index_component.html.heex b/lib/mindwendel_web/live/lane_live/index_component.html.heex index a5f06ef4..aca3f900 100644 --- a/lib/mindwendel_web/live/lane_live/index_component.html.heex +++ b/lib/mindwendel_web/live/lane_live/index_component.html.heex @@ -8,7 +8,7 @@ <.link class="btn btn-primary btn-sm d-inline-flex align-items-center" title={gettext("Add idea")} - patch={~p"/brainstormings/#{@brainstorming.id}/show/lanes/#{lane.id}/new_idea"} + patch={~p"/brainstormings/#{@brainstorming.id}/lanes/#{lane.id}/new_idea"} > <%= gettext("Add idea") %> @@ -122,6 +122,13 @@ <% end %> + <.link + patch={~p"/brainstormings/#{@brainstorming.id}/ideas/#{idea.id}"} + class="float-end ms-3 mb-3" + title={gettext("Show idea")} + > + + <%= for idea_label <- Enum.sort_by(idea.idea_labels, &(&1.position_order)) do %>

- <.link href={~p"/files/#{attachment.id}"}> + <.link href={~p"/files/#{attachment.id}"} download={attachment.name}> <%= attachment.name || gettext("No filename") %>

@@ -167,7 +174,7 @@ <% end %>
-
+
<%= gettext("By") %> <%= Gettext.gettext(MindwendelWeb.Gettext, idea.username) %> <%= Timex.format!( idea.inserted_at, @@ -250,7 +257,7 @@

<%= gettext("No ideas brainstormed") %>

<.link class="btn btn-outline-primary d-inline-flex align-items-center" - patch={~p"/brainstormings/#{@brainstorming.id}/show/lanes/#{lane.id}/new_idea"} + patch={~p"/brainstormings/#{@brainstorming.id}/lanes/#{lane.id}/new_idea"} > <%= gettext("Add idea") %> @@ -266,7 +273,7 @@

<%= gettext("No lanes available") %>

<.link class="btn btn-outline-primary d-inline-flex align-items-center" - patch={~p"/brainstormings/#{@brainstorming.id}/show/new_lane"} + patch={~p"/brainstormings/#{@brainstorming.id}/new_lane"} > <%= gettext("New lane") %> diff --git a/lib/mindwendel_web/live/live_helpers.ex b/lib/mindwendel_web/live/live_helpers.ex index 85f0fb55..84e98c03 100644 --- a/lib/mindwendel_web/live/live_helpers.ex +++ b/lib/mindwendel_web/live/live_helpers.ex @@ -12,12 +12,13 @@ defmodule MindwendelWeb.LiveHelpers do Enum.member?(brainstorming.moderating_users |> Enum.map(& &1.id), current_user.id) end - def has_ownership(idea, current_user) do - idea.user_id == current_user.id + def has_ownership(record, current_user) do + %{user_id: user_id} = record + user_id == current_user.id end - def has_moderating_or_ownership_permission(brainstorming, idea, current_user) do - has_ownership(idea, current_user) or has_moderating_permission(brainstorming, current_user) + def has_moderating_or_ownership_permission(brainstorming, record, current_user) do + has_ownership(record, current_user) or has_moderating_permission(brainstorming, current_user) end def uuid do diff --git a/lib/mindwendel_web/router.ex b/lib/mindwendel_web/router.ex index 7c574f5e..e0dc7257 100644 --- a/lib/mindwendel_web/router.ex +++ b/lib/mindwendel_web/router.ex @@ -54,16 +54,17 @@ defmodule MindwendelWeb.Router do post("/brainstormings", BrainstormingController, :create) live "/brainstormings/:id", BrainstormingLive.Show, :show - live "/brainstormings/:id/show/edit", BrainstormingLive.Show, :edit - # Maybe rather "/brainstormings/:id/ideas/new" ? - live "/brainstormings/:id/show/lanes/:lane_id/new_idea", BrainstormingLive.Show, :new_idea - live "/brainstormings/:id/show/new_lane", BrainstormingLive.Show, :new_lane - live "/brainstormings/:id/show/share", BrainstormingLive.Show, :share + live "/brainstormings/:id/edit", BrainstormingLive.Show, :edit + live "/brainstormings/:id/lanes/:lane_id/new_idea", BrainstormingLive.Show, :new_idea + live "/brainstormings/:id/new_lane", BrainstormingLive.Show, :new_lane + live "/brainstormings/:id/share", BrainstormingLive.Show, :share live "/brainstormings/:brainstorming_id/ideas/:idea_id/edit", BrainstormingLive.Show, :edit_idea + live "/brainstormings/:brainstorming_id/ideas/:idea_id", BrainstormingLive.Show, :show_idea + live "/brainstormings/:brainstorming_id/lanes/:lane_id/edit", BrainstormingLive.Show, :edit_lane diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po index f04a17a9..1745856b 100644 --- a/priv/gettext/de/LC_MESSAGES/default.po +++ b/priv/gettext/de/LC_MESSAGES/default.po @@ -26,16 +26,17 @@ msgstr "Wie können wir ..." msgid "Ready?" msgstr "Fertig?" -#: lib/mindwendel_web/live/brainstorming_live/show.ex:139 +#: lib/mindwendel_web/live/brainstorming_live/show.ex:168 #, elixir-autogen, elixir-format msgid "%{name} - Edit" msgstr "%{name} - Editieren" -#: lib/mindwendel_web/live/brainstorming_live/show.ex:116 +#: lib/mindwendel_web/live/brainstorming_live/show.ex:145 #, elixir-autogen, elixir-format msgid "%{name} - New Idea" msgstr "%{name} - Neue Idee" +#: lib/mindwendel_web/live/comment_live/show_component.html.heex:22 #: lib/mindwendel_web/live/lane_live/index_component.html.heex:113 #, elixir-autogen, elixir-format msgid "Are you sure you want to delete this idea?" @@ -46,6 +47,8 @@ msgstr "Möchtest du die Idee löschen?" msgid "Attention: This will delete the brainstorming with all belonging ideas and other associated records to it. This cant be undone" msgstr "Achtung: Hiermit löschst du das Brainstorming und alle dazugehörigen Ideen. Diese Aktion kann nicht rückgängig gemacht werden." +#: lib/mindwendel_web/live/comment_live/form_component.html.heex:34 +#: lib/mindwendel_web/live/comment_live/form_component.html.heex:36 #: lib/mindwendel_web/live/idea_live/form_component.html.heex:55 #: lib/mindwendel_web/live/idea_live/form_component.html.heex:57 #: lib/mindwendel_web/live/lane_live/form_component.html.heex:16 @@ -105,12 +108,12 @@ msgstr "Idee erstellt" msgid "New brainstorming" msgstr "Neues Brainstorming" -#: lib/mindwendel_web/live/brainstorming_live/show.html.heex:95 +#: lib/mindwendel_web/live/brainstorming_live/show.html.heex:80 #, elixir-autogen, elixir-format msgid "New idea" msgstr "Neue Idee" -#: lib/mindwendel_web/live/lane_live/index_component.html.heex:250 +#: lib/mindwendel_web/live/lane_live/index_component.html.heex:257 #, elixir-autogen, elixir-format msgid "No ideas brainstormed" msgstr "Bisher keine Ideen vorhanden" @@ -120,6 +123,7 @@ msgstr "Bisher keine Ideen vorhanden" msgid "Proceed to your brainstorming" msgstr "Weiter zu deinem Brainstorming" +#: lib/mindwendel_web/live/comment_live/form_component.html.heex:39 #: lib/mindwendel_web/live/idea_live/form_component.html.heex:60 #: lib/mindwendel_web/live/lane_live/form_component.html.heex:21 #, elixir-autogen, elixir-format @@ -131,6 +135,7 @@ msgstr "Speichern" msgid "Save this link to update / delete your brainstorming later on:" msgstr "Speichere diesen Link, um das Brainstorming zukünftig zu bearbeiten oder zu löschen" +#: lib/mindwendel_web/live/comment_live/form_component.html.heex:38 #: lib/mindwendel_web/live/idea_live/form_component.html.heex:59 #: lib/mindwendel_web/live/lane_live/form_component.html.heex:20 #, elixir-autogen, elixir-format @@ -189,13 +194,15 @@ msgstr "Deine letzten Brainstormings" msgid "Your idea" msgstr "Deine Idee" +#: lib/mindwendel_web/live/comment_live/form_component.html.heex:12 #: lib/mindwendel_web/live/idea_live/form_component.html.heex:9 #, elixir-autogen, elixir-format msgid "Username" msgstr "Nutzername" #: lib/mindwendel_web/controllers/admin/brainstorming_html/export.html.heex:3 -#: lib/mindwendel_web/live/lane_live/index_component.html.heex:172 +#: lib/mindwendel_web/live/comment_live/show_component.html.heex:40 +#: lib/mindwendel_web/live/lane_live/index_component.html.heex:179 #, elixir-autogen, elixir-format msgid "By" msgstr "Von" @@ -269,7 +276,7 @@ msgstr "Mindwendel Brainstorming" msgid "Share" msgstr "Teilen" -#: lib/mindwendel_web/live/brainstorming_live/show.html.heex:162 +#: lib/mindwendel_web/live/brainstorming_live/show.html.heex:164 #, elixir-autogen, elixir-format msgid "Share brainstorming" msgstr "Teile Dein Brainstorming" @@ -289,7 +296,7 @@ msgstr "Download als SVG" msgid "Brainstorming delete are you sure" msgstr "Bist du sicher, dass das Brainstorming gelöscht werden soll?" -#: lib/mindwendel_web/live/brainstorming_live/show.html.heex:129 +#: lib/mindwendel_web/live/brainstorming_live/show.html.heex:131 #, elixir-autogen, elixir-format msgid "Update idea" msgstr "Idee bearbeiten" @@ -310,7 +317,7 @@ msgstr "Bist du sicher, dass das Brainstorming geleert werden soll?" msgid "Empty brainstorming" msgstr "Leere das Brainstorming" -#: lib/mindwendel_web/live/live_helpers.ex:28 +#: lib/mindwendel_web/live/live_helpers.ex:29 #, elixir-autogen, elixir-format, fuzzy msgid "Brainstorming will be deleted %{days}" msgstr "Brainstorming wird gelöscht %{days}" @@ -396,7 +403,7 @@ msgstr "Löschen" msgid "Type the label name" msgstr "Gebe dem Label einen Namen" -#: lib/mindwendel_web/live/brainstorming_live/show.ex:126 +#: lib/mindwendel_web/live/brainstorming_live/show.ex:155 #, elixir-autogen, elixir-format, fuzzy msgid "%{name} - New Lane" msgstr "%{name} - Neue Idee" @@ -413,13 +420,13 @@ msgstr "Name" #: lib/mindwendel_web/live/brainstorming_live/show.html.heex:26 #: lib/mindwendel_web/live/brainstorming_live/show.html.heex:28 -#: lib/mindwendel_web/live/brainstorming_live/show.html.heex:112 -#: lib/mindwendel_web/live/lane_live/index_component.html.heex:271 +#: lib/mindwendel_web/live/brainstorming_live/show.html.heex:114 +#: lib/mindwendel_web/live/lane_live/index_component.html.heex:278 #, elixir-autogen, elixir-format msgid "New lane" msgstr "Neue Spalte" -#: lib/mindwendel_web/live/brainstorming_live/show.html.heex:146 +#: lib/mindwendel_web/live/brainstorming_live/show.html.heex:148 #, elixir-autogen, elixir-format, fuzzy msgid "Update lane" msgstr "Spalte bearbeiten" @@ -448,7 +455,7 @@ msgstr "Spalte aktualisiert" #: lib/mindwendel_web/live/lane_live/index_component.html.heex:10 #: lib/mindwendel_web/live/lane_live/index_component.html.heex:13 -#: lib/mindwendel_web/live/lane_live/index_component.html.heex:255 +#: lib/mindwendel_web/live/lane_live/index_component.html.heex:262 #, elixir-autogen, elixir-format, fuzzy msgid "Add idea" msgstr "Neue Idee" @@ -458,7 +465,7 @@ msgstr "Neue Idee" msgid "Default lane" msgstr "Eine Spalte" -#: lib/mindwendel_web/live/lane_live/index_component.html.heex:266 +#: lib/mindwendel_web/live/lane_live/index_component.html.heex:273 #, elixir-autogen, elixir-format msgid "No lanes available" msgstr "Keine Spalten vorhanden" @@ -468,6 +475,7 @@ msgstr "Keine Spalten vorhanden" msgid "Edit idea" msgstr "Idee bearbeiten" +#: lib/mindwendel_web/live/comment_live/show_component.html.heex:30 #: lib/mindwendel_web/live/lane_live/index_component.html.heex:112 #, elixir-autogen, elixir-format, fuzzy msgid "Delete idea" @@ -484,10 +492,11 @@ msgid "Additional Attachment" msgstr "Zusätzlicher Anhang" #: lib/mindwendel_web/live/idea_live/form_component.html.heex:43 -#: lib/mindwendel_web/live/lane_live/index_component.html.heex:163 +#: lib/mindwendel_web/live/idea_live/show_component.html.heex:27 +#: lib/mindwendel_web/live/lane_live/index_component.html.heex:170 #, elixir-autogen, elixir-format msgid "No filename" -msgstr "" +msgstr "Kein Dateiname" #: lib/mindwendel_web/live/idea_live/form_component.ex:145 #, elixir-autogen, elixir-format @@ -509,6 +518,47 @@ msgstr "Zu viele Dateien ausgewählt" msgid "Allowed files: JPG/GIF/PNG/PDF" msgstr "Erlaubte Dateiformate: JPG/PNG/PDF" +#: lib/mindwendel_web/live/idea_live/show_component.html.heex:52 +#, elixir-autogen, elixir-format +msgid "Add a new comment" +msgstr "Kommentar hinzufügen" + +#: lib/mindwendel_web/live/comment_live/form_component.ex:113 +#, elixir-autogen, elixir-format, fuzzy +msgid "Comment created successfully" +msgstr "Spalte erfolgreich erstellt" + +#: lib/mindwendel_web/live/comment_live/form_component.ex:85 +#, elixir-autogen, elixir-format +msgid "Comment updated" +msgstr "Kommentar aktualisiert" + +#: lib/mindwendel_web/live/idea_live/show_component.html.heex:34 +#, elixir-autogen, elixir-format +msgid "Comments" +msgstr "Kommentare" + +#: lib/mindwendel_web/live/comment_live/show_component.html.heex:21 +#, elixir-autogen, elixir-format, fuzzy +msgid "Delete comment" +msgstr "Löschen" + +#: lib/mindwendel_web/live/idea_live/show_component.html.heex:47 +#, elixir-autogen, elixir-format, fuzzy +msgid "No comments available" +msgstr "Keine Spalten vorhanden" + +#: lib/mindwendel_web/live/brainstorming_live/show.html.heex:97 +#: lib/mindwendel_web/live/lane_live/index_component.html.heex:128 +#, elixir-autogen, elixir-format, fuzzy +msgid "Show idea" +msgstr "Zeige Idee" + +#: lib/mindwendel_web/live/comment_live/form_component.html.heex:20 +#, elixir-autogen, elixir-format +msgid "Your comment" +msgstr "Kommentar" + #: lib/mindwendel_web/components/../templates/layout/root.html.heex:86 #: lib/mindwendel_web/controllers/static_page_html/home.html.heex:75 #, elixir-autogen, elixir-format diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot index 1ae163e6..928a737f 100644 --- a/priv/gettext/default.pot +++ b/priv/gettext/default.pot @@ -25,16 +25,17 @@ msgstr "" msgid "Ready?" msgstr "" -#: lib/mindwendel_web/live/brainstorming_live/show.ex:139 +#: lib/mindwendel_web/live/brainstorming_live/show.ex:168 #, elixir-autogen, elixir-format msgid "%{name} - Edit" msgstr "" -#: lib/mindwendel_web/live/brainstorming_live/show.ex:116 +#: lib/mindwendel_web/live/brainstorming_live/show.ex:145 #, elixir-autogen, elixir-format msgid "%{name} - New Idea" msgstr "" +#: lib/mindwendel_web/live/comment_live/show_component.html.heex:22 #: lib/mindwendel_web/live/lane_live/index_component.html.heex:113 #, elixir-autogen, elixir-format msgid "Are you sure you want to delete this idea?" @@ -45,6 +46,8 @@ msgstr "" msgid "Attention: This will delete the brainstorming with all belonging ideas and other associated records to it. This cant be undone" msgstr "" +#: lib/mindwendel_web/live/comment_live/form_component.html.heex:34 +#: lib/mindwendel_web/live/comment_live/form_component.html.heex:36 #: lib/mindwendel_web/live/idea_live/form_component.html.heex:55 #: lib/mindwendel_web/live/idea_live/form_component.html.heex:57 #: lib/mindwendel_web/live/lane_live/form_component.html.heex:16 @@ -104,12 +107,12 @@ msgstr "" msgid "New brainstorming" msgstr "" -#: lib/mindwendel_web/live/brainstorming_live/show.html.heex:95 +#: lib/mindwendel_web/live/brainstorming_live/show.html.heex:80 #, elixir-autogen, elixir-format msgid "New idea" msgstr "" -#: lib/mindwendel_web/live/lane_live/index_component.html.heex:250 +#: lib/mindwendel_web/live/lane_live/index_component.html.heex:257 #, elixir-autogen, elixir-format msgid "No ideas brainstormed" msgstr "" @@ -119,6 +122,7 @@ msgstr "" msgid "Proceed to your brainstorming" msgstr "" +#: lib/mindwendel_web/live/comment_live/form_component.html.heex:39 #: lib/mindwendel_web/live/idea_live/form_component.html.heex:60 #: lib/mindwendel_web/live/lane_live/form_component.html.heex:21 #, elixir-autogen, elixir-format @@ -130,6 +134,7 @@ msgstr "" msgid "Save this link to update / delete your brainstorming later on:" msgstr "" +#: lib/mindwendel_web/live/comment_live/form_component.html.heex:38 #: lib/mindwendel_web/live/idea_live/form_component.html.heex:59 #: lib/mindwendel_web/live/lane_live/form_component.html.heex:20 #, elixir-autogen, elixir-format @@ -188,13 +193,15 @@ msgstr "" msgid "Your idea" msgstr "" +#: lib/mindwendel_web/live/comment_live/form_component.html.heex:12 #: lib/mindwendel_web/live/idea_live/form_component.html.heex:9 #, elixir-autogen, elixir-format msgid "Username" msgstr "" #: lib/mindwendel_web/controllers/admin/brainstorming_html/export.html.heex:3 -#: lib/mindwendel_web/live/lane_live/index_component.html.heex:172 +#: lib/mindwendel_web/live/comment_live/show_component.html.heex:40 +#: lib/mindwendel_web/live/lane_live/index_component.html.heex:179 #, elixir-autogen, elixir-format msgid "By" msgstr "" @@ -268,7 +275,7 @@ msgstr "" msgid "Share" msgstr "" -#: lib/mindwendel_web/live/brainstorming_live/show.html.heex:162 +#: lib/mindwendel_web/live/brainstorming_live/show.html.heex:164 #, elixir-autogen, elixir-format msgid "Share brainstorming" msgstr "" @@ -288,7 +295,7 @@ msgstr "" msgid "Brainstorming delete are you sure" msgstr "" -#: lib/mindwendel_web/live/brainstorming_live/show.html.heex:129 +#: lib/mindwendel_web/live/brainstorming_live/show.html.heex:131 #, elixir-autogen, elixir-format msgid "Update idea" msgstr "" @@ -309,7 +316,7 @@ msgstr "" msgid "Empty brainstorming" msgstr "" -#: lib/mindwendel_web/live/live_helpers.ex:28 +#: lib/mindwendel_web/live/live_helpers.ex:29 #, elixir-autogen, elixir-format msgid "Brainstorming will be deleted %{days}" msgstr "" @@ -395,7 +402,7 @@ msgstr "" msgid "Type the label name" msgstr "" -#: lib/mindwendel_web/live/brainstorming_live/show.ex:126 +#: lib/mindwendel_web/live/brainstorming_live/show.ex:155 #, elixir-autogen, elixir-format msgid "%{name} - New Lane" msgstr "" @@ -412,13 +419,13 @@ msgstr "" #: lib/mindwendel_web/live/brainstorming_live/show.html.heex:26 #: lib/mindwendel_web/live/brainstorming_live/show.html.heex:28 -#: lib/mindwendel_web/live/brainstorming_live/show.html.heex:112 -#: lib/mindwendel_web/live/lane_live/index_component.html.heex:271 +#: lib/mindwendel_web/live/brainstorming_live/show.html.heex:114 +#: lib/mindwendel_web/live/lane_live/index_component.html.heex:278 #, elixir-autogen, elixir-format msgid "New lane" msgstr "" -#: lib/mindwendel_web/live/brainstorming_live/show.html.heex:146 +#: lib/mindwendel_web/live/brainstorming_live/show.html.heex:148 #, elixir-autogen, elixir-format msgid "Update lane" msgstr "" @@ -447,7 +454,7 @@ msgstr "" #: lib/mindwendel_web/live/lane_live/index_component.html.heex:10 #: lib/mindwendel_web/live/lane_live/index_component.html.heex:13 -#: lib/mindwendel_web/live/lane_live/index_component.html.heex:255 +#: lib/mindwendel_web/live/lane_live/index_component.html.heex:262 #, elixir-autogen, elixir-format msgid "Add idea" msgstr "" @@ -457,7 +464,7 @@ msgstr "" msgid "Default lane" msgstr "" -#: lib/mindwendel_web/live/lane_live/index_component.html.heex:266 +#: lib/mindwendel_web/live/lane_live/index_component.html.heex:273 #, elixir-autogen, elixir-format msgid "No lanes available" msgstr "" @@ -467,6 +474,7 @@ msgstr "" msgid "Edit idea" msgstr "" +#: lib/mindwendel_web/live/comment_live/show_component.html.heex:30 #: lib/mindwendel_web/live/lane_live/index_component.html.heex:112 #, elixir-autogen, elixir-format msgid "Delete idea" @@ -483,7 +491,8 @@ msgid "Additional Attachment" msgstr "" #: lib/mindwendel_web/live/idea_live/form_component.html.heex:43 -#: lib/mindwendel_web/live/lane_live/index_component.html.heex:163 +#: lib/mindwendel_web/live/idea_live/show_component.html.heex:27 +#: lib/mindwendel_web/live/lane_live/index_component.html.heex:170 #, elixir-autogen, elixir-format msgid "No filename" msgstr "" @@ -508,6 +517,47 @@ msgstr "" msgid "Allowed files: JPG/GIF/PNG/PDF" msgstr "" +#: lib/mindwendel_web/live/idea_live/show_component.html.heex:52 +#, elixir-autogen, elixir-format +msgid "Add a new comment" +msgstr "" + +#: lib/mindwendel_web/live/comment_live/form_component.ex:113 +#, elixir-autogen, elixir-format +msgid "Comment created successfully" +msgstr "" + +#: lib/mindwendel_web/live/comment_live/form_component.ex:85 +#, elixir-autogen, elixir-format +msgid "Comment updated" +msgstr "" + +#: lib/mindwendel_web/live/idea_live/show_component.html.heex:34 +#, elixir-autogen, elixir-format +msgid "Comments" +msgstr "" + +#: lib/mindwendel_web/live/comment_live/show_component.html.heex:21 +#, elixir-autogen, elixir-format +msgid "Delete comment" +msgstr "" + +#: lib/mindwendel_web/live/idea_live/show_component.html.heex:47 +#, elixir-autogen, elixir-format +msgid "No comments available" +msgstr "" + +#: lib/mindwendel_web/live/brainstorming_live/show.html.heex:97 +#: lib/mindwendel_web/live/lane_live/index_component.html.heex:128 +#, elixir-autogen, elixir-format +msgid "Show idea" +msgstr "" + +#: lib/mindwendel_web/live/comment_live/form_component.html.heex:20 +#, elixir-autogen, elixir-format +msgid "Your comment" +msgstr "" + #: lib/mindwendel_web/components/../templates/layout/root.html.heex:86 #: lib/mindwendel_web/controllers/static_page_html/home.html.heex:75 #, elixir-autogen, elixir-format diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po index 2f21594d..30e21128 100644 --- a/priv/gettext/en/LC_MESSAGES/default.po +++ b/priv/gettext/en/LC_MESSAGES/default.po @@ -26,16 +26,17 @@ msgstr "" msgid "Ready?" msgstr "" -#: lib/mindwendel_web/live/brainstorming_live/show.ex:139 +#: lib/mindwendel_web/live/brainstorming_live/show.ex:168 #, elixir-autogen, elixir-format msgid "%{name} - Edit" msgstr "" -#: lib/mindwendel_web/live/brainstorming_live/show.ex:116 +#: lib/mindwendel_web/live/brainstorming_live/show.ex:145 #, elixir-autogen, elixir-format msgid "%{name} - New Idea" msgstr "" +#: lib/mindwendel_web/live/comment_live/show_component.html.heex:22 #: lib/mindwendel_web/live/lane_live/index_component.html.heex:113 #, elixir-autogen, elixir-format msgid "Are you sure you want to delete this idea?" @@ -46,6 +47,8 @@ msgstr "" msgid "Attention: This will delete the brainstorming with all belonging ideas and other associated records to it. This cant be undone" msgstr "" +#: lib/mindwendel_web/live/comment_live/form_component.html.heex:34 +#: lib/mindwendel_web/live/comment_live/form_component.html.heex:36 #: lib/mindwendel_web/live/idea_live/form_component.html.heex:55 #: lib/mindwendel_web/live/idea_live/form_component.html.heex:57 #: lib/mindwendel_web/live/lane_live/form_component.html.heex:16 @@ -105,12 +108,12 @@ msgstr "" msgid "New brainstorming" msgstr "" -#: lib/mindwendel_web/live/brainstorming_live/show.html.heex:95 +#: lib/mindwendel_web/live/brainstorming_live/show.html.heex:80 #, elixir-autogen, elixir-format msgid "New idea" msgstr "" -#: lib/mindwendel_web/live/lane_live/index_component.html.heex:250 +#: lib/mindwendel_web/live/lane_live/index_component.html.heex:257 #, elixir-autogen, elixir-format msgid "No ideas brainstormed" msgstr "" @@ -120,6 +123,7 @@ msgstr "" msgid "Proceed to your brainstorming" msgstr "" +#: lib/mindwendel_web/live/comment_live/form_component.html.heex:39 #: lib/mindwendel_web/live/idea_live/form_component.html.heex:60 #: lib/mindwendel_web/live/lane_live/form_component.html.heex:21 #, elixir-autogen, elixir-format @@ -131,6 +135,7 @@ msgstr "" msgid "Save this link to update / delete your brainstorming later on:" msgstr "" +#: lib/mindwendel_web/live/comment_live/form_component.html.heex:38 #: lib/mindwendel_web/live/idea_live/form_component.html.heex:59 #: lib/mindwendel_web/live/lane_live/form_component.html.heex:20 #, elixir-autogen, elixir-format @@ -189,13 +194,15 @@ msgstr "" msgid "Your idea" msgstr "" +#: lib/mindwendel_web/live/comment_live/form_component.html.heex:12 #: lib/mindwendel_web/live/idea_live/form_component.html.heex:9 #, elixir-autogen, elixir-format msgid "Username" msgstr "" #: lib/mindwendel_web/controllers/admin/brainstorming_html/export.html.heex:3 -#: lib/mindwendel_web/live/lane_live/index_component.html.heex:172 +#: lib/mindwendel_web/live/comment_live/show_component.html.heex:40 +#: lib/mindwendel_web/live/lane_live/index_component.html.heex:179 #, elixir-autogen, elixir-format msgid "By" msgstr "" @@ -269,7 +276,7 @@ msgstr "Mindwendel Brainstorming" msgid "Share" msgstr "Share" -#: lib/mindwendel_web/live/brainstorming_live/show.html.heex:162 +#: lib/mindwendel_web/live/brainstorming_live/show.html.heex:164 #, elixir-autogen, elixir-format msgid "Share brainstorming" msgstr "Share brainstorming" @@ -289,7 +296,7 @@ msgstr "Download as svg" msgid "Brainstorming delete are you sure" msgstr "Are you sure that you want to delete this brainstorming?" -#: lib/mindwendel_web/live/brainstorming_live/show.html.heex:129 +#: lib/mindwendel_web/live/brainstorming_live/show.html.heex:131 #, elixir-autogen, elixir-format msgid "Update idea" msgstr "" @@ -310,7 +317,7 @@ msgstr "Are you sure that you want to delete this brainstorming?" msgid "Empty brainstorming" msgstr "" -#: lib/mindwendel_web/live/live_helpers.ex:28 +#: lib/mindwendel_web/live/live_helpers.ex:29 #, elixir-autogen, elixir-format, fuzzy msgid "Brainstorming will be deleted %{days}" msgstr "" @@ -396,7 +403,7 @@ msgstr "" msgid "Type the label name" msgstr "" -#: lib/mindwendel_web/live/brainstorming_live/show.ex:126 +#: lib/mindwendel_web/live/brainstorming_live/show.ex:155 #, elixir-autogen, elixir-format, fuzzy msgid "%{name} - New Lane" msgstr "" @@ -413,13 +420,13 @@ msgstr "" #: lib/mindwendel_web/live/brainstorming_live/show.html.heex:26 #: lib/mindwendel_web/live/brainstorming_live/show.html.heex:28 -#: lib/mindwendel_web/live/brainstorming_live/show.html.heex:112 -#: lib/mindwendel_web/live/lane_live/index_component.html.heex:271 +#: lib/mindwendel_web/live/brainstorming_live/show.html.heex:114 +#: lib/mindwendel_web/live/lane_live/index_component.html.heex:278 #, elixir-autogen, elixir-format msgid "New lane" msgstr "" -#: lib/mindwendel_web/live/brainstorming_live/show.html.heex:146 +#: lib/mindwendel_web/live/brainstorming_live/show.html.heex:148 #, elixir-autogen, elixir-format, fuzzy msgid "Update lane" msgstr "" @@ -448,7 +455,7 @@ msgstr "" #: lib/mindwendel_web/live/lane_live/index_component.html.heex:10 #: lib/mindwendel_web/live/lane_live/index_component.html.heex:13 -#: lib/mindwendel_web/live/lane_live/index_component.html.heex:255 +#: lib/mindwendel_web/live/lane_live/index_component.html.heex:262 #, elixir-autogen, elixir-format, fuzzy msgid "Add idea" msgstr "" @@ -458,7 +465,7 @@ msgstr "" msgid "Default lane" msgstr "" -#: lib/mindwendel_web/live/lane_live/index_component.html.heex:266 +#: lib/mindwendel_web/live/lane_live/index_component.html.heex:273 #, elixir-autogen, elixir-format msgid "No lanes available" msgstr "" @@ -468,6 +475,7 @@ msgstr "" msgid "Edit idea" msgstr "" +#: lib/mindwendel_web/live/comment_live/show_component.html.heex:30 #: lib/mindwendel_web/live/lane_live/index_component.html.heex:112 #, elixir-autogen, elixir-format, fuzzy msgid "Delete idea" @@ -484,7 +492,8 @@ msgid "Additional Attachment" msgstr "" #: lib/mindwendel_web/live/idea_live/form_component.html.heex:43 -#: lib/mindwendel_web/live/lane_live/index_component.html.heex:163 +#: lib/mindwendel_web/live/idea_live/show_component.html.heex:27 +#: lib/mindwendel_web/live/lane_live/index_component.html.heex:170 #, elixir-autogen, elixir-format msgid "No filename" msgstr "" @@ -509,6 +518,47 @@ msgstr "" msgid "Allowed files: JPG/GIF/PNG/PDF" msgstr "" +#: lib/mindwendel_web/live/idea_live/show_component.html.heex:52 +#, elixir-autogen, elixir-format +msgid "Add a new comment" +msgstr "" + +#: lib/mindwendel_web/live/comment_live/form_component.ex:113 +#, elixir-autogen, elixir-format, fuzzy +msgid "Comment created successfully" +msgstr "" + +#: lib/mindwendel_web/live/comment_live/form_component.ex:85 +#, elixir-autogen, elixir-format +msgid "Comment updated" +msgstr "" + +#: lib/mindwendel_web/live/idea_live/show_component.html.heex:34 +#, elixir-autogen, elixir-format +msgid "Comments" +msgstr "" + +#: lib/mindwendel_web/live/comment_live/show_component.html.heex:21 +#, elixir-autogen, elixir-format, fuzzy +msgid "Delete comment" +msgstr "" + +#: lib/mindwendel_web/live/idea_live/show_component.html.heex:47 +#, elixir-autogen, elixir-format, fuzzy +msgid "No comments available" +msgstr "" + +#: lib/mindwendel_web/live/brainstorming_live/show.html.heex:97 +#: lib/mindwendel_web/live/lane_live/index_component.html.heex:128 +#, elixir-autogen, elixir-format, fuzzy +msgid "Show idea" +msgstr "" + +#: lib/mindwendel_web/live/comment_live/form_component.html.heex:20 +#, elixir-autogen, elixir-format +msgid "Your comment" +msgstr "" + #: lib/mindwendel_web/components/../templates/layout/root.html.heex:86 #: lib/mindwendel_web/controllers/static_page_html/home.html.heex:75 #, elixir-autogen, elixir-format diff --git a/priv/repo/data_migrations/migrate_add_position_order_to_ideas.exs b/priv/repo/data_migrations/migrate_add_position_order_to_ideas.exs index 2c4ad223..f1fd7bdf 100644 --- a/priv/repo/data_migrations/migrate_add_position_order_to_ideas.exs +++ b/priv/repo/data_migrations/migrate_add_position_order_to_ideas.exs @@ -1,10 +1,70 @@ defmodule Mindwendel.Repo.DataMigrations.MigrateAddPositionOrderToIdeas do require Logger alias Mindwendel.Repo - alias Mindwendel.Brainstormings.Idea - alias Mindwendel.Brainstormings.Brainstorming import Ecto.Query, warn: false + defmodule Brainstorming do + use Mindwendel.Schema + + use Gettext, backend: MindwendelWeb.Gettext + alias Mindwendel.Brainstormings.Idea + alias Mindwendel.Brainstormings.IdeaLabel + alias Mindwendel.Brainstormings.Lane + alias Mindwendel.Brainstormings.BrainstormingModeratingUser + alias Mindwendel.Accounts.User + alias Mindwendel.Accounts.BrainstormingUser + + schema "brainstormings" do + field :name, :string + field :option_show_link_to_settings, :boolean + field :option_allow_manual_ordering, :boolean + field :admin_url_id, :binary_id + field :last_accessed_at, :utc_datetime + field :filter_labels_ids, {:array, :binary_id} + belongs_to :creating_user, User + has_many :ideas, Idea + has_many :lanes, Lane, preload_order: [asc: :position_order] + has_many :labels, IdeaLabel + many_to_many :users, User, join_through: BrainstormingUser + many_to_many :moderating_users, User, join_through: BrainstormingModeratingUser + + timestamps() + end + end + + defmodule Idea do + use Mindwendel.Schema + + alias Mindwendel.Brainstormings.IdeaLabel + alias Mindwendel.Brainstormings.IdeaIdeaLabel + alias Mindwendel.Brainstormings.Like + alias Mindwendel.Brainstormings.Lane + alias Mindwendel.Brainstormings.Comment + alias Mindwendel.Attachments.Link + alias Mindwendel.Attachments.File + alias Mindwendel.Accounts.User + + @label_values [:label_1, :label_2, :label_3, :label_4, :label_5] + + schema "ideas" do + field :body, :string + field :position_order, :integer + field :username, :string, default: "Anonymous" + field :deprecated_label, Ecto.Enum, source: :label, values: @label_values + has_one :link, Link + belongs_to :user, User + has_many :likes, Like + has_many :comments, Comment, preload_order: [desc: :inserted_at] + has_many :files, File + belongs_to :brainstorming, Brainstorming + belongs_to :label, IdeaLabel, on_replace: :nilify + belongs_to :lane, Lane + many_to_many :idea_labels, IdeaLabel, join_through: IdeaIdeaLabel, on_replace: :delete + + timestamps() + end + end + def run do idea_query = from(idea in Idea, where: is_nil(idea.position_order), diff --git a/priv/repo/migrations/20241025074220_add_comments_for_ideas.exs b/priv/repo/migrations/20241025074220_add_comments_for_ideas.exs new file mode 100644 index 00000000..6388da95 --- /dev/null +++ b/priv/repo/migrations/20241025074220_add_comments_for_ideas.exs @@ -0,0 +1,22 @@ +defmodule Mindwendel.Repo.Migrations.AddCommentsForIdeas do + use Ecto.Migration + + def change do + create table(:idea_comments, primary_key: false) do + add :id, :uuid, primary_key: true + add :body, :string, size: 500 + # same as the user table, however, the ideas table allows longer names + add :username, :string, size: 64 + add :user_id, references(:users, type: :uuid, on_delete: :delete_all) + add :idea_id, references(:ideas, type: :uuid, on_delete: :delete_all) + + timestamps() + end + + create index(:idea_comments, [:idea_id]) + + alter table(:ideas) do + add(:comments_count, :integer, default: 0) + end + end +end diff --git a/test/mindwendel/brainstormings_test.exs b/test/mindwendel/brainstormings_test.exs index 0f85d1fe..18cbd413 100644 --- a/test/mindwendel/brainstormings_test.exs +++ b/test/mindwendel/brainstormings_test.exs @@ -10,6 +10,7 @@ defmodule Mindwendel.BrainstormingsTest do alias Mindwendel.Brainstormings.Brainstorming alias Mindwendel.Brainstormings.Idea alias Mindwendel.Brainstormings.Like + alias Mindwendel.Brainstormings.Comment alias Mindwendel.Attachments alias Mindwendel.Accounts.User @@ -196,6 +197,24 @@ defmodule Mindwendel.BrainstormingsTest do refute Repo.exists?(from(l in Attachments.Link, where: l.id == ^old_link.id)) end + test "removes the old brainstormings ideas comments" do + old_brainstorming = + Factory.insert!(:brainstorming, + last_accessed_at: DateTime.from_naive!(~N[2021-01-01 10:00:00], "Etc/UTC") + ) + + old_idea = + Factory.insert!(:idea, + brainstorming: old_brainstorming, + inserted_at: ~N[2021-01-01 15:04:30] + ) + + old_comment = Factory.insert!(:comment, idea: old_idea) + Brainstormings.delete_old_brainstormings() + + refute Repo.exists?(from(c in Comment, where: c.id == ^old_comment.id)) + end + test "removes file attachments" do old_brainstorming = Factory.insert!(:brainstorming, diff --git a/test/mindwendel/comments_test.exs b/test/mindwendel/comments_test.exs new file mode 100644 index 00000000..4147efdc --- /dev/null +++ b/test/mindwendel/comments_test.exs @@ -0,0 +1,30 @@ +defmodule Mindwendel.CommentsTest do + use Mindwendel.DataCase, async: true + alias Mindwendel.Factory + + alias Mindwendel.Comments + alias Mindwendel.Brainstormings.Idea + + setup do + idea = Factory.insert!(:idea) + + %{ + idea: idea + } + end + + describe "create_comment" do + test "increments comment count on idea", %{idea: idea} do + {:ok, _comment} = Comments.create_comment(%{body: "test", idea_id: idea.id}) + assert Repo.get_by!(Idea, id: idea.id).comments_count == 1 + end + end + + describe "delete_comment" do + test "decrements comment count on idea", %{idea: idea} do + {:ok, comment} = Comments.create_comment(%{body: "test", idea_id: idea.id}) + {:ok, _comment} = Comments.delete_comment(comment) + assert Repo.get_by!(Idea, id: idea.id).comments_count == 0 + end + end +end diff --git a/test/mindwendel/ideas_test.exs b/test/mindwendel/ideas_test.exs index f3f466bf..21f804d5 100644 --- a/test/mindwendel/ideas_test.exs +++ b/test/mindwendel/ideas_test.exs @@ -29,6 +29,27 @@ defmodule Mindwendel.IdeasTest do } end + describe "increment_comment_count" do + test "increments comment count on an idea", + %{ + idea: idea + } do + {:ok, idea} = Ideas.increment_comment_count(idea.id) + assert idea.comments_count == 1 + end + end + + describe "decrements_comment_count" do + test "increments comment count on an idea", + %{ + idea: idea + } do + Ideas.update_idea(idea, %{comments_count: 1}) + {:ok, idea} = Ideas.decrement_comment_count(idea.id) + assert idea.comments_count == 0 + end + end + describe "get_max_position_order" do test "returns 0 if no position is available", %{ diff --git a/test/mindwendel_web/live/brainstorming_live/show_idea_comment_test.exs b/test/mindwendel_web/live/brainstorming_live/show_idea_comment_test.exs new file mode 100644 index 00000000..e6051df4 --- /dev/null +++ b/test/mindwendel_web/live/brainstorming_live/show_idea_comment_test.exs @@ -0,0 +1,243 @@ +defmodule MindwendelWeb.BrainstormingLive.ShowIdeaCommentTest do + use MindwendelWeb.ConnCase, async: true + import Phoenix.LiveViewTest + alias Mindwendel.Brainstormings + + alias Mindwendel.Factory + + setup %{conn: conn} do + brainstorming = Factory.insert!(:brainstorming) + lane = Enum.at(brainstorming.lanes, 0) + current_user_id = Ecto.UUID.generate() + user = Factory.insert!(:user, id: current_user_id) + + idea = + Factory.insert!(:idea, %{ + brainstorming: brainstorming, + lane: lane, + user_id: current_user_id + }) + + comment = + Factory.insert!(:comment, %{ + idea: idea, + user_id: current_user_id, + body: "a test comment" + }) + + moderating_user = Factory.insert!(:user) + Brainstormings.add_moderating_user(brainstorming, moderating_user) + + new_user = Factory.insert!(:user) + + %{ + brainstorming: brainstorming, + current_user_id: current_user_id, + conn: conn |> init_test_session(%{current_user_id: current_user_id}), + idea: idea, + user: user, + moderating_user: moderating_user, + new_user: new_user, + lane: lane, + comment: comment + } + end + + test "contains button for showing details of an idea", %{ + conn: conn, + brainstorming: brainstorming + } do + {:ok, show_live_view, _html} = live(conn, ~p"/brainstormings/#{brainstorming.id}") + + assert show_live_view + |> element(html_selector_button_idea_show_link()) + |> has_element? + end + + test "moves to detail page after click", %{ + conn: conn, + brainstorming: brainstorming, + idea: idea + } do + {:ok, show_live_view, _html} = + live(conn, ~p"/brainstormings/#{brainstorming.id}") + + assert show_live_view + |> element(html_selector_button_idea_show_link()) + |> render_click() + + assert show_live_view + |> assert_patched(~p"/brainstormings/#{brainstorming.id}/ideas/#{idea.id}") + end + + test "shows an existing comment", %{ + conn: conn, + brainstorming: brainstorming, + idea: idea + } do + {:ok, _show_live_view, html} = + live(conn, ~p"/brainstormings/#{brainstorming.id}/ideas/#{idea.id}") + + assert html =~ "a test comment" + end + + test "add a new comment", %{ + conn: conn, + brainstorming: brainstorming, + idea: idea + } do + {:ok, show_live_view, _html} = + live(conn, ~p"/brainstormings/#{brainstorming.id}/ideas/#{idea.id}") + + assert show_live_view + |> form("#comment-form-new", comment: %{body: "new comment"}) + |> render_submit() + + html = render(show_live_view) + assert html =~ "new comment" + end + + test "shows delete button", %{ + conn: conn, + brainstorming: brainstorming, + idea: idea + } do + {:ok, show_live_view, _html} = + conn + |> live(~p"/brainstormings/#{brainstorming.id}/ideas/#{idea.id}") + + assert show_live_view + |> element(html_selector_button_delete()) + |> has_element? + end + + test "pressing delete removes comment", %{ + conn: conn, + brainstorming: brainstorming, + idea: idea + } do + {:ok, show_live_view, _html} = + conn + |> live(~p"/brainstormings/#{brainstorming.id}/ideas/#{idea.id}") + + assert show_live_view + |> element(html_selector_button_delete()) + |> render_click() + + refute show_live_view + |> element(html_selector_button_delete()) + |> has_element? + end + + test "shows the delete button for moderating user", %{ + conn: conn, + brainstorming: brainstorming, + idea: idea, + moderating_user: moderating_user + } do + {:ok, show_live_view, _html} = + conn + |> init_test_session(%{current_user_id: moderating_user.id}) + |> live(~p"/brainstormings/#{brainstorming.id}/ideas/#{idea.id}") + + assert show_live_view + |> element(html_selector_button_delete()) + |> has_element? + end + + test "does not show delete button for other users", %{ + conn: conn, + brainstorming: brainstorming, + idea: idea, + new_user: new_user + } do + {:ok, show_live_view, _html} = + conn + |> init_test_session(%{current_user_id: new_user.id}) + |> live(~p"/brainstormings/#{brainstorming.id}/ideas/#{idea.id}") + + refute show_live_view + |> element(html_selector_button_delete()) + |> has_element? + end + + test "shows edit button", %{ + conn: conn, + brainstorming: brainstorming, + idea: idea + } do + {:ok, show_live_view, _html} = + conn + |> live(~p"/brainstormings/#{brainstorming.id}/ideas/#{idea.id}") + + assert show_live_view + |> element(html_selector_button_edit()) + |> has_element? + end + + test "shows the edit button for moderating user", %{ + conn: conn, + brainstorming: brainstorming, + idea: idea, + moderating_user: moderating_user + } do + {:ok, show_live_view, _html} = + conn + |> init_test_session(%{current_user_id: moderating_user.id}) + |> live(~p"/brainstormings/#{brainstorming.id}/ideas/#{idea.id}") + + assert show_live_view + |> element(html_selector_button_edit()) + |> has_element? + end + + test "editing a comment", %{ + conn: conn, + brainstorming: brainstorming, + idea: idea, + comment: comment + } do + {:ok, show_live_view, _html} = + conn + |> live(~p"/brainstormings/#{brainstorming.id}/ideas/#{idea.id}") + + assert show_live_view + |> element(html_selector_button_edit()) + |> render_click() + + assert show_live_view + |> form("#comment-form-#{comment.id}", comment: %{body: "edited comment"}) + |> render_submit() + + html = render(show_live_view) + assert html =~ "edited comment" + end + + test "does not show edit button for other users", %{ + conn: conn, + brainstorming: brainstorming, + idea: idea, + new_user: new_user + } do + {:ok, show_live_view, _html} = + conn + |> init_test_session(%{current_user_id: new_user.id}) + |> live(~p"/brainstormings/#{brainstorming.id}/ideas/#{idea.id}") + + refute show_live_view + |> element(html_selector_button_edit()) + |> has_element? + end + + defp html_selector_button_idea_show_link() do + ".card-body-mindwendel-idea > a:nth-child(3)" + end + + defp html_selector_button_delete() do + "a[@phx-click='delete_comment']" + end + + defp html_selector_button_edit() do + "a[@phx-click='edit_comment']" + end +end diff --git a/test/mindwendel_web/live/brainstorming_live_test.exs b/test/mindwendel_web/live/brainstorming_live_test.exs index b385b395..f41ee26d 100644 --- a/test/mindwendel_web/live/brainstorming_live_test.exs +++ b/test/mindwendel_web/live/brainstorming_live_test.exs @@ -331,7 +331,7 @@ defmodule MindwendelWeb.BrainstormingLiveTest do lane: lane } do {:ok, _show_live, html} = - live(conn, ~p"/brainstormings/#{brainstorming.id}/show/lanes/#{lane.id}/new_idea") + live(conn, ~p"/brainstormings/#{brainstorming.id}/lanes/#{lane.id}/new_idea") assert html =~ "Anonymous" end @@ -342,14 +342,14 @@ defmodule MindwendelWeb.BrainstormingLiveTest do lane: lane } do {:ok, show_live_view, _html} = - live(conn, ~p"/brainstormings/#{brainstorming.id}/show/lanes/#{lane.id}/new_idea") + live(conn, ~p"/brainstormings/#{brainstorming.id}/lanes/#{lane.id}/new_idea") assert show_live_view |> form("#idea-form", idea: %{username: "I am new", body: "test"}) |> render_submit() {:ok, _show_live_view, html} = - live(conn, ~p"/brainstormings/#{brainstorming.id}/show/lanes/#{lane.id}/new_idea") + live(conn, ~p"/brainstormings/#{brainstorming.id}/lanes/#{lane.id}/new_idea") assert html =~ "I am new" end diff --git a/test/support/factory.ex b/test/support/factory.ex index 68b13e59..1b42926e 100644 --- a/test/support/factory.ex +++ b/test/support/factory.ex @@ -6,6 +6,7 @@ defmodule Mindwendel.Factory do alias Mindwendel.Brainstormings.IdeaLabel alias Mindwendel.Brainstormings.IdeaIdeaLabel alias Mindwendel.Brainstormings.Like + alias Mindwendel.Brainstormings.Comment alias Mindwendel.Attachments.Link alias Mindwendel.Attachments.File alias Mindwendel.Accounts.User @@ -64,6 +65,10 @@ defmodule Mindwendel.Factory do %Lane{} end + def build(:comment) do + %Comment{} + end + def build(:brainstorming, :with_users) do %Brainstorming{ name: "How to brainstorm ideas?",