feat(content): support indexed custom field sorting by logelog · Pull Request #2212 · emdash-cms/emdash

logelog · 2026-07-22T23:02:26Z

What does this PR do?

Adds server-backed sorting for custom scalar fields that are explicitly marked indexed.

Collection fields gain an opt-in indexed flag. EmDash validates that flag against supported scalar field types, maintains a normalized index table when content changes, and allows the existing orderBy contract to sort by those field slugs. Sorting remains database-backed and cursor-safe, so it applies to the complete result set instead of only the currently loaded admin page.

This enables uses such as SEO score, ticket priority, workflow rank, or other numeric and textual metadata without introducing full-table scans.

The collection administration contract this builds on has landed in emdash-cms/emdash PR 2194.

Addresses the structured sorting portion of emdash-cms/emdash issue 2179.
Discussion: indexed sorting; configured content-list fields.

Type of change

Checklist

I have read CONTRIBUTING.md
pnpm typecheck passes
pnpm lint passes
pnpm test passes (or targeted tests for my change)
pnpm format has been run
I have added/updated tests for my changes (if applicable)
User-visible strings in the admin UI are wrapped for translation (if applicable)
I have added a changeset (if this PR changes a published package)
New features link to an approved Discussion: indexed sorting is awaiting maintainer review.

AI-generated code disclosure

This PR includes AI generated code: Claude Opus 5, GPT-5.6 (via private dev orchestra)

Screenshots / test output

Validated on the current main base at the time of the update:

focused SQLite: 282 tests passed
PostgreSQL 17.10 indexed ordering: 3 tests passed
focused admin: 71 tests passed
full workspace typecheck passed
type-aware lint passed
format check passed for 2,659 files

GitHub CI runs the complete branch matrix.

changeset-bot · 2026-07-22T23:02:30Z

🦋 Changeset detected

Latest commit: 1e1bf1d

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 17 packages

Name	Type
emdash	Minor
@emdash-cms/admin	Minor
@emdash-cms/cloudflare	Minor
@emdash-cms/sandbox-workerd	Patch
@emdash-cms/plugin-mcp-smoke	Major
@emdash-cms/fixture-perf-site	Patch
@emdash-cms/perf-demo-site	Patch
@emdash-cms/cache-demo-site	Patch
@emdash-cms/do-demo-site	Patch
@emdash-cms/do-solo-demo-site	Patch
@emdash-cms/auth	Minor
@emdash-cms/blocks	Minor
@emdash-cms/gutenberg-to-portable-text	Minor
@emdash-cms/x402	Minor
create-emdash	Minor
@emdash-cms/auth-atproto	Patch
@emdash-cms/plugin-embeds	Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

github-actions · 2026-07-22T23:03:30Z

Scope check

This PR changes 920 lines across 35 files. Large PRs are harder to review and more likely to be closed without review.

If this scope is intentional, no action needed. A maintainer will review it. If not, please consider splitting this into smaller PRs.

See CONTRIBUTING.md for contribution guidelines.

pkg-pr-new · 2026-07-22T23:05:47Z

Open in StackBlitz

@emdash-cms/admin

npm i https://pkg.pr.new/@emdash-cms/admin@2212

@emdash-cms/auth

npm i https://pkg.pr.new/@emdash-cms/auth@2212

@emdash-cms/auth-atproto

npm i https://pkg.pr.new/@emdash-cms/auth-atproto@2212

@emdash-cms/blocks

npm i https://pkg.pr.new/@emdash-cms/blocks@2212

@emdash-cms/cloudflare

npm i https://pkg.pr.new/@emdash-cms/cloudflare@2212

@emdash-cms/contentful-to-portable-text

npm i https://pkg.pr.new/@emdash-cms/contentful-to-portable-text@2212

emdash

npm i https://pkg.pr.new/emdash@2212

create-emdash

npm i https://pkg.pr.new/create-emdash@2212

@emdash-cms/gutenberg-to-portable-text

npm i https://pkg.pr.new/@emdash-cms/gutenberg-to-portable-text@2212

@emdash-cms/plugin-cli

npm i https://pkg.pr.new/@emdash-cms/plugin-cli@2212

@emdash-cms/plugin-types

npm i https://pkg.pr.new/@emdash-cms/plugin-types@2212

@emdash-cms/registry-client

npm i https://pkg.pr.new/@emdash-cms/registry-client@2212

@emdash-cms/registry-lexicons

