feat(media) Adds media drag uploads and picker metadata editing by masonjames · Pull Request #1366 · emdash-cms/emdash

masonjames · 2026-06-05T19:23:23Z

What does this PR do?

Adds the next media workflow improvements from discussion #990:

Adds drag-and-drop batch uploads to the Media Library and Media Picker.
Reuses the existing upload paths with shared batch progress and error handling.
Adds active/reject drop states, upload progress, success/error messages, and invalid-file rejection.
Keeps picker uploads selected after successful upload, including provider uploads.
Adds inline alt text and caption editing in the Media Picker using the existing updateMedia behavior.
Adds missing-alt, alt-set, and caption-set indicators plus quick edit affordances.

Related discussion: #990

Closes: n/a (discussion-driven feature)

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). Do not include messages.po changes except in translation PRs — a workflow extracts catalogs on merge to main.
I have added a changeset (if this PR changes a published package)
New features link to an approved Discussion: Make media handling a first-class editing workflow #990

AI-generated code disclosure

This PR includes AI-generated code — model/tool: GPT-5 Codex, RepoPrompt workflow tools

Screenshots / test output

Manual QA completed locally before PR creation; optional RTL check was not rerun manually. The implementation was also smoke-checked in Arabic/RTL during development.

Automated checks run locally:

pnpm format
pnpm lint:json | jq '.diagnostics | length' -> 0
pnpm typecheck -> passed
pnpm --filter @emdash-cms/admin test tests/components/MediaLibrary.test.tsx tests/components/MediaPickerModal.test.tsx --run -> 64 passed
pnpm --filter @emdash-cms/admin build -> passed

changeset-bot · 2026-06-05T19:23:27Z

🦋 Changeset detected

Latest commit: 5db84aa

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

This PR includes changesets to release 16 packages

Name	Type
@emdash-cms/admin	Minor
emdash	Minor
@emdash-cms/cloudflare	Minor
@emdash-cms/sandbox-workerd	Patch
@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-06-05T19:23:32Z

Scope check

This PR changes 2,259 lines across 8 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-06-05T19:26:09Z

Open in StackBlitz

@emdash-cms/admin

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

@emdash-cms/auth

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

@emdash-cms/auth-atproto

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

@emdash-cms/blocks

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

@emdash-cms/cloudflare

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

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

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

emdash

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

create-emdash

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

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

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

@emdash-cms/plugin-cli

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

@emdash-cms/plugin-types

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

@emdash-cms/registry-client

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

@emdash-cms/registry-lexicons

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

@emdash-cms/sandbox-workerd

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

@emdash-cms/x402

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

@emdash-cms/plugin-ai-moderation

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

@emdash-cms/plugin-atproto

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

@emdash-cms/plugin-audit-log

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

@emdash-cms/plugin-color

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

@emdash-cms/plugin-embeds

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

@emdash-cms/plugin-field-kit

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

@emdash-cms/plugin-forms

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

@emdash-cms/plugin-webhook-notifier

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

commit: 5db84aa

…r-metadata # Conflicts: # packages/admin/src/components/MediaLibrary.tsx # packages/admin/src/components/MediaPickerModal.tsx

masonjames · 2026-06-17T12:54:06Z

Update 2026-06-17:

Merged current upstream main (a436ceb8) into this branch to pick up the latest released EmDash package state (emdash@0.20.0) and clear the previous conflict state.
Resolved the media library/picker conflicts by retaining this PR's drag-upload + metadata editing behavior while preserving upstream thumbnail fallback/dimension handling.
PR diff against upstream main remains scoped to the media changeset and admin media files.

Local verification on 4a9df1d8:

pnpm install --frozen-lockfile
pnpm --filter @emdash-cms/plugin-types build (refreshes local dist for merged upstream exports)
pnpm --filter @emdash-cms/admin test tests/components/MediaLibrary.test.tsx tests/components/MediaPickerModal.test.tsx --run -> 64 passed
pnpm --filter @emdash-cms/admin build
pnpm --filter @emdash-cms/admin typecheck
pnpm lint:json | jq '.diagnostics | length' -> 0\n\nNote: the focused browser test run still prints the upstream Vitest/@vitest-browser version warning, but the tests pass after clearing stale Vite optimized-dependency caches.

masonjames · 2026-06-17T13:20:44Z

