Commit 9c0348c
committed
TransgeneExpressionHere: restore Expressed_in column
v2 prod's legacy ExpressionOverlapsHere result table carried an
Expressed_in column listing the anatomy class(es) each EP overlaps
(e.g. "pacemaker neuron"). The v1.10.x migration to VFBquery dropped
it; the TODO at the top of get_transgene_expression_here flagged the
missing column for a follow-up. This is that follow-up.
Cypher:
- WITH now collects `anat.label + '----' + anat.short_form` per
distinct anat per ep (within the Owlery closure from v1.14.0),
alongside the existing pub_shorts collection.
- RETURN projects `expressed_in` capped at the first 5 entries
with a `+N more` suffix so wide closures stay readable. Items
joined with `; ` (matching the Reference column's
stringDelimiter convention) and entity ids wrapped with `----`
(matching the entityDelimiter convention) so the v2 frontend
component can extract the click target.
Schema:
- AnatomyExpressedIn_to_schema gains `expressed_in` in
preview_columns (between name and pubs).
- get_transgene_expression_here's formatted-dict headers add
`expressed_in: {title: "Expressed_in", type: "markdown",
order: 1}`, shifting pubs/tags/template/technique orders one slot
later.
- encode_markdown_links is NOT called on expressed_in: the
`; `-joined wire format is already what the V2
QueryLinkArrayComponent expects to receive verbatim; running it
through the markdown-link encoder would corrupt the
`----`-wrapped entity ids.
Companion geppetto-vfb change switches the queryBuilderConfiguration
entry for `expressed_in` from QueryLinkComponent (single link) to
QueryLinkArrayComponent (clickable chip list), adds
stringDelimiter ";", and keeps the existing entityDelimiter ("----"),
entityIndex (1), and click action (window.addVfbId('$entity$')).
Verified locally against pdb for pacemaker neuron (FBbt_00006048):
P{GAL4-per.BS} -> "pacemaker neuron----FBbt_00006048"
P{GAL4-tim.E} -> "pacemaker neuron----FBbt_00006048"
P{GSV6}GS10340 -> "pacemaker neuron----FBbt_00006048"
P{cry-GAL4.E} -> "pacemaker neuron----FBbt_00006048"
matching v2 prod's single-value Expressed_in display for the same
entity.
Patch bump 1.14.2 -> 1.14.3. New column triggers natural cache
invalidation via the result shape change.1 parent a7021c2 commit 9c0348c
2 files changed
Lines changed: 27 additions & 16 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
6 | | - | |
| 6 | + | |
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1960 | 1960 | | |
1961 | 1961 | | |
1962 | 1962 | | |
1963 | | - | |
| 1963 | + | |
1964 | 1964 | | |
1965 | 1965 | | |
1966 | 1966 | | |
| |||
5424 | 5424 | | |
5425 | 5425 | | |
5426 | 5426 | | |
5427 | | - | |
5428 | | - | |
5429 | | - | |
5430 | | - | |
5431 | | - | |
| 5427 | + | |
| 5428 | + | |
| 5429 | + | |
| 5430 | + | |
| 5431 | + | |
| 5432 | + | |
| 5433 | + | |
| 5434 | + | |
5432 | 5435 | | |
5433 | 5436 | | |
5434 | 5437 | | |
| |||
5468 | 5471 | | |
5469 | 5472 | | |
5470 | 5473 | | |
5471 | | - | |
| 5474 | + | |
| 5475 | + | |
| 5476 | + | |
5472 | 5477 | | |
5473 | 5478 | | |
5474 | 5479 | | |
| |||
5496 | 5501 | | |
5497 | 5502 | | |
5498 | 5503 | | |
| 5504 | + | |
| 5505 | + | |
| 5506 | + | |
| 5507 | + | |
| 5508 | + | |
5499 | 5509 | | |
5500 | 5510 | | |
5501 | 5511 | | |
| |||
5512 | 5522 | | |
5513 | 5523 | | |
5514 | 5524 | | |
5515 | | - | |
5516 | | - | |
5517 | | - | |
5518 | | - | |
5519 | | - | |
5520 | | - | |
5521 | | - | |
| 5525 | + | |
| 5526 | + | |
| 5527 | + | |
| 5528 | + | |
| 5529 | + | |
| 5530 | + | |
| 5531 | + | |
| 5532 | + | |
5522 | 5533 | | |
5523 | 5534 | | |
5524 | | - | |
| 5535 | + | |
5525 | 5536 | | |
5526 | 5537 | | |
5527 | 5538 | | |
| |||
0 commit comments