diff options
| author | Joe Mou <dev@mou.fo> | 2026-08-11 13:32:44 -0400 |
|---|---|---|
| committer | Joe Mou <dev@mou.fo> | 2026-08-11 17:37:02 -0400 |
| commit | 866f99c414cb3d102483ce21c68a0e62b394baaa (patch) | |
| tree | 973b8e526bf51e8a05f6daab262d84035b7e2901 /cgithub/src | |
| parent | 10f923b51e2844486651493b44974e418a2be6d9 (diff) | |
Keep the ref picker on the current view and path
Diffstat (limited to 'cgithub/src')
| -rw-r--r-- | cgithub/src/app.test.ts | 52 | ||||
| -rw-r--r-- | cgithub/src/app.ts | 12 |
2 files changed, 60 insertions, 4 deletions
diff --git a/cgithub/src/app.test.ts b/cgithub/src/app.test.ts index 498d8a6..6544f03 100644 --- a/cgithub/src/app.test.ts +++ b/cgithub/src/app.test.ts @@ -8,6 +8,56 @@ import { createApp } from "./app.ts"; const eta = new Eta({ views: path.join(import.meta.dirname, "..", "views") }); const app = createApp(eta); +describe("branch picker", () => { + const repo = { owner: "actions", name: "deploy-pages" }; + const refs = [{ name: "main", isDefault: true }, { name: "v4" }]; + + it("should keep the current view and path", () => { + const blob = eta.render("_refs.eta", { + repo, + refs, + type: "branches", + view: "blob", + path: "src/main.ts", + }); + const tree = eta.render("_refs.eta", { + repo, + refs, + type: "branches", + view: "tree", + path: "src", + }); + + assert.match(blob, /href="\/actions\/deploy-pages\/blob\/main\/src\/main.ts"/); + assert.match(blob, /href="\/actions\/deploy-pages\/blob\/v4\/src\/main.ts"/); + assert.match(tree, /href="\/actions\/deploy-pages\/tree\/v4\/src"/); + }); + + it("should link to the root tree without a path", () => { + const html = eta.render("_refs.eta", { repo, refs, type: "branches", view: "tree", path: "" }); + + assert.match(html, /href="\/actions\/deploy-pages\/tree\/main"/); + }); + + it("should not build ref links for views it does not serve", async () => { + const res = await app.request("http://cgithub.example/api/a/b/refs/branches/raw/README.md"); + + assert.strictEqual(res.status, 404); + }); + + it("should tell the refs endpoint where the picker was opened", () => { + const nav = { repo, branch: "main", path: "src" }; + + const blob = eta.render("_nav.eta", { ...nav, view: "blob", path: "src/main.ts" }); + assert.match(blob, /data-view="blob" data-path="src\/main.ts"/); + assert.match( + eta.render("_nav.eta", { ...nav, view: "tree" }), + /data-view="tree" data-path="src"/, + ); + assert.doesNotMatch(eta.render("_nav.eta", { ...nav, view: "tree", path: "" }), /data-path=/); + }); +}); + describe("redirects to GitHub", () => { // An HTTP redirect would be caught by the extension's declarativeNetRequest // rules and bounced straight back here. @@ -21,7 +71,7 @@ describe("redirects to GitHub", () => { const body = await res.text(); assert.match( body, - /<meta http-equiv="refresh" content="2; url=https:\/\/github.com\/a\/b\/c\?x=1">/, + /<meta http-equiv="refresh" content="1; url=https:\/\/github.com\/a\/b\/c\?x=1">/, ); assert.doesNotMatch(body, /<script/); }); diff --git a/cgithub/src/app.ts b/cgithub/src/app.ts index 9a7ee8e..81e47fd 100644 --- a/cgithub/src/app.ts +++ b/cgithub/src/app.ts @@ -155,12 +155,18 @@ export function createApp(eta: Eta) { // be visited directly. Keep the site's initial page loads plain server- // rendered HTML while still surfacing data (branches/tags, latest commit) // that would otherwise require an extra scrape on every page view. - app.get("/api/:owner/:repo/refs/:type", async (c) => { - const { owner, repo, type } = c.req.param(); + // The view and path are where the picker was opened, so each ref can link to + // the same page on another ref. + app.get("/api/:owner/:repo/refs/:type/:view/:path{.*}?", async (c) => { + const { owner, repo, type, view, path = "" } = c.req.param(); if (type !== "branches" && type !== "tags") { return c.notFound(); } - return tryRenderFragment(c, "_refs.eta", getGitHubRefs(owner, repo, type)); + if (view !== "tree" && view !== "blob" && view !== "commits") { + return c.notFound(); + } + const refs = getGitHubRefs(owner, repo, type).then((data) => ({ ...data, view, path })); + return tryRenderFragment(c, "_refs.eta", refs); }); app.get("/api/:owner/:repo/latest-commit/:branch/:path{.*}?", async (c) => { |
