<%= @title %>
- <.spacing value="XS" />
+ <.spacing value="S" />
<.live_component
module={Selector}
id={:template_selector}
diff --git a/core/systems/project/item_form.ex b/core/systems/project/item_form.ex
new file mode 100644
index 000000000..d15e249c7
--- /dev/null
+++ b/core/systems/project/item_form.ex
@@ -0,0 +1,77 @@
+defmodule Systems.Project.ItemForm do
+ use CoreWeb.LiveForm
+
+ alias Systems.{
+ Project
+ }
+
+ # Handle initial update
+ @impl true
+ def update(
+ %{id: id, entity: item, target: target},
+ socket
+ ) do
+ changeset = Project.ItemModel.changeset(item, %{})
+
+ close_button = %{
+ action: %{type: :send, event: "close"},
+ face: %{type: :icon, icon: :close}
+ }
+
+ {
+ :ok,
+ socket
+ |> assign(
+ id: id,
+ entity: item,
+ target: target,
+ close_button: close_button,
+ changeset: changeset
+ )
+ }
+ end
+
+ # Handle Events
+ @impl true
+ def handle_event("close", _params, socket) do
+ send(self(), %{module: __MODULE__, action: :close})
+ {:noreply, socket}
+ end
+
+ @impl true
+ def handle_event("save", %{"item_model" => attrs}, %{assigns: %{entity: entity}} = socket) do
+ {
+ :noreply,
+ socket
+ |> save(entity, attrs)
+ }
+ end
+
+ # Saving
+
+ def save(socket, entity, attrs) do
+ changeset = Project.ItemModel.changeset(entity, attrs)
+
+ socket
+ |> save(changeset)
+ end
+
+ @impl true
+ def render(assigns) do
+ ~H"""
+
+
+
+ <%= dgettext("eyra-project", "item.form.title") %>
+
+
+
+
+
+ <.form id={@id} :let={form} for={@changeset} phx-change="save" phx-target={@myself} >
+ <.text_input form={form} field={:name} label_text={dgettext("eyra-project", "item.form.name.label")} />
+
+
+ """
+ end
+end
diff --git a/core/systems/project/item_model.ex b/core/systems/project/item_model.ex
index 23310d9c6..508456745 100644
--- a/core/systems/project/item_model.ex
+++ b/core/systems/project/item_model.ex
@@ -63,6 +63,11 @@ defmodule Systems.Project.ItemModel do
tags = get_card_tags(tool)
path = ~p"/project/item/#{id}/content"
+ edit = %{
+ action: %{type: :send, event: "edit", item: id},
+ face: %{type: :label, label: "Edit", wrap: true}
+ }
+
delete = %{
action: %{type: :send, event: "delete", item: id},
face: %{type: :icon, icon: :delete}
@@ -76,7 +81,7 @@ defmodule Systems.Project.ItemModel do
title: name,
tags: tags,
info: ["#{subject_count} participants | 0 donations"],
- left_actions: [],
+ left_actions: [edit],
right_actions: [delete]
}
end
@@ -102,6 +107,11 @@ defmodule Systems.Project.ItemModel do
path = ~p"/project/item/#{id}/content"
label = get_label(status)
+ edit = %{
+ action: %{type: :send, event: "edit", item: id},
+ face: %{type: :label, label: "Edit", wrap: true}
+ }
+
delete = %{
action: %{type: :send, event: "delete", item: id},
face: %{type: :icon, icon: :delete}
@@ -127,7 +137,7 @@ defmodule Systems.Project.ItemModel do
title: name,
tags: tags,
info: [info_line_1],
- left_actions: [],
+ left_actions: [edit],
right_actions: [delete]
}
end
diff --git a/core/systems/project/node_page.ex b/core/systems/project/node_page.ex
index 12f2db212..ae19212c9 100644
--- a/core/systems/project/node_page.ex
+++ b/core/systems/project/node_page.ex
@@ -17,7 +17,7 @@ defmodule Systems.Project.NodePage do
{
:ok,
socket
- |> assign(model: model)
+ |> assign(model: model, popup: nil)
|> observe_view_model()
|> update_menus()
}
@@ -27,6 +27,19 @@ defmodule Systems.Project.NodePage do
socket |> update_menus()
end
+ @impl true
+ def handle_event("edit", %{"item" => item_id}, socket) do
+ item = Project.Public.get_item!(String.to_integer(item_id))
+
+ popup = %{
+ module: Project.ItemForm,
+ entity: item,
+ target: self()
+ }
+
+ {:noreply, assign(socket, popup: popup)}
+ end
+
@impl true
def handle_event("delete", %{"item" => item_id}, socket) do
Project.Public.delete_item(String.to_integer(item_id))
@@ -39,6 +52,20 @@ defmodule Systems.Project.NodePage do
}
end
+ @impl true
+ def handle_event("create_item", _params, %{assigns: %{vm: %{node: node}}} = socket) do
+ popup = %{
+ module: Project.CreateItemPopup,
+ target: self(),
+ node: node
+ }
+
+ {
+ :noreply,
+ socket |> assign(popup: popup)
+ }
+ end
+
@impl true
def handle_event(
"card_clicked",
@@ -50,6 +77,25 @@ defmodule Systems.Project.NodePage do
{:noreply, push_redirect(socket, to: path)}
end
+ @impl true
+ def handle_info(%{module: _, action: :close}, socket) do
+ {
+ :noreply,
+ socket
+ |> assign(popup: nil)
+ |> update_view_model()
+ }
+ end
+
+ @impl true
+ def handle_info({:handle_auto_save_done, :node_page_popup}, socket) do
+ {
+ :noreply,
+ socket
+ |> update_view_model()
+ }
+ end
+
@doc """
## Attributes
- vm: Observed view model: title, node_cards, item_cards
@@ -59,6 +105,15 @@ defmodule Systems.Project.NodePage do
def render(assigns) do
~H"""
<.workspace title={@vm.title} menus={@menus}>
+
+ <%= if @popup do %>
+ <.popup>
+
+ <.live_component id={:node_page_popup} module={@popup.module} {@popup} />
+
+
+ <% end %>
+
<%= if Enum.count(@vm.node_cards) > 0 do %>
diff --git a/core/systems/project/node_page_builder.ex b/core/systems/project/node_page_builder.ex
index e174bf9bb..5963052c5 100644
--- a/core/systems/project/node_page_builder.ex
+++ b/core/systems/project/node_page_builder.ex
@@ -33,9 +33,8 @@ defmodule Systems.Project.NodePageBuilder do
end
defp to_item_cards(%{items: items}, assigns) do
- Enum.map(
- items,
- &ViewModelBuilder.view_model(&1, {Project.NodePage, :item_card}, assigns)
- )
+ items
+ |> Enum.sort_by(& &1.inserted_at, {:asc, NaiveDateTime})
+ |> Enum.map(&ViewModelBuilder.view_model(&1, {Project.NodePage, :item_card}, assigns))
end
end
diff --git a/core/test/systems/project/assembly_test.exs b/core/test/systems/project/assembly_test.exs
index b73a8a98d..9e93947d1 100644
--- a/core/test/systems/project/assembly_test.exs
+++ b/core/test/systems/project/assembly_test.exs
@@ -1,11 +1,57 @@
defmodule Systems.Project.AssemblyTest do
use Core.DataCase
- # alias Systems.{
- # Project
- # }
+ alias Systems.{
+ Project
+ }
- test "create_item/2" do
- %{root: _root} = Factories.insert!(:project, %{name: "AAP"})
+ test "create_item/3 create benchmark item" do
+ %{id: project_id, root: %{id: root_id} = root} =
+ Factories.insert!(:project, %{name: "Project"})
+
+ item_name = "Item"
+
+ assert {:ok,
+ %{
+ item: %Systems.Project.ItemModel{
+ name: ^item_name,
+ project_path: [^project_id, ^root_id],
+ node_id: ^root_id,
+ tool_ref: %Systems.Project.ToolRefModel{
+ survey_tool_id: nil,
+ lab_tool_id: nil,
+ data_donation_tool_id: nil,
+ benchmark_tool: %Systems.Benchmark.ToolModel{
+ status: :concept,
+ director: :project
+ }
+ }
+ }
+ }} = Project.Assembly.create_item(item_name, root, :benchmark)
+ end
+
+ test "create_item/3 create data donation item" do
+ %{id: project_id, root: %{id: root_id} = root} =
+ Factories.insert!(:project, %{name: "Project"})
+
+ item_name = "Item"
+
+ assert {:ok,
+ %{
+ item: %Systems.Project.ItemModel{
+ name: ^item_name,
+ project_path: [^project_id, ^root_id],
+ node_id: ^root_id,
+ tool_ref: %Systems.Project.ToolRefModel{
+ survey_tool_id: nil,
+ lab_tool_id: nil,
+ data_donation_tool: %Systems.DataDonation.ToolModel{
+ status: :concept,
+ director: :project
+ },
+ benchmark_tool_id: nil
+ }
+ }
+ }} = Project.Assembly.create_item(item_name, root, :data_donation)
end
end