Follow-up after CI completed: the branch is rebased/merged onto current main and is no longer conflict-dirty. Most checks passed, including CI Typecheck, Lint, Tests, Integration Tests, Browser Tests, all E2E shards, CodeQL, zizmor, formatting, and preview publishing. The remaining red check is CI / Smoke Tests, failing in tests/integration/smoke/site-matrix-smoke.test.ts for the aggregate command pnpm run --recursive --filter {./templates/*} --filter @emdash-cms/playground build. The log does not show a media-library-specific assertion failure; it reports the aggregate template-build command failure. I tried to rerun failed jobs, but GitHub rejected it because this account does not have admin rights on the repository.

…r-metadata

Weekly (Mon 09:17 UTC) + manual: ff-mirror upstream main to fork main, merge upstream into mj/prod, prove with core+admin build and the PR emdash-cms#1366 media test suites, push, and report carried-patch status. On merge conflict: abort, open an issue, alert via ntfy (optional secrets). Lives on mj/prod (the default branch) because GitHub runs cron workflows from the default branch; main stays a pristine upstream mirror. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

The upload/confirm URL mapping called storage?.getPublicUrl() unconditionally; optional chaining guards a missing storage object but not a missing method, so upstream's placeholder tests (whose Storage doubles don't implement getPublicUrl) got a TypeError and a 500 from routes our media patch touches. Feature-detect the method and fall back to the relative proxy route, matching the existing fallback intent. Fixes the 5 upstream media placeholder tests on mj/prod; worth folding into PR emdash-cms#1366 as well.

github-actions · 2026-07-05T00:59:32Z

Overlapping PRs

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

fix(media): refine media library and asset details UX #1824 (3 shared files)

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

…r-metadata

Add media drag uploads and picker metadata editing

b02fa2f

github-actions Bot added the area/admin label Jun 5, 2026

github-actions Bot added the size/XL label Jun 5, 2026

masonjames changed the title ~~[codex] Add media drag uploads and picker metadata editing~~ feat(Media) Add media drag uploads and picker metadata editing Jun 5, 2026

masonjames changed the title ~~feat(Media) Add media drag uploads and picker metadata editing~~ feat(media) Add media drag uploads and picker metadata editing Jun 5, 2026

masonjames marked this pull request as ready for review June 5, 2026 19:48

github-actions Bot added the review/needs-review No maintainer or bot review yet label Jun 5, 2026

github-actions Bot added the needs-rebase label Jun 16, 2026

Merge remote-tracking branch 'origin/main' into codex/media-dnd-picke…

4a9df1d

…r-metadata # Conflicts: # packages/admin/src/components/MediaLibrary.tsx # packages/admin/src/components/MediaPickerModal.tsx

github-actions Bot removed the needs-rebase label Jun 17, 2026

masonjames added 3 commits June 23, 2026 08:18

Merge branch 'main' into codex/media-dnd-picker-metadata

72510ad

Merge remote-tracking branch 'origin/main' into codex/media-dnd-picke…

841dcf2

…r-metadata

Merge branch 'main' into codex/media-dnd-picker-metadata

3c8b72e

masonjames changed the title ~~feat(media) Add media drag uploads and picker metadata editing~~ feat(media) Adds media drag uploads and picker metadata editing Jul 3, 2026

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

github-actions Bot mentioned this pull request Jul 5, 2026

fix(media): refine media library and asset details UX #1824

Merged

18 tasks

github-actions Bot mentioned this pull request Jul 5, 2026

fix(admin): lazy-load Media Library thumbnails #1827

Draft

18 tasks

masonjames added 2 commits July 6, 2026 15:05

Merge origin/main into media drag-and-drop picker metadata

2643d2e

Merge remote-tracking branch 'origin/main' into codex/media-dnd-picke…

5db84aa

…r-metadata

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

feat(media) Adds media drag uploads and picker metadata editing#1366

feat(media) Adds media drag uploads and picker metadata editing#1366
masonjames wants to merge 7 commits into
emdash-cms:mainfrom
masonjames:codex/media-dnd-picker-metadata

masonjames commented Jun 5, 2026

Uh oh!

changeset-bot Bot commented Jun 5, 2026 •

edited

Loading

Uh oh!

github-actions Bot commented Jun 5, 2026

Uh oh!

pkg-pr-new Bot commented Jun 5, 2026 •

edited

Loading

Uh oh!

masonjames commented Jun 17, 2026

Uh oh!

masonjames commented Jun 17, 2026

Uh oh!

github-actions Bot commented Jul 5, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

Uh oh!

Conversation

masonjames commented Jun 5, 2026

What does this PR do?

Type of change

Checklist

AI-generated code disclosure

Screenshots / test output

Uh oh!

changeset-bot Bot commented Jun 5, 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 Jun 5, 2026

Scope check

Uh oh!

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

Uh oh!

Uh oh!

masonjames commented Jun 17, 2026

Uh oh!

masonjames commented Jun 17, 2026

Uh oh!

github-actions Bot commented Jul 5, 2026

Overlapping PRs

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

changeset-bot Bot commented Jun 5, 2026 •

edited

Loading

pkg-pr-new Bot commented Jun 5, 2026 •

edited

Loading