Radish alpha
r
rad:z4V1sjrXqjvFdnCUbxPFqd5p4DtH5
Radicle web interface
Radicle
Git
Refactor usage of authorSchema
Sebastian Martinez committed 1 year ago
commit b84cace48f82af27a96cab9da545d933d52fe1c6
parent cf08c83
6 files changed +12 -8
modified http-client/index.ts
@@ -9,6 +9,7 @@ import type {
  TreeStats,
} from "./lib/project.js";
import type {
+
  Author,
  Config,
  SeedingPolicy,
  DefaultSeedingPolicy,
@@ -50,6 +51,7 @@ import {
} from "./lib/shared.js";

export type {
+
  Author,
  BaseUrl,
  Blob,
  ChangesetWithDiff,
modified http-client/lib/project.ts
@@ -26,6 +26,7 @@ import {
} from "./project/commit.js";
import { issueSchema, issuesSchema } from "./project/issue.js";
import { patchSchema, patchesSchema } from "./project/patch.js";
+
import { authorSchema } from "./shared.js";

const repoSchema = object({
  rid: string(),
@@ -34,7 +35,7 @@ const repoSchema = object({
    description: string(),
    defaultBranch: string(),
  }),
-
  delegates: array(object({ id: string(), alias: optional(string()) })),
+
  delegates: array(authorSchema),
  head: string(),
  threshold: number(),
  visibility: union([
modified http-client/lib/shared.ts
@@ -117,6 +117,8 @@ export const codeLocationSchema = object({
  new: rangeSchema.nullable(),
});

+
export type Author = z.infer<typeof authorSchema>;
+

export const authorSchema = object({
  id: string(),
  alias: string().optional(),
modified src/lib/utils.ts
@@ -1,4 +1,4 @@
-
import type { BaseUrl } from "@http-client";
+
import type { Author, BaseUrl } from "@http-client";

import md5 from "md5";
import bs58 from "bs58";
@@ -80,10 +80,7 @@ export function formatCommit(oid: string): string {
  return oid.substring(0, 7);
}

-
export function formatEditedCaption(
-
  author: { id: string; alias?: string },
-
  timestamp: number,
-
) {
+
export function formatEditedCaption(author: Author, timestamp: number) {
  return `${
    author.alias ? author.alias : formatNodeId(author.id)
  } edited ${absoluteTimestamp(timestamp)}`;
modified src/views/projects/Cob/Revision.svelte
@@ -1,5 +1,6 @@
<script lang="ts">
  import type {
+
    Author,
    BaseUrl,
    Comment,
    DiffResponse,
@@ -44,7 +45,7 @@
  export let revisionOid: string;
  export let revisionTimestamp: number;
  export let revisionReactions: Comment["reactions"];
-
  export let revisionAuthor: { id: string; alias?: string | undefined };
+
  export let revisionAuthor: Author;
  export let revisionDescription: string;
  export let timelines: Timeline[];
  export let previousRevBase: string | undefined = undefined;
modified src/views/projects/Patch.svelte
@@ -1,5 +1,6 @@
<script lang="ts" context="module">
  import type {
+
    Author,
    Comment,
    Review,
    Merge,
@@ -168,7 +169,7 @@
        revisionOid: string;
        revisionEdits: Revision["edits"];
        revisionReactions: Revision["reactions"];
-
        revisionAuthor: { id: string; alias?: string | undefined };
+
        revisionAuthor: Author;
        revisionDescription: string;
      },
      Timeline[],