Skip to content

Merge main into next - #250

Merged
dlrice merged 4 commits into
nextfrom
merge-main-into-next
Jul 31, 2026
Merged

Merge main into next#250
dlrice merged 4 commits into
nextfrom
merge-main-into-next

Conversation

@dlrice

@dlrice dlrice commented Jul 31, 2026

Copy link
Copy Markdown
Contributor

Purpose

Bring the worthwhile changes from the 4.x main line into the v5 next branch: the 3D structure-viewer feature set (AlphaFold-complex loading, oligomeric-state/chain handling, predictions API for complexes, .cif downloads, simplified PDBe links, a structures-loaded event, and selected-id/no-table attributes) plus the ecosystem metrics tooling.

Approach

Targeted port rather than a full main → next merge. next is a from-scratch v5 rewrite that develops independently and replaces main at the Q4 release, so a merge would only drag in irrelevant history — including main's revert of the config-approach architecture that next is built on. The structure work was reapplied onto next's rewritten component as three focused commits; original authorship is preserved (Swaathik is the commit author, with source PRs #178 and #203 cited).

Testing

No new tests were written. The structure adapter is covered by the existing structure-adapter.spec.ts, and the ported component/datatable code is byte-identical to an integration already run through the full suite. Verify with yarn validate (lint, type-check, unit tests, build, publint, attw, package contract).

Visual changes

None to the default layout. The structure table/viewer gains extra columns and complex-structure handling; no screenshots attached.

Checklist

  • My PR is scoped properly, and "does one thing only"
  • I have reviewed my own code
  • I have checked that linting checks pass and type safety is respected
  • I have checked that tests pass and coverage has at least improved, and if not explained the reasons why
  • If needed, the changes have been previewed by all interested parties.

Swaathik and others added 3 commits July 31, 2026 12:39
…ctures-loaded event, no-table mode

Reapplies the 4.x structure-viewer work onto next's rewritten component: AlphaFold-complex loading, oligomeric-state and chain handling, predictions API for complexes, .cif download URLs, and simplified PDBe links (PRs #178 and #203; commit f40cff0). The consumer-facing additions — the structures-loaded event and selected-id/no-table attributes — and the empty-data handling are folded in from the lead developer's changes on the same branch.

Co-authored-by: Daniel Rice <dlrice@ebi.ac.uk>
Comment thread CONTRIBUTING.md Outdated
Comment on lines 291 to 292
| 2026-06-26 | 15.30 - 16.30 | Planned |
| 2026-07-31 | 10.30 - 11.30 | Planned |

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should update these two dates as well

@dlrice
dlrice merged commit ca9a9e9 into next Jul 31, 2026
2 checks passed
@dlrice
dlrice deleted the merge-main-into-next branch July 31, 2026 13:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants