Skip to content

Commit 97be84f

Browse files
committed
feat: sorted assumptions
1 parent 7336c4c commit 97be84f

File tree

2 files changed

+14
-7
lines changed
  • valentine/lib/valentine_web/live/workspace_live

2 files changed

+14
-7
lines changed

valentine/lib/valentine_web/live/workspace_live/assumption/index.ex

+10-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@ defmodule ValentineWeb.WorkspaceLive.Assumption.Index do
1515
socket
1616
|> assign(:workspace_id, workspace_id)
1717
|> assign(:workspace, workspace)
18-
|> assign(:assumptions, workspace.assumptions)}
18+
|> assign(
19+
:assumptions,
20+
get_sorted_assumptions(workspace)
21+
)}
1922
end
2023

2124
@impl true
@@ -66,7 +69,7 @@ defmodule ValentineWeb.WorkspaceLive.Assumption.Index do
6669

6770
{:noreply,
6871
socket
69-
|> assign(:assumptions, workspace.assumptions)}
72+
|> assign(:assumptions, get_sorted_assumptions(workspace))}
7073
end
7174

7275
@impl true
@@ -85,7 +88,7 @@ defmodule ValentineWeb.WorkspaceLive.Assumption.Index do
8588
|> put_flash(:info, gettext("Assumption deleted successfully"))
8689
|> assign(
8790
:assumptions,
88-
workspace.assumptions
91+
get_sorted_assumptions(workspace)
8992
)}
9093

9194
{:error, _} ->
@@ -94,6 +97,10 @@ defmodule ValentineWeb.WorkspaceLive.Assumption.Index do
9497
end
9598
end
9699

100+
defp get_sorted_assumptions(workspace) do
101+
workspace.assumptions |> Enum.sort(&(&1.numeric_id >= &2.numeric_id))
102+
end
103+
97104
defp get_workspace(id) do
98105
Composer.get_workspace!(id, [:mitigations, :threats, assumptions: [:mitigations, :threats]])
99106
end

valentine/lib/valentine_web/live/workspace_live/mitigation/index.ex

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ defmodule ValentineWeb.WorkspaceLive.Mitigation.Index do
1717
|> assign(:filters, %{})
1818
|> assign(
1919
:mitigations,
20-
get_sorted_mitgations(workspace)
20+
get_sorted_mitigations(workspace)
2121
)}
2222
end
2323

@@ -82,7 +82,7 @@ defmodule ValentineWeb.WorkspaceLive.Mitigation.Index do
8282
|> put_flash(:info, gettext("Mitigation deleted successfully"))
8383
|> assign(
8484
:mitigations,
85-
get_sorted_mitgations(workspace)
85+
get_sorted_mitigations(workspace)
8686
)}
8787

8888
{:error, _} ->
@@ -111,7 +111,7 @@ defmodule ValentineWeb.WorkspaceLive.Mitigation.Index do
111111

112112
{:noreply,
113113
socket
114-
|> assign(:mitigations, get_sorted_mitgations(workspace))}
114+
|> assign(:mitigations, get_sorted_mitigations(workspace))}
115115
end
116116

117117
@impl true
@@ -127,7 +127,7 @@ defmodule ValentineWeb.WorkspaceLive.Mitigation.Index do
127127
}
128128
end
129129

130-
defp get_sorted_mitgations(workspace) do
130+
defp get_sorted_mitigations(workspace) do
131131
workspace.mitigations |> Enum.sort(&(&1.numeric_id >= &2.numeric_id))
132132
end
133133

0 commit comments

Comments
 (0)