feat: update views to new models + parse time ago

Author: MarcosNicolau

explorer/lib/explorer/models/aggregated_proofs.ex

@@ -76,12 +76,12 @@ defmodule AggregatedProofs do
   end
 
   def get_last_page(page_size) do
-    total_proofs = Explorer.Repo.aggregate(AggregatedProofs, :count, :number)
+    total_proofs = Explorer.Repo.aggregate(AggregatedProofs, :count, :merkle_root)
     last_page = div(total_proofs, page_size)
     if rem(total_proofs, page_size) > 0, do: last_page + 1, else: last_page
   end
 
   def get_number_of_agg_proofs() do
-    Explorer.Repo.aggregate(AggregatedProofs, :count, :number)
+    Explorer.Repo.aggregate(AggregatedProofs, :count, :merkle_root)
   end
 end

explorer/lib/explorer/models/aggregation_mode_proof.ex

@@ -45,10 +45,10 @@ defmodule AggregationModeProof do
     end
   end
 
-  def get_all_proof_hashes(agg_proof_number) do
+  def get_all_proof_hashes(merkle_root) do
     query =
       from(proof in AggregationModeProof,
-        where: proof.aggregated_proof_number == ^agg_proof_number,
+        where: proof.merkle_root == ^merkle_root,
         select: proof.proof_hash
       )
 

explorer/lib/explorer_web/components/agg_proofs_table.ex

@@ -8,7 +8,7 @@ defmodule ExplorerWeb.AggProofsTable do
     ~H"""
     <.table id="agg_proofs" rows={@proofs}>
       <:col :let={proof} label="Merkle root" class="text-left">
-        <.link navigate={~p"/aggregated_proofs/#{proof.number}"}>
+        <.link navigate={~p"/aggregated_proofs/#{proof.merkle_root}"}>
           <span class="inline-flex gap-x-3 items-center group-hover:text-foreground/80">
             <%= Helpers.shorten_hash(proof.merkle_root, 6) %>
             <.right_arrow />
@@ -18,9 +18,6 @@ defmodule ExplorerWeb.AggProofsTable do
           </span>
         </.link>
       </:col>
-      <:col :let={proof} label="Status">
-        <.dynamic_badge_for_agg_proof status={proof.status} />
-      </:col>
       <:col :let={proof} label="Age">
         <span class="md:px-0" title={proof.age}>
           <%= proof.age %>

explorer/lib/explorer_web/live/pages/agg_proof/index.ex

@@ -3,9 +3,9 @@ defmodule ExplorerWeb.AggProof.Index do
   use ExplorerWeb, :live_view
 
   @impl true
-  def mount(%{"proof_number" => proof_number}, _, socket) do
+  def mount(%{"merkle_root" => merkle_root}, _, socket) do
     agg_proof =
-      AggregatedProofs.get_aggregated_proof_by_number(proof_number)
+      AggregatedProofs.get_aggregated_proof_by_merkle_root(merkle_root)
 
     {
       :ok,
@@ -19,7 +19,7 @@ defmodule ExplorerWeb.AggProof.Index do
 
   @impl true
   def handle_event("show_proofs", _value, socket) do
-    proofs = AggregationModeProof.get_all_proof_hashes(socket.assigns.agg_proof.number)
+    proofs = AggregationModeProof.get_all_proof_hashes(socket.assigns.agg_proof.merkle_root)
     {:noreply, assign(socket, proof_hashes: proofs)}
   end
 

explorer/lib/explorer_web/live/pages/agg_proof/index.html.heex

@@ -22,12 +22,6 @@
         </p>
       </div>
 
-      <div>
-        <h3>
-          Status:
-        </h3>
-        <.dynamic_badge_for_agg_proof class="w-fit" status={@agg_proof.status} />
-      </div>
       <div>
         <h3>
           Number of Proofs included:

explorer/lib/explorer_web/live/pages/agg_proofs/index.ex

@@ -14,7 +14,9 @@ defmodule ExplorerWeb.AggProofs.Index do
         page: current_page,
         page_size: @page_size
       })
-      |> Enum.map(fn proof -> proof |> Map.merge(%{age: "2 days ago"}) end)
+      |> Enum.map(fn proof ->
+        proof |> Map.merge(%{age: proof.block_timestamp |> Helpers.parse_timeago()})
+      end)
 
     {
       :ok,

explorer/lib/explorer_web/router.ex

@@ -48,7 +48,7 @@ defmodule ExplorerWeb.Router do
       live "/batches/:merkle_root", Batch.Index
       live "/batches", Batches.Index
       live "/aggregated_proofs", AggProofs.Index
-      live "/aggregated_proofs/:proof_number", AggProof.Index
+      live "/aggregated_proofs/:merkle_root", AggProof.Index
       live "/restaked", Restakes.Index
       live "/restaked/:address", Restake.Index
       live "/operators", Operators.Index