[PB-6531]: merge folder uploads into the existing folder on skip

[terrerox]

Description

Stacked on #2150, which sits on #2039. Skipping a folder that already exists now merges it into the existing one: existing files are ignored, new files and subfolders are uploaded, and colliding subfolders are merged recursively so the structure is preserved. The merge helpers live in nameCollision.actions.ts and upload skips route to them; the unit suite covers the recursion.

Second commit adds the Playwright coverage that needs this PR or its mock extensions: keep both for files and folders, replacing a folder, merging a skipped folder into the existing one, replace, keep both and skip for moved files, and versioned replace. The Drive mock from #2150 gains folders, folder creation, moves and a versioning flag; moves are driven by dispatching the HTML5 drag events on the row's drop zone (a data-test hook on it). Flows that wait for a bucket upload never settle with the bridge blocked, so those specs assert on recorded requests and the task panel instead of the dialog closing; the versioned replace check is Chromium-only.

Related Issues

Related Pull Requests

• Previous: [PB-6531]: e2e coverage for the skip option in name collisions #2150

Checklist

• Changes have been tested locally.
• Unit tests have been written or updated as necessary.
• The code adheres to the repository's coding standards.
• Relevant documentation has been added or updated.
• No new warnings or errors have been introduced.
• SonarCloud issues have been reviewed and addressed.
• QA Passed

Testing Process

yarn vitest run src/app/drive/components/NameCollisionDialog and yarn playwright test test/e2e/tests/specs/DRIVE-internxt-name-collision-resolutions.spec.ts test/e2e/tests/specs/DRIVE-internxt-name-collision-skip.spec.ts --project "Internxt E2E tests on chromium" with the dev server running.

[cloudflare-workers-and-pages]

Deploying drive-web with    Cloudflare Pages

Latest commit:	b37601a
Status:	✅  Deploy successful!
Preview URL:	https://ece9f1d6.drive-web.pages.dev
Branch Preview URL:	https://feat-name-collision-folder-m.drive-web.pages.dev

View logs

[CandelR]

I find it odd that the ‘skip’ feature doesn’t skip uploading the folder, instead, it skips the ‘replace’ step and uploads the items into the existing folder. Has this been confirmed by Product? I find it confusing

[terrerox]

I find it odd that the ‘skip’ feature doesn’t skip uploading the folder, instead, it skips the ‘replace’ step and uploads the items into the existing folder. Has this been confirmed by Product? I find it confusing

Yes, confirmed. As explicitly stated in the ticket:

Case 3 — Folder Upload

The user uploads a folder containing a mix of:

• Existing files
• New files

If Skip is selected:

• Existing files are ignored
• New files continue uploading
• The folder structure is preserved.

[sonarqubecloud]

Quality Gate failed

Failed conditions
C Reliability Rating on New Code (required ≥ A)

See analysis details on SonarQube Cloud

Catch issues before they fail your Quality Gate with our IDE extension SonarQube for IDE