Radish alpha
r
rad:z4D5UCArafTzTQpDZNQRuqswh3ury
Radicle desktop app
Radicle
Git
Add id to revision type
Merged did:key:z6MkkfM3...sVz5 opened 1 year ago
3 files changed +8 -4 d3d690c0 6b8c73c6
modified src-tauri/bindings/Revision.ts
@@ -7,10 +7,11 @@ import type { Reaction } from "./Reaction";
import type { Review } from "./Review";

export type Revision = {
+
  id: string;
  author: Author;
  description: Array<Edit>;
  base: string;
-
  oid: string;
+
  head: string;
  reviews: Array<Review>;
  timestamp: bigint;
  discussion: Array<Comment<CodeLocation>>;
modified src-tauri/src/types/cobs.rs
@@ -125,12 +125,14 @@ impl Patch {
#[serde(rename_all = "camelCase")]
#[ts(export)]
pub struct Revision {
+
    #[ts(as = "String")]
+
    id: patch::RevisionId,
    author: Author,
    description: Vec<Edit>,
    #[ts(as = "String")]
    base: git::Oid,
    #[ts(as = "String")]
-
    oid: git::Oid,
+
    head: git::Oid,
    reviews: Vec<Review>,
    #[ts(as = "i64")]
    timestamp: cob::common::Timestamp,
@@ -141,13 +143,14 @@ pub struct Revision {
impl Revision {
    pub fn new(value: cob::patch::Revision, aliases: &impl AliasStore) -> Self {
        Self {
+
            id: value.id(),
            author: Author::new(*value.author().id(), aliases),
            description: value
                .edits()
                .map(|e| Edit::new(e, aliases))
                .collect::<Vec<_>>(),
            base: *value.base(),
-
            oid: value.head(),
+
            head: value.head(),
            reviews: value
                .reviews()
                .map(|(id, r)| Review::new(*id, r.clone(), aliases))
modified src/views/repo/Patch.svelte
@@ -146,7 +146,7 @@
    </div>
    <div class="txt-small" style:margin-top="1rem">Revisions</div>
    {#each revisions as revision}
-
      <div class="global-oid">{formatOid(revision.oid)}</div>
+
      <div class="global-oid">{formatOid(revision.id)}</div>
    {/each}
  </div>
</Layout>