Fix not found and loading error screens

Signed-off-by: Rūdolfs Ošiņš <rudolfs@osins.org>
This commit is contained in:
Rūdolfs Ošiņš
2023-08-16 09:35:44 +02:00
parent 0e33915e9a
commit 5736083d50
15 changed files with 240 additions and 155 deletions
+30
View File
@@ -0,0 +1,30 @@
<script lang="ts">
import { twemoji } from "@app/lib/utils";
export let title: string;
</script>
<style>
.container {
display: flex;
align-items: center;
flex-direction: column;
gap: 1rem;
}
.emoji {
display: flex;
font-size: var(--font-size-xx-large);
}
.title {
color: var(--color-secondary);
}
</style>
<div class="layout-centered">
<div class="container">
<div class="emoji" use:twemoji>🏜️</div>
<div class="title txt-medium txt-bold">{title}</div>
</div>
</div>
+18 -26
View File
@@ -1,4 +1,4 @@
import type { LoadError } from "@app/lib/router/definitions";
import type { LoadErrorRoute } from "@app/lib/router/definitions";
import type { ProjectBaseUrl } from "@app/lib/search";
import type { WeeklyActivity } from "@app/lib/commit";
@@ -19,30 +19,22 @@ export interface HomeLoadedRoute {
params: { projects: ProjectBaseUrlActivity[] };
}
export async function loadHomeRoute(): Promise<HomeLoadedRoute | LoadError> {
try {
const projects = await getProjectsFromNodes(config.projects.pinned);
const results = await Promise.all(
projects.map(async projectNode => {
const activity = await loadProjectActivity(
projectNode.project.id,
projectNode.baseUrl,
);
return {
...projectNode,
activity,
};
}),
);
export async function loadHomeRoute(): Promise<
HomeLoadedRoute | LoadErrorRoute
> {
const projects = await getProjectsFromNodes(config.projects.pinned);
const results = await Promise.all(
projects.map(async projectNode => {
const activity = await loadProjectActivity(
projectNode.project.id,
projectNode.baseUrl,
);
return {
...projectNode,
activity,
};
}),
);
return { resource: "home", params: { projects: results } };
} catch (error: any) {
return {
resource: "loadError",
params: {
errorMessage: "Could not load pinned projects.",
stackTrace: error.stack,
},
};
}
return { resource: "home", params: { projects: results } };
}
+4 -6
View File
@@ -1,5 +1,5 @@
import type { BaseUrl, Project } from "@httpd-client";
import type { LoadError } from "@app/lib/router/definitions";
import type { NotFoundRoute } from "@app/lib/router/definitions";
import type { WeeklyActivity } from "@app/lib/commit";
import { HttpdClient } from "@httpd-client";
@@ -81,7 +81,7 @@ export function nodePath(baseUrl: BaseUrl) {
export async function loadNodeRoute(
params: NodesRouteParams,
): Promise<NodesLoadedRoute | LoadError> {
): Promise<NodesLoadedRoute | NotFoundRoute> {
const api = new HttpdClient(params.baseUrl);
try {
const projectPageIndex = 0;
@@ -102,11 +102,9 @@ export async function loadNodeRoute(
};
} catch (error: any) {
return {
resource: "loadError",
resource: "notFound",
params: {
title: `${params.baseUrl.hostname}:${params.baseUrl.port}`,
errorMessage: "Not able to query this node.",
stackTrace: error.stack,
title: "Node not found",
},
};
}
+51 -38
View File
@@ -1,4 +1,7 @@
import type { LoadError } from "@app/lib/router/definitions";
import type {
LoadErrorRoute,
NotFoundRoute,
} from "@app/lib/router/definitions";
import type {
BaseUrl,
Blob,
@@ -230,13 +233,13 @@ function parseRevisionToOid(
export async function loadProjectRoute(
route: ProjectRoute,
): Promise<ProjectLoadedRoute | LoadError> {
): Promise<ProjectLoadedRoute | LoadErrorRoute | NotFoundRoute> {
const api = new HttpdClient(route.node);
try {
if (route.resource === "project.source") {
return loadTreeView(route);
return await loadTreeView(route);
} else if (route.resource === "project.history") {
return loadHistoryView(route);
return await loadHistoryView(route);
} else if (route.resource === "project.commit") {
const [project, commit] = await Promise.all([
api.project.getById(route.project),
@@ -252,33 +255,22 @@ export async function loadProjectRoute(
},
};
} else if (route.resource === "project.issue") {
try {
const [project, issue] = await Promise.all([
api.project.getById(route.project),
api.project.getIssueById(route.project, route.issue),
]);
return {
resource: "project.issue",
params: {
baseUrl: route.node,
project,
issue,
},
};
} catch (error: any) {
return {
resource: "loadError",
params: {
title: route.issue,
errorMessage: "Not able to load this issue.",
stackTrace: error.stack,
},
};
}
const [project, issue] = await Promise.all([
api.project.getById(route.project),
api.project.getIssueById(route.project, route.issue),
]);
return {
resource: "project.issue",
params: {
baseUrl: route.node,
project,
issue,
},
};
} else if (route.resource === "project.patch") {
return loadPatchView(route);
return await loadPatchView(route);
} else if (route.resource === "project.issues") {
return loadIssuesView(route);
return await loadIssuesView(route);
} else if (route.resource === "project.newIssue") {
const project = await api.project.getById(route.project);
return {
@@ -289,19 +281,40 @@ export async function loadProjectRoute(
},
};
} else if (route.resource === "project.patches") {
return loadPatchesView(route);
return await loadPatchesView(route);
} else {
return unreachable(route);
}
} catch (error: any) {
return {
resource: "loadError",
params: {
title: route.project,
errorMessage: "Not able to load this project.",
stackTrace: error.stack,
},
};
if (error?.status === 404) {
let subject;
if (route.resource === "project.commit") {
subject = "Commit";
} else if (route.resource === "project.issue") {
subject = "Issue";
} else if (route.resource === "project.patch") {
subject = "Patch";
} else {
subject = "Project";
}
return {
resource: "notFound",
params: {
title: `${subject} not found`,
},
};
} else {
return {
resource: "loadError",
params: {
title: "Could not load this project",
errorMessage: error.message,
stackTrace: error.stack,
},
};
}
}
}