From 02b33e08448907c2d09e7f6c4671c169f1668aa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20Zieli=C5=84ski?= Date: Thu, 29 Oct 2026 17:51:21 +0100 Subject: [PATCH 1/5] [Website] Guide Reprint authorization one step at a time --- .../playwright/e2e/reprint-import.spec.ts | 21 +- .../website/playwright/e2e/reprint-ui.spec.ts | 23 +- .../site-transfer-panel/index.spec.tsx | 130 +++++- .../site-transfer-panel/index.tsx | 374 +++++++++++++----- .../site-transfer-panel/style.module.css | 37 ++ 5 files changed, 460 insertions(+), 125 deletions(-) diff --git a/packages/playground/website/playwright/e2e/reprint-import.spec.ts b/packages/playground/website/playwright/e2e/reprint-import.spec.ts index 075b4a625c..b0d2afeae1 100644 --- a/packages/playground/website/playwright/e2e/reprint-import.spec.ts +++ b/packages/playground/website/playwright/e2e/reprint-import.spec.ts @@ -26,6 +26,7 @@ test( await website.goto('./?reprint'); const page = website.page; + await page.context().grantPermissions(['clipboard-write']); await page.waitForFunction(() => Boolean((window as any).playgroundSites?.getClient()) ); @@ -52,6 +53,10 @@ test( .fill(siteUrl!); await pane.getByRole('button', { name: 'Check site' }).click(); // The key step opens only when Reprint Server answered the probe. + await pane + .locator('summary') + .filter({ hasText: 'Show key and connection details' }) + .click(); const key = pane.getByRole('textbox', { name: 'Migration key', exact: true, @@ -60,10 +65,14 @@ test( const publicKey = await key.inputValue(); // Enroll through the actual plugin settings, just as a user would. No // shared token or unauthenticated test endpoint stands in for signatures. - const sourceAdmin = await page.context().newPage(); - await sourceAdmin.goto( - new URL('wp-admin/tools.php?page=reprint-server', siteUrl).href - ); + await pane + .getByRole('button', { name: 'Copy migration key', exact: true }) + .click(); + const sourceAdminOpened = page.context().waitForEvent('page'); + await pane + .getByRole('link', { name: 'Open Reprint settings ↗', exact: true }) + .click(); + const sourceAdmin = await sourceAdminOpened; await sourceAdmin .getByRole('textbox', { name: 'Username or Email Address' }) .fill('admin'); @@ -89,7 +98,9 @@ test( sourceAdmin.getByText('Public key enrolled.') ).toBeVisible(); await sourceAdmin.close(); - await pane.getByRole('button', { name: 'Clone site' }).click(); + await pane + .getByRole('button', { name: 'I’ve authorized it — clone site' }) + .click(); const openSite = page.getByRole('button', { name: 'Open site' }); // Stop waiting when the UI reports a failed stage, so the failure snapshot diff --git a/packages/playground/website/playwright/e2e/reprint-ui.spec.ts b/packages/playground/website/playwright/e2e/reprint-ui.spec.ts index 2d750ef13e..c7bd963b90 100644 --- a/packages/playground/website/playwright/e2e/reprint-ui.spec.ts +++ b/packages/playground/website/playwright/e2e/reprint-ui.spec.ts @@ -10,6 +10,7 @@ test( ); await website.goto('./?reprint&name=pull-entry-original'); const page = website.page; + await page.context().grantPermissions(['clipboard-write']); await page.waitForFunction(() => Boolean((window as any).playgroundSites?.getClient()) ); @@ -55,11 +56,31 @@ test( .fill('http://127.0.0.1:1/'); await pane.getByRole('button', { name: 'Check site' }).click(); await pane.getByRole('button', { name: 'Connect manually' }).click(); + await expect( + pane.getByRole('button', { + name: 'Copy migration key', + exact: true, + }) + ).toBeVisible(); + await pane + .getByRole('button', { name: 'Copy migration key', exact: true }) + .click(); + const settingsOpened = page.context().waitForEvent('page'); + await pane + .getByRole('link', { name: 'Open Reprint settings ↗', exact: true }) + .click(); + await (await settingsOpened).close(); + await pane + .locator('summary') + .filter({ hasText: 'Show key and connection details' }) + .click(); await expect( pane.getByRole('textbox', { name: 'Migration key', exact: true }) ).toHaveValue(/^[A-Za-z0-9+/]+=*$/); expect(await activeSlug()).toBe(originalSlug); - await pane.getByRole('button', { name: 'Clone site' }).click(); + await pane + .getByRole('button', { name: 'I’ve authorized it — clone site' }) + .click(); await page.waitForFunction( (slug) => diff --git a/packages/playground/website/src/components/site-manager/site-transfer-panel/index.spec.tsx b/packages/playground/website/src/components/site-manager/site-transfer-panel/index.spec.tsx index 372529485f..01de98ea74 100644 --- a/packages/playground/website/src/components/site-manager/site-transfer-panel/index.spec.tsx +++ b/packages/playground/website/src/components/site-manager/site-transfer-panel/index.spec.tsx @@ -94,7 +94,12 @@ vi.mock('@wordpress/components', () => ({ isBusy?: boolean; }) => href ? ( - + )} + href={href} + target={target} + rel={rel} + > {children} ) : ( @@ -172,6 +177,9 @@ describe('Reprint connection changes', () => { beforeEach(() => { vi.resetAllMocks(); vi.mocked(generateReprintKeyPair).mockResolvedValue(keyPair); + vi.stubGlobal('navigator', { + clipboard: { writeText: vi.fn().mockResolvedValue(undefined) }, + }); ui.pendingClone = undefined; ui.cloneRequested = false; dispatch.mockImplementation((action) => { @@ -216,6 +224,92 @@ describe('Reprint connection changes', () => { ); }); + it('waits for the final confirmation before creating the clone', async () => { + ui.cloneRequested = true; + vi.mocked(detectReprint).mockResolvedValue('needs-key'); + await render(); + edit('url', 'https://example.com'); + await submit(); + // Enter must not skip the copy or settings step. + await act(async () => { + container + .querySelector('form')! + .dispatchEvent( + new Event('submit', { bubbles: true, cancelable: true }) + ); + }); + expect(createNewTemporarySite).not.toHaveBeenCalled(); + await click('Copy migration key'); + expect(navigator.clipboard.writeText).toHaveBeenCalledWith( + keyPair.publicKey + ); + await act(async () => { + container + .querySelector('form')! + .dispatchEvent( + new Event('submit', { bubbles: true, cancelable: true }) + ); + }); + expect(createNewTemporarySite).not.toHaveBeenCalled(); + await click('Open Reprint settings ↗'); + expect(createNewTemporarySite).not.toHaveBeenCalled(); + await click('Back to Reprint settings'); + await click('Back to migration key'); + await submit(); + expect(createNewTemporarySite).toHaveBeenCalledTimes(1); + expect(generateReprintKeyPair).toHaveBeenCalledTimes(1); + }); + + it('allows manual copying when clipboard access is denied', async () => { + vi.mocked(navigator.clipboard.writeText).mockRejectedValue( + new Error('Denied') + ); + vi.mocked(detectReprint).mockResolvedValue('needs-key'); + await render(); + edit('url', 'https://example.com'); + await submit(); + await click('Copy migration key'); + const field = container.querySelector('textarea')!; + expect(field.value).toBe(keyPair.publicKey); + expect(field.closest('details')).toBeNull(); + expect(document.activeElement).toBe(field); + expect(pullSite).not.toHaveBeenCalled(); + await click('I’ve copied the key'); + await click('Open Reprint settings ↗'); + await submit(); + expect(vi.mocked(pullSite).mock.calls[0].slice(1, 3)).toEqual([ + 'https://example.com/', + privateKey, + ]); + expect(generateReprintKeyPair).toHaveBeenCalledTimes(1); + }); + + it('ignores a clipboard result after returning to edit the site address', async () => { + let finish!: () => void; + vi.mocked(navigator.clipboard.writeText).mockReturnValueOnce( + new Promise((resolve) => { + finish = resolve; + }) + ); + vi.mocked(detectReprint).mockResolvedValue('needs-key'); + await render(); + edit('url', 'https://first.example'); + await submit(); + await click('Copy migration key'); + await click('Copying key…'); + expect(navigator.clipboard.writeText).toHaveBeenCalledTimes(1); + await click('Back to site address'); + edit('url', 'https://second.example'); + await submit(); + await act(async () => finish()); + expect(container.querySelector('a[href*="tools.php"]')).toBeNull(); + expect(pullSite).not.toHaveBeenCalled(); + await submit(); + expect(vi.mocked(pullSite).mock.calls[0][1]).toBe( + 'https://second.example/' + ); + }); + it('ignores a late detection result after the address changes', async () => { let finish!: (value: 'configured') => void; vi.mocked(detectReprint).mockReturnValueOnce( @@ -245,6 +339,7 @@ describe('Reprint connection changes', () => { await click('Back to site address'); edit('url', 'https://second.example'); await submit(); + await click('Copy migration key'); expect( container.querySelector('textarea')!.value ).toBe('public-key'); @@ -309,6 +404,7 @@ describe('Reprint connection changes', () => { await render(playground, false); await render(playground, true); expect(playground.readFileAsText).toHaveBeenCalledTimes(2); + await click('Copy migration key'); expect( container.querySelector( 'a[href*="tools.php"]' @@ -341,8 +437,8 @@ describe('Reprint connection changes', () => { ).toBe('https://typed.example'); }); - // Editing or stepping back must not start a pull. Only submitting the key - // starts it, with no direction choice or second confirmation screen. + // Copying the key or opening settings must not start a pull. Confirmation + // starts it with the same pair, even after stepping back to edit the address. it('preserves the key when stepping back and pulls on key submission', async () => { vi.mocked(detectReprint).mockResolvedValue('configured'); await render(); @@ -365,7 +461,7 @@ describe('Reprint connection changes', () => { expect(container.textContent).toContain('Open site'); }); - it('focuses each input and explains completed steps without retaining their forms', async () => { + it('focuses the current task and removes setup after the pull finishes', async () => { vi.mocked(detectReprint).mockResolvedValue('configured'); await render(); expect(document.activeElement).toBe( @@ -373,12 +469,8 @@ describe('Reprint connection changes', () => { ); edit('url', 'https://example.com'); await submit(); - expect(document.activeElement).toBe( - container.querySelector('textarea') - ); - expect(container.textContent).toContain( - 'Reprint settings on example.com' - ); + expect(document.activeElement).toBe(container.querySelector('h3')); + expect(container.textContent).toContain('Copy your migration key'); await submit(); expect(container.textContent).toContain('example.com cloned'); expect(container.querySelector('input')).toBeNull(); @@ -584,9 +676,7 @@ describe('Reprint connection changes', () => { expect( container.querySelector('textarea')!.value ).toBe(keyPair.publicKey); - expect(document.activeElement).toBe( - container.querySelector('textarea') - ); + expect(document.activeElement).toBe(container.querySelector('h3')); expect(generateReprintKeyPair).toHaveBeenCalledTimes(1); expect(pullSite).toHaveBeenCalledTimes(1); await submit(); @@ -789,7 +879,9 @@ describe('Reprint connection changes', () => { async function click(text: string, startsWith = false) { await act(async () => { const button = Array.from( - container.querySelectorAll('button') + container.querySelectorAll< + HTMLButtonElement | HTMLAnchorElement + >('button, a') ).find((button) => startsWith ? button.textContent!.startsWith(text) @@ -843,8 +935,16 @@ describe('Reprint connection changes', () => { input.dispatchEvent(new Event('input', { bubbles: true })); }); } - /** Submit setup without bypassing its current validation state. */ + /** Follow the key guidance before submitting the current setup form. */ async function submit() { + if ( + Array.from(container.querySelectorAll('button')).some( + (button) => button.textContent === 'Copy migration key' + ) + ) { + await click('Copy migration key'); + await click('Open Reprint settings ↗'); + } await act(async () => container .querySelector('form')! diff --git a/packages/playground/website/src/components/site-manager/site-transfer-panel/index.tsx b/packages/playground/website/src/components/site-manager/site-transfer-panel/index.tsx index dcd7cbb0eb..e812e5909a 100644 --- a/packages/playground/website/src/components/site-manager/site-transfer-panel/index.tsx +++ b/packages/playground/website/src/components/site-manager/site-transfer-panel/index.tsx @@ -89,9 +89,16 @@ export function SiteTransferPanel({ rememberedConnection(site.slug)?.keyPair ?? null) ); - const [step, setStep] = useState<'site' | 'install' | 'key' | 'transfer'>( - handoff ? 'transfer' : 'site' - ); + const [step, setStep] = useState< + | 'site' + | 'install' + | 'key' + | 'copying-key' + | 'manual-key' + | 'authorize' + | 'confirm' + | 'transfer' + >(handoff ? 'transfer' : 'site'); // A clone handoff pulls as soon as the new Playground can run PHP. const [autoStart, setAutoStart] = useState(!!handoff); const heading = useRef(null); @@ -228,9 +235,13 @@ export function SiteTransferPanel({ heading.current?.focus(); return; } - const input = content.current?.querySelector< - HTMLInputElement | HTMLTextAreaElement - >('input:not([disabled]):not([type=checkbox]), textarea[readonly]'); + const input = Array.from( + content.current?.querySelectorAll< + HTMLInputElement | HTMLTextAreaElement + >( + 'input:not([disabled]):not([type=checkbox]), textarea[readonly]' + ) ?? [] + ).find((input) => !input.closest('details:not([open])')); if (input) input.focus(); else heading.current?.focus(); }, [step, isVisible, busy, completed, keyPair, setup, error]); @@ -258,6 +269,21 @@ export function SiteTransferPanel({ setCompleted(false); }; + /** Copy during the click gesture; ignore completion after Back or an address edit. */ + const copyMigrationKey = async () => { + if (!keyPair || step === 'copying-key') return; + checkController.current?.abort(); + const controller = new AbortController(); + checkController.current = controller; + setStep('copying-key'); + try { + await navigator.clipboard.writeText(keyPair.publicKey); + if (!controller.signal.aborted) setStep('authorize'); + } catch { + if (!controller.signal.aborted) setStep('manual-key'); + } + }; + /** Advance only when the current address probe returns. */ const checkSite = async () => { checkController.current?.abort(); @@ -304,8 +330,14 @@ export function SiteTransferPanel({ dispatch(setDockPaneSection('new')); return; } - if (step === 'transfer') { + if ( + step === 'transfer' || + step === 'authorize' || + step === 'manual-key' + ) { setStep('key'); + } else if (step === 'confirm') { + setStep('authorize'); } else { skipConnectionRestore.current = true; setSetup(null); @@ -382,8 +414,8 @@ export function SiteTransferPanel({ } catch (error) { setSetup('manual'); if ((error as { name?: string } | null)?.name === 'AbortError') { - // Stopped on request: the key step offers to resume later. - setStep('key'); + // Stopped on request: the confirmation step offers to resume later. + setStep('confirm'); return; } const message = @@ -619,9 +651,13 @@ export function SiteTransferPanel({ backLabel: step === 'site' ? 'Back to New Playground' - : step === 'transfer' + : step === 'transfer' || + step === 'authorize' || + step === 'manual-key' ? 'Back to migration key' - : 'Back to site address', + : step === 'confirm' + ? 'Back to Reprint settings' + : 'Back to site address', onBack: goBack, } : undefined @@ -656,6 +692,19 @@ export function SiteTransferPanel({ } }; + const migrationKeyField = ( + {}} + readOnly + autoFocus={isVisible && step === 'manual-key'} + onFocus={(event) => event.target.select()} + value={keyPair?.publicKey ?? ''} + rows={3} + /> + ); + return (
)} - {!busy && !completed && step === 'key' && links && ( -
{ - event.preventDefault(); - if (cloneRequested) { - void cloneIntoNewSite(); - return; - } - if (keyReady && ready) { - rememberConnection( - site.slug, - getReprintAdminUrls(url).site, - keyPair! - ); - void start(); - } - }} - > - - {generatingKey && ( - - )} - {keyPair && ( - <> -

- In{' '} - - Reprint settings on {hostname} - - , paste this migration key into{' '} - Migration Token and - choose Authorize tool. - Then come back and clone the site. -

+ {!busy && + !completed && + step !== 'site' && + step !== 'install' && + step !== 'transfer' && + links && ( + { + event.preventDefault(); + if (step !== 'confirm') return; + if (cloneRequested) { + void cloneIntoNewSite(); + return; + } + if (keyReady && ready) { + rememberConnection( + site.slug, + getReprintAdminUrls(url).site, + keyPair! + ); + void start(); + } + }} + > + +
    +
  1. + 1. Copy key +
  2. +
  3. + 2. Authorize +
  4. +
  5. + 3. {cloning ? 'Clone' : 'Pull'} +
  6. +
+

+ {step === 'authorize' + ? `Authorize on ${hostname}` + : step === 'confirm' + ? 'Finish on your live site' + : 'Copy your migration key'} +

+ {(step === 'key' || step === 'copying-key') && (

- Older versions use the{' '} - Public key field and{' '} - Enroll key button. + You’ll paste it into Reprint on your + live site.

- {}} - readOnly - autoFocus={isVisible} - onFocus={(event) => - event.target.select() - } - value={keyPair.publicKey} - rows={3} - /> + )} + {generatingKey && ( + + )} + {step === 'manual-key' && ( + <> +

+ We couldn’t copy automatically. + Select and copy the key below. +

+ {migrationKeyField} + + )} + {step === 'authorize' && ( +

+ + Key copied +

+ )} + {(step === 'authorize' || + step === 'confirm') && ( + +
  • + Paste the key into{' '} + Migration Token. +
  • +
  • + Choose{' '} + Authorize tool + {step === 'confirm' + ? ', then return here.' + : '.'} +
  • +
    + )} + {step === 'authorize' ? ( -

    - Only the migration key goes to your live - site. The private key stays in this tab - and is reused when you retry. -

    + ) : ( - - )} - {!cloneRequested && ( - - )} - {!cloneRequested && !ready && playground && ( - - Enable networking and use PHP 8.1 or newer. - - )} -
    - - )} + )} + {step === 'authorize' && ( +

    + Opens in a new tab. Return here when + you’re done. +

    + )} + {step === 'confirm' && ( +

    + We’ll check access before copying your + site. +

    + )} + {(step === 'authorize' || + step === 'confirm') && ( +
    + + My screen looks different + +

    + Older versions use the{' '} + Public key field + and Enroll key{' '} + button. +

    +
    + )} + {keyPair && ( +
    + + {step === 'manual-key' + ? 'About this connection' + : 'Show key and connection details'} + + {step !== 'manual-key' && + migrationKeyField} +

    + Only the migration key goes to your + live site. The private key stays in + this tab and is reused when you + retry. +

    + {step === 'confirm' && ( + + )} +
    + )} + {!cloneRequested && ( + + )} + {!cloneRequested && !ready && playground && ( + + Enable networking and use PHP 8.1 or + newer. + + )} +
    + + )} {busy && } {busy && confirmStop && ( diff --git a/packages/playground/website/src/components/site-manager/site-transfer-panel/style.module.css b/packages/playground/website/src/components/site-manager/site-transfer-panel/style.module.css index c946a6c4aa..a14867cc4b 100644 --- a/packages/playground/website/src/components/site-manager/site-transfer-panel/style.module.css +++ b/packages/playground/website/src/components/site-manager/site-transfer-panel/style.module.css @@ -117,6 +117,43 @@ min-height: 0; } +.key-steps { + color: var(--ink-muted); + display: flex; + flex-wrap: wrap; + font-size: 13px; + gap: var(--space-4); + list-style: none; + margin: 0 0 var(--space-2); + padding: 0; +} + +.key-steps [aria-current='step'] { + color: var(--ink); + font-weight: 600; +} + +.key-copied { + align-items: center; + color: var(--ink-muted); + display: flex; + font-size: 13px; + gap: var(--space-1); +} + +.connection-details { + color: var(--ink-muted); + font-size: 13px; +} + +.connection-details summary { + cursor: pointer; +} + +.connection-details[open] > :not(summary) { + margin-top: var(--space-3); +} + .error { overflow-wrap: anywhere; } From 0f35426c7b9658ed9c2dc8db062adf45dfbd236a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20Zieli=C5=84ski?= Date: Thu, 29 Oct 2026 18:10:17 +0100 Subject: [PATCH 2/5] [Website] Keep Reprint steps visible while attention moves forward --- .../website/playwright/e2e/reprint-ui.spec.ts | 12 + .../site-transfer-panel/index.spec.tsx | 41 +- .../site-transfer-panel/index.tsx | 433 +++++++++--------- .../site-transfer-panel/style.module.css | 26 +- 4 files changed, 276 insertions(+), 236 deletions(-) diff --git a/packages/playground/website/playwright/e2e/reprint-ui.spec.ts b/packages/playground/website/playwright/e2e/reprint-ui.spec.ts index c7bd963b90..474d14598b 100644 --- a/packages/playground/website/playwright/e2e/reprint-ui.spec.ts +++ b/packages/playground/website/playwright/e2e/reprint-ui.spec.ts @@ -65,11 +65,23 @@ test( await pane .getByRole('button', { name: 'Copy migration key', exact: true }) .click(); + await expect( + pane.getByRole('button', { + name: 'Copy migration key', + exact: true, + }) + ).toBeFocused(); const settingsOpened = page.context().waitForEvent('page'); await pane .getByRole('link', { name: 'Open Reprint settings ↗', exact: true }) .click(); await (await settingsOpened).close(); + await expect( + pane.getByRole('link', { + name: 'Open Reprint settings ↗', + exact: true, + }) + ).toBeFocused(); await pane .locator('summary') .filter({ hasText: 'Show key and connection details' }) diff --git a/packages/playground/website/src/components/site-manager/site-transfer-panel/index.spec.tsx b/packages/playground/website/src/components/site-manager/site-transfer-panel/index.spec.tsx index 01de98ea74..01c357807f 100644 --- a/packages/playground/website/src/components/site-manager/site-transfer-panel/index.spec.tsx +++ b/packages/playground/website/src/components/site-manager/site-transfer-panel/index.spec.tsx @@ -80,6 +80,7 @@ vi.mock('@wordpress/components', () => ({ variant: _variant, isDestructive: _destructive, isBusy: _busy, + accessibleWhenDisabled, type = 'button', href, target, @@ -92,6 +93,7 @@ vi.mock('@wordpress/components', () => ({ variant?: string; isDestructive?: boolean; isBusy?: boolean; + accessibleWhenDisabled?: boolean; }) => href ? ( ({ {children} ) : ( - ), @@ -253,8 +259,8 @@ describe('Reprint connection changes', () => { expect(createNewTemporarySite).not.toHaveBeenCalled(); await click('Open Reprint settings ↗'); expect(createNewTemporarySite).not.toHaveBeenCalled(); - await click('Back to Reprint settings'); - await click('Back to migration key'); + await click('Back to site address'); + await submit(); await submit(); expect(createNewTemporarySite).toHaveBeenCalledTimes(1); expect(generateReprintKeyPair).toHaveBeenCalledTimes(1); @@ -284,6 +290,32 @@ describe('Reprint connection changes', () => { expect(generateReprintKeyPair).toHaveBeenCalledTimes(1); }); + it('keeps the same controls focused as the checklist advances', async () => { + vi.mocked(detectReprint).mockResolvedValue('needs-key'); + await render(); + edit('url', 'https://example.com'); + await submit(); + const copy = Array.from(container.querySelectorAll('button')).find( + (button) => button.textContent === 'Copy migration key' + )!; + copy.focus(); + await click('Copy migration key'); + expect(document.activeElement).toBe(copy); + const settings = container.querySelector( + 'a[href*="tools.php"]' + )!; + settings.focus(); + await click('Open Reprint settings ↗'); + expect(document.activeElement).toBe(settings); + await click('Copy migration key'); + expect( + container + .querySelector('button[type=submit]')! + .hasAttribute('disabled') + ).toBe(false); + expect(pullSite).not.toHaveBeenCalled(); + }); + it('ignores a clipboard result after returning to edit the site address', async () => { let finish!: () => void; vi.mocked(navigator.clipboard.writeText).mockReturnValueOnce( @@ -296,7 +328,7 @@ describe('Reprint connection changes', () => { edit('url', 'https://first.example'); await submit(); await click('Copy migration key'); - await click('Copying key…'); + await click('Copy migration key'); expect(navigator.clipboard.writeText).toHaveBeenCalledTimes(1); await click('Back to site address'); edit('url', 'https://second.example'); @@ -938,6 +970,7 @@ describe('Reprint connection changes', () => { /** Follow the key guidance before submitting the current setup form. */ async function submit() { if ( + !container.querySelector('a[href*="tools.php"]') && Array.from(container.querySelectorAll('button')).some( (button) => button.textContent === 'Copy migration key' ) diff --git a/packages/playground/website/src/components/site-manager/site-transfer-panel/index.tsx b/packages/playground/website/src/components/site-manager/site-transfer-panel/index.tsx index e812e5909a..ea138f4293 100644 --- a/packages/playground/website/src/components/site-manager/site-transfer-panel/index.tsx +++ b/packages/playground/website/src/components/site-manager/site-transfer-panel/index.tsx @@ -17,6 +17,7 @@ import { } from '@wordpress/components'; import { Icon, check, moreVertical } from '@wordpress/icons'; import { formatBytes } from '@php-wasm/util'; +import { usePrevious } from '../../../lib/hooks/use-previous'; import { generateReprintKeyPair, type ReprintKeyPair, @@ -153,6 +154,12 @@ export function SiteTransferPanel({ playground && site.metadata.runtimeConfiguration.networking && Number.parseFloat(site.metadata.runtimeConfiguration.phpVersion) >= 8.1; + const isKeySetup = + step !== 'site' && step !== 'install' && step !== 'transfer'; + const wasKeySetupVisible = usePrevious( + isKeySetup && isVisible && !busy && !completed + ); + const keyCopied = step === 'authorize' || step === 'confirm'; // Restore only an idle address form. A late saved-connection read must not // replace transfer progress or a completed clone. Explicit address editing @@ -235,6 +242,9 @@ export function SiteTransferPanel({ heading.current?.focus(); return; } + // Copying and opening settings update the same checklist. Keep the clicked + // control focused instead of sending keyboard users back to its heading. + if (isKeySetup && wasKeySetupVisible && step !== 'manual-key') return; const input = Array.from( content.current?.querySelectorAll< HTMLInputElement | HTMLTextAreaElement @@ -244,7 +254,17 @@ export function SiteTransferPanel({ ).find((input) => !input.closest('details:not([open])')); if (input) input.focus(); else heading.current?.focus(); - }, [step, isVisible, busy, completed, keyPair, setup, error]); + }, [ + step, + isVisible, + busy, + completed, + keyPair, + setup, + error, + isKeySetup, + wasKeySetupVisible, + ]); useEffect(() => { if (!busy) return; @@ -275,10 +295,12 @@ export function SiteTransferPanel({ checkController.current?.abort(); const controller = new AbortController(); checkController.current = controller; - setStep('copying-key'); + // Copying again must not undo a settings tab the user already opened. + if (!keyCopied) setStep('copying-key'); try { await navigator.clipboard.writeText(keyPair.publicKey); - if (!controller.signal.aborted) setStep('authorize'); + if (!controller.signal.aborted) + setStep(step === 'confirm' ? 'confirm' : 'authorize'); } catch { if (!controller.signal.aborted) setStep('manual-key'); } @@ -330,14 +352,8 @@ export function SiteTransferPanel({ dispatch(setDockPaneSection('new')); return; } - if ( - step === 'transfer' || - step === 'authorize' || - step === 'manual-key' - ) { + if (step === 'transfer') { setStep('key'); - } else if (step === 'confirm') { - setStep('authorize'); } else { skipConnectionRestore.current = true; setSetup(null); @@ -651,13 +667,9 @@ export function SiteTransferPanel({ backLabel: step === 'site' ? 'Back to New Playground' - : step === 'transfer' || - step === 'authorize' || - step === 'manual-key' + : step === 'transfer' ? 'Back to migration key' - : step === 'confirm' - ? 'Back to Reprint settings' - : 'Back to site address', + : 'Back to site address', onBack: goBack, } : undefined @@ -709,7 +721,7 @@ export function SiteTransferPanel({
    {error && ( @@ -918,228 +930,205 @@ export function SiteTransferPanel({ )} - {!busy && - !completed && - step !== 'site' && - step !== 'install' && - step !== 'transfer' && - links && ( -
    { - event.preventDefault(); - if (step !== 'confirm') return; - if (cloneRequested) { - void cloneIntoNewSite(); - return; - } - if (keyReady && ready) { - rememberConnection( - site.slug, - getReprintAdminUrls(url).site, - keyPair! - ); - void start(); - } - }} - > - -
      { + event.preventDefault(); + if (step !== 'confirm') return; + if (cloneRequested) { + void cloneIntoNewSite(); + return; + } + if (keyReady && ready) { + rememberConnection( + site.slug, + getReprintAdminUrls(url).site, + keyPair! + ); + void start(); + } + }} + > + +
        +
      1. -
      2. - 1. Copy key -
      3. -
      4. - 2. Authorize -
      5. -
      6. - 3. {cloning ? 'Clone' : 'Pull'} -
      7. -
      -

      - {step === 'authorize' - ? `Authorize on ${hostname}` - : step === 'confirm' - ? 'Finish on your live site' - : 'Copy your migration key'} -

      - {(step === 'key' || step === 'copying-key') && ( + 1. Copy your migration key +

      You’ll paste it into Reprint on your live site.

      - )} - {generatingKey && ( - - )} - {step === 'manual-key' && ( - <> -

      - We couldn’t copy automatically. - Select and copy the key below. -

      - {migrationKeyField} - - )} - {step === 'authorize' && ( -

      - - Key copied -

      - )} - {(step === 'authorize' || - step === 'confirm') && ( - -
    1. - Paste the key into{' '} - Migration Token. -
    2. -
    3. - Choose{' '} - Authorize tool - {step === 'confirm' - ? ', then return here.' - : '.'} -
    4. -
      - )} - {step === 'authorize' ? ( - + + {keyCopied && ( + <> + + Copied + + )} + +
    + +
  • +

    - Open Reprint settings ↗ - - ) : ( + 2. Authorize on {hostname} +

    +

    + Paste into{' '} + Migration Token, then + choose Authorize tool. +

    + {keyCopied ? ( + + ) : ( + + )} +
  • +
  • +

    + 3. Return here and{' '} + {cloning ? 'clone' : 'pull'} your site +

    +

    + We’ll check access before copying your + site. +

    - )} - {step === 'authorize' && ( -

    - Opens in a new tab. Return here when - you’re done. -

    - )} - {step === 'confirm' && ( +
  • + +
    + My screen looks different +

    + Older versions use the{' '} + Public key field and{' '} + Enroll key button. +

    +
    + {keyPair && ( +
    + + {step === 'manual-key' + ? 'About this connection' + : 'Show key and connection details'} + + {step !== 'manual-key' && migrationKeyField}

    - We’ll check access before copying your - site. + Only the migration key goes to your live + site. The private key stays in this tab + and is reused when you retry.

    - )} - {(step === 'authorize' || - step === 'confirm') && ( -
    - - My screen looks different - -

    - Older versions use the{' '} - Public key field - and Enroll key{' '} - button. -

    -
    - )} - {keyPair && ( -
    - - {step === 'manual-key' - ? 'About this connection' - : 'Show key and connection details'} - - {step !== 'manual-key' && - migrationKeyField} -

    - Only the migration key goes to your - live site. The private key stays in - this tab and is reused when you - retry. -

    - {step === 'confirm' && ( - - )} -
    - )} - {!cloneRequested && ( - - )} - {!cloneRequested && !ready && playground && ( - - Enable networking and use PHP 8.1 or - newer. - - )} - - - )} +
    + )} + {!cloneRequested && ( + + )} + {!cloneRequested && !ready && playground && ( + + Enable networking and use PHP 8.1 or newer. + + )} +
    + + )} {busy && } {busy && confirmStop && ( diff --git a/packages/playground/website/src/components/site-manager/site-transfer-panel/style.module.css b/packages/playground/website/src/components/site-manager/site-transfer-panel/style.module.css index a14867cc4b..10f3e3b6c8 100644 --- a/packages/playground/website/src/components/site-manager/site-transfer-panel/style.module.css +++ b/packages/playground/website/src/components/site-manager/site-transfer-panel/style.module.css @@ -117,20 +117,26 @@ min-height: 0; } -.key-steps { - color: var(--ink-muted); - display: flex; - flex-wrap: wrap; - font-size: 13px; - gap: var(--space-4); +.connection-steps { + display: grid; + gap: var(--space-6); list-style: none; - margin: 0 0 var(--space-2); + margin: 0; padding: 0; } -.key-steps [aria-current='step'] { - color: var(--ink); - font-weight: 600; +.connection-steps > li { + display: flex; + flex-direction: column; + gap: var(--space-3); +} + +.connection-steps > li:not([aria-current='step']) .setup-title { + color: var(--ink-muted); +} + +.connection-steps :global(.components-button:disabled) { + color: var(--ink-muted); } .key-copied { From 3547fd36d09a14fe59c5cd8a3e8870fc0c568c91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20Zieli=C5=84ski?= Date: Thu, 29 Oct 2026 18:16:30 +0100 Subject: [PATCH 3/5] [Website] Remove legacy Reprint field-name help --- .../components/site-manager/site-transfer-panel/index.tsx | 8 -------- 1 file changed, 8 deletions(-) diff --git a/packages/playground/website/src/components/site-manager/site-transfer-panel/index.tsx b/packages/playground/website/src/components/site-manager/site-transfer-panel/index.tsx index ea138f4293..e3ada66dbb 100644 --- a/packages/playground/website/src/components/site-manager/site-transfer-panel/index.tsx +++ b/packages/playground/website/src/components/site-manager/site-transfer-panel/index.tsx @@ -1095,14 +1095,6 @@ export function SiteTransferPanel({ -
    - My screen looks different -

    - Older versions use the{' '} - Public key field and{' '} - Enroll key button. -

    -
    {keyPair && (
    From 1b4e64f52ae6ed231fc4fef2e781bd2a3b072ab1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20Zieli=C5=84ski?= Date: Thu, 29 Oct 2026 19:35:51 +0100 Subject: [PATCH 4/5] [Website] Preserve the current setup step after repeated key copies --- .../site-transfer-panel/index.spec.tsx | 37 +++++++++++++++++++ .../site-transfer-panel/index.tsx | 14 +++++-- 2 files changed, 48 insertions(+), 3 deletions(-) diff --git a/packages/playground/website/src/components/site-manager/site-transfer-panel/index.spec.tsx b/packages/playground/website/src/components/site-manager/site-transfer-panel/index.spec.tsx index 01c357807f..d4638a3f55 100644 --- a/packages/playground/website/src/components/site-manager/site-transfer-panel/index.spec.tsx +++ b/packages/playground/website/src/components/site-manager/site-transfer-panel/index.spec.tsx @@ -316,6 +316,43 @@ describe('Reprint connection changes', () => { expect(pullSite).not.toHaveBeenCalled(); }); + it.each(['succeeds', 'fails'])( + 'keeps the pull enabled when a pending second copy %s after settings opens', + async (result) => { + vi.mocked(detectReprint).mockResolvedValue('needs-key'); + await render(); + edit('url', 'https://example.com'); + await submit(); + await click('Copy migration key'); + + let finish!: () => void; + vi.mocked(navigator.clipboard.writeText).mockReturnValueOnce( + new Promise((resolve, reject) => { + finish = () => { + if (result === 'succeeds') resolve(); + else reject(new Error('Denied')); + }; + }) + ); + await click('Copy migration key'); + await click('Open Reprint settings ↗'); + expect( + container.querySelector( + 'button[type=submit]' + )!.disabled + ).toBe(false); + + await act(async () => finish()); + expect( + container.querySelector( + 'button[type=submit]' + )!.disabled + ).toBe(false); + await submit(); + expect(pullSite).toHaveBeenCalledTimes(1); + } + ); + it('ignores a clipboard result after returning to edit the site address', async () => { let finish!: () => void; vi.mocked(navigator.clipboard.writeText).mockReturnValueOnce( diff --git a/packages/playground/website/src/components/site-manager/site-transfer-panel/index.tsx b/packages/playground/website/src/components/site-manager/site-transfer-panel/index.tsx index f697f2c032..17f2448e64 100644 --- a/packages/playground/website/src/components/site-manager/site-transfer-panel/index.tsx +++ b/packages/playground/website/src/components/site-manager/site-transfer-panel/index.tsx @@ -291,7 +291,10 @@ export function SiteTransferPanel({ setCompleted(false); }; - /** Copy during the click gesture; ignore completion after Back or an address edit. */ + /** + * Copy during the click gesture; ignore completion after Back or an address edit. + * A repeated copy must leave any newer setup step in place. + */ const copyMigrationKey = async () => { if (!keyPair || step === 'copying-key') return; checkController.current?.abort(); @@ -302,9 +305,14 @@ export function SiteTransferPanel({ try { await navigator.clipboard.writeText(keyPair.publicKey); if (!controller.signal.aborted) - setStep(step === 'confirm' ? 'confirm' : 'authorize'); + setStep((current) => + current === 'copying-key' ? 'authorize' : current + ); } catch { - if (!controller.signal.aborted) setStep('manual-key'); + if (!controller.signal.aborted) + setStep((current) => + current === 'copying-key' ? 'manual-key' : current + ); } }; From eeae4e6d1b72045cc7b7847d2e813c4eb9296b89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20Zieli=C5=84ski?= Date: Thu, 29 Oct 2026 19:53:05 +0100 Subject: [PATCH 5/5] [Website] Keep Copy focused when retrying after a clone failure --- .../site-transfer-panel/index.spec.tsx | 23 +++++++++++++++++++ .../site-transfer-panel/index.tsx | 2 ++ 2 files changed, 25 insertions(+) diff --git a/packages/playground/website/src/components/site-manager/site-transfer-panel/index.spec.tsx b/packages/playground/website/src/components/site-manager/site-transfer-panel/index.spec.tsx index d4638a3f55..8da644d020 100644 --- a/packages/playground/website/src/components/site-manager/site-transfer-panel/index.spec.tsx +++ b/packages/playground/website/src/components/site-manager/site-transfer-panel/index.spec.tsx @@ -316,6 +316,29 @@ describe('Reprint connection changes', () => { expect(pullSite).not.toHaveBeenCalled(); }); + it('keeps Copy focused when retrying after clone creation fails', async () => { + ui.cloneRequested = true; + createNewTemporarySite.mockRejectedValueOnce( + new Error('Creating the clone failed') + ); + vi.mocked(detectReprint).mockResolvedValue('needs-key'); + await render(); + edit('url', 'https://example.com'); + await submit(); + await submit(); + expect(container.textContent).toContain('Creating the clone failed'); + + const copy = Array.from(container.querySelectorAll('button')).find( + (button) => button.textContent === 'Copy migration key' + )!; + copy.focus(); + await click('Copy migration key'); + expect(document.activeElement).toBe(copy); + expect(container.textContent).not.toContain( + 'Creating the clone failed' + ); + }); + it.each(['succeeds', 'fails'])( 'keeps the pull enabled when a pending second copy %s after settings opens', async (result) => { diff --git a/packages/playground/website/src/components/site-manager/site-transfer-panel/index.tsx b/packages/playground/website/src/components/site-manager/site-transfer-panel/index.tsx index 17f2448e64..7183c6ace9 100644 --- a/packages/playground/website/src/components/site-manager/site-transfer-panel/index.tsx +++ b/packages/playground/website/src/components/site-manager/site-transfer-panel/index.tsx @@ -298,6 +298,8 @@ export function SiteTransferPanel({ const copyMigrationKey = async () => { if (!keyPair || step === 'copying-key') return; checkController.current?.abort(); + // An old clone error would make the focus effect jump back to its heading. + setError(''); const controller = new AbortController(); checkController.current = controller; // Copying again must not undo a settings tab the user already opened.