From 5b30269c7c65394bd19fb9ee430b3a337b2d2279 Mon Sep 17 00:00:00 2001 From: Sebastian Martinez Date: Thu, 7 Mar 2024 21:19:27 +0100 Subject: [PATCH] Add support for submodules and update heartwood --- httpd-client/index.ts | 9 ++-- httpd-client/lib/project.ts | 3 +- httpd-client/lib/project/comment.ts | 11 +++-- httpd-client/lib/project/issue.ts | 5 +- httpd-client/lib/project/patch.ts | 32 +++++-------- httpd-client/lib/shared.ts | 5 ++ httpd-client/tests/project.test.ts | 13 +++++- src/components/Comment.svelte | 5 +- src/components/ReactionSelector.svelte | 2 +- src/components/Reactions.svelte | 5 +- src/components/Thread.svelte | 6 ++- src/views/projects/Cob/AssigneeInput.svelte | 31 +++++++------ src/views/projects/Cob/Revision.svelte | 7 ++- src/views/projects/Issue.svelte | 18 ++++++-- src/views/projects/Issue/New.svelte | 12 +++-- src/views/projects/Patch.svelte | 8 ++-- src/views/projects/Source/Tree.svelte | 3 ++ .../projects/Source/Tree/Submodule.svelte | 43 ++++++++++++++++++ tests/e2e/project.spec.ts | 11 +++-- tests/e2e/project/commit.spec.ts | 6 ++- tests/e2e/project/commits.spec.ts | 21 +++++---- tests/e2e/router.ts | 4 +- tests/fixtures/repos/source-browsing.tar.bz2 | Bin 13841 -> 12420 bytes tests/support/fixtures.ts | 7 +-- tests/support/heartwood-version | 2 +- tests/tmp/.gitkeep | 0 26 files changed, 183 insertions(+), 86 deletions(-) create mode 100644 src/views/projects/Source/Tree/Submodule.svelte delete mode 100644 tests/tmp/.gitkeep diff --git a/httpd-client/index.ts b/httpd-client/index.ts index 83d22854d..5637d5cd4 100644 --- a/httpd-client/index.ts +++ b/httpd-client/index.ts @@ -13,7 +13,7 @@ import type { Policy, Scope, } from "./lib/shared.js"; -import type { Comment, Embed } from "./lib/project/comment.js"; +import type { Comment, Embed, Reaction } from "./lib/project/comment.js"; import type { Commit, CommitBlob, @@ -71,6 +71,7 @@ export type { Policy, Project, Range, + Reaction, Remote, Review, Revision, @@ -121,13 +122,11 @@ const nodeTrackingSchema = array( ); export interface NodeStats { - projects: { count: number }; - users: { count: number }; + repos: { total: number }; } const nodeStatsSchema = object({ - projects: object({ count: number() }), - users: object({ count: number() }), + repos: object({ total: number() }), }) satisfies ZodSchema; export class HttpdClient { diff --git a/httpd-client/lib/project.ts b/httpd-client/lib/project.ts index e4054a55b..2628e58f2 100644 --- a/httpd-client/lib/project.ts +++ b/httpd-client/lib/project.ts @@ -96,7 +96,8 @@ export type Blob = z.infer; const treeEntrySchema = object({ path: string(), name: string(), - kind: union([literal("blob"), literal("tree")]), + oid: string(), + kind: union([literal("blob"), literal("tree"), literal("submodule")]), }); export type TreeEntry = z.infer; diff --git a/httpd-client/lib/project/comment.ts b/httpd-client/lib/project/comment.ts index 56d726001..d5ce83bc1 100644 --- a/httpd-client/lib/project/comment.ts +++ b/httpd-client/lib/project/comment.ts @@ -1,24 +1,25 @@ import type { z } from "zod"; import { array, boolean, number, object, string } from "zod"; -import { codeLocationSchema } from "../shared"; +import { authorSchema, codeLocationSchema } from "../shared"; export type Comment = z.infer; -export type Embed = z.infer["embeds"][0]; +export type Embed = Comment["embeds"][0]; +export type Reaction = Comment["reactions"][0]; export const commentSchema = object({ id: string(), - author: object({ id: string(), alias: string().optional() }), + author: authorSchema, body: string(), edits: array( object({ - author: object({ id: string(), alias: string().optional() }), + author: authorSchema, body: string(), embeds: array(object({ name: string(), content: string() })), timestamp: number(), }), ), embeds: array(object({ name: string(), content: string() })), - reactions: array(object({ emoji: string(), authors: array(string()) })), + reactions: array(object({ emoji: string(), authors: array(authorSchema) })), timestamp: number(), location: codeLocationSchema.nullable().optional(), resolved: boolean(), diff --git a/httpd-client/lib/project/issue.ts b/httpd-client/lib/project/issue.ts index 9ca0fe982..d45a7dfd6 100644 --- a/httpd-client/lib/project/issue.ts +++ b/httpd-client/lib/project/issue.ts @@ -3,6 +3,7 @@ import type { ZodSchema, z } from "zod"; import { array, boolean, literal, object, string, union } from "zod"; import { commentSchema } from "./comment.js"; +import { authorSchema } from "../shared.js"; export type IssueState = | { status: "open" } @@ -18,12 +19,12 @@ const issueStateSchema = union([ export const issueSchema = object({ id: string(), - author: object({ id: string(), alias: string().optional() }), + author: authorSchema, title: string(), state: issueStateSchema, discussion: array(commentSchema), labels: array(string()), - assignees: array(string()), + assignees: array(authorSchema), }); export type Issue = z.infer; diff --git a/httpd-client/lib/project/patch.ts b/httpd-client/lib/project/patch.ts index f9cb0e404..7f41ddf9b 100644 --- a/httpd-client/lib/project/patch.ts +++ b/httpd-client/lib/project/patch.ts @@ -15,13 +15,9 @@ import { tuple, union, } from "zod"; -import { codeLocationSchema } from "../shared.js"; +import { authorSchema } from "../shared.js"; -export type PatchState = - | { status: "draft" } - | { status: "open"; conflicts?: [string, string][] } - | { status: "archived" } - | { status: "merged"; revision: string; commit: string }; +export type PatchState = z.infer; const patchStateSchema = union([ object({ @@ -39,26 +35,21 @@ const patchStateSchema = union([ revision: string(), commit: string(), }), -]) satisfies ZodSchema; +]); -export interface Merge { - author: { id: string; alias?: string }; - revision: string; - commit: string; - timestamp: number; -} +export type Merge = z.infer; const mergeSchema = object({ - author: object({ id: string(), alias: string().optional() }), + author: authorSchema, revision: string(), commit: string(), timestamp: number(), -}) satisfies ZodSchema; +}); export type Verdict = "accept" | "reject"; const reviewSchema = object({ - author: object({ id: string(), alias: string().optional() }), + author: authorSchema, verdict: optional(union([literal("accept"), literal("reject")]).nullable()), comments: array(commentSchema), summary: string().nullable(), @@ -69,11 +60,11 @@ export type Review = z.infer; const revisionSchema = object({ id: string(), - author: object({ id: string(), alias: string().optional() }), + author: authorSchema, description: string(), edits: array( object({ - author: object({ id: string(), alias: string().optional() }), + author: authorSchema, body: string(), embeds: array(object({ name: string(), content: string() })), timestamp: number(), @@ -82,8 +73,7 @@ const revisionSchema = object({ reactions: array( object({ emoji: string(), - location: codeLocationSchema.nullable(), - authors: array(string()), + authors: array(authorSchema), }), ), base: string(), @@ -98,7 +88,7 @@ export type Revision = z.infer; export const patchSchema = object({ id: string(), - author: object({ id: string(), alias: string().optional() }), + author: authorSchema, title: string(), state: patchStateSchema, target: string(), diff --git a/httpd-client/lib/shared.ts b/httpd-client/lib/shared.ts index e8011d5b9..bbc2a73a2 100644 --- a/httpd-client/lib/shared.ts +++ b/httpd-client/lib/shared.ts @@ -70,3 +70,8 @@ export const codeLocationSchema = object({ }); export type CodeLocation = z.infer; + +export const authorSchema = object({ + id: string(), + alias: string().optional(), +}); diff --git a/httpd-client/tests/project.test.ts b/httpd-client/tests/project.test.ts index 996a3f03a..c8479cb08 100644 --- a/httpd-client/tests/project.test.ts +++ b/httpd-client/tests/project.test.ts @@ -182,7 +182,18 @@ describe("project", () => { }, sessionId, ); - await assertIssue(issueId, { assignees: [bobRemote] }, api); + await assertIssue( + issueId, + { + assignees: [ + { + id: "did:key:z6Mkg49NtQR2LyYRDCQFK4w1VVHqhypZSSRo7HsyuN7SV7v5", + alias: "bob", + }, + ], + }, + api, + ); }, ); diff --git a/src/components/Comment.svelte b/src/components/Comment.svelte index 8b01de3e1..e046fd4b9 100644 --- a/src/components/Comment.svelte +++ b/src/components/Comment.svelte @@ -34,7 +34,10 @@ | ((body: string, embeds: Embed[]) => Promise) | undefined = undefined; export let reactOnComment: - | ((nids: string[], reaction: string) => Promise) + | (( + authors: Comment["reactions"][0]["authors"], + reaction: string, + ) => Promise) | undefined = undefined; diff --git a/src/components/ReactionSelector.svelte b/src/components/ReactionSelector.svelte index e21134319..7fb2411b0 100644 --- a/src/components/ReactionSelector.svelte +++ b/src/components/ReactionSelector.svelte @@ -12,7 +12,7 @@ export let reactions: Comment["reactions"] | undefined = undefined; const dispatch = createEventDispatcher<{ - select: { emoji: string; authors: string[] }; + select: Comment["reactions"][0]; }>(); diff --git a/src/components/Reactions.svelte b/src/components/Reactions.svelte index d0d5f68af..34efc518a 100644 --- a/src/components/Reactions.svelte +++ b/src/components/Reactions.svelte @@ -5,7 +5,10 @@ export let reactions: Comment["reactions"]; export let handleReaction: - | ((authors: string[], reaction: string) => Promise) + | (( + authors: Comment["reactions"][0]["authors"], + reaction: string, + ) => Promise) | undefined; diff --git a/src/components/Thread.svelte b/src/components/Thread.svelte index 5cd17d170..a6a8239e5 100644 --- a/src/components/Thread.svelte +++ b/src/components/Thread.svelte @@ -25,7 +25,11 @@ | ((commentId: string, comment: string, embeds: Embed[]) => Promise) | undefined; export let reactOnComment: - | ((commentId: string, nids: string[], reaction: string) => Promise) + | (( + commentId: string, + authors: Comment["reactions"][0]["authors"], + reaction: string, + ) => Promise) | undefined; async function toggleReply() { diff --git a/src/views/projects/Cob/AssigneeInput.svelte b/src/views/projects/Cob/AssigneeInput.svelte index 369745397..f4e89077c 100644 --- a/src/views/projects/Cob/AssigneeInput.svelte +++ b/src/views/projects/Cob/AssigneeInput.svelte @@ -1,4 +1,6 @@ + + + +
+
+ +
+ {name} @ {formatCommit(oid)} +
diff --git a/tests/e2e/project.spec.ts b/tests/e2e/project.spec.ts index c4356fc46..047f37298 100644 --- a/tests/e2e/project.spec.ts +++ b/tests/e2e/project.spec.ts @@ -34,7 +34,7 @@ test("navigate to project", async ({ page }) => { ); await expect( page.getByRole("link", { - name: "Commits 6", + name: "Commits 7", }), ).toBeVisible(); } @@ -54,7 +54,7 @@ test("navigate to project", async ({ page }) => { test("show source tree at specific revision", async ({ page }) => { await page.goto(sourceBrowsingUrl); - await page.getByRole("link", { name: "Commits 6" }).click(); + await page.getByRole("link", { name: "Commits 7" }).click(); await page .locator(".teaser", { hasText: "335dd6d" }) @@ -120,7 +120,7 @@ test("navigate deep file hierarchies", async ({ page }) => { await sourceTree.getByText("entirely").click(); await sourceTree.getByText("possible").click(); await sourceTree.getByText("in").nth(1).click(); - await sourceTree.getByText("git").click(); + await sourceTree.getByRole("button", { name: "git" }).click(); await sourceTree.getByText("repositories").click(); await sourceTree.getByText(".gitkeep").click(); await expect( @@ -151,6 +151,11 @@ test("navigate deep file hierarchies", async ({ page }) => { } }); +test("submodules", async ({ page }) => { + await page.goto(sourceBrowsingUrl); + await expect(page.getByText("rips @ 329dee9")).toBeVisible(); +}); + test("files with special characters in the filename", async ({ page }) => { await page.goto(sourceBrowsingUrl); diff --git a/tests/e2e/project/commit.spec.ts b/tests/e2e/project/commit.spec.ts index 99775d2bc..f0b8822f6 100644 --- a/tests/e2e/project/commit.spec.ts +++ b/tests/e2e/project/commit.spec.ts @@ -13,7 +13,7 @@ test("navigation from commit list", async ({ page }) => { await page.goto(sourceBrowsingUrl); await page.getByTitle("Change peer").click(); await page.getByRole("link", { name: "bob" }).click(); - await page.getByRole("link", { name: "Commits 7" }).click(); + await page.getByRole("link", { name: "Commits 8" }).click(); await page.getByText("Update readme").click(); await expect(page).toHaveURL(commitUrl); @@ -30,7 +30,9 @@ test("relative timestamps", async ({ page }) => { }; }); await page.goto(commitUrl); - await expect(page.getByText("Bob Belcher committed 28f3710")).toBeVisible(); + await expect( + page.getByText(`Bob Belcher committed ${shortBobHead}`), + ).toBeVisible(); }); test("modified file", async ({ page }) => { diff --git a/tests/e2e/project/commits.spec.ts b/tests/e2e/project/commits.spec.ts index f780f85ea..2ba9940d4 100644 --- a/tests/e2e/project/commits.spec.ts +++ b/tests/e2e/project/commits.spec.ts @@ -2,6 +2,7 @@ import { aliceMainHead, expect, gitOptions, + shortBobHead, sourceBrowsingUrl, test, } from "@tests/support/fixtures.js"; @@ -9,7 +10,7 @@ import { createProject } from "@tests/support/project"; test("peer and branch switching", async ({ page }) => { await page.goto(sourceBrowsingUrl); - await page.getByRole("link", { name: "Commits 6" }).click(); + await page.getByRole("link", { name: "Commits 7" }).click(); // Alice's peer. { @@ -23,10 +24,10 @@ test("peer and branch switching", async ({ page }) => { await expect(page.getByTitle("Change peer")).toHaveText("alice Delegate"); await expect(page.getByText("Thursday, November 17, 2022")).toBeVisible(); - await expect(page.locator(".list .teaser")).toHaveCount(6); + await expect(page.locator(".list .teaser")).toHaveCount(7); const latestCommit = page.locator(".teaser").first(); - await expect(latestCommit).toContainText("Add README.md"); + await expect(latestCommit).toContainText("Add submodule"); await expect(latestCommit).toContainText(aliceMainHead.substring(0, 7)); const earliestCommit = page.locator(".teaser").last(); @@ -68,12 +69,12 @@ test("peer and branch switching", async ({ page }) => { await expect(page.getByText("Thursday, November 17, 2022")).toBeVisible(); await expect(page.locator(".list").last().locator(".teaser")).toHaveCount( - 6, + 7, ); const latestCommit = page.locator(".teaser").first(); await expect(latestCommit).toContainText("Update readme"); - await expect(latestCommit).toContainText("28f3710"); + await expect(latestCommit).toContainText(shortBobHead); const earliestCommit = page.locator(".teaser").last(); await expect(earliestCommit).toContainText( @@ -85,7 +86,7 @@ test("peer and branch switching", async ({ page }) => { test("expand commit message", async ({ page }) => { await page.goto(sourceBrowsingUrl); - await page.getByRole("link", { name: "Commits 6" }).click(); + await page.getByRole("link", { name: "Commits 7" }).click(); const commitToggle = page.getByRole("button", { name: "expand" }).first(); await commitToggle.click(); @@ -111,14 +112,16 @@ test("relative timestamps", async ({ page }) => { }); await page.goto(sourceBrowsingUrl); - await page.getByRole("link", { name: "Commits 6" }).click(); + await page.getByRole("link", { name: "Commits 7" }).click(); await page.getByTitle("Change peer").click(); await page.getByRole("link", { name: "bob" }).click(); await expect(page.getByTitle("Change peer")).toHaveText("bob"); const latestCommit = page.locator(".teaser").first(); - await expect(latestCommit).toContainText("Bob Belcher committed 28f3710 now"); - await expect(latestCommit).toContainText("28f3710"); + await expect(latestCommit).toContainText( + `Bob Belcher committed ${shortBobHead} now`, + ); + await expect(latestCommit).toContainText(shortBobHead); const earliestCommit = page.locator(".teaser").last(); await expect(earliestCommit).toContainText( "Alice Liddell committed 36d5bbe last month", diff --git a/tests/e2e/router.ts b/tests/e2e/router.ts index 301e9c436..58b1f1527 100644 --- a/tests/e2e/router.ts +++ b/tests/e2e/router.ts @@ -66,7 +66,7 @@ test.describe("project page navigation", () => { .waitFor({ state: "hidden" }); await expect(page).toHaveURL(projectTreeURL); - await page.getByRole("link", { name: "Commits 6" }).click(); + await page.getByRole("link", { name: "Commits 7" }).click(); await expect(page).toHaveURL( `${sourceBrowsingUrl}/history/${aliceMainHead}`, ); @@ -89,7 +89,7 @@ test.describe("project page navigation", () => { await page.getByText(".hidden").click(); await expect(page).toHaveURL(`${projectTreeURL}/tree/.hidden`); - await page.getByRole("link", { name: "Commits 6" }).click(); + await page.getByRole("link", { name: "Commits 7" }).click(); await expect(page).toHaveURL(`${sourceBrowsingUrl}/history`); }); diff --git a/tests/fixtures/repos/source-browsing.tar.bz2 b/tests/fixtures/repos/source-browsing.tar.bz2 index 9125e508bd065c630475677a8801fe9b440ec828..5e6eea3f36d5370c26e9357d28a029350ef59f11 100644 GIT binary patch literal 12420 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 Te67<<|M7PuQ-ui%wch(M+_}=p diff --git a/tests/support/fixtures.ts b/tests/support/fixtures.ts index 02bf560d9..2449e5182 100644 --- a/tests/support/fixtures.ts +++ b/tests/support/fixtures.ts @@ -13,6 +13,7 @@ import { createOptions, supportDir, tmpDir } from "@tests/support/support.js"; import { createPeerManager } from "@tests/support/peerManager.js"; import { createProject } from "@tests/support/project.js"; import type { PeerManager, RadiclePeer } from "./peerManager.js"; +import { formatCommit } from "@app/lib/utils.js"; export { expect }; @@ -652,13 +653,13 @@ export async function createMarkdownFixture(peer: RadiclePeer) { ); } -export const aliceMainHead = "dd068e9aff9a569e597f6abaf84f120dd0cbbd70"; +export const aliceMainHead = "4a9f278344b795afaef44c0d9effb35c4d794fba"; export const aliceRemote = "did:key:z6MkqGC3nWZhYieEVTVDKW5v588CiGfsDSmRVG9ZwwWTvLSK"; export const bobRemote = "did:key:z6Mkg49NtQR2LyYRDCQFK4w1VVHqhypZSSRo7HsyuN7SV7v5"; -export const bobHead = "28f37105bb78db48111e36281291ff253dd050e8"; -export const shortBobHead = "28f3710"; +export const bobHead = "ff32f18dc09d82bff329ffcd96fd5eba2d7f826c"; +export const shortBobHead = formatCommit(bobHead); export const sourceBrowsingRid = "rad:z4BwwjPCFNVP27FwVbDFgwVwkjcir"; export const cobRid = "rad:z3fpY7nttPPa6MBnAv2DccHzQJnqe"; export const markdownRid = "rad:z2tchH2Ti4LxRKdssPQYs6VHE5rsg"; diff --git a/tests/support/heartwood-version b/tests/support/heartwood-version index c835542a0..b817d6f00 100644 --- a/tests/support/heartwood-version +++ b/tests/support/heartwood-version @@ -1 +1 @@ -a48081f2717f069d456ec09f31d9e639b232dbed +570a7eb141b6ba001713c46345d79b6fead1ca15 diff --git a/tests/tmp/.gitkeep b/tests/tmp/.gitkeep deleted file mode 100644 index e69de29bb..000000000