diff --git a/http-client/lib/repo.ts b/http-client/lib/repo.ts
index 20ffbb565..c5a31219c 100644
--- a/http-client/lib/repo.ts
+++ b/http-client/lib/repo.ts
@@ -30,28 +30,34 @@ import { authorSchema } from "./shared.js";
const repoSchema = object({
rid: string(),
- "xyz.radicle.project": object({
- name: string(),
- description: string(),
- defaultBranch: string(),
+ payloads: object({
+ "xyz.radicle.project": object({
+ data: object({
+ name: string(),
+ description: string(),
+ defaultBranch: string(),
+ }),
+ meta: object({
+ head: string(),
+ patches: object({
+ open: number(),
+ draft: number(),
+ archived: number(),
+ merged: number(),
+ }),
+ issues: object({
+ open: number(),
+ closed: number(),
+ }),
+ }),
+ }),
}),
delegates: array(authorSchema),
- head: string(),
threshold: number(),
visibility: union([
object({ type: literal("public") }),
object({ type: literal("private"), allow: optional(array(string())) }),
]),
- patches: object({
- open: number(),
- draft: number(),
- archived: number(),
- merged: number(),
- }),
- issues: object({
- open: number(),
- closed: number(),
- }),
seeding: number(),
});
const reposSchema = array(repoSchema);
diff --git a/src/components/RepoCard.svelte b/src/components/RepoCard.svelte
index e809b597a..c7d0eb525 100644
--- a/src/components/RepoCard.svelte
+++ b/src/components/RepoCard.svelte
@@ -17,7 +17,7 @@
export let repoInfo: RepoInfo;
$: repo = repoInfo.repo;
- $: project = repoInfo.repo["xyz.radicle.project"];
+ $: project = repoInfo.repo.payloads["xyz.radicle.project"];
$: baseUrl = repoInfo.baseUrl;
$: isPrivate = repo.visibility.type === "private";
@@ -145,7 +145,7 @@
-
{project.name}
+
{project.data.name}
{#if isPrivate}
- {project.description}
+ {project.data.description}
- {repo.issues.open} ·
+ {project.meta.issues.open} ·
- {repo.patches.open} · Updated {formatTimestamp(
+ {project.meta.patches.open} · Updated {formatTimestamp(
repoInfo.lastCommit.commit.committer.time,
)}
diff --git a/src/components/RepoCard.ts b/src/components/RepoCard.ts
index 97e5dbc0c..c0a74bcf0 100644
--- a/src/components/RepoCard.ts
+++ b/src/components/RepoCard.ts
@@ -24,13 +24,18 @@ export async function fetchRepoInfos(
repos = await api.repo.getAll(query);
}
const info = await Promise.all(
- repos.map(async repo => {
- const [activity, lastCommit] = await Promise.all([
- loadRepoActivity(repo.rid, baseUrl),
- api.repo.getCommitBySha(repo.rid, repo.head),
- ]);
- return { repo, activity, lastCommit, baseUrl };
- }),
+ repos
+ .filter(r => Boolean(r.payloads["xyz.radicle.project"]))
+ .map(async repo => {
+ const [activity, lastCommit] = await Promise.all([
+ loadRepoActivity(repo.rid, baseUrl),
+ api.repo.getCommitBySha(
+ repo.rid,
+ repo["payloads"]["xyz.radicle.project"].meta.head,
+ ),
+ ]);
+ return { repo, activity, lastCommit, baseUrl };
+ }),
);
return info.sort((a, b) => {
diff --git a/src/views/repos/Header.svelte b/src/views/repos/Header.svelte
index 00db3eb4e..ca7b1063f 100644
--- a/src/views/repos/Header.svelte
+++ b/src/views/repos/Header.svelte
@@ -82,7 +82,7 @@
class="counter"
class:selected={activeTab === "issues"}
class:hover={hover && activeTab !== "issues"}>
- {repo.issues.open}
+ {repo.payloads["xyz.radicle.project"].meta.issues.open}
@@ -107,7 +107,7 @@
class="counter"
class:hover={hover && activeTab !== "patches"}
class:selected={activeTab === "patches"}>
- {repo.patches.open}
+ {repo.payloads["xyz.radicle.project"].meta.patches.open}
diff --git a/src/views/repos/Issue.svelte b/src/views/repos/Issue.svelte
index dc1026156..74c26d521 100644
--- a/src/views/repos/Issue.svelte
+++ b/src/views/repos/Issue.svelte
@@ -215,7 +215,9 @@
+ rawPath={rawPath(
+ repo.payloads["xyz.radicle.project"].meta.head,
+ )} />
{:else}
No description
{/if}
@@ -234,7 +236,9 @@
+ rawPath={rawPath(
+ repo.payloads["xyz.radicle.project"].meta.head,
+ )} />
{#if i < threads.length - 1}
{/if}
diff --git a/src/views/repos/Issues.svelte b/src/views/repos/Issues.svelte
index b5c1e637a..cdcdf3f87 100644
--- a/src/views/repos/Issues.svelte
+++ b/src/views/repos/Issues.svelte
@@ -72,7 +72,9 @@
};
$: showMoreButton =
- !loading && !error && allIssues.length < repo.issues[status];
+ !loading &&
+ !error &&
+ allIssues.length < repo.payloads["xyz.radicle.project"].meta.issues[status];