From b6e8bca18bd2b480a371cf2402b1c3e97758a622 Mon Sep 17 00:00:00 2001
From: Sebastian Martinez <me@sebastinez.dev>
Date: Thu, 7 Mar 2024 12:25:02 +0100
Subject: [PATCH] Fetch project listing on node page after page load

---
 src/views/nodes/View.svelte | 45 ++++++++++++++++++++++---------------
 src/views/nodes/router.ts   | 21 +++++------------
 2 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/src/views/nodes/View.svelte b/src/views/nodes/View.svelte
index 7741bdaee..82c5c2173 100644
--- a/src/views/nodes/View.svelte
+++ b/src/views/nodes/View.svelte
@@ -1,24 +1,27 @@
 <script lang="ts">
-  import type { BaseUrl, Policy, Scope } from "@httpd-client";
+  import type { BaseUrl, NodeStats, Policy, Scope } from "@httpd-client";
 
   import capitalize from "lodash/capitalize";
 
+  import * as router from "@app/lib/router";
   import { api, httpdStore } from "@app/lib/httpd";
+  import { baseUrlToString, isLocal, truncateId } from "@app/lib/utils";
+  import { fetchProjectInfos } from "@app/components/ProjectCard";
+  import { handleError } from "@app/views/nodes/error";
   import { isDelegate } from "@app/lib/roles";
-  import { isLocal, truncateId } from "@app/lib/utils";
 
   import AppLayout from "@app/App/AppLayout.svelte";
   import CopyableId from "@app/components/CopyableId.svelte";
+  import HoverPopover from "@app/components/HoverPopover.svelte";
   import IconSmall from "@app/components/IconSmall.svelte";
   import ProjectCard from "@app/components/ProjectCard.svelte";
   import ScopePolicyExplainer from "@app/components/ScopePolicyExplainer.svelte";
-  import HoverPopover from "@app/components/HoverPopover.svelte";
-  import type { ProjectInfo } from "@app/components/ProjectCard";
+  import Loading from "@app/components/Loading.svelte";
 
   export let baseUrl: BaseUrl;
   export let nid: string;
+  export let stats: NodeStats;
   export let externalAddresses: string[];
-  export let projectInfos: ProjectInfo[];
   export let version: string;
   export let policy: Policy | undefined = undefined;
   export let scope: Scope | undefined = undefined;
@@ -33,6 +36,7 @@
 <style>
   .layout {
     width: 100%;
+    height: 100%;
     display: flex;
     justify-content: center;
     padding: 3rem 0 5rem 0;
@@ -135,8 +139,7 @@
 
       <div class="subtitle">
         <div class="pinned txt-semibold">
-          {projectInfos.length}
-          {isLocal(baseUrl.hostname) ? "" : "pinned"} projects
+          {stats.repos.total} repositories hosted
         </div>
 
         {#if !isLocal(baseUrl.hostname)}
@@ -187,17 +190,23 @@
         {/if}
       </div>
 
-      <div class="project-grid">
-        {#each projectInfos as projectInfo}
-          <ProjectCard
-            {projectInfo}
-            isSeeding={false}
-            isDelegate={isDelegate(
-              session?.publicKey,
-              projectInfo.project.delegates,
-            ) ?? false} />
-        {/each}
-      </div>
+      {#await fetchProjectInfos(baseUrl, isLocal(baseUrl.hostname) ? "all" : "pinned")}
+        <Loading small center />
+      {:then projectInfos}
+        <div class="project-grid">
+          {#each projectInfos as projectInfo}
+            <ProjectCard
+              {projectInfo}
+              isSeeding={false}
+              isDelegate={isDelegate(
+                session?.publicKey,
+                projectInfo.project.delegates,
+              ) ?? false} />
+          {/each}
+        </div>
+      {:catch error}
+        {router.push(handleError(error, baseUrlToString(api.baseUrl)))}
+      {/await}
     </div>
   </div>
 </AppLayout>
diff --git a/src/views/nodes/router.ts b/src/views/nodes/router.ts
index ad9da9295..70a8de2e0 100644
--- a/src/views/nodes/router.ts
+++ b/src/views/nodes/router.ts
@@ -1,14 +1,10 @@
-import type { BaseUrl, Policy, Scope } from "@httpd-client";
+import type { BaseUrl, NodeStats, Policy, Scope } from "@httpd-client";
 import type { ErrorRoute, NotFoundRoute } from "@app/lib/router/definitions";
 
 import { HttpdClient } from "@httpd-client";
 import { config } from "@app/lib/config";
-import { baseUrlToString, isLocal } from "@app/lib/utils";
+import { baseUrlToString } from "@app/lib/utils";
 import { handleError } from "@app/views/nodes/error";
-import {
-  fetchProjectInfos,
-  type ProjectInfo,
-} from "@app/components/ProjectCard";
 
 export interface NodesRouteParams {
   baseUrl: BaseUrl;
@@ -27,7 +23,7 @@ export interface NodesLoadedRoute {
     version: string;
     externalAddresses: string[];
     nid: string;
-    projectInfos: ProjectInfo[];
+    stats: NodeStats;
     policy?: Policy;
     scope?: Scope;
   };
@@ -48,21 +44,16 @@ export async function loadNodeRoute(
 ): Promise<NodesLoadedRoute | NotFoundRoute | ErrorRoute> {
   const api = new HttpdClient(params.baseUrl);
   try {
-    const [node, projectInfos] = await Promise.all([
-      api.getNode(),
-      fetchProjectInfos(
-        params.baseUrl,
-        isLocal(params.baseUrl.hostname) ? "all" : "pinned",
-      ),
-    ]);
+    const [node, stats] = await Promise.all([api.getNode(), api.getStats()]);
+
     return {
       resource: "nodes",
       params: {
         baseUrl: params.baseUrl,
         nid: node.id,
+        stats,
         externalAddresses: node.config?.externalAddresses ?? [],
         version: node.version,
-        projectInfos: projectInfos,
         policy: node.config?.policy,
         scope: node.config?.scope,
       },