npm i https://pkg.pr.new/@emdash-cms/registry-lexicons@2212

@emdash-cms/registry-verification

npm i https://pkg.pr.new/@emdash-cms/registry-verification@2212

@emdash-cms/sandbox-workerd

npm i https://pkg.pr.new/@emdash-cms/sandbox-workerd@2212

@emdash-cms/x402

npm i https://pkg.pr.new/@emdash-cms/x402@2212

@emdash-cms/plugin-ai-moderation

npm i https://pkg.pr.new/@emdash-cms/plugin-ai-moderation@2212

@emdash-cms/plugin-atproto

npm i https://pkg.pr.new/@emdash-cms/plugin-atproto@2212

@emdash-cms/plugin-audit-log

npm i https://pkg.pr.new/@emdash-cms/plugin-audit-log@2212

@emdash-cms/plugin-color

npm i https://pkg.pr.new/@emdash-cms/plugin-color@2212

@emdash-cms/plugin-embeds

npm i https://pkg.pr.new/@emdash-cms/plugin-embeds@2212

@emdash-cms/plugin-field-kit

npm i https://pkg.pr.new/@emdash-cms/plugin-field-kit@2212

@emdash-cms/plugin-forms

npm i https://pkg.pr.new/@emdash-cms/plugin-forms@2212

@emdash-cms/plugin-webhook-notifier

npm i https://pkg.pr.new/@emdash-cms/plugin-webhook-notifier@2212

commit: 1e1bf1d

github-actions · 2026-07-23T00:50:33Z

Overlapping PRs

This PR modifies files that are also changed by other open PRs:

feat(content): filter indexed custom fields #2213 (35 shared files)
feat(admin): allow trusted plugins to add content list columns #2195 (23 shared files)
feat(admin): show configured fields in content lists #2194 (23 shared files)
Harden plugin MCP tool registration #988 (3 shared files)
feat(core): configurable titleField and dateField per collection #1973 (13 shared files)
feat: reference field type (storage-less edges + admin UI) #1928 (9 shared files)
feat(admin): add date-only content field #1365 (9 shared files)

This may cause merge conflicts or duplicated work. A maintainer will coordinate.

emdashbot

The server-side sorting approach is sound: it adds physical SQLite indexes on real ec_* columns for scalar field types, keeps pagination cursor-stable with explicit null ordering, and validates the indexed flag against a whitelist of indexable types. That fits EmDash’s schema-in-the-database architecture.

Two things block a clean sign-off:

AGENTS.md Discussion requirement. The PR introduces a new user-facing feature (indexed custom-field sorting) but the description explicitly states that the linked Discussion #1717 only covers admin.listColumns (#2194) and “no Discussion has been opened for indexed sorting yet.” EmDash requires a maintainer-approved Discussion before merging a feature. This needs to be opened/approved before merge.
FieldEditor bug when changing an indexed field to a non-indexable type. The editor sends indexed: undefined when the selected type is not indexable. The backend interprets undefined as “preserve existing value,” so an already-indexed field that is changed to a non-indexable type (e.g. string → text) fails with FIELD_NOT_INDEXABLE instead of dropping the index. Fix by explicitly sending false for non-indexable types.

Other notes:

The diff still includes the stacked #2194 admin.listColumns commits/changeset. Review comments here focus on the indexed-sorting additions; the list-columns pieces should land via #2194.
Server support for custom-field sorting is complete, but the admin content list does not yet expose sort controls on custom columns (the new columns are display-only). If admin UI for selecting a custom sort is intended for this PR, it is missing.
I did not run tests/lint/typecheck (no shell/tooling). Test coverage looks reasonable for null ordering, equal-value stability, unindexed-field rejection, and index lifecycle; the query-plan assertions are brittle but directly verify the stated performance goal.

emdashbot · 2026-08-03T13:05:15Z

 			required,
 			unique,
 			searchable: isSearchableType ? searchable : undefined,
+			indexed: isIndexableType ? indexed : undefined,


[needs fixing] When the selected type is not indexable, this sends indexed: undefined. In updateField the backend computes nextIndexed = input.indexed ?? field.indexed, so an already-indexed field that is changed to a non-indexable type (e.g. string → text, same column type) keeps indexed = true and assertIndexableField throws FIELD_NOT_INDEXABLE. The UI gives the user no way to recover because the Indexed switch has disappeared.

