Conversation
Deploying drive-web with
|
| Latest commit: |
fbb014d
|
| Status: | ✅ Deploy successful! |
| Preview URL: | https://81eabbed.drive-web.pages.dev |
| Branch Preview URL: | https://feat-name-collision-folder-m.drive-web.pages.dev |
7 tasks
terrerox
marked this pull request as draft
August 26, 2026 03:55
terrerox
marked this pull request as ready for review
August 26, 2026 04:02
terrerox
force-pushed
the
feat/name-collision-folder-merge-on-skip
branch
from
September 11, 2026 03:19
834e9e0 to
6bc5800
Compare
7 tasks
terrerox
changed the base branch from
feat/skip-item-option-in-name-collision
to
refactor/extract-name-collision-logic
September 11, 2026 03:20
terrerox
force-pushed
the
feat/name-collision-folder-merge-on-skip
branch
from
September 11, 2026 03:40
6bc5800 to
c2df4b0
Compare
terrerox
changed the base branch from
refactor/extract-name-collision-logic
to
feat/skip-item-option-in-name-collision
September 11, 2026 03:40
7 tasks
terrerox
added this pull request to stack #2149
September 11, 2026 04:06
terrerox
force-pushed
the
feat/name-collision-folder-merge-on-skip
branch
from
September 11, 2026 04:43
c2df4b0 to
f16a105
Compare
terrerox
force-pushed
the
feat/name-collision-folder-merge-on-skip
branch
from
September 11, 2026 05:32
f16a105 to
a1e01e8
Compare
7 tasks
terrerox
removed this pull request from stack #2149
September 11, 2026 05:41
terrerox
changed the base branch from
feat/skip-item-option-in-name-collision
to
test/name-collision-skip-e2e
September 11, 2026 05:49
terrerox
added this pull request to stack #2151
September 11, 2026 05:49
Skipping a colliding folder upload now keeps the existing folder and uploads only the files and subfolders that do not exist yet, merging colliding subfolders recursively so the folder structure is preserved.
Covers 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 now tracks folders, folder creation, moves and a versioning flag; moves are driven by dispatching the HTML5 drag events on the row's drop zone.
terrerox
force-pushed
the
feat/name-collision-folder-merge-on-skip
branch
from
September 15, 2026 03:33
64d8f9c to
fbb014d
Compare
|
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
1 participant
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
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.tsand 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-testhook 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
Checklist
Testing Process
yarn vitest run src/app/drive/components/NameCollisionDialogandyarn 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.