Repository navigation
[6.x] Render standalone CP pages with Inertia and Blade - #19931
Draft
brianjhanson wants to merge 7 commits into
Draft
brianjhanson wants to merge 7 commits into
brianjhanson wants to merge 7 commits into
Conversation
The plugin installer, email-taken and licensing pages were standalone Twig documents. They now render through Inertia: the installer through the same `updater/Index` page as the other updaters, and the others as new `auth/EmailTaken` and `licensing/Issues` pages. Control panel errors render a Craft-owned Blade page instead of Laravel's default or the site's own error templates, which still apply to site requests. The unused Twig error templates are removed. The workbench gets Debug sections for the pages still drawn by Twig, the ported pages in each of their states, and real error pages, plus an overlay that draws the nav flyouts' safe areas, which `HoverIntentGroup::safeAreas()` now exposes. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
📚 Storybook previews@craftcms/ui — open Storybook No changed components detected in this Storybook. resources/js — open Storybook No changed components detected in this Storybook. |
It was only there to debug the flyout closing early, which is fixed separately, so it and the `safeAreas()` method it read from can go. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…yling Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Only the legacy `Craft.AuthManager` and `Craft.AssetImageEditor` call `users/login-modal` and `assets/image-editor`; the control panel itself uses the Vue elevated-session host and image editor dialog. The endpoints, their templates, and their tests now live in yii2-adapter, at the same URLs. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…yling 6.x removed Craft.AuthManager, the legacy AssetImageEditor, and the users/login-modal action outright, so the adapter copies of the login modal and image editor endpoints go too. assets/image-editor stays in core, where 6.x now uses it to serve the new image editor's settings. login.twig is deleted, since the login modal was the only thing including it.
This branch has not been deployed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Follow-up to #19884, which moved most control panel screens into the Inertia shell. A handful of pages still drew their own Twig documents. This ports three of them, gives the control panel its own error page, and adds workbench pages for previewing what's left.
Ported to Inertia
BaseUpdaterController::index()now rendersupdater/Index, the page the updater, plugin remover and config sync already used. Their identicalindex()overrides are gone._special/updater.twigis removed. The installer's return URL is now a full CP URL, since the Vue page navigates to it directly.VerifyEmailControllerrenders a newauth/EmailTakenpage throughrenderViewWithFallback(), like the other auth pages.EnforceLicensesrenders a newlicensing/Issuespage, still with a 402 and no-cache headers. The countdown, the shun-cookie request and the Refresh button are ported from the jQuery version.Control panel error pages
resources/views/errors/cp.blade.php, a standalone page with inline styles and no JS. It's served through a renderable registered inAppServiceProvider(CpErrorPage).errors/*templates. CP errors used to show Laravel's built-in page, or the site's own template when one existed.errors/*.twig,error.twig) weren't rendered by anything and are removed.Standalone page styling
_layouts/basenow gives its body thecp-legacy-screenclass, the scope bridged screens already use, so standalone Twig pages pick up the same compat styles.legacy.tsnow importslegacy.css, which adds the message-page layout.bulletslist, and the error page is restyled._special/login.twigis removed. Only the login modal included it, and 6.x has since removed that.Workbench
New sections under Debug:
_layouts/message): database update, can't run, set password, verify email.Not included
Note for review
VerifyEmailControlleronly reaches the email-taken page whenUsers::verifyEmailForUser()throwsInvalidElementException, which it currently never does, because it saves the user model directly. The new test forces that exception. Verifying an email that another user already has seems to go through today, which may deserve its own issue.Tests
InstallControllerTestandEnforceLicensesTestfor the Inertia responses.VerifyEmailControllerTest, plusCpErrorPageTest.🤖 Generated with Claude Code