From 55fec2f343fe468eb4f98de21405241a1f5bf20a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C5=ABdolfs=20O=C5=A1i=C5=86=C5=A1?= <rudolfs@osins.org>
Date: Tue, 13 Jun 2023 15:07:31 +0200
Subject: [PATCH] Issue loading
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rūdolfs Ošiņš <rudolfs@osins.org>
---
 src/views/projects/View.svelte | 14 +++++--------
 src/views/projects/router.ts   | 36 ++++++++++++++++++++++++++++++++--
 2 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/src/views/projects/View.svelte b/src/views/projects/View.svelte
index 884b8954a..6adb78494 100644
--- a/src/views/projects/View.svelte
+++ b/src/views/projects/View.svelte
@@ -162,15 +162,11 @@
       issueCounters={project.issues}
       state={issueFilter} />
   {:else if view.resource === "issue"}
-    {#await api.project.getIssueById(id, view.params.issue)}
-      <Loading center />
-    {:then issue}
-      <Issue projectId={id} projectHead={project.head} {baseUrl} {issue} />
-    {:catch e}
-      <div class="message">
-        <ErrorMessage message="Couldn't load issue." stackTrace={e} />
-      </div>
-    {/await}
+    <Issue
+      projectId={id}
+      projectHead={project.head}
+      {baseUrl}
+      issue={view.params.loadedIssue} />
   {:else if view.resource === "patches"}
     <Patches
       {baseUrl}
diff --git a/src/views/projects/router.ts b/src/views/projects/router.ts
index 8a8bea624..b83652223 100644
--- a/src/views/projects/router.ts
+++ b/src/views/projects/router.ts
@@ -1,5 +1,5 @@
 import type { LoadError } from "@app/lib/router/definitions";
-import type { Project, Remote, Tree } from "@httpd-client";
+import type { Project, Remote, Tree, Issue } from "@httpd-client";
 
 import { get } from "svelte/store";
 
@@ -79,7 +79,7 @@ export type ProjectLoadedView =
       resource: "history";
       params: LoadedSourceBrowsingParams;
     }
-  | { resource: "issue"; params: { issue: string } }
+  | { resource: "issue"; params: { issue: string; loadedIssue: Issue } }
   | {
       resource: "issues";
       params?: {
@@ -199,6 +199,38 @@ export async function loadProjectRoute(
           },
         },
       };
+    } else if (params.view.resource === "issue") {
+      try {
+        const projectPromise = api.project.getById(params.id);
+        const issuePromise = api.project.getIssueById(
+          params.id,
+          params.view.params.issue,
+        );
+        const [project, issue] = await Promise.all([
+          projectPromise,
+          issuePromise,
+        ]);
+        return {
+          resource: "projects",
+          params: {
+            ...params,
+            project,
+            view: {
+              resource: "issue",
+              params: { ...params.view.params, loadedIssue: issue },
+            },
+          },
+        };
+      } catch (error: any) {
+        return {
+          resource: "loadError",
+          params: {
+            title: params.view.params.issue,
+            errorMessage: "Not able to load this issue.",
+            stackTrace: error.stack,
+          },
+        };
+      }
     } else {
       const project = await api.project.getById(params.id);
       return {