<%= for attr <- @unset_attrs do %>
<.link
@@ -1561,7 +1561,7 @@ defmodule PlatformWeb.Components do
~H"""
-
+
<%= @attr.label %>
<%= if Platform.Material.Attribute.requires_privileges_to_edit(@attr) do %>
diff --git a/platform/lib/platform_web/live/media_live/index.ex b/platform/lib/platform_web/live/media_live/index.ex
index e3535d7c8..b2417686d 100644
--- a/platform/lib/platform_web/live/media_live/index.ex
+++ b/platform/lib/platform_web/live/media_live/index.ex
@@ -98,10 +98,7 @@ defmodule PlatformWeb.MediaLive.Index do
:user_projects,
Platform.Projects.list_projects_for_user(socket.assigns.current_user)
)
- |> assign(
- :attributes,
- Attribute.active_attributes(project: active_project) |> Enum.filter(&is_nil(&1.parent))
- )
+ |> assign_attributes(active_project)
|> then(fn s ->
if display == "table",
do:
@@ -118,17 +115,57 @@ defmodule PlatformWeb.MediaLive.Index do
end)
end
+ def assign_attributes(socket, project) do
+ attributes = Attribute.active_attributes(project: project) |> Enum.filter(&is_nil(&1.parent))
+
+ groups =
+ case dbg(project) do
+ nil -> [:core]
+ _ -> project.attribute_groups
+ end
+
+ attributes_with_groups =
+ Enum.map(attributes, fn a ->
+ member_of = Enum.find(groups, &(not is_atom(&1) and Enum.member?(&1.member_ids, a.name)))
+
+ group =
+ cond do
+ not is_nil(member_of) -> member_of
+ is_atom(a.name) -> :core
+ true -> :unassigned
+ end
+
+ {a, group}
+ end)
+
+ # Sort by group ordering, then attribute ordering
+ attributes_with_groups =
+ Enum.sort_by(attributes_with_groups, fn {_, g} ->
+ {if(is_atom(dbg(g)), do: -1, else: g.ordering)}
+ end)
+
+ socket
+ |> assign(
+ :attributes,
+ attributes
+ )
+ |> assign(
+ :attributes_with_groups,
+ attributes_with_groups
+ )
+ end
+
def handle_params(params, _uri, socket) do
# Wrap and catch CastErrors, in which case we put a flash and redirect to /incidents
- try do
- {:noreply, handle_params_internal(params, socket)}
- rescue
- _error ->
- {:noreply,
- socket
- |> put_flash(:error, "Your search had invalid parameters. Please try again.")
- |> push_patch(to: "/incidents", replace: true)}
- end
+ # try do
+ {:noreply, handle_params_internal(params, socket)}
+ # rescue
+ # _error ->
+ # {:noreply,
+ # socket
+ # |> put_flash(:error, "Your search had invalid parameters. Please try again.")
+ # |> push_patch(to: "/incidents", replace: true)}
+ # end
end
defp assign_media(socket, media) do
diff --git a/platform/lib/platform_web/live/media_live/index.html.heex b/platform/lib/platform_web/live/media_live/index.html.heex
index 4abc3d5cd..98b9850b4 100644
--- a/platform/lib/platform_web/live/media_live/index.html.heex
+++ b/platform/lib/platform_web/live/media_live/index.html.heex
@@ -375,10 +375,15 @@
>
Incident
- <%= for attr <- @attributes do %>
+ <%= for {attr, group} <- @attributes_with_groups do %>
<%= attr.label %>
@@ -531,7 +536,7 @@
- <%= for attr <- @attributes do %>
+ <%= for {attr, group} <- @attributes_with_groups do %>
namespace, "version" => version_id} = _params,
+ socket
+ ) do
+ version = Material.get_media_version!(version_id)
+
+ if version.media_id != socket.assigns.media.id or
+ not Permissions.can_edit_media?(socket.assigns.current_user, socket.assigns.media) do
+ raise PlatformWeb.Errors.Unauthorized, "No permission"
+ end
+
+ updated_metadata = Map.drop(version.metadata || %{}, [namespace])
+
+ {:ok, _} = Material.update_media_version(version, %{metadata: updated_metadata})
+
+ {:noreply,
+ socket
+ |> assign_media_and_updates()
+ |> put_flash(:info, "Metadata cleared successfully.")}
+ end
+
def handle_event(
"set_media_visibility",
%{"version" => version, "state" => value} = _params,
diff --git a/platform/lib/platform_web/live/media_live/show.html.heex b/platform/lib/platform_web/live/media_live/show.html.heex
index 00d7df35f..9c7a99684 100644
--- a/platform/lib/platform_web/live/media_live/show.html.heex
+++ b/platform/lib/platform_web/live/media_live/show.html.heex
@@ -8,35 +8,7 @@
if Platform.Material.Media.is_sensitive(@media),
do: " (#{Enum.join(@media.attr_sensitive, ", ")})",
else: "" %>
- pulse = false, 500)"}
- >
- <%= Media.slug_to_display(@media) %>
-
- <% title_classes =
- "text-xl font-medium leading-7 text-neutral-700 sm:text-3xl block transition p-1 rounded " <>
- if @media.deleted, do: "line-through ", else: "" %>
- <%= if(
- Permissions.can_edit_media?(@current_user, @media, Attribute.get_attribute(:description))
- ) do %>
- <.link
- class={title_classes <> " hover:bg-neutral-200 focus:bg-neutral-200"}
- patch={Routes.media_show_path(@socket, :edit, @media.slug, :description)}
- data-tooltip="Edit description"
- replace={true}
- >
- <%= @media.attr_description %>
-
- <% else %>
-
- <%= @media.attr_description %>
-
- <% end %>
-
+
<%= if @media.attr_status do %>
<.link
class={"chip @high inline-block mt-2 flex gap-1 " <> Attribute.attr_color(:status, @media.attr_status)}
@@ -46,7 +18,7 @@
<.attribute_icon
name={:status}
value={@media.attr_status}
- class="h-4 w-4"
+ class="h-4 w-4 opacity-75"
type={:solid}
/>
<%= @media.attr_status %>
@@ -61,7 +33,7 @@
>
@@ -79,7 +51,7 @@
@@ -93,6 +65,37 @@
<% end %>
+
+ pulse = false, 500)"}
+ >
+ <%= Media.slug_to_display(@media) %>
+
+ <% title_classes =
+ "text-xl font-medium leading-7 text-neutral-700 sm:text-2xl transition p-1 -m-1 rounded " <>
+ if @media.deleted, do: "line-through ", else: "" %>
+ <%= if(
+ Permissions.can_edit_media?(@current_user, @media, Attribute.get_attribute(:description))
+ ) do %>
+
+ <.link
+ class={title_classes <> " hover:bg-neutral-200 focus:bg-neutral-200"}
+ patch={Routes.media_show_path(@socket, :edit, @media.slug, :description)}
+ data-tooltip="Edit description"
+ replace={true}
+ >
+ <%= @media.attr_description %>
+
+ <% else %>
+
+ <%= @media.attr_description %>
+
+ <% end %>
+
<.live_component
@@ -222,25 +225,61 @@
- <.card>
+ <.card no_pad={true} class="overflow-hidden">
<:header>
Attributes
-
- <.attr_display_block
- set_attrs={
- Attribute.set_for_media(@media, pane: :attributes, project: @media.project)
- }
- unset_attrs={
- Attribute.unset_for_media(@media, pane: :attributes, project: @media.project)
- |> filter_editable(@media, @current_user)
- }
- media={@media}
- updates={@updates}
- socket={@socket}
- current_user={@current_user}
- membership={@membership}
- />
+
+
+
+
+
+
+ <%= group.name %>
+
+
+
+ <%= group.description %>
+
+
+ <.attr_display_block
+ set_attrs={
+ Attribute.set_for_media(@media,
+ pane: :attributes,
+ project: @media.project,
+ groups:
+ if(group == :core_and_unassigned, do: [:core, :unassigned], else: [group])
+ )
+ }
+ unset_attrs={
+ Attribute.unset_for_media(@media,
+ pane: :attributes,
+ project: @media.project,
+ groups:
+ if(group == :core_and_unassigned, do: [:core, :unassigned], else: [group])
+ )
+ |> filter_editable(@media, @current_user)
+ }
+ media={@media}
+ updates={@updates}
+ socket={@socket}
+ current_user={@current_user}
+ membership={@membership}
+ />
+
<.card>
@@ -761,6 +800,40 @@
<% end %>
+
+
+ View and manage metadata
+
+
+
+ Source material metadata is an advanced feature, and most users don't need to use it. Some metadata is set automatically by Atlos (e.g., "auto_archive_successful" and "content_info") while others are set by integrations.
+
+
+
+
+
+
+ <%= namespace %>
+
+
+ Clear
+
+
<%= Jason.encode!(version.metadata[namespace], pretty: true) |> String.trim(" \t\n") %>
+
+
+
Atlos provides best-effort archival. Archives may be incomplete or missing, and should not be relied on for legal evidence.
diff --git a/platform/lib/platform_web/live/new_live/new_component.ex b/platform/lib/platform_web/live/new_live/new_component.ex
index 13c9a8604..6c2016324 100644
--- a/platform/lib/platform_web/live/new_live/new_component.ex
+++ b/platform/lib/platform_web/live/new_live/new_component.ex
@@ -353,19 +353,44 @@ defmodule PlatformWeb.NewLive.NewComponent do
<% end %>
<%= if not is_nil(@project) and not Enum.empty?(@project.attributes) do %>
-
-
- <.edit_attributes
- attrs={@project_attributes |> Enum.filter(&(&1.is_decorator != true))}
- include_decorators={@project_attributes}
- form={@form}
- media_slug="NEW"
- media={nil}
- optional={true}
- current_user={@current_user}
- project={@project}
- />
-
+
+
+
+ <%= group.name %>
+
+
+ <%= group.description %>
+
+
+ <.edit_attributes
+ attrs={
+ @project_attributes
+ |> Enum.filter(&(&1.is_decorator != true))
+ |> Platform.Material.Attribute.filter_attributes_to_group(
+ group,
+ @project
+ )
+ }
+ include_decorators={@project_attributes}
+ form={@form}
+ media_slug="NEW"
+ media={nil}
+ optional={true}
+ current_user={@current_user}
+ project={@project}
+ />
+
+
<% end %>
diff --git a/platform/lib/platform_web/live/projects_live/edit_component.ex b/platform/lib/platform_web/live/projects_live/edit_component.ex
index 27f33a4e6..b28725443 100644
--- a/platform/lib/platform_web/live/projects_live/edit_component.ex
+++ b/platform/lib/platform_web/live/projects_live/edit_component.ex
@@ -1,7 +1,7 @@
defmodule PlatformWeb.ProjectsLive.EditComponent do
use PlatformWeb, :live_component
- alias Platform.Projects.ProjectAttribute
+ alias Platform.Projects.{ProjectAttribute, ProjectAttributeGroup}
alias Platform.Auditor
alias Platform.Projects
alias Platform.Permissions
@@ -22,8 +22,7 @@ defmodule PlatformWeb.ProjectsLive.EditComponent do
{:ok,
socket
- # Either nil, :new, :decorators, or a UUID
- |> assign(:actively_editing_id, nil)
+ |> close_modal()
|> assign_new(:general_changeset, fn ->
Projects.change_project(socket.assigns.project)
end)
@@ -36,6 +35,12 @@ defmodule PlatformWeb.ProjectsLive.EditComponent do
|> assign_new(:show_panes, fn -> [:general, :custom_attributes] end)}
end
+ defp close_modal(socket) do
+ socket
+ |> assign(:actively_editing_attribute_id, nil)
+ |> assign(:actively_editing_group_id, nil)
+ end
+
def assign_general_changeset(socket, attrs \\ %{}) do
socket
|> assign(
@@ -123,7 +128,8 @@ defmodule PlatformWeb.ProjectsLive.EditComponent do
) do
{:ok, project} ->
send(self(), {:project_saved, project})
- {:noreply, socket |> assign(project: project) |> assign(:actively_editing_id, nil)}
+
+ {:noreply, socket |> assign(project: project) |> close_modal()}
{:error, changeset} ->
{:noreply,
@@ -145,7 +151,7 @@ defmodule PlatformWeb.ProjectsLive.EditComponent do
{:noreply,
socket
|> assign(project: project)
- |> assign(:actively_editing_id, nil)
+ |> close_modal()
|> assign_custom_attribute_changeset()}
{:error, changeset} ->
@@ -165,7 +171,23 @@ defmodule PlatformWeb.ProjectsLive.EditComponent do
existing ++ [%ProjectAttribute{}]
)
end)
- |> assign(:actively_editing_id, :new)
+ |> assign(:actively_editing_attribute_id, :new)
+
+ {:noreply, socket}
+ end
+
+ def handle_event("add_attr_group", _, socket) do
+ socket =
+ update(socket, :custom_attribute_changeset, fn changeset ->
+ existing = Ecto.Changeset.get_field(changeset, :attribute_groups, [])
+
+ Ecto.Changeset.put_embed(
+ changeset,
+ :attribute_groups,
+ existing ++ [%ProjectAttributeGroup{}]
+ )
+ end)
+ |> assign(:actively_editing_group_id, :new)
{:noreply, socket}
end
@@ -209,7 +231,7 @@ defmodule PlatformWeb.ProjectsLive.EditComponent do
end)
)
end)
- |> assign(:actively_editing_id, :decorators)
+ |> assign(:actively_editing_attribute_id, :decorators)
{:noreply, socket}
end
@@ -224,16 +246,41 @@ defmodule PlatformWeb.ProjectsLive.EditComponent do
{:noreply,
socket
|> assign(:project, project)
- |> assign(:actively_editing_id, nil)
+ |> close_modal()
|> assign_custom_attribute_changeset()}
end
- def handle_event("open_modal", %{"id" => id}, socket) do
- {:noreply, socket |> assign(:actively_editing_id, id)}
+ def handle_event("delete_group", %{"id" => id}, socket) do
+ # Delete the attribute group, save, and close the actively editing modal
+ {:ok, project} =
+ Projects.delete_project_attribute_group(
+ socket.assigns.project,
+ id,
+ socket.assigns.current_user
+ )
+
+ send(self(), {:project_saved, project})
+
+ {:noreply,
+ socket
+ |> assign(:project, project)
+ |> assign(:actively_editing_group_id, nil)
+ |> assign_custom_attribute_changeset()}
+ end
+
+ def handle_event("open_attr_edit_modal", %{"id" => id}, socket) do
+ {:noreply, socket |> assign(:actively_editing_attribute_id, id)}
+ end
+
+ def handle_event("open_group_edit_modal", %{"id" => id}, socket) do
+ {:noreply, socket |> assign(:actively_editing_group_id, id)}
end
def handle_event("close_modal", _params, socket) do
- {:noreply, socket |> assign(:actively_editing_id, nil) |> assign_custom_attribute_changeset()}
+ {:noreply,
+ socket
+ |> close_modal()
+ |> assign_custom_attribute_changeset()}
end
def type_mapping,
@@ -249,6 +296,89 @@ defmodule PlatformWeb.ProjectsLive.EditComponent do
# Invert type_mapping
do: type_mapping() |> Enum.map(fn {k, v} -> {v, k} end) |> Enum.into(%{})
+ def handle_event("reposition", params, socket) do
+ # Ensure we have the latest project
+ project = Platform.Projects.get_project!(socket.assigns.project.id)
+
+ # Called when dragging an attribute to a new position
+ %{"group" => group_id, "ordering" => ordering} = params
+
+ case group_id do
+ "group_ordering" ->
+ # Reorder groups
+ groups =
+ Enum.map(project.attribute_groups, fn g ->
+ idx =
+ case g do
+ %ProjectAttributeGroup{} -> Enum.find_index(ordering, &(&1 == g.id)) || 0
+ _ -> 0
+ end
+
+ %{g | ordering: idx}
+ end)
+ |> Enum.sort_by(& &1.ordering)
+ |> Enum.map(fn g -> Map.from_struct(g) end)
+
+ # Update the project with the new groups
+ {:ok, project} =
+ Projects.update_project(
+ project,
+ %{attribute_groups: groups},
+ socket.assigns.current_user
+ )
+
+ send(self(), {:project_saved, project})
+
+ {:noreply, socket |> assign(project: project) |> assign_custom_attribute_changeset()}
+
+ # For all the groups, if the group is the one we want to edit, update the ordering; if it's not, make sure that the none of the elements in the ordering are in that group
+ _ ->
+ new_groups =
+ Enum.map(project.attribute_groups, fn g ->
+ g =
+ if g.id == group_id do
+ %{g | member_ids: ordering}
+ else
+ %{
+ g
+ | member_ids: Enum.reject(g.member_ids, fn id -> Enum.member?(ordering, id) end)
+ }
+ end
+
+ Map.from_struct(g)
+ end)
+
+ # Reorder the embedded attributes given their order in their respective
+ # groups. This is also what allows us to sort unassigned attributes.
+ new_attributes =
+ Enum.map(project.attributes, fn e ->
+ idx =
+ case Enum.find(new_groups, &Enum.member?(&1.member_ids, e.id)) do
+ # We can't find them in a group, so we check the given ordering
+ # (which allows reordering if the attribute is in the unassigned
+ # group)
+ nil -> Enum.find_index(ordering, &(&1 == e.id)) || -1
+ group -> Enum.find_index(group.member_ids, &(&1 == e.id)) || -1
+ end
+
+ Map.from_struct(%{e | ordering: idx})
+ end)
+ |> Enum.sort_by(& &1.ordering)
+
+ # Update the project with the new groups
+ {:ok, project} =
+ Projects.update_project(
+ socket.assigns.project,
+ %{attribute_groups: new_groups, attributes: new_attributes},
+ socket.assigns.current_user
+ )
+
+ send(self(), {:project_saved, project})
+
+ {:noreply, socket |> assign(project: project) |> assign_custom_attribute_changeset()}
+ end
+ end
+
def edit_custom_project_attribute(assigns) do
# The attribute this is a decorator for
assigns =
@@ -313,7 +443,7 @@ defmodule PlatformWeb.ProjectsLive.EditComponent do
key: k,
value: v,
disabled:
- not Enum.member?(
+ not is_nil(Ecto.Changeset.get_field(@f_attr.source, :id)) and not Enum.member?(
ProjectAttribute.compatible_types(Ecto.Changeset.get_field(@f_attr.source, :type)),
v
)
@@ -379,6 +509,85 @@ defmodule PlatformWeb.ProjectsLive.EditComponent do
"""
end
+ def edit_attribute_group(assigns) do
+ ~H"""
+ <%= inputs_for @f, :attribute_groups, [multipart: true, id: "attr-group-form-#{@group_id}"], fn ef -> %>
+ <%= if ef.data.id == @group_id or (is_nil(ef.data.id) and @group_id == :new) do %>
+
+
+ <%= label(ef, :name, class: "!text-neutral-600 !font-normal") %>
+ <%= text_input(ef, :name, class: "my-1") %>
+ <%= error_tag(ef, :name) %>
+
+
+ <%= label(ef, :description, class: "!text-neutral-600 !font-normal") %>
+ <%= text_input(ef, :description, class: "my-1") %>
+ <%= error_tag(ef, :description) %>
+
+ Optional. The description will be displayed with this attribute group to provide additional context.
+
+
+
+ <%= label(ef, :color, class: "!text-neutral-600 !font-normal") %>
+
+
+ <%= for color <- ["#808080", "#fb923c", "#fbbf24", "#a3e635", "#4ade80", "#2dd4bf", "#22d3ee", "#60a5fa", "#818cf8", "#a78bfa", "#c084fc", "#e879f9", "#f472b6"] do %>
+
+ <%= radio_button(ef, :color, color,
+ "x-model": "active",
+ class: "hidden"
+ ) %>
+
+
+
+ <% end %>
+
+
+ <%= error_tag(ef, :color) %>
+
+ This color will help visually identify the attribute group.
+
+
+
+
+ <%= checkbox(ef, :show_in_creation_form) %>
+ <%= label(ef, :show_in_creation_form, class: "!text-neutral-600 !font-normal") do %>
+ Include this group in the incident creation window
+ <% end %>
+
+
+ If enabled, the attributes in this group are included in the incident creation window. If disabled, the group's attributes aren't shown in the incident creation window but can still be edited directly on the incident page.
+
+ <%= error_tag(ef, :show_in_creation_form) %>
+
+
@@ -389,36 +598,44 @@ defmodule PlatformWeb.ProjectsLive.EditComponent do
def attribute_table_row(assigns) do
~H"""
-
- <%= @attr.label %>
-
-
- <%= @attr.type
- |> then(&Map.get(name_mapping(), &1)) %>
-
-
- <%= @attr.description |> Platform.Utils.truncate(40) %>
-
-
- <%= if @attr.schema_field == :project_attributes do %>
-
- Edit <%= @attr.label %>
-
- <% else %>
-
+
+
+ <%= @attr.label %>
+