Ben Stull
4e7410f90b
§22 migrated the READ/catalog path to the three-tier (project/collection)
model but the WRITE/branch/body subsystem still hardcoded the default
project's default collection — resolving every meta-resident entry to the
default content repo at rfcs/<slug>.md, ignoring the entry's project (its own
content repo) and collection (a <subfolder>/rfcs/ prefix). An entry outside
the default collection rendered a blank canonical body and every edit/PR/
body-write path hit the wrong file.
- New single resolver: projects.content_repo_for_collection() +
projects.entry_location(config, cid, slug) -> (org, repo, md_path)
(collection -> project -> content_repo + subfolder; falls back to the
default repo for a legacy/unknown collection).
- Every entry write/read path resolves via it: api_branches (body GET + all
branch write paths), api_prs (pr-draft/open/merge/withdraw/review/
resolution-branch), api_graduation (graduate/claim/retire/unretire +
orchestrator + state-flip), api.py mark-reviewed + idea-PR merge/decline/
withdraw + proposal preview, api_metadata. bot.open_metadata_pr and
bot.mark_entry_reviewed gained a file_path param. refresh_meta_branches,
the webhook corpus-refresh dispatch, and the hygiene branch-delete now
span every project's content repo, not just the default.
- New additive collection-scoped body-read routes:
GET /api/projects/{pid}/collections/{cid}/rfcs/{slug}/main and
.../branches/{branch} disambiguate a slug across collections (G-5) and read
the entry's own repo. Slug-only routes kept (now collection-aware via the
cached row). Frontend getRFCMain/getBranch take optional pid+cid; RFCView
threads them (mirrors the v0.52.1 entry-detail fix).
No migration, no config change. Existing default-collection entries
unaffected. Tests: backend resolver + collection-scoped branch/body + graduate-
in-subfolder write path; frontend api unit. backend 677 / frontend 60 green.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
41 lines
1.6 KiB
JavaScript
41 lines
1.6 KiB
JavaScript
// §22/G-15 — getRFCMain/getBranch build collection-scoped URLs when a project +
|
|
// collection are supplied (so an entry outside the default collection reads its
|
|
// own content repo / subfolder), and fall back to the slug-only routes otherwise.
|
|
import { describe, it, expect, vi, afterEach } from 'vitest'
|
|
import { getRFCMain, getBranch } from './api.js'
|
|
|
|
function mockFetch() {
|
|
const fn = vi.fn(async () => ({ ok: true, status: 200, json: async () => ({}) }))
|
|
global.fetch = fn
|
|
return fn
|
|
}
|
|
|
|
afterEach(() => { vi.restoreAllMocks() })
|
|
|
|
describe('G-15 collection-scoped branch/body URLs', () => {
|
|
it('getRFCMain scopes to project+collection when both are given', async () => {
|
|
const f = mockFetch()
|
|
await getRFCMain('login', 'rfc-app', 'specs')
|
|
expect(f).toHaveBeenCalledWith('/api/projects/rfc-app/collections/specs/rfcs/login/main')
|
|
})
|
|
|
|
it('getRFCMain falls back to the slug-only route without a collection', async () => {
|
|
const f = mockFetch()
|
|
await getRFCMain('login')
|
|
expect(f).toHaveBeenCalledWith('/api/rfcs/login/main')
|
|
})
|
|
|
|
it('getBranch scopes to project+collection and encodes the branch', async () => {
|
|
const f = mockFetch()
|
|
await getBranch('login', 'edit/foo', 'rfc-app', 'specs')
|
|
expect(f).toHaveBeenCalledWith(
|
|
'/api/projects/rfc-app/collections/specs/rfcs/login/branches/edit%2Ffoo')
|
|
})
|
|
|
|
it('getBranch falls back to the slug-only route without a collection', async () => {
|
|
const f = mockFetch()
|
|
await getBranch('login', 'main')
|
|
expect(f).toHaveBeenCalledWith('/api/rfcs/login/branches/main')
|
|
})
|
|
})
|