[PB-6531]feat/skip item option in name collision by jaaaaavier · Pull Request #2039 · internxt/drive-web

jaaaaavier · 2026-07-13T12:57:03Z

Description

Stacked on #2148 (which sits on #2147 and #2146). Adds a Skip option to the name-collision dialog, next to Replace and Keep both, for both upload and move collisions. Duplicates are now resolved one at a time, and a new "Apply this action to all duplicates" checkbox handles them all at once, closing the dialog immediately and running the work in the background.

The container logic lives in nameCollision.actions.ts and nameCollision.utils.ts (extracted in #2146 and #2147), so this PR adds the skip branch to the resolvers, the pending-group bookkeeping for the one-at-a-time flow, and their unit tests. The name-based matching and batching fixes that used to be bundled here are now #2148.

Also: the renameModal i18n block is renamed to alreadyExistsModal (the dialog doesn't rename anything), the description text is operation-neutral, and the apply-to-all label toggles the checkbox.

Skipping a folder is a no-op here; merging its new content into the existing folder comes in #2129, stacked on this one.

Related Issues

Related Pull Requests

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

Tested uploading existing files, then, verified that all functions work as expected

Additional Notes

cloudflare-workers-and-pages · 2026-07-13T12:58:31Z

Deploying drive-web with Cloudflare Pages

Latest commit:	`53ac5f2`
Status:	⚡️ Build in progress...

View logs

sonarqubecloud · 2026-07-13T13:01:46Z

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

CandelR · 2026-07-20T14:42:12Z

      "title": "Umbenennen",
      "label": "Name"
    },
-    "renameModal": {


nit: why teh change of the key?

CandelR · 2026-07-20T14:43:32Z

-      "description": "{{itemName}} ya existe en esta carpeta. ¿Deseas reemplazarlo o mantener los dos?",
-      "multipleDescription": "Más de un elemento existe en esta localización. Deseas reemplazarlos o mantenerlos?",
+      "selectOption": "Selecciona una opción",
+      "description": "{{itemName}} ya existe en esta ubicación. ¿Deseas reemplazarlo por el que estás moviendo?",


it is like always gonna move all the items and it is not the only action. The modal also is used for uploading

CandelR · 2026-07-20T14:45:13Z

+        {remainingItemsCount > 1 && (
+          <div className="flex items-center">
+            <Checkbox checked={applyToAll} onClick={() => setApplyToAll((prev) => !prev)} />
+            <p className="ml-2 select-none text-base font-medium text-gray-80">
+              {translate('modals.alreadyExistsModal.applyToAll')}
+            </p>
+          </div>
+        )}


to keep element consistency maybe we should do that pressint the text also select/unselect the checkbox

CandelR · 2026-07-20T15:01:49Z

+      case 'upload' + 'replace':
+        await replaceAndUploadSingleItem(itemToUpload as IRoot | File, itemToReplace, group.destinationUuid);
+        break;
+      case 'upload' + 'skip':


move + skip option should exists or is only for upload option?

github-actions · 2026-08-20T07:40:53Z

This pull request has been inactive for 30 days. Is it still in progress? If so, please leave a comment or make an update to keep it open. Otherwise, it will be closed automatically in 15 days.

terrerox · 2026-08-26T01:06:29Z

The folder-merge behavior (skip keeps the existing folder and uploads only the new content) is in the follow-up #2129, stacked on this branch

CandelR · 2026-09-09T15:19:39Z

+      case 'move' + 'keep':
+        await keepAndMoveItems([itemToUpload as DriveItemData], group.destinationUuid);
+        dispatch(storageActions.popItemsToDelete([itemToUpload as DriveItemData]));
+        break;
+      case 'move' + 'replace':
+        await replaceAndMoveItems(pairs as CollisionPair<DriveItemData>[], group.destinationUuid);
+        dispatch(storageActions.popItemsToDelete([itemToUpload as DriveItemData]));
+        break;
+      case 'upload' + 'keep':
+        await keepAndUploadItems([itemToUpload as IRoot | File], group.destinationUuid);
+        break;
+      case 'upload' + 'replace':
+        await replaceAndUploadItems(pairs as CollisionPair<IRoot | File>[], group.destinationUuid);
+        break;
+      case 'upload' + 'skip':
+      case 'move' + 'skip':
+        break;
+    }


This is almost duplicated, please check it. All the logic for managing the different types of items and actions can be moved out of the component, add tests to all that logic.

CandelR · 2026-09-09T15:22:25Z

+    const movedItem = itemToUpload as DriveItemData;
+    return existingItems.find(
+      (existing) =>
+        !!existing.isFolder === !!movedItem.isFolder &&


I'm not sure if existingItems items have the isFolder field.

Covers single and multiple duplicates, per-item and apply-to-all skipping, non-conflicting files still uploading, and Replace trashing the matching file, with auth, bootstrap and Drive endpoints mocked so the specs run without a backend. Queued uploads are asserted through the task panel because Playwright cannot intercept the bridge in Firefox.

Adds a Skip option to the name-collision dialog, next to Replace and Keep both, for both upload and move collisions. Duplicates are resolved one at a time, and a new "Apply this action to all duplicates" checkbox handles them all at once, closing the dialog immediately and running the work in the background. The renameModal i18n block is renamed to alreadyExistsModal (the dialog does not rename anything), the description text is operation-neutral and the apply-to-all label toggles the checkbox.

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.

…at a time

…te related logic

…restore-e2e [PB-6531]: e2e coverage for same-name restore collisions

…atch [PB-6531]: resolve same-name items within a move collision batch

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

[PB-6531]: e2e coverage for the skip option in name collisions

sonarqubecloud · 2026-10-07T14:48:49Z

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

jaaaaavier self-assigned this Jul 13, 2026

jaaaaavier added the enhancement New feature or request label Jul 13, 2026

jaaaaavier marked this pull request as ready for review July 13, 2026 14:03

jaaaaavier requested review from CandelR and larryrider as code owners July 13, 2026 14:03

CandelR reviewed Jul 20, 2026

View reviewed changes

github-actions Bot added the stalled label Aug 20, 2026

terrerox self-assigned this Aug 22, 2026

github-actions Bot removed the stalled label Aug 22, 2026

terrerox marked this pull request as draft August 22, 2026 16:21

terrerox force-pushed the feat/skip-item-option-in-name-collision branch 2 times, most recently from a8f0beb to 9ce4b8b Compare August 26, 2026 00:56

terrerox marked this pull request as ready for review August 26, 2026 01:06

terrerox mentioned this pull request Aug 26, 2026

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

Merged

4 of 7 tasks

terrerox requested a review from CandelR August 26, 2026 14:49

CandelR requested changes Sep 9, 2026

View reviewed changes

terrerox mentioned this pull request Sep 11, 2026

[PB-6531]: extract name collision logic out of the container #2145

Closed

4 of 7 tasks

terrerox force-pushed the feat/skip-item-option-in-name-collision branch from 9ce4b8b to 41817e2 Compare September 11, 2026 03:40

terrerox changed the base branch from master to fix/name-collision-matching-and-batching September 11, 2026 03:40

This was referenced Sep 11, 2026

[PB-6531]: extract name collision move actions out of the container #2146

Merged

[PB-6531]: match name collisions by name and type and batch their resolution #2148

Merged

terrerox added this pull request to stack #2149 September 11, 2026 04:06

terrerox force-pushed the feat/skip-item-option-in-name-collision branch from 41817e2 to 890333f Compare September 11, 2026 04:43

terrerox mentioned this pull request Sep 11, 2026

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

Merged

4 of 7 tasks

terrerox removed this pull request from stack #2149 September 11, 2026 05:41

terrerox added this pull request to stack #2151 September 11, 2026 05:44

terrerox requested a review from CandelR September 11, 2026 05:51

terrerox force-pushed the fix/name-collision-matching-and-batching branch from 7091a30 to bce942f Compare September 15, 2026 03:33

terrerox force-pushed the feat/skip-item-option-in-name-collision branch from 890333f to c327fed Compare September 15, 2026 03:33

CandelR previously approved these changes Sep 18, 2026

View reviewed changes

terrerox mentioned this pull request Sep 20, 2026

[PB-6531]: resolve same-name items within a move collision batch #2159

Merged

4 of 7 tasks

terrerox dismissed CandelR’s stale review via dec3bf9 September 27, 2026 23:57

terrerox force-pushed the feat/skip-item-option-in-name-collision branch 2 times, most recently from dec3bf9 to 6c5fa93 Compare September 30, 2026 02:25

terrerox force-pushed the feat/skip-item-option-in-name-collision branch 2 times, most recently from 8be0b5a to c4b1f37 Compare October 7, 2026 01:03

terrerox added 9 commits October 7, 2026 09:25

feat: merge folder uploads into the existing folder on skip

858fda9

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.

test: ensure collision dialog closes after resolving file upload

b37601a

test: add e2e coverage for same-name restore collisions

c66e58e

fix: resolve same-name items within a move collision batch

8322c32

test: add e2e coverage for same-name restore collisions resolved one …

f9e798b

…at a time

fix: restore same-name items resolved one at a time with replace

846a9a6

terrerox force-pushed the feat/skip-item-option-in-name-collision branch from c4b1f37 to c947fa0 Compare October 7, 2026 13:25

terrerox removed this pull request from stack #2151 October 7, 2026 13:28

terrerox and others added 6 commits October 7, 2026 10:04

feat: add versioning max file size to name collision context and upda…

b733417

…te related logic

feat: enhance unique name handling for file uploads to avoid collisions

f549f92

Merge pull request #2160 from internxt/test/name-collision-same-name-…

8b4af77

…restore-e2e [PB-6531]: e2e coverage for same-name restore collisions

Merge pull request #2159 from internxt/fix/name-collision-same-name-b…

c0be480

…atch [PB-6531]: resolve same-name items within a move collision batch

Merge pull request #2129 from internxt/feat/name-collision-folder-mer…

d6191a4

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

Merge pull request #2150 from internxt/test/name-collision-skip-e2e

53ac5f2

[PB-6531]: e2e coverage for the skip option in name collisions

terrerox merged commit afbfe83 into fix/name-collision-matching-and-batching Oct 7, 2026
1 of 3 checks passed

terrerox deleted the feat/skip-item-option-in-name-collision branch October 7, 2026 14:43

Navigation Menu

Repository navigation

[PB-6531]feat/skip item option in name collision - #2039

[PB-6531]feat/skip item option in name collision#2039
terrerox merged 15 commits into
fix/name-collision-matching-and-batchingfrom
feat/skip-item-option-in-name-collision

jaaaaavier commented Jul 13, 2026 •

edited by terrerox

Loading

Uh oh!

cloudflare-workers-and-pages Bot commented Jul 13, 2026 •

edited

Loading

Uh oh!

sonarqubecloud Bot commented Jul 13, 2026

Uh oh!

CandelR Jul 20, 2026

Uh oh!

CandelR Jul 20, 2026

Uh oh!

CandelR Jul 20, 2026

Uh oh!

CandelR Jul 20, 2026

Uh oh!

github-actions Bot commented Aug 20, 2026

Uh oh!

terrerox commented Aug 26, 2026

Uh oh!

CandelR Sep 9, 2026

Uh oh!

CandelR Sep 9, 2026

Uh oh!

Uh oh!

sonarqubecloud Bot commented Oct 7, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

jaaaaavier commented Jul 13, 2026 • edited by terrerox Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Related Issues

Related Pull Requests

Checklist

Testing Process

Additional Notes

Uh oh!

cloudflare-workers-and-pages Bot commented Jul 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Deploying drive-web with Cloudflare Pages

Uh oh!

sonarqubecloud Bot commented Jul 13, 2026

Quality Gate passed

Uh oh!

CandelR Jul 20, 2026

Choose a reason for hiding this comment

Uh oh!

CandelR Jul 20, 2026

Choose a reason for hiding this comment

Uh oh!

CandelR Jul 20, 2026

Choose a reason for hiding this comment

Uh oh!

CandelR Jul 20, 2026

Choose a reason for hiding this comment

Uh oh!

github-actions Bot commented Aug 20, 2026

Uh oh!

terrerox commented Aug 26, 2026

Uh oh!

CandelR Sep 9, 2026

Choose a reason for hiding this comment

Uh oh!

CandelR Sep 9, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

sonarqubecloud Bot commented Oct 7, 2026

Quality Gate failed

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

jaaaaavier commented Jul 13, 2026 •

edited by terrerox

Loading

cloudflare-workers-and-pages Bot commented Jul 13, 2026 •

edited

Loading