Compare commits
60
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b2a3f32c62 | ||
|
|
e2c63a9905 | ||
|
|
3f3c5953f6 | ||
|
|
124c6702a9 | ||
|
|
e25722d9ab | ||
|
|
07d586d0ad | ||
|
|
b793640507 | ||
|
|
21a5d18f59 | ||
|
|
f614414070 | ||
|
|
310b63b0cb | ||
|
|
c2c76c5817 | ||
|
|
c5a4d106da | ||
|
|
2437ffce42 | ||
|
|
eb648f3f76 | ||
|
|
74e5fffc10 | ||
|
|
748ef32180 | ||
|
|
b0c4ea8282 | ||
|
|
e236669fde | ||
|
|
fb5a0928bd | ||
|
|
264edd2e3a | ||
|
|
cd2cbe7be6 | ||
|
|
73182d0c0c | ||
|
|
cbe3a9a772 | ||
|
|
2e9b5c83c5 | ||
|
|
102397fe69 | ||
|
|
68a192e430 | ||
|
|
ccd5074c90 | ||
|
|
2b4cf20d75 | ||
|
|
cef2f77149 | ||
|
|
68b6417149 | ||
|
|
c5719ef362 | ||
|
|
5e5b61987a | ||
|
|
c564566432 | ||
|
|
9188626051 | ||
|
|
7ae9ecdc36 | ||
|
|
1980d79eee | ||
|
|
9423f11567 | ||
|
|
576013d627 | ||
|
|
7c08138fe4 | ||
|
|
a7829d591a | ||
|
|
1ed4470fc2 | ||
|
|
7a16b1b52f | ||
|
|
cf9d41b476 | ||
|
|
e820e7fecd | ||
|
|
4fdeb70a93 | ||
|
|
9a1f56c431 | ||
|
|
ade9dbb3ba | ||
|
|
d1a8596208 | ||
|
|
a3c09d9b67 | ||
|
|
a7f4c86464 | ||
|
|
0804566736 | ||
|
|
55363cbd18 | ||
|
|
868eb344f5 | ||
|
|
0b15497c09 | ||
|
|
d55f6cce23 | ||
|
|
3236efa846 | ||
|
|
d5a6db289d | ||
|
|
d8ccb5b733 | ||
|
|
c3f044bd65 | ||
|
|
59265f78b6 |
No files matched your search
+17
-3
@@ -919,6 +919,7 @@ async def get_school_details(request: Request, urn: int):
|
|||||||
"phonics": supplementary.get("phonics"),
|
"phonics": supplementary.get("phonics"),
|
||||||
"deprivation": supplementary.get("deprivation"),
|
"deprivation": supplementary.get("deprivation"),
|
||||||
"finance": supplementary.get("finance"),
|
"finance": supplementary.get("finance"),
|
||||||
|
"destinations": supplementary.get("destinations"),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -1337,9 +1338,22 @@ async def get_place(request: Request, kind: str, slug: str,
|
|||||||
for m in ("rwm_expected_pct", "attainment_8_score")
|
for m in ("rwm_expected_pct", "attainment_8_score")
|
||||||
}
|
}
|
||||||
|
|
||||||
cols = [c for c in SCHOOL_COLUMNS + ["latitude", "longitude", "phase",
|
# dict.fromkeys, not a list: SCHOOL_COLUMNS already ends with latitude and
|
||||||
"rwm_expected_pct", "attainment_8_score",
|
# longitude, so concatenating them again selected each twice and pandas
|
||||||
"total_pupils"]
|
# dropped one of every duplicated pair with a "columns are not unique"
|
||||||
|
# warning. Ordered de-duplication keeps the column order and the warning
|
||||||
|
# cannot come back.
|
||||||
|
#
|
||||||
|
# nursery_provision and parliamentary_constituency are not in
|
||||||
|
# SCHOOL_COLUMNS and the place table shows both. The `in rows.columns`
|
||||||
|
# guard is what keeps a mart the pipeline has not rebuilt working: those
|
||||||
|
# two are the optional GIAS columns data_loader degrades to NULL.
|
||||||
|
cols = [c for c in dict.fromkeys(
|
||||||
|
SCHOOL_COLUMNS + ["latitude", "longitude", "phase",
|
||||||
|
"nursery_provision",
|
||||||
|
"parliamentary_constituency",
|
||||||
|
"rwm_expected_pct", "attainment_8_score",
|
||||||
|
"total_pupils"])
|
||||||
if c in rows.columns]
|
if c in rows.columns]
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ from .models import (
|
|||||||
DimSchool, DimLocation, KS2Performance,
|
DimSchool, DimLocation, KS2Performance,
|
||||||
FactOfstedInspection, FactAdmissions, FactAdmissionDistance,
|
FactOfstedInspection, FactAdmissions, FactAdmissionDistance,
|
||||||
FactDeprivation, FactFinance, FactPupilCharacteristics,
|
FactDeprivation, FactFinance, FactPupilCharacteristics,
|
||||||
|
FactKs4Destinations, FactKs5Destinations,
|
||||||
)
|
)
|
||||||
from .ofsted_codes import ofsted_page_url, report_card_labels
|
from .ofsted_codes import ofsted_page_url, report_card_labels
|
||||||
from .schemas import SCHOOL_TYPE_MAP
|
from .schemas import SCHOOL_TYPE_MAP
|
||||||
@@ -816,6 +817,218 @@ def _finance_dict(f) -> dict:
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
# Destination measures that are totals DfE published itself, rather than one of
|
||||||
|
# the categories that partition the cohort.
|
||||||
|
_AGGREGATE_MEASURES = {"agg_sustained_education", "agg_sustained_all"}
|
||||||
|
|
||||||
|
|
||||||
|
def _format_cohort_year(year) -> str | None:
|
||||||
|
"""202223 -> '2022/23'.
|
||||||
|
|
||||||
|
The section has to date its own cohort. Destination measures run about two
|
||||||
|
GCSE years behind the results shown above them on the same page, so an
|
||||||
|
undated figure reads as stale data rather than as a different question.
|
||||||
|
"""
|
||||||
|
if not year:
|
||||||
|
return None
|
||||||
|
text = str(year)
|
||||||
|
if len(text) == 6:
|
||||||
|
return f"{text[:4]}/{text[4:6]}"
|
||||||
|
if len(text) == 8:
|
||||||
|
return f"{text[:4]}/{text[6:8]}"
|
||||||
|
return text
|
||||||
|
|
||||||
|
|
||||||
|
_PUPIL_GROUPS = ("disadvantaged", "other", "all")
|
||||||
|
|
||||||
|
|
||||||
|
def _lone_hidden_groups(groups: dict) -> list:
|
||||||
|
"""Pupil groups hiding exactly one category — solvable by subtraction."""
|
||||||
|
return [
|
||||||
|
key for key, group in groups.items()
|
||||||
|
if sum(1 for c in group["categories"] if c["status"] == "suppressed") == 1
|
||||||
|
]
|
||||||
|
|
||||||
|
|
||||||
|
def _lone_hidden_categories(groups: dict) -> list:
|
||||||
|
"""Categories hidden in exactly one of several pupil groups."""
|
||||||
|
lone = []
|
||||||
|
categories = {c["category"] for g in groups.values() for c in g["categories"]}
|
||||||
|
for category in categories:
|
||||||
|
found = [
|
||||||
|
c for g in groups.values() for c in g["categories"]
|
||||||
|
if c["category"] == category
|
||||||
|
]
|
||||||
|
hidden = [c for c in found if c["status"] == "suppressed"]
|
||||||
|
if len(hidden) == 1 and len(found) > 1:
|
||||||
|
lone.append(category)
|
||||||
|
return lone
|
||||||
|
|
||||||
|
|
||||||
|
def disclosure_invariant_holds(groups: dict) -> bool:
|
||||||
|
"""Every row and every column hides none, or at least two.
|
||||||
|
|
||||||
|
Public so the tests can assert it directly rather than re-deriving it.
|
||||||
|
"""
|
||||||
|
return not _lone_hidden_groups(groups) and not _lone_hidden_categories(groups)
|
||||||
|
|
||||||
|
|
||||||
|
def _mask_for_disclosure(groups: dict) -> None:
|
||||||
|
"""Withhold further cells until nothing suppressed can be solved for.
|
||||||
|
|
||||||
|
Not rendering a figure is not the same as not publishing it. This endpoint
|
||||||
|
is public and unauthenticated, so anything left in the payload is
|
||||||
|
published, whatever the UI chooses to draw — the same reasoning the
|
||||||
|
admission_distance field carries in app.py.
|
||||||
|
|
||||||
|
Two identities let a caller solve for a withheld cell:
|
||||||
|
|
||||||
|
* within a pupil group, the categories sum to the cohort, so a group with
|
||||||
|
exactly ONE suppressed category gives it away as cohort - sum(rest);
|
||||||
|
* across groups, disadvantaged + other = all for every category, so a
|
||||||
|
category suppressed in exactly ONE of the three gives itself away.
|
||||||
|
|
||||||
|
DfE's own answer is secondary suppression: withhold a second cell so the
|
||||||
|
residual spans two unknowns and identifies neither.
|
||||||
|
|
||||||
|
Where no companion can do that — a sparse cohort whose every other category
|
||||||
|
is `not_applicable`, which is common in special schools and alternative
|
||||||
|
provision — there is nothing left to withhold, so the pupil group is
|
||||||
|
DROPPED entirely. An earlier version simply gave up here and returned with
|
||||||
|
the violation intact and no signal, which is the one outcome this function
|
||||||
|
must never produce: a disclosure-control pass that fails silently is worse
|
||||||
|
than none, because everything downstream trusts it.
|
||||||
|
|
||||||
|
Mutates `groups` in place. Guaranteed to return with
|
||||||
|
disclosure_invariant_holds(groups) true.
|
||||||
|
"""
|
||||||
|
|
||||||
|
def suppress(cell):
|
||||||
|
if cell["status"] == "published":
|
||||||
|
cell["status"] = "suppressed"
|
||||||
|
cell["pupils"] = None
|
||||||
|
cell["percentage"] = None
|
||||||
|
return True
|
||||||
|
return False
|
||||||
|
|
||||||
|
def add_companion(candidates) -> bool:
|
||||||
|
"""Withhold a second cell so the residual spans two unknowns.
|
||||||
|
|
||||||
|
The companion must carry pupils. Suppressing a zero looks like
|
||||||
|
secondary suppression and protects nothing: the residual still equals
|
||||||
|
the original withheld figure exactly. Returns False when no cell can
|
||||||
|
do the job, which escalates to dropping the group.
|
||||||
|
"""
|
||||||
|
published = [c for c in candidates if c["status"] == "published"]
|
||||||
|
useful = sorted(
|
||||||
|
(c for c in published if (c["pupils"] or 0) > 0),
|
||||||
|
key=lambda c: c["pupils"],
|
||||||
|
)
|
||||||
|
if useful:
|
||||||
|
return suppress(useful[0])
|
||||||
|
# Every remaining cell is zero or not applicable: withholding any of
|
||||||
|
# them leaves the residual equal to the original figure.
|
||||||
|
return False
|
||||||
|
|
||||||
|
# Fixpoint: each new suppression can break the other identity. Terminates
|
||||||
|
# because every pass either adds a suppression, drops a group, or stops.
|
||||||
|
while not disclosure_invariant_holds(groups):
|
||||||
|
changed = False
|
||||||
|
|
||||||
|
for category in _lone_hidden_categories(groups):
|
||||||
|
siblings = [
|
||||||
|
c for g in groups.values() for c in g["categories"]
|
||||||
|
if c["category"] == category
|
||||||
|
]
|
||||||
|
if add_companion(siblings):
|
||||||
|
changed = True
|
||||||
|
|
||||||
|
for key in _lone_hidden_groups(groups):
|
||||||
|
if add_companion(groups[key]["categories"]):
|
||||||
|
changed = True
|
||||||
|
|
||||||
|
if changed:
|
||||||
|
continue
|
||||||
|
|
||||||
|
# Nothing left to withhold. Drop the groups that are still solvable,
|
||||||
|
# and any category still solvable across the groups that remain.
|
||||||
|
for key in _lone_hidden_groups(groups):
|
||||||
|
del groups[key]
|
||||||
|
changed = True
|
||||||
|
|
||||||
|
for category in _lone_hidden_categories(groups):
|
||||||
|
for group in groups.values():
|
||||||
|
for cell in group["categories"]:
|
||||||
|
if cell["category"] == category and suppress(cell):
|
||||||
|
changed = True
|
||||||
|
|
||||||
|
if not changed:
|
||||||
|
# Unreachable given the two escalations above, but a masking pass
|
||||||
|
# must never spin or exit unsafely. Withhold everything.
|
||||||
|
groups.clear()
|
||||||
|
return
|
||||||
|
|
||||||
|
|
||||||
|
def _destinations_block(rows: list) -> dict | None:
|
||||||
|
"""Shape destination rows for one phase into the API's block.
|
||||||
|
|
||||||
|
Applies secondary suppression before returning, so no caller of this public
|
||||||
|
endpoint can solve for a figure DfE withheld. See _mask_for_disclosure.
|
||||||
|
|
||||||
|
Aggregate measures are dropped entirely. DfE publishes them, and they would
|
||||||
|
be useful for a "what is published for this group" fallback, but nothing
|
||||||
|
renders them today and an aggregate spanning exactly one suppressed
|
||||||
|
component names that component. An unused field that leaks is not a
|
||||||
|
trade-off worth carrying — re-add them with their own guard if the fallback
|
||||||
|
is ever built.
|
||||||
|
|
||||||
|
Deliberately computes no residual, no "remaining pupils" figure, and no
|
||||||
|
total that would close a gap left by a suppressed category.
|
||||||
|
"""
|
||||||
|
if not rows:
|
||||||
|
return None
|
||||||
|
|
||||||
|
years = [r["year"] for r in rows if r.get("year") is not None]
|
||||||
|
if not years:
|
||||||
|
return None
|
||||||
|
latest_year = max(years)
|
||||||
|
rows = [r for r in rows if r.get("year") == latest_year]
|
||||||
|
|
||||||
|
groups: dict = {}
|
||||||
|
for row in rows:
|
||||||
|
group = groups.setdefault(
|
||||||
|
row["pupil_group"],
|
||||||
|
{"cohort": row.get("cohort_pupils"), "categories": []},
|
||||||
|
)
|
||||||
|
measure = row["destination_measure"]
|
||||||
|
published = row.get("status") == "published"
|
||||||
|
# Belt and braces: percentage is derived from the same source cell as
|
||||||
|
# pupils, but publishing one without the other would hand back the
|
||||||
|
# cohort (pupils / percentage) and with it the residual.
|
||||||
|
cell = {
|
||||||
|
"category": measure,
|
||||||
|
"pupils": row.get("pupils") if published else None,
|
||||||
|
"percentage": row.get("percentage") if published else None,
|
||||||
|
"status": row.get("status"),
|
||||||
|
}
|
||||||
|
if measure in _AGGREGATE_MEASURES:
|
||||||
|
continue
|
||||||
|
group["categories"].append(cell)
|
||||||
|
|
||||||
|
if not groups:
|
||||||
|
return None
|
||||||
|
|
||||||
|
_mask_for_disclosure(groups)
|
||||||
|
|
||||||
|
# Masking can empty the block entirely — a sparse cohort where no group
|
||||||
|
# could be made safe. Return None so the section is absent rather than
|
||||||
|
# rendering an empty shell.
|
||||||
|
if not groups:
|
||||||
|
return None
|
||||||
|
|
||||||
|
return {"cohort_year": _format_cohort_year(latest_year), "groups": groups}
|
||||||
|
|
||||||
|
|
||||||
def _empty_supplementary() -> dict:
|
def _empty_supplementary() -> dict:
|
||||||
return {
|
return {
|
||||||
"ofsted": None,
|
"ofsted": None,
|
||||||
@@ -827,6 +1040,7 @@ def _empty_supplementary() -> dict:
|
|||||||
"phonics": None,
|
"phonics": None,
|
||||||
"deprivation": None,
|
"deprivation": None,
|
||||||
"finance": None,
|
"finance": None,
|
||||||
|
"destinations": None,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -954,6 +1168,38 @@ def get_supplementary_data_batch(db: Session, urns: list[int]) -> dict:
|
|||||||
result[f.urn]["finance"] = _finance_dict(f)
|
result[f.urn]["finance"] = _finance_dict(f)
|
||||||
_safe(_finance)
|
_safe(_finance)
|
||||||
|
|
||||||
|
# Destinations — KS4 and 16-18. Both marts are long-format, so every row
|
||||||
|
# for a URN is collected and _destinations_block picks the latest year and
|
||||||
|
# shapes the pupil groups. A phase with no rows serialises as null rather
|
||||||
|
# than an empty shell, so the frontend renders nothing rather than an empty
|
||||||
|
# section.
|
||||||
|
def _destinations():
|
||||||
|
from collections import defaultdict
|
||||||
|
|
||||||
|
def _collect(model):
|
||||||
|
per_urn = defaultdict(list)
|
||||||
|
for r in db.query(model).filter(model.urn.in_(urns)).all():
|
||||||
|
per_urn[r.urn].append({
|
||||||
|
"year": r.year,
|
||||||
|
"pupil_group": r.pupil_group,
|
||||||
|
"destination_measure": r.destination_measure,
|
||||||
|
"cohort_pupils": r.cohort_pupils,
|
||||||
|
"pupils": r.pupils,
|
||||||
|
"percentage": r.percentage,
|
||||||
|
"status": r.status,
|
||||||
|
})
|
||||||
|
return per_urn
|
||||||
|
|
||||||
|
ks4_rows = _collect(FactKs4Destinations)
|
||||||
|
ks5_rows = _collect(FactKs5Destinations)
|
||||||
|
for urn in urns:
|
||||||
|
ks4 = _destinations_block(ks4_rows.get(urn, []))
|
||||||
|
ks5 = _destinations_block(ks5_rows.get(urn, []))
|
||||||
|
result[urn]["destinations"] = (
|
||||||
|
{"ks4": ks4, "ks5": ks5} if (ks4 or ks5) else None
|
||||||
|
)
|
||||||
|
_safe(_destinations)
|
||||||
|
|
||||||
return result
|
return result
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -321,3 +321,48 @@ class Ks2NationalAverage(Base):
|
|||||||
gps_high_pct = Column(Float)
|
gps_high_pct = Column(Float)
|
||||||
gps_avg_score = Column(Float)
|
gps_avg_score = Column(Float)
|
||||||
science_expected_pct = Column(Float)
|
science_expected_pct = Column(Float)
|
||||||
|
|
||||||
|
|
||||||
|
class FactKs4Destinations(Base):
|
||||||
|
"""KS4 leavers destinations — one row per URN, year, pupil group, measure.
|
||||||
|
|
||||||
|
Long format rather than wide because pupil_group is a real third dimension.
|
||||||
|
`status` is load-bearing: 'suppressed' means DfE withheld a figure it
|
||||||
|
considered disclosive and the page must print "withheld"; 'not_applicable'
|
||||||
|
means the measure does not apply and the page must print nothing. `pupils`
|
||||||
|
is null for both, so collapsing status to a null check loses the
|
||||||
|
difference — and the categories sum to the cohort, so a consumer that
|
||||||
|
treats a withheld cell as zero republishes what DfE hid.
|
||||||
|
"""
|
||||||
|
__tablename__ = "fact_ks4_destinations"
|
||||||
|
__table_args__ = (
|
||||||
|
Index("ix_ks4_dest_urn_year", "urn", "year"),
|
||||||
|
MARTS,
|
||||||
|
)
|
||||||
|
|
||||||
|
urn = Column(Integer, primary_key=True)
|
||||||
|
year = Column(Integer, primary_key=True)
|
||||||
|
pupil_group = Column(String(20), primary_key=True)
|
||||||
|
destination_measure = Column(String(40), primary_key=True)
|
||||||
|
cohort_pupils = Column(Integer)
|
||||||
|
pupils = Column(Integer)
|
||||||
|
percentage = Column(Float)
|
||||||
|
status = Column(String(20))
|
||||||
|
|
||||||
|
|
||||||
|
class FactKs5Destinations(Base):
|
||||||
|
"""16-18 study leavers destinations — same grain as FactKs4Destinations."""
|
||||||
|
__tablename__ = "fact_ks5_destinations"
|
||||||
|
__table_args__ = (
|
||||||
|
Index("ix_ks5_dest_urn_year", "urn", "year"),
|
||||||
|
MARTS,
|
||||||
|
)
|
||||||
|
|
||||||
|
urn = Column(Integer, primary_key=True)
|
||||||
|
year = Column(Integer, primary_key=True)
|
||||||
|
pupil_group = Column(String(20), primary_key=True)
|
||||||
|
destination_measure = Column(String(40), primary_key=True)
|
||||||
|
cohort_pupils = Column(Integer)
|
||||||
|
pupils = Column(Integer)
|
||||||
|
percentage = Column(Float)
|
||||||
|
status = Column(String(20))
|
||||||
@@ -0,0 +1,269 @@
|
|||||||
|
"""The destinations serialiser's contract.
|
||||||
|
|
||||||
|
Not rendering a figure is not the same as not publishing it. This endpoint is
|
||||||
|
public and unauthenticated, so whatever the payload carries is published,
|
||||||
|
whatever the UI draws. The categories sum to the cohort and the pupil groups
|
||||||
|
sum to each other, so a lone suppressed cell is solvable by subtraction — the
|
||||||
|
serialiser adds secondary suppression to prevent it.
|
||||||
|
|
||||||
|
See docs/superpowers/specs/2026-08-28-destination-measures-design.md.
|
||||||
|
"""
|
||||||
|
|
||||||
|
from backend.data_loader import (
|
||||||
|
_destinations_block, _format_cohort_year, disclosure_invariant_holds,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def _row(group, measure, pupils, status, cohort=180, percentage=None, year=202223):
|
||||||
|
return {
|
||||||
|
"pupil_group": group,
|
||||||
|
"destination_measure": measure,
|
||||||
|
"pupils": pupils,
|
||||||
|
"percentage": percentage,
|
||||||
|
"status": status,
|
||||||
|
"cohort_pupils": cohort,
|
||||||
|
"year": year,
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
def test_suppressed_category_serialises_as_suppressed_with_null_pupils():
|
||||||
|
rows = [
|
||||||
|
_row("all", "school_sixth_form", 75, "published", percentage=41.7),
|
||||||
|
_row("all", "sixth_form_college", None, "suppressed"),
|
||||||
|
]
|
||||||
|
block = _destinations_block(rows)
|
||||||
|
cats = {c["category"]: c for c in block["groups"]["all"]["categories"]}
|
||||||
|
assert cats["sixth_form_college"]["status"] == "suppressed"
|
||||||
|
assert cats["sixth_form_college"]["pupils"] is None
|
||||||
|
assert cats["sixth_form_college"]["percentage"] is None
|
||||||
|
|
||||||
|
|
||||||
|
def test_published_category_keeps_its_figures():
|
||||||
|
block = _destinations_block([
|
||||||
|
_row("all", "school_sixth_form", 75, "published", percentage=41.7),
|
||||||
|
])
|
||||||
|
cat = block["groups"]["all"]["categories"][0]
|
||||||
|
assert cat["pupils"] == 75
|
||||||
|
assert cat["percentage"] == 41.7
|
||||||
|
assert cat["status"] == "published"
|
||||||
|
|
||||||
|
|
||||||
|
def test_only_the_latest_year_is_served():
|
||||||
|
rows = [
|
||||||
|
_row("all", "school_sixth_form", 60, "published", year=202122),
|
||||||
|
_row("all", "school_sixth_form", 75, "published", year=202223),
|
||||||
|
]
|
||||||
|
block = _destinations_block(rows)
|
||||||
|
assert block["cohort_year"] == "2022/23"
|
||||||
|
assert len(block["groups"]["all"]["categories"]) == 1
|
||||||
|
assert block["groups"]["all"]["categories"][0]["pupils"] == 75
|
||||||
|
|
||||||
|
|
||||||
|
def test_all_three_pupil_groups_are_carried():
|
||||||
|
rows = [
|
||||||
|
_row("all", "school_sixth_form", 75, "published"),
|
||||||
|
_row("disadvantaged", "school_sixth_form", 17, "published", cohort=62),
|
||||||
|
_row("other", "school_sixth_form", 58, "published", cohort=118),
|
||||||
|
]
|
||||||
|
block = _destinations_block(rows)
|
||||||
|
assert set(block["groups"]) == {"all", "disadvantaged", "other"}
|
||||||
|
assert block["groups"]["disadvantaged"]["cohort"] == 62
|
||||||
|
|
||||||
|
|
||||||
|
def test_cohort_year_is_reported_so_the_page_can_date_itself():
|
||||||
|
block = _destinations_block([_row("all", "school_sixth_form", 75, "published")])
|
||||||
|
assert block["cohort_year"] == "2022/23"
|
||||||
|
|
||||||
|
|
||||||
|
def test_format_cohort_year_handles_the_six_digit_form():
|
||||||
|
assert _format_cohort_year(202223) == "2022/23"
|
||||||
|
assert _format_cohort_year(None) is None
|
||||||
|
|
||||||
|
|
||||||
|
def test_empty_rows_yield_none_not_an_empty_shell():
|
||||||
|
assert _destinations_block([]) is None
|
||||||
|
|
||||||
|
|
||||||
|
# ── Disclosure control ──────────────────────────────────────────────────────
|
||||||
|
#
|
||||||
|
# The rendering guards in lib/destinations.ts stop a withheld figure being
|
||||||
|
# DRAWN. They do nothing about it being COMPUTED: this endpoint is public and
|
||||||
|
# unauthenticated, so whatever the payload carries is published. These tests
|
||||||
|
# are the ones that matter.
|
||||||
|
|
||||||
|
def _solve_residual(group):
|
||||||
|
"""What any caller can work out: cohort minus everything published."""
|
||||||
|
published = [c["pupils"] for c in group["categories"] if c["pupils"] is not None]
|
||||||
|
hidden = [c for c in group["categories"] if c["status"] == "suppressed"]
|
||||||
|
return group["cohort"] - sum(published), len(hidden)
|
||||||
|
|
||||||
|
|
||||||
|
def test_a_lone_suppressed_category_cannot_be_solved_for():
|
||||||
|
"""Whitley Bay High School's real 2022/23 disadvantaged group: further
|
||||||
|
education withheld, everything else published, cohort 41. Before secondary
|
||||||
|
suppression the payload gave the answer away as 41 - 23 = 18."""
|
||||||
|
rows = [
|
||||||
|
_row("disadvantaged", "school_sixth_form", 15, "published", cohort=41),
|
||||||
|
_row("disadvantaged", "sixth_form_college", 0, "published", cohort=41),
|
||||||
|
_row("disadvantaged", "further_education", None, "suppressed", cohort=41),
|
||||||
|
_row("disadvantaged", "apprenticeship", 1, "published", cohort=41),
|
||||||
|
_row("disadvantaged", "employment", 2, "published", cohort=41),
|
||||||
|
_row("disadvantaged", "not_sustained", 3, "published", cohort=41),
|
||||||
|
_row("disadvantaged", "not_captured", 2, "published", cohort=41),
|
||||||
|
]
|
||||||
|
group = _destinations_block(rows)["groups"]["disadvantaged"]
|
||||||
|
residual, hidden = _solve_residual(group)
|
||||||
|
assert hidden >= 2, "a lone suppressed cell must gain a companion"
|
||||||
|
assert residual != 18, "the withheld figure is recoverable from the payload"
|
||||||
|
|
||||||
|
|
||||||
|
def test_every_group_hides_none_or_at_least_two_categories():
|
||||||
|
rows = [
|
||||||
|
_row("all", "school_sixth_form", 75, "published"),
|
||||||
|
_row("all", "sixth_form_college", None, "suppressed"),
|
||||||
|
_row("all", "further_education", 61, "published"),
|
||||||
|
_row("all", "apprenticeship", 8, "published"),
|
||||||
|
_row("all", "employment", 6, "published"),
|
||||||
|
_row("all", "not_sustained", 5, "published"),
|
||||||
|
_row("all", "not_captured", 4, "published"),
|
||||||
|
]
|
||||||
|
group = _destinations_block(rows)["groups"]["all"]
|
||||||
|
hidden = [c for c in group["categories"] if c["status"] == "suppressed"]
|
||||||
|
assert len(hidden) >= 2
|
||||||
|
|
||||||
|
|
||||||
|
def test_a_category_hidden_in_one_group_is_hidden_in_a_second():
|
||||||
|
"""disadvantaged + other = all for every category, so a category withheld
|
||||||
|
in exactly one of the three is recoverable from the other two."""
|
||||||
|
rows = []
|
||||||
|
for measure, a, d, o in [
|
||||||
|
("school_sixth_form", 75, None, 58),
|
||||||
|
("further_education", 61, 27, 34),
|
||||||
|
("apprenticeship", 8, 4, 4),
|
||||||
|
("employment", 6, 1, 5),
|
||||||
|
("not_sustained", 5, 3, 2),
|
||||||
|
("not_captured", 4, 2, 2),
|
||||||
|
]:
|
||||||
|
rows.append(_row("all", measure, a, "published", cohort=159))
|
||||||
|
rows.append(_row("disadvantaged", measure, d,
|
||||||
|
"published" if d is not None else "suppressed", cohort=37))
|
||||||
|
rows.append(_row("other", measure, o, "published", cohort=122))
|
||||||
|
|
||||||
|
groups = _destinations_block(rows)["groups"]
|
||||||
|
measures = {c["category"] for g in groups.values() for c in g["categories"]}
|
||||||
|
assert len(measures) == 6, "the fixture's six measures must all be checked"
|
||||||
|
|
||||||
|
for measure in sorted(measures):
|
||||||
|
hidden = sum(
|
||||||
|
1 for g in groups.values() for c in g["categories"]
|
||||||
|
if c["category"] == measure and c["status"] == "suppressed"
|
||||||
|
)
|
||||||
|
# The invariant is "none, or at least two" — not "at least two".
|
||||||
|
assert hidden != 1, f"{measure} is solvable across the pupil groups"
|
||||||
|
|
||||||
|
|
||||||
|
def test_a_suppressed_cell_never_keeps_its_percentage():
|
||||||
|
"""percentage / pupils would hand back the cohort, and with it the residual."""
|
||||||
|
rows = [
|
||||||
|
_row("all", "school_sixth_form", 75, "published", percentage=41.7),
|
||||||
|
_row("all", "sixth_form_college", None, "suppressed", percentage=11.7),
|
||||||
|
_row("all", "further_education", 61, "published", percentage=33.9),
|
||||||
|
]
|
||||||
|
group = _destinations_block(rows)["groups"]["all"]
|
||||||
|
for cell in group["categories"]:
|
||||||
|
if cell["status"] != "published":
|
||||||
|
assert cell["pupils"] is None
|
||||||
|
assert cell["percentage"] is None
|
||||||
|
|
||||||
|
|
||||||
|
def test_aggregates_are_not_served():
|
||||||
|
"""An aggregate spanning exactly one suppressed component names it, and
|
||||||
|
nothing renders them today."""
|
||||||
|
rows = [
|
||||||
|
_row("all", "school_sixth_form", 75, "published"),
|
||||||
|
_row("all", "agg_sustained_all", 171, "published"),
|
||||||
|
]
|
||||||
|
group = _destinations_block(rows)["groups"]["all"]
|
||||||
|
assert [c["category"] for c in group["categories"]] == ["school_sixth_form"]
|
||||||
|
assert "aggregates" not in group
|
||||||
|
|
||||||
|
|
||||||
|
def test_a_fully_published_group_is_left_alone():
|
||||||
|
"""Secondary suppression must not cost anything where nothing is withheld —
|
||||||
|
this is the all-pupils view on every mainstream secondary."""
|
||||||
|
rows = [
|
||||||
|
_row("all", m, p, "published")
|
||||||
|
for m, p in [("school_sixth_form", 75), ("sixth_form_college", 21),
|
||||||
|
("further_education", 61), ("apprenticeship", 8),
|
||||||
|
("employment", 6), ("not_sustained", 5), ("not_captured", 4)]
|
||||||
|
]
|
||||||
|
group = _destinations_block(rows)["groups"]["all"]
|
||||||
|
assert all(c["status"] == "published" for c in group["categories"])
|
||||||
|
assert len(group["categories"]) == 7
|
||||||
|
|
||||||
|
|
||||||
|
def test_the_invariant_is_asserted_directly_not_re_derived():
|
||||||
|
"""A group with one suppressed category and nothing else to withhold."""
|
||||||
|
rows = [
|
||||||
|
_row("all", "school_sixth_form", None, "suppressed", cohort=9),
|
||||||
|
_row("all", "sixth_form_college", None, "not_applicable", cohort=9),
|
||||||
|
_row("all", "further_education", None, "not_applicable", cohort=9),
|
||||||
|
]
|
||||||
|
block = _destinations_block(rows)
|
||||||
|
assert block is None or disclosure_invariant_holds(block["groups"])
|
||||||
|
|
||||||
|
|
||||||
|
def test_a_sparse_cohort_with_no_companion_drops_the_group():
|
||||||
|
"""Special schools and AP routinely have one suppressed category and every
|
||||||
|
other one not applicable. There is nothing left to withhold, so the group
|
||||||
|
goes — an earlier version returned here with the violation intact."""
|
||||||
|
rows = [
|
||||||
|
_row("all", "school_sixth_form", None, "suppressed", cohort=9),
|
||||||
|
_row("all", "sixth_form_college", None, "not_applicable", cohort=9),
|
||||||
|
_row("all", "further_education", None, "not_applicable", cohort=9),
|
||||||
|
_row("all", "apprenticeship", None, "not_applicable", cohort=9),
|
||||||
|
_row("all", "employment", None, "not_applicable", cohort=9),
|
||||||
|
_row("all", "not_sustained", None, "not_applicable", cohort=9),
|
||||||
|
_row("all", "not_captured", None, "not_applicable", cohort=9),
|
||||||
|
]
|
||||||
|
block = _destinations_block(rows)
|
||||||
|
assert block is None or "all" not in block["groups"], (
|
||||||
|
"a group that cannot be made safe must not be served"
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def test_zeros_are_not_treated_as_a_usable_companion():
|
||||||
|
"""Suppressing a zero protects nothing — the residual is unchanged. With
|
||||||
|
only zeros available the group must be dropped, not falsely 'fixed'."""
|
||||||
|
rows = [
|
||||||
|
_row("all", "school_sixth_form", None, "suppressed", cohort=5),
|
||||||
|
_row("all", "sixth_form_college", 0, "published", cohort=5),
|
||||||
|
_row("all", "further_education", 0, "published", cohort=5),
|
||||||
|
]
|
||||||
|
block = _destinations_block(rows)
|
||||||
|
if block and "all" in block["groups"]:
|
||||||
|
group = block["groups"]["all"]
|
||||||
|
published = sum(c["pupils"] for c in group["categories"]
|
||||||
|
if c["pupils"] is not None)
|
||||||
|
hidden = [c for c in group["categories"] if c["status"] == "suppressed"]
|
||||||
|
assert len(hidden) != 1, "a zero companion leaves the figure solvable"
|
||||||
|
assert group["cohort"] - published != 5
|
||||||
|
|
||||||
|
|
||||||
|
def test_masking_always_terminates_in_a_safe_state():
|
||||||
|
"""Exhaustive over every suppression pattern of a four-category group."""
|
||||||
|
from itertools import product
|
||||||
|
MEASURES = ["school_sixth_form", "sixth_form_college",
|
||||||
|
"further_education", "apprenticeship"]
|
||||||
|
for statuses in product(["published", "suppressed", "not_applicable"],
|
||||||
|
repeat=len(MEASURES)):
|
||||||
|
rows = [
|
||||||
|
_row("all", m, 3 if st == "published" else None, st, cohort=12)
|
||||||
|
for m, st in zip(MEASURES, statuses)
|
||||||
|
]
|
||||||
|
block = _destinations_block(rows)
|
||||||
|
if block is None:
|
||||||
|
continue
|
||||||
|
assert disclosure_invariant_holds(block["groups"]), (
|
||||||
|
f"invariant broken for {statuses}"
|
||||||
|
)
|
||||||
@@ -137,3 +137,49 @@ def test_an_authority_without_a_page_is_named_but_carries_no_slug(straddling_cli
|
|||||||
by_name = {a["name"]: a for a in body["place"]["authorities"]}
|
by_name = {a["name"]: a for a in body["place"]["authorities"]}
|
||||||
assert by_name["Essex"]["slug"] == "essex"
|
assert by_name["Essex"]["slug"] == "essex"
|
||||||
assert by_name["Isles Of Scilly"]["slug"] is None
|
assert by_name["Isles Of Scilly"]["slug"] is None
|
||||||
|
|
||||||
|
|
||||||
|
def _attributed_df() -> pd.DataFrame:
|
||||||
|
"""The same town, with the four attributes the place table now shows."""
|
||||||
|
df = _schools_df()
|
||||||
|
df["age_range"] = "4-11"
|
||||||
|
df["religious_denomination"] = "Church of England"
|
||||||
|
df["nursery_provision"] = True
|
||||||
|
df["parliamentary_constituency"] = "Brentwood and Ongar"
|
||||||
|
return df
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.fixture()
|
||||||
|
def attributed_client(monkeypatch):
|
||||||
|
from backend import app as app_module
|
||||||
|
|
||||||
|
monkeypatch.setattr(app_module, "load_school_data", _attributed_df)
|
||||||
|
monkeypatch.setattr(app_module, "load_latest_school_data", _attributed_df)
|
||||||
|
monkeypatch.setattr(app_module, "_place_registry", None)
|
||||||
|
return TestClient(app_module.app, raise_server_exceptions=False)
|
||||||
|
|
||||||
|
|
||||||
|
def test_place_detail_carries_the_attributes_the_table_shows(attributed_client):
|
||||||
|
"""age_range and religious_denomination ride in on SCHOOL_COLUMNS.
|
||||||
|
|
||||||
|
nursery_provision and parliamentary_constituency do not, and the place
|
||||||
|
table needs all four — a column the response cannot fill is a column of
|
||||||
|
dashes on ~3,900 pages.
|
||||||
|
"""
|
||||||
|
body = attributed_client.get("/api/places/town/brentwood").json()
|
||||||
|
school = body["schools"][0]
|
||||||
|
assert school["age_range"] == "4-11"
|
||||||
|
assert school["religious_denomination"] == "Church of England"
|
||||||
|
assert school["nursery_provision"] is True
|
||||||
|
assert school["parliamentary_constituency"] == "Brentwood and Ongar"
|
||||||
|
|
||||||
|
|
||||||
|
def test_place_detail_survives_a_mart_without_the_optional_columns(client):
|
||||||
|
"""The base fixture has neither column, as an unrebuilt mart does not.
|
||||||
|
|
||||||
|
data_loader degrades those to NULL rather than failing the load, so the
|
||||||
|
endpoint must not assume they are present.
|
||||||
|
"""
|
||||||
|
res = client.get("/api/places/town/brentwood")
|
||||||
|
assert res.status_code == 200
|
||||||
|
assert "nursery_provision" not in res.json()["schools"][0]
|
||||||
@@ -132,16 +132,23 @@ def test_one_query_per_table_and_latest_row_per_urn():
|
|||||||
"FactPupilCharacteristics": [],
|
"FactPupilCharacteristics": [],
|
||||||
"FactDeprivation": [],
|
"FactDeprivation": [],
|
||||||
"FactFinance": [],
|
"FactFinance": [],
|
||||||
|
"FactKs4Destinations": [],
|
||||||
|
"FactKs5Destinations": [],
|
||||||
}
|
}
|
||||||
session = _FakeSession(rows)
|
session = _FakeSession(rows)
|
||||||
out = get_supplementary_data_batch(session, [1, 2])
|
out = get_supplementary_data_batch(session, [1, 2])
|
||||||
|
|
||||||
# Exactly one query per table — six total, regardless of two URNs.
|
# Exactly one query per table — eight total, regardless of two URNs.
|
||||||
assert sorted(session.queries) == [
|
assert sorted(session.queries) == [
|
||||||
"FactAdmissionDistance", "FactAdmissions", "FactDeprivation",
|
"FactAdmissionDistance", "FactAdmissions", "FactDeprivation",
|
||||||
"FactFinance", "FactOfstedInspection", "FactPupilCharacteristics",
|
"FactFinance", "FactKs4Destinations", "FactKs5Destinations",
|
||||||
|
"FactOfstedInspection", "FactPupilCharacteristics",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
# A school with no destination rows gets null, not an empty shell — the
|
||||||
|
# frontend renders the section from the block's presence.
|
||||||
|
assert out[1]["destinations"] is None
|
||||||
|
|
||||||
# Latest Ofsted kept per URN
|
# Latest Ofsted kept per URN
|
||||||
assert out[1]["ofsted"]["overall_effectiveness"] == 2
|
assert out[1]["ofsted"]["overall_effectiveness"] == 2
|
||||||
assert out[2]["ofsted"]["overall_effectiveness"] == 1
|
assert out[2]["ofsted"]["overall_effectiveness"] == 1
|
||||||
|
|||||||
@@ -23,6 +23,52 @@ Key files:
|
|||||||
- `backend/data_loader.py` - Data queries, geocoding, legacy DataFrame compatibility
|
- `backend/data_loader.py` - Data queries, geocoding, legacy DataFrame compatibility
|
||||||
- `backend/schemas.py` - Column mappings, metric definitions, LA code mappings
|
- `backend/schemas.py` - Column mappings, metric definitions, LA code mappings
|
||||||
|
|
||||||
|
### Content / CMS (Payload)
|
||||||
|
|
||||||
|
Payload CMS runs **inside** the Next.js app — one image, one container, no
|
||||||
|
separate service. It powers `/blog`; `/about` is a plain coded page.
|
||||||
|
|
||||||
|
- **Admin panel:** `/admin`. The only authenticated surface on the site.
|
||||||
|
`noindex` via both `robots.txt` and `X-Robots-Tag`.
|
||||||
|
- **CMS API:** `/cms-api`, **not** `/api`. `/api/*` is a catch-all proxy to
|
||||||
|
FastAPI (`app/(frontend)/api/[...path]`) which would silently swallow every
|
||||||
|
admin call and forward it to the backend. Mount points are defined once in
|
||||||
|
`lib/payloadRoutes.ts`.
|
||||||
|
- **Database:** the existing Postgres, in its own `payload` schema, so no
|
||||||
|
pipeline operation on `public` — including
|
||||||
|
`scripts/migrate_csv_to_db.py --drop` — can reach blog content.
|
||||||
|
- **Uploads:** the `payload_media` Docker volume at `/app/media`. Not
|
||||||
|
reproducible from the pipeline; must be backed up.
|
||||||
|
- **New env vars:** `DATABASE_URL` and `PAYLOAD_SECRET` on the frontend service.
|
||||||
|
Staging must use a different `PAYLOAD_SECRET` from production.
|
||||||
|
- Publishing workflow and house style: `nextjs-app/docs/PUBLISHING.md`.
|
||||||
|
- **Admin field components resolve through a generated import map**
|
||||||
|
(`app/(payload)/admin/importMap.js`). Payload hands the client a *path* per
|
||||||
|
field and looks it up there; a missing entry renders no field and reports no
|
||||||
|
error, while `required` still blocks the save. After adding or changing any
|
||||||
|
field, editor or lexical feature, run `npm run generate:importmap` in
|
||||||
|
`nextjs-app/` and commit the result.
|
||||||
|
|
||||||
|
### Two route groups
|
||||||
|
|
||||||
|
`nextjs-app/app/` has no root `layout.tsx`. It cannot: Payload's admin panel
|
||||||
|
ships its own root layout rendering `<html>`/`<body>`, and Next permits
|
||||||
|
multiple root layouts only when no `app/layout.tsx` exists.
|
||||||
|
|
||||||
|
- `app/(frontend)/` — the site. Its `layout.tsx` is the site's root layout.
|
||||||
|
- `app/(payload)/` — the admin panel and `/cms-api`.
|
||||||
|
|
||||||
|
Route groups are invisible to routing, so every public URL is unchanged.
|
||||||
|
|
||||||
|
**The metadata file conventions stay at the `app/` root** — `robots.ts`,
|
||||||
|
`opengraph-image.tsx`, `icon.png`, `apple-icon.png`. Inside a route group Next
|
||||||
|
treats them as segment-scoped: it renames `/icon.png` to `/icon-<hash>.png` and
|
||||||
|
drops `/robots.txt` entirely. Route handlers are unaffected.
|
||||||
|
|
||||||
|
The build must succeed with `DATABASE_URL` unset, because CI builds it that
|
||||||
|
way. Never call `getCachedPayload()` at module scope, and never add
|
||||||
|
`generateStaticParams` to a DB-backed route.
|
||||||
|
|
||||||
### Frontend (Vanilla JS)
|
### Frontend (Vanilla JS)
|
||||||
- Single-page application with hash-based routing
|
- Single-page application with hash-based routing
|
||||||
- Chart.js for data visualization
|
- Chart.js for data visualization
|
||||||
|
|||||||
@@ -18,7 +18,14 @@
|
|||||||
# TYPESENSE_SEARCH_KEY — Typesense search-only key (exposed to frontend)
|
# TYPESENSE_SEARCH_KEY — Typesense search-only key (exposed to frontend)
|
||||||
# UNLEASH_URL — http://<unleash-ip>:4242/api (empty = all flags off)
|
# UNLEASH_URL — http://<unleash-ip>:4242/api (empty = all flags off)
|
||||||
# UNLEASH_API_TOKEN — Unleash *client* token, environment: development
|
# UNLEASH_API_TOKEN — Unleash *client* token, environment: development
|
||||||
# AIRFLOW_ADMIN_USER — Airflow admin username (password auto-generated, see api-server logs)
|
# PAYLOAD_SECRET — Payload CMS encryption secret. REQUIRED: long and
|
||||||
|
# random, and DIFFERENT from production's. Sharing
|
||||||
|
# it would let a staging session authenticate
|
||||||
|
# against production.
|
||||||
|
# AIRFLOW_ADMIN_USER — Airflow admin username (default: admin)
|
||||||
|
# AIRFLOW_ADMIN_PASSWORD — Airflow admin password. REQUIRED: the api-server
|
||||||
|
# refuses to start without it, rather than falling
|
||||||
|
# back to a generated one that changes on restart.
|
||||||
# STAGING_DB_IP — macvlan IP for staging Postgres (default 10.0.1.190)
|
# STAGING_DB_IP — macvlan IP for staging Postgres (default 10.0.1.190)
|
||||||
# STAGING_FRONTEND_IP — macvlan IP for staging frontend (default 10.0.1.151)
|
# STAGING_FRONTEND_IP — macvlan IP for staging frontend (default 10.0.1.151)
|
||||||
|
|
||||||
@@ -86,9 +93,20 @@ services:
|
|||||||
- FASTAPI_URL=http://backend:80/api
|
- FASTAPI_URL=http://backend:80/api
|
||||||
- TYPESENSE_URL=http://typesense:8108
|
- TYPESENSE_URL=http://typesense:8108
|
||||||
- TYPESENSE_API_KEY=${TYPESENSE_SEARCH_KEY:-changeme}
|
- TYPESENSE_API_KEY=${TYPESENSE_SEARCH_KEY:-changeme}
|
||||||
|
# Payload CMS runs inside this container, in the `payload` schema of the
|
||||||
|
# staging database. Staging has its own stack, its own Postgres and its
|
||||||
|
# own admin account — never production's.
|
||||||
|
- DATABASE_URL=postgresql://${DB_USERNAME}:${DB_PASSWORD}@sc_database:5432/${DB_DATABASE_NAME}
|
||||||
|
- PAYLOAD_SECRET=${PAYLOAD_SECRET:?set PAYLOAD_SECRET in the staging Portainer stack environment}
|
||||||
|
volumes:
|
||||||
|
# Portainer prefixes volume names with the stack name, so this is
|
||||||
|
# automatically isolated from production's media.
|
||||||
|
- payload_media:/app/media
|
||||||
depends_on:
|
depends_on:
|
||||||
backend:
|
backend:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
|
sc_database:
|
||||||
|
condition: service_healthy
|
||||||
networks:
|
networks:
|
||||||
backend: {}
|
backend: {}
|
||||||
macvlan:
|
macvlan:
|
||||||
@@ -124,7 +142,23 @@ services:
|
|||||||
airflow-api-server:
|
airflow-api-server:
|
||||||
image: privaterepo.sitaru.org/tudor/school_compare-pipeline:staging
|
image: privaterepo.sitaru.org/tudor/school_compare-pipeline:staging
|
||||||
container_name: sc_staging_airflow_api
|
container_name: sc_staging_airflow_api
|
||||||
command: airflow api-server --port 8080
|
# The simple auth manager generates a random password on first start and
|
||||||
|
# writes it to a file, so every container restart invalidates the last one.
|
||||||
|
# Writing the file ourselves from an environment variable makes the login
|
||||||
|
# deterministic. Airflow does not generate anything when the file exists.
|
||||||
|
#
|
||||||
|
# Built with python rather than echo/printf so a password containing quotes,
|
||||||
|
# backslashes or spaces is escaped correctly by json.dumps. An unset
|
||||||
|
# AIRFLOW_ADMIN_PASSWORD raises KeyError and the container exits: falling
|
||||||
|
# back to a generated password would silently undo the point of this.
|
||||||
|
command:
|
||||||
|
- bash
|
||||||
|
- -c
|
||||||
|
- |
|
||||||
|
set -euo pipefail
|
||||||
|
mkdir -p /opt/airflow
|
||||||
|
python -c "import json, os, pathlib; pathlib.Path('/opt/airflow/simple_auth_manager_passwords.json').write_text(json.dumps({os.environ.get('AIRFLOW_ADMIN_USER', 'admin'): os.environ['AIRFLOW_ADMIN_PASSWORD']}))"
|
||||||
|
exec airflow api-server --port 8080
|
||||||
ports:
|
ports:
|
||||||
- "8081:8080"
|
- "8081:8080"
|
||||||
environment:
|
environment:
|
||||||
@@ -136,6 +170,8 @@ services:
|
|||||||
AIRFLOW__API_AUTH__JWT_SECRET: "school-compare-staging-airflow-jwt-secret-key-long-enough-for-sha512"
|
AIRFLOW__API_AUTH__JWT_SECRET: "school-compare-staging-airflow-jwt-secret-key-long-enough-for-sha512"
|
||||||
AIRFLOW__API_AUTH__JWT_ISSUER: airflow
|
AIRFLOW__API_AUTH__JWT_ISSUER: airflow
|
||||||
AIRFLOW__CORE__SIMPLE_AUTH_MANAGER_USERS: "${AIRFLOW_ADMIN_USER:-admin}:admin"
|
AIRFLOW__CORE__SIMPLE_AUTH_MANAGER_USERS: "${AIRFLOW_ADMIN_USER:-admin}:admin"
|
||||||
|
AIRFLOW__CORE__SIMPLE_AUTH_MANAGER_PASSWORDS_FILE: /opt/airflow/simple_auth_manager_passwords.json
|
||||||
|
AIRFLOW_ADMIN_PASSWORD: ${AIRFLOW_ADMIN_PASSWORD:?set AIRFLOW_ADMIN_PASSWORD in the Portainer stack environment}
|
||||||
AIRFLOW__LOGGING__BASE_LOG_FOLDER: /opt/airflow/logs
|
AIRFLOW__LOGGING__BASE_LOG_FOLDER: /opt/airflow/logs
|
||||||
PG_HOST: sc_database
|
PG_HOST: sc_database
|
||||||
PG_PORT: "5432"
|
PG_PORT: "5432"
|
||||||
@@ -221,3 +257,4 @@ volumes:
|
|||||||
typesense_data:
|
typesense_data:
|
||||||
airflow_logs:
|
airflow_logs:
|
||||||
unleash_cache:
|
unleash_cache:
|
||||||
|
payload_media:
|
||||||
@@ -9,7 +9,13 @@
|
|||||||
# TYPESENSE_SEARCH_KEY — Typesense search-only key (exposed to frontend)
|
# TYPESENSE_SEARCH_KEY — Typesense search-only key (exposed to frontend)
|
||||||
# UNLEASH_URL — http://<unleash-ip>:4242/api (empty = all flags off)
|
# UNLEASH_URL — http://<unleash-ip>:4242/api (empty = all flags off)
|
||||||
# UNLEASH_API_TOKEN — Unleash *client* token, environment: production
|
# UNLEASH_API_TOKEN — Unleash *client* token, environment: production
|
||||||
# AIRFLOW_ADMIN_USER — Airflow admin username (password auto-generated, see api-server logs)
|
# PAYLOAD_SECRET — Payload CMS encryption secret. REQUIRED: long and
|
||||||
|
# random. Changing it invalidates every admin
|
||||||
|
# session. Staging MUST use a different value.
|
||||||
|
# AIRFLOW_ADMIN_USER — Airflow admin username (default: admin)
|
||||||
|
# AIRFLOW_ADMIN_PASSWORD — Airflow admin password. REQUIRED: the api-server
|
||||||
|
# refuses to start without it, rather than falling
|
||||||
|
# back to a generated one that changes on restart.
|
||||||
|
|
||||||
services:
|
services:
|
||||||
|
|
||||||
@@ -75,9 +81,21 @@ services:
|
|||||||
- FASTAPI_URL=http://backend:80/api
|
- FASTAPI_URL=http://backend:80/api
|
||||||
- TYPESENSE_URL=http://typesense:8108
|
- TYPESENSE_URL=http://typesense:8108
|
||||||
- TYPESENSE_API_KEY=${TYPESENSE_SEARCH_KEY:-changeme}
|
- TYPESENSE_API_KEY=${TYPESENSE_SEARCH_KEY:-changeme}
|
||||||
|
# Payload CMS runs inside this container. It reaches Postgres over the
|
||||||
|
# `backend` network and keeps its tables in the `payload` schema, so no
|
||||||
|
# pipeline operation on `public` can touch blog content.
|
||||||
|
- DATABASE_URL=postgresql://${DB_USERNAME}:${DB_PASSWORD}@sc_database:5432/${DB_DATABASE_NAME}
|
||||||
|
# Same :? form as AIRFLOW_ADMIN_PASSWORD: refuse to start rather than
|
||||||
|
# boot with an empty secret and silently accept forged sessions.
|
||||||
|
- PAYLOAD_SECRET=${PAYLOAD_SECRET:?set PAYLOAD_SECRET in the Portainer stack environment}
|
||||||
|
volumes:
|
||||||
|
# Blog images. Not reproducible from the pipeline — must be backed up.
|
||||||
|
- payload_media:/app/media
|
||||||
depends_on:
|
depends_on:
|
||||||
backend:
|
backend:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
|
sc_database:
|
||||||
|
condition: service_healthy
|
||||||
networks:
|
networks:
|
||||||
backend: {}
|
backend: {}
|
||||||
macvlan:
|
macvlan:
|
||||||
@@ -113,7 +131,23 @@ services:
|
|||||||
airflow-api-server:
|
airflow-api-server:
|
||||||
image: privaterepo.sitaru.org/tudor/school_compare-pipeline:prod
|
image: privaterepo.sitaru.org/tudor/school_compare-pipeline:prod
|
||||||
container_name: schoolcompare_airflow_api
|
container_name: schoolcompare_airflow_api
|
||||||
command: airflow api-server --port 8080
|
# The simple auth manager generates a random password on first start and
|
||||||
|
# writes it to a file, so every container restart invalidates the last one.
|
||||||
|
# Writing the file ourselves from an environment variable makes the login
|
||||||
|
# deterministic. Airflow does not generate anything when the file exists.
|
||||||
|
#
|
||||||
|
# Built with python rather than echo/printf so a password containing quotes,
|
||||||
|
# backslashes or spaces is escaped correctly by json.dumps. An unset
|
||||||
|
# AIRFLOW_ADMIN_PASSWORD raises KeyError and the container exits: falling
|
||||||
|
# back to a generated password would silently undo the point of this.
|
||||||
|
command:
|
||||||
|
- bash
|
||||||
|
- -c
|
||||||
|
- |
|
||||||
|
set -euo pipefail
|
||||||
|
mkdir -p /opt/airflow
|
||||||
|
python -c "import json, os, pathlib; pathlib.Path('/opt/airflow/simple_auth_manager_passwords.json').write_text(json.dumps({os.environ.get('AIRFLOW_ADMIN_USER', 'admin'): os.environ['AIRFLOW_ADMIN_PASSWORD']}))"
|
||||||
|
exec airflow api-server --port 8080
|
||||||
ports:
|
ports:
|
||||||
- "8080:8080"
|
- "8080:8080"
|
||||||
environment:
|
environment:
|
||||||
@@ -125,6 +159,8 @@ services:
|
|||||||
AIRFLOW__API_AUTH__JWT_SECRET: "school-compare-airflow-jwt-secret-key-long-enough-for-sha512"
|
AIRFLOW__API_AUTH__JWT_SECRET: "school-compare-airflow-jwt-secret-key-long-enough-for-sha512"
|
||||||
AIRFLOW__API_AUTH__JWT_ISSUER: airflow
|
AIRFLOW__API_AUTH__JWT_ISSUER: airflow
|
||||||
AIRFLOW__CORE__SIMPLE_AUTH_MANAGER_USERS: "${AIRFLOW_ADMIN_USER:-admin}:admin"
|
AIRFLOW__CORE__SIMPLE_AUTH_MANAGER_USERS: "${AIRFLOW_ADMIN_USER:-admin}:admin"
|
||||||
|
AIRFLOW__CORE__SIMPLE_AUTH_MANAGER_PASSWORDS_FILE: /opt/airflow/simple_auth_manager_passwords.json
|
||||||
|
AIRFLOW_ADMIN_PASSWORD: ${AIRFLOW_ADMIN_PASSWORD:?set AIRFLOW_ADMIN_PASSWORD in the Portainer stack environment}
|
||||||
AIRFLOW__LOGGING__BASE_LOG_FOLDER: /opt/airflow/logs
|
AIRFLOW__LOGGING__BASE_LOG_FOLDER: /opt/airflow/logs
|
||||||
PG_HOST: sc_database
|
PG_HOST: sc_database
|
||||||
PG_PORT: "5432"
|
PG_PORT: "5432"
|
||||||
@@ -210,3 +246,4 @@ volumes:
|
|||||||
typesense_data:
|
typesense_data:
|
||||||
airflow_logs:
|
airflow_logs:
|
||||||
unleash_cache:
|
unleash_cache:
|
||||||
|
payload_media:
|
||||||
+19
-1
@@ -105,7 +105,23 @@ services:
|
|||||||
airflow-api-server:
|
airflow-api-server:
|
||||||
image: privaterepo.sitaru.org/tudor/school_compare-pipeline:latest
|
image: privaterepo.sitaru.org/tudor/school_compare-pipeline:latest
|
||||||
container_name: schoolcompare_airflow_api
|
container_name: schoolcompare_airflow_api
|
||||||
command: airflow api-server --port 8080
|
# The simple auth manager generates a random password on first start and
|
||||||
|
# writes it to a file, so every container restart invalidates the last one.
|
||||||
|
# Writing the file ourselves from an environment variable makes the login
|
||||||
|
# deterministic. Airflow does not generate anything when the file exists.
|
||||||
|
#
|
||||||
|
# Built with python rather than echo/printf so a password containing quotes,
|
||||||
|
# backslashes or spaces is escaped correctly by json.dumps. An unset
|
||||||
|
# AIRFLOW_ADMIN_PASSWORD raises KeyError and the container exits: falling
|
||||||
|
# back to a generated password would silently undo the point of this.
|
||||||
|
command:
|
||||||
|
- bash
|
||||||
|
- -c
|
||||||
|
- |
|
||||||
|
set -euo pipefail
|
||||||
|
mkdir -p /opt/airflow
|
||||||
|
python -c "import json, os, pathlib; pathlib.Path('/opt/airflow/simple_auth_manager_passwords.json').write_text(json.dumps({os.environ.get('AIRFLOW_ADMIN_USER', 'admin'): os.environ['AIRFLOW_ADMIN_PASSWORD']}))"
|
||||||
|
exec airflow api-server --port 8080
|
||||||
ports:
|
ports:
|
||||||
- "8080:8080"
|
- "8080:8080"
|
||||||
environment: &airflow-env
|
environment: &airflow-env
|
||||||
@@ -117,6 +133,8 @@ services:
|
|||||||
AIRFLOW__API_AUTH__JWT_SECRET: "school-compare-airflow-jwt-secret-key-long-enough-for-sha512"
|
AIRFLOW__API_AUTH__JWT_SECRET: "school-compare-airflow-jwt-secret-key-long-enough-for-sha512"
|
||||||
AIRFLOW__API_AUTH__JWT_ISSUER: airflow
|
AIRFLOW__API_AUTH__JWT_ISSUER: airflow
|
||||||
AIRFLOW__CORE__SIMPLE_AUTH_MANAGER_USERS: "admin:admin"
|
AIRFLOW__CORE__SIMPLE_AUTH_MANAGER_USERS: "admin:admin"
|
||||||
|
AIRFLOW__CORE__SIMPLE_AUTH_MANAGER_PASSWORDS_FILE: /opt/airflow/simple_auth_manager_passwords.json
|
||||||
|
AIRFLOW_ADMIN_PASSWORD: ${AIRFLOW_ADMIN_PASSWORD:-admin}
|
||||||
PG_HOST: db
|
PG_HOST: db
|
||||||
PG_PORT: "5432"
|
PG_PORT: "5432"
|
||||||
PG_USER: schoolcompare
|
PG_USER: schoolcompare
|
||||||
|
|||||||
+28
-3
@@ -98,6 +98,12 @@ fail the E2E gate. That's the point: staging absorbs the risk.
|
|||||||
pr-checks status checks (frontend, backend, builds, ai-review) to pass.
|
pr-checks status checks (frontend, backend, builds, ai-review) to pass.
|
||||||
5. **Bootstrap staging data via Airflow** (no prod dump — staging populates
|
5. **Bootstrap staging data via Airflow** (no prod dump — staging populates
|
||||||
itself from source, exercising the pipeline image end-to-end):
|
itself from source, exercising the pipeline image end-to-end):
|
||||||
|
- Set `AIRFLOW_ADMIN_PASSWORD` in the stack environment first. The
|
||||||
|
api-server refuses to start without it. Airflow's simple auth manager
|
||||||
|
otherwise generates a password on first start and writes it to a file, so
|
||||||
|
the login changes every time the container restarts; the stack writes that
|
||||||
|
file itself from this variable instead. `AIRFLOW_ADMIN_USER` defaults to
|
||||||
|
`admin`.
|
||||||
- Open the staging Airflow UI (`http://<host>:8081`) and trigger, in order:
|
- Open the staging Airflow UI (`http://<host>:8081`) and trigger, in order:
|
||||||
`school_data_daily`, `school_data_monthly_ofsted`, then the manual-schedule
|
`school_data_daily`, `school_data_monthly_ofsted`, then the manual-schedule
|
||||||
`school_data_annual_ees` and `school_data_annual_idaci`.
|
`school_data_annual_ees` and `school_data_annual_idaci`.
|
||||||
@@ -206,11 +212,30 @@ registry is orphaned and nothing reads it.
|
|||||||
variable, and set `UNLEASH_URL` to `http://<UNLEASH_IP>:4242/api`.
|
variable, and set `UNLEASH_URL` to `http://<UNLEASH_IP>:4242/api`.
|
||||||
5. Redeploy the application stacks.
|
5. Redeploy the application stacks.
|
||||||
|
|
||||||
|
### Adding a flag to Unleash
|
||||||
|
|
||||||
|
**Unleash does not create flags by itself.** The SDK reads definitions from the
|
||||||
|
server and never registers anything, and metrics for a flag the server has
|
||||||
|
never heard of are discarded. So a flag declared in `backend/flags.py` will be
|
||||||
|
evaluated on every request, stay `False` forever, and never appear in the UI
|
||||||
|
until someone creates it there by hand.
|
||||||
|
|
||||||
|
For each flag in the registry, create one in Unleash with:
|
||||||
|
|
||||||
|
- **Name** — character for character what `backend/flags.py` declares.
|
||||||
|
snake_case, no hyphens or spaces. A typo produces a flag that looks correct
|
||||||
|
in the UI and is read by nothing.
|
||||||
|
- **Type** — Release. No strategies, constraints or variants: these are plain
|
||||||
|
on/off switches, by design.
|
||||||
|
|
||||||
### Turning a feature on
|
### Turning a feature on
|
||||||
|
|
||||||
Toggle the flag in the environment you want. Flags appear in the Unleash UI
|
Toggle the flag in the environment matching the stack you mean: **development**
|
||||||
after the backend has evaluated them once, so a newly declared flag shows up
|
for staging, **production** for prod. The token in each stack is scoped to one
|
||||||
shortly after the deploy that introduced it.
|
environment, so toggling the other one has no visible effect.
|
||||||
|
|
||||||
|
The SDK refreshes every 15 seconds, so the API reflects the change almost at
|
||||||
|
once; the pages follow on their own schedule, below.
|
||||||
|
|
||||||
A flip reaches school pages within about five minutes and place pages within
|
A flip reaches school pages within about five minutes and place pages within
|
||||||
the hour. Next's ISR does the propagating — it revalidates a route at the
|
the hour. Next's ISR does the propagating — it revalidates a route at the
|
||||||
|
|||||||
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
@@ -0,0 +1,399 @@
|
|||||||
|
# Destination Measures — Design
|
||||||
|
|
||||||
|
**Date:** 2026-08-28
|
||||||
|
**Status:** awaiting review
|
||||||
|
**Scope:** secondary school detail pages only
|
||||||
|
|
||||||
|
## Goal
|
||||||
|
|
||||||
|
Say what happened to a school's leavers after they left. Two sections on the
|
||||||
|
secondary template:
|
||||||
|
|
||||||
|
- **After Year 11** — every secondary, from the KS4 destination measures
|
||||||
|
- **After the sixth form** — sixth-form schools only, from the 16-18 measures
|
||||||
|
|
||||||
|
This replaces the "Post-16 destination data coming soon" placeholder standing in
|
||||||
|
`nextjs-app/components/school/SecondaryAdmissionsSection.tsx:117` since the exam
|
||||||
|
phase taxonomy work, and fills the `ks5_destinations_pct` slot specified but
|
||||||
|
never built in `2026-07-07-exam-phase-taxonomy-design.md:201`.
|
||||||
|
|
||||||
|
Mockup, with all three data states live:
|
||||||
|
<https://claude.ai/code/artifact/5be149d6-252f-473c-9a4f-4c36b05161b0>
|
||||||
|
|
||||||
|
## The finding that shapes everything
|
||||||
|
|
||||||
|
**Suppression is per cell, and the cells sum to the cohort.**
|
||||||
|
|
||||||
|
DfE withholds a figure it considers disclosive by writing `c`. It does this at
|
||||||
|
the level of an individual destination category, not the whole school, and it
|
||||||
|
publishes the cohort total alongside. The categories form a clean partition. So
|
||||||
|
where exactly one category is suppressed, subtracting the published ones from the
|
||||||
|
cohort recovers it exactly.
|
||||||
|
|
||||||
|
Verified against three real schools in the 2022/23 file:
|
||||||
|
|
||||||
|
| School | URN | Withheld | Recovers to |
|
||||||
|
|---|---|---|---|
|
||||||
|
| North East Futures UTC | 145900 | School sixth form | **3 pupils** |
|
||||||
|
| Whitley Bay High School | 108638 | Further education | **18 pupils** |
|
||||||
|
| St Matthew's RC High School | 148389 | School sixth form | **4 pupils** |
|
||||||
|
|
||||||
|
Those are the precise numbers the `c` exists to hide, and in a random 400-school
|
||||||
|
sample **22% of mainstream secondaries** have exactly one suppressed category in
|
||||||
|
their disadvantaged group. This is the normal case, not an edge case.
|
||||||
|
|
||||||
|
Three rules follow, and everything else in this document is downstream of them.
|
||||||
|
|
||||||
|
**R1 — Never *publish* enough to derive a remainder.**
|
||||||
|
|
||||||
|
An earlier draft of this rule said "never *render* a derived remainder", and
|
||||||
|
that was the defect code review caught in PR #137. Not drawing a number does
|
||||||
|
nothing to stop it being computed: `GET /api/schools/{urn}` is public and
|
||||||
|
unauthenticated, so anything in the payload is published whatever the UI
|
||||||
|
chooses to draw. The rendering guards shipped; the payload still carried the
|
||||||
|
cohort and every published category, and `cohort - sum(published)` returned
|
||||||
|
Whitley Bay's withheld figure exactly.
|
||||||
|
|
||||||
|
The rule is therefore about the serialiser, and the UI guards are a second line
|
||||||
|
of defence behind it. Two identities have to be closed:
|
||||||
|
|
||||||
|
- within a pupil group the categories sum to the cohort, so a group with
|
||||||
|
exactly **one** suppressed category gives it away;
|
||||||
|
- across groups, disadvantaged + other = all for every category, so a category
|
||||||
|
suppressed in exactly **one** of the three gives itself away.
|
||||||
|
|
||||||
|
`_mask_for_disclosure` applies DfE's own answer — secondary suppression —
|
||||||
|
withholding a companion cell until every row and every column hides either none
|
||||||
|
or at least two. It iterates, because each new suppression can break the other
|
||||||
|
identity, and terminates because cells are only ever added.
|
||||||
|
|
||||||
|
The companion must carry pupils. Suppressing a zero looks like secondary
|
||||||
|
suppression and protects nothing: the residual still equals the original
|
||||||
|
withheld figure.
|
||||||
|
|
||||||
|
Where no companion can do the job — a sparse cohort whose every other category
|
||||||
|
is `not_applicable`, routine in special schools and alternative provision — the
|
||||||
|
pupil group is **dropped from the payload entirely**. A first version simply
|
||||||
|
returned at that point with the violation intact and no signal, which review
|
||||||
|
caught: a disclosure-control pass that fails silently is worse than none,
|
||||||
|
because everything downstream trusts it. The function now cannot terminate
|
||||||
|
except in a state where `disclosure_invariant_holds()` is true, and an
|
||||||
|
exhaustive test sweeps all 81 suppression patterns of a four-category group to
|
||||||
|
prove it.
|
||||||
|
|
||||||
|
Measured cost on the 400-school sample: the all-pupils bar survives on **94%**
|
||||||
|
of mainstream secondaries rather than 100%. That is the price of not
|
||||||
|
republishing what DfE withheld.
|
||||||
|
|
||||||
|
**R2 — Never aggregate across a suppression boundary.** Summing published
|
||||||
|
components to fill a gap is R1 with extra steps.
|
||||||
|
|
||||||
|
DfE's own aggregates (`Sustained education destination`, `Sustained education,
|
||||||
|
employment & apprenticeships`) are ingested but **not served**. An aggregate
|
||||||
|
spanning exactly one suppressed component names it, and nothing renders them
|
||||||
|
today — an unused field that leaks is not a trade-off worth carrying. They can
|
||||||
|
be re-added with their own guard if the fallback ladder is ever built.
|
||||||
|
|
||||||
|
**R3 — The three pupil groups are one disclosure surface, not three.**
|
||||||
|
Disadvantaged and Not-known-to-be-disadvantaged partition All pupils, so
|
||||||
|
rendering any *two* of them recovers the third. Where a category is suppressed in
|
||||||
|
the disadvantaged group, it must therefore also be withheld from **all other
|
||||||
|
pupils** — the all-pupils view is the primary one and keeps it.
|
||||||
|
|
||||||
|
This costs almost nothing, because DfE already applies the same masking: across
|
||||||
|
the sample, 493 of 498 suppressed disadvantaged cells were suppressed in the
|
||||||
|
other group too. The mart enforces the remaining 5, which fell on 2 schools of
|
||||||
|
262. **The all-pupils bar is unaffected** — masking the whole page wherever the
|
||||||
|
disadvantaged group is thin would remove the bar from 80% of schools, and is not
|
||||||
|
what this rule says.
|
||||||
|
|
||||||
|
R1 and R2 both hold within a group and still leak across the switch, which is why
|
||||||
|
R3 is stated separately.
|
||||||
|
|
||||||
|
### The convention that would break this quietly
|
||||||
|
|
||||||
|
`macros/safe_numeric.sql` coerces every EES sentinel — `z`, `c`, `x`, `q`, `u` —
|
||||||
|
to `NULL`, deliberately and correctly for attainment, where "suppressed" and "no
|
||||||
|
data" are equally unrenderable. Here they are not the same thing: one must print
|
||||||
|
*withheld*, the other must print nothing at all, and the difference is what keeps
|
||||||
|
R1 enforceable.
|
||||||
|
|
||||||
|
**`safe_numeric` must not be used on destination counts.** The staging model
|
||||||
|
keeps the sentinel in a companion status column. This is the single most likely
|
||||||
|
way for this feature to regress into a disclosure, so it gets its own dbt test.
|
||||||
|
|
||||||
|
## What is actually available
|
||||||
|
|
||||||
|
Measured against the EES public API (open, no key). Both datasets carry
|
||||||
|
`geographicLevel: School` with `urn` on every location option, so the join to
|
||||||
|
`dim_school` is direct.
|
||||||
|
|
||||||
|
| | KS4 | 16-18 |
|
||||||
|
|---|---|---|
|
||||||
|
| Dataset id | `019d4f41-22d1-71b2-a1a7-f3b91026815b` | `019d4e73-6440-7523-b60c-bfab1ad4a30d` |
|
||||||
|
| Rows | 1,871,739 | 3,862,658 |
|
||||||
|
| Institutions | 4,946 | 3,065 |
|
||||||
|
| Time periods | 2009/10–2022/23 | 2016/17–2022/23 |
|
||||||
|
|
||||||
|
**Destination categories (KS4).** School sixth form · Sixth form college ·
|
||||||
|
Further education · Other education destination · Sustained apprenticeships (with
|
||||||
|
level breakdown) · Sustained employment destination · Not recorded as a sustained
|
||||||
|
destination · Activity not captured. Plus the aggregates `Sustained education
|
||||||
|
destination` and `Sustained education, employment & apprenticeships`.
|
||||||
|
|
||||||
|
**16-18 adds** UK higher education institution and FE split by level, which is
|
||||||
|
what makes the post-16 section worth having.
|
||||||
|
|
||||||
|
**Breakdowns.** `Disadvantage Status` gives Disadvantaged / Not known to be
|
||||||
|
disadvantaged / Total — exactly the three-way switch. Sex, ethnicity, FSM status,
|
||||||
|
prior attainment and SEN provision also travel in the same table; we ingest none
|
||||||
|
of them.
|
||||||
|
|
||||||
|
**Indicators.** Both counts and percentages, plus the cohort size. Bar widths use
|
||||||
|
the counts — the published percentages do not sum to 100.
|
||||||
|
|
||||||
|
### Coverage, and what degrades
|
||||||
|
|
||||||
|
Random 400-school sample, 2022/23, mainstream secondaries (n=262):
|
||||||
|
|
||||||
|
| View | As published by DfE | After R1–R3 masking | Consequence |
|
||||||
|
|---|---|---|---|
|
||||||
|
| All pupils, all categories | 100% | **94%** | Bar works nearly everywhere |
|
||||||
|
| Disadvantaged, headline rate | 95% | 95% | Gap panel works |
|
||||||
|
| Disadvantaged, three grouped cards | 68% | 68% | Degrades card by card |
|
||||||
|
| Disadvantaged, all six categories | 20% | **20%** | Bar unusable for this group |
|
||||||
|
|
||||||
|
The middle column is what the site actually serves. Masking costs the
|
||||||
|
all-pupils bar on 6% of mainstream secondaries — those are schools where a
|
||||||
|
category was suppressed in exactly one pupil group and no non-zero companion
|
||||||
|
existed below the all-pupils row.
|
||||||
|
|
||||||
|
Special schools and alternative provision are far worse: 13% and 41% respectively
|
||||||
|
have the whole cohort suppressed even for all pupils. The empty state is
|
||||||
|
load-bearing, not defensive.
|
||||||
|
|
||||||
|
## The display
|
||||||
|
|
||||||
|
Question-led. Three cards over one bar, with the cards acting as a lens on the
|
||||||
|
bar rather than a summary beside it — hovering a card dims the bar, table and
|
||||||
|
England reference to the categories that card is built from. The full mockup is
|
||||||
|
linked above; what matters for implementation:
|
||||||
|
|
||||||
|
**The headline is not the sustained rate.** That figure sits between 92% and 97%
|
||||||
|
for nearly every school in England. The mix is what varies, so the mix leads.
|
||||||
|
|
||||||
|
**The grouping is ours, not DfE's.** "Academic route" = school sixth form +
|
||||||
|
sixth-form college; "College" = FE and other colleges; "Work" = apprenticeship +
|
||||||
|
employment. This is the most arguable thing on the page, so it lives in one place
|
||||||
|
in `lib/destinations.ts`, is explained in a tooltip, and is reversible in one
|
||||||
|
edit.
|
||||||
|
|
||||||
|
**The absence is hatched neutral, never a colour.** "Activity not captured" means
|
||||||
|
no record in the sources DfE holds — it includes independent schools, moving
|
||||||
|
abroad and private training. Colouring it as a bad outcome would be a factual
|
||||||
|
error rendered in CSS. The hatch also fixes a real contrast problem: neutral
|
||||||
|
against the employment blue failed CVD separation at ΔE 7.6, and texture is the
|
||||||
|
secondary encoding that rescues it. Every other adjacent pair clears ΔE 10.9
|
||||||
|
under protanopia.
|
||||||
|
|
||||||
|
**Colour tokens.** Education is one hue in three steps (school-like to
|
||||||
|
college-like); apprenticeship and employment are separate hues. Six new tokens in
|
||||||
|
`globals.css`, defined in both themes, per the existing token discipline.
|
||||||
|
|
||||||
|
**The disadvantage split rides the same control.** One visualisation serving
|
||||||
|
three cohorts, with the England reference repointing to the matching national
|
||||||
|
group. The gap statement stays visible below the bar whatever is selected,
|
||||||
|
because a gap nobody clicks on is a gap nobody sees.
|
||||||
|
|
||||||
|
## Data model
|
||||||
|
|
||||||
|
### Extraction
|
||||||
|
|
||||||
|
A new `tap-uk-ees-destinations` extractor, separate from `tap-uk-ees`. The
|
||||||
|
existing tap downloads a release ZIP and reads a CSV inside it; the destinations
|
||||||
|
files are far larger than we need and the query API filters server-side, so this
|
||||||
|
one POSTs to `/v1/data-sets/{id}/query` and pages through results.
|
||||||
|
|
||||||
|
With every dimension pinned — destination measures, disadvantage status, sex
|
||||||
|
Total, characteristic topic Total — one year returns **252,610 rows** across all
|
||||||
|
geographic levels. Three school-level years is comfortably tractable.
|
||||||
|
|
||||||
|
Pinning is mandatory, not an optimisation: leaving the characteristic dimensions
|
||||||
|
unconstrained returned 45 rows where 9 were wanted, because every breakdown
|
||||||
|
shares one table.
|
||||||
|
|
||||||
|
The tap emits the raw value as text. **It does not coerce `c`.**
|
||||||
|
|
||||||
|
### Staging
|
||||||
|
|
||||||
|
`stg_ees_ks4_destinations` / `stg_ees_ks5_destinations`. Each raw value becomes
|
||||||
|
two columns:
|
||||||
|
|
||||||
|
```sql
|
||||||
|
case when raw ~ '^-?[0-9]+(\.[0-9]+)?$' then raw::numeric end as pupils,
|
||||||
|
case
|
||||||
|
when raw ~ '^-?[0-9]+(\.[0-9]+)?$' then 'published'
|
||||||
|
when lower(trim(raw)) = 'c' then 'suppressed'
|
||||||
|
else 'not_applicable'
|
||||||
|
end as status
|
||||||
|
```
|
||||||
|
|
||||||
|
### Marts
|
||||||
|
|
||||||
|
`fact_ks4_destinations` and `fact_ks5_destinations`, **long format**:
|
||||||
|
|
||||||
|
```
|
||||||
|
urn, year, pupil_group, destination_category, cohort_pupils, pupils, percentage, status
|
||||||
|
```
|
||||||
|
|
||||||
|
This departs from the wide house pattern (`fact_ks4_performance` and friends) on
|
||||||
|
purpose. `pupil_group` is a genuine third dimension; going wide would need three
|
||||||
|
sets of every column, and R2 is far easier to test on rows than on columns.
|
||||||
|
|
||||||
|
Roughly 8 categories × 3 groups × 4,946 schools × 3 years ≈ 356k rows.
|
||||||
|
|
||||||
|
`fact_destination_national` carries the same grain for England, so the page's
|
||||||
|
England reference repoints with the switch.
|
||||||
|
|
||||||
|
### dbt tests
|
||||||
|
|
||||||
|
- `assert_destinations_no_derived_remainder` — for every (urn, year,
|
||||||
|
pupil_group) with exactly one suppressed category, assert no aggregate row
|
||||||
|
exists that would let the residual be recovered. **This is the R1 guard.**
|
||||||
|
- `assert_destinations_group_masking` — for every (urn, year, category), if the
|
||||||
|
disadvantaged group carries `suppressed`, so does the other-pupils group.
|
||||||
|
**This is the R3 guard**, applied in the mart so no consumer can reach an
|
||||||
|
unmasked combination.
|
||||||
|
- `assert_destination_status_null_agreement` — `pupils is null` wherever
|
||||||
|
`status != 'published'`, and never null where it is.
|
||||||
|
- `assert_destinations_join_dim_school` — no orphaned URNs, matching the
|
||||||
|
existing `assert_no_orphaned_facts` pattern.
|
||||||
|
|
||||||
|
## API
|
||||||
|
|
||||||
|
`GET /api/schools/{urn}` gains a `destinations` block:
|
||||||
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"ks4": {
|
||||||
|
"cohort_year": "2022/23",
|
||||||
|
"published": "2026-04",
|
||||||
|
"groups": {
|
||||||
|
"all": { "cohort": 180, "categories": [ … ], "aggregates": { … } },
|
||||||
|
"disadvantaged": { … },
|
||||||
|
"other": { … }
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"ks5": { … }
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
Each category carries `pupils`, `percentage` and `status`. **The serialiser never
|
||||||
|
emits a computed remainder**, and a backend test asserts that a group containing a
|
||||||
|
suppressed category serialises no total that closes the gap.
|
||||||
|
|
||||||
|
`null` for the whole block where nothing is published — the frontend renders the
|
||||||
|
empty state from its absence, not from a sentinel.
|
||||||
|
|
||||||
|
## Frontend
|
||||||
|
|
||||||
|
| File | Kind | Job |
|
||||||
|
|---|---|---|
|
||||||
|
| `lib/destinations.ts` | pure | Category list, the academic/college/work grouping, `canAggregate()` enforcing R2, percentage derivation from counts |
|
||||||
|
| `components/school/DestinationsSection.tsx` | server | Section shell, renders **all pupils** into the HTML |
|
||||||
|
| `components/school/DestinationsView.tsx` | client | Cohort switch, card↔bar linkage |
|
||||||
|
| `components/school/Post16DestinationsSection.tsx` | server | Year 13 section, sixth-form schools only |
|
||||||
|
| `app/globals.css` | tokens | Six destination colours, both themes |
|
||||||
|
|
||||||
|
Server-first matches the directory's existing discipline — every component in
|
||||||
|
`components/school/` is a server component except `AdmissionsViewToggle`, which
|
||||||
|
is the precedent this follows. All-pupils figures are in the HTML for crawlers
|
||||||
|
and for no-JS; only the switch and the hover linkage need the client.
|
||||||
|
|
||||||
|
`lib/schoolSections.ts` gains `hasKs4Destinations` / `hasKs5Destinations` flags
|
||||||
|
and the nav items, following the existing `computeSchoolFlags` pattern.
|
||||||
|
|
||||||
|
**Placement** on the secondary template: GCSE results → After Year 11 → After the
|
||||||
|
sixth form → admissions. Destinations follow attainment because they answer "and
|
||||||
|
then what happened".
|
||||||
|
|
||||||
|
**Dating.** The latest destination year is 2022/23, published April 2026, while
|
||||||
|
the site's newest KS4 year is 2024/25. The section header states its own cohort
|
||||||
|
year, or it reads as stale data next to the GCSE section above it.
|
||||||
|
|
||||||
|
## Edge states
|
||||||
|
|
||||||
|
| State | Frequency | Behaviour |
|
||||||
|
|---|---|---|
|
||||||
|
| Whole cohort suppressed | 13% of special, 41% of AP | Section renders the explanation, no chart |
|
||||||
|
| Some categories withheld | 80% of disadvantaged views | Cards degrade individually; **no bar**; table marks withheld rows |
|
||||||
|
| Disadvantaged group suppressed entirely | 5% | Switch drops to two options, gap panel not rendered |
|
||||||
|
| No sixth form | — | Post-16 section not rendered at all — absence is correct, a "no data" placeholder would imply something is missing |
|
||||||
|
| School too new | — | "First figures expected in 2026", not a bare no |
|
||||||
|
|
||||||
|
## Testing
|
||||||
|
|
||||||
|
Per CLAUDE.md, user-facing behaviour extends `e2e/` in the same PR.
|
||||||
|
|
||||||
|
**Unit** — `lib/destinations.ts` is where R1 and R2 live, so it carries the
|
||||||
|
heaviest tests: `canAggregate()` refuses a group containing one suppressed cell,
|
||||||
|
allows one spanning two, and the bar builder refuses to emit segments for any
|
||||||
|
group with suppression. These are the tests that must fail loudly if someone
|
||||||
|
later "fixes" a gap in the chart.
|
||||||
|
|
||||||
|
**dbt** — the three tests above.
|
||||||
|
|
||||||
|
**Backend** — the serialiser emits no closing total for a partially suppressed
|
||||||
|
group.
|
||||||
|
|
||||||
|
**E2E** — a school with full data renders three cards and a bar; a school with a
|
||||||
|
partially suppressed disadvantaged group renders the withheld state and **no bar
|
||||||
|
element**; a suppressed school renders the explanation; a school with no sixth
|
||||||
|
form renders no post-16 section.
|
||||||
|
|
||||||
|
Note the staging caveat: mart changes are inert until the Airflow pipeline runs,
|
||||||
|
and the staging E2E gate runs post-merge.
|
||||||
|
|
||||||
|
## Out of scope
|
||||||
|
|
||||||
|
- **Compare view and rankings.** The long mart shape supports both; neither is
|
||||||
|
built here. Flagged because "% to a school sixth form" is a plausible rankings
|
||||||
|
metric and the mart shape should not have to change to allow it.
|
||||||
|
- **Ethnicity, sex, SEN and prior-attainment breakdowns.** Available in the same
|
||||||
|
file, ingested deliberately not at all — each is a separate editorial decision
|
||||||
|
about what a school page should assert.
|
||||||
|
- **Longer term destinations** (3 and 5 years out) and **Progression to higher
|
||||||
|
education** — separate publications, worth a later look for sixth forms.
|
||||||
|
- **Primary schools.** No KS2 destination measures publication exists; DfE
|
||||||
|
tracking starts at KS4. Naming the secondaries a primary's leavers go to needs
|
||||||
|
the National Pupil Database, which is not publishable at that grain.
|
||||||
|
|
||||||
|
## Risks
|
||||||
|
|
||||||
|
**A later change reintroduces the disclosure.** The likeliest routes are
|
||||||
|
applying `safe_numeric` to a destination column for consistency, adding a
|
||||||
|
`coalesce` in a mart, or — as happened in review — enforcing a disclosure rule
|
||||||
|
at the rendering layer instead of the publishing layer. Mitigation is the dbt
|
||||||
|
tests plus `backend/tests/test_destinations_api.py`, which reconstructs the
|
||||||
|
residual the way an attacker would and asserts it no longer resolves.
|
||||||
|
|
||||||
|
**The two-year lag reads as staleness.** Mitigated by dating the cohort in the
|
||||||
|
section header rather than only in a tooltip.
|
||||||
|
|
||||||
|
**Sixth-form retention will be misread.** "41% went to a school sixth form" says
|
||||||
|
nothing about *which* school. The published file reports destination type, never
|
||||||
|
destination institution. Copy must never imply "stayed on here", and the tooltip
|
||||||
|
should say so.
|
||||||
|
|
||||||
|
**Section length.** The secondary template is already long and this adds two
|
||||||
|
sections. If it becomes a problem the post-16 section is the one to collapse
|
||||||
|
behind a disclosure, not the Year 11 one.
|
||||||
|
|
||||||
|
## Open questions
|
||||||
|
|
||||||
|
1. Is the disadvantage split its own section or a sub-block inside the
|
||||||
|
destinations section? Modelled as a sub-block; it is the most differentiating
|
||||||
|
figure on the page and the most easily misread on a small cohort.
|
||||||
|
2. Do we ingest the apprenticeship level breakdown (intermediate / advanced /
|
||||||
|
higher) now, or collapse to one apprenticeship figure and revisit? Collapsed
|
||||||
|
in this design.
|
||||||
@@ -0,0 +1,368 @@
|
|||||||
|
# Giving schoolcompare a human author: an About page and a blog
|
||||||
|
|
||||||
|
**Date:** 2026-09-02
|
||||||
|
**Status:** Design — awaiting review
|
||||||
|
**Scope:** A named author for the site, an `/about` page, and a Payload-CMS-backed
|
||||||
|
blog at `/blog`.
|
||||||
|
|
||||||
|
## Why
|
||||||
|
|
||||||
|
The site reads as synthetic. Not because of its tone, but because of three
|
||||||
|
specific absences:
|
||||||
|
|
||||||
|
1. **Nobody is accountable for the numbers.** There is no author, no statement
|
||||||
|
of why the site exists, and no one who can be wrong. The only human trace on
|
||||||
|
the entire site is `contact@schoolcompare.co.uk` in the footer.
|
||||||
|
2. **No visible judgement.** Every figure is presented as though it fell out of
|
||||||
|
a machine. Hundreds of editorial decisions went into this codebase — which
|
||||||
|
metrics to show, when a benchmark is invalid, what to suppress — and not one
|
||||||
|
of them is visible to a reader. `isSpecialSchool()` silently drops the
|
||||||
|
England comparison for special schools and PRUs because that comparison is
|
||||||
|
meaningless; nowhere does the site *say* so.
|
||||||
|
3. **The voice is institutional third person.** "schoolcompare brings it all
|
||||||
|
into one place." "Built for parents, governors, journalists." That is
|
||||||
|
brochure register, and it is precisely the register that machine-generated
|
||||||
|
content defaults to.
|
||||||
|
|
||||||
|
There is a second, independent reason. The SEO programme
|
||||||
|
(`2026-08-20-seo-programme-design.md`) defines eight workstreams and none of
|
||||||
|
them address E-E-A-T or authorship. School performance data is YMYL territory;
|
||||||
|
an anonymous site republishing DfE figures has no authorship signal at all. This
|
||||||
|
work fills that hole, and the blog gives W6 (explainer content) somewhere to
|
||||||
|
live.
|
||||||
|
|
||||||
|
### The failure mode to avoid
|
||||||
|
|
||||||
|
The standard fix — a stock photo and "Hi, I'm Tudor, and I'm passionate about
|
||||||
|
education!" — reads as *more* synthetic than the current coldness. Manufactured
|
||||||
|
warmth is a stronger machine-tell than plain institutional voice. Everything
|
||||||
|
here has to be specific, occasionally awkward, and willing to be unflattering,
|
||||||
|
or it makes the problem worse.
|
||||||
|
|
||||||
|
## Positioning
|
||||||
|
|
||||||
|
The author is **Tudor**: first name only, real photograph, no surname, no
|
||||||
|
employer named.
|
||||||
|
|
||||||
|
The credibility claim is deliberately **not** educational expertise. The About
|
||||||
|
page states plainly: *"I'm not an education expert."* Authority comes from two
|
||||||
|
things that are actually true:
|
||||||
|
|
||||||
|
- **Experience.** A parent going through primary admissions in south-west London
|
||||||
|
right now. Google's E-E-A-T leads with Experience, and lived experience of the
|
||||||
|
thing is exactly what the DfE's own service lacks.
|
||||||
|
- **Method.** Every number's provenance is stated, so a reader can check the
|
||||||
|
site rather than trust it.
|
||||||
|
|
||||||
|
This is more durable than borrowed expertise: it cannot be undermined by someone
|
||||||
|
noticing the author has no teaching qualification.
|
||||||
|
|
||||||
|
**Consequence for the design.** A `Person` entity with no surname is a weak
|
||||||
|
search signal and cannot be corroborated off-site. The credibility load
|
||||||
|
therefore shifts onto the methodology being visibly rigorous. That is a design
|
||||||
|
constraint, not a caveat — it is why the About page carries a substantial
|
||||||
|
"how this is built and where it can be wrong" section rather than a short bio.
|
||||||
|
|
||||||
|
### Voice rules
|
||||||
|
|
||||||
|
Applied to About and every post. Recorded here so the voice does not drift.
|
||||||
|
|
||||||
|
- First person singular. "I built", not "we provide".
|
||||||
|
- Concrete over general. "when we were looking at schools in Wandsworth" beats
|
||||||
|
any amount of stated warmth.
|
||||||
|
- State limits before someone else finds them. Every post that presents a
|
||||||
|
metric says what it does not show.
|
||||||
|
- No mission statements, no "passionate about", no invented team.
|
||||||
|
- No em dashes. One of the clearest tells of machine-written prose, which is
|
||||||
|
the exact problem this work exists to fix.
|
||||||
|
- Short sentences. The existing code comments in this repo are already written
|
||||||
|
this way; the prose should match.
|
||||||
|
|
||||||
|
## Scope
|
||||||
|
|
||||||
|
**In:**
|
||||||
|
|
||||||
|
- `/about` — a coded page (not CMS-managed).
|
||||||
|
- `/blog` and `/blog/[slug]` — Payload-backed, with an index and post pages.
|
||||||
|
- Payload CMS installed into the existing Next application.
|
||||||
|
- Footer and navigation links to both.
|
||||||
|
- `Person`, `Organization`, `BlogPosting`, `BreadcrumbList` JSON-LD.
|
||||||
|
- RSS feed and sitemap integration.
|
||||||
|
- One first post, so the blog does not launch empty.
|
||||||
|
|
||||||
|
**Out (deliberately):**
|
||||||
|
|
||||||
|
- Rewriting existing homepage/how-it-works copy into first person. Worth doing,
|
||||||
|
but it would double the review surface of this PR. Separate change.
|
||||||
|
- In-product signed notes on school pages (the "distributed humanity" idea).
|
||||||
|
Revisit once About and the blog exist.
|
||||||
|
- Comments, newsletter, author accounts beyond one.
|
||||||
|
- A team page. There is no team.
|
||||||
|
|
||||||
|
## Architecture
|
||||||
|
|
||||||
|
### Topology
|
||||||
|
|
||||||
|
Payload 3 installs **into the existing Next application** and serves `/admin`
|
||||||
|
from the same container. One image, one deploy, no new service. This is
|
||||||
|
Payload 3's native model and it makes on-demand revalidation trivial, because
|
||||||
|
the CMS hooks run in the same process as the Next cache.
|
||||||
|
|
||||||
|
Accepted costs: the public site's image now carries Payload, so a CMS security
|
||||||
|
patch redeploys the whole site; and the image grows substantially.
|
||||||
|
|
||||||
|
### Two collisions that must be handled
|
||||||
|
|
||||||
|
**1. `/api` is already taken.** `app/api/[...path]/route.ts` is a catch-all that
|
||||||
|
proxies `/api/*` to FastAPI at runtime. Payload's default API route is also
|
||||||
|
`/api`. Left alone, these fight, and the failure is not clean — the catch-all
|
||||||
|
would swallow Payload's admin API calls and forward them to FastAPI.
|
||||||
|
|
||||||
|
Payload's API route is therefore remapped:
|
||||||
|
|
||||||
|
```ts
|
||||||
|
routes: { api: '/cms-api', admin: '/admin' }
|
||||||
|
```
|
||||||
|
|
||||||
|
with its route group at `app/(payload)/cms-api/[...slug]/route.ts`. The
|
||||||
|
`/cms-api` prefix must also be added to the FastAPI proxy's excluded-paths list
|
||||||
|
as a defensive second line.
|
||||||
|
|
||||||
|
**2. `next.config.js` is CommonJS.** Payload's `withPayload()` wrapper is ESM
|
||||||
|
only. The config must become `next.config.mjs`, converting `module.exports` to
|
||||||
|
`export default` and wrapping the export. All existing content — the standalone
|
||||||
|
output, `outputFileTracingIncludes`, the staging `X-Robots-Tag` header block,
|
||||||
|
the CSP — carries over unchanged. This is mechanical but it touches the file
|
||||||
|
that controls staging's noindex, so it needs care and an explicit test.
|
||||||
|
|
||||||
|
### Database
|
||||||
|
|
||||||
|
Payload uses the existing `sc_database` Postgres instance, in its **own
|
||||||
|
`payload` schema**:
|
||||||
|
|
||||||
|
```ts
|
||||||
|
db: postgresAdapter({
|
||||||
|
pool: { connectionString: process.env.DATABASE_URL },
|
||||||
|
schemaName: 'payload',
|
||||||
|
})
|
||||||
|
```
|
||||||
|
|
||||||
|
The frontend container is already on the `backend` Docker network, so it can
|
||||||
|
reach `sc_database:5432` with no networking change. It needs a new
|
||||||
|
`DATABASE_URL` environment variable.
|
||||||
|
|
||||||
|
Schema isolation is not cosmetic. `public` currently holds the application
|
||||||
|
tables and Airflow's metadata, and `scripts/migrate_csv_to_db.py --drop` exists
|
||||||
|
to drop and reimport. Blog content living in its own schema means no data
|
||||||
|
pipeline operation can destroy it.
|
||||||
|
|
||||||
|
**Verified 2026-09-02** (this was an open question when the spec was written).
|
||||||
|
`--drop` calls `run_full_migration()` in `backend/migration.py`, which drops
|
||||||
|
exactly two tables by name:
|
||||||
|
|
||||||
|
```python
|
||||||
|
ks2_tables = ["school_results", "schools"]
|
||||||
|
for tname in ks2_tables:
|
||||||
|
if tname in existing:
|
||||||
|
Base.metadata.tables[tname].drop(bind=engine)
|
||||||
|
```
|
||||||
|
|
||||||
|
There is no `Base.metadata.drop_all()` anywhere in `backend/`, and no
|
||||||
|
`DROP SCHEMA`. The only other drop is `_apply_schema_drops()`, a single
|
||||||
|
schema-qualified `DROP TABLE IF EXISTS marts.fact_parent_view CASCADE`.
|
||||||
|
Nothing sets `search_path`, so the SQLAlchemy metadata resolves to `public`,
|
||||||
|
and `inspector.get_table_names()` does not even enumerate other schemas.
|
||||||
|
|
||||||
|
So the guarantee is stronger than schema isolation alone: `--drop` targets two
|
||||||
|
named tables that Payload does not have, and would not reach `posts`, `media`
|
||||||
|
or `users` even if they shared a schema. The `payload` schema remains the right
|
||||||
|
choice — it protects against a *future* broadening of that script rather than
|
||||||
|
today's behaviour — but the safety claim rests on verified code, not on
|
||||||
|
assumption.
|
||||||
|
|
||||||
|
Putting CMS tables in this instance is consistent with existing practice —
|
||||||
|
Airflow already stores its metadata there.
|
||||||
|
|
||||||
|
### Migrations
|
||||||
|
|
||||||
|
Payload's Postgres adapter auto-pushes schema in development and requires
|
||||||
|
explicit migrations in production. Use `prodMigrations`, which runs pending
|
||||||
|
migrations during server initialisation:
|
||||||
|
|
||||||
|
```ts
|
||||||
|
db: postgresAdapter({ /* ... */, prodMigrations: migrations })
|
||||||
|
```
|
||||||
|
|
||||||
|
This is preferred over a one-shot init container (the `airflow-init` pattern)
|
||||||
|
because the app is a single long-running process and there is no ordering
|
||||||
|
problem to solve. Migration files are generated with `payload migrate:create`
|
||||||
|
and committed, so schema changes travel through the same PR and staging gate as
|
||||||
|
code.
|
||||||
|
|
||||||
|
### Media
|
||||||
|
|
||||||
|
Uploads go to a Docker named volume, consistent with `postgres_data`,
|
||||||
|
`typesense_data` and `airflow_logs`.
|
||||||
|
|
||||||
|
- `staticDir` must be an **absolute** path in Payload 3: `/app/media`.
|
||||||
|
- The container runs as `nextjs` (uid 1001). The Dockerfile must
|
||||||
|
`mkdir -p /app/media && chown nextjs:nodejs /app/media` **before** the volume
|
||||||
|
is mounted, or Docker will create the mountpoint root-owned and every upload
|
||||||
|
will fail with EACCES.
|
||||||
|
- `sharp` moves from `devDependencies` to `dependencies` — Payload needs it at
|
||||||
|
runtime to generate `imageSizes`.
|
||||||
|
- The volume must be added to the backup routine alongside Postgres. A blog
|
||||||
|
post's images are not reproducible from the pipeline.
|
||||||
|
|
||||||
|
### Rendering
|
||||||
|
|
||||||
|
**Constraint:** CI builds the image with no database reachable. Blog pages
|
||||||
|
therefore cannot use build-time `generateStaticParams` — that would either fail
|
||||||
|
the build or bake in an empty post list.
|
||||||
|
|
||||||
|
Instead: ISR. Post and index pages declare a `revalidate` window and render on
|
||||||
|
first request, with Payload `afterChange` / `afterDelete` hooks calling
|
||||||
|
`revalidatePath('/blog')` and `revalidatePath('/blog/' + slug)` for immediate
|
||||||
|
publication. Because Payload runs in the same process, the hook calls
|
||||||
|
`revalidatePath` from `next/cache` directly — no webhook, no shared secret.
|
||||||
|
|
||||||
|
The ISR cache lives on container disk and is cleared by a redeploy. For a
|
||||||
|
single container serving a handful of posts this is fine.
|
||||||
|
|
||||||
|
### Collections
|
||||||
|
|
||||||
|
- **`posts`** — `title`, `slug`, `publishedAt`, `excerpt`, `heroImage`
|
||||||
|
(relation to `media`), `content` (Lexical rich text), `seo` group
|
||||||
|
(`metaTitle`, `metaDescription`), `_status` (drafts enabled).
|
||||||
|
- **`media`** — upload collection, `alt` required, `imageSizes` for thumbnail
|
||||||
|
and hero widths, public read access.
|
||||||
|
- **`users`** — Payload's auth collection. One account. Public creation
|
||||||
|
disabled.
|
||||||
|
|
||||||
|
Drafts are enabled so posts can be written over several sittings and previewed
|
||||||
|
before publication.
|
||||||
|
|
||||||
|
**Payload Blocks** are how posts embed live product components — a real trend
|
||||||
|
chart or comparison table inside a post, rendered from live data rather than
|
||||||
|
screenshotted. This is the main thing the CMS has to earn back against
|
||||||
|
file-based MDX, and it directly serves the goal: showing judgement in context.
|
||||||
|
Ship with one block (a callout/aside for "what this number doesn't tell you");
|
||||||
|
add a live-chart block once a post needs it.
|
||||||
|
|
||||||
|
### Security
|
||||||
|
|
||||||
|
`/admin` is the first authenticated surface on this site. Public, hardened:
|
||||||
|
|
||||||
|
- `PAYLOAD_SECRET` — long, random, set in the Portainer stack environment, never
|
||||||
|
committed. The same variable must exist in staging with a *different* value.
|
||||||
|
- Strong unique password on the single admin account.
|
||||||
|
- Login rate limiting via Payload's `maxLoginAttempts` / `lockTime`.
|
||||||
|
- `X-Robots-Tag: noindex, nofollow` on `/admin/*` and `/cms-api/*`, and a
|
||||||
|
`robots.ts` disallow. The admin panel must never be indexed.
|
||||||
|
- Public user creation disabled; no open registration.
|
||||||
|
- Verify the existing CSP `frame-ancestors` directive does not break the admin
|
||||||
|
panel.
|
||||||
|
|
||||||
|
Residual risk, accepted: a future Payload authentication CVE is live against the
|
||||||
|
public internet. Mitigation is prompt patching, which the staging→prod pipeline
|
||||||
|
already supports. If this becomes uncomfortable, restricting `/admin` at the
|
||||||
|
proxy to LAN/VPN is a one-line change later.
|
||||||
|
|
||||||
|
Staging note: staging runs the same image on `stx.`, so it gets its own admin
|
||||||
|
panel and its own database. It must have its own `PAYLOAD_SECRET` and its own
|
||||||
|
credentials — never production's.
|
||||||
|
|
||||||
|
## Deployment changes
|
||||||
|
|
||||||
|
- `nextjs-app/Dockerfile` — create and chown `/app/media`; ensure Payload's
|
||||||
|
admin bundle and `sharp` survive standalone output file tracing.
|
||||||
|
- `docker-compose.portainer.yml` and the staging equivalent — add
|
||||||
|
`DATABASE_URL` and `PAYLOAD_SECRET` to the `frontend` service, add a
|
||||||
|
`payload_media` volume mounted at `/app/media`, and add
|
||||||
|
`depends_on: sc_database`.
|
||||||
|
- Document both new environment variables in the compose header comment block,
|
||||||
|
which is where this stack records its configuration.
|
||||||
|
|
||||||
|
## SEO
|
||||||
|
|
||||||
|
- `Person` (Tudor, with photo) and `Organization` JSON-LD on `/about`.
|
||||||
|
- `BlogPosting` + `BreadcrumbList` on post pages, with `author` referencing the
|
||||||
|
same `Person`.
|
||||||
|
- Canonical URLs on `/blog` and every post.
|
||||||
|
- Posts and `/about` added to the existing sitemap (`app/sitemap.xml/route.ts`
|
||||||
|
and `app/sitemaps/[...parts]`). Post URLs come from Payload at request time.
|
||||||
|
- RSS feed at `/blog/rss.xml`.
|
||||||
|
- Footer links to both pages, under a new "About" column.
|
||||||
|
|
||||||
|
**Navigation is deliberately left alone.** `Navigation.tsx` renders a bottom tab
|
||||||
|
bar on mobile that already carries four items (Search, Compare, Rankings,
|
||||||
|
Admissions). A fifth tab makes each one cramped at 320px, and About and Blog are
|
||||||
|
both lower-intent than any of the four. Both live in the footer; About
|
||||||
|
additionally gets a byline link from every post, which is where a reader who
|
||||||
|
cares actually asks the question. Revisit only if analytics show people hunting
|
||||||
|
for it.
|
||||||
|
|
||||||
|
## Testing
|
||||||
|
|
||||||
|
Unit (Jest):
|
||||||
|
|
||||||
|
- Post rendering, including a post with no hero image and one with no excerpt.
|
||||||
|
- Slug generation and collision handling.
|
||||||
|
- JSON-LD shape for `BlogPosting` and `Person`.
|
||||||
|
- The `next.config.mjs` conversion preserves the staging `X-Robots-Tag` rule —
|
||||||
|
this guards the riskiest mechanical change in the plan.
|
||||||
|
|
||||||
|
E2E (Playwright, `e2e/`, required by CLAUDE.md for user-facing change):
|
||||||
|
|
||||||
|
- `/about` renders, shows the author name and photo, and is reachable from the
|
||||||
|
footer and nav.
|
||||||
|
- `/blog` lists at least one post; clicking through reaches the post.
|
||||||
|
- A post page renders title, date, body and byline.
|
||||||
|
- `/admin` responds with `noindex` and does not leak a stack trace when
|
||||||
|
unauthenticated.
|
||||||
|
|
||||||
|
Note the known constraint: new journeys cannot be proven in PR checks, because
|
||||||
|
the staging E2E gate runs post-merge.
|
||||||
|
|
||||||
|
## Risks
|
||||||
|
|
||||||
|
| Risk | Mitigation |
|
||||||
|
|---|---|
|
||||||
|
| `next.config.mjs` conversion silently drops the staging noindex header, making staging a crawlable duplicate | Unit test asserting the header rule; verify on staging before promotion |
|
||||||
|
| Payload API route collides with the FastAPI `/api` proxy | Remap to `/cms-api`; add to the proxy's exclusion list |
|
||||||
|
| Media volume mounts root-owned; all uploads fail with EACCES | `mkdir`+`chown` in the Dockerfile before the mount; test an upload on staging |
|
||||||
|
| Build fails or bakes empty content because CI has no DB | No build-time DB access; ISR only |
|
||||||
|
| A pipeline `--drop` destroys blog content | Separate `payload` schema; verify `--drop` blast radius before building |
|
||||||
|
| Media volume not backed up; images unrecoverable | Add `payload_media` to the backup routine |
|
||||||
|
| Payload auth CVE exposed publicly | Prompt patching; proxy restriction available as a fallback |
|
||||||
|
| Blog launches empty or goes stale | Ship with one post; cadence is explicitly "a few times a year", so no cadence is promised anywhere on the page — no dates implying a schedule |
|
||||||
|
|
||||||
|
## Sequence
|
||||||
|
|
||||||
|
Each step is independently reviewable and mergeable.
|
||||||
|
|
||||||
|
1. **Payload foundation** — install, `next.config.mjs` conversion, `payload`
|
||||||
|
schema, `/cms-api` remap, `users` collection, `/admin` hardening, compose and
|
||||||
|
Dockerfile changes. No public-facing change yet. Verify on staging that the
|
||||||
|
site is unchanged and `/admin` works.
|
||||||
|
2. **`/about`** — coded page, photo, `Person`/`Organization` JSON-LD, footer and
|
||||||
|
nav links, e2e journey. Independently valuable and does not depend on the
|
||||||
|
blog.
|
||||||
|
3. **Blog** — `posts` and `media` collections, `/blog` index and post pages, ISR
|
||||||
|
plus revalidation hooks, RSS, sitemap, structured data, e2e journeys.
|
||||||
|
4. **First post** — written in the admin panel, published through the normal
|
||||||
|
flow, proving the whole path end to end.
|
||||||
|
|
||||||
|
Step 1 carries all the infrastructure risk and none of the visible benefit, so
|
||||||
|
it should be verified on staging carefully before step 2 starts.
|
||||||
|
|
||||||
|
## Dependencies on Tudor
|
||||||
|
|
||||||
|
- **A photograph.** Blocks step 2. Nothing else in the plan is blocked by it.
|
||||||
|
- **The first post's subject.** Blocks step 4 only. Suggested: what school
|
||||||
|
performance data cannot tell you — it demonstrates judgement, is genuinely
|
||||||
|
useful, and is the kind of thing an anonymous or machine-written site will not
|
||||||
|
publish.
|
||||||
|
- ~~Confirmation that `scripts/migrate_csv_to_db.py --drop` is schema-scoped.~~
|
||||||
|
**Resolved 2026-09-02** — verified in `backend/migration.py`; see the
|
||||||
|
Database section. No action needed.
|
||||||
+418
-5
@@ -1304,6 +1304,52 @@ test('with the distance feature off, the section is absent rather than empty', a
|
|||||||
.toHaveCount(0);
|
.toHaveCount(0);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A secondary school carrying an EES admissions row, which is what makes its
|
||||||
|
* Admissions section render while the distance feature is dark.
|
||||||
|
*/
|
||||||
|
async function secondarySchoolWithAdmissions(page: Page) {
|
||||||
|
const list = await page.request.get('/api/schools?phase=secondary&page_size=40');
|
||||||
|
if (!list.ok()) return null;
|
||||||
|
const body = await list.json();
|
||||||
|
for (const s of (body?.schools ?? []).slice(0, 25)) {
|
||||||
|
const res = await page.request.get(`/api/schools/${s.urn}`);
|
||||||
|
if (!res.ok()) continue;
|
||||||
|
const detail = await res.json();
|
||||||
|
if (detail?.admissions == null) continue;
|
||||||
|
return { urn: s.urn as number };
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
test('with the distance feature off, a secondary page makes no claim about publication', async ({ page }) => {
|
||||||
|
/*
|
||||||
|
* Shipping dark must not put words in the council's mouth. The secondary
|
||||||
|
* template is the only one that words the absence, and "X has not published
|
||||||
|
* a cut-off distance for this school" is false wherever X does publish and
|
||||||
|
* we are simply withholding it.
|
||||||
|
*
|
||||||
|
* This is why the API omits the key rather than sending null: absent means
|
||||||
|
* "cut-offs are not published at all", null means "this school has none".
|
||||||
|
* Only the second is a fact about the school, and only the second is sayable.
|
||||||
|
*/
|
||||||
|
test.skip(await distanceFeatureIsOn(page),
|
||||||
|
'the admission_distance flag is on in this environment');
|
||||||
|
|
||||||
|
const found = await secondarySchoolWithAdmissions(page);
|
||||||
|
test.skip(found === null, 'no secondary school in the sample has an admissions row');
|
||||||
|
|
||||||
|
await page.goto(`/school/${found!.urn}`);
|
||||||
|
await expect(page.locator('h1').first()).toBeVisible({ timeout: 15_000 });
|
||||||
|
|
||||||
|
// The Admissions section is still there — this is not a test that the whole
|
||||||
|
// section vanished, which would pass for the wrong reason.
|
||||||
|
await expect(page.locator('#admissions')).toHaveCount(1);
|
||||||
|
|
||||||
|
await expect(page.getByText(/has not published a cut-off distance/)).toHaveCount(0);
|
||||||
|
await expect(page.getByText(/Contact the admissions authority/)).toHaveCount(0);
|
||||||
|
});
|
||||||
|
|
||||||
test('/api/flags is not reachable from the public internet', async ({ page }) => {
|
test('/api/flags is not reachable from the public internet', async ({ page }) => {
|
||||||
// It names every unreleased feature and whether it is on. Next reads it
|
// It names every unreleased feature and whether it is on. Next reads it
|
||||||
// server-side over the Docker network; the public proxy must deny it.
|
// server-side over the Docker network; the public proxy must deny it.
|
||||||
@@ -1978,6 +2024,59 @@ test('a place page links its phase variants, and they resolve', async ({ page })
|
|||||||
await expect(page.locator('h1')).toContainText(new RegExp(`${phase} schools in`, 'i'));
|
await expect(page.locator('h1')).toContainText(new RegExp(`${phase} schools in`, 'i'));
|
||||||
});
|
});
|
||||||
|
|
||||||
|
/*
|
||||||
|
* The table shipped with one column of scores. A parent shortlisting from a
|
||||||
|
* town page needs to know whether a school takes their child's age, whether
|
||||||
|
* it is a faith school, and — for a primary — whether it has a nursery,
|
||||||
|
* before a percentage means anything.
|
||||||
|
*
|
||||||
|
* These assert the column headings rather than the values: nursery_provision
|
||||||
|
* and parliamentary_constituency are optional mart columns, and on an
|
||||||
|
* environment whose pipeline has not rebuilt them the API degrades them to
|
||||||
|
* absent. A value assertion would then fail for a data reason, not a code one.
|
||||||
|
*/
|
||||||
|
async function phasedPlace(page: Page, phase: 'primary' | 'secondary') {
|
||||||
|
const place = await firstPlaceOfKind(page, 'town');
|
||||||
|
const detail = await (await page.request.get(`/api/places/town/${place.slug}`)).json();
|
||||||
|
test.skip(!(detail.place.phases ?? []).includes(phase),
|
||||||
|
`no ${phase} page clears the threshold here`);
|
||||||
|
return place;
|
||||||
|
}
|
||||||
|
|
||||||
|
test('a primary place page names each school as well as scoring it', async ({ page }) => {
|
||||||
|
const place = await phasedPlace(page, 'primary');
|
||||||
|
await page.goto(`/schools/${place.slug}/primary`);
|
||||||
|
for (const heading of ['Ages', 'Religious character', 'Nursery', 'Constituency']) {
|
||||||
|
await expect(page.getByRole('columnheader', { name: heading, exact: true }))
|
||||||
|
.toBeVisible();
|
||||||
|
}
|
||||||
|
// age_range rides in on SCHOOL_COLUMNS and predates the optional columns,
|
||||||
|
// so it is the one attribute safe to assert a value for anywhere.
|
||||||
|
await expect(page.locator('table tbody td').filter({ hasText: /^\d+–\d+$/ }).first())
|
||||||
|
.toBeVisible();
|
||||||
|
});
|
||||||
|
|
||||||
|
test('a secondary place page does not ask about nurseries', async ({ page }) => {
|
||||||
|
const place = await phasedPlace(page, 'secondary');
|
||||||
|
await page.goto(`/schools/${place.slug}/secondary`);
|
||||||
|
await expect(page.getByRole('columnheader', { name: 'Ages', exact: true }))
|
||||||
|
.toBeVisible();
|
||||||
|
await expect(page.getByRole('columnheader', { name: 'Nursery', exact: true }))
|
||||||
|
.toHaveCount(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('the measure stays beside the school name, not behind a swipe', async ({ page }) => {
|
||||||
|
// Six columns overflow a phone; .tableWrap turns that into a horizontal
|
||||||
|
// scroll. With the measure last, the number the page exists for is the one
|
||||||
|
// off the screen.
|
||||||
|
const place = await phasedPlace(page, 'primary');
|
||||||
|
await page.setViewportSize({ width: 390, height: 844 });
|
||||||
|
await page.goto(`/schools/${place.slug}/primary`);
|
||||||
|
const second = page.locator('table thead th').nth(1);
|
||||||
|
await expect(second).toContainText(/reading, writing/i);
|
||||||
|
await expect(second).toBeInViewport();
|
||||||
|
});
|
||||||
|
|
||||||
test('phase variants are submitted in the places sitemap', async ({ page }) => {
|
test('phase variants are submitted in the places sitemap', async ({ page }) => {
|
||||||
const xml = await (await page.request.get('/sitemaps/places-1.xml')).text();
|
const xml = await (await page.request.get('/sitemaps/places-1.xml')).text();
|
||||||
expect(xml).toMatch(/\/schools\/[a-z0-9-]+\/primary</);
|
expect(xml).toMatch(/\/schools\/[a-z0-9-]+\/primary</);
|
||||||
@@ -2094,12 +2193,32 @@ test('a place page lists its schools alphabetically', async ({ page }) => {
|
|||||||
expect(town).toBeTruthy();
|
expect(town).toBeTruthy();
|
||||||
|
|
||||||
await page.goto(`/schools/${town.slug}`);
|
await page.goto(`/schools/${town.slug}`);
|
||||||
const names = await page.locator('a[href^="/school/"]').allTextContents();
|
|
||||||
expect(names.length).toBeGreaterThan(1);
|
|
||||||
|
|
||||||
const sorted = [...names].sort((a, b) =>
|
/*
|
||||||
a.toLowerCase().localeCompare(b.toLowerCase()));
|
* Per table, not per page.
|
||||||
expect(names).toEqual(sorted);
|
*
|
||||||
|
* An unphased place page renders one table per phase, and an all-through
|
||||||
|
* school legitimately appears in both — so the page's school links are not
|
||||||
|
* one alphabetical run and never were. This assertion used to collect them
|
||||||
|
* all together and only passed because no town it picked happened to hold an
|
||||||
|
* all-through school; when the data gave Abbots Langley one, Breakspeare
|
||||||
|
* School showed up in the primary table and again in the secondary, and the
|
||||||
|
* test failed on correct behaviour.
|
||||||
|
*/
|
||||||
|
const tables = page.locator('table');
|
||||||
|
const tableCount = await tables.count();
|
||||||
|
expect(tableCount).toBeGreaterThan(0);
|
||||||
|
|
||||||
|
let checked = 0;
|
||||||
|
for (let i = 0; i < tableCount; i++) {
|
||||||
|
const names = await tables.nth(i).locator('a[href^="/school/"]').allTextContents();
|
||||||
|
if (names.length < 2) continue; // a one-row table says nothing about order
|
||||||
|
const sorted = [...names].sort((a, b) =>
|
||||||
|
a.toLowerCase().localeCompare(b.toLowerCase()));
|
||||||
|
expect(names, `table ${i + 1} is not alphabetical`).toEqual(sorted);
|
||||||
|
checked++;
|
||||||
|
}
|
||||||
|
expect(checked, 'no table had enough rows to check the ordering').toBeGreaterThan(0);
|
||||||
});
|
});
|
||||||
|
|
||||||
test('the rankings page still orders by score, not name', async ({ page }) => {
|
test('the rankings page still orders by score, not name', async ({ page }) => {
|
||||||
@@ -2112,6 +2231,66 @@ test('the rankings page still orders by score, not name', async ({ page }) => {
|
|||||||
expect(scores).toEqual([...scores].sort((a: number, b: number) => b - a));
|
expect(scores).toEqual([...scores].sort((a: number, b: number) => b - a));
|
||||||
});
|
});
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Analytics on the location layer.
|
||||||
|
*
|
||||||
|
* Umami counts a pageview for every one of these URLs already. What it cannot
|
||||||
|
* say is which *kind* of location page earns engagement, because all four
|
||||||
|
* families share the /schools/ prefix — and that is the question that decides
|
||||||
|
* whether to keep investing in them.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/** Capture Umami events, with the real script blocked so it cannot clobber
|
||||||
|
* the stub. Must be called before the first navigation. */
|
||||||
|
async function captureEvents(page: Page) {
|
||||||
|
const events: Array<{ name: string; data: Record<string, unknown> }> = [];
|
||||||
|
await page.route('**/analytics.schoolcompare.co.uk/**', (route) => route.abort());
|
||||||
|
await page.exposeFunction('__capture',
|
||||||
|
(name: string, data: Record<string, unknown>) => { events.push({ name, data }); });
|
||||||
|
await page.addInitScript(() => {
|
||||||
|
(window as unknown as { umami: unknown }).umami = {
|
||||||
|
track: (name: string, data: unknown) =>
|
||||||
|
(window as unknown as { __capture: (n: string, d: unknown) => void })
|
||||||
|
.__capture(name, data),
|
||||||
|
};
|
||||||
|
});
|
||||||
|
return events;
|
||||||
|
}
|
||||||
|
|
||||||
|
test('a location page reports which kind of place it is', async ({ page }) => {
|
||||||
|
const events = await captureEvents(page);
|
||||||
|
const place = await firstPlaceOfKind(page, 'authority');
|
||||||
|
|
||||||
|
await page.goto(`/schools/authority/${place.slug}`);
|
||||||
|
await expect.poll(() => events.find((e) => e.name === 'place_viewed'),
|
||||||
|
{ timeout: 10_000 }).toBeTruthy();
|
||||||
|
|
||||||
|
const event = events.find((e) => e.name === 'place_viewed')!;
|
||||||
|
expect(event.data.kind).toBe('authority');
|
||||||
|
expect(event.data.slug).toBe(place.slug);
|
||||||
|
expect(event.data.phase).toBe('all');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('a school reached from a location page is attributed to it, not to direct', async ({ page }) => {
|
||||||
|
/*
|
||||||
|
* The defect this was written for. getNavigationSource had no case for
|
||||||
|
* /schools/, so every school view that came through the location layer was
|
||||||
|
* filed as 'direct' — the bucket you read as "typed the URL". The one
|
||||||
|
* measurement that says whether ~3,900 SEO pages work was reporting the
|
||||||
|
* wrong answer, confidently.
|
||||||
|
*/
|
||||||
|
const events = await captureEvents(page);
|
||||||
|
const place = await firstPlaceOfKind(page, 'town');
|
||||||
|
|
||||||
|
await page.goto(`/schools/${place.slug}`);
|
||||||
|
await page.locator('a[href^="/school/"]').first().click();
|
||||||
|
await page.waitForURL(/\/school\//);
|
||||||
|
|
||||||
|
await expect.poll(() => events.find((e) => e.name === 'school_viewed'),
|
||||||
|
{ timeout: 10_000 }).toBeTruthy();
|
||||||
|
expect(events.find((e) => e.name === 'school_viewed')!.data.from).toBe('place');
|
||||||
|
});
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* School autosuggest (spec 2026-08-26).
|
* School autosuggest (spec 2026-08-26).
|
||||||
*/
|
*/
|
||||||
@@ -2198,6 +2377,30 @@ test('the whole dropdown is reachable, not clipped by the hero', async ({ page }
|
|||||||
+ '— an ancestor is clipping or covering the dropdown').toBeTruthy();
|
+ '— an ancestor is clipping or covering the dropdown').toBeTruthy();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test('the dropdown does not survive into the results it produced', async ({ page }) => {
|
||||||
|
/*
|
||||||
|
* The bug that took the staging gate down, and it was not a test problem:
|
||||||
|
* after a search the results-page bar still holds the term, so the dropdown
|
||||||
|
* reopened on top of the results and swallowed the click on the first one.
|
||||||
|
* Playwright reported it as "<li role=option> intercepts pointer events"; a
|
||||||
|
* reader would simply have found their first result unclickable.
|
||||||
|
*/
|
||||||
|
test.skip(!(await autosuggestIsOn(page)),
|
||||||
|
'the school_autosuggest flag is off in this environment');
|
||||||
|
|
||||||
|
await page.goto('/');
|
||||||
|
await page.getByRole('combobox').first().fill('school');
|
||||||
|
await expect(page.getByRole('option').first()).toBeVisible();
|
||||||
|
|
||||||
|
await page.getByRole('button', { name: /Search/i }).first().click();
|
||||||
|
await page.waitForURL(/search=school/);
|
||||||
|
|
||||||
|
await expect(page.getByRole('listbox')).toHaveCount(0);
|
||||||
|
// And the results underneath are actually reachable, which is the point.
|
||||||
|
await page.locator('a[href^="/school/"]').first().click({ timeout: 15_000 });
|
||||||
|
await expect(page).toHaveURL(/\/school\//);
|
||||||
|
});
|
||||||
|
|
||||||
test('with autosuggest off, the search box is a plain input', async ({ page }) => {
|
test('with autosuggest off, the search box is a plain input', async ({ page }) => {
|
||||||
test.skip(await autosuggestIsOn(page),
|
test.skip(await autosuggestIsOn(page),
|
||||||
'the school_autosuggest flag is on in this environment');
|
'the school_autosuggest flag is on in this environment');
|
||||||
@@ -2209,3 +2412,213 @@ test('with autosuggest off, the search box is a plain input', async ({ page }) =
|
|||||||
await page.getByRole('button', { name: /Search/i }).first().click();
|
await page.getByRole('button', { name: /Search/i }).first().click();
|
||||||
await expect(page).toHaveURL(/search=abbey/);
|
await expect(page).toHaveURL(/search=abbey/);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// ── Destination measures ───────────────────────────────────────────────────
|
||||||
|
//
|
||||||
|
// Two failure modes have to be told apart here, and conflating them is how
|
||||||
|
// this suite would either hide a regression or block the promotion pipeline:
|
||||||
|
//
|
||||||
|
// * the backend does not serve the `destinations` field at all — a code
|
||||||
|
// regression, or a deploy that did not land. FAILS.
|
||||||
|
// * the field is served but every school is empty — the annual EES DAG has
|
||||||
|
// not run on this environment yet. SKIPS, loudly.
|
||||||
|
//
|
||||||
|
// The second is a data-load precondition, not a defect, and it is true for
|
||||||
|
// every commit between this merging and the DAG being triggered. Failing on it
|
||||||
|
// would redden the staging gate for unrelated work. This is not the quiet skip
|
||||||
|
// 4f01fbd removed from the distance journeys: that one hid a broken feature
|
||||||
|
// behind a flag check, whereas the assertion that the code is deployed and
|
||||||
|
// correctly shaped still runs here on every commit.
|
||||||
|
|
||||||
|
async function secondaryWithDestinations(page: Page): Promise<{
|
||||||
|
urn: string; destinations: any;
|
||||||
|
}> {
|
||||||
|
const res = await page.request.get('/api/schools?search=school&per_page=100');
|
||||||
|
expect(res.ok()).toBeTruthy();
|
||||||
|
const body = await res.json();
|
||||||
|
const urns: string[] = (body.schools ?? [])
|
||||||
|
.filter((s: { phase?: string; attainment_8_score?: number | null }) =>
|
||||||
|
s.phase === 'Secondary' && s.attainment_8_score != null)
|
||||||
|
.map((s: { urn: number }) => String(s.urn));
|
||||||
|
expect(urns.length).toBeGreaterThan(0);
|
||||||
|
|
||||||
|
let served = false;
|
||||||
|
for (const urn of urns.slice(0, 25)) {
|
||||||
|
const detail = await page.request.get(`/api/schools/${urn}`);
|
||||||
|
if (!detail.ok()) continue;
|
||||||
|
const data = await detail.json();
|
||||||
|
// The key must exist, even as null. Its absence means the backend in front
|
||||||
|
// of us does not know about destinations at all.
|
||||||
|
if ('destinations' in data) served = true;
|
||||||
|
if (data.destinations?.ks4) return { urn, destinations: data.destinations };
|
||||||
|
}
|
||||||
|
|
||||||
|
expect(served,
|
||||||
|
'GET /api/schools/{urn} served no `destinations` key at all — the backend '
|
||||||
|
+ 'is missing this feature, not merely missing its data').toBeTruthy();
|
||||||
|
|
||||||
|
test.skip(true,
|
||||||
|
'No school has destination data yet: the annual EES DAG has not run on '
|
||||||
|
+ 'this environment. The API shape is correct, so this is a data-load '
|
||||||
|
+ 'precondition rather than a regression.');
|
||||||
|
throw new Error('unreachable');
|
||||||
|
}
|
||||||
|
|
||||||
|
test('a secondary school page says where its Year 11 leavers went', async ({ page }) => {
|
||||||
|
const { urn } = await secondaryWithDestinations(page);
|
||||||
|
await page.goto(`/school/${urn}`);
|
||||||
|
|
||||||
|
const section = page.locator('#destinations');
|
||||||
|
await expect(section).toBeVisible({ timeout: 15_000 });
|
||||||
|
await expect(section.getByRole('heading', { name: 'After Year 11' })).toBeVisible();
|
||||||
|
// The section must date its own cohort: destinations run about two GCSE
|
||||||
|
// years behind the results above them, and an undated figure reads as stale.
|
||||||
|
await expect(section).toContainText(/20\d{2}\/\d{2}/);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('the destinations bar is absent entirely whenever a figure is withheld', async ({ page }) => {
|
||||||
|
const { urn, destinations } = await secondaryWithDestinations(page);
|
||||||
|
await page.goto(`/school/${urn}`);
|
||||||
|
const section = page.locator('#destinations');
|
||||||
|
await expect(section).toBeVisible({ timeout: 15_000 });
|
||||||
|
|
||||||
|
const allGroup = destinations.ks4.groups.all;
|
||||||
|
const suppressed = (allGroup?.categories ?? [])
|
||||||
|
.filter((c: { status: string }) => c.status === 'suppressed');
|
||||||
|
|
||||||
|
if (suppressed.length > 0) {
|
||||||
|
// R1: a bar drawn from the published segments leaves a gap whose width is
|
||||||
|
// the withheld figure, readable straight off the axis.
|
||||||
|
await expect(section.locator('[data-destination-segment]')).toHaveCount(0);
|
||||||
|
await expect(section.getByText(/withheld/i).first()).toBeVisible();
|
||||||
|
} else {
|
||||||
|
const published = (allGroup?.categories ?? [])
|
||||||
|
.filter((c: { status: string }) => c.status === 'published');
|
||||||
|
await expect(section.locator('[data-destination-segment]'))
|
||||||
|
.toHaveCount(published.length);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
test('switching to disadvantaged pupils never reveals a withheld figure', async ({ page }) => {
|
||||||
|
const { urn, destinations } = await secondaryWithDestinations(page);
|
||||||
|
const disadvantaged = destinations.ks4.groups.disadvantaged;
|
||||||
|
test.skip(!disadvantaged, 'this school publishes no disadvantaged breakdown');
|
||||||
|
|
||||||
|
await page.goto(`/school/${urn}`);
|
||||||
|
const section = page.locator('#destinations');
|
||||||
|
await expect(section).toBeVisible({ timeout: 15_000 });
|
||||||
|
|
||||||
|
const radio = section.getByRole('radio', { name: /disadvantaged/i });
|
||||||
|
await expect(radio).toBeVisible();
|
||||||
|
await radio.click();
|
||||||
|
|
||||||
|
const suppressed = (disadvantaged.categories ?? [])
|
||||||
|
.filter((c: { status: string }) => c.status === 'suppressed');
|
||||||
|
if (suppressed.length > 0) {
|
||||||
|
await expect(section.locator('[data-destination-segment]')).toHaveCount(0);
|
||||||
|
|
||||||
|
// The residual must appear nowhere on the page — it is the withheld figure.
|
||||||
|
const cohort: number = disadvantaged.cohort;
|
||||||
|
const publishedTotal = (disadvantaged.categories ?? [])
|
||||||
|
.filter((c: { status: string }) => c.status === 'published')
|
||||||
|
.reduce((sum: number, c: { pupils: number }) => sum + c.pupils, 0);
|
||||||
|
const residual = cohort - publishedTotal;
|
||||||
|
const text = (await section.textContent()) ?? '';
|
||||||
|
expect(text).not.toMatch(new RegExp(`\\b${residual}\\b`));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
test('a school with no sixth form has no post-16 destinations section', async ({ page }) => {
|
||||||
|
const res = await page.request.get('/api/schools?search=school&per_page=100');
|
||||||
|
const body = await res.json();
|
||||||
|
const noSixthForm = (body.schools ?? [])
|
||||||
|
.filter((s: { phase?: string; has_sixth_form?: boolean }) =>
|
||||||
|
s.phase === 'Secondary' && s.has_sixth_form === false)
|
||||||
|
.map((s: { urn: number }) => String(s.urn));
|
||||||
|
test.skip(noSixthForm.length === 0, 'no sixth-form-less secondary in this dataset');
|
||||||
|
|
||||||
|
await page.goto(`/school/${noSixthForm[0]}`);
|
||||||
|
await expect(page.locator('h1').first()).toBeVisible({ timeout: 15_000 });
|
||||||
|
// Absence is the correct statement, so there must be no placeholder either.
|
||||||
|
await expect(page.locator('#post16-destinations')).toHaveCount(0);
|
||||||
|
await expect(page.getByText(/destination data coming soon/i)).toHaveCount(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('the destinations section never claims a pupil stayed at this school', async ({ page }) => {
|
||||||
|
const { urn } = await secondaryWithDestinations(page);
|
||||||
|
await page.goto(`/school/${urn}`);
|
||||||
|
const section = page.locator('#destinations');
|
||||||
|
await expect(section).toBeVisible({ timeout: 15_000 });
|
||||||
|
// The published file records the TYPE of place a leaver went to, never which
|
||||||
|
// one, so the page can never say a pupil stayed on here.
|
||||||
|
const text = (await section.textContent()) ?? '';
|
||||||
|
expect(text).not.toMatch(/stayed on (here|at this school)/i);
|
||||||
|
});
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The About page and the blog exist to give the site a named human author.
|
||||||
|
* These journeys assert the load-bearing parts of that — a name, a face, the
|
||||||
|
* honesty claim, and a resolvable Person entity — rather than exact copy,
|
||||||
|
* which will be edited.
|
||||||
|
*/
|
||||||
|
test('the about page names a human author and is reachable from the footer', async ({ page }) => {
|
||||||
|
await page.goto('/');
|
||||||
|
const aboutLink = page.locator('footer a[href="/about"]');
|
||||||
|
await expect(aboutLink).toBeVisible();
|
||||||
|
await aboutLink.click();
|
||||||
|
await page.waitForURL(/\/about$/);
|
||||||
|
|
||||||
|
await expect(page.getByRole('heading', { level: 1 })).toContainText('Tudor');
|
||||||
|
await expect(page.locator('img[alt*="Tudor"]')).toBeVisible();
|
||||||
|
|
||||||
|
// The credibility claim is lived experience plus stated provenance, not
|
||||||
|
// expertise. If this sentence ever disappears the positioning has drifted.
|
||||||
|
await expect(page.getByText(/not an education expert/i)).toBeVisible();
|
||||||
|
|
||||||
|
const jsonLd = await page
|
||||||
|
.locator('script[type="application/ld+json"]')
|
||||||
|
.first()
|
||||||
|
.textContent();
|
||||||
|
expect(jsonLd).toContain('"Person"');
|
||||||
|
// First name only — a surname here would be the one place it leaks.
|
||||||
|
expect(jsonLd).not.toMatch(/familyName/);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('the blog lists posts and each one renders with a byline', async ({ page }) => {
|
||||||
|
await page.goto('/blog');
|
||||||
|
await expect(page.getByRole('heading', { level: 1 })).toBeVisible();
|
||||||
|
|
||||||
|
const postLinks = page.locator('a[href^="/blog/"]');
|
||||||
|
// Data invariant: staging must carry at least one published post. If this
|
||||||
|
// fails, the environment has no content rather than the code being broken.
|
||||||
|
expect(await postLinks.count()).toBeGreaterThan(0);
|
||||||
|
|
||||||
|
await postLinks.first().click();
|
||||||
|
await page.waitForURL(/\/blog\/.+/);
|
||||||
|
await expect(page.getByRole('heading', { level: 1 })).toBeVisible();
|
||||||
|
await expect(page.getByText(/^By Tudor/)).toBeVisible();
|
||||||
|
|
||||||
|
const jsonLd = await page
|
||||||
|
.locator('script[type="application/ld+json"]')
|
||||||
|
.first()
|
||||||
|
.textContent();
|
||||||
|
expect(jsonLd).toContain('"BlogPosting"');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('the admin panel is not indexable', async ({ page }) => {
|
||||||
|
const response = await page.request.get('/admin');
|
||||||
|
expect(response.headers()['x-robots-tag']).toContain('noindex');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('the content sitemap lists the about page and is advertised in robots', async ({ page }) => {
|
||||||
|
const sitemap = await page.request.get('/content-sitemap.xml');
|
||||||
|
expect(sitemap.ok()).toBeTruthy();
|
||||||
|
expect(await sitemap.text()).toContain('/about');
|
||||||
|
|
||||||
|
// The school corpus sitemap is proxied from FastAPI; this one is Next's.
|
||||||
|
// robots.txt must advertise both or the blog never gets discovered.
|
||||||
|
const robots = await page.request.get('/robots.txt');
|
||||||
|
const body = await robots.text();
|
||||||
|
expect(body).toContain('/sitemap.xml');
|
||||||
|
expect(body).toContain('/content-sitemap.xml');
|
||||||
|
});
|
||||||
@@ -39,3 +39,4 @@ yarn-error.log*
|
|||||||
# typescript
|
# typescript
|
||||||
*.tsbuildinfo
|
*.tsbuildinfo
|
||||||
next-env.d.ts
|
next-env.d.ts
|
||||||
|
|
||||||
@@ -53,6 +53,13 @@ COPY --from=builder /app/.next/static ./.next/static
|
|||||||
# a miss here is a silent 500 on /opengraph-image, not a build failure.
|
# a miss here is a silent 500 on /opengraph-image, not a build failure.
|
||||||
COPY --from=builder /app/assets ./assets
|
COPY --from=builder /app/assets ./assets
|
||||||
|
|
||||||
|
# Payload writes uploads here, and the compose file mounts a named volume over
|
||||||
|
# it. The directory must exist and be owned by the runtime user BEFORE the
|
||||||
|
# mount: Docker seeds a fresh named volume from the image path, so a missing or
|
||||||
|
# root-owned directory here makes every upload fail with EACCES at runtime,
|
||||||
|
# long after the build passed. The chown below covers it.
|
||||||
|
RUN mkdir -p /app/media
|
||||||
|
|
||||||
# Set correct permissions
|
# Set correct permissions
|
||||||
RUN chown -R nextjs:nodejs /app
|
RUN chown -R nextjs:nodejs /app
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
// environment provides — under jsdom this suite fails on import, not on an
|
// environment provides — under jsdom this suite fails on import, not on an
|
||||||
// assertion.
|
// assertion.
|
||||||
import { NextRequest } from 'next/server';
|
import { NextRequest } from 'next/server';
|
||||||
import { GET } from '@/app/api/[...path]/route';
|
import { GET } from '@/app/(frontend)/api/[...path]/route';
|
||||||
|
|
||||||
function request(path: string) {
|
function request(path: string) {
|
||||||
return new NextRequest(`http://localhost:3000/api/${path}`);
|
return new NextRequest(`http://localhost:3000/api/${path}`);
|
||||||
|
|||||||
@@ -0,0 +1,34 @@
|
|||||||
|
import { metadata } from '@/app/(frontend)/about/page';
|
||||||
|
import { personJsonLd, organizationJsonLd } from '@/lib/jsonld';
|
||||||
|
|
||||||
|
describe('/about metadata', () => {
|
||||||
|
it('canonicalises to the bare path', () => {
|
||||||
|
expect(metadata.alternates?.canonical)
|
||||||
|
.toBe('https://www.schoolcompare.co.uk/about');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('author structured data', () => {
|
||||||
|
it('describes a Person with a first name and a photo', () => {
|
||||||
|
const person = personJsonLd();
|
||||||
|
expect(person['@type']).toBe('Person');
|
||||||
|
expect(person.name).toBe('Tudor');
|
||||||
|
expect(person.image).toBe('https://www.schoolcompare.co.uk/brand/tudor.jpg');
|
||||||
|
expect(person.url).toBe('https://www.schoolcompare.co.uk/about');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('never publishes a surname or an employer', () => {
|
||||||
|
// Author identity constraint: first name only. A surname here would be
|
||||||
|
// the one place it leaks, since JSON-LD is machine-read and archived.
|
||||||
|
const serialised = JSON.stringify(personJsonLd());
|
||||||
|
expect(serialised).not.toMatch(/familyName|Sitaru/i);
|
||||||
|
expect(serialised).not.toMatch(/worksFor|affiliation/i);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('describes the site as an Organization the Person authors for', () => {
|
||||||
|
const org = organizationJsonLd();
|
||||||
|
expect(org['@type']).toBe('Organization');
|
||||||
|
expect(org.name).toBe('schoolcompare');
|
||||||
|
expect(org.url).toBe('https://www.schoolcompare.co.uk');
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,53 @@
|
|||||||
|
/**
|
||||||
|
* The blog index imports getCachedPayload, which pulls in Payload — ESM-only,
|
||||||
|
* and next/jest will not transform node_modules. Mocking that one module keeps
|
||||||
|
* the page's metadata testable without loading the CMS; the mock is never
|
||||||
|
* called, because `metadata` is a static export evaluated at import time.
|
||||||
|
*/
|
||||||
|
jest.mock('@/lib/payload', () => ({ getCachedPayload: jest.fn() }));
|
||||||
|
|
||||||
|
import { metadata } from '@/app/(frontend)/blog/page';
|
||||||
|
import { blogPostingJsonLd, breadcrumbJsonLd } from '@/lib/jsonld';
|
||||||
|
|
||||||
|
const post = {
|
||||||
|
title: 'What the data cannot tell you',
|
||||||
|
slug: 'what-the-data-cannot-tell-you',
|
||||||
|
excerpt: 'Results describe one year group on a handful of days.',
|
||||||
|
publishedAt: '2026-09-15T00:00:00.000Z',
|
||||||
|
};
|
||||||
|
|
||||||
|
describe('/blog metadata', () => {
|
||||||
|
it('canonicalises to the bare path', () => {
|
||||||
|
expect(metadata.alternates?.canonical)
|
||||||
|
.toBe('https://www.schoolcompare.co.uk/blog');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('BlogPosting structured data', () => {
|
||||||
|
it('names the same Person entity the about page declares', () => {
|
||||||
|
// By @id, not by repeating the person: search engines must resolve every
|
||||||
|
// post and the about page to one author entity, or the site has several.
|
||||||
|
const ld = blogPostingJsonLd(post);
|
||||||
|
expect(ld['@type']).toBe('BlogPosting');
|
||||||
|
expect(ld.author['@id']).toBe('https://www.schoolcompare.co.uk/about#tudor');
|
||||||
|
expect(ld.publisher['@id']).toBe('https://www.schoolcompare.co.uk#organization');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('carries a self-referencing canonical url and the publish date', () => {
|
||||||
|
const ld = blogPostingJsonLd(post);
|
||||||
|
expect(ld.url).toBe(
|
||||||
|
'https://www.schoolcompare.co.uk/blog/what-the-data-cannot-tell-you',
|
||||||
|
);
|
||||||
|
expect(ld.datePublished).toBe('2026-09-15T00:00:00.000Z');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('breadcrumbs', () => {
|
||||||
|
it('places the post under the blog index', () => {
|
||||||
|
const ld = breadcrumbJsonLd(post);
|
||||||
|
expect(ld.itemListElement[0].item).toBe('https://www.schoolcompare.co.uk/blog');
|
||||||
|
expect(ld.itemListElement[1].item).toBe(
|
||||||
|
'https://www.schoolcompare.co.uk/blog/what-the-data-cannot-tell-you',
|
||||||
|
);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
import { metadata as homeMetadata } from '@/app/page';
|
import { metadata as homeMetadata } from '@/app/(frontend)/page';
|
||||||
import { metadata as rankingsMetadata } from '@/app/rankings/page';
|
import { metadata as rankingsMetadata } from '@/app/(frontend)/rankings/page';
|
||||||
import { metadata as admissionsMetadata } from '@/app/admissions/page';
|
import { metadata as admissionsMetadata } from '@/app/(frontend)/admissions/page';
|
||||||
import { generateMetadata as compareMetadata } from '@/app/compare/page';
|
import { generateMetadata as compareMetadata } from '@/app/(frontend)/compare/page';
|
||||||
|
|
||||||
describe('canonical URLs', () => {
|
describe('canonical URLs', () => {
|
||||||
it('the homepage canonicalises to the bare root', () => {
|
it('the homepage canonicalises to the bare root', () => {
|
||||||
|
|||||||
@@ -0,0 +1,66 @@
|
|||||||
|
/**
|
||||||
|
* next.config.mjs carries the staging noindex rule. Breaking it turns
|
||||||
|
* stx.schoolcompare.co.uk into a fully crawlable duplicate of production,
|
||||||
|
* and nothing else in the suite would notice.
|
||||||
|
*
|
||||||
|
* The non-null assertions are deliberate: every key asserted here is optional
|
||||||
|
* on NextConfig, and a missing one is precisely the regression under test, so
|
||||||
|
* the assertion below should fail the test rather than the compile.
|
||||||
|
*/
|
||||||
|
import nextConfig from '@/next.config.mjs';
|
||||||
|
|
||||||
|
async function headerRules() {
|
||||||
|
return nextConfig.headers!();
|
||||||
|
}
|
||||||
|
|
||||||
|
describe('next.config.mjs', () => {
|
||||||
|
it('keeps the staging host out of the index', async () => {
|
||||||
|
const headers = await headerRules();
|
||||||
|
const stagingRule = headers.find((rule) =>
|
||||||
|
rule.has?.some(
|
||||||
|
(cond) => cond.type === 'host' && cond.value === 'stx.schoolcompare.co.uk',
|
||||||
|
),
|
||||||
|
);
|
||||||
|
expect(stagingRule).toBeDefined();
|
||||||
|
expect(stagingRule!.headers).toContainEqual({
|
||||||
|
key: 'X-Robots-Tag',
|
||||||
|
value: 'noindex, nofollow',
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('still emits standalone output for the Docker runner', () => {
|
||||||
|
expect(nextConfig.output).toBe('standalone');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('still traces the share-card fonts into the standalone bundle', () => {
|
||||||
|
expect(nextConfig.outputFileTracingIncludes!['/opengraph-image']).toEqual([
|
||||||
|
'./assets/**',
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('still allows the analytics subdomain to frame the site', async () => {
|
||||||
|
const headers = await headerRules();
|
||||||
|
const csp = headers
|
||||||
|
.flatMap((rule) => rule.headers)
|
||||||
|
.find((header) => header.key === 'Content-Security-Policy');
|
||||||
|
expect(csp).toBeDefined();
|
||||||
|
expect(csp!.value).toContain('https://analytics.schoolcompare.co.uk');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('admin surface', () => {
|
||||||
|
it('serves noindex on the admin panel and the CMS API', async () => {
|
||||||
|
// robots.txt disallows these too, but a Disallow only blocks crawling — a
|
||||||
|
// URL found from an external link can still be indexed without ever being
|
||||||
|
// fetched. This header is what actually keeps them out.
|
||||||
|
const headers = await headerRules();
|
||||||
|
for (const source of ['/admin/:path*', '/cms-api/:path*']) {
|
||||||
|
const rule = headers.find((entry) => entry.source === source);
|
||||||
|
expect(rule).toBeDefined();
|
||||||
|
expect(rule!.headers).toContainEqual({
|
||||||
|
key: 'X-Robots-Tag',
|
||||||
|
value: 'noindex, nofollow',
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
import { generateMetadata as placeMeta } from '@/app/schools/[place]/page';
|
import { generateMetadata as placeMeta } from '@/app/(frontend)/schools/[place]/page';
|
||||||
|
|
||||||
jest.mock('@/lib/places', () => ({
|
jest.mock('@/lib/places', () => ({
|
||||||
...jest.requireActual('@/lib/places'),
|
...jest.requireActual('@/lib/places'),
|
||||||
|
|||||||
@@ -0,0 +1,20 @@
|
|||||||
|
import robots from '@/app/robots';
|
||||||
|
|
||||||
|
describe('robots.txt', () => {
|
||||||
|
it('disallows the admin panel and the CMS API', () => {
|
||||||
|
const rules = robots().rules;
|
||||||
|
const rule = Array.isArray(rules) ? rules[0] : rules;
|
||||||
|
expect(rule.disallow).toEqual(
|
||||||
|
expect.arrayContaining(['/api/', '/_next/', '/admin/', '/cms-api/']),
|
||||||
|
);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('sitemap discovery', () => {
|
||||||
|
it('lists both the proxied school sitemap and the Next-owned content sitemap', () => {
|
||||||
|
expect(robots().sitemap).toEqual([
|
||||||
|
'https://www.schoolcompare.co.uk/sitemap.xml',
|
||||||
|
'https://www.schoolcompare.co.uk/content-sitemap.xml',
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,149 @@
|
|||||||
|
import { render, screen } from '@testing-library/react';
|
||||||
|
import { DestinationsSection } from '@/components/school/DestinationsSection';
|
||||||
|
import type { DestinationPhase } from '@/lib/types';
|
||||||
|
import type { DestinationCategory, DestinationStatus } from '@/lib/destinations';
|
||||||
|
|
||||||
|
const cell = (
|
||||||
|
category: DestinationCategory,
|
||||||
|
pupils: number | null,
|
||||||
|
status: DestinationStatus = 'published',
|
||||||
|
) => ({
|
||||||
|
category, pupils,
|
||||||
|
percentage: pupils === null ? null : (pupils / 180) * 100,
|
||||||
|
status,
|
||||||
|
});
|
||||||
|
|
||||||
|
const ALL_PUBLISHED = [
|
||||||
|
cell('school_sixth_form', 75), cell('sixth_form_college', 21),
|
||||||
|
cell('further_education', 55), cell('other_education', 6),
|
||||||
|
cell('apprenticeship', 8), cell('employment', 6),
|
||||||
|
cell('not_sustained', 5), cell('not_captured', 4),
|
||||||
|
];
|
||||||
|
|
||||||
|
const fullPhase: DestinationPhase = {
|
||||||
|
cohort_year: '2022/23',
|
||||||
|
groups: { all: { cohort: 180, categories: ALL_PUBLISHED } },
|
||||||
|
};
|
||||||
|
|
||||||
|
const suppressedPhase: DestinationPhase = {
|
||||||
|
cohort_year: '2022/23',
|
||||||
|
groups: {
|
||||||
|
all: {
|
||||||
|
cohort: 180,
|
||||||
|
categories: [
|
||||||
|
cell('school_sixth_form', 75), cell('sixth_form_college', null, 'suppressed'),
|
||||||
|
cell('further_education', 55), cell('other_education', 6),
|
||||||
|
cell('apprenticeship', 8), cell('employment', 6),
|
||||||
|
cell('not_sustained', 5), cell('not_captured', 4),
|
||||||
|
],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
describe('DestinationsSection', () => {
|
||||||
|
it('dates its own cohort so it is not read as stale next to the GCSE section', () => {
|
||||||
|
render(<DestinationsSection destinations={fullPhase} />);
|
||||||
|
expect(screen.getByText(/2022\/23/)).toBeInTheDocument();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('renders one bar segment per published category', () => {
|
||||||
|
const { container } = render(<DestinationsSection destinations={fullPhase} />);
|
||||||
|
expect(container.querySelectorAll('[data-destination-segment]')).toHaveLength(8);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('renders NO bar at all when a category is withheld', () => {
|
||||||
|
const { container } = render(<DestinationsSection destinations={suppressedPhase} />);
|
||||||
|
// R1: a bar with a gap in it publishes the withheld figure by its width.
|
||||||
|
expect(container.querySelectorAll('[data-destination-segment]')).toHaveLength(0);
|
||||||
|
expect(screen.getAllByText(/withheld/i).length).toBeGreaterThan(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('never states the remainder for a partially suppressed group', () => {
|
||||||
|
const { container } = render(<DestinationsSection destinations={suppressedPhase} />);
|
||||||
|
// 180 cohort - 159 published = 21, the withheld figure. It must appear nowhere.
|
||||||
|
expect(container.textContent).not.toMatch(/\b21\b/);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('shows a card value for a group whose components are all published', () => {
|
||||||
|
render(<DestinationsSection destinations={fullPhase} />);
|
||||||
|
// academic route = 75 + 21 = 96 of 180 = 53%
|
||||||
|
expect(screen.getByText('53%')).toBeInTheDocument();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('refuses a card value when one of its components is withheld', () => {
|
||||||
|
render(<DestinationsSection destinations={suppressedPhase} />);
|
||||||
|
// academic route needs sixth_form_college, which is suppressed.
|
||||||
|
expect(screen.getByText(/not published/i)).toBeInTheDocument();
|
||||||
|
expect(screen.queryByText('53%')).not.toBeInTheDocument();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('never claims a pupil stayed at this school', () => {
|
||||||
|
const { container } = render(<DestinationsSection destinations={fullPhase} />);
|
||||||
|
// The published file reports destination TYPE, never destination institution.
|
||||||
|
expect(container.textContent).not.toMatch(/stayed on (here|at this school)/i);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('renders nothing when no group carries categories', () => {
|
||||||
|
const empty: DestinationPhase = { cohort_year: '2022/23', groups: {} };
|
||||||
|
const { container } = render(<DestinationsSection destinations={empty} />);
|
||||||
|
expect(container.firstChild).toBeNull();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('the detail table keeps the three statuses apart', () => {
|
||||||
|
// 'suppressed' and 'not_applicable' are different claims, and the mart, the
|
||||||
|
// SQLAlchemy model and the serialiser all preserve the difference. The table
|
||||||
|
// used to key its Share column off `percentage === null`, which is true for
|
||||||
|
// both, so a category that simply does not apply was labelled "withheld" —
|
||||||
|
// while the Pupils column beside it rendered blank.
|
||||||
|
const mixedPhase: DestinationPhase = {
|
||||||
|
cohort_year: '2022/23',
|
||||||
|
groups: {
|
||||||
|
all: {
|
||||||
|
cohort: 180,
|
||||||
|
categories: [
|
||||||
|
cell('school_sixth_form', 75),
|
||||||
|
cell('sixth_form_college', null, 'suppressed'),
|
||||||
|
cell('further_education', null, 'suppressed'),
|
||||||
|
cell('apprenticeship', null, 'not_applicable'),
|
||||||
|
],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
const rowFor = (container: HTMLElement, category: string) =>
|
||||||
|
Array.from(container.querySelectorAll('tbody tr'))
|
||||||
|
.find(tr => tr.textContent?.includes(category));
|
||||||
|
|
||||||
|
it('never labels a not-applicable category as withheld', () => {
|
||||||
|
const { container } = render(<DestinationsSection destinations={mixedPhase} />);
|
||||||
|
const row = rowFor(container, 'Apprenticeship');
|
||||||
|
expect(row).toBeTruthy();
|
||||||
|
expect(row!.textContent).not.toMatch(/withheld/i);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('labels a genuinely suppressed category as withheld in both columns', () => {
|
||||||
|
const { container } = render(<DestinationsSection destinations={mixedPhase} />);
|
||||||
|
const row = rowFor(container, 'Sixth-form college');
|
||||||
|
expect(row).toBeTruthy();
|
||||||
|
expect(row!.querySelectorAll('td')).toHaveLength(2);
|
||||||
|
Array.from(row!.querySelectorAll('td')).forEach(td =>
|
||||||
|
expect(td.textContent).toMatch(/withheld/i));
|
||||||
|
});
|
||||||
|
|
||||||
|
it('the two columns of a row never disagree about what the row is', () => {
|
||||||
|
const { container } = render(<DestinationsSection destinations={mixedPhase} />);
|
||||||
|
Array.from(container.querySelectorAll('tbody tr')).forEach(tr => {
|
||||||
|
const cells = Array.from(tr.querySelectorAll('td'))
|
||||||
|
.map(td => /withheld/i.test(td.textContent ?? ''));
|
||||||
|
expect(new Set(cells).size).toBe(1);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('shows a published category its real figures', () => {
|
||||||
|
const { container } = render(<DestinationsSection destinations={mixedPhase} />);
|
||||||
|
const row = rowFor(container, 'State-funded school sixth form');
|
||||||
|
expect(row!.textContent).toMatch(/75/);
|
||||||
|
expect(row!.textContent).toMatch(/42%/);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -3,10 +3,11 @@ import userEvent from '@testing-library/user-event';
|
|||||||
import { FilterBar } from '@/components/FilterBar';
|
import { FilterBar } from '@/components/FilterBar';
|
||||||
|
|
||||||
const push = jest.fn();
|
const push = jest.fn();
|
||||||
|
let searchParams = new URLSearchParams();
|
||||||
jest.mock('next/navigation', () => ({
|
jest.mock('next/navigation', () => ({
|
||||||
useRouter: () => ({ push, replace: jest.fn(), prefetch: jest.fn() }),
|
useRouter: () => ({ push, replace: jest.fn(), prefetch: jest.fn() }),
|
||||||
usePathname: () => '/',
|
usePathname: () => '/',
|
||||||
useSearchParams: () => new URLSearchParams(),
|
useSearchParams: () => searchParams,
|
||||||
}));
|
}));
|
||||||
|
|
||||||
const FILTERS = {
|
const FILTERS = {
|
||||||
@@ -24,6 +25,7 @@ beforeEach(() => {
|
|||||||
phase: 'Primary', school_type: 'Community school' }] }),
|
phase: 'Primary', school_type: 'Community school' }] }),
|
||||||
})) as unknown as typeof fetch;
|
})) as unknown as typeof fetch;
|
||||||
push.mockClear();
|
push.mockClear();
|
||||||
|
searchParams = new URLSearchParams();
|
||||||
});
|
});
|
||||||
afterEach(() => { global.fetch = realFetch; });
|
afterEach(() => { global.fetch = realFetch; });
|
||||||
|
|
||||||
@@ -74,3 +76,35 @@ describe('FilterBar autosuggest', () => {
|
|||||||
expect.stringContaining('search=brecknock')));
|
expect.stringContaining('search=brecknock')));
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
describe('FilterBar autosuggest does not reopen over results', () => {
|
||||||
|
it('stays shut when the input arrives pre-filled from the URL', async () => {
|
||||||
|
/*
|
||||||
|
* The results-page bar renders with the search term already in the input.
|
||||||
|
* Opening on that would drop the dropdown on top of the results the search
|
||||||
|
* just produced — which is exactly what happened: the first result became
|
||||||
|
* unclickable, because the list sat over it and swallowed the pointer.
|
||||||
|
*
|
||||||
|
* Suggestions answer typing, not the presence of a value.
|
||||||
|
*/
|
||||||
|
searchParams = new URLSearchParams('search=brecknock');
|
||||||
|
render(<FilterBar filters={FILTERS} autosuggest />);
|
||||||
|
|
||||||
|
expect(screen.getByRole('combobox')).toHaveValue('brecknock');
|
||||||
|
await new Promise((r) => setTimeout(r, 300)); // past the 200ms debounce
|
||||||
|
expect(global.fetch).not.toHaveBeenCalled();
|
||||||
|
expect(screen.queryByRole('listbox')).not.toBeInTheDocument();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('closes the dropdown when the search is submitted', async () => {
|
||||||
|
render(<FilterBar filters={FILTERS} autosuggest />);
|
||||||
|
const input = screen.getByRole('combobox');
|
||||||
|
|
||||||
|
await userEvent.type(input, 'brecknock');
|
||||||
|
expect(await screen.findByRole('listbox')).toBeInTheDocument();
|
||||||
|
|
||||||
|
await userEvent.type(input, '{Enter}');
|
||||||
|
await waitFor(() =>
|
||||||
|
expect(screen.queryByRole('listbox')).not.toBeInTheDocument());
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -346,3 +346,134 @@ describe('PlaceView unlinkable authorities', () => {
|
|||||||
.toContain('Isles Of Scilly');
|
.toContain('Isles Of Scilly');
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
describe('PlaceView school attributes', () => {
|
||||||
|
/*
|
||||||
|
* The table shipped with one column of scores, which answers "how did they
|
||||||
|
* do" and nothing about whether the school is one a family could use. Age
|
||||||
|
* range, faith, nursery and constituency are the four facts a parent
|
||||||
|
* filters on before they look at a number at all.
|
||||||
|
*/
|
||||||
|
const withAttributes: PlaceDetail = {
|
||||||
|
place: { kind: 'town', slug: 'chelmsford', name: 'Chelmsford', count: 3,
|
||||||
|
parent_authority: 'Essex', phases: ['primary', 'secondary'] },
|
||||||
|
schools: [
|
||||||
|
{ urn: 1, school_name: 'Alpha Primary', phase: 'Primary',
|
||||||
|
rwm_expected_pct: 82, attainment_8_score: null,
|
||||||
|
age_range: '4-11', religious_denomination: 'Church of England',
|
||||||
|
nursery_provision: true,
|
||||||
|
parliamentary_constituency: 'Chelmsford' } as never,
|
||||||
|
{ urn: 2, school_name: 'Beta High', phase: 'Secondary',
|
||||||
|
rwm_expected_pct: null, attainment_8_score: 47,
|
||||||
|
age_range: '11-16', religious_denomination: 'Does not apply',
|
||||||
|
nursery_provision: false,
|
||||||
|
parliamentary_constituency: 'Witham' } as never,
|
||||||
|
],
|
||||||
|
averages: { rwm_expected_pct: 63, attainment_8_score: 45 },
|
||||||
|
};
|
||||||
|
|
||||||
|
function headings(container: HTMLElement, table = 0): string[] {
|
||||||
|
return Array.from(container.querySelectorAll('table')[table]
|
||||||
|
.querySelectorAll('thead th')).map((th) => th.textContent ?? '');
|
||||||
|
}
|
||||||
|
|
||||||
|
it('heads a primary table with all four attributes', () => {
|
||||||
|
const { container } = render(<PlaceView detail={withAttributes}
|
||||||
|
englandAverage={61} neighbours={[]} />);
|
||||||
|
expect(headings(container)).toEqual([
|
||||||
|
'School', 'Reading, writing & maths',
|
||||||
|
'Ages', 'Religious character', 'Nursery', 'Constituency',
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('omits nursery from a secondary table, where it does not apply', () => {
|
||||||
|
const { container } = render(<PlaceView detail={withAttributes}
|
||||||
|
englandAverage={61} neighbours={[]} />);
|
||||||
|
expect(headings(container, 1)).toEqual([
|
||||||
|
'School', 'Attainment 8', 'Ages', 'Religious character', 'Constituency',
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('keeps the measure beside the school name, where a phone can see it', () => {
|
||||||
|
// Six columns overflow a phone and .tableWrap turns that into a swipe.
|
||||||
|
// With the measure last, the one number the page exists for is the one
|
||||||
|
// scrolled off the screen.
|
||||||
|
const { container } = render(<PlaceView detail={withAttributes}
|
||||||
|
phase="primary" englandAverage={61} neighbours={[]} />);
|
||||||
|
expect(headings(container)[1]).toBe('Reading, writing & maths');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('shows the age range without repeating the column heading', () => {
|
||||||
|
render(<PlaceView detail={withAttributes} englandAverage={61}
|
||||||
|
neighbours={[]} />);
|
||||||
|
expect(screen.getByText('4–11')).toBeInTheDocument();
|
||||||
|
expect(screen.queryByText('Ages 4–11')).not.toBeInTheDocument();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('names the faith of a faith school', () => {
|
||||||
|
render(<PlaceView detail={withAttributes} englandAverage={61}
|
||||||
|
neighbours={[]} />);
|
||||||
|
expect(screen.getByText('Church of England')).toBeInTheDocument();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('reads "Does not apply" as no religious character, not as a value', () => {
|
||||||
|
// GIAS spells the absence of a faith as "Does not apply", which is a
|
||||||
|
// database answer rather than an English one. The school page already
|
||||||
|
// suppresses it; the two must not disagree about the same school.
|
||||||
|
const { container } = render(<PlaceView detail={withAttributes}
|
||||||
|
englandAverage={61} neighbours={[]} />);
|
||||||
|
const secondary = container.querySelectorAll('table')[1]
|
||||||
|
.querySelectorAll('tbody td');
|
||||||
|
expect(secondary[3].textContent).toBe('—');
|
||||||
|
expect(screen.queryByText(/Does not apply/)).not.toBeInTheDocument();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('marks a nursery as such and a school without one as not', () => {
|
||||||
|
const { container } = render(<PlaceView detail={withAttributes}
|
||||||
|
englandAverage={61} neighbours={[]} />);
|
||||||
|
const cells = container.querySelectorAll('table')[0]
|
||||||
|
.querySelectorAll('tbody td');
|
||||||
|
expect(cells[4].textContent).toBe('Yes');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('names the constituency of each school', () => {
|
||||||
|
render(<PlaceView detail={withAttributes} englandAverage={61}
|
||||||
|
neighbours={[]} />);
|
||||||
|
expect(screen.getByText('Chelmsford', { selector: 'td' })).toBeInTheDocument();
|
||||||
|
expect(screen.getByText('Witham', { selector: 'td' })).toBeInTheDocument();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('dashes an attribute the data does not carry', () => {
|
||||||
|
// nursery_provision and parliamentary_constituency are absent from marts
|
||||||
|
// the pipeline has not rebuilt, and the API degrades them to null rather
|
||||||
|
// than failing. A row must survive that.
|
||||||
|
const bare: PlaceDetail = {
|
||||||
|
...withAttributes,
|
||||||
|
schools: [{ urn: 3, school_name: 'Gamma Primary', phase: 'Primary',
|
||||||
|
rwm_expected_pct: 70 } as never],
|
||||||
|
};
|
||||||
|
const { container } = render(<PlaceView detail={bare} phase="primary"
|
||||||
|
englandAverage={61} neighbours={[]} />);
|
||||||
|
const cells = Array.from(container.querySelectorAll('tbody td'))
|
||||||
|
.map((td) => td.textContent);
|
||||||
|
expect(cells.slice(2)).toEqual(['—', '—', '—', '—']);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('gives an all-through school its nursery under primary only', () => {
|
||||||
|
// All-through schools render in both groups. Nursery belongs to the
|
||||||
|
// primary reading of the same school, not the secondary one.
|
||||||
|
const allThrough: PlaceDetail = {
|
||||||
|
...withAttributes,
|
||||||
|
schools: [{ urn: 4, school_name: 'Delta Academy', phase: 'All-through',
|
||||||
|
rwm_expected_pct: 66, attainment_8_score: 51,
|
||||||
|
age_range: '4-18', religious_denomination: 'None',
|
||||||
|
nursery_provision: true,
|
||||||
|
parliamentary_constituency: 'Chelmsford' } as never],
|
||||||
|
};
|
||||||
|
const { container } = render(<PlaceView detail={allThrough}
|
||||||
|
englandAverage={61} neighbours={[]} />);
|
||||||
|
const tables = container.querySelectorAll('table');
|
||||||
|
expect(tables[0].textContent).toContain('Yes');
|
||||||
|
expect(tables[1].textContent).not.toContain('Yes');
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,44 @@
|
|||||||
|
import { render, screen } from '@testing-library/react';
|
||||||
|
import { Post16DestinationsSection } from '@/components/school/Post16DestinationsSection';
|
||||||
|
import type { DestinationPhase } from '@/lib/types';
|
||||||
|
|
||||||
|
const phase: DestinationPhase = {
|
||||||
|
cohort_year: '2022/23',
|
||||||
|
groups: {
|
||||||
|
all: {
|
||||||
|
cohort: 96,
|
||||||
|
categories: [
|
||||||
|
{ category: 'higher_education', pupils: 56, percentage: 58.3, status: 'published' },
|
||||||
|
{ category: 'further_education', pupils: 12, percentage: 12.5, status: 'published' },
|
||||||
|
{ category: 'apprenticeship', pupils: 9, percentage: 9.4, status: 'published' },
|
||||||
|
{ category: 'employment', pupils: 13, percentage: 13.5, status: 'published' },
|
||||||
|
{ category: 'not_sustained', pupils: 6, percentage: 6.3, status: 'published' },
|
||||||
|
],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
describe('Post16DestinationsSection', () => {
|
||||||
|
it('names the Year 13 cohort, not Year 11', () => {
|
||||||
|
const { container } = render(<Post16DestinationsSection destinations={phase} />);
|
||||||
|
expect(container.textContent).toMatch(/Year 13/);
|
||||||
|
expect(container.textContent).not.toMatch(/Year 11/);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('reports higher education destinations', () => {
|
||||||
|
render(<Post16DestinationsSection destinations={phase} />);
|
||||||
|
expect(screen.getByText(/UK higher education/i)).toBeInTheDocument();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('uses its own anchor so the nav does not collide with After Year 11', () => {
|
||||||
|
const { container } = render(<Post16DestinationsSection destinations={phase} />);
|
||||||
|
expect(container.querySelector('#post16-destinations')).toBeTruthy();
|
||||||
|
expect(container.querySelector('#destinations')).toBeNull();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('renders nothing when no group carries categories', () => {
|
||||||
|
const empty: DestinationPhase = { cohort_year: '2022/23', groups: {} };
|
||||||
|
const { container } = render(<Post16DestinationsSection destinations={empty} />);
|
||||||
|
expect(container.firstChild).toBeNull();
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,38 @@
|
|||||||
|
/**
|
||||||
|
* The trail has to be written by something, and it has to be written on every
|
||||||
|
* route — not only the ones that happen to track an event.
|
||||||
|
*/
|
||||||
|
import { render } from '@testing-library/react';
|
||||||
|
|
||||||
|
const recordVisitedPath = jest.fn();
|
||||||
|
let pathname = '/schools/brentwood';
|
||||||
|
|
||||||
|
jest.mock('next/navigation', () => ({ usePathname: () => pathname }));
|
||||||
|
jest.mock('@/lib/analytics', () => ({
|
||||||
|
recordVisitedPath: (p: string) => recordVisitedPath(p),
|
||||||
|
}));
|
||||||
|
|
||||||
|
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
||||||
|
const { RouteTrail } = require('@/components/RouteTrail');
|
||||||
|
|
||||||
|
describe('RouteTrail', () => {
|
||||||
|
beforeEach(() => recordVisitedPath.mockClear());
|
||||||
|
|
||||||
|
it('records the page it is mounted on', () => {
|
||||||
|
render(<RouteTrail />);
|
||||||
|
expect(recordVisitedPath).toHaveBeenCalledWith('/schools/brentwood');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('records each new route as the user moves through the app', () => {
|
||||||
|
const { rerender } = render(<RouteTrail />);
|
||||||
|
pathname = '/school/115429-brentwood-school';
|
||||||
|
rerender(<RouteTrail />);
|
||||||
|
expect(recordVisitedPath).toHaveBeenLastCalledWith(
|
||||||
|
'/school/115429-brentwood-school');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('renders nothing, so it can sit anywhere in the layout', () => {
|
||||||
|
const { container } = render(<RouteTrail />);
|
||||||
|
expect(container).toBeEmptyDOMElement();
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,45 @@
|
|||||||
|
import { render } from '@testing-library/react';
|
||||||
|
import { TrackPlaceView } from '@/components/places/TrackPlaceView';
|
||||||
|
|
||||||
|
const trackMock = jest.fn();
|
||||||
|
jest.mock('@/lib/analytics', () => ({
|
||||||
|
track: (...args: unknown[]) => trackMock(...args),
|
||||||
|
getNavigationSource: () => 'search',
|
||||||
|
}));
|
||||||
|
|
||||||
|
describe('TrackPlaceView', () => {
|
||||||
|
beforeEach(() => trackMock.mockClear());
|
||||||
|
|
||||||
|
it('reports which kind of location page was viewed', () => {
|
||||||
|
/*
|
||||||
|
* `kind` is the reason this event exists. Whether to keep investing in the
|
||||||
|
* location layer turns on which *sort* of page earns engagement — towns,
|
||||||
|
* authorities or postcode districts — and a bare pageview cannot say,
|
||||||
|
* because all four families share the /schools/ prefix.
|
||||||
|
*/
|
||||||
|
render(<TrackPlaceView kind="authority" slug="kent" count={412} />);
|
||||||
|
expect(trackMock).toHaveBeenCalledWith('place_viewed', {
|
||||||
|
kind: 'authority', slug: 'kent', phase: 'all',
|
||||||
|
school_count: 412, from: 'search',
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('names the phase when the page is a phase variant', () => {
|
||||||
|
render(<TrackPlaceView kind="town" slug="brentwood" count={29} phase="primary" />);
|
||||||
|
expect(trackMock).toHaveBeenCalledWith('place_viewed',
|
||||||
|
expect.objectContaining({ phase: 'primary' }));
|
||||||
|
});
|
||||||
|
|
||||||
|
it('fires once, not once per render', () => {
|
||||||
|
const { rerender } = render(
|
||||||
|
<TrackPlaceView kind="town" slug="brentwood" count={29} />);
|
||||||
|
rerender(<TrackPlaceView kind="town" slug="brentwood" count={29} />);
|
||||||
|
expect(trackMock).toHaveBeenCalledTimes(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('renders nothing', () => {
|
||||||
|
const { container } = render(
|
||||||
|
<TrackPlaceView kind="town" slug="brentwood" count={29} />);
|
||||||
|
expect(container).toBeEmptyDOMElement();
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,192 @@
|
|||||||
|
import fs from 'fs';
|
||||||
|
import path from 'path';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Guards against light-theme-only CSS.
|
||||||
|
*
|
||||||
|
* The site themes entirely through tokens redefined under
|
||||||
|
* `@media (prefers-color-scheme: dark)`. A hardcoded colour therefore does not
|
||||||
|
* fail loudly — it renders perfectly in the theme it was written for and
|
||||||
|
* quietly wrongly in the other, which nobody sees unless they happen to be in
|
||||||
|
* dark mode when they look.
|
||||||
|
*
|
||||||
|
* Both rules below are drawn from real defects in SchoolHeroMap.module.css,
|
||||||
|
* found by eye rather than by any test:
|
||||||
|
*
|
||||||
|
* - the map's fade to the header ramped through hardcoded white and landed on
|
||||||
|
* `var(--bg-card)`. Invisible in light; a bright band across the full width
|
||||||
|
* of a near-black card in dark.
|
||||||
|
* - the controls floating over the map paired a hardcoded white background
|
||||||
|
* with `color: var(--text-primary)`, which resolves to #E9EEF0 in dark —
|
||||||
|
* near-white text on a near-white button.
|
||||||
|
*/
|
||||||
|
|
||||||
|
const COMPONENTS = path.join(__dirname, '..', '..', 'components');
|
||||||
|
|
||||||
|
function stylesheets(dir: string): string[] {
|
||||||
|
return fs.readdirSync(dir, { withFileTypes: true }).flatMap((entry) => {
|
||||||
|
const full = path.join(dir, entry.name);
|
||||||
|
if (entry.isDirectory()) return stylesheets(full);
|
||||||
|
return entry.name.endsWith('.module.css') ? [full] : [];
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Innermost `selector { body }` pairs. Nested at-rules never match as rules,
|
||||||
|
* because their body contains braces.
|
||||||
|
*
|
||||||
|
* Comments are stripped before matching rather than after, so that the whole
|
||||||
|
* selector survives. Taking only its last line — which is what stripping a
|
||||||
|
* leading comment used to require — silently discarded every selector in a
|
||||||
|
* grouped rule but the final one, and a safety guard that cannot see half its
|
||||||
|
* input fails open. */
|
||||||
|
function rules(css: string): Array<{ selector: string; body: string }> {
|
||||||
|
const bare = css.replace(/\/\*[\s\S]*?\*\//g, '');
|
||||||
|
return Array.from(bare.matchAll(/([^{}]+)\{([^{}]*)\}/g), (m) => ({
|
||||||
|
selector: m[1].trim().replace(/\s*\n\s*/g, ' '),
|
||||||
|
body: m[2],
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
const HARDCODED_WHITE_BG = /background[^;]*(?:255,\s*255,\s*255|#fff\b|#ffffff\b)/i;
|
||||||
|
const THEMED_COLOR = /(?:^|[^-])color:\s*var\(--/;
|
||||||
|
|
||||||
|
const files = stylesheets(COMPONENTS);
|
||||||
|
|
||||||
|
/** Component sources, for the third-party-surface rule below. */
|
||||||
|
function sources(dir: string): string[] {
|
||||||
|
return fs.readdirSync(dir, { withFileTypes: true }).flatMap((entry) => {
|
||||||
|
const full = path.join(dir, entry.name);
|
||||||
|
if (entry.isDirectory()) return sources(full);
|
||||||
|
return entry.name.endsWith('.tsx') ? [full] : [];
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
describe('dark-theme safety', () => {
|
||||||
|
it('finds stylesheets to check', () => {
|
||||||
|
expect(files.length).toBeGreaterThan(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('never pairs a hardcoded white background with a themed text colour', () => {
|
||||||
|
const offenders = files.flatMap((file) =>
|
||||||
|
rules(fs.readFileSync(file, 'utf8'))
|
||||||
|
.filter((r) => HARDCODED_WHITE_BG.test(r.body) && THEMED_COLOR.test(r.body))
|
||||||
|
.map((r) => `${path.relative(COMPONENTS, file)} ${r.selector}`));
|
||||||
|
|
||||||
|
// Either the surface follows the theme and so should the text, or it does
|
||||||
|
// not and the text must be literal too. Mixing them is how near-white text
|
||||||
|
// ends up on a near-white button.
|
||||||
|
expect(offenders).toEqual([]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('never fades to a themed colour through a hardcoded one', () => {
|
||||||
|
const offenders = files.flatMap((file) =>
|
||||||
|
rules(fs.readFileSync(file, 'utf8'))
|
||||||
|
.filter((r) => /linear-gradient/.test(r.body)
|
||||||
|
&& /var\(--bg-(card|primary|secondary)\)/.test(r.body)
|
||||||
|
&& /255,\s*255,\s*255|#fff\b/i.test(r.body))
|
||||||
|
.map((r) => `${path.relative(COMPONENTS, file)} ${r.selector}`));
|
||||||
|
|
||||||
|
// A gradient that lands on a token has to be made of that token, or the
|
||||||
|
// ramp and its destination disagree in one theme. Use the matching
|
||||||
|
// `--*-rgb` token for the transparent stops.
|
||||||
|
expect(offenders).toEqual([]);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The same defect one stylesheet further out.
|
||||||
|
*
|
||||||
|
* The rules above scan our own CSS modules. They cannot see a surface painted
|
||||||
|
* by a third-party sheet: leaflet.css hardcodes `background: white` on
|
||||||
|
* `.leaflet-popup-content-wrapper` and `.leaflet-popup-tip`, and
|
||||||
|
* LeafletMapInner builds its popup as an HTML string with inline
|
||||||
|
* `color: var(--text-primary)`. Neither half lives in a .module.css, so the
|
||||||
|
* module scan passed while dark mode rendered #E9EEF0 on #FFFFFF — 1.17:1,
|
||||||
|
* with the school name and the headline figure effectively invisible.
|
||||||
|
*
|
||||||
|
* globals.css already pulls the rest of Leaflet's chrome onto the tokens (the
|
||||||
|
* attribution bar, the zoom controls) for exactly this reason. The popup was
|
||||||
|
* simply missed.
|
||||||
|
*/
|
||||||
|
describe('third-party surfaces under themed text', () => {
|
||||||
|
const GLOBALS = path.join(__dirname, '..', '..', 'app', '(frontend)', 'globals.css');
|
||||||
|
|
||||||
|
/** Leaflet surfaces our own code writes token-coloured text onto. */
|
||||||
|
const LEAFLET_POPUP_SURFACES = [
|
||||||
|
'.leaflet-popup-content-wrapper',
|
||||||
|
'.leaflet-popup-tip',
|
||||||
|
];
|
||||||
|
|
||||||
|
it('still finds a component painting themed text into a Leaflet popup', () => {
|
||||||
|
// Guards the rule below against passing vacuously if the popups are ever
|
||||||
|
// rewritten as React components rather than HTML strings.
|
||||||
|
const themed = sources(COMPONENTS).filter((file) => {
|
||||||
|
const src = fs.readFileSync(file, 'utf8');
|
||||||
|
return /bindPopup\(/.test(src) && /color:var\(--|color: var\(--/.test(src);
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(themed.length).toBeGreaterThan(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('themes the Leaflet popup surface, because the text on it is themed', () => {
|
||||||
|
const globals = rules(fs.readFileSync(GLOBALS, 'utf8'));
|
||||||
|
|
||||||
|
const unthemed = LEAFLET_POPUP_SURFACES.filter((surface) => {
|
||||||
|
const rule = globals.find((r) => r.selector.includes(surface));
|
||||||
|
return !rule || !/background[^;]*var\(--/.test(rule.body);
|
||||||
|
});
|
||||||
|
|
||||||
|
// Leaflet's white is not a colour this site owns. Either the surface
|
||||||
|
// follows the theme or the text on it must be literal — and the text is
|
||||||
|
// already themed.
|
||||||
|
expect(unthemed).toEqual([]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('never puts a literal white label on a themed fill', () => {
|
||||||
|
/*
|
||||||
|
* The mirror image of the module-CSS rule above, and the half of the popup
|
||||||
|
* that theming the card does not reach. "View Details" is
|
||||||
|
* `background:var(--status-above);color:white`; --status-above is #36743F
|
||||||
|
* in light but #7FCB8A in dark, so the label went from 5.63:1 to 1.94:1.
|
||||||
|
*
|
||||||
|
* --text-inverse is the token for ink on a saturated fill — #FFFFFF in
|
||||||
|
* light, #111A20 in dark — and the popup's Ofsted badge already uses it.
|
||||||
|
*/
|
||||||
|
const offenders = sources(COMPONENTS).flatMap((file) => {
|
||||||
|
const src = fs.readFileSync(file, 'utf8');
|
||||||
|
return Array.from(
|
||||||
|
src.matchAll(/background:\s*var\(--[^;"']*;[^"']*?color:\s*(white|#fff\b|#ffffff\b)/gi),
|
||||||
|
() => path.relative(COMPONENTS, file));
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(offenders).toEqual([]);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Destination measures add the first new colour family since the palette was
|
||||||
|
* set. The tokens have to exist in both blocks or the section renders one
|
||||||
|
* theme's fills on the other theme's ground — the exact failure the suite
|
||||||
|
* above exists to catch, but for tokens rather than literals.
|
||||||
|
*/
|
||||||
|
describe('destination tokens', () => {
|
||||||
|
const css = fs.readFileSync(
|
||||||
|
path.join(__dirname, '..', '..', 'app', '(frontend)', 'globals.css'), 'utf8');
|
||||||
|
|
||||||
|
const TOKENS = [
|
||||||
|
'--dest-sixthform', '--dest-sfcollege', '--dest-fecollege',
|
||||||
|
'--dest-apprentice', '--dest-employment', '--dest-none', '--dest-none-hatch',
|
||||||
|
];
|
||||||
|
|
||||||
|
const DARK_AT = css.indexOf('@media (prefers-color-scheme: dark)');
|
||||||
|
|
||||||
|
it('defines every destination token in the light palette', () => {
|
||||||
|
const light = css.slice(0, DARK_AT);
|
||||||
|
expect(TOKENS.filter((t) => !light.includes(`${t}:`))).toEqual([]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('redefines every destination token for dark', () => {
|
||||||
|
const dark = css.slice(DARK_AT);
|
||||||
|
expect(TOKENS.filter((t) => !dark.includes(`${t}:`))).toEqual([]);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,108 @@
|
|||||||
|
import fs from 'fs';
|
||||||
|
import path from 'path';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The hero search and the results filter bar are the same component in two
|
||||||
|
* costumes. `.filterBar` is the card — background, border, shadow, padding —
|
||||||
|
* and `.heroMode` strips all of it so the search sits directly on the hero
|
||||||
|
* panel.
|
||||||
|
*
|
||||||
|
* Both selectors have specificity (0,1,0), so **source order decides**, and
|
||||||
|
* `.heroMode` only wins because it is declared immediately after. Any later
|
||||||
|
* bare `.filterBar` rule — which in practice means one inside a media query —
|
||||||
|
* silently wins instead, and the hero grows a card's padding back.
|
||||||
|
*
|
||||||
|
* That is exactly what happened: `@media (max-width: 768px) { .filterBar {
|
||||||
|
* padding: 0.875rem } }` re-added 14px in hero mode, indenting the search box,
|
||||||
|
* the hint and the location link 14px past the headline above them and costing
|
||||||
|
* the search field 28px of width on a 390px screen. The two rules directly
|
||||||
|
* below it in the same block were correctly written as
|
||||||
|
* `.filterBar:not(.heroMode)`; this one was missed, and nothing caught it
|
||||||
|
* because the result is a plausible-looking layout rather than a broken one.
|
||||||
|
*/
|
||||||
|
|
||||||
|
const CSS = path.join(__dirname, '..', '..', 'components', 'FilterBar.module.css');
|
||||||
|
|
||||||
|
/** Properties `.heroMode` resets. A later bare `.filterBar` rule setting any
|
||||||
|
* of these puts the card back on the hero. */
|
||||||
|
const RESET_BY_HERO_MODE = [
|
||||||
|
'background', 'border', 'border-radius', 'box-shadow', 'padding',
|
||||||
|
];
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Comments are stripped before anything is parsed.
|
||||||
|
*
|
||||||
|
* A `{` or `}` inside a comment would otherwise desynchronise the brace walk
|
||||||
|
* below and the rule regex alike, and the selector text captured for each rule
|
||||||
|
* would carry the preceding comment along with it.
|
||||||
|
*/
|
||||||
|
function withoutComments(css: string): string {
|
||||||
|
return css.replace(/\/\*[\s\S]*?\*\//g, '');
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The individual selectors in a rule's prelude.
|
||||||
|
*
|
||||||
|
* Split on commas, because a selector list is a list: `.filterBar, .other { }`
|
||||||
|
* applies to `.filterBar` just as surely as `.filterBar { }` does, and an
|
||||||
|
* earlier version of this guard compared the whole prelude against the literal
|
||||||
|
* string '.filterBar' — so writing the regression as a comma list, or across
|
||||||
|
* two lines, would have walked straight past it.
|
||||||
|
*/
|
||||||
|
function selectorsOf(prelude: string): string[] {
|
||||||
|
return prelude.split(',').map((sel) => sel.trim().replace(/\s+/g, ' '))
|
||||||
|
.filter(Boolean);
|
||||||
|
}
|
||||||
|
|
||||||
|
function mediaQueryBodies(css: string): string[] {
|
||||||
|
const bodies: string[] = [];
|
||||||
|
const re = /@media[^{]*\{/g;
|
||||||
|
let m: RegExpExecArray | null;
|
||||||
|
while ((m = re.exec(css)) !== null) {
|
||||||
|
// Walk braces from the opening one to find this at-rule's whole body.
|
||||||
|
let depth = 1;
|
||||||
|
let i = m.index + m[0].length;
|
||||||
|
const start = i;
|
||||||
|
while (i < css.length && depth > 0) {
|
||||||
|
if (css[i] === '{') depth++;
|
||||||
|
else if (css[i] === '}') depth--;
|
||||||
|
i++;
|
||||||
|
}
|
||||||
|
bodies.push(css.slice(start, i - 1));
|
||||||
|
}
|
||||||
|
return bodies;
|
||||||
|
}
|
||||||
|
|
||||||
|
describe('FilterBar hero-mode scoping', () => {
|
||||||
|
const css = withoutComments(fs.readFileSync(CSS, 'utf8'));
|
||||||
|
|
||||||
|
it('confirms heroMode still resets the card, which is what makes this matter', () => {
|
||||||
|
const hero = css.match(/\.heroMode\s*\{([^}]*)\}/);
|
||||||
|
expect(hero).not.toBeNull();
|
||||||
|
expect(hero![1]).toMatch(/padding:\s*0/);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('never re-applies card styling to the hero from inside a media query', () => {
|
||||||
|
const offenders: string[] = [];
|
||||||
|
|
||||||
|
for (const body of mediaQueryBodies(css)) {
|
||||||
|
for (const rule of body.matchAll(/([^{}]+)\{([^{}]*)\}/g)) {
|
||||||
|
// Only a *bare* .filterBar is dangerous, and it is dangerous wherever
|
||||||
|
// it appears in a selector list. Scoped variants
|
||||||
|
// (`.filterBar:not(.heroMode)`) and descendants are fine.
|
||||||
|
const selectors = selectorsOf(rule[1]);
|
||||||
|
if (!selectors.includes('.filterBar')) continue;
|
||||||
|
|
||||||
|
for (const prop of RESET_BY_HERO_MODE) {
|
||||||
|
if (new RegExp(`(^|[;\\s])${prop}\\s*:`).test(rule[2])) {
|
||||||
|
offenders.push(`${rule[1].trim()} sets ${prop}`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Fix by scoping the rule as `.filterBar:not(.heroMode)`, the way the
|
||||||
|
// neighbouring rules in the same block already are.
|
||||||
|
expect(offenders).toEqual([]);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -98,6 +98,17 @@ describe('secondary detail page', () => {
|
|||||||
|
|
||||||
expect(screen.getByText(/has not published a cut-off distance/)).toBeInTheDocument();
|
expect(screen.getByText(/has not published a cut-off distance/)).toBeInTheDocument();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('makes no claim about publication when the feature is switched off', () => {
|
||||||
|
// Absent, not null. The API omits the key entirely while the
|
||||||
|
// admission_distance flag is off, and "Islington has not published a
|
||||||
|
// cut-off distance" is then a statement about us, not about Islington —
|
||||||
|
// false wherever the authority does publish one.
|
||||||
|
renderSecondarySchoolDetail({ ...secondaryFixture, admissionDistance: undefined });
|
||||||
|
|
||||||
|
expect(screen.queryByText(/has not published a cut-off distance/)).not.toBeInTheDocument();
|
||||||
|
expect(screen.queryByText(/Contact the admissions authority/)).not.toBeInTheDocument();
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
// ── The Distance section ───────────────────────────────────────────────
|
// ── The Distance section ───────────────────────────────────────────────
|
||||||
|
|||||||
@@ -0,0 +1,158 @@
|
|||||||
|
import { getNavigationSource } from '@/lib/analytics';
|
||||||
|
|
||||||
|
/** jsdom's document.referrer is read-only; redefining it is the way in. */
|
||||||
|
function referrer(url: string) {
|
||||||
|
Object.defineProperty(document, 'referrer', { value: url, configurable: true });
|
||||||
|
}
|
||||||
|
|
||||||
|
const ORIGIN = 'http://localhost';
|
||||||
|
|
||||||
|
describe('getNavigationSource', () => {
|
||||||
|
afterEach(() => referrer(''));
|
||||||
|
|
||||||
|
it('attributes a visit from a location page to the place layer', () => {
|
||||||
|
/*
|
||||||
|
* The one this was added for.
|
||||||
|
*
|
||||||
|
* W2 published ~3,900 location pages whose entire purpose is to funnel
|
||||||
|
* search traffic onto school pages. Before this case existed they fell
|
||||||
|
* through to 'direct' — so the location layer's contribution was not
|
||||||
|
* merely missing from the funnel, it was being counted in the bucket you
|
||||||
|
* read as "typed the URL". The measurement that decides whether W2 worked
|
||||||
|
* was confidently reporting the wrong answer.
|
||||||
|
*/
|
||||||
|
referrer(`${ORIGIN}/schools/barnet`);
|
||||||
|
expect(getNavigationSource()).toBe('place');
|
||||||
|
});
|
||||||
|
|
||||||
|
it.each([
|
||||||
|
['/schools/authority/kent', 'authority'],
|
||||||
|
['/schools/near/sw11', 'outcode'],
|
||||||
|
['/schools/brentwood/primary', 'phase variant'],
|
||||||
|
])('covers %s (%s)', (path) => {
|
||||||
|
referrer(`${ORIGIN}${path}`);
|
||||||
|
expect(getNavigationSource()).toBe('place');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('still calls a school page "detail", one character away', () => {
|
||||||
|
// /school/ and /schools/ differ by one letter and mean different things.
|
||||||
|
// A prefix test written in the wrong order silently merges them.
|
||||||
|
referrer(`${ORIGIN}/school/100010-brecknock-primary-school`);
|
||||||
|
expect(getNavigationSource()).toBe('detail');
|
||||||
|
});
|
||||||
|
|
||||||
|
it.each([
|
||||||
|
['/', 'search'],
|
||||||
|
['/rankings', 'rankings'],
|
||||||
|
['/compare?urns=1,2', 'compare'],
|
||||||
|
])('leaves %s attributed as %s', (path, expected) => {
|
||||||
|
referrer(`${ORIGIN}${path}`);
|
||||||
|
expect(getNavigationSource()).toBe(expected);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('treats an external referrer as direct', () => {
|
||||||
|
// Umami records the real referrer on the pageview; this field is only
|
||||||
|
// about internal navigation.
|
||||||
|
referrer('https://www.google.com/search?q=schools+in+barnet');
|
||||||
|
expect(getNavigationSource()).toBe('direct');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('treats no referrer as direct', () => {
|
||||||
|
referrer('');
|
||||||
|
expect(getNavigationSource()).toBe('direct');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
/*
|
||||||
|
* The defect the existing suite could not see.
|
||||||
|
*
|
||||||
|
* Every test above sets document.referrer, which the browser writes only when
|
||||||
|
* a *document* loads. Every internal navigation in this app is an App Router
|
||||||
|
* soft navigation — history.pushState, no new document — so document.referrer
|
||||||
|
* keeps naming whatever opened the tab for the whole session. Verified on
|
||||||
|
* staging: /schools/brentwood → click a school → URL changes to /school/…
|
||||||
|
* and document.referrer is still "".
|
||||||
|
*
|
||||||
|
* So `from` reported 'direct' for essentially every in-app journey, and the
|
||||||
|
* suite passed because it only ever exercised the full-page-load path.
|
||||||
|
*/
|
||||||
|
function freshAnalytics() {
|
||||||
|
let mod!: typeof import('@/lib/analytics');
|
||||||
|
jest.isolateModules(() => {
|
||||||
|
mod = require('@/lib/analytics');
|
||||||
|
});
|
||||||
|
return mod;
|
||||||
|
}
|
||||||
|
|
||||||
|
function at(path: string) {
|
||||||
|
window.history.pushState({}, '', path);
|
||||||
|
}
|
||||||
|
|
||||||
|
describe('getNavigationSource across a soft navigation', () => {
|
||||||
|
afterEach(() => {
|
||||||
|
referrer('');
|
||||||
|
at('/');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('attributes a school view to the place page the user actually came from', () => {
|
||||||
|
const { recordVisitedPath, getNavigationSource: source } = freshAnalytics();
|
||||||
|
at('/schools/brentwood');
|
||||||
|
recordVisitedPath('/schools/brentwood');
|
||||||
|
|
||||||
|
at('/school/115429-brentwood-school');
|
||||||
|
recordVisitedPath('/school/115429-brentwood-school');
|
||||||
|
|
||||||
|
expect(source()).toBe('place');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('does not depend on whether the new path was recorded first', () => {
|
||||||
|
// The trail is written by a layout-level effect and read by a page-level
|
||||||
|
// one. React orders those by tree position, which is not a contract worth
|
||||||
|
// resting a measurement on, so the answer must be the same either way.
|
||||||
|
const { recordVisitedPath, getNavigationSource: source } = freshAnalytics();
|
||||||
|
recordVisitedPath('/rankings');
|
||||||
|
at('/school/115429-brentwood-school');
|
||||||
|
|
||||||
|
expect(source()).toBe('rankings');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('names the previous page, not the current one, when both are schools', () => {
|
||||||
|
const { recordVisitedPath, getNavigationSource: source } = freshAnalytics();
|
||||||
|
at('/school/100010-brecknock-primary-school');
|
||||||
|
recordVisitedPath('/school/100010-brecknock-primary-school');
|
||||||
|
|
||||||
|
at('/school/115429-brentwood-school');
|
||||||
|
recordVisitedPath('/school/115429-brentwood-school');
|
||||||
|
|
||||||
|
expect(source()).toBe('detail');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('looks past a return visit to the page the user came back from', () => {
|
||||||
|
const { recordVisitedPath, getNavigationSource: source } = freshAnalytics();
|
||||||
|
for (const p of ['/schools/brentwood', '/school/115429-brentwood-school',
|
||||||
|
'/schools/brentwood']) {
|
||||||
|
at(p);
|
||||||
|
recordVisitedPath(p);
|
||||||
|
}
|
||||||
|
expect(source()).toBe('detail');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('falls back to the referrer on a real document load, where it is true', () => {
|
||||||
|
// A fresh module is a fresh document: nothing has been recorded, and
|
||||||
|
// document.referrer is meaningful again.
|
||||||
|
const { getNavigationSource: source } = freshAnalytics();
|
||||||
|
at('/school/115429-brentwood-school');
|
||||||
|
referrer(`${ORIGIN}/schools/barnet`);
|
||||||
|
|
||||||
|
expect(source()).toBe('place');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('still reads an arrival from outside as direct', () => {
|
||||||
|
const { recordVisitedPath, getNavigationSource: source } = freshAnalytics();
|
||||||
|
at('/schools/brentwood');
|
||||||
|
recordVisitedPath('/schools/brentwood');
|
||||||
|
referrer('https://www.google.com/search?q=schools+in+brentwood');
|
||||||
|
|
||||||
|
expect(source()).toBe('direct');
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,87 @@
|
|||||||
|
import {
|
||||||
|
canAggregate, aggregateCells,
|
||||||
|
canRenderBar, toBarSegments, CARD_GROUPS,
|
||||||
|
type DestinationCell, type DestinationGroup, type DestinationCategory,
|
||||||
|
} from '@/lib/destinations';
|
||||||
|
|
||||||
|
const pub = (category: DestinationCategory, pupils: number, cohort: number): DestinationCell => ({
|
||||||
|
category, pupils, percentage: (pupils / cohort) * 100, status: 'published',
|
||||||
|
});
|
||||||
|
const sup = (category: DestinationCategory): DestinationCell => ({
|
||||||
|
category, pupils: null, percentage: null, status: 'suppressed',
|
||||||
|
});
|
||||||
|
|
||||||
|
const fullGroup = (): DestinationGroup => ({
|
||||||
|
cohort: 180,
|
||||||
|
cells: [
|
||||||
|
pub('school_sixth_form', 75, 180), pub('sixth_form_college', 21, 180),
|
||||||
|
pub('further_education', 55, 180), pub('other_education', 6, 180),
|
||||||
|
pub('apprenticeship', 8, 180), pub('employment', 6, 180),
|
||||||
|
pub('not_sustained', 5, 180), pub('not_captured', 4, 180),
|
||||||
|
],
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('canAggregate — R2, computing from components', () => {
|
||||||
|
it('allows a sum when every component is published', () => {
|
||||||
|
expect(canAggregate([pub('apprenticeship', 8, 180), pub('employment', 6, 180)])).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('refuses a sum when any component is suppressed', () => {
|
||||||
|
expect(canAggregate([pub('apprenticeship', 8, 180), sup('employment')])).toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('refuses a sum when every component is suppressed', () => {
|
||||||
|
expect(canAggregate([sup('apprenticeship'), sup('employment')])).toBe(false);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('aggregateCells', () => {
|
||||||
|
it('sums published cells and derives a percentage from the cohort', () => {
|
||||||
|
expect(aggregateCells([pub('apprenticeship', 8, 180), pub('employment', 6, 180)], 180))
|
||||||
|
.toEqual({ pupils: 14, percentage: (14 / 180) * 100 });
|
||||||
|
});
|
||||||
|
|
||||||
|
it('returns null rather than a partial sum when a component is suppressed', () => {
|
||||||
|
expect(aggregateCells([pub('apprenticeship', 8, 180), sup('employment')], 180)).toBeNull();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('canRenderBar — R1', () => {
|
||||||
|
it('allows a bar when the whole group is published', () => {
|
||||||
|
expect(canRenderBar(fullGroup())).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('refuses a bar when a single category is suppressed', () => {
|
||||||
|
const g = fullGroup();
|
||||||
|
g.cells[1] = sup('sixth_form_college');
|
||||||
|
expect(canRenderBar(g)).toBe(false);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('toBarSegments', () => {
|
||||||
|
it('derives widths from counts, not from rounded percentages', () => {
|
||||||
|
const segs = toBarSegments(fullGroup());
|
||||||
|
expect(segs).toHaveLength(8);
|
||||||
|
expect(segs[0].widthPct).toBeCloseTo((75 / 180) * 100, 10);
|
||||||
|
expect(segs.reduce((a, s) => a + s.widthPct, 0)).toBeCloseTo(100, 6);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('throws rather than silently leaving a gap when the group is suppressed', () => {
|
||||||
|
const g = fullGroup();
|
||||||
|
g.cells[1] = sup('sixth_form_college');
|
||||||
|
expect(() => toBarSegments(g)).toThrow(/suppressed/i);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('CARD_GROUPS', () => {
|
||||||
|
it('partitions every destination category exactly once, plus the absence', () => {
|
||||||
|
const grouped = Object.values(CARD_GROUPS).flat();
|
||||||
|
expect(new Set(grouped).size).toBe(grouped.length);
|
||||||
|
expect(grouped).toEqual(expect.arrayContaining([
|
||||||
|
'school_sixth_form', 'sixth_form_college', 'further_education',
|
||||||
|
'other_education', 'apprenticeship', 'employment',
|
||||||
|
]));
|
||||||
|
expect(grouped).not.toContain('not_sustained');
|
||||||
|
expect(grouped).not.toContain('not_captured');
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,83 @@
|
|||||||
|
import { computeSecondaryFlags, buildSecondaryNavItems } from '@/lib/schoolSections';
|
||||||
|
import type { School, SchoolDestinations } from '@/lib/types';
|
||||||
|
|
||||||
|
const schoolInfo = {
|
||||||
|
urn: 137083, school_name: 'Northbrook Academy', phase: 'Secondary',
|
||||||
|
has_sixth_form: true,
|
||||||
|
} as unknown as School;
|
||||||
|
|
||||||
|
const base = { schoolInfo, yearlyData: [], deprivation: null, finance: null };
|
||||||
|
|
||||||
|
const phase = (categories = 1) => ({
|
||||||
|
cohort_year: '2022/23',
|
||||||
|
groups: {
|
||||||
|
all: {
|
||||||
|
cohort: 180,
|
||||||
|
categories: Array.from({ length: categories }, () => ({
|
||||||
|
category: 'school_sixth_form' as const,
|
||||||
|
pupils: 75, percentage: 41.7, status: 'published' as const,
|
||||||
|
})),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
const ks4Only: SchoolDestinations = { ks4: phase(), ks5: null };
|
||||||
|
const both: SchoolDestinations = { ks4: phase(), ks5: phase() };
|
||||||
|
|
||||||
|
describe('computeSecondaryFlags — destinations', () => {
|
||||||
|
it('flags KS4 destinations when the block carries categories', () => {
|
||||||
|
const flags = computeSecondaryFlags({ ...base, destinations: ks4Only });
|
||||||
|
expect(flags.hasKs4Destinations).toBe(true);
|
||||||
|
expect(flags.hasKs5Destinations).toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('flags both phases when both are present', () => {
|
||||||
|
const flags = computeSecondaryFlags({ ...base, destinations: both });
|
||||||
|
expect(flags.hasKs4Destinations).toBe(true);
|
||||||
|
expect(flags.hasKs5Destinations).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('flags neither when the block is absent', () => {
|
||||||
|
const flags = computeSecondaryFlags({ ...base, destinations: null });
|
||||||
|
expect(flags.hasKs4Destinations).toBe(false);
|
||||||
|
expect(flags.hasKs5Destinations).toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('does not flag a phase whose groups carry no categories', () => {
|
||||||
|
const empty: SchoolDestinations = {
|
||||||
|
ks4: { cohort_year: '2022/23', groups: {} }, ks5: null,
|
||||||
|
};
|
||||||
|
expect(computeSecondaryFlags({ ...base, destinations: empty }).hasKs4Destinations)
|
||||||
|
.toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('does not flag a phase whose only group has an empty category list', () => {
|
||||||
|
const empty: SchoolDestinations = { ks4: phase(0), ks5: null };
|
||||||
|
expect(computeSecondaryFlags({ ...base, destinations: empty }).hasKs4Destinations)
|
||||||
|
.toBe(false);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('buildSecondaryNavItems — destinations', () => {
|
||||||
|
const navInput = {
|
||||||
|
ofsted: null, admissions: null, admissionDistance: null,
|
||||||
|
hasLocation: false, yearlyDataLength: 0,
|
||||||
|
};
|
||||||
|
|
||||||
|
it('adds both entries, after GCSEs', () => {
|
||||||
|
const flags = computeSecondaryFlags({ ...base, destinations: both });
|
||||||
|
const ids = buildSecondaryNavItems({ ...flags, hasResults: true }, navInput)
|
||||||
|
.map(i => i.id);
|
||||||
|
expect(ids).toContain('destinations');
|
||||||
|
expect(ids).toContain('post16-destinations');
|
||||||
|
expect(ids.indexOf('destinations')).toBeGreaterThan(ids.indexOf('gcse'));
|
||||||
|
expect(ids.indexOf('post16-destinations')).toBe(ids.indexOf('destinations') + 1);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('adds no entry for a phase that will not render — the nav must not link to a missing anchor', () => {
|
||||||
|
const flags = computeSecondaryFlags({ ...base, destinations: null });
|
||||||
|
const ids = buildSecondaryNavItems(flags, navInput).map(i => i.id);
|
||||||
|
expect(ids).not.toContain('destinations');
|
||||||
|
expect(ids).not.toContain('post16-destinations');
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -13,6 +13,8 @@ import {
|
|||||||
metricKind,
|
metricKind,
|
||||||
shortName,
|
shortName,
|
||||||
computeYBounds,
|
computeYBounds,
|
||||||
|
formatAgeRange,
|
||||||
|
formatAgeSpan,
|
||||||
} from '@/lib/utils';
|
} from '@/lib/utils';
|
||||||
|
|
||||||
describe('formatPercentage', () => {
|
describe('formatPercentage', () => {
|
||||||
@@ -320,3 +322,27 @@ describe('shortName', () => {
|
|||||||
expect(shortName('A'.repeat(30), 10)).toBe('AAAAAAAAA…');
|
expect(shortName('A'.repeat(30), 10)).toBe('AAAAAAAAA…');
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
describe('formatAgeSpan', () => {
|
||||||
|
it('normalises a hyphenated range to an en dash, without a label', () => {
|
||||||
|
// The place table carries "Ages" in the column heading, so repeating it
|
||||||
|
// in every cell is noise. formatAgeRange keeps the label for the contexts
|
||||||
|
// that have no heading to hang it on.
|
||||||
|
expect(formatAgeSpan('4-11')).toBe('4–11');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('leaves a range it does not recognise alone rather than mangling it', () => {
|
||||||
|
expect(formatAgeSpan('3-19 (SEN)')).toBe('3-19 (SEN)');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('returns an empty string for a missing range', () => {
|
||||||
|
expect(formatAgeSpan(null)).toBe('');
|
||||||
|
expect(formatAgeSpan(undefined)).toBe('');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('formatAgeRange', () => {
|
||||||
|
it('keeps its label, so the two helpers stay distinguishable', () => {
|
||||||
|
expect(formatAgeRange('4-11')).toBe('Ages 4–11');
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,70 @@
|
|||||||
|
/**
|
||||||
|
* Payload is ESM-only and next/jest will not transform it, so the collections
|
||||||
|
* cannot be imported and their sanitised config inspected here (see
|
||||||
|
* lib/payloadRoutes.ts for the full reasoning). These assert the source of the
|
||||||
|
* collection definitions instead — enough to catch the settings whose loss is
|
||||||
|
* silent, and cheap. Behaviour is proved by the e2e journeys against staging.
|
||||||
|
*/
|
||||||
|
import fs from 'fs';
|
||||||
|
import path from 'path';
|
||||||
|
|
||||||
|
const read = (file: string) =>
|
||||||
|
fs.readFileSync(path.join(__dirname, '..', '..', 'collections', file), 'utf8');
|
||||||
|
|
||||||
|
const POSTS = read('Posts.ts');
|
||||||
|
const MEDIA = read('Media.ts');
|
||||||
|
const CONFIG = fs.readFileSync(
|
||||||
|
path.join(__dirname, '..', '..', 'payload.config.ts'),
|
||||||
|
'utf8',
|
||||||
|
);
|
||||||
|
|
||||||
|
describe('posts collection', () => {
|
||||||
|
it('supports drafts, so saving is not publishing', () => {
|
||||||
|
expect(POSTS).toMatch(/drafts:\s*true/);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('has a unique, indexed slug for stable URLs', () => {
|
||||||
|
const slugField = POSTS.slice(POSTS.indexOf("name: 'slug'"));
|
||||||
|
expect(slugField).toMatch(/unique:\s*true/);
|
||||||
|
expect(slugField).toMatch(/index:\s*true/);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('hides drafts from anonymous readers at the access layer', () => {
|
||||||
|
// Payload's docs are explicit: "The `draft` argument alone does not
|
||||||
|
// restrict documents with _status: 'draft' from being returned by the
|
||||||
|
// API." The blog pages' where-clause is not enforcement — a direct GET
|
||||||
|
// /cms-api/posts would return unpublished drafts to anyone. Access
|
||||||
|
// control returning a query constraint is the only thing that stops it.
|
||||||
|
expect(POSTS).toMatch(/_status:\s*\{\s*equals:\s*'published'\s*\}/);
|
||||||
|
expect(POSTS).toMatch(/if\s*\(req\.user\)\s*return true/);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('revalidates the post page when a post changes or is deleted', () => {
|
||||||
|
// /blog/[slug] is ISR — generated on first request and cached — so an edit
|
||||||
|
// to an already-published post would otherwise not appear until the
|
||||||
|
// revalidate window expired, up to an hour of a writer concluding that
|
||||||
|
// saving is broken. The index and feeds are force-dynamic and need no hook.
|
||||||
|
expect(POSTS).toContain('afterChange');
|
||||||
|
expect(POSTS).toContain('afterDelete');
|
||||||
|
expect(POSTS).toMatch(/revalidatePath\(`\/blog\/\$\{[^}]+\}`\)/);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('media collection', () => {
|
||||||
|
it('writes uploads to the mounted volume, by absolute path', () => {
|
||||||
|
// Must match the payload_media mount in docker-compose.portainer.yml.
|
||||||
|
// Payload 3 requires staticDir to be absolute.
|
||||||
|
expect(MEDIA).toMatch(/staticDir:\s*'\/app\/media'/);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('requires alt text on every upload', () => {
|
||||||
|
const altField = MEDIA.slice(MEDIA.indexOf("name: 'alt'"));
|
||||||
|
expect(altField).toMatch(/required:\s*true/);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('payload config', () => {
|
||||||
|
it('registers every collection', () => {
|
||||||
|
expect(CONFIG).toMatch(/collections:\s*\[Users,\s*Posts,\s*Media\]/);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,67 @@
|
|||||||
|
/**
|
||||||
|
* The admin panel does not import field components directly. Payload sends the
|
||||||
|
* client a *path* for each one — a richText field's is
|
||||||
|
* `@payloadcms/richtext-lexical/rsc#RscEntryLexicalField` — and resolves it
|
||||||
|
* through this generated map. An entry that is missing from the map is not an
|
||||||
|
* error the panel reports: the field simply does not render.
|
||||||
|
*
|
||||||
|
* That failure is quietly awful, because `required: true` is enforced on the
|
||||||
|
* server regardless. A writer gets a new-post form with no Content editor and
|
||||||
|
* a save that refuses on a field they were never shown.
|
||||||
|
*
|
||||||
|
* The map is generated by `npx payload generate:importmap`, so it drifts every
|
||||||
|
* time a field or a lexical feature is added and nobody re-runs it. These
|
||||||
|
* assert the entries the current config needs.
|
||||||
|
*/
|
||||||
|
import fs from 'fs';
|
||||||
|
import path from 'path';
|
||||||
|
|
||||||
|
const MAP = fs.readFileSync(
|
||||||
|
path.join(__dirname, '..', '..', 'app', '(payload)', 'admin', 'importMap.js'),
|
||||||
|
'utf8',
|
||||||
|
);
|
||||||
|
const POSTS = fs.readFileSync(
|
||||||
|
path.join(__dirname, '..', '..', 'collections', 'Posts.ts'),
|
||||||
|
'utf8',
|
||||||
|
);
|
||||||
|
|
||||||
|
describe('admin import map', () => {
|
||||||
|
it('resolves the richText field, so Content renders in the editor', () => {
|
||||||
|
// Guarded because Posts.content is required: without this entry the field
|
||||||
|
// is invisible and the post is unsaveable.
|
||||||
|
expect(POSTS).toMatch(/type:\s*'richText'/);
|
||||||
|
expect(MAP).toContain('@payloadcms/richtext-lexical/rsc#RscEntryLexicalField');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('resolves the richText cell, so the list view can render the column', () => {
|
||||||
|
expect(MAP).toContain('@payloadcms/richtext-lexical/rsc#RscEntryLexicalCell');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('resolves the diff component, which the drafts UI needs', () => {
|
||||||
|
// versions.drafts is on, so the panel offers version comparison.
|
||||||
|
expect(POSTS).toMatch(/drafts:\s*true/);
|
||||||
|
expect(MAP).toContain('@payloadcms/richtext-lexical/rsc#LexicalDiffComponent');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('resolves BlocksFeature, so the Callout block is insertable', () => {
|
||||||
|
expect(POSTS).toContain('BlocksFeature');
|
||||||
|
expect(MAP).toContain('@payloadcms/richtext-lexical/client#BlocksFeatureClient');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('resolves the default toolbar features the editor is built with', () => {
|
||||||
|
// defaultFeatures is spread into the editor config; each one contributes a
|
||||||
|
// client component the toolbar cannot render without.
|
||||||
|
for (const feature of [
|
||||||
|
'BoldFeatureClient',
|
||||||
|
'ItalicFeatureClient',
|
||||||
|
'HeadingFeatureClient',
|
||||||
|
'LinkFeatureClient',
|
||||||
|
'UploadFeatureClient',
|
||||||
|
'UnorderedListFeatureClient',
|
||||||
|
'OrderedListFeatureClient',
|
||||||
|
'InlineToolbarFeatureClient',
|
||||||
|
]) {
|
||||||
|
expect(MAP).toContain(`@payloadcms/richtext-lexical/client#${feature}`);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,52 @@
|
|||||||
|
/**
|
||||||
|
* The generated migration is schema-qualified to "payload" throughout but does
|
||||||
|
* not create that schema — `schemaName` says where tables go, it does not
|
||||||
|
* create anything. On staging and production, which have never run it, the
|
||||||
|
* whole migration fails with `schema "payload" does not exist`.
|
||||||
|
*
|
||||||
|
* The CREATE SCHEMA is therefore hand-added, which makes it exactly the kind
|
||||||
|
* of edit a regeneration silently discards. This is the guard.
|
||||||
|
*/
|
||||||
|
import fs from 'fs';
|
||||||
|
import path from 'path';
|
||||||
|
|
||||||
|
const DIR = path.join(__dirname, '..', '..', 'migrations');
|
||||||
|
|
||||||
|
function migrationFiles() {
|
||||||
|
return fs
|
||||||
|
.readdirSync(DIR)
|
||||||
|
.filter((f) => f.endsWith('.ts') && f !== 'index.ts');
|
||||||
|
}
|
||||||
|
|
||||||
|
describe('payload migrations', () => {
|
||||||
|
it('ships at least one migration, so a container has tables to find', () => {
|
||||||
|
expect(migrationFiles().length).toBeGreaterThan(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('creates the payload schema before creating anything in it', () => {
|
||||||
|
const initial = migrationFiles().find((f) => f.includes('initial'))!;
|
||||||
|
const sql = fs.readFileSync(path.join(DIR, initial), 'utf8');
|
||||||
|
|
||||||
|
expect(sql).toMatch(/CREATE SCHEMA IF NOT EXISTS "payload"/);
|
||||||
|
|
||||||
|
// Ordering matters: the schema must be created before the first object
|
||||||
|
// that lives in it, or the migration fails on its first statement.
|
||||||
|
expect(sql.indexOf('CREATE SCHEMA IF NOT EXISTS "payload"'))
|
||||||
|
.toBeLessThan(sql.indexOf('CREATE TABLE "payload"'));
|
||||||
|
});
|
||||||
|
|
||||||
|
it('creates the tables the app queries on boot', () => {
|
||||||
|
const initial = migrationFiles().find((f) => f.includes('initial'))!;
|
||||||
|
const sql = fs.readFileSync(path.join(DIR, initial), 'utf8');
|
||||||
|
for (const table of ['users', 'posts', '_posts_v', 'media', 'payload_migrations']) {
|
||||||
|
expect(sql).toContain(`CREATE TABLE "payload"."${table}"`);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
it('is wired into the adapter, so it runs on server init', () => {
|
||||||
|
const config = fs.readFileSync(
|
||||||
|
path.join(__dirname, '..', '..', 'payload.config.ts'), 'utf8',
|
||||||
|
);
|
||||||
|
expect(config).toMatch(/prodMigrations:\s*migrations/);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,45 @@
|
|||||||
|
/**
|
||||||
|
* Guards the one thing about Payload's mounting that fails silently.
|
||||||
|
*
|
||||||
|
* payload.config.ts itself cannot be imported here — Payload is ESM-only and
|
||||||
|
* next/jest will not transform it — so this asserts the shared constants and
|
||||||
|
* that the config actually wires them in, by reading its source. The live
|
||||||
|
* proof that /api still reaches FastAPI is the e2e journeys, which call
|
||||||
|
* /api/schools against the running app.
|
||||||
|
*/
|
||||||
|
import fs from 'fs';
|
||||||
|
import path from 'path';
|
||||||
|
import { PAYLOAD_API_ROUTE, PAYLOAD_ADMIN_ROUTE } from '@/lib/payloadRoutes';
|
||||||
|
|
||||||
|
const CONFIG = fs.readFileSync(
|
||||||
|
path.join(__dirname, '..', '..', 'payload.config.ts'),
|
||||||
|
'utf8',
|
||||||
|
);
|
||||||
|
|
||||||
|
describe('payload mount points', () => {
|
||||||
|
it('serves the CMS API from /cms-api, never /api', () => {
|
||||||
|
// /api is the FastAPI proxy's catch-all. Payload's default would be
|
||||||
|
// swallowed by it and forwarded to the backend, silently.
|
||||||
|
expect(PAYLOAD_API_ROUTE).toBe('/cms-api');
|
||||||
|
expect(PAYLOAD_API_ROUTE).not.toBe('/api');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('serves the admin panel from /admin', () => {
|
||||||
|
expect(PAYLOAD_ADMIN_ROUTE).toBe('/admin');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('wires both constants into the Payload config', () => {
|
||||||
|
expect(CONFIG).toContain('PAYLOAD_API_ROUTE');
|
||||||
|
expect(CONFIG).toContain('PAYLOAD_ADMIN_ROUTE');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('never hardcodes a routes block that could drift from the constants', () => {
|
||||||
|
expect(CONFIG).not.toMatch(/routes:\s*\{[^}]*api:\s*['"]/);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('isolates CMS tables in their own postgres schema', () => {
|
||||||
|
// Blog content must sit outside `public`, where the app tables, Airflow's
|
||||||
|
// metadata and scripts/migrate_csv_to_db.py --drop all live.
|
||||||
|
expect(CONFIG).toMatch(/schemaName:\s*['"]payload['"]/);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -21,7 +21,7 @@ import {
|
|||||||
import { nationalAveragesFixture } from './schoolFixtures';
|
import { nationalAveragesFixture } from './schoolFixtures';
|
||||||
|
|
||||||
// The shell calls useComparison(), which throws outside the provider. In the
|
// The shell calls useComparison(), which throws outside the provider. In the
|
||||||
// app this wrapper comes from app/layout.tsx.
|
// app this wrapper comes from app/(frontend)/layout.tsx.
|
||||||
function withProviders(ui: ReactNode) {
|
function withProviders(ui: ReactNode) {
|
||||||
return <ComparisonProvider>{ui}</ComparisonProvider>;
|
return <ComparisonProvider>{ui}</ComparisonProvider>;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,82 @@
|
|||||||
|
.page {
|
||||||
|
max-width: 42rem;
|
||||||
|
margin: 0 auto;
|
||||||
|
padding: 2.5rem 1.25rem 4rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.header {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 1.25rem;
|
||||||
|
margin-bottom: 2rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.portrait {
|
||||||
|
border-radius: 50%;
|
||||||
|
border: 2px solid var(--border);
|
||||||
|
object-fit: cover;
|
||||||
|
flex-shrink: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.kicker {
|
||||||
|
font-family: var(--font-ui);
|
||||||
|
font-size: 0.75rem;
|
||||||
|
font-weight: 600;
|
||||||
|
text-transform: uppercase;
|
||||||
|
letter-spacing: 0.06em;
|
||||||
|
color: var(--brand);
|
||||||
|
margin: 0 0 0.35rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.heading {
|
||||||
|
font-family: var(--font-display);
|
||||||
|
font-size: clamp(1.5rem, 4vw, 2rem);
|
||||||
|
font-weight: 700;
|
||||||
|
line-height: 1.2;
|
||||||
|
color: var(--text-primary);
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.subheading {
|
||||||
|
font-family: var(--font-display);
|
||||||
|
font-size: 1.15rem;
|
||||||
|
font-weight: 600;
|
||||||
|
color: var(--text-primary);
|
||||||
|
margin: 2.25rem 0 0.75rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.prose p {
|
||||||
|
font-family: var(--font-ui);
|
||||||
|
font-size: 1rem;
|
||||||
|
line-height: 1.7;
|
||||||
|
color: var(--text-secondary);
|
||||||
|
margin: 0 0 1.1rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* The opening paragraph carries the page. Larger, and in the primary ink
|
||||||
|
rather than the secondary, so it reads as a voice rather than as body copy.
|
||||||
|
|
||||||
|
Must stay in the descendant form: `.prose p` scores (0,1,1) and would beat a
|
||||||
|
bare `.lede` at (0,1,0), so simplifying this selector silently reverts the
|
||||||
|
lede to ordinary body copy. */
|
||||||
|
.prose .lede {
|
||||||
|
font-size: 1.125rem;
|
||||||
|
color: var(--text-primary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.link {
|
||||||
|
color: var(--brand);
|
||||||
|
font-weight: 600;
|
||||||
|
}
|
||||||
|
|
||||||
|
.link:hover {
|
||||||
|
color: var(--brand-strong);
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (max-width: 480px) {
|
||||||
|
.header {
|
||||||
|
flex-direction: column;
|
||||||
|
align-items: flex-start;
|
||||||
|
gap: 1rem;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,130 @@
|
|||||||
|
import type { Metadata } from 'next';
|
||||||
|
import Image from 'next/image';
|
||||||
|
import { absoluteUrl } from '@/lib/site';
|
||||||
|
import { personJsonLd, organizationJsonLd } from '@/lib/jsonld';
|
||||||
|
import styles from './About.module.css';
|
||||||
|
|
||||||
|
export const metadata: Metadata = {
|
||||||
|
title: 'About',
|
||||||
|
description:
|
||||||
|
'Who builds schoolcompare, why it exists, and where its numbers come from.',
|
||||||
|
alternates: { canonical: absoluteUrl('/about') },
|
||||||
|
};
|
||||||
|
|
||||||
|
export default function AboutPage() {
|
||||||
|
const jsonLd = {
|
||||||
|
'@context': 'https://schema.org',
|
||||||
|
'@graph': [personJsonLd(), organizationJsonLd()],
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className={styles.page}>
|
||||||
|
<script
|
||||||
|
type="application/ld+json"
|
||||||
|
dangerouslySetInnerHTML={{ __html: JSON.stringify(jsonLd) }}
|
||||||
|
/>
|
||||||
|
|
||||||
|
<header className={styles.header}>
|
||||||
|
<Image
|
||||||
|
src="/brand/tudor.jpg"
|
||||||
|
alt="Tudor, who builds schoolcompare"
|
||||||
|
width={96}
|
||||||
|
height={96}
|
||||||
|
className={styles.portrait}
|
||||||
|
priority
|
||||||
|
/>
|
||||||
|
<div>
|
||||||
|
<p className={styles.kicker}>Who's behind this</p>
|
||||||
|
<h1 className={styles.heading}>I'm Tudor. I built this site.</h1>
|
||||||
|
</div>
|
||||||
|
</header>
|
||||||
|
|
||||||
|
<div className={styles.prose}>
|
||||||
|
<p className={styles.lede}>
|
||||||
|
I'm a parent in south-west London. When we started looking at
|
||||||
|
primary schools, I found the information I needed was all published,
|
||||||
|
and almost impossible to hold in one place.
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<p>
|
||||||
|
SATs results were in one government table. Ofsted judgements were in a
|
||||||
|
separate service, in a format that had just changed. Admissions
|
||||||
|
distances were buried in council PDFs, a different one per borough,
|
||||||
|
each with its own layout. I ended up building a spreadsheet, and then
|
||||||
|
I got tired of the spreadsheet.
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<p>
|
||||||
|
So I built this instead. It pulls the official figures into one place
|
||||||
|
and puts them side by side, which is what I wanted and could not find.
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<h2 className={styles.subheading}>I'm not an education expert</h2>
|
||||||
|
|
||||||
|
<p>
|
||||||
|
I want to be straightforward about that. I'm not a teacher, a
|
||||||
|
governor, or an education researcher. I have no qualification that
|
||||||
|
makes my opinion about a school worth more than yours.
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<p>
|
||||||
|
What I do have is the problem itself. I'm going through primary
|
||||||
|
admissions right now, and I work with data for a living. That
|
||||||
|
combination is enough to take published figures and present them
|
||||||
|
honestly. It is not enough to tell you which school is right for your
|
||||||
|
child, and this site never tries to.
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<h2 className={styles.subheading}>Where the numbers come from</h2>
|
||||||
|
|
||||||
|
<p>
|
||||||
|
Everything here is official published data: Key Stage 2 and Key Stage
|
||||||
|
4 results and school characteristics from the Department for
|
||||||
|
Education, inspection outcomes from Ofsted, and admissions data from
|
||||||
|
local authorities. Nothing is estimated, modelled or filled in. Where
|
||||||
|
a figure is missing, the page says so rather than showing a guess.
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<p>
|
||||||
|
This is an independent site. It is not affiliated with the Department
|
||||||
|
for Education or with Ofsted, and nobody pays to appear on it or to
|
||||||
|
rank higher.
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<h2 className={styles.subheading}>What the data can't tell you</h2>
|
||||||
|
|
||||||
|
<p>
|
||||||
|
A school is not its results. The figures here describe one year group,
|
||||||
|
on a handful of days, measured in a way that suits national statistics
|
||||||
|
rather than your child. A small cohort makes percentages swing wildly.
|
||||||
|
In a class of thirty, one pupil is worth more than three points.
|
||||||
|
Results say nothing at all about whether a child will be happy
|
||||||
|
somewhere.
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<p>
|
||||||
|
I try to build that honesty into the site rather than just say it
|
||||||
|
here. Special schools and pupil referral units are never compared
|
||||||
|
against a mainstream national average, because that comparison is
|
||||||
|
meaningless and makes good schools look like failing ones. Where a
|
||||||
|
number is unreliable, the aim is for the page to tell you before you
|
||||||
|
draw a conclusion from it.
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<h2 className={styles.subheading}>If something's wrong</h2>
|
||||||
|
|
||||||
|
<p>
|
||||||
|
Tell me and I'll fix it. If a figure looks wrong, or a page gives
|
||||||
|
a misleading impression of a school, I genuinely want to know.
|
||||||
|
It's the fastest way this gets better.
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<p>
|
||||||
|
<a href="mailto:contact@schoolcompare.co.uk" className={styles.link}>
|
||||||
|
contact@schoolcompare.co.uk
|
||||||
|
</a>
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
File renamed without changes.
File renamed without changes.
@@ -0,0 +1,76 @@
|
|||||||
|
.page {
|
||||||
|
max-width: 42rem;
|
||||||
|
margin: 0 auto;
|
||||||
|
padding: 2.5rem 1.25rem 4rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.header { margin-bottom: 2.5rem; }
|
||||||
|
|
||||||
|
.kicker {
|
||||||
|
font-family: var(--font-ui);
|
||||||
|
font-size: 0.75rem;
|
||||||
|
font-weight: 600;
|
||||||
|
text-transform: uppercase;
|
||||||
|
letter-spacing: 0.06em;
|
||||||
|
color: var(--brand);
|
||||||
|
margin: 0 0 0.35rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.heading {
|
||||||
|
font-family: var(--font-display);
|
||||||
|
font-size: clamp(1.5rem, 4vw, 2rem);
|
||||||
|
font-weight: 700;
|
||||||
|
line-height: 1.2;
|
||||||
|
color: var(--text-primary);
|
||||||
|
margin: 0 0 0.75rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.standfirst {
|
||||||
|
font-family: var(--font-ui);
|
||||||
|
font-size: 1.05rem;
|
||||||
|
line-height: 1.65;
|
||||||
|
color: var(--text-secondary);
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.list { list-style: none; padding: 0; margin: 0; }
|
||||||
|
|
||||||
|
.item {
|
||||||
|
padding: 1.5rem 0;
|
||||||
|
border-top: 1px solid var(--border);
|
||||||
|
}
|
||||||
|
|
||||||
|
.date {
|
||||||
|
font-family: var(--font-ui);
|
||||||
|
font-size: 0.8rem;
|
||||||
|
color: var(--text-muted);
|
||||||
|
/* Inter's tabular numerals keep a column of dates aligned. */
|
||||||
|
font-variant-numeric: tabular-nums;
|
||||||
|
}
|
||||||
|
|
||||||
|
.itemTitle {
|
||||||
|
font-family: var(--font-display);
|
||||||
|
font-size: 1.25rem;
|
||||||
|
font-weight: 600;
|
||||||
|
line-height: 1.3;
|
||||||
|
margin: 0.35rem 0 0.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.itemLink { color: var(--text-primary); text-decoration: none; }
|
||||||
|
.itemLink:hover { color: var(--brand); }
|
||||||
|
|
||||||
|
.excerpt {
|
||||||
|
font-family: var(--font-ui);
|
||||||
|
font-size: 0.95rem;
|
||||||
|
line-height: 1.65;
|
||||||
|
color: var(--text-secondary);
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.empty {
|
||||||
|
font-family: var(--font-ui);
|
||||||
|
color: var(--text-muted);
|
||||||
|
}
|
||||||
|
|
||||||
|
.link { color: var(--brand); font-weight: 600; }
|
||||||
|
.link:hover { color: var(--brand-strong); }
|
||||||
@@ -0,0 +1,87 @@
|
|||||||
|
.page {
|
||||||
|
max-width: 42rem;
|
||||||
|
margin: 0 auto;
|
||||||
|
padding: 2.5rem 1.25rem 4rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.crumb {
|
||||||
|
font-family: var(--font-ui);
|
||||||
|
font-size: 0.85rem;
|
||||||
|
margin-bottom: 1.25rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.heading {
|
||||||
|
font-family: var(--font-display);
|
||||||
|
font-size: clamp(1.6rem, 5vw, 2.25rem);
|
||||||
|
font-weight: 700;
|
||||||
|
line-height: 1.2;
|
||||||
|
color: var(--text-primary);
|
||||||
|
margin: 0 0 0.75rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.byline {
|
||||||
|
font-family: var(--font-ui);
|
||||||
|
font-size: 0.9rem;
|
||||||
|
color: var(--text-muted);
|
||||||
|
margin: 0 0 2rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.hero {
|
||||||
|
width: 100%;
|
||||||
|
height: auto;
|
||||||
|
border-radius: 10px;
|
||||||
|
border: 1px solid var(--border);
|
||||||
|
margin-bottom: 2rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Rich-text output: the editor emits plain elements, so these are styled by
|
||||||
|
descendant selector rather than by class. */
|
||||||
|
.prose p {
|
||||||
|
font-family: var(--font-ui);
|
||||||
|
font-size: 1rem;
|
||||||
|
line-height: 1.7;
|
||||||
|
color: var(--text-secondary);
|
||||||
|
margin: 0 0 1.1rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.prose h2 {
|
||||||
|
font-family: var(--font-display);
|
||||||
|
font-size: 1.25rem;
|
||||||
|
font-weight: 600;
|
||||||
|
color: var(--text-primary);
|
||||||
|
margin: 2.25rem 0 0.75rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.prose h3 {
|
||||||
|
font-family: var(--font-display);
|
||||||
|
font-size: 1.05rem;
|
||||||
|
font-weight: 600;
|
||||||
|
color: var(--text-primary);
|
||||||
|
margin: 1.75rem 0 0.6rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.prose ul,
|
||||||
|
.prose ol {
|
||||||
|
font-family: var(--font-ui);
|
||||||
|
font-size: 1rem;
|
||||||
|
line-height: 1.7;
|
||||||
|
color: var(--text-secondary);
|
||||||
|
padding-left: 1.35rem;
|
||||||
|
margin: 0 0 1.1rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.prose li { margin-bottom: 0.4rem; }
|
||||||
|
|
||||||
|
.prose a { color: var(--brand); font-weight: 500; }
|
||||||
|
.prose a:hover { color: var(--brand-strong); }
|
||||||
|
|
||||||
|
.prose blockquote {
|
||||||
|
border-left: 3px solid var(--border-strong);
|
||||||
|
padding-left: 1rem;
|
||||||
|
margin: 1.5rem 0;
|
||||||
|
color: var(--text-muted);
|
||||||
|
font-style: italic;
|
||||||
|
}
|
||||||
|
|
||||||
|
.link { color: var(--brand); font-weight: 600; }
|
||||||
|
.link:hover { color: var(--brand-strong); }
|
||||||
@@ -0,0 +1,176 @@
|
|||||||
|
import { cache } from 'react';
|
||||||
|
import type { Metadata } from 'next';
|
||||||
|
import Link from 'next/link';
|
||||||
|
import { notFound } from 'next/navigation';
|
||||||
|
import { RichText } from '@payloadcms/richtext-lexical/react';
|
||||||
|
import type { JSXConvertersFunction } from '@payloadcms/richtext-lexical/react';
|
||||||
|
import { getCachedPayload } from '@/lib/payload';
|
||||||
|
import type { Post, Media } from '@/payload-types';
|
||||||
|
import { absoluteUrl } from '@/lib/site';
|
||||||
|
import {
|
||||||
|
blogPostingJsonLd,
|
||||||
|
breadcrumbJsonLd,
|
||||||
|
personJsonLd,
|
||||||
|
organizationJsonLd,
|
||||||
|
} from '@/lib/jsonld';
|
||||||
|
import { CalloutBlock } from '@/components/blog/CalloutBlock';
|
||||||
|
import styles from './Post.module.css';
|
||||||
|
|
||||||
|
/*
|
||||||
|
* ISR. Unlike the index, this route has a dynamic param and no
|
||||||
|
* generateStaticParams, so there is nothing for the build to prerender: each
|
||||||
|
* post is generated on first request and cached until the collection's
|
||||||
|
* afterChange hook revalidates it. That hook is what makes an edit to an
|
||||||
|
* already-published post appear immediately.
|
||||||
|
*/
|
||||||
|
export const revalidate = 3600;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* heroImage is `number | Media | null`: an id when the query is shallow, the
|
||||||
|
* populated document at depth 1. Both pages query at depth 1, but narrowing
|
||||||
|
* rather than asserting keeps it correct if that ever changes.
|
||||||
|
*/
|
||||||
|
function heroOf(post: Post): Media | null {
|
||||||
|
return typeof post.heroImage === 'object' && post.heroImage !== null
|
||||||
|
? post.heroImage
|
||||||
|
: null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Spreads the default converters and adds the one custom block.
|
||||||
|
*
|
||||||
|
* Without the spread, every default node type — paragraphs, headings, links —
|
||||||
|
* loses its renderer and the post body comes out empty.
|
||||||
|
*/
|
||||||
|
const calloutConverters: JSXConvertersFunction = ({ defaultConverters }) => ({
|
||||||
|
...defaultConverters,
|
||||||
|
blocks: {
|
||||||
|
// Annotated because the generic block converter cannot infer a custom
|
||||||
|
// block's field shape; String() guards the values regardless.
|
||||||
|
callout: ({ node }: { node: { fields: Record<string, unknown> } }) => (
|
||||||
|
<CalloutBlock
|
||||||
|
tone={String(node.fields.tone ?? 'caveat')}
|
||||||
|
body={String(node.fields.body ?? '')}
|
||||||
|
/>
|
||||||
|
),
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Wrapped in React's cache() because Next calls generateMetadata and the page
|
||||||
|
* component separately for the same request — without it, every post view runs
|
||||||
|
* this query against Postgres twice. cache() dedupes within a single request
|
||||||
|
* only, so it never serves one visitor's request from another's.
|
||||||
|
*/
|
||||||
|
const findPost = cache(async (slug: string) => {
|
||||||
|
const payload = await getCachedPayload();
|
||||||
|
const { docs } = await payload.find({
|
||||||
|
collection: 'posts',
|
||||||
|
where: { slug: { equals: slug }, _status: { equals: 'published' } },
|
||||||
|
limit: 1,
|
||||||
|
depth: 1,
|
||||||
|
});
|
||||||
|
return docs[0] ?? null;
|
||||||
|
});
|
||||||
|
|
||||||
|
function summarise(post: Post) {
|
||||||
|
return {
|
||||||
|
title: post.title,
|
||||||
|
slug: post.slug,
|
||||||
|
excerpt: post.excerpt,
|
||||||
|
publishedAt: post.publishedAt,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function generateMetadata(
|
||||||
|
{ params }: { params: Promise<{ slug: string }> },
|
||||||
|
): Promise<Metadata> {
|
||||||
|
const { slug } = await params;
|
||||||
|
const post = await findPost(slug);
|
||||||
|
if (!post) return { title: 'Not found' };
|
||||||
|
|
||||||
|
const hero = heroOf(post);
|
||||||
|
|
||||||
|
return {
|
||||||
|
title: post.title,
|
||||||
|
description: post.excerpt,
|
||||||
|
alternates: { canonical: absoluteUrl(`/blog/${post.slug}`) },
|
||||||
|
openGraph: {
|
||||||
|
type: 'article',
|
||||||
|
title: post.title,
|
||||||
|
description: post.excerpt,
|
||||||
|
url: absoluteUrl(`/blog/${post.slug}`),
|
||||||
|
publishedTime: post.publishedAt,
|
||||||
|
// A post with a hero image shares that; one without falls through to the
|
||||||
|
// generated share card at app/opengraph-image.tsx.
|
||||||
|
...(hero?.url ? { images: [{ url: hero.url }] } : {}),
|
||||||
|
},
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export default async function PostPage(
|
||||||
|
{ params }: { params: Promise<{ slug: string }> },
|
||||||
|
) {
|
||||||
|
const { slug } = await params;
|
||||||
|
const post = await findPost(slug);
|
||||||
|
if (!post) notFound();
|
||||||
|
|
||||||
|
const summary = summarise(post);
|
||||||
|
const hero = heroOf(post);
|
||||||
|
|
||||||
|
const jsonLd = {
|
||||||
|
'@context': 'https://schema.org',
|
||||||
|
'@graph': [
|
||||||
|
blogPostingJsonLd(summary),
|
||||||
|
breadcrumbJsonLd(summary),
|
||||||
|
personJsonLd(),
|
||||||
|
organizationJsonLd(),
|
||||||
|
],
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<article className={styles.page}>
|
||||||
|
<script
|
||||||
|
type="application/ld+json"
|
||||||
|
dangerouslySetInnerHTML={{ __html: JSON.stringify(jsonLd) }}
|
||||||
|
/>
|
||||||
|
|
||||||
|
<nav className={styles.crumb}>
|
||||||
|
<Link href="/blog" className={styles.link}>Blog</Link>
|
||||||
|
</nav>
|
||||||
|
|
||||||
|
<h1 className={styles.heading}>{summary.title}</h1>
|
||||||
|
|
||||||
|
<p className={styles.byline}>
|
||||||
|
By <Link href="/about" className={styles.link}>Tudor</Link>
|
||||||
|
{' · '}
|
||||||
|
<time dateTime={summary.publishedAt}>
|
||||||
|
{new Date(summary.publishedAt).toLocaleDateString('en-GB', {
|
||||||
|
day: 'numeric',
|
||||||
|
month: 'long',
|
||||||
|
year: 'numeric',
|
||||||
|
})}
|
||||||
|
</time>
|
||||||
|
</p>
|
||||||
|
|
||||||
|
{/*
|
||||||
|
A plain <img>, not next/image: Payload already generated the sized
|
||||||
|
derivatives on upload (Media's imageSizes), so routing it through the
|
||||||
|
optimizer would resize an image that is already the right size.
|
||||||
|
*/}
|
||||||
|
{hero?.url && (
|
||||||
|
<img
|
||||||
|
className={styles.hero}
|
||||||
|
src={hero.url}
|
||||||
|
alt={hero.alt ?? ''}
|
||||||
|
width={hero.width ?? undefined}
|
||||||
|
height={hero.height ?? undefined}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
|
||||||
|
<div className={styles.prose}>
|
||||||
|
<RichText data={post.content} converters={calloutConverters} />
|
||||||
|
</div>
|
||||||
|
</article>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,76 @@
|
|||||||
|
import type { Metadata } from 'next';
|
||||||
|
import Link from 'next/link';
|
||||||
|
import { getCachedPayload } from '@/lib/payload';
|
||||||
|
import { absoluteUrl } from '@/lib/site';
|
||||||
|
import styles from './Blog.module.css';
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Dynamic, not ISR.
|
||||||
|
*
|
||||||
|
* This route has no dynamic params, so Next prerenders it at build time — and
|
||||||
|
* CI builds the image with no database reachable, which fails the build. It is
|
||||||
|
* a single indexed query against Postgres on the same Docker network, so
|
||||||
|
* rendering per request is cheap, and it means a newly published post appears
|
||||||
|
* here immediately rather than waiting on a revalidation.
|
||||||
|
*/
|
||||||
|
export const dynamic = 'force-dynamic';
|
||||||
|
|
||||||
|
export const metadata: Metadata = {
|
||||||
|
title: 'Blog',
|
||||||
|
description:
|
||||||
|
'Notes on what school performance data shows, and what it does not.',
|
||||||
|
alternates: { canonical: absoluteUrl('/blog') },
|
||||||
|
};
|
||||||
|
|
||||||
|
function formatDate(value: string) {
|
||||||
|
return new Date(value).toLocaleDateString('en-GB', {
|
||||||
|
day: 'numeric',
|
||||||
|
month: 'long',
|
||||||
|
year: 'numeric',
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export default async function BlogIndexPage() {
|
||||||
|
const payload = await getCachedPayload();
|
||||||
|
const { docs } = await payload.find({
|
||||||
|
collection: 'posts',
|
||||||
|
where: { _status: { equals: 'published' } },
|
||||||
|
sort: '-publishedAt',
|
||||||
|
limit: 50,
|
||||||
|
depth: 0,
|
||||||
|
});
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className={styles.page}>
|
||||||
|
<header className={styles.header}>
|
||||||
|
<p className={styles.kicker}>Blog</p>
|
||||||
|
<h1 className={styles.heading}>Notes on the numbers</h1>
|
||||||
|
<p className={styles.standfirst}>
|
||||||
|
What school performance data shows, what it doesn't, and how to
|
||||||
|
read it without being misled. Written by{' '}
|
||||||
|
<Link href="/about" className={styles.link}>Tudor</Link>.
|
||||||
|
</p>
|
||||||
|
</header>
|
||||||
|
|
||||||
|
{docs.length === 0 ? (
|
||||||
|
<p className={styles.empty}>No posts yet.</p>
|
||||||
|
) : (
|
||||||
|
<ul className={styles.list}>
|
||||||
|
{docs.map((post) => (
|
||||||
|
<li key={post.id} className={styles.item}>
|
||||||
|
<time className={styles.date} dateTime={String(post.publishedAt)}>
|
||||||
|
{formatDate(String(post.publishedAt))}
|
||||||
|
</time>
|
||||||
|
<h2 className={styles.itemTitle}>
|
||||||
|
<Link href={`/blog/${post.slug}`} className={styles.itemLink}>
|
||||||
|
{post.title}
|
||||||
|
</Link>
|
||||||
|
</h2>
|
||||||
|
<p className={styles.excerpt}>{post.excerpt}</p>
|
||||||
|
</li>
|
||||||
|
))}
|
||||||
|
</ul>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,52 @@
|
|||||||
|
import { getCachedPayload } from '@/lib/payload';
|
||||||
|
import { absoluteUrl } from '@/lib/site';
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Dynamic, not ISR.
|
||||||
|
*
|
||||||
|
* This route has no dynamic params, so Next prerenders it at build time — and
|
||||||
|
* CI builds the image with no database reachable, which fails the build. It is
|
||||||
|
* a single indexed query against Postgres on the same Docker network, so
|
||||||
|
* rendering per request is cheap, and it means a newly published post appears
|
||||||
|
* here immediately rather than waiting on a revalidation.
|
||||||
|
*/
|
||||||
|
export const dynamic = 'force-dynamic';
|
||||||
|
|
||||||
|
function escapeXml(value: string): string {
|
||||||
|
return value.replace(/[<>&'"]/g, (char) =>
|
||||||
|
({ '<': '<', '>': '>', '&': '&', "'": ''', '"': '"' }[char]!));
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function GET() {
|
||||||
|
const payload = await getCachedPayload();
|
||||||
|
const { docs } = await payload.find({
|
||||||
|
collection: 'posts',
|
||||||
|
where: { _status: { equals: 'published' } },
|
||||||
|
sort: '-publishedAt',
|
||||||
|
limit: 50,
|
||||||
|
depth: 0,
|
||||||
|
});
|
||||||
|
|
||||||
|
const items = docs.map((post) => `
|
||||||
|
<item>
|
||||||
|
<title>${escapeXml(String(post.title))}</title>
|
||||||
|
<link>${absoluteUrl(`/blog/${post.slug}`)}</link>
|
||||||
|
<guid isPermaLink="true">${absoluteUrl(`/blog/${post.slug}`)}</guid>
|
||||||
|
<description>${escapeXml(String(post.excerpt))}</description>
|
||||||
|
<pubDate>${new Date(String(post.publishedAt)).toUTCString()}</pubDate>
|
||||||
|
</item>`).join('');
|
||||||
|
|
||||||
|
const xml = `<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<rss version="2.0">
|
||||||
|
<channel>
|
||||||
|
<title>schoolcompare blog</title>
|
||||||
|
<link>${absoluteUrl('/blog')}</link>
|
||||||
|
<description>What school performance data shows, and what it does not.</description>
|
||||||
|
<language>en-GB</language>${items}
|
||||||
|
</channel>
|
||||||
|
</rss>`;
|
||||||
|
|
||||||
|
return new Response(xml, {
|
||||||
|
headers: { 'Content-Type': 'application/rss+xml; charset=utf-8' },
|
||||||
|
});
|
||||||
|
}
|
||||||
File renamed without changes.
@@ -0,0 +1,52 @@
|
|||||||
|
/*
|
||||||
|
* A second sitemap for the URLs Next owns.
|
||||||
|
*
|
||||||
|
* /sitemap.xml is proxied from FastAPI (app/(frontend)/sitemap.xml), which
|
||||||
|
* knows nothing about Payload — the backend and frontend ship as separate
|
||||||
|
* images. Rather than teach it, the Next-owned URLs get their own sitemap and
|
||||||
|
* robots.txt lists both.
|
||||||
|
*/
|
||||||
|
import { getCachedPayload } from '@/lib/payload';
|
||||||
|
import { absoluteUrl } from '@/lib/site';
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Dynamic, not ISR.
|
||||||
|
*
|
||||||
|
* This route has no dynamic params, so Next prerenders it at build time — and
|
||||||
|
* CI builds the image with no database reachable, which fails the build. It is
|
||||||
|
* a single indexed query against Postgres on the same Docker network, so
|
||||||
|
* rendering per request is cheap, and it means a newly published post appears
|
||||||
|
* here immediately rather than waiting on a revalidation.
|
||||||
|
*/
|
||||||
|
export const dynamic = 'force-dynamic';
|
||||||
|
|
||||||
|
export async function GET() {
|
||||||
|
const payload = await getCachedPayload();
|
||||||
|
const { docs } = await payload.find({
|
||||||
|
collection: 'posts',
|
||||||
|
where: { _status: { equals: 'published' } },
|
||||||
|
sort: '-publishedAt',
|
||||||
|
limit: 500,
|
||||||
|
depth: 0,
|
||||||
|
});
|
||||||
|
|
||||||
|
const urls: Array<{ loc: string; lastmod: string | null }> = [
|
||||||
|
{ loc: absoluteUrl('/about'), lastmod: null },
|
||||||
|
{ loc: absoluteUrl('/blog'), lastmod: null },
|
||||||
|
...docs.map((post) => ({
|
||||||
|
loc: absoluteUrl(`/blog/${post.slug}`),
|
||||||
|
lastmod: new Date(String(post.updatedAt ?? post.publishedAt)).toISOString(),
|
||||||
|
})),
|
||||||
|
];
|
||||||
|
|
||||||
|
const xml = `<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
|
||||||
|
${urls.map(({ loc, lastmod }) =>
|
||||||
|
` <url><loc>${loc}</loc>${lastmod ? `<lastmod>${lastmod}</lastmod>` : ''}</url>`,
|
||||||
|
).join('\n')}
|
||||||
|
</urlset>`;
|
||||||
|
|
||||||
|
return new Response(xml, {
|
||||||
|
headers: { 'Content-Type': 'application/xml; charset=utf-8' },
|
||||||
|
});
|
||||||
|
}
|
||||||
@@ -28,6 +28,9 @@
|
|||||||
--bg-primary: #FAFAF8; /* Warm White */
|
--bg-primary: #FAFAF8; /* Warm White */
|
||||||
--bg-secondary: #F5EFE6; /* Sand — hero panels, sunken rows */
|
--bg-secondary: #F5EFE6; /* Sand — hero panels, sunken rows */
|
||||||
--bg-card: #FFFFFF;
|
--bg-card: #FFFFFF;
|
||||||
|
/* For gradients that have to fade to the card colour. A hardcoded white
|
||||||
|
ramp reads as a bright band against a dark card. */
|
||||||
|
--bg-card-rgb: 255, 255, 255;
|
||||||
--surface-inverse: #0F766E;
|
--surface-inverse: #0F766E;
|
||||||
|
|
||||||
/* ── Ink ────────────────────────────────────────────────────────── */
|
/* ── Ink ────────────────────────────────────────────────────────── */
|
||||||
@@ -102,6 +105,23 @@
|
|||||||
--series-7: #0E7A86;
|
--series-7: #0E7A86;
|
||||||
--series-8: #8A4A6B;
|
--series-8: #8A4A6B;
|
||||||
|
|
||||||
|
/* ── Destination measures ───────────────────────────────────────────
|
||||||
|
Education is one hue in three steps (school-like -> college-like) so the
|
||||||
|
education destinations read as one family; apprenticeship and employment
|
||||||
|
are separate hues. The absence is neutral and HATCHED, never a colour:
|
||||||
|
"activity not captured" covers independent schools, moving abroad and
|
||||||
|
training DfE holds no data on, so rendering it as a bad outcome would be
|
||||||
|
a factual error. The hatch is also the secondary encoding that rescues
|
||||||
|
the neutral/blue pair, which separates at only dE 7.6 as flat fills.
|
||||||
|
Every other adjacent pair clears dE 10.9 under protanopia. */
|
||||||
|
--dest-sixthform: #0F766E;
|
||||||
|
--dest-sfcollege: #4A9E96;
|
||||||
|
--dest-fecollege: #7CBFB8;
|
||||||
|
--dest-apprentice: #806200;
|
||||||
|
--dest-employment: #2F6F8F;
|
||||||
|
--dest-none: #6B7580;
|
||||||
|
--dest-none-hatch: rgba(107, 117, 128, 0.34);
|
||||||
|
|
||||||
/* ── Phase: category, desaturated so it stays under the status hues ── */
|
/* ── Phase: category, desaturated so it stays under the status hues ── */
|
||||||
--phase-primary: #0F766E;
|
--phase-primary: #0F766E;
|
||||||
--phase-primary-bg: rgba(167, 215, 197, 0.40);
|
--phase-primary-bg: rgba(167, 215, 197, 0.40);
|
||||||
@@ -234,6 +254,7 @@
|
|||||||
--bg-primary: #111A20;
|
--bg-primary: #111A20;
|
||||||
--bg-secondary: #16222A;
|
--bg-secondary: #16222A;
|
||||||
--bg-card: #18242C;
|
--bg-card: #18242C;
|
||||||
|
--bg-card-rgb: 24, 36, 44;
|
||||||
--surface-inverse: #E9EEF0;
|
--surface-inverse: #E9EEF0;
|
||||||
|
|
||||||
--text-primary: #E9EEF0;
|
--text-primary: #E9EEF0;
|
||||||
@@ -289,6 +310,17 @@
|
|||||||
--series-7: #6FD0DC;
|
--series-7: #6FD0DC;
|
||||||
--series-8: #D99BB8;
|
--series-8: #D99BB8;
|
||||||
|
|
||||||
|
/* Destinations. Not a naive inversion: the education ramp reverses
|
||||||
|
direction so its darkest step stays the one furthest from the
|
||||||
|
school, and each step is re-checked against the dark card. */
|
||||||
|
--dest-sixthform: #5FC7BB;
|
||||||
|
--dest-sfcollege: #3E9B92;
|
||||||
|
--dest-fecollege: #2A716B;
|
||||||
|
--dest-apprentice: #EFC658;
|
||||||
|
--dest-employment: #8FB4D9;
|
||||||
|
--dest-none: #8B9AA1;
|
||||||
|
--dest-none-hatch: rgba(139, 154, 161, 0.34);
|
||||||
|
|
||||||
--phase-primary: #5FC7BB;
|
--phase-primary: #5FC7BB;
|
||||||
--phase-primary-bg: rgba(95, 199, 187, 0.16);
|
--phase-primary-bg: rgba(95, 199, 187, 0.16);
|
||||||
--phase-primary-text: #8ADACF;
|
--phase-primary-text: #8ADACF;
|
||||||
@@ -584,6 +616,35 @@ html .leaflet-bar a:hover {
|
|||||||
color: var(--text-primary);
|
color: var(--text-primary);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* The popup, which leaflet.css paints `background: white; color: #333` on both
|
||||||
|
* the card and its tip. The content LeafletMapInner binds into it is themed —
|
||||||
|
* the school name and the headline figure are `var(--text-primary)` — so in
|
||||||
|
* dark mode that was #E9EEF0 on #FFFFFF, a contrast ratio of 1.17:1. The name
|
||||||
|
* and the number were the two least readable things on the page.
|
||||||
|
*
|
||||||
|
* Moving the surface onto --bg-card fixes every foreground at once rather than
|
||||||
|
* one at a time: the muted phase line goes 2.90:1 -> 5.45:1, the vs-national
|
||||||
|
* delta 1.94:1 -> 8.14:1, the Ofsted badge 1.74:1 -> 9.11:1. In light mode
|
||||||
|
* --bg-card is #FFFFFF, so the popup looks as it always did.
|
||||||
|
*/
|
||||||
|
html .leaflet-popup-content-wrapper,
|
||||||
|
html .leaflet-popup-tip {
|
||||||
|
background: var(--bg-card);
|
||||||
|
color: var(--text-primary);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Leaflet's own selector is `.leaflet-container a.leaflet-popup-close-button`
|
||||||
|
at 0,2,1 — an `html` prefix alone would lose to it. */
|
||||||
|
html .leaflet-container a.leaflet-popup-close-button {
|
||||||
|
color: var(--text-muted);
|
||||||
|
}
|
||||||
|
|
||||||
|
html .leaflet-container a.leaflet-popup-close-button:hover,
|
||||||
|
html .leaflet-container a.leaflet-popup-close-button:focus {
|
||||||
|
color: var(--text-primary);
|
||||||
|
}
|
||||||
|
|
||||||
/* Main content column */
|
/* Main content column */
|
||||||
.main {
|
.main {
|
||||||
max-width: 1400px;
|
max-width: 1400px;
|
||||||
@@ -4,6 +4,7 @@ import Script from 'next/script';
|
|||||||
import { Navigation } from '@/components/Navigation';
|
import { Navigation } from '@/components/Navigation';
|
||||||
import { Footer } from '@/components/Footer';
|
import { Footer } from '@/components/Footer';
|
||||||
import { ComparisonToast } from '@/components/ComparisonToast';
|
import { ComparisonToast } from '@/components/ComparisonToast';
|
||||||
|
import { RouteTrail } from '@/components/RouteTrail';
|
||||||
import { ComparisonProvider } from '@/context/ComparisonProvider';
|
import { ComparisonProvider } from '@/context/ComparisonProvider';
|
||||||
import { SITE_URL } from '@/lib/site';
|
import { SITE_URL } from '@/lib/site';
|
||||||
import './globals.css';
|
import './globals.css';
|
||||||
@@ -114,6 +115,10 @@ export default function RootLayout({
|
|||||||
/>
|
/>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
|
{/* Records every route so funnel attribution has a previous page to
|
||||||
|
name. document.referrer cannot: a soft navigation creates no
|
||||||
|
document, so the browser never updates it. */}
|
||||||
|
<RouteTrail />
|
||||||
<ComparisonProvider>
|
<ComparisonProvider>
|
||||||
<a href="#main-content" className="skip-link">Skip to main content</a>
|
<a href="#main-content" className="skip-link">Skip to main content</a>
|
||||||
<Navigation />
|
<Navigation />
|
||||||
File renamed without changes.
File renamed without changes.
+4
-2
@@ -148,7 +148,7 @@ export default async function SchoolPage({ params }: SchoolPageProps) {
|
|||||||
notFound();
|
notFound();
|
||||||
}
|
}
|
||||||
|
|
||||||
const { school_info, yearly_data, absence_data, ofsted, census, admissions, admissions_history, admission_distance, deprivation, finance } = data;
|
const { school_info, yearly_data, absence_data, ofsted, census, admissions, admissions_history, admission_distance, deprivation, finance, destinations } = data;
|
||||||
|
|
||||||
// Redirect bare URN to canonical slug URL
|
// Redirect bare URN to canonical slug URL
|
||||||
const canonicalSlug = schoolUrl(urn, school_info.school_name).replace('/school/', '');
|
const canonicalSlug = schoolUrl(urn, school_info.school_name).replace('/school/', '');
|
||||||
@@ -171,6 +171,7 @@ export default async function SchoolPage({ params }: SchoolPageProps) {
|
|||||||
schoolInfo: school_info, yearlyData: yearly_data,
|
schoolInfo: school_info, yearlyData: yearly_data,
|
||||||
absenceData: absence_data, census: census ?? null,
|
absenceData: absence_data, census: census ?? null,
|
||||||
deprivation: deprivation ?? null, finance: finance ?? null,
|
deprivation: deprivation ?? null, finance: finance ?? null,
|
||||||
|
destinations: destinations ?? null,
|
||||||
};
|
};
|
||||||
const primaryFlags = computeSchoolFlags(sectionInput);
|
const primaryFlags = computeSchoolFlags(sectionInput);
|
||||||
const secondaryFlags = computeSecondaryFlags(sectionInput);
|
const secondaryFlags = computeSecondaryFlags(sectionInput);
|
||||||
@@ -232,10 +233,11 @@ export default async function SchoolPage({ params }: SchoolPageProps) {
|
|||||||
census={census ?? null}
|
census={census ?? null}
|
||||||
admissions={admissions ?? null}
|
admissions={admissions ?? null}
|
||||||
admissionsHistory={admissions_history ?? []}
|
admissionsHistory={admissions_history ?? []}
|
||||||
admissionDistance={admission_distance ?? null}
|
admissionDistance={admission_distance}
|
||||||
deprivation={deprivation ?? null}
|
deprivation={deprivation ?? null}
|
||||||
finance={finance ?? null}
|
finance={finance ?? null}
|
||||||
nationalAvg={nationalAvg}
|
nationalAvg={nationalAvg}
|
||||||
|
destinations={destinations ?? null}
|
||||||
flags={secondaryFlags}
|
flags={secondaryFlags}
|
||||||
/>
|
/>
|
||||||
</SchoolDetailShell>
|
</SchoolDetailShell>
|
||||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -0,0 +1,16 @@
|
|||||||
|
import type { Metadata } from 'next';
|
||||||
|
import config from '@payload-config';
|
||||||
|
import { NotFoundPage, generatePageMetadata } from '@payloadcms/next/views';
|
||||||
|
import { importMap } from '../importMap.js';
|
||||||
|
|
||||||
|
type Args = {
|
||||||
|
params: Promise<{ segments: string[] }>;
|
||||||
|
searchParams: Promise<{ [key: string]: string | string[] }>;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const generateMetadata = ({ params, searchParams }: Args): Promise<Metadata> =>
|
||||||
|
generatePageMetadata({ config, params, searchParams });
|
||||||
|
|
||||||
|
export default function NotFound({ params, searchParams }: Args) {
|
||||||
|
return NotFoundPage({ config, importMap, params, searchParams });
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
import type { Metadata } from 'next';
|
||||||
|
import config from '@payload-config';
|
||||||
|
import { RootPage, generatePageMetadata } from '@payloadcms/next/views';
|
||||||
|
import { importMap } from '../importMap.js';
|
||||||
|
|
||||||
|
type Args = {
|
||||||
|
params: Promise<{ segments: string[] }>;
|
||||||
|
searchParams: Promise<{ [key: string]: string | string[] }>;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const generateMetadata = ({ params, searchParams }: Args): Promise<Metadata> =>
|
||||||
|
generatePageMetadata({ config, params, searchParams });
|
||||||
|
|
||||||
|
export default function Page({ params, searchParams }: Args) {
|
||||||
|
return RootPage({ config, importMap, params, searchParams });
|
||||||
|
}
|
||||||
@@ -0,0 +1,54 @@
|
|||||||
|
import { RscEntryLexicalCell as RscEntryLexicalCell_44fe37237e0ebf4470c9990d8cb7b07e } from '@payloadcms/richtext-lexical/rsc'
|
||||||
|
import { RscEntryLexicalField as RscEntryLexicalField_44fe37237e0ebf4470c9990d8cb7b07e } from '@payloadcms/richtext-lexical/rsc'
|
||||||
|
import { LexicalDiffComponent as LexicalDiffComponent_44fe37237e0ebf4470c9990d8cb7b07e } from '@payloadcms/richtext-lexical/rsc'
|
||||||
|
import { BlocksFeatureClient as BlocksFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from '@payloadcms/richtext-lexical/client'
|
||||||
|
import { BoldFeatureClient as BoldFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from '@payloadcms/richtext-lexical/client'
|
||||||
|
import { ItalicFeatureClient as ItalicFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from '@payloadcms/richtext-lexical/client'
|
||||||
|
import { UnderlineFeatureClient as UnderlineFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from '@payloadcms/richtext-lexical/client'
|
||||||
|
import { StrikethroughFeatureClient as StrikethroughFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from '@payloadcms/richtext-lexical/client'
|
||||||
|
import { SubscriptFeatureClient as SubscriptFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from '@payloadcms/richtext-lexical/client'
|
||||||
|
import { SuperscriptFeatureClient as SuperscriptFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from '@payloadcms/richtext-lexical/client'
|
||||||
|
import { InlineCodeFeatureClient as InlineCodeFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from '@payloadcms/richtext-lexical/client'
|
||||||
|
import { ParagraphFeatureClient as ParagraphFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from '@payloadcms/richtext-lexical/client'
|
||||||
|
import { HeadingFeatureClient as HeadingFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from '@payloadcms/richtext-lexical/client'
|
||||||
|
import { AlignFeatureClient as AlignFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from '@payloadcms/richtext-lexical/client'
|
||||||
|
import { IndentFeatureClient as IndentFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from '@payloadcms/richtext-lexical/client'
|
||||||
|
import { UnorderedListFeatureClient as UnorderedListFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from '@payloadcms/richtext-lexical/client'
|
||||||
|
import { OrderedListFeatureClient as OrderedListFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from '@payloadcms/richtext-lexical/client'
|
||||||
|
import { ChecklistFeatureClient as ChecklistFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from '@payloadcms/richtext-lexical/client'
|
||||||
|
import { LinkFeatureClient as LinkFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from '@payloadcms/richtext-lexical/client'
|
||||||
|
import { RelationshipFeatureClient as RelationshipFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from '@payloadcms/richtext-lexical/client'
|
||||||
|
import { BlockquoteFeatureClient as BlockquoteFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from '@payloadcms/richtext-lexical/client'
|
||||||
|
import { UploadFeatureClient as UploadFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from '@payloadcms/richtext-lexical/client'
|
||||||
|
import { HorizontalRuleFeatureClient as HorizontalRuleFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from '@payloadcms/richtext-lexical/client'
|
||||||
|
import { InlineToolbarFeatureClient as InlineToolbarFeatureClient_e70f5e05f09f93e00b997edb1ef0c864 } from '@payloadcms/richtext-lexical/client'
|
||||||
|
import { CollectionCards as CollectionCards_f9c02e79a4aed9a3924487c0cd4cafb1 } from '@payloadcms/next/rsc'
|
||||||
|
|
||||||
|
/** @type import('payload').ImportMap */
|
||||||
|
export const importMap = {
|
||||||
|
"@payloadcms/richtext-lexical/rsc#RscEntryLexicalCell": RscEntryLexicalCell_44fe37237e0ebf4470c9990d8cb7b07e,
|
||||||
|
"@payloadcms/richtext-lexical/rsc#RscEntryLexicalField": RscEntryLexicalField_44fe37237e0ebf4470c9990d8cb7b07e,
|
||||||
|
"@payloadcms/richtext-lexical/rsc#LexicalDiffComponent": LexicalDiffComponent_44fe37237e0ebf4470c9990d8cb7b07e,
|
||||||
|
"@payloadcms/richtext-lexical/client#BlocksFeatureClient": BlocksFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
|
||||||
|
"@payloadcms/richtext-lexical/client#BoldFeatureClient": BoldFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
|
||||||
|
"@payloadcms/richtext-lexical/client#ItalicFeatureClient": ItalicFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
|
||||||
|
"@payloadcms/richtext-lexical/client#UnderlineFeatureClient": UnderlineFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
|
||||||
|
"@payloadcms/richtext-lexical/client#StrikethroughFeatureClient": StrikethroughFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
|
||||||
|
"@payloadcms/richtext-lexical/client#SubscriptFeatureClient": SubscriptFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
|
||||||
|
"@payloadcms/richtext-lexical/client#SuperscriptFeatureClient": SuperscriptFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
|
||||||
|
"@payloadcms/richtext-lexical/client#InlineCodeFeatureClient": InlineCodeFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
|
||||||
|
"@payloadcms/richtext-lexical/client#ParagraphFeatureClient": ParagraphFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
|
||||||
|
"@payloadcms/richtext-lexical/client#HeadingFeatureClient": HeadingFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
|
||||||
|
"@payloadcms/richtext-lexical/client#AlignFeatureClient": AlignFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
|
||||||
|
"@payloadcms/richtext-lexical/client#IndentFeatureClient": IndentFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
|
||||||
|
"@payloadcms/richtext-lexical/client#UnorderedListFeatureClient": UnorderedListFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
|
||||||
|
"@payloadcms/richtext-lexical/client#OrderedListFeatureClient": OrderedListFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
|
||||||
|
"@payloadcms/richtext-lexical/client#ChecklistFeatureClient": ChecklistFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
|
||||||
|
"@payloadcms/richtext-lexical/client#LinkFeatureClient": LinkFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
|
||||||
|
"@payloadcms/richtext-lexical/client#RelationshipFeatureClient": RelationshipFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
|
||||||
|
"@payloadcms/richtext-lexical/client#BlockquoteFeatureClient": BlockquoteFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
|
||||||
|
"@payloadcms/richtext-lexical/client#UploadFeatureClient": UploadFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
|
||||||
|
"@payloadcms/richtext-lexical/client#HorizontalRuleFeatureClient": HorizontalRuleFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
|
||||||
|
"@payloadcms/richtext-lexical/client#InlineToolbarFeatureClient": InlineToolbarFeatureClient_e70f5e05f09f93e00b997edb1ef0c864,
|
||||||
|
"@payloadcms/next/rsc#CollectionCards": CollectionCards_f9c02e79a4aed9a3924487c0cd4cafb1
|
||||||
|
}
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
/*
|
||||||
|
* Payload's REST API, mounted at /cms-api rather than /api.
|
||||||
|
* See lib/payloadRoutes.ts — /api is the FastAPI proxy's catch-all.
|
||||||
|
*/
|
||||||
|
import config from '@payload-config';
|
||||||
|
import {
|
||||||
|
REST_DELETE,
|
||||||
|
REST_GET,
|
||||||
|
REST_OPTIONS,
|
||||||
|
REST_PATCH,
|
||||||
|
REST_POST,
|
||||||
|
REST_PUT,
|
||||||
|
} from '@payloadcms/next/routes';
|
||||||
|
|
||||||
|
export const GET = REST_GET(config);
|
||||||
|
export const POST = REST_POST(config);
|
||||||
|
export const DELETE = REST_DELETE(config);
|
||||||
|
export const PATCH = REST_PATCH(config);
|
||||||
|
export const PUT = REST_PUT(config);
|
||||||
|
export const OPTIONS = REST_OPTIONS(config);
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
import config from '@payload-config';
|
||||||
|
import { GRAPHQL_PLAYGROUND_GET } from '@payloadcms/next/routes';
|
||||||
|
|
||||||
|
export const GET = GRAPHQL_PLAYGROUND_GET(config);
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
import config from '@payload-config';
|
||||||
|
import { GRAPHQL_POST, REST_OPTIONS } from '@payloadcms/next/routes';
|
||||||
|
|
||||||
|
export const POST = GRAPHQL_POST(config);
|
||||||
|
export const OPTIONS = REST_OPTIONS(config);
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
/**
|
||||||
|
* Root layout for the Payload admin panel.
|
||||||
|
*
|
||||||
|
* This is a SECOND root layout: it renders its own <html>/<body>, as does
|
||||||
|
* app/(frontend)/layout.tsx. Next permits that only while no app/layout.tsx
|
||||||
|
* exists — which is why the site's routes were moved into (frontend). Adding
|
||||||
|
* an app/layout.tsx would nest the admin panel inside the site's nav, footer
|
||||||
|
* and providers and emit nested <html>.
|
||||||
|
*/
|
||||||
|
import type { ServerFunctionClient } from 'payload';
|
||||||
|
import config from '@payload-config';
|
||||||
|
import { RootLayout, handleServerFunctions } from '@payloadcms/next/layouts';
|
||||||
|
import { importMap } from './admin/importMap.js';
|
||||||
|
import '@payloadcms/next/css';
|
||||||
|
|
||||||
|
const serverFunction: ServerFunctionClient = async function (args) {
|
||||||
|
'use server';
|
||||||
|
return handleServerFunctions({ ...args, config, importMap });
|
||||||
|
};
|
||||||
|
|
||||||
|
export default function PayloadLayout({ children }: { children: React.ReactNode }) {
|
||||||
|
return (
|
||||||
|
<RootLayout config={config} importMap={importMap} serverFunction={serverFunction}>
|
||||||
|
{children}
|
||||||
|
</RootLayout>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -12,9 +12,14 @@ export default function robots(): MetadataRoute.Robots {
|
|||||||
{
|
{
|
||||||
userAgent: '*',
|
userAgent: '*',
|
||||||
allow: '/',
|
allow: '/',
|
||||||
disallow: ['/api/', '/_next/'],
|
// /admin and /cms-api are also served X-Robots-Tag: noindex by
|
||||||
|
// next.config.mjs. A Disallow alone blocks crawling, not indexing.
|
||||||
|
disallow: ['/api/', '/_next/', '/admin/', '/cms-api/'],
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
sitemap: absoluteUrl('/sitemap.xml'),
|
// Two sitemaps: /sitemap.xml is proxied from FastAPI and carries the
|
||||||
|
// school corpus; /content-sitemap.xml is Next-owned and carries /about
|
||||||
|
// and the blog. The backend knows nothing about Payload.
|
||||||
|
sitemap: [absoluteUrl('/sitemap.xml'), absoluteUrl('/content-sitemap.xml')],
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
import type { Block } from 'payload';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The house block: "what this number doesn't tell you".
|
||||||
|
*
|
||||||
|
* Blocks are the reason this site runs a CMS rather than flat files — a post
|
||||||
|
* can carry live product components, not screenshots of them. This is the
|
||||||
|
* first and simplest one; a live-chart block follows when a post needs it.
|
||||||
|
*/
|
||||||
|
export const Callout: Block = {
|
||||||
|
slug: 'callout',
|
||||||
|
labels: { singular: 'Callout', plural: 'Callouts' },
|
||||||
|
fields: [
|
||||||
|
{
|
||||||
|
name: 'tone',
|
||||||
|
type: 'select',
|
||||||
|
defaultValue: 'caveat',
|
||||||
|
options: [
|
||||||
|
{ label: 'Caveat: what this does not show', value: 'caveat' },
|
||||||
|
{ label: 'Note: useful aside', value: 'note' },
|
||||||
|
],
|
||||||
|
},
|
||||||
|
{ name: 'body', type: 'textarea', required: true },
|
||||||
|
],
|
||||||
|
};
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
import type { CollectionConfig } from 'payload';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Uploads land on a Docker named volume mounted at /app/media. The path is
|
||||||
|
* absolute because Payload 3 requires it, and it must match the payload_media
|
||||||
|
* mount in docker-compose.portainer.yml exactly — a mismatch writes into the
|
||||||
|
* container's own filesystem, where the next redeploy silently discards it.
|
||||||
|
*/
|
||||||
|
export const Media: CollectionConfig = {
|
||||||
|
slug: 'media',
|
||||||
|
access: { read: () => true },
|
||||||
|
upload: {
|
||||||
|
staticDir: '/app/media',
|
||||||
|
mimeTypes: ['image/*'],
|
||||||
|
imageSizes: [
|
||||||
|
{ name: 'thumbnail', width: 400 },
|
||||||
|
{ name: 'hero', width: 1200 },
|
||||||
|
],
|
||||||
|
adminThumbnail: 'thumbnail',
|
||||||
|
},
|
||||||
|
fields: [
|
||||||
|
{
|
||||||
|
name: 'alt',
|
||||||
|
type: 'text',
|
||||||
|
required: true,
|
||||||
|
// Required rather than optional: a decorative-by-default image is an
|
||||||
|
// accessibility regression on a site parents use under time pressure.
|
||||||
|
admin: { description: 'Describe the image for screen readers.' },
|
||||||
|
},
|
||||||
|
],
|
||||||
|
};
|
||||||
@@ -0,0 +1,99 @@
|
|||||||
|
import type { CollectionConfig } from 'payload';
|
||||||
|
import { revalidatePath } from 'next/cache';
|
||||||
|
import { lexicalEditor, BlocksFeature } from '@payloadcms/richtext-lexical';
|
||||||
|
import { Callout } from '@/blocks/Callout';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Drop the cached copy of a post page when it changes.
|
||||||
|
*
|
||||||
|
* Only the post page needs this. The blog index, the RSS feed and the content
|
||||||
|
* sitemap are force-dynamic — they have no dynamic params, so Next would
|
||||||
|
* prerender them at build time, where CI has no database — which means they
|
||||||
|
* already reflect a change on the next request.
|
||||||
|
*
|
||||||
|
* /blog/[slug] is ISR: generated on first request and cached, so without this
|
||||||
|
* an edit to an already-published post would not appear until the revalidate
|
||||||
|
* window expired — up to an hour of a writer concluding that saving is broken.
|
||||||
|
*
|
||||||
|
* Payload runs in the same process as Next, so this is a direct revalidatePath
|
||||||
|
* call: no webhook, no shared secret, no network hop to get wrong.
|
||||||
|
*/
|
||||||
|
function revalidatePost(slug: string) {
|
||||||
|
revalidatePath(`/blog/${slug}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
export const Posts: CollectionConfig = {
|
||||||
|
slug: 'posts',
|
||||||
|
access: {
|
||||||
|
/*
|
||||||
|
* Drafts must be hidden here, not in the pages that query this collection.
|
||||||
|
*
|
||||||
|
* From Payload's own documentation: "The `draft` argument alone does not
|
||||||
|
* restrict documents with `_status: 'draft'` from being returned by the
|
||||||
|
* API." The blog index and post page both filter on `_status`, but that
|
||||||
|
* is a convenience, not a control — a direct GET /cms-api/posts would
|
||||||
|
* hand every unpublished draft to any visitor.
|
||||||
|
*
|
||||||
|
* Returning a query constraint rather than a boolean is the documented
|
||||||
|
* mechanism: Payload merges it into every read for an anonymous caller.
|
||||||
|
*/
|
||||||
|
read: ({ req }) => {
|
||||||
|
if (req.user) return true;
|
||||||
|
return { _status: { equals: 'published' } };
|
||||||
|
},
|
||||||
|
},
|
||||||
|
admin: {
|
||||||
|
useAsTitle: 'title',
|
||||||
|
defaultColumns: ['title', 'publishedAt', '_status'],
|
||||||
|
},
|
||||||
|
versions: {
|
||||||
|
// Posts get written across several sittings and previewed before they go
|
||||||
|
// live. Without drafts, saving is publishing.
|
||||||
|
drafts: true,
|
||||||
|
},
|
||||||
|
hooks: {
|
||||||
|
afterChange: [({ doc }) => { revalidatePost(String(doc.slug)); }],
|
||||||
|
afterDelete: [({ doc }) => { revalidatePost(String(doc.slug)); }],
|
||||||
|
},
|
||||||
|
fields: [
|
||||||
|
{ name: 'title', type: 'text', required: true },
|
||||||
|
{
|
||||||
|
name: 'slug',
|
||||||
|
type: 'text',
|
||||||
|
required: true,
|
||||||
|
unique: true,
|
||||||
|
index: true,
|
||||||
|
admin: {
|
||||||
|
position: 'sidebar',
|
||||||
|
description: 'The URL segment. Never change it after publishing.',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'publishedAt',
|
||||||
|
type: 'date',
|
||||||
|
required: true,
|
||||||
|
admin: { position: 'sidebar', date: { pickerAppearance: 'dayOnly' } },
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'excerpt',
|
||||||
|
type: 'textarea',
|
||||||
|
required: true,
|
||||||
|
maxLength: 200,
|
||||||
|
admin: {
|
||||||
|
description: 'Shown on the index and used as the meta description.',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{ name: 'heroImage', type: 'upload', relationTo: 'media' },
|
||||||
|
{
|
||||||
|
name: 'content',
|
||||||
|
type: 'richText',
|
||||||
|
required: true,
|
||||||
|
editor: lexicalEditor({
|
||||||
|
features: ({ defaultFeatures }) => [
|
||||||
|
...defaultFeatures,
|
||||||
|
BlocksFeature({ blocks: [Callout] }),
|
||||||
|
],
|
||||||
|
}),
|
||||||
|
},
|
||||||
|
],
|
||||||
|
};
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
import type { CollectionConfig } from 'payload';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The site's only authenticated surface. There is one account and no
|
||||||
|
* registration: `create` is closed to everyone, so the first user is seeded
|
||||||
|
* with `payload create-first-user` and no one can add another through the API.
|
||||||
|
*/
|
||||||
|
export const Users: CollectionConfig = {
|
||||||
|
slug: 'users',
|
||||||
|
auth: {
|
||||||
|
// Slows credential stuffing against a panel that is on the public
|
||||||
|
// internet. Five attempts, then a ten-minute lock.
|
||||||
|
maxLoginAttempts: 5,
|
||||||
|
lockTime: 10 * 60 * 1000,
|
||||||
|
},
|
||||||
|
access: {
|
||||||
|
create: () => false,
|
||||||
|
read: ({ req }) => Boolean(req.user),
|
||||||
|
update: ({ req }) => Boolean(req.user),
|
||||||
|
delete: () => false,
|
||||||
|
},
|
||||||
|
admin: { useAsTitle: 'email' },
|
||||||
|
fields: [
|
||||||
|
{
|
||||||
|
name: 'displayName',
|
||||||
|
type: 'text',
|
||||||
|
required: true,
|
||||||
|
// Rendered as the byline on every post. First name only — the site
|
||||||
|
// publishes no surname and no employer.
|
||||||
|
defaultValue: 'Tudor',
|
||||||
|
},
|
||||||
|
],
|
||||||
|
};
|
||||||
@@ -413,7 +413,17 @@
|
|||||||
/* ── Narrow ───────────────────────────────────────────────────────── */
|
/* ── Narrow ───────────────────────────────────────────────────────── */
|
||||||
|
|
||||||
@media (max-width: 768px) {
|
@media (max-width: 768px) {
|
||||||
.filterBar {
|
/*
|
||||||
|
* Scoped, like the two rules below it.
|
||||||
|
*
|
||||||
|
* The results filter bar is a card — background, border, shadow — and needs
|
||||||
|
* inner padding. The hero's search is not a card: .heroMode zeroes the
|
||||||
|
* padding, border and background so the search sits directly on the panel.
|
||||||
|
* Unscoped, this rule put 14px back, which indented the search box, the hint
|
||||||
|
* and the location link 14px past the headline they sit under, and cost the
|
||||||
|
* search field 28px of width on a 390px screen.
|
||||||
|
*/
|
||||||
|
.filterBar:not(.heroMode) {
|
||||||
padding: 0.875rem;
|
padding: 0.875rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -457,6 +467,14 @@
|
|||||||
align-items: flex-start;
|
align-items: flex-start;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Optical alignment: the button's own 6px of padding is what makes its
|
||||||
|
label start further right than the hint above it, even once both boxes
|
||||||
|
share a left edge. Pulling the padding back off lines the text up while
|
||||||
|
keeping the tap target. */
|
||||||
|
.heroMode .nearMeBtn {
|
||||||
|
margin-left: -0.375rem;
|
||||||
|
}
|
||||||
|
|
||||||
.geoError {
|
.geoError {
|
||||||
text-align: left;
|
text-align: left;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -69,14 +69,28 @@ export function FilterBar({
|
|||||||
const [omniValue, setOmniValue] = useState(initialOmniValue);
|
const [omniValue, setOmniValue] = useState(initialOmniValue);
|
||||||
|
|
||||||
const suggestId = `school-suggest-${isHero ? "hero" : "bar"}`;
|
const suggestId = `school-suggest-${isHero ? "hero" : "bar"}`;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Suggestions answer typing, not the mere presence of a value.
|
||||||
|
*
|
||||||
|
* Without this the results-page bar reopened the dropdown over the results:
|
||||||
|
* after a search the input still holds the term, so on every render the
|
||||||
|
* query was >= 2 characters and the list opened again — on top of the very
|
||||||
|
* results the search had just produced, swallowing the click on the first
|
||||||
|
* one. The E2E gate caught it as "<li role=option> intercepts pointer
|
||||||
|
* events", but a reader would just have found the page unclickable.
|
||||||
|
*/
|
||||||
|
const [hasTyped, setHasTyped] = useState(false);
|
||||||
|
|
||||||
// Suppressed once the value parses as a postcode: the box takes a school
|
// Suppressed once the value parses as a postcode: the box takes a school
|
||||||
// name OR a postcode, and suggesting schools during postcode entry fights
|
// name OR a postcode, and suggesting schools during postcode entry fights
|
||||||
// the user rather than helping them.
|
// the user rather than helping them.
|
||||||
const suggestEnabled = autosuggest && !isValidPostcode(omniValue);
|
const suggestEnabled = autosuggest && hasTyped && !isValidPostcode(omniValue);
|
||||||
const { suggestions, open, activeIndex, setActiveIndex, close } =
|
const { suggestions, open, activeIndex, setActiveIndex, close } =
|
||||||
useSchoolSuggest(omniValue, suggestEnabled);
|
useSchoolSuggest(omniValue, suggestEnabled);
|
||||||
|
|
||||||
const pickSuggestion = (s: Suggestion) => {
|
const pickSuggestion = (s: Suggestion) => {
|
||||||
|
setHasTyped(false);
|
||||||
close();
|
close();
|
||||||
track('search_submitted', {
|
track('search_submitted', {
|
||||||
query: s.school_name.toLowerCase(),
|
query: s.school_name.toLowerCase(),
|
||||||
@@ -169,6 +183,9 @@ export function FilterBar({
|
|||||||
|
|
||||||
const handleSearchSubmit = (e: React.FormEvent) => {
|
const handleSearchSubmit = (e: React.FormEvent) => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
|
// The search has been made; the suggestions that led to it are spent.
|
||||||
|
setHasTyped(false);
|
||||||
|
close();
|
||||||
if (!omniValue.trim()) {
|
if (!omniValue.trim()) {
|
||||||
updateURL({ search: "", postcode: "", radius: "" });
|
updateURL({ search: "", postcode: "", radius: "" });
|
||||||
return;
|
return;
|
||||||
@@ -271,7 +288,7 @@ export function FilterBar({
|
|||||||
ref={inputRef}
|
ref={inputRef}
|
||||||
type="search"
|
type="search"
|
||||||
value={omniValue}
|
value={omniValue}
|
||||||
onChange={(e) => setOmniValue(e.target.value)}
|
onChange={(e) => { setOmniValue(e.target.value); setHasTyped(true); }}
|
||||||
onKeyDown={handleOmniKeyDown}
|
onKeyDown={handleOmniKeyDown}
|
||||||
onBlur={close}
|
onBlur={close}
|
||||||
placeholder="School name or postcode"
|
placeholder="School name or postcode"
|
||||||
|
|||||||
@@ -22,7 +22,8 @@
|
|||||||
|
|
||||||
.content {
|
.content {
|
||||||
display: grid;
|
display: grid;
|
||||||
grid-template-columns: 1.6fr 1fr 1fr;
|
/* Brand column plus three link columns: Product, Resources, About. */
|
||||||
|
grid-template-columns: 1.6fr 1fr 1fr 1fr;
|
||||||
gap: 2rem;
|
gap: 2rem;
|
||||||
margin-bottom: 3rem;
|
margin-bottom: 3rem;
|
||||||
}
|
}
|
||||||
@@ -193,6 +194,14 @@
|
|||||||
color: var(--on-sunken);
|
color: var(--on-sunken);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Four columns crush between the tablet range and the 768px collapse, so
|
||||||
|
pair them up first rather than jumping straight to a single column. */
|
||||||
|
@media (max-width: 960px) {
|
||||||
|
.content {
|
||||||
|
grid-template-columns: 1fr 1fr;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@media (max-width: 768px) {
|
@media (max-width: 768px) {
|
||||||
.container {
|
.container {
|
||||||
padding: 2rem 1rem 1.5rem;
|
padding: 2rem 1rem 1.5rem;
|
||||||
|
|||||||
@@ -93,6 +93,18 @@ export function Footer() {
|
|||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div className={styles.section}>
|
||||||
|
<h4 className={styles.sectionTitle}>About</h4>
|
||||||
|
<ul className={styles.links}>
|
||||||
|
{/* The only route to a named human. Deliberately not in the nav:
|
||||||
|
the mobile bottom bar already carries four items, and both of
|
||||||
|
these are lower intent than any of them. Post bylines link
|
||||||
|
here too, which is where a reader actually asks the question. */}
|
||||||
|
<li><a href="/about" className={styles.link}>Who's behind this</a></li>
|
||||||
|
<li><a href="/blog" className={styles.link}>Blog</a></li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className={styles.bottom}>
|
<div className={styles.bottom}>
|
||||||
|
|||||||
@@ -184,7 +184,7 @@ export default function LeafletMapInner({ schools, center, zoom, referencePoint,
|
|||||||
${phaseLabel}${school.local_authority ? ` · ${escapeHtml(school.local_authority)}` : ''}${distanceStr}
|
${phaseLabel}${school.local_authority ? ` · ${escapeHtml(school.local_authority)}` : ''}${distanceStr}
|
||||||
</div>
|
</div>
|
||||||
${metricHtml}
|
${metricHtml}
|
||||||
<a href="${slug}" style="display:block;text-align:center;padding:6px;background:var(--status-above);color:white;border-radius:5px;text-decoration:none;font-size:12px;font-weight:600;margin-top:8px">View Details →</a>
|
<a href="${slug}" style="display:block;text-align:center;padding:6px;background:var(--status-above);color:var(--text-inverse);border-radius:5px;text-decoration:none;font-size:12px;font-weight:600;margin-top:8px">View Details →</a>
|
||||||
</div>`;
|
</div>`;
|
||||||
|
|
||||||
marker.bindPopup(popupContent);
|
marker.bindPopup(popupContent);
|
||||||
|
|||||||
@@ -0,0 +1,27 @@
|
|||||||
|
/**
|
||||||
|
* Writes the in-app navigation trail that funnel attribution reads.
|
||||||
|
*
|
||||||
|
* Renders nothing. It exists because document.referrer cannot answer "which
|
||||||
|
* page did they come from" in an App Router app: a soft navigation creates no
|
||||||
|
* document, so the browser never updates it. See the trail comment in
|
||||||
|
* lib/analytics.ts.
|
||||||
|
*
|
||||||
|
* Mounted once in the root layout, so every route is recorded — including the
|
||||||
|
* ones that fire no event of their own, which are still somebody else's
|
||||||
|
* previous page.
|
||||||
|
*/
|
||||||
|
'use client';
|
||||||
|
|
||||||
|
import { useEffect } from 'react';
|
||||||
|
import { usePathname } from 'next/navigation';
|
||||||
|
import { recordVisitedPath } from '@/lib/analytics';
|
||||||
|
|
||||||
|
export function RouteTrail() {
|
||||||
|
const pathname = usePathname();
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
recordVisitedPath(pathname);
|
||||||
|
}, [pathname]);
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
@@ -47,7 +47,13 @@
|
|||||||
width: 100%;
|
width: 100%;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
background:
|
background:
|
||||||
linear-gradient(100deg, rgba(255, 255, 255, 0) 40%, rgba(255, 255, 255, .5) 50%, rgba(255, 255, 255, 0) 60%) var(--bg-secondary);
|
/* Sweeps toward the card colour, which is a shade lighter than this
|
||||||
|
ground in both themes. Hardcoded white was a bright flash across a
|
||||||
|
dark page every 1.4s while the tiles loaded. */
|
||||||
|
linear-gradient(100deg,
|
||||||
|
rgba(var(--bg-card-rgb), 0) 40%,
|
||||||
|
rgba(var(--bg-card-rgb), .5) 50%,
|
||||||
|
rgba(var(--bg-card-rgb), 0) 60%) var(--bg-secondary);
|
||||||
background-size: 200% 100%;
|
background-size: 200% 100%;
|
||||||
animation: shimmer 1.4s infinite;
|
animation: shimmer 1.4s infinite;
|
||||||
}
|
}
|
||||||
@@ -76,6 +82,15 @@
|
|||||||
justify-content: center;
|
justify-content: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Controls that float ON the map.
|
||||||
|
*
|
||||||
|
* The map tiles are light in both themes, so these deliberately do NOT follow
|
||||||
|
* the theme — they follow the map. The literal ink below is the point: paired
|
||||||
|
* with a hardcoded white background, `color: var(--text-primary)` resolved to
|
||||||
|
* #E9EEF0 in the dark theme and put near-white text on a near-white button.
|
||||||
|
* A themed token is the wrong tool for a surface that never changes.
|
||||||
|
*/
|
||||||
.openHint {
|
.openHint {
|
||||||
display: inline-flex;
|
display: inline-flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
@@ -85,7 +100,8 @@
|
|||||||
border-radius: 999px;
|
border-radius: 999px;
|
||||||
font-size: 13px;
|
font-size: 13px;
|
||||||
font-weight: 600;
|
font-weight: 600;
|
||||||
color: var(--text-primary);
|
/* See "Controls that float ON the map" above. */
|
||||||
|
color: #1C2731;
|
||||||
background: rgba(255, 255, 255, .85);
|
background: rgba(255, 255, 255, .85);
|
||||||
-webkit-backdrop-filter: blur(6px);
|
-webkit-backdrop-filter: blur(6px);
|
||||||
backdrop-filter: blur(6px);
|
backdrop-filter: blur(6px);
|
||||||
@@ -113,11 +129,18 @@
|
|||||||
on top of the blend. */
|
on top of the blend. */
|
||||||
z-index: 450;
|
z-index: 450;
|
||||||
pointer-events: none;
|
pointer-events: none;
|
||||||
|
/* The card colour, not white.
|
||||||
|
This ramp was hardcoded white and ended at var(--bg-card). In the light
|
||||||
|
theme that is white into white and invisible, as intended. In the dark
|
||||||
|
theme it climbed to 95% WHITE and then met a near-black card — a bright
|
||||||
|
band across the full width, right where the map is supposed to dissolve
|
||||||
|
into the header. Fading to the same colour the gradient lands on is the
|
||||||
|
whole trick, and it only works if that colour is a token. */
|
||||||
background: linear-gradient(to bottom,
|
background: linear-gradient(to bottom,
|
||||||
rgba(255, 255, 255, 0) 0%,
|
rgba(var(--bg-card-rgb), 0) 0%,
|
||||||
rgba(255, 255, 255, .35) 35%,
|
rgba(var(--bg-card-rgb), .35) 35%,
|
||||||
rgba(255, 255, 255, .75) 62%,
|
rgba(var(--bg-card-rgb), .75) 62%,
|
||||||
rgba(255, 255, 255, .95) 82%,
|
rgba(var(--bg-card-rgb), .95) 82%,
|
||||||
var(--bg-card) 100%);
|
var(--bg-card) 100%);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -134,7 +157,8 @@
|
|||||||
border: none;
|
border: none;
|
||||||
border-radius: 8px;
|
border-radius: 8px;
|
||||||
background: rgba(255, 255, 255, .92);
|
background: rgba(255, 255, 255, .92);
|
||||||
color: var(--text-primary);
|
/* See "Controls that float ON the map" above. */
|
||||||
|
color: #1C2731;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
box-shadow: 0 2px 10px rgba(var(--shadow-rgb), .2);
|
box-shadow: 0 2px 10px rgba(var(--shadow-rgb), .2);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,21 @@
|
|||||||
|
.caveat,
|
||||||
|
.note {
|
||||||
|
border-left: 3px solid var(--brand);
|
||||||
|
background: var(--brand-bg);
|
||||||
|
padding: 1rem 1.15rem;
|
||||||
|
margin: 1.75rem 0;
|
||||||
|
border-radius: 0 8px 8px 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.note {
|
||||||
|
border-left-color: var(--border-strong);
|
||||||
|
background: var(--bg-secondary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.body {
|
||||||
|
font-family: var(--font-ui);
|
||||||
|
font-size: 0.95rem;
|
||||||
|
line-height: 1.65;
|
||||||
|
color: var(--text-primary);
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
import styles from './CalloutBlock.module.css';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Renders the Callout block from blocks/Callout.ts. The "caveat" tone is the
|
||||||
|
* one that matters: it is how a post says what a number does not show, in
|
||||||
|
* context, rather than burying it in a closing paragraph.
|
||||||
|
*/
|
||||||
|
export function CalloutBlock({ tone, body }: { tone: string; body: string }) {
|
||||||
|
return (
|
||||||
|
<aside className={tone === 'caveat' ? styles.caveat : styles.note}>
|
||||||
|
<p className={styles.body}>{body}</p>
|
||||||
|
</aside>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -164,6 +164,34 @@
|
|||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Attribute columns. Muted, because they qualify the row rather than compete
|
||||||
|
* with the measure for it, and hugging their content so the school name keeps
|
||||||
|
* the spare width — the same width:1% trick as .num, which is what stops six
|
||||||
|
* columns from splitting evenly and squeezing the names into two lines each.
|
||||||
|
*
|
||||||
|
* .attr never wraps: "4–11" and "Yes" broken across lines read as two values.
|
||||||
|
* .attrWide may — "Church of England" and some constituency names are long
|
||||||
|
* enough that forcing one line would push the measure off a phone screen.
|
||||||
|
*/
|
||||||
|
.table th.attr,
|
||||||
|
.table td.attr,
|
||||||
|
.table th.attrWide,
|
||||||
|
.table td.attrWide {
|
||||||
|
color: var(--text-secondary);
|
||||||
|
width: 1%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.table th.attr,
|
||||||
|
.table td.attr {
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
.table th.attrWide,
|
||||||
|
.table td.attrWide {
|
||||||
|
min-width: 8rem;
|
||||||
|
}
|
||||||
|
|
||||||
/* The measure is spelled out; the tooltip carries the definition. */
|
/* The measure is spelled out; the tooltip carries the definition. */
|
||||||
.metricHead {
|
.metricHead {
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
|
|||||||
@@ -13,8 +13,9 @@ import Link from 'next/link';
|
|||||||
import type { PlaceDetail, PlaceSummary } from '@/lib/places';
|
import type { PlaceDetail, PlaceSummary } from '@/lib/places';
|
||||||
import { placeUrl, authoritySlug } from '@/lib/places';
|
import { placeUrl, authoritySlug } from '@/lib/places';
|
||||||
import type { School } from '@/lib/types';
|
import type { School } from '@/lib/types';
|
||||||
import { schoolUrl } from '@/lib/utils';
|
import { schoolUrl, formatAgeSpan } from '@/lib/utils';
|
||||||
import { absoluteUrl } from '@/lib/site';
|
import { absoluteUrl } from '@/lib/site';
|
||||||
|
import { TrackPlaceView } from './TrackPlaceView';
|
||||||
import styles from './PlaceView.module.css';
|
import styles from './PlaceView.module.css';
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
@@ -63,8 +64,31 @@ function isPhase(school: School, phase: PhaseKey): boolean {
|
|||||||
: p.includes('primary') || p.includes('middle');
|
: p.includes('primary') || p.includes('middle');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* GIAS spells the absence of a faith as "Does not apply", and sometimes
|
||||||
|
* "None" or "Not applicable" — database answers, not English ones. The school
|
||||||
|
* page and the comparison already suppress all three; this is the same rule,
|
||||||
|
* so the two surfaces cannot disagree about the same school.
|
||||||
|
*/
|
||||||
|
const NO_FAITH = /^(none|does not apply|not applicable)$/i;
|
||||||
|
|
||||||
|
/** An attribute the data does not carry. Distinct from the measure's "Not
|
||||||
|
* published": four of those per row would drown the row it qualifies. */
|
||||||
|
const NO_VALUE = '—';
|
||||||
|
|
||||||
|
function faithOf(school: School): string {
|
||||||
|
const denom = school.religious_denomination ?? '';
|
||||||
|
return denom && !NO_FAITH.test(denom) ? denom : NO_VALUE;
|
||||||
|
}
|
||||||
|
|
||||||
function SchoolTable({ schools, phase }: { schools: School[]; phase: PhaseKey }) {
|
function SchoolTable({ schools, phase }: { schools: School[]; phase: PhaseKey }) {
|
||||||
const metric = METRICS[phase];
|
const metric = METRICS[phase];
|
||||||
|
/*
|
||||||
|
* Nursery is a primary question. An all-through school renders in both
|
||||||
|
* groups, and its nursery belongs to the primary reading of it — under
|
||||||
|
* "Secondary schools" the column would be a fact about a different intake.
|
||||||
|
*/
|
||||||
|
const showNursery = phase === 'primary';
|
||||||
return (
|
return (
|
||||||
<div className={styles.tableWrap}>
|
<div className={styles.tableWrap}>
|
||||||
<table className={styles.table}>
|
<table className={styles.table}>
|
||||||
@@ -78,6 +102,13 @@ function SchoolTable({ schools, phase }: { schools: School[]; phase: PhaseKey })
|
|||||||
{metric.heading}
|
{metric.heading}
|
||||||
</abbr>
|
</abbr>
|
||||||
</th>
|
</th>
|
||||||
|
{/* The measure sits second, not last. Six columns overflow a
|
||||||
|
phone and .tableWrap turns that into a swipe; last would put
|
||||||
|
the one number the page exists for off the screen. */}
|
||||||
|
<th scope="col" className={styles.attr}>Ages</th>
|
||||||
|
<th scope="col" className={styles.attrWide}>Religious character</th>
|
||||||
|
{showNursery && <th scope="col" className={styles.attr}>Nursery</th>}
|
||||||
|
<th scope="col" className={styles.attrWide}>Constituency</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
@@ -95,6 +126,19 @@ function SchoolTable({ schools, phase }: { schools: School[]; phase: PhaseKey })
|
|||||||
? <span className={styles.noData}>Not published</span>
|
? <span className={styles.noData}>Not published</span>
|
||||||
: `${Math.round(Number(value))}${metric.unit}`}
|
: `${Math.round(Number(value))}${metric.unit}`}
|
||||||
</td>
|
</td>
|
||||||
|
<td className={styles.attr}>{formatAgeSpan(s.age_range) || NO_VALUE}</td>
|
||||||
|
<td className={styles.attrWide}>{faithOf(s)}</td>
|
||||||
|
{showNursery && (
|
||||||
|
<td className={styles.attr}>
|
||||||
|
{/* Undefined is a mart the pipeline has not rebuilt, and
|
||||||
|
false is a school without one. Neither is a "Yes", and
|
||||||
|
neither is worth two different words. */}
|
||||||
|
{s.nursery_provision ? 'Yes' : NO_VALUE}
|
||||||
|
</td>
|
||||||
|
)}
|
||||||
|
<td className={styles.attrWide}>
|
||||||
|
{s.parliamentary_constituency || NO_VALUE}
|
||||||
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
);
|
);
|
||||||
})}
|
})}
|
||||||
@@ -165,6 +209,11 @@ export function PlaceView({ detail, phase, englandAverage, neighbours }: Props)
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div className={styles.container}>
|
<div className={styles.container}>
|
||||||
|
{/* One line, and all four place families are measured, because they all
|
||||||
|
render through this component. */}
|
||||||
|
<TrackPlaceView kind={place.kind} slug={place.slug}
|
||||||
|
count={place.count} phase={phase} />
|
||||||
|
|
||||||
<script
|
<script
|
||||||
type="application/ld+json"
|
type="application/ld+json"
|
||||||
dangerouslySetInnerHTML={{ __html: JSON.stringify(jsonLd) }}
|
dangerouslySetInnerHTML={{ __html: JSON.stringify(jsonLd) }}
|
||||||
|
|||||||
@@ -0,0 +1,47 @@
|
|||||||
|
'use client';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Fires `place_viewed` once per location page.
|
||||||
|
*
|
||||||
|
* A separate client component because PlaceView is a server component and
|
||||||
|
* cannot call into the browser. It renders nothing — its whole job is the
|
||||||
|
* effect, which keeps the page itself server-rendered.
|
||||||
|
*
|
||||||
|
* Umami already counts a pageview for every one of these URLs, so this is not
|
||||||
|
* about traffic. It is about `kind`: whether to keep investing in the location
|
||||||
|
* layer turns on which *sort* of page earns engagement — towns, authorities,
|
||||||
|
* London localities or postcode districts — and a pageview cannot say, because
|
||||||
|
* all four families share the /schools/ prefix and only the registry knows
|
||||||
|
* which is which.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { useEffect } from 'react';
|
||||||
|
import { track, getNavigationSource } from '@/lib/analytics';
|
||||||
|
|
||||||
|
interface Props {
|
||||||
|
kind: string;
|
||||||
|
slug: string;
|
||||||
|
count: number;
|
||||||
|
phase?: 'primary' | 'secondary';
|
||||||
|
}
|
||||||
|
|
||||||
|
export function TrackPlaceView({ kind, slug, count, phase }: Props) {
|
||||||
|
useEffect(() => {
|
||||||
|
track('place_viewed', {
|
||||||
|
kind,
|
||||||
|
slug,
|
||||||
|
// "all" rather than omitting it, so the unphased page is a value in the
|
||||||
|
// same field rather than a gap that has to be interpreted.
|
||||||
|
phase: phase ?? 'all',
|
||||||
|
school_count: count,
|
||||||
|
// Internal navigation only. An arrival from Google reads as 'direct'
|
||||||
|
// here; Umami's own pageview referrer is where external attribution
|
||||||
|
// lives, and these pages exist to be arrived at externally.
|
||||||
|
from: getNavigationSource(),
|
||||||
|
});
|
||||||
|
// Once per place, not once per render.
|
||||||
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||||
|
}, [kind, slug, phase]);
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
@@ -0,0 +1,38 @@
|
|||||||
|
/**
|
||||||
|
* DestinationsSection — where a school's Year 11 leavers went. Server component.
|
||||||
|
*
|
||||||
|
* The headline is deliberately NOT the sustained-destination rate. That figure
|
||||||
|
* sits between 92% and 97% for nearly every school in England, so leading with
|
||||||
|
* it would say nothing; the mix is what actually varies between schools.
|
||||||
|
*
|
||||||
|
* The section dates its own cohort because destination measures are published
|
||||||
|
* about two GCSE years behind the results in the section above — undated, the
|
||||||
|
* figures read as stale rather than as a different question.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import type { DestinationPhase } from '@/lib/types';
|
||||||
|
import { Section, sectionStyles } from './sectionShared';
|
||||||
|
import { DestinationsView } from './DestinationsView';
|
||||||
|
|
||||||
|
export function DestinationsSection({ destinations }: { destinations: DestinationPhase }) {
|
||||||
|
const all = destinations.groups.all;
|
||||||
|
const hasContent = Object.values(destinations.groups)
|
||||||
|
.some(group => (group?.categories?.length ?? 0) > 0);
|
||||||
|
if (!hasContent) return null;
|
||||||
|
|
||||||
|
const cohort = all?.cohort ?? null;
|
||||||
|
const year = destinations.cohort_year;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Section id="destinations">
|
||||||
|
<h2 className={sectionStyles.sectionTitle}>After Year 11</h2>
|
||||||
|
<p className={sectionStyles.sectionSubtitle}>
|
||||||
|
Where {cohort ? `the ${cohort} pupils` : 'the pupils'} who left Year 11
|
||||||
|
{year ? ` in ${year}` : ''} were during the following year. The Department
|
||||||
|
for Education tracks leavers for two terms, so these figures cover an
|
||||||
|
earlier year group than the GCSE results above.
|
||||||
|
</p>
|
||||||
|
<DestinationsView destinations={destinations} phase="ks4" />
|
||||||
|
</Section>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,261 @@
|
|||||||
|
'use client';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* DestinationsView — the interactive body of both destination sections.
|
||||||
|
*
|
||||||
|
* Three question cards over one bar, with the cards acting as a lens on the
|
||||||
|
* bar rather than a summary beside it: focusing a card dims everything the
|
||||||
|
* card is not made of, so the grouping we chose is inspectable rather than
|
||||||
|
* asserted.
|
||||||
|
*
|
||||||
|
* Everything here defers to lib/destinations.ts for what may be shown. In
|
||||||
|
* particular the bar is rendered only when canRenderBar() allows it: the
|
||||||
|
* destination categories sum to the cohort, so a bar drawn from the published
|
||||||
|
* segments leaves a gap whose width IS the withheld figure.
|
||||||
|
*
|
||||||
|
* The one client component in this directory besides AdmissionsViewToggle.
|
||||||
|
* The all-pupils view is what the server renders into the HTML; the switch and
|
||||||
|
* the hover linkage are the only parts that need the browser.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { useState } from 'react';
|
||||||
|
import type { DestinationPhase, DestinationGroupPayload } from '@/lib/types';
|
||||||
|
import {
|
||||||
|
CARD_GROUPS, CARD_QUESTIONS, CATEGORY_LABELS, CATEGORY_ORDER,
|
||||||
|
aggregateCells, canRenderBar, toBarSegments, cardGroupFor,
|
||||||
|
type CardGroup, type DestinationCell, type DestinationGroup, type PupilGroup,
|
||||||
|
} from '@/lib/destinations';
|
||||||
|
import styles from './destinations.module.css';
|
||||||
|
|
||||||
|
const GROUP_LABELS: Record<PupilGroup, string> = {
|
||||||
|
all: 'All pupils',
|
||||||
|
disadvantaged: 'Disadvantaged',
|
||||||
|
other: 'All other pupils',
|
||||||
|
};
|
||||||
|
|
||||||
|
const GROUP_ORDER: PupilGroup[] = ['all', 'disadvantaged', 'other'];
|
||||||
|
|
||||||
|
function toGroup(payload: DestinationGroupPayload): DestinationGroup {
|
||||||
|
return {
|
||||||
|
cohort: payload.cohort ?? 0,
|
||||||
|
cells: payload.categories,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function cellsFor(group: DestinationGroup, card: CardGroup): DestinationCell[] {
|
||||||
|
const wanted = new Set(CARD_GROUPS[card]);
|
||||||
|
return group.cells.filter(c => wanted.has(c.category));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* One cell of the detail table.
|
||||||
|
*
|
||||||
|
* The three statuses are three different statements and the table has to keep
|
||||||
|
* them apart, because the whole pipeline does — the mart, the SQLAlchemy model
|
||||||
|
* and the serialiser all preserve the difference deliberately:
|
||||||
|
*
|
||||||
|
* published the figure
|
||||||
|
* suppressed DfE withheld it to protect a small number of pupils
|
||||||
|
* not_applicable this destination does not apply to this school at all
|
||||||
|
*
|
||||||
|
* An earlier version keyed the share column off `percentage === null`, which is
|
||||||
|
* also true for not_applicable, so a category that simply does not apply was
|
||||||
|
* labelled "withheld" — while the pupils column beside it rendered blank. Both
|
||||||
|
* columns now derive from `status`, so they cannot disagree.
|
||||||
|
*/
|
||||||
|
function cellValue(
|
||||||
|
cell: DestinationCell, cohort: number, kind: 'pupils' | 'share',
|
||||||
|
) {
|
||||||
|
if (cell.status === 'suppressed') {
|
||||||
|
return <span className={styles.withheldMark}>withheld</span>;
|
||||||
|
}
|
||||||
|
const notApplicable = (
|
||||||
|
<span className={styles.notApplicable} title="Does not apply to this school">
|
||||||
|
—
|
||||||
|
</span>
|
||||||
|
);
|
||||||
|
|
||||||
|
if (cell.status !== 'published' || cell.pupils === null) return notApplicable;
|
||||||
|
if (kind === 'pupils') return cell.pupils;
|
||||||
|
|
||||||
|
// Percentages come from the mart, but a published count with no published
|
||||||
|
// percentage is recoverable from the cohort — both halves are published, so
|
||||||
|
// nothing withheld is involved. Same derivation the bar widths use.
|
||||||
|
const share = cell.percentage ?? (cohort > 0 ? (cell.pupils / cohort) * 100 : null);
|
||||||
|
return share === null ? notApplicable : `${Math.round(share)}%`;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function DestinationsView({
|
||||||
|
destinations, phase,
|
||||||
|
}: { destinations: DestinationPhase; phase: 'ks4' | 'ks5' }) {
|
||||||
|
const available = GROUP_ORDER.filter(
|
||||||
|
g => (destinations.groups[g]?.categories?.length ?? 0) > 0,
|
||||||
|
);
|
||||||
|
const [selected, setSelected] = useState<PupilGroup>(available[0] ?? 'all');
|
||||||
|
const [focused, setFocused] = useState<CardGroup | null>(null);
|
||||||
|
|
||||||
|
const payload = destinations.groups[selected];
|
||||||
|
if (!payload) return null;
|
||||||
|
const group = toGroup(payload);
|
||||||
|
|
||||||
|
const barDrawable = canRenderBar(group);
|
||||||
|
const segments = barDrawable ? toBarSegments(group) : [];
|
||||||
|
const withheld = group.cells.filter(c => c.status === 'suppressed');
|
||||||
|
|
||||||
|
const dimmed = (card: CardGroup | null) => focused !== null && focused !== card;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className={styles.view}>
|
||||||
|
{available.length > 1 && (
|
||||||
|
<div className={styles.switchRow}>
|
||||||
|
<span className={styles.switchLabel} id={`${phase}-cohort-label`}>Show</span>
|
||||||
|
<div
|
||||||
|
className={styles.switchButtons}
|
||||||
|
role="radiogroup"
|
||||||
|
aria-labelledby={`${phase}-cohort-label`}
|
||||||
|
>
|
||||||
|
{available.map(g => (
|
||||||
|
<button
|
||||||
|
key={g}
|
||||||
|
type="button"
|
||||||
|
role="radio"
|
||||||
|
aria-checked={selected === g}
|
||||||
|
className={styles.switchButton}
|
||||||
|
onClick={() => { setSelected(g); setFocused(null); }}
|
||||||
|
>
|
||||||
|
{GROUP_LABELS[g]}
|
||||||
|
<span className={styles.switchCount}>
|
||||||
|
{destinations.groups[g]?.cohort ?? ''}
|
||||||
|
</span>
|
||||||
|
</button>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
<div className={styles.cards}>
|
||||||
|
{(Object.keys(CARD_GROUPS) as CardGroup[]).map(card => {
|
||||||
|
const cells = cellsFor(group, card);
|
||||||
|
if (cells.length === 0) return null;
|
||||||
|
const total = aggregateCells(cells, group.cohort);
|
||||||
|
const { question, hint } = CARD_QUESTIONS[card];
|
||||||
|
const keys = cells.map(c => (
|
||||||
|
<span key={c.category} className={`${styles.swatch} ${styles[c.category]}`} />
|
||||||
|
));
|
||||||
|
|
||||||
|
if (total === null) {
|
||||||
|
return (
|
||||||
|
<div key={card} className={`${styles.card} ${styles.cardWithheld}`}>
|
||||||
|
<span className={styles.cardQuestion}>{question}</span>
|
||||||
|
<span className={styles.cardWithheldValue}>Not published</span>
|
||||||
|
<span className={styles.cardHint}>
|
||||||
|
Too few pupils went to {hint} for the Department for Education
|
||||||
|
to release a figure.
|
||||||
|
</span>
|
||||||
|
<span className={styles.cardKeys}>{keys}</span>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<button
|
||||||
|
key={card}
|
||||||
|
type="button"
|
||||||
|
className={`${styles.card} ${dimmed(card) ? styles.dim : ''}`}
|
||||||
|
data-group={card}
|
||||||
|
onMouseEnter={() => setFocused(card)}
|
||||||
|
onMouseLeave={() => setFocused(null)}
|
||||||
|
onFocus={() => setFocused(card)}
|
||||||
|
onBlur={() => setFocused(null)}
|
||||||
|
>
|
||||||
|
<span className={styles.cardQuestion}>{question}</span>
|
||||||
|
<span className={styles.cardValue}>{Math.round(total.percentage)}%</span>
|
||||||
|
<span className={styles.cardHint}>went to {hint}.</span>
|
||||||
|
<span className={styles.cardKeys}>{keys}</span>
|
||||||
|
</button>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{barDrawable ? (
|
||||||
|
<div className={styles.barBlock}>
|
||||||
|
<div className={styles.bar}>
|
||||||
|
{segments.map(seg => {
|
||||||
|
const card = cardGroupFor(seg.category);
|
||||||
|
return (
|
||||||
|
<div
|
||||||
|
key={seg.category}
|
||||||
|
data-destination-segment={seg.category}
|
||||||
|
data-group={card ?? 'none'}
|
||||||
|
className={`${styles.segment} ${styles[seg.category]} ${dimmed(card) ? styles.dim : ''}`}
|
||||||
|
style={{ width: `${seg.widthPct}%` }}
|
||||||
|
title={`${CATEGORY_LABELS[seg.category]} — ${seg.labelPct}% (${seg.pupils} pupils)`}
|
||||||
|
>
|
||||||
|
{seg.widthPct >= 9 ? `${seg.labelPct}%` : ''}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</div>
|
||||||
|
<div className={styles.barScale}>
|
||||||
|
<span>0%</span><span>25%</span><span>50%</span><span>75%</span><span>100%</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
) : (
|
||||||
|
<div className={styles.withheldPanel}>
|
||||||
|
<strong className={styles.withheldTitle}>
|
||||||
|
No breakdown chart for this group
|
||||||
|
</strong>
|
||||||
|
<p className={styles.withheldBody}>
|
||||||
|
{withheld.length === 1
|
||||||
|
? 'One of the destinations is withheld'
|
||||||
|
: `${withheld.length} of the destinations are withheld`}
|
||||||
|
{' '}because too few pupils went there. These destinations add up to
|
||||||
|
the whole year group, so drawing the rest as a chart would give the
|
||||||
|
withheld figures away. The table below shows what was published,
|
||||||
|
and nothing more.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
<div className={styles.tableWrap}>
|
||||||
|
<table className={styles.table}>
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th scope="col">Destination</th>
|
||||||
|
<th scope="col">Pupils</th>
|
||||||
|
<th scope="col">Share</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
{CATEGORY_ORDER.flatMap(category => {
|
||||||
|
const cell = group.cells.find(c => c.category === category);
|
||||||
|
if (!cell) return [];
|
||||||
|
const card = cardGroupFor(category);
|
||||||
|
return [(
|
||||||
|
<tr
|
||||||
|
key={category}
|
||||||
|
data-group={card ?? 'none'}
|
||||||
|
data-status={cell.status}
|
||||||
|
className={dimmed(card) ? styles.dim : ''}
|
||||||
|
>
|
||||||
|
<th scope="row" className={styles.rowName}>
|
||||||
|
<span className={`${styles.swatch} ${styles[category]}`} />
|
||||||
|
{CATEGORY_LABELS[category]}
|
||||||
|
</th>
|
||||||
|
<td>{cellValue(cell, group.cohort, 'pupils')}</td>
|
||||||
|
<td>{cellValue(cell, group.cohort, 'share')}</td>
|
||||||
|
</tr>
|
||||||
|
)];
|
||||||
|
})}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<p className={styles.footnote}>
|
||||||
|
Shares are rounded and may not add up to 100%. A pupil counted under a
|
||||||
|
school sixth form may have moved to a different school's sixth
|
||||||
|
form — the published data records the type of place, not which one.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -24,7 +24,7 @@ export function DistanceSection({
|
|||||||
admissionDistance,
|
admissionDistance,
|
||||||
schoolInfo,
|
schoolInfo,
|
||||||
}: {
|
}: {
|
||||||
admissionDistance: SchoolAdmissionDistance | null;
|
admissionDistance: SchoolAdmissionDistance | null | undefined;
|
||||||
schoolInfo: School;
|
schoolInfo: School;
|
||||||
}) {
|
}) {
|
||||||
// Without a figure there is nothing to compare against, and without
|
// Without a figure there is nothing to compare against, and without
|
||||||
|
|||||||
@@ -0,0 +1,40 @@
|
|||||||
|
/**
|
||||||
|
* Post16DestinationsSection — where a school's Year 13 leavers went.
|
||||||
|
* Server component.
|
||||||
|
*
|
||||||
|
* A separate publication, a separate cohort and a separate question from
|
||||||
|
* After Year 11, so it is a separate section rather than a tab: a parent
|
||||||
|
* choosing a secondary and a student choosing a sixth form are not the same
|
||||||
|
* reader.
|
||||||
|
*
|
||||||
|
* Not rendered at all for a school without post-16 provision. A "no data"
|
||||||
|
* placeholder there would imply something is missing, when the truthful
|
||||||
|
* statement is that the question does not apply — which is why the old
|
||||||
|
* "Post-16 destination data coming soon" note is gone rather than reworded.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import type { DestinationPhase } from '@/lib/types';
|
||||||
|
import { Section, sectionStyles } from './sectionShared';
|
||||||
|
import { DestinationsView } from './DestinationsView';
|
||||||
|
|
||||||
|
export function Post16DestinationsSection({
|
||||||
|
destinations,
|
||||||
|
}: { destinations: DestinationPhase }) {
|
||||||
|
const hasContent = Object.values(destinations.groups)
|
||||||
|
.some(group => (group?.categories?.length ?? 0) > 0);
|
||||||
|
if (!hasContent) return null;
|
||||||
|
|
||||||
|
const cohort = destinations.groups.all?.cohort ?? null;
|
||||||
|
const year = destinations.cohort_year;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Section id="post16-destinations">
|
||||||
|
<h2 className={sectionStyles.sectionTitle}>After the sixth form</h2>
|
||||||
|
<p className={sectionStyles.sectionSubtitle}>
|
||||||
|
Where {cohort ? `the ${cohort} students` : 'the students'} who finished
|
||||||
|
Year 13{year ? ` in ${year}` : ''} went next.
|
||||||
|
</p>
|
||||||
|
<DestinationsView destinations={destinations} phase="ks5" />
|
||||||
|
</Section>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -15,17 +15,22 @@ import {
|
|||||||
} from './lastDistanceOffered';
|
} from './lastDistanceOffered';
|
||||||
|
|
||||||
export function SecondaryAdmissionsSection({
|
export function SecondaryAdmissionsSection({
|
||||||
admissions, admissionsHistory, admissionDistance, schoolInfo, hasSixthForm,
|
admissions, admissionsHistory, admissionDistance, schoolInfo,
|
||||||
}: {
|
}: {
|
||||||
/* Nullable for the same reason as the primary section: a school can have a
|
/* Nullable for the same reason as the primary section: a school can have a
|
||||||
published cut-off and no EES admissions row. */
|
published cut-off and no EES admissions row. */
|
||||||
admissions: SchoolAdmissions | null;
|
admissions: SchoolAdmissions | null;
|
||||||
admissionsHistory: SchoolAdmissions[];
|
admissionsHistory: SchoolAdmissions[];
|
||||||
admissionDistance: SchoolAdmissionDistance | null;
|
admissionDistance: SchoolAdmissionDistance | null | undefined;
|
||||||
schoolInfo: School;
|
schoolInfo: School;
|
||||||
hasSixthForm: boolean;
|
|
||||||
}) {
|
}) {
|
||||||
const cutoff = describeCutoff(admissionDistance);
|
const cutoff = describeCutoff(admissionDistance);
|
||||||
|
/* Absent means cut-offs are not being published at all; null means this
|
||||||
|
school has no published cut-off. Only the second is a fact about the
|
||||||
|
school, and only the second can be stated. Saying "X has not published a
|
||||||
|
cut-off" while the feature is dark describes us, and is false wherever the
|
||||||
|
authority does publish one. */
|
||||||
|
const featureOn = admissionDistance !== undefined;
|
||||||
// Moved with this section from SecondarySchoolDetailView, its only consumer.
|
// Moved with this section from SecondarySchoolDetailView, its only consumer.
|
||||||
const admissionsTag = (() => {
|
const admissionsTag = (() => {
|
||||||
const policy = schoolInfo.admissions_policy?.toLowerCase() ?? '';
|
const policy = schoolInfo.admissions_policy?.toLowerCase() ?? '';
|
||||||
@@ -102,7 +107,7 @@ export function SecondaryAdmissionsSection({
|
|||||||
{CUTOFF_NOTE} {CUTOFF_MEASUREMENT_NOTE}
|
{CUTOFF_NOTE} {CUTOFF_MEASUREMENT_NOTE}
|
||||||
{cutoff.routeNote && <> {cutoff.routeNote}</>}
|
{cutoff.routeNote && <> {cutoff.routeNote}</>}
|
||||||
</p>
|
</p>
|
||||||
) : (
|
) : featureOn ? (
|
||||||
<p className={styles.sectionSubtitle} style={{ marginTop: '1rem' }}>
|
<p className={styles.sectionSubtitle} style={{ marginTop: '1rem' }}>
|
||||||
{describeCutoffAbsence({
|
{describeCutoffAbsence({
|
||||||
localAuthority: schoolInfo.local_authority,
|
localAuthority: schoolInfo.local_authority,
|
||||||
@@ -110,13 +115,8 @@ export function SecondaryAdmissionsSection({
|
|||||||
admissionsHistory,
|
admissionsHistory,
|
||||||
})}
|
})}
|
||||||
</p>
|
</p>
|
||||||
)}
|
) : null}
|
||||||
|
|
||||||
{hasSixthForm && (
|
|
||||||
<div className={styles.sixthFormNote}>
|
|
||||||
This school has a sixth form (Post-16 provision). Post-16 destination data coming soon.
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</section>
|
</section>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -14,11 +14,14 @@
|
|||||||
import type {
|
import type {
|
||||||
School, SchoolResult, AbsenceData, OfstedInspection, SchoolCensus,
|
School, SchoolResult, AbsenceData, OfstedInspection, SchoolCensus,
|
||||||
SchoolAdmissions, SchoolAdmissionDistance, SchoolDeprivation, SchoolFinance, NationalAverages,
|
SchoolAdmissions, SchoolAdmissionDistance, SchoolDeprivation, SchoolFinance, NationalAverages,
|
||||||
|
SchoolDestinations,
|
||||||
} from '@/lib/types';
|
} from '@/lib/types';
|
||||||
import { ofstedLegacyAreas } from '@/lib/utils';
|
import { ofstedLegacyAreas } from '@/lib/utils';
|
||||||
import type { SecondaryFlags } from '@/lib/schoolSections';
|
import type { SecondaryFlags } from '@/lib/schoolSections';
|
||||||
import { OfstedSection } from './OfstedSection';
|
import { OfstedSection } from './OfstedSection';
|
||||||
import { GcseSection } from './GcseSection';
|
import { GcseSection } from './GcseSection';
|
||||||
|
import { DestinationsSection } from './DestinationsSection';
|
||||||
|
import { Post16DestinationsSection } from './Post16DestinationsSection';
|
||||||
import { SecondaryAdmissionsSection } from './SecondaryAdmissionsSection';
|
import { SecondaryAdmissionsSection } from './SecondaryAdmissionsSection';
|
||||||
import { DistanceSection } from './DistanceSection';
|
import { DistanceSection } from './DistanceSection';
|
||||||
import { SecondaryHistorySection } from './SecondaryHistorySection';
|
import { SecondaryHistorySection } from './SecondaryHistorySection';
|
||||||
@@ -36,17 +39,21 @@ export interface SecondarySchoolSectionsProps {
|
|||||||
/** Needed to tell a year with no published cut-off apart from a year the
|
/** Needed to tell a year with no published cut-off apart from a year the
|
||||||
* school simply was not oversubscribed. */
|
* school simply was not oversubscribed. */
|
||||||
admissionsHistory: SchoolAdmissions[];
|
admissionsHistory: SchoolAdmissions[];
|
||||||
admissionDistance: SchoolAdmissionDistance | null;
|
/** Absent — not null — while the admission_distance flag is off. The two
|
||||||
|
* mean different things to the reader and must stay distinguishable:
|
||||||
|
* see SecondaryAdmissionsSection, which words the absence. */
|
||||||
|
admissionDistance: SchoolAdmissionDistance | null | undefined;
|
||||||
deprivation: SchoolDeprivation | null;
|
deprivation: SchoolDeprivation | null;
|
||||||
finance: SchoolFinance | null;
|
finance: SchoolFinance | null;
|
||||||
nationalAvg: NationalAverages | null;
|
nationalAvg: NationalAverages | null;
|
||||||
|
destinations: SchoolDestinations | null;
|
||||||
flags: SecondaryFlags;
|
flags: SecondaryFlags;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function SecondarySchoolSections({
|
export function SecondarySchoolSections({
|
||||||
schoolInfo, yearlyData, ofsted, census,
|
schoolInfo, yearlyData, ofsted, census,
|
||||||
admissions, admissionsHistory, admissionDistance,
|
admissions, admissionsHistory, admissionDistance,
|
||||||
deprivation, finance, nationalAvg, flags,
|
deprivation, finance, nationalAvg, destinations, flags,
|
||||||
}: SecondarySchoolSectionsProps) {
|
}: SecondarySchoolSectionsProps) {
|
||||||
const secondaryAvg = nationalAvg?.secondary ?? {};
|
const secondaryAvg = nationalAvg?.secondary ?? {};
|
||||||
|
|
||||||
@@ -85,6 +92,18 @@ export function SecondarySchoolSections({
|
|||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
{/* Destinations follow attainment: they answer "and then what happened",
|
||||||
|
which only lands once the results are in view. */}
|
||||||
|
{flags.hasKs4Destinations && destinations?.ks4 && (
|
||||||
|
<DestinationsSection destinations={destinations.ks4} />
|
||||||
|
)}
|
||||||
|
|
||||||
|
{/* Sixth-form schools only. Absent, not placeheld, for a school with no
|
||||||
|
post-16 provision — the question simply does not apply there. */}
|
||||||
|
{flags.hasKs5Destinations && destinations?.ks5 && (
|
||||||
|
<Post16DestinationsSection destinations={destinations.ks5} />
|
||||||
|
)}
|
||||||
|
|
||||||
{/* See PrimarySchoolSections: distance and EES admissions are independent
|
{/* See PrimarySchoolSections: distance and EES admissions are independent
|
||||||
sources, so either one warrants the section. */}
|
sources, so either one warrants the section. */}
|
||||||
{(admissions || admissionDistance) && (
|
{(admissions || admissionDistance) && (
|
||||||
@@ -93,7 +112,6 @@ export function SecondarySchoolSections({
|
|||||||
admissionDistance={admissionDistance}
|
admissionDistance={admissionDistance}
|
||||||
admissionsHistory={admissionsHistory}
|
admissionsHistory={admissionsHistory}
|
||||||
schoolInfo={schoolInfo}
|
schoolInfo={schoolInfo}
|
||||||
hasSixthForm={flags.hasSixthForm}
|
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,307 @@
|
|||||||
|
/*
|
||||||
|
* Destination sections.
|
||||||
|
*
|
||||||
|
* Every colour comes from the --dest-* tokens in globals.css, which are
|
||||||
|
* defined in both themes. Nothing here is a literal colour — see
|
||||||
|
* __tests__/components/darkThemeSafety.test.ts for why.
|
||||||
|
*/
|
||||||
|
|
||||||
|
.view {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 1.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ── Cohort switch ─────────────────────────────────────────────────────── */
|
||||||
|
|
||||||
|
.switchRow {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 0.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.switchLabel {
|
||||||
|
font-size: var(--step--2);
|
||||||
|
font-weight: 600;
|
||||||
|
letter-spacing: 0.06em;
|
||||||
|
text-transform: uppercase;
|
||||||
|
color: var(--text-muted);
|
||||||
|
}
|
||||||
|
|
||||||
|
.switchButtons {
|
||||||
|
display: inline-flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
gap: 2px;
|
||||||
|
padding: 2px;
|
||||||
|
background: var(--bg-secondary);
|
||||||
|
border-radius: var(--radius-md);
|
||||||
|
align-self: flex-start;
|
||||||
|
}
|
||||||
|
|
||||||
|
.switchButton {
|
||||||
|
appearance: none;
|
||||||
|
border: none;
|
||||||
|
background: transparent;
|
||||||
|
font: inherit;
|
||||||
|
font-size: var(--step--1);
|
||||||
|
font-weight: 600;
|
||||||
|
color: var(--text-secondary);
|
||||||
|
padding: 0.5rem 0.9rem;
|
||||||
|
border-radius: calc(var(--radius-md) - 2px);
|
||||||
|
cursor: pointer;
|
||||||
|
white-space: nowrap;
|
||||||
|
transition: background var(--transition), color var(--transition);
|
||||||
|
}
|
||||||
|
|
||||||
|
.switchButton:hover { color: var(--text-primary); }
|
||||||
|
.switchButton:focus-visible { outline: 2px solid var(--brand); outline-offset: 1px; }
|
||||||
|
|
||||||
|
.switchButton[aria-checked='true'] {
|
||||||
|
background: var(--bg-card);
|
||||||
|
color: var(--text-primary);
|
||||||
|
box-shadow: var(--shadow-soft);
|
||||||
|
}
|
||||||
|
|
||||||
|
.switchCount {
|
||||||
|
margin-left: 0.4rem;
|
||||||
|
font-weight: 500;
|
||||||
|
color: var(--text-muted);
|
||||||
|
font-variant-numeric: tabular-nums;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ── Question cards ────────────────────────────────────────────────────── */
|
||||||
|
|
||||||
|
.cards {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: repeat(auto-fit, minmax(14rem, 1fr));
|
||||||
|
gap: 0.75rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.card {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 0.35rem;
|
||||||
|
text-align: left;
|
||||||
|
font: inherit;
|
||||||
|
background: var(--brand-bg);
|
||||||
|
border: 1px solid transparent;
|
||||||
|
border-radius: var(--radius-md);
|
||||||
|
padding: 1.15rem 1.25rem;
|
||||||
|
cursor: pointer;
|
||||||
|
transition: border-color var(--transition), opacity var(--transition);
|
||||||
|
}
|
||||||
|
|
||||||
|
.card:hover { border-color: var(--brand); }
|
||||||
|
.card:focus-visible { outline: 2px solid var(--brand); outline-offset: 2px; }
|
||||||
|
|
||||||
|
.cardWithheld {
|
||||||
|
background: var(--bg-secondary);
|
||||||
|
border-style: dashed;
|
||||||
|
border-color: var(--border-strong);
|
||||||
|
cursor: default;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cardQuestion {
|
||||||
|
font-family: var(--font-display);
|
||||||
|
font-size: var(--step--1);
|
||||||
|
font-weight: 700;
|
||||||
|
color: var(--text-primary);
|
||||||
|
text-wrap: balance;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cardValue {
|
||||||
|
font-family: var(--font-display);
|
||||||
|
font-size: var(--step-3);
|
||||||
|
font-weight: 800;
|
||||||
|
line-height: 1.05;
|
||||||
|
letter-spacing: -0.02em;
|
||||||
|
font-variant-numeric: tabular-nums;
|
||||||
|
color: var(--text-primary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.cardWithheldValue {
|
||||||
|
font-family: var(--font-display);
|
||||||
|
font-size: var(--step-1);
|
||||||
|
font-weight: 700;
|
||||||
|
color: var(--text-muted);
|
||||||
|
}
|
||||||
|
|
||||||
|
.cardHint {
|
||||||
|
font-size: var(--step--2);
|
||||||
|
color: var(--text-secondary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.cardKeys {
|
||||||
|
display: flex;
|
||||||
|
gap: 0.3rem;
|
||||||
|
margin-top: 0.2rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cardKeys .swatch {
|
||||||
|
width: 1.5rem;
|
||||||
|
height: 0.35rem;
|
||||||
|
border-radius: 2px;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ── Bar ───────────────────────────────────────────────────────────────── */
|
||||||
|
|
||||||
|
.barBlock {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 0.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* 2px surface gaps between segments so adjacent fills stay distinguishable
|
||||||
|
without a border darkening the palette. */
|
||||||
|
.bar {
|
||||||
|
display: flex;
|
||||||
|
gap: 2px;
|
||||||
|
height: 3rem;
|
||||||
|
border-radius: var(--radius-sm);
|
||||||
|
overflow: hidden;
|
||||||
|
background: var(--bg-card);
|
||||||
|
}
|
||||||
|
|
||||||
|
.segment {
|
||||||
|
display: grid;
|
||||||
|
place-items: center;
|
||||||
|
min-width: 2px;
|
||||||
|
overflow: hidden;
|
||||||
|
color: var(--text-inverse);
|
||||||
|
font-size: var(--step--2);
|
||||||
|
font-weight: 700;
|
||||||
|
font-variant-numeric: tabular-nums;
|
||||||
|
transition: opacity var(--transition);
|
||||||
|
}
|
||||||
|
|
||||||
|
.barScale {
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
|
font-size: var(--step--2);
|
||||||
|
color: var(--text-muted);
|
||||||
|
font-variant-numeric: tabular-nums;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ── Category colours ──────────────────────────────────────────────────── */
|
||||||
|
|
||||||
|
.higher_education,
|
||||||
|
.school_sixth_form { background: var(--dest-sixthform); }
|
||||||
|
.sixth_form_college { background: var(--dest-sfcollege); }
|
||||||
|
.further_education,
|
||||||
|
.other_education { background: var(--dest-fecollege); color: var(--text-primary); }
|
||||||
|
.apprenticeship { background: var(--dest-apprentice); }
|
||||||
|
.employment { background: var(--dest-employment); }
|
||||||
|
|
||||||
|
/* The absence is hatched neutral, never a colour: "activity not captured"
|
||||||
|
covers independent schools, moving abroad and training the department holds
|
||||||
|
no data on, so a red segment would state something false. The hatch is also
|
||||||
|
the secondary encoding that separates it from the employment blue. */
|
||||||
|
.not_sustained,
|
||||||
|
.not_captured {
|
||||||
|
background-color: var(--bg-card);
|
||||||
|
background-image: repeating-linear-gradient(
|
||||||
|
45deg,
|
||||||
|
var(--dest-none-hatch) 0 3px,
|
||||||
|
transparent 3px 7px
|
||||||
|
);
|
||||||
|
box-shadow: inset 0 0 0 1px var(--dest-none);
|
||||||
|
color: var(--text-secondary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.swatch {
|
||||||
|
display: inline-block;
|
||||||
|
width: 0.9rem;
|
||||||
|
height: 0.9rem;
|
||||||
|
border-radius: 3px;
|
||||||
|
flex: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ── Dimming, for the card-to-bar linkage ──────────────────────────────── */
|
||||||
|
|
||||||
|
.dim { opacity: 0.3; }
|
||||||
|
|
||||||
|
/* ── Withheld panel ────────────────────────────────────────────────────── */
|
||||||
|
|
||||||
|
.withheldPanel {
|
||||||
|
background: var(--bg-secondary);
|
||||||
|
border-radius: var(--radius-md);
|
||||||
|
padding: 1.15rem 1.25rem;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 0.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.withheldTitle {
|
||||||
|
font-family: var(--font-display);
|
||||||
|
font-size: var(--step--1);
|
||||||
|
font-weight: 700;
|
||||||
|
color: var(--text-primary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.withheldBody {
|
||||||
|
margin: 0;
|
||||||
|
font-size: var(--step--1);
|
||||||
|
color: var(--text-secondary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.withheldMark {
|
||||||
|
display: inline-block;
|
||||||
|
font-size: var(--step--2);
|
||||||
|
font-weight: 700;
|
||||||
|
color: var(--text-muted);
|
||||||
|
background: var(--bg-secondary);
|
||||||
|
border: 1px dashed var(--border-strong);
|
||||||
|
border-radius: 999px;
|
||||||
|
padding: 0.1rem 0.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ── Table ─────────────────────────────────────────────────────────────── */
|
||||||
|
|
||||||
|
.tableWrap { overflow-x: auto; }
|
||||||
|
|
||||||
|
.table {
|
||||||
|
width: 100%;
|
||||||
|
border-collapse: collapse;
|
||||||
|
font-size: var(--step--1);
|
||||||
|
}
|
||||||
|
|
||||||
|
.table th,
|
||||||
|
.table td {
|
||||||
|
padding: 0.55rem 0;
|
||||||
|
border-bottom: 1px solid var(--border);
|
||||||
|
text-align: right;
|
||||||
|
font-variant-numeric: tabular-nums;
|
||||||
|
}
|
||||||
|
|
||||||
|
.table thead th {
|
||||||
|
font-size: var(--step--2);
|
||||||
|
font-weight: 600;
|
||||||
|
letter-spacing: 0.05em;
|
||||||
|
text-transform: uppercase;
|
||||||
|
color: var(--text-muted);
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
.table th:first-child { text-align: left; }
|
||||||
|
|
||||||
|
.rowName {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 0.6rem;
|
||||||
|
font-weight: 500;
|
||||||
|
color: var(--text-primary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.footnote {
|
||||||
|
margin: 0;
|
||||||
|
font-size: var(--step--2);
|
||||||
|
color: var(--text-muted);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* A destination that does not apply to this school. Deliberately not the
|
||||||
|
withheld badge: "we are not told" and "there is nothing to tell" are
|
||||||
|
different statements, and the rest of the pipeline keeps them apart. */
|
||||||
|
.notApplicable {
|
||||||
|
color: var(--text-muted);
|
||||||
|
cursor: help;
|
||||||
|
}
|
||||||
@@ -1883,15 +1883,7 @@
|
|||||||
color: var(--phase-secondary-text);
|
color: var(--phase-secondary-text);
|
||||||
border: 1px solid rgba(var(--status-above-rgb), 0.2);
|
border: 1px solid rgba(var(--status-above-rgb), 0.2);
|
||||||
}
|
}
|
||||||
.sixthFormNote {
|
|
||||||
margin-top: 1rem;
|
|
||||||
padding: 0.625rem 0.875rem;
|
|
||||||
background: var(--bg-secondary);
|
|
||||||
border-radius: 6px;
|
|
||||||
font-size: 0.825rem;
|
|
||||||
color: var(--text-secondary);
|
|
||||||
border-left: 3px solid var(--brand);
|
|
||||||
}
|
|
||||||
.genderSplitHint {
|
.genderSplitHint {
|
||||||
font-size: 0.7rem;
|
font-size: 0.7rem;
|
||||||
color: var(--text-muted);
|
color: var(--text-muted);
|
||||||
@@ -2107,7 +2099,6 @@
|
|||||||
border-top: 1px solid var(--border);
|
border-top: 1px solid var(--border);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
.cutoffMapFigure {
|
.cutoffMapFigure {
|
||||||
/* Enough to read a set of concentric rings and no more — this is a
|
/* Enough to read a set of concentric rings and no more — this is a
|
||||||
diagram of a number, not a map anyone navigates by. */
|
diagram of a number, not a map anyone navigates by. */
|
||||||
|
|||||||
@@ -0,0 +1,86 @@
|
|||||||
|
# Publishing to the blog
|
||||||
|
|
||||||
|
The blog is Payload CMS, running inside the Next.js app. There is no separate
|
||||||
|
service and no second deploy. Writing a post is done in the browser and takes
|
||||||
|
effect on the live site within seconds.
|
||||||
|
|
||||||
|
## Signing in
|
||||||
|
|
||||||
|
`https://www.schoolcompare.co.uk/admin`, one account, no registration. If you
|
||||||
|
need the account seeded on a fresh environment, run against the container:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
npx payload create-first-user
|
||||||
|
```
|
||||||
|
|
||||||
|
Staging has its own admin panel, its own database and its own credentials at
|
||||||
|
`https://stx.schoolcompare.co.uk/admin`. Never reuse production's secret or
|
||||||
|
password there.
|
||||||
|
|
||||||
|
## Writing a post
|
||||||
|
|
||||||
|
**Posts → Create New.** The fields:
|
||||||
|
|
||||||
|
| Field | Notes |
|
||||||
|
|---|---|
|
||||||
|
| **Title** | The `<h1>` and the browser tab. |
|
||||||
|
| **Slug** | The URL segment, in the sidebar. **Never change it after publishing.** It is the canonical URL, and changing it breaks every existing link and discards the page's accumulated search signal. |
|
||||||
|
| **Published at** | The date shown on the post and in the feed. |
|
||||||
|
| **Excerpt** | Max 200 characters. Shown on the index *and* used as the meta description, so write it as a standalone sentence rather than a teaser. |
|
||||||
|
| **Hero image** | Optional. Becomes the social share image; without one, the site's generated card is used. |
|
||||||
|
| **Content** | Rich text. `/` inserts a block. |
|
||||||
|
|
||||||
|
**Save as draft** while you're working; drafts are not public. **Publish** when
|
||||||
|
it's ready.
|
||||||
|
|
||||||
|
### The callout block
|
||||||
|
|
||||||
|
One custom block, `Callout`, with two tones:
|
||||||
|
|
||||||
|
- **Caveat**: what a number does *not* show. This is the one that matters. It
|
||||||
|
is how a post states a limitation in context rather than burying it in a
|
||||||
|
closing paragraph.
|
||||||
|
- **Note**: a useful aside.
|
||||||
|
|
||||||
|
### Images
|
||||||
|
|
||||||
|
Every image requires alt text; the editor will not let you save without it.
|
||||||
|
Uploads go to a Docker volume on the host, which is backed up separately from
|
||||||
|
Postgres. An image is not reproducible from the pipeline the way school data
|
||||||
|
is.
|
||||||
|
|
||||||
|
## How publishing reaches the live site
|
||||||
|
|
||||||
|
- `/blog`, `/blog/rss.xml` and `/content-sitemap.xml` are rendered per request,
|
||||||
|
so a new post appears immediately.
|
||||||
|
- `/blog/[slug]` is cached after its first request. Publishing or editing fires
|
||||||
|
a `revalidatePath` from the collection's `afterChange` hook, which drops that
|
||||||
|
cached copy, so edits appear immediately too.
|
||||||
|
|
||||||
|
If a change doesn't show, it is far more likely the post is still a draft than
|
||||||
|
that the cache is stale.
|
||||||
|
|
||||||
|
## House style
|
||||||
|
|
||||||
|
These rules are why the blog exists. A post that ignores them makes the site
|
||||||
|
read more machine-generated, not less.
|
||||||
|
|
||||||
|
- **First person singular.** "I built", "I found", never "we provide".
|
||||||
|
- **Concrete over general.** "When we were looking at schools in Wandsworth"
|
||||||
|
beats any amount of stated warmth.
|
||||||
|
- **State limits before someone else finds them.** Every post that presents a
|
||||||
|
metric says what it does not show. This is the single strongest signal that a
|
||||||
|
human wrote it: generated content does not volunteer its own weaknesses.
|
||||||
|
- **No mission statements, no "passionate about", no invented team.** There is
|
||||||
|
one person here.
|
||||||
|
- **No em dashes.** They are one of the clearest tells of machine-written
|
||||||
|
prose, which is the whole problem this blog exists to fix. A full stop, a
|
||||||
|
colon, a semicolon or a pair of commas does the job and reads as though a
|
||||||
|
person chose it.
|
||||||
|
- **Short sentences.**
|
||||||
|
- **Never publish a surname, an employer, or a child's name.** The site's author
|
||||||
|
is "Tudor". See `/about`.
|
||||||
|
- **Never invent a figure**, even illustratively. On a site whose whole
|
||||||
|
proposition is official data, a made-up number attached to a real school is
|
||||||
|
the one thing it cannot do, and no illustrative intent survives being
|
||||||
|
screenshotted.
|
||||||
File renamed without changes.
Loaded 100 of 144 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user