diff --git a/crates/radicle-types/bindings/cob/issue/Issue.ts b/crates/radicle-types/bindings/cob/issue/Issue.ts index 0d2c55464..e9571459b 100644 --- a/crates/radicle-types/bindings/cob/issue/Issue.ts +++ b/crates/radicle-types/bindings/cob/issue/Issue.ts @@ -10,7 +10,7 @@ export type Issue = { title: string; state: State; assignees: Array; - body: Comment; + body?: Comment; commentCount: number; labels: Array; timestamp: number; diff --git a/crates/radicle-types/src/cobs/issue.rs b/crates/radicle-types/src/cobs/issue.rs index f6296c5e0..065465bb6 100644 --- a/crates/radicle-types/src/cobs/issue.rs +++ b/crates/radicle-types/src/cobs/issue.rs @@ -23,7 +23,11 @@ pub struct Issue { title: String, state: cobs::issue::State, assignees: Vec, - body: cobs::thread::Comment, + // Omitted from list responses, which only need teaser data; populated + // when fetching a single issue. + #[serde(skip_serializing_if = "Option::is_none")] + #[ts(optional)] + body: Option, #[ts(type = "number")] comment_count: usize, #[ts(as = "Vec")] @@ -36,6 +40,18 @@ impl Issue { pub fn new(id: &issue::IssueId, issue: &issue::Issue, aliases: &impl AliasStore) -> Self { let (root_oid, root_comment) = issue.root(); + Self { + body: Some(cobs::thread::Comment::::new( + *root_oid, + root_comment.clone(), + aliases, + )), + ..Self::summary(id, issue, aliases) + } + } + + /// Teaser variant for list responses; omits the issue body. + pub fn summary(id: &issue::IssueId, issue: &issue::Issue, aliases: &impl AliasStore) -> Self { Self { id: id.to_string(), author: cobs::Author::new(issue.author().id(), aliases), @@ -45,11 +61,7 @@ impl Issue { .assignees() .map(|did| cobs::Author::new(did, aliases)) .collect::>(), - body: cobs::thread::Comment::::new( - *root_oid, - root_comment.clone(), - aliases, - ), + body: None, comment_count: issue.replies().count(), labels: issue.labels().cloned().collect::>(), timestamp: issue.timestamp(), diff --git a/crates/radicle-types/src/traits/issue.rs b/crates/radicle-types/src/traits/issue.rs index 43691ba47..c8a59954d 100644 --- a/crates/radicle-types/src/traits/issue.rs +++ b/crates/radicle-types/src/traits/issue.rs @@ -39,7 +39,7 @@ pub trait Issues: Profile { None => { let content = issues .into_iter() - .map(|(id, issue)| cobs::issue::Issue::new(&id, &issue, aliases)) + .map(|(id, issue)| cobs::issue::Issue::summary(&id, &issue, aliases)) .collect::>(); Ok::<_, Error>(cobs::PaginatedQuery { @@ -54,7 +54,7 @@ pub trait Issues: Profile { .into_iter() .skip(cursor) .take(take) - .map(|(id, issue)| cobs::issue::Issue::new(&id, &issue, aliases)) + .map(|(id, issue)| cobs::issue::Issue::summary(&id, &issue, aliases)) .collect::>(); Ok::<_, Error>(cobs::PaginatedQuery { diff --git a/src/views/repo/Issue.svelte b/src/views/repo/Issue.svelte index 1f98148d6..ebb49b970 100644 --- a/src/views/repo/Issue.svelte +++ b/src/views/repo/Issue.svelte @@ -361,33 +361,35 @@ allowedToEdit={roles.isDelegateOrAuthor( config.publicKey, repo.delegates.map(delegate => delegate.did), - issue.body.author.did, + issue.author.did, )} title={issue.title} cobId={issue.id} /> -
- 1 - ? issue.body.edits.at(-1) - : undefined} - author={issue.body.author} - caption="opened" - reactions={issue.body.reactions} - timestamp={issue.body.edits.slice(-1)[0].timestamp} - body={issue.body.edits.slice(-1)[0].body} - editComment={roles.isDelegateOrAuthor( - config.publicKey, - repo.delegates.map(delegate => delegate.did), - issue.body.author.did, - ) && partial(editComment, issue.body.id)} - reactOnComment={partial(reactOnComment, issue.body.id)}> - -
+ {#if issue.body} +
+ 1 + ? issue.body.edits.at(-1) + : undefined} + author={issue.body.author} + caption="opened" + reactions={issue.body.reactions} + timestamp={issue.body.edits.slice(-1)[0].timestamp} + body={issue.body.edits.slice(-1)[0].body} + editComment={roles.isDelegateOrAuthor( + config.publicKey, + repo.delegates.map(delegate => delegate.did), + issue.body.author.did, + ) && partial(editComment, issue.body.id)} + reactOnComment={partial(reactOnComment, issue.body.id)}> + +
+ {/if}