Skip to content

feat: per-file tracking for folder uploads in upload queue #3786

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Crash-- wants to merge 10 commits into
base: fix/upload-queue-fileId-identity
Choose a base branch
from
Open

feat: per-file tracking for folder uploads in upload queue #3786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c1c5b73
fix: reducer fallback on file.name, fix extractFilesEntries, cleanup …
Crash-- Apr 6, 2026
6e66ad7
feat: flatten folder uploads into individual file items in upload queue
Crash-- Apr 6, 2026
ac3f655
feat: show upload queue immediately before folder resolution
Crash-- Apr 6, 2026
59d2f76
refactor: reduce cyclomatic complexity in upload module
Crash-- Apr 6, 2026
ab6ea25
fix: RESOLVE_FOLDER_ITEMS appends new items for DropzoneDnD folder drops
Crash-- Apr 6, 2026
70fef8e
Update src/modules/upload/index.js
Crash-- Apr 6, 2026
b725ca5
perf: pre-index resolvedItems by fileId in mergeResolvedItems for O(n…
Copilot Apr 6, 2026
31b1669
Apply suggestion from @Copilot
Crash-- Apr 7, 2026
f2132dd
fix: resolve rebase conflicts, remove dead code, fix lint
Crash-- Apr 7, 2026
d21f35a
refactor: extract helpers to fix CodeScene complexity in upload module
Crash-- Apr 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions src/modules/upload/Dropzone.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,6 @@ import { uploadFiles } from '@/modules/navigation/duck'
import DropzoneTeaser from '@/modules/upload/DropzoneTeaser'
import { useNewItemHighlightContext } from '@/modules/upload/NewItemHighlightProvider'

// DnD helpers for folder upload
const canHandleFolders = evt => {
if (!evt.dataTransfer) return false
const dt = evt.dataTransfer
return dt.items && dt.items.length && dt.items[0].webkitGetAsEntry != null
}

const canDrop = evt => {
const items = evt.dataTransfer.items
for (let i = 0; i < items.length; i += 1) {
Expand Down Expand Up @@ -55,7 +48,9 @@ export const Dropzone = ({
const onDrop = async (files, _, evt) => {
if (!canDrop(evt)) return

const filesToUpload = canHandleFolders(evt) ? evt.dataTransfer.items : files
// react-dropzone sets file.path on each File with the relative path.
// addToUploadQueue uses file.path to detect and handle folder uploads.
const filesToUpload = files
dispatch(
uploadFiles(
filesToUpload,
Expand Down
3 changes: 3 additions & 0 deletions src/modules/upload/DropzoneDnD.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@ export const Dropzone = ({
canDrop: item => !disabled && canDropHelper(item),
drop(item) {
if (disabled) return
// react-dnd calls drop() synchronously during the native drop event,
// so DataTransferItemList and webkitGetAsEntry() are still valid here
// (unlike react-dropzone which processes files asynchronously).
const filesToUpload = canHandleFolders(item)
? item.dataTransfer.items
: item.files
Expand Down
27 changes: 22 additions & 5 deletions src/modules/upload/UploadQueue.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,28 @@ export const DumbUploadQueue = translate()(props => {
)
})

const mapStateToProps = state => ({
queue: getUploadQueue(state),
doneCount: getProcessed(state).length,
successCount: getSuccessful(state).length
})
const mapStateToProps = state => {
const rawQueue = getUploadQueue(state)

// Replace file.name with relativePath for display when available
const queue = rawQueue.map(item => {
if (!item.relativePath) return item
return {
...item,
file: {
name: item.relativePath,
Copy link
Copy Markdown
Member

@rezk2ll rezk2ll Apr 7, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This might break icon resolution since we pass a path instead of a file name

Copy link
Copy Markdown
Contributor Author

@Crash-- Crash-- Apr 7, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm interesting. I'll check that and add a test for that.

type: item.file?.type,
size: item.file?.size
}
}
})
Comment on lines +43 to +57
Copy link

Copilot AI Apr 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mapStateToProps always creates a new queue array via rawQueue.map(...) even when no items have relativePath. This breaks referential equality and can trigger re-renders of the connected UploadQueue on any store update. Consider memoizing this transformation (e.g., reselect) or only mapping when at least one item needs a display override.

Copilot uses AI. Check for mistakes.
Copy link
Copy Markdown
Contributor Author

@Crash-- Crash-- Apr 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@copilot apply changes based on this feedback


return {
queue,
doneCount: getProcessed(state).length,
successCount: getSuccessful(state).length
}
}
const mapDispatchToProps = dispatch => ({
purgeQueue: () => dispatch(purgeUploadQueue())
})
Expand Down
Loading
Loading