-
-
<%= translated("Git Log") %>
-
<%= translated("Working tree integration is not wired yet in the shell, but the tab is selectable and ready for command output.") %>
+ <%= if Enum.empty?(@git_entries) do %>
+
+
+ <%= translated("Git Log") %>
+ <%= translated("No git history yet") %>
+
-
+ <% else %>
+
+ <%= for entry <- @git_entries do %>
+
+ <%= short_commit_hash(entry.hash) %> <%= entry.subject || translated("No commit subject") %>
+ <%= entry.hash %>
+
+ <% end %>
+
+ <% end %>
"""
end
@@ -399,7 +807,7 @@ defmodule BDS.Desktop.ShellLive do
"""
end
- defp translated(text, bindings \\ %{}), do: ShellData.translate(text, bindings)
+ defp translated(text, bindings \\ %{}), do: ShellData.translate(text, bindings, Process.get(:bds_ui_locale))
defp panel_tab_label(:tasks), do: translated("Tasks")
defp panel_tab_label(:output), do: translated("Output")
@@ -418,6 +826,8 @@ defmodule BDS.Desktop.ShellLive do
defp sidebar_header_label(label), do: translated(label)
+ defp present?(value), do: value not in [nil, ""]
+
defp timeline_height(entry, entries) do
max_count =
entries
@@ -511,6 +921,261 @@ defmodule BDS.Desktop.ShellLive do
|> reload_shell(workbench)
end
+ defp merge_sidebar_ui_state(socket, view_id, sidebar_data) do
+ filters = Map.get(sidebar_data, :filters)
+
+ if is_map(filters) and Map.get(filters, :enabled) do
+ filter_panel_visible = Map.get(socket.assigns.sidebar_filter_panels, view_id, true)
+ Map.put(sidebar_data, :filters, Map.put(filters, :filter_panel_visible, filter_panel_visible))
+ else
+ sidebar_data
+ end
+ end
+
+ defp current_sidebar_filters(socket, view_id) do
+ socket.assigns.sidebar_filters_by_view
+ |> Map.get(view_id, %{})
+ |> normalize_sidebar_filters(socket.assigns[:sidebar_data])
+ end
+
+ defp normalize_sidebar_filters(filters, sidebar_data) do
+ max_items = sidebar_page_size(sidebar_data)
+
+ %{
+ search: normalize_filter_string(Map.get(filters, :search)),
+ year: Map.get(filters, :year),
+ month: Map.get(filters, :month),
+ tags: Map.get(filters, :tags, []),
+ categories: Map.get(filters, :categories, []),
+ display_limit: max(Map.get(filters, :display_limit, max_items) || max_items, max_items)
+ }
+ end
+
+ defp put_sidebar_filters(socket, updater) do
+ view_id = Atom.to_string(socket.assigns.workbench.active_view)
+ filters = current_sidebar_filters(socket, view_id) |> updater.() |> normalize_sidebar_filters(socket.assigns.sidebar_data)
+ assign(socket, :sidebar_filters_by_view, Map.put(socket.assigns.sidebar_filters_by_view, view_id, filters))
+ end
+
+ defp toggle_filter_value(filters, key, value) do
+ values = Map.get(filters, key, [])
+
+ next_values =
+ if value in values do
+ List.delete(values, value)
+ else
+ values ++ [value]
+ end
+
+ Map.put(filters, key, next_values)
+ end
+
+ defp normalize_filter_string(nil), do: nil
+
+ defp normalize_filter_string(value) do
+ value
+ |> to_string()
+ |> String.trim()
+ |> case do
+ "" -> nil
+ trimmed -> trimmed
+ end
+ end
+
+ defp parse_optional_integer(nil), do: nil
+ defp parse_optional_integer(value) when is_integer(value), do: value
+
+ defp parse_optional_integer(value) when is_binary(value) do
+ case Integer.parse(value) do
+ {parsed, _rest} -> parsed
+ :error -> nil
+ end
+ end
+
+ defp sidebar_page_size(nil), do: 500
+
+ defp sidebar_page_size(sidebar_data) do
+ sidebar_data
+ |> Map.get(:filters, %{})
+ |> Map.get(:max_items, 500)
+ end
+
+ defp set_page_language(socket, language) do
+ codes = Enum.map(socket.assigns[:supported_ui_languages] || ShellData.supported_ui_languages(), & &1.code)
+
+ normalized =
+ language
+ |> to_string()
+ |> String.trim()
+ |> case do
+ value -> if(value in codes, do: value, else: socket.assigns.page_language)
+ end
+
+ if normalized == socket.assigns.page_language do
+ socket
+ else
+ socket
+ |> assign(:page_language, normalized)
+ |> reload_shell(socket.assigns.workbench)
+ end
+ end
+
+ defp activate_project(socket, project_id, title, message_fun) do
+ cond do
+ project_id == socket.assigns.projects.active_project_id -> assign(socket, :project_menu_open, false)
+ true ->
+ case Projects.set_active_project(project_id) do
+ {:ok, project} ->
+ socket
+ |> assign(:project_menu_open, false)
+ |> assign(:sidebar_filters_by_view, %{})
+ |> append_output_entry(title, message_fun.(project))
+ |> reload_shell(Workbench.clear_tabs(socket.assigns.workbench))
+
+ {:error, reason} ->
+ socket
+ |> assign(:project_menu_open, false)
+ |> append_output_entry(title, inspect(reason), nil, "error")
+ end
+ end
+ end
+
+ defp append_output_entry(socket, title, message, details \\ nil, level \\ "info") do
+ entry = %{title: title, message: message, details: details, level: level}
+ entries = [entry | socket.assigns.output_entries] |> Enum.take(@output_entry_limit)
+ assign(socket, :output_entries, entries)
+ end
+
+ defp next_project_name(projects) do
+ existing_names = MapSet.new(Enum.map(projects, & &1.name))
+
+ Stream.iterate(1, &(&1 + 1))
+ |> Enum.find_value(fn index ->
+ candidate = if index == 1, do: @default_new_project_name, else: "#{@default_new_project_name} #{index}"
+ if MapSet.member?(existing_names, candidate), do: nil, else: candidate
+ end)
+ end
+
+ defp handle_native_menu_action(socket, action) do
+ with action_atom when not is_nil(action_atom) <- safe_existing_atom(action) do
+ if MapSet.member?(@local_menu_actions, action_atom) do
+ reload_shell(socket, MenuBar.execute(socket.assigns.workbench, action_atom))
+ else
+ apply_shell_command(socket, action)
+ end
+ else
+ _other -> append_output_entry(socket, "Menu", "Unsupported shell command", action, "error")
+ end
+ end
+
+ defp safe_existing_atom(action) when is_binary(action) do
+ String.to_existing_atom(action)
+ rescue
+ ArgumentError -> nil
+ end
+
+ defp apply_shell_command(socket, action) do
+ case ShellCommands.execute(action) do
+ {:ok, result} -> apply_shell_command_result(socket, result)
+ {:error, %{message: message}} -> append_output_entry(socket, command_title(action), message, nil, "error")
+ {:error, reason} -> append_output_entry(socket, command_title(action), inspect(reason), nil, "error")
+ end
+ end
+
+ defp apply_shell_command_result(socket, %{kind: "task_queued", title: title, message: message, panel_tab: panel_tab}) do
+ workbench =
+ socket.assigns.workbench
+ |> Workbench.set_panel_visible(true)
+ |> Workbench.set_panel_tab(String.to_existing_atom(panel_tab))
+
+ socket
+ |> append_output_entry(title, message)
+ |> reload_shell(workbench)
+ end
+
+ defp apply_shell_command_result(socket, %{kind: "output", title: title, message: message} = result) do
+ socket
+ |> append_output_entry(title, message, Map.get(result, :details), Map.get(result, :level, "info"))
+ end
+
+ defp apply_shell_command_result(socket, %{kind: "open_url", title: title, message: message, url: url}) do
+ append_output_entry(socket, title, message, url)
+ end
+
+ defp apply_shell_command_result(socket, %{kind: "open_editor", route: route, title: title, subtitle: subtitle}) do
+ route_atom = String.to_existing_atom(route)
+ tab_id = tab_id_for_route(route_atom, route)
+ workbench = Workbench.open_tab(socket.assigns.workbench, route_atom, tab_id, :pin)
+ tab_meta = Map.put(socket.assigns.tab_meta, {route_atom, tab_id}, %{title: title, subtitle: subtitle})
+
+ socket
+ |> assign(:tab_meta, tab_meta)
+ |> reload_shell(workbench)
+ end
+
+ defp apply_shell_command_result(socket, _result), do: socket
+
+ defp command_title(action) do
+ action
+ |> to_string()
+ |> String.replace("_", " ")
+ |> String.split()
+ |> Enum.map_join(" ", &String.capitalize/1)
+ end
+
+ defp post_link_entries(assigns) do
+ case assigns.current_tab do
+ %{type: :post, id: post_id} ->
+ %{
+ backlinks: related_posts(PostLinks.list_incoming_links(post_id), :source_post_id),
+ outlinks: related_posts(PostLinks.list_outgoing_links(post_id), :target_post_id)
+ }
+
+ _other ->
+ %{backlinks: [], outlinks: []}
+ end
+ end
+
+ defp related_posts(links, key) do
+ Enum.map(links, fn link ->
+ case Repo.get(Post, Map.fetch!(link, key)) do
+ %Post{} = post -> %{id: post.id, title: post.title || post.slug || post.id, text: link.link_text || post.slug || post.id}
+ _other -> nil
+ end
+ end)
+ |> Enum.reject(&is_nil/1)
+ end
+
+ defp git_log_entries(assigns) do
+ case git_history_target(assigns.current_tab) do
+ nil -> []
+ {project_id, file_path} ->
+ case Git.file_history(project_id, file_path) do
+ {:ok, %{commits: commits}} -> commits
+ _other -> []
+ end
+ end
+ end
+
+ defp git_history_target(%{type: :post, id: post_id}) do
+ case Repo.get(Post, post_id) do
+ %Post{project_id: project_id, file_path: file_path} when file_path not in [nil, ""] -> {project_id, file_path}
+ _other -> nil
+ end
+ end
+
+ defp git_history_target(%{type: :media, id: media_id}) do
+ case Repo.get(Media, media_id) do
+ %Media{project_id: project_id, file_path: file_path} when file_path not in [nil, ""] -> {project_id, file_path}
+ _other -> nil
+ end
+ end
+
+ defp git_history_target(_tab), do: nil
+
+ defp short_commit_hash(hash) when is_binary(hash), do: String.slice(hash, 0, 7)
+ defp short_commit_hash(_hash), do: "-------"
+
defp sidebar_route_atom(route) when is_atom(route), do: route
defp sidebar_route_atom(route) when is_binary(route), do: String.to_existing_atom(route)
diff --git a/lib/bds/desktop/shell_live/index.html.heex b/lib/bds/desktop/shell_live/index.html.heex
index 9133e20..f1ca0f8 100644
--- a/lib/bds/desktop/shell_live/index.html.heex
+++ b/lib/bds/desktop/shell_live/index.html.heex
@@ -99,6 +99,7 @@
<%= String.upcase(sidebar_header_label(@sidebar_header)) %>