shibao/memEx
1
1
Fork 0
Code Issues 5 Pull Requests Projects Releases 16 Wiki Activity

fix table component not sorting structs correctly
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
shibao 2023-03-18 01:35:20 -04:00
parent aa5a1f30f9
commit 7e51d8961a
1 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
lib/memex_web/components/table_component.ex
View File

@ -33,7 +33,8 @@ defmodule MemexWeb.Components.TableComponent do
optional(:class) => String.t(), optional(:class) => String.t(),
optional(:row_class) => String.t(), optional(:row_class) => String.t(),
optional(:alternate_row_class) => String.t(), optional(:alternate_row_class) => String.t(),
optional(:sortable) => false optional(:sortable) => false,
optional(:type) => module()
}), }),
required(:rows) => required(:rows) =>
list(%{ list(%{
@ -60,7 +61,8 @@ defmodule MemexWeb.Components.TableComponent do
:asc :asc
end end
rows = rows |> sort_by_custom_sort_value_or_value(initial_key, initial_sort_mode) type = columns |> Enum.find(%{}, fn %{key: key} -> key == initial_key end) |> Map.get(:type)
rows = rows |> sort_by_custom_sort_value_or_value(initial_key, initial_sort_mode, type)
socket = socket =
socket socket
@ -68,11 +70,12 @@ defmodule MemexWeb.Components.TableComponent do
|> assign( |> assign(
columns: columns, columns: columns,
rows: rows, rows: rows,
key: initial_key,
last_sort_key: initial_key, last_sort_key: initial_key,
sort_mode: initial_sort_mode sort_mode: initial_sort_mode
) )
|> assign_new(:row_class, fn -> "bg-primary-900" end) |> assign_new(:row_class, fn -> "bg-white" end)
|> assign_new(:alternate_row_class, fn -> "bg-primary-900" end) |> assign_new(:alternate_row_class, fn -> "bg-gray-200" end)
{:ok, socket} {:ok, socket}
end end
@ -81,7 +84,14 @@ defmodule MemexWeb.Components.TableComponent do
def handle_event( def handle_event(
"sort_by", "sort_by",
%{"sort-key" => key}, %{"sort-key" => key},
%{assigns: %{rows: rows, last_sort_key: last_sort_key, sort_mode: sort_mode}} = socket %{
assigns: %{
columns: columns,
rows: rows,
last_sort_key: last_sort_key,
sort_mode: sort_mode
}
} = socket
) do ) do
key = key |> String.to_existing_atom() key = key |> String.to_existing_atom()
@ -92,11 +102,28 @@ defmodule MemexWeb.Components.TableComponent do
{_new_sort_key, _last_sort_mode} -> :asc {_new_sort_key, _last_sort_mode} -> :asc
end end
rows = rows |> sort_by_custom_sort_value_or_value(key, sort_mode) type =
columns |> Enum.find(%{}, fn %{key: column_key} -> column_key == key end) |> Map.get(:type)
rows = rows |> sort_by_custom_sort_value_or_value(key, sort_mode, type)
{:noreply, socket |> assign(last_sort_key: key, sort_mode: sort_mode, rows: rows)} {:noreply, socket |> assign(last_sort_key: key, sort_mode: sort_mode, rows: rows)}
end end
defp sort_by_custom_sort_value_or_value(rows, key, sort_mode) do defp sort_by_custom_sort_value_or_value(rows, key, sort_mode, type)
when type in [Date, DateTime] do
rows
|> Enum.sort_by(
fn row ->
case row |> Map.get(key) do
{custom_sort_key, _value} -> custom_sort_key
value -> value
end
end,
{sort_mode, type}
)
end
defp sort_by_custom_sort_value_or_value(rows, key, sort_mode, _type) do
rows rows
|> Enum.sort_by( |> Enum.sort_by(
fn row -> fn row ->