From 8976ddd569af95509c836023b4a82fc3f5bcb5ed Mon Sep 17 00:00:00 2001 From: the-last-pastafarian Date: Thu, 21 Mar 2024 18:04:00 +0100 Subject: [PATCH] after Simon edit --- server/lib/field_hub/couch_service.ex | 5 +++-- server/lib/field_hub/project.ex | 8 ++++++++ server/lib/field_hub_web/live/project_show_live.ex | 9 +-------- .../field_hub_web/live/project_show_live.html.heex | 11 +++++++---- 4 files changed, 19 insertions(+), 14 deletions(-) diff --git a/server/lib/field_hub/couch_service.ex b/server/lib/field_hub/couch_service.ex index 7d702d9bab..b568c95651 100644 --- a/server/lib/field_hub/couch_service.ex +++ b/server/lib/field_hub/couch_service.ex @@ -363,6 +363,7 @@ defmodule FieldHub.CouchService do ) |> Map.get(:body) |> Jason.decode!() + |> IO.inspect() last_sequence = Map.get(changes, "last_seq") @@ -390,8 +391,8 @@ defmodule FieldHub.CouchService do iex> get_last_change_date("development") "2024-02-29 (edited by André Leroi-Gourhan)" """ - def get_last_change_date(project_identifier) do - case Map.get(get_last_change_info(project_identifier), "id") do + def get_last_change_date(changes_data, project_identifier) do + case Map.get(changes_data, "id") do nil -> :no_changes_found diff --git a/server/lib/field_hub/project.ex b/server/lib/field_hub/project.ex index 66094fc335..4245da0876 100644 --- a/server/lib/field_hub/project.ex +++ b/server/lib/field_hub/project.ex @@ -201,6 +201,14 @@ defmodule FieldHub.Project do db_statistics -> file_statistics = evaluate_file_store(project_identifier) + changes = CouchService.get_last_change_info(project_identifier) + + db_statistics = + db_statistics + |> Map.put(:last_update_seq, String.slice(Map.get(changes, "seq"), 0..27) <> "[...]") + |> Map.put(:last_update_id, Map.get(changes, "id")) + |> Map.put(:last_update_date, CouchService.get_last_change_date(changes, project_identifier)) + %{ name: project_identifier, database: db_statistics, diff --git a/server/lib/field_hub_web/live/project_show_live.ex b/server/lib/field_hub_web/live/project_show_live.ex index 49d2b3ec27..d3182770b8 100644 --- a/server/lib/field_hub_web/live/project_show_live.ex +++ b/server/lib/field_hub_web/live/project_show_live.ex @@ -47,13 +47,6 @@ defmodule FieldHubWeb.ProjectShowLive do |> assign(:confirm_project_name, "") |> assign(:delete_files, false) |> assign(:hide_cache_cleared_message, true) - |> assign( - :last_update_seq, - String.slice(Map.get(CouchService.get_last_change_info(project), "seq"), 0..27) <> - "[...]" - ) - |> assign(:last_update_id, Map.get(CouchService.get_last_change_info(project), "id")) - |> assign(:last_update_date, CouchService.get_last_change_date(project)) |> read_project_doc() } @@ -68,7 +61,7 @@ defmodule FieldHubWeb.ProjectShowLive do ) do stats = Project.evaluate_project(project) - Process.send_after(self(), :update_overview, 10000) + # Process.send_after(self(), :update_overview, 10000) { :noreply, diff --git a/server/lib/field_hub_web/live/project_show_live.html.heex b/server/lib/field_hub_web/live/project_show_live.html.heex index c918bb8a29..cafa652f80 100644 --- a/server/lib/field_hub_web/live/project_show_live.html.heex +++ b/server/lib/field_hub_web/live/project_show_live.html.heex @@ -54,14 +54,17 @@ <% %{ database: %{ doc_count: db_doc_count, - file_size: db_file_size + file_size: db_file_size, + last_update_seq: last_update_seq, + last_update_id: last_update_id, + last_update_date: last_update_date }, files: files } -> %>
Database documents: <%= db_doc_count %>
-
Last sequence: <%= @last_update_seq %>
-
Last change id: <%= @last_update_id %>
-
Last change date: <%= @last_update_date %>
+
Last sequence: <%= last_update_seq %>
+
Last change id: <%= last_update_id %>
+
Last change date: <%= last_update_date %>
Database size: <%= Sizeable.filesize(db_file_size) %> (<%= db_file_size %> bytes)
<%= case files do %> <% :enoent -> %>