Send false explicitly for non-indexable types so the index is dropped and the type change can succeed:

Suggested change

indexed: isIndexableType ? indexed : undefined,

indexed: isIndexableType ? indexed : false,

emdashbot · 2026-08-03T13:05:15Z

+"@emdash-cms/admin": minor
+---
+
+Adds opt-in database indexes for scalar custom fields and stable cursor pagination when ordering content lists by those fields.


[needs fixing] This changeset describes a new user-facing feature, but AGENTS.md requires a prior maintainer-approved Discussion for features. The PR description acknowledges that Discussion #1717 covers admin.listColumns (#2194) only and that no Discussion has been opened for indexed custom-field sorting yet. Please open and get approval for a Discussion covering this feature before merging.

Three blocks defend sending `indexed: false` or narrate a Playwright workaround. The tests already name the contract they cover. The bind-budget note above the seed batch size stays: it records a limit a reader would otherwise raise.

The file moved to 061 when upstream took 059; this import still named 060, so the suite could not load the module at all.

ascorbic · 2026-08-13T12:16:02Z

+		const indexName = this.getFieldIndexName(fieldId);
+
+		await sql`
+			CREATE INDEX IF NOT EXISTS ${sql.ref(indexName)}


Localised list queries filter by locale, but this index orders every locale together. On a collection where the requested locale contains only a small fraction of entries, the database must walk and discard rows from other locales to fill each page, approaching a collection-wide index scan. Please make locale-scoped custom-field ordering seekable,e.g. put locale before the ordering tuple

ascorbic

Thanks!

Reconciles upstream's indexed custom field sorting (emdash-cms#2212) with this branch's storage-less reference fields. Conflict resolutions: - registry.ts deleteField: drop the field index when `field.indexed`, then drop the column behind the `columnExists` guard. A field being storage-less is a property of the row, not the type, so pre-existing reference columns still need the DDL. - seed/apply.ts existing-field path: keep `upsertSeedField`, which supersedes the inline update/create pair. - seed/apply.ts new-collection path: keep the reference-relation loop and carry `indexed` through to the created field. - upsertSeedField: pass `indexed` to both updateField and createField. Seeding an existing collection routes through here, so omitting it would drop the flag for every seeded field. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

github-actions Bot added review/needs-review No maintainer or bot review yet area/admin area/core area/docs size/XL labels Jul 22, 2026

This was referenced Jul 22, 2026

feat(content): filter indexed custom fields #2213

Open

feat(admin): show configured fields in content lists #2194

Merged

feat(admin): allow trusted plugins to add content list columns #2195

Open

github-actions Bot added the overlap label Jul 23, 2026

logelog mentioned this pull request Jul 23, 2026

Content entities - Admins can customize columns (especially using custom fields) #2179

Open

logelog force-pushed the feat/indexed-custom-field-sorting branch from a3f5bcc to 9509332 Compare July 24, 2026 19:27

This was referenced Jul 28, 2026

feat(admin): allow hiding a collection from the admin sidebar #2264

Merged

feat(admin): explicit collection order in the sidebar #2267

Merged

fix: make media uploads reliable across storage backends #2273

Merged

github-actions Bot added the needs-rebase label Jul 30, 2026

This was referenced Aug 1, 2026

feat: filter the admin content list by byline #2312

Merged

Fix scheduled cleanup of superseded media-usage generations #2324

Merged

logelog force-pushed the feat/indexed-custom-field-sorting branch from 9509332 to 3a15f15 Compare August 2, 2026 23:36

github-actions Bot removed the needs-rebase label Aug 2, 2026

logelog force-pushed the feat/indexed-custom-field-sorting branch 2 times, most recently from 138f0cd to 33ed15e Compare August 3, 2026 12:23

MA2153 added the bot:review Trigger an emdashbot code review on this PR label Aug 3, 2026

emdashbot Bot reviewed Aug 3, 2026

View reviewed changes

emdashbot Bot removed the bot:review Trigger an emdashbot code review on this PR label Aug 3, 2026

github-actions Bot added review/needs-rereview Author pushed changes since the last review and removed review/needs-review No maintainer or bot review yet labels Aug 3, 2026

logelog added 14 commits August 12, 2026 19:26

fix(content): remove redundant indexed cursor cast

d8763c3

fix(content): use generated custom field indexes

cf7b782

fix(content): keep indexed cursor scans ordered

cf8201d

test(content): capture qualified list queries

6150a70

fix(admin): clear the indexed flag for non-indexable field types

6883b14

test(admin): cover clearing the indexed flag on type change

4eb2958

refactor: drop comments that address the reviewer

5fb204a

Three blocks defend sending `indexed: false` or narrate a Playwright workaround. The tests already name the contract they cover. The bind-budget note above the seed batch size stays: it records a limit a reader would otherwise raise.

test(core): cover indexed ordering on PostgreSQL

a35c48b

refactor(schema): simplify indexable field comment

827c6f5

fix(test): import the indexed migration from its current slot

cf3d73f

The file moved to 061 when upstream took 059; this import still named 060, so the suite could not load the module at all.

fix(seed): reject unsupported indexed field types

a425046

test(core): allow PostgreSQL ordering setup

9716a1a

fix(content): preserve indexed field contracts

e420c10

fix(test): import indexed migration from slot 066

3cdeddc

logelog force-pushed the feat/indexed-custom-field-sorting branch from 0688023 to 3cdeddc Compare August 12, 2026 17:35

github-actions Bot mentioned this pull request Aug 12, 2026

fix(core): reconcile media usage indexes automatically #2443

Merged

18 tasks

ascorbic and others added 3 commits August 13, 2026 10:14

Merge branch 'main' into feat/indexed-custom-field-sorting

5e04db7

Merge branch 'main' into feat/indexed-custom-field-sorting

d9ab329

Merge branch 'main' into feat/indexed-custom-field-sorting

c89ddd8

ascorbic reviewed Aug 13, 2026

View reviewed changes

fix(core): keep localized custom ordering seekable

93ba7b0

github-actions Bot added review/awaiting-author Reviewed; waiting on the author to respond and removed review/needs-rereview Author pushed changes since the last review labels Aug 13, 2026

Merge main into feat/indexed-custom-field-sorting

1e1bf1d

github-actions Bot added review/needs-rereview Author pushed changes since the last review and removed review/awaiting-author Reviewed; waiting on the author to respond labels Aug 13, 2026

ascorbic approved these changes Aug 13, 2026

View reviewed changes

ascorbic merged commit fefb702 into emdash-cms:main Aug 13, 2026
46 checks passed

emdashbot Bot mentioned this pull request Aug 13, 2026

ci: release #2419

Open

Navigation Menu

Uh oh!

feat(content): support indexed custom field sorting - #2212

feat(content): support indexed custom field sorting#2212
ascorbic merged 20 commits into
emdash-cms:mainfrom
logelog:feat/indexed-custom-field-sorting

logelog commented Jul 22, 2026 •

edited

Loading

Uh oh!

changeset-bot Bot commented Jul 22, 2026 •

edited

Loading

Uh oh!

github-actions Bot commented Jul 22, 2026

Uh oh!

pkg-pr-new Bot commented Jul 22, 2026 •

edited

Loading

Uh oh!

github-actions Bot commented Jul 23, 2026

Uh oh!

emdashbot Bot left a comment

Uh oh!

emdashbot Bot Aug 3, 2026

Uh oh!

emdashbot Bot Aug 3, 2026

Uh oh!

ascorbic Aug 13, 2026

Uh oh!

ascorbic left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

	indexed: isIndexableType ? indexed : undefined,
	indexed: isIndexableType ? indexed : false,

Uh oh!

Conversation

logelog commented Jul 22, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What does this PR do?

Type of change

Checklist

AI-generated code disclosure

Screenshots / test output

Uh oh!

changeset-bot Bot commented Jul 22, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🦋 Changeset detected

Uh oh!

github-actions Bot commented Jul 22, 2026

Scope check

Uh oh!

pkg-pr-new Bot commented Jul 22, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions Bot commented Jul 23, 2026

Overlapping PRs

Uh oh!

emdashbot Bot left a comment

Choose a reason for hiding this comment

Uh oh!

emdashbot Bot Aug 3, 2026

Choose a reason for hiding this comment

Uh oh!

emdashbot Bot Aug 3, 2026

Choose a reason for hiding this comment

Uh oh!

ascorbic Aug 13, 2026

Choose a reason for hiding this comment

Uh oh!

ascorbic left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

logelog commented Jul 22, 2026 •

edited

Loading

changeset-bot Bot commented Jul 22, 2026 •

edited

Loading

pkg-pr-new Bot commented Jul 22, 2026 •

edited

Loading