Don't recreate a saved sort that comes back under a new id
When a sort is removed and added back on the same field in one draft, it comes back under a new id. On save, getViewSortsToDelete keeps the saved sort because its field and direction still match, while getViewSortsToCreate matched by id only and created the new one too, so the view ended up with the sort twice (or the server rejected the duplicate).
Changes
getViewSortsToCreatenow skips a sort that matches a saved one by id or by target, mirroringgetViewSortsToDelete; both go through a sharedisSameViewSortTarget.
This PR used to also generalise the filter and sort save hooks for column scopes. Column scopes are now saved through one server mutation (#30466), so that refactor had no caller left and was dropped.
Stack
The work is split into short tracks that can be reviewed and merged in parallel. Each PR targets main or the one PR it builds on. Two PRs need several others; they target an integration branch (felix/relaxed-einstein-vxil3q-base-*, not a PR) that merges exactly their dependencies, so their diff shows only their own changes. A PR can merge once everything in its "Builds on" column is merged; retarget it to main at that point.
Size counts changed lines outside tests and generated files: S < 300, M 300–800, L > 800. Sizes are a snapshot and are not kept in sync with every push.
| Track | PR | What it does | Size | Code | Tests / generated | Builds on |
|---|---|---|---|---|---|---|
| Server: views | #30339 | Per-column settings on view fields (label, record limit) | S | +300 −2 | +703 −152 | main |
| Server: views | #30341 | A view can be owned by a one-to-many view field (scope view) | M | +584 −56 | +891 −4 | main |
| Server: views | #30472 | Lookup: a view field shows one field of its related record | M | +280 −38 | +428 −4 | #30339 |
| Server: views | #30466 | upsertViewFieldWithScope: save a column with its settings, lookup and scope in one migration (~600 lines moved out of view-widget-upsert) | L | +1330 −567 | +1117 −256 | #30339, #30341, #30472 |
| Server: views | #30450 | Expose column scopes and lookups in the view AI tools | S | +31 | +222 | #30339, #30341, #30472 |
| Server: query engine | #30347 | Honor filter / orderBy / first on nested one-to-many relations | M | +462 −86 | +509 | main |
| Server: query engine | #30473 | One relation-selection tree through the common query layer (refactor, no behavior change) | L | +663 −685 | +277 −46 | #30347 |
| Server: query engine | #30465 | Each alias of a nested relation gets its own arguments and rows | L | +595 −237 | +727 −21 | #30473 |
| Front | #30468 | Query a relation under an alias with its own filter, sort and limit | S | +140 −19 | — | main |
| Front | #30469 👈 | Don't recreate a saved sort that comes back under a new id | S | +21 −17 | +8 | main |
| Front | #30348 | Extra table columns and the Edit column panel, behind IS_COLUMN_SETTINGS_ENABLED | M | +718 −76 | +152 −30 | #30339 |
| Front | #30349 | Scope one-to-many columns from the Edit column panel | L | +1053 −92 | +316 −18 | #30348, #30466, #30468, #30469, #30465 |
| Front | #30439 | Lookup columns in the table, editable from their cells (absorbs #30440) | L | +805 −223 | +283 −30 | #30349 |
| Front | #30458 | Lookup and scoped columns on boards and calendars | M | +404 −284 | +140 −7 | #30439 |
The longest dependency chain is #30339 → #30348 → #30349 → #30439 → #30458; everything else is one or two levels deep. #30339, #30341 and #30472 each add a 2.59 instance command, so whichever merges after another may need a fresh timestamp.
Testing
- Unit:
getViewSortsToCreategains "should not recreate a saved sort that came back under a new id"; the existinggetViewSorts{Create,Delete,Update}suites pass.
Generated by Claude Code