@strapi/upload 5.52.1 → 5.52.3

package/dist/admin/future/pages/Assets/utils/mergeUploadedAssets.mjs

@@ -0,0 +1,83 @@
+/**
+ * Merges just-uploaded assets into the loaded asset list so each one appears as
+ * soon as its own upload finishes, rather than when the whole batch settles.
+ *
+ * The upload is one mutation per batch, so its cache invalidation fires once at
+ * the end. These helpers bridge that gap purely client-side: the completed
+ * uploads already sit in the progress store as full `File` objects, so they can
+ * be placed into the list at their sort position with no extra request.
+ *
+ * The server list stays authoritative — merging never reorders it, and an id it
+ * already contains wins over the local copy, so the end-of-batch refetch
+ * silently takes over.
+ */ const SORT_FIELDS = [
+    'createdAt',
+    'updatedAt',
+    'name',
+    'size'
+];
+const isSortField = (value)=>SORT_FIELDS.includes(value);
+const DEFAULT_RULE = 'updatedAt:DESC';
+const compareByField = (field, a, b)=>{
+    if (field === 'size') {
+        return (a.size ?? 0) - (b.size ?? 0);
+    }
+    if (field === 'name') {
+        return a.name.localeCompare(b.name);
+    }
+    // `createdAt` / `updatedAt` are ISO-8601, which sorts correctly as text.
+    return (a[field] ?? '').localeCompare(b[field] ?? '');
+};
+/**
+ * Comparator matching a `<field>:<ASC|DESC>` sort rule, as sent to the API.
+ *
+ * Ties break on id so the order is total: without it, two files sharing a
+ * timestamp could swap places between renders.
+ */ const getAssetComparator = (rule = DEFAULT_RULE)=>{
+    const [field, requestedDirection] = rule.split(':');
+    // An unrecognised field discards the direction too: half-applying a rule we
+    // cannot read would order the list differently from the default it stands in for.
+    const isKnownField = isSortField(field);
+    const sortField = isKnownField ? field : 'updatedAt';
+    const direction = isKnownField ? requestedDirection : 'DESC';
+    const sign = direction === 'ASC' ? 1 : -1;
+    return (a, b)=>{
+        const byField = compareByField(sortField, a, b);
+        return byField !== 0 ? sign * byField : sign * (a.id - b.id);
+    };
+};
+/**
+ * Places `uploaded` into `assets` at their sort position.
+ *
+ * An upload that sorts past everything loaded is dropped unless the list is
+ * fully loaded: it belongs on a page the user has not reached, and appending it
+ * would show it adjacent to the last loaded item instead of at its real place.
+ */ const mergeUploadedAssets = ({ assets, uploaded, sort, hasNextPage })=>{
+    if (uploaded.length === 0) {
+        return assets;
+    }
+    const loadedIds = new Set(assets.map((asset)=>asset.id));
+    const compare = getAssetComparator(sort);
+    const fresh = uploaded.filter((asset)=>!loadedIds.has(asset.id)).sort(compare);
+    if (fresh.length === 0) {
+        return assets;
+    }
+    const merged = [
+        ...assets
+    ];
+    for (const asset of fresh){
+        const at = merged.findIndex((loaded)=>compare(asset, loaded) < 0);
+        if (at === -1) {
+            if (hasNextPage) {
+                continue;
+            }
+            merged.push(asset);
+        } else {
+            merged.splice(at, 0, asset);
+        }
+    }
+    return merged;
+};
+
+export { getAssetComparator, mergeUploadedAssets };
+//# sourceMappingURL=mergeUploadedAssets.mjs.map

package/dist/admin/future/pages/Assets/utils/mergeUploadedAssets.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"mergeUploadedAssets.mjs","sources":["../../../../../../admin/src/future/pages/Assets/utils/mergeUploadedAssets.ts"],"sourcesContent":["/**\n * Merges just-uploaded assets into the loaded asset list so each one appears as\n * soon as its own upload finishes, rather than when the whole batch settles.\n *\n * The upload is one mutation per batch, so its cache invalidation fires once at\n * the end. These helpers bridge that gap purely client-side: the completed\n * uploads already sit in the progress store as full `File` objects, so they can\n * be placed into the list at their sort position with no extra request.\n *\n * The server list stays authoritative — merging never reorders it, and an id it\n * already contains wins over the local copy, so the end-of-batch refetch\n * silently takes over.\n */\n\nimport type { File } from '../../../../../../shared/contracts/files';\n\ntype SortField = 'createdAt' | 'updatedAt' | 'name' | 'size';\n\nconst SORT_FIELDS: SortField[] = ['createdAt', 'updatedAt', 'name', 'size'];\n\nconst isSortField = (value: string): value is SortField =>\n  (SORT_FIELDS as string[]).includes(value);\n\nconst DEFAULT_RULE = 'updatedAt:DESC';\n\nconst compareByField = (field: SortField, a: File, b: File): number => {\n  if (field === 'size') {\n    return (a.size ?? 0) - (b.size ?? 0);\n  }\n\n  if (field === 'name') {\n    return a.name.localeCompare(b.name);\n  }\n\n  // `createdAt` / `updatedAt` are ISO-8601, which sorts correctly as text.\n  return (a[field] ?? '').localeCompare(b[field] ?? '');\n};\n\n/**\n * Comparator matching a `<field>:<ASC|DESC>` sort rule, as sent to the API.\n *\n * Ties break on id so the order is total: without it, two files sharing a\n * timestamp could swap places between renders.\n */\nexport const getAssetComparator = (rule: string = DEFAULT_RULE) => {\n  const [field, requestedDirection] = rule.split(':');\n  // An unrecognised field discards the direction too: half-applying a rule we\n  // cannot read would order the list differently from the default it stands in for.\n  const isKnownField = isSortField(field);\n  const sortField: SortField = isKnownField ? field : 'updatedAt';\n  const direction = isKnownField ? requestedDirection : 'DESC';\n  const sign = direction === 'ASC' ? 1 : -1;\n\n  return (a: File, b: File): number => {\n    const byField = compareByField(sortField, a, b);\n\n    return byField !== 0 ? sign * byField : sign * (a.id - b.id);\n  };\n};\n\n/**\n * Places `uploaded` into `assets` at their sort position.\n *\n * An upload that sorts past everything loaded is dropped unless the list is\n * fully loaded: it belongs on a page the user has not reached, and appending it\n * would show it adjacent to the last loaded item instead of at its real place.\n */\nexport const mergeUploadedAssets = ({\n  assets,\n  uploaded,\n  sort,\n  hasNextPage,\n}: {\n  assets: File[];\n  uploaded: File[];\n  sort?: string;\n  /** Whether more pages remain, i.e. the tail of the list is not loaded. */\n  hasNextPage: boolean;\n}): File[] => {\n  if (uploaded.length === 0) {\n    return assets;\n  }\n\n  const loadedIds = new Set(assets.map((asset) => asset.id));\n  const compare = getAssetComparator(sort);\n  const fresh = uploaded.filter((asset) => !loadedIds.has(asset.id)).sort(compare);\n\n  if (fresh.length === 0) {\n    return assets;\n  }\n\n  const merged = [...assets];\n\n  for (const asset of fresh) {\n    const at = merged.findIndex((loaded) => compare(asset, loaded) < 0);\n\n    if (at === -1) {\n      if (hasNextPage) {\n        continue;\n      }\n      merged.push(asset);\n    } else {\n      merged.splice(at, 0, asset);\n    }\n  }\n\n  return merged;\n};\n"],"names":["SORT_FIELDS","isSortField","value","includes","DEFAULT_RULE","compareByField","field","a","b","size","name","localeCompare","getAssetComparator","rule","requestedDirection","split","isKnownField","sortField","direction","sign","byField","id","mergeUploadedAssets","assets","uploaded","sort","hasNextPage","length","loadedIds","Set","map","asset","compare","fresh","filter","has","merged","at","findIndex","loaded","push","splice"],"mappings":"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"}

package/dist/admin/future/pages/Assets/utils/renderedKeys.js

@@ -0,0 +1,19 @@
+'use strict';
+
+var selection = require('./selection.js');
+
+/**
+ * The keys of the items actually on screen, in render order.
+ *
+ * Single source for every consumer of the rendered set — range selection,
+ * select-all and the bulk action bar. Derived once so they cannot disagree:
+ * in "Folders: Mixed with files" the rows come from `mergeMixedList`, which
+ * withholds folders sorting after the last loaded asset, so `folders` is not
+ * the rendered folder set.
+ */ const buildRenderedKeys = ({ folders, assets, mixedItems })=>mixedItems ? mixedItems.map((item)=>item.kind === 'folder' ? selection.folderKey(item.folder.id) : selection.assetKey(item.asset.id)) : [
+        ...folders.map((folder)=>selection.folderKey(folder.id)),
+        ...assets.map((asset)=>selection.assetKey(asset.id))
+    ];
+
+exports.buildRenderedKeys = buildRenderedKeys;
+//# sourceMappingURL=renderedKeys.js.map

package/dist/admin/future/pages/Assets/utils/renderedKeys.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"renderedKeys.js","sources":["../../../../../../admin/src/future/pages/Assets/utils/renderedKeys.ts"],"sourcesContent":["import { assetKey, folderKey, type ItemKey } from './selection';\n\nimport type { MixedItem } from './mergeMixedList';\nimport type { File } from '../../../../../../shared/contracts/files';\nimport type { Folder } from '../../../../../../shared/contracts/folders';\n\n/**\n * The keys of the items actually on screen, in render order.\n *\n * Single source for every consumer of the rendered set — range selection,\n * select-all and the bulk action bar. Derived once so they cannot disagree:\n * in \"Folders: Mixed with files\" the rows come from `mergeMixedList`, which\n * withholds folders sorting after the last loaded asset, so `folders` is not\n * the rendered folder set.\n */\nexport const buildRenderedKeys = ({\n  folders,\n  assets,\n  mixedItems,\n}: {\n  folders: Folder[];\n  assets: File[];\n  /** The interleaved rows, when the table is in mixed mode. */\n  mixedItems?: MixedItem[] | null;\n}): ItemKey[] =>\n  mixedItems\n    ? mixedItems.map((item) =>\n        item.kind === 'folder' ? folderKey(item.folder.id) : assetKey(item.asset.id)\n      )\n    : [\n        ...folders.map((folder) => folderKey(folder.id)),\n        ...assets.map((asset) => assetKey(asset.id)),\n      ];\n"],"names":["buildRenderedKeys","folders","assets","mixedItems","map","item","kind","folderKey","folder","id","assetKey","asset"],"mappings":";;;;AAMA;;;;;;;;AAQC,IACM,MAAMA,iBAAAA,GAAoB,CAAC,EAChCC,OAAO,EACPC,MAAM,EACNC,UAAU,EAMX,GACCA,UAAAA,GACIA,WAAWC,GAAG,CAAC,CAACC,IAAAA,GACdA,IAAAA,CAAKC,IAAI,KAAK,QAAA,GAAWC,oBAAUF,IAAAA,CAAKG,MAAM,CAACC,EAAE,IAAIC,kBAAAA,CAASL,IAAAA,CAAKM,KAAK,CAACF,EAAE,CAAA,CAAA,GAE7E;AACKR,QAAAA,GAAAA,OAAAA,CAAQG,GAAG,CAAC,CAACI,MAAAA,GAAWD,mBAAAA,CAAUC,OAAOC,EAAE,CAAA,CAAA;AAC3CP,QAAAA,GAAAA,MAAAA,CAAOE,GAAG,CAAC,CAACO,KAAAA,GAAUD,kBAAAA,CAASC,MAAMF,EAAE,CAAA;;;;;"}

package/dist/admin/future/pages/Assets/utils/renderedKeys.mjs

@@ -0,0 +1,17 @@
+import { folderKey, assetKey } from './selection.mjs';
+
+/**
+ * The keys of the items actually on screen, in render order.
+ *
+ * Single source for every consumer of the rendered set — range selection,
+ * select-all and the bulk action bar. Derived once so they cannot disagree:
+ * in "Folders: Mixed with files" the rows come from `mergeMixedList`, which
+ * withholds folders sorting after the last loaded asset, so `folders` is not
+ * the rendered folder set.
+ */ const buildRenderedKeys = ({ folders, assets, mixedItems })=>mixedItems ? mixedItems.map((item)=>item.kind === 'folder' ? folderKey(item.folder.id) : assetKey(item.asset.id)) : [
+        ...folders.map((folder)=>folderKey(folder.id)),
+        ...assets.map((asset)=>assetKey(asset.id))
+    ];
+
+export { buildRenderedKeys };
+//# sourceMappingURL=renderedKeys.mjs.map

package/dist/admin/future/pages/Assets/utils/renderedKeys.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"renderedKeys.mjs","sources":["../../../../../../admin/src/future/pages/Assets/utils/renderedKeys.ts"],"sourcesContent":["import { assetKey, folderKey, type ItemKey } from './selection';\n\nimport type { MixedItem } from './mergeMixedList';\nimport type { File } from '../../../../../../shared/contracts/files';\nimport type { Folder } from '../../../../../../shared/contracts/folders';\n\n/**\n * The keys of the items actually on screen, in render order.\n *\n * Single source for every consumer of the rendered set — range selection,\n * select-all and the bulk action bar. Derived once so they cannot disagree:\n * in \"Folders: Mixed with files\" the rows come from `mergeMixedList`, which\n * withholds folders sorting after the last loaded asset, so `folders` is not\n * the rendered folder set.\n */\nexport const buildRenderedKeys = ({\n  folders,\n  assets,\n  mixedItems,\n}: {\n  folders: Folder[];\n  assets: File[];\n  /** The interleaved rows, when the table is in mixed mode. */\n  mixedItems?: MixedItem[] | null;\n}): ItemKey[] =>\n  mixedItems\n    ? mixedItems.map((item) =>\n        item.kind === 'folder' ? folderKey(item.folder.id) : assetKey(item.asset.id)\n      )\n    : [\n        ...folders.map((folder) => folderKey(folder.id)),\n        ...assets.map((asset) => assetKey(asset.id)),\n      ];\n"],"names":["buildRenderedKeys","folders","assets","mixedItems","map","item","kind","folderKey","folder","id","assetKey","asset"],"mappings":";;AAMA;;;;;;;;AAQC,IACM,MAAMA,iBAAAA,GAAoB,CAAC,EAChCC,OAAO,EACPC,MAAM,EACNC,UAAU,EAMX,GACCA,UAAAA,GACIA,WAAWC,GAAG,CAAC,CAACC,IAAAA,GACdA,IAAAA,CAAKC,IAAI,KAAK,QAAA,GAAWC,UAAUF,IAAAA,CAAKG,MAAM,CAACC,EAAE,IAAIC,QAAAA,CAASL,IAAAA,CAAKM,KAAK,CAACF,EAAE,CAAA,CAAA,GAE7E;AACKR,QAAAA,GAAAA,OAAAA,CAAQG,GAAG,CAAC,CAACI,MAAAA,GAAWD,SAAAA,CAAUC,OAAOC,EAAE,CAAA,CAAA;AAC3CP,QAAAA,GAAAA,MAAAA,CAAOE,GAAG,CAAC,CAACO,KAAAA,GAAUD,QAAAA,CAASC,MAAMF,EAAE,CAAA;;;;;"}

package/dist/admin/future/services/api.js

@@ -43,11 +43,37 @@ const unregisterAbortController = (uploadId)=>{
         unregisterAbortController(uploadId);
     }
 };
+/**
+ * Runs are chained per batch rather than started in parallel: a second pool
+ * alongside the first would double the files in flight and make `concurrency`
+ * stop meaning anything.
+ */ const poolTails = new Map();
+const trackPoolRun = (uploadId, run)=>{
+    // Not swallowed: the caller still gets the real result from `run`.
+    const tail = run.catch(()=>undefined);
+    poolTails.set(uploadId, tail);
+    tail.then(()=>{
+        // Leave the entry alone if another run has queued behind us in the meantime.
+        if (poolTails.get(uploadId) === tail) {
+            poolTails.delete(uploadId);
+        }
+    });
+};
 /** Maps a server per-file outcome onto the row's terminal metadata status. */ const METADATA_STATUS_BY_RESULT = {
     success: 'generated',
     skipped: 'skipped',
     error: 'failed'
 };
+/**
+ * Re-attaches the folder an upload targeted.
+ *
+ * The create response is built from `db.query().create()` with no populate, so
+ * it comes back without the folder relation it was just given. The list needs
+ * it to tell whether a freshly uploaded asset belongs to the folder on screen.
+ */ const withTargetFolder = (file, folder)=>file.folder != null ? file : {
+        ...file,
+        folder: folder ?? null
+    };
 /**
  * Kicks off AI metadata generation for a freshly uploaded file.
  *
@@ -116,7 +142,8 @@ const unregisterAbortController = (uploadId)=>{
         dispatch(uploadProgress.setFileUploading({
             name: fileName,
             index,
-            size: entry.file.size
+            size: entry.file.size,
+            uploadId
         }));
         const formData = new FormData();
         formData.append('files', entry.file);
@@ -125,7 +152,8 @@ const unregisterAbortController = (uploadId)=>{
         const batcher = createRafBatcher.createRafBatcher((bytes)=>{
             dispatch(uploadProgress.setFileProgress({
                 index,
-                bytes
+                bytes,
+                uploadId
             }));
         });
         try {
@@ -134,7 +162,9 @@ const unregisterAbortController = (uploadId)=>{
             uploaded.push(file);
             dispatch(uploadProgress.setFileComplete({
                 index,
-                file
+                file: withTargetFolder(file, entry.fileInfo?.folder),
+                uploadId,
+                completedAt: Date.now()
             }));
             // Not awaited: overlaps with the next file's upload and can't fail the batch.
             maybeGenerateMetadata({
@@ -155,7 +185,8 @@ const unregisterAbortController = (uploadId)=>{
             dispatch(uploadProgress.setFileError({
                 index,
                 name: fileName,
-                message
+                message,
+                uploadId
             }));
         }
     };
@@ -185,6 +216,44 @@ const unregisterAbortController = (uploadId)=>{
         data: uploaded
     };
 };
+/**
+ * Reuses the batch's AbortController so one Cancel stops both drops.
+ * `runUploadPool` unregisters it on finish, hence the re-register below.
+ *
+ * Resolves with the whole batch's files, not just this leg's: the mutation
+ * models one drop, and after a merge the drop is the batch. The earlier leg's
+ * files come from the tail this run queued behind.
+ */ const runMergedUploadPool = async ({ entries, indices, token, uploadId, dispatch, concurrency, generateAiMetadata })=>{
+    const abortController = abortControllers.get(uploadId) ?? new AbortController();
+    const run = (poolTails.get(uploadId) ?? Promise.resolve(undefined)).then((previous)=>{
+        // A failed earlier leg contributes no files; its error already reached the
+        // store, and this leg still has files of its own to upload.
+        const earlier = previous?.data ?? [];
+        if (abortController.signal.aborted) {
+            return {
+                data: earlier
+            };
+        }
+        registerAbortController(uploadId, abortController);
+        return runUploadPool({
+            entries,
+            indices,
+            token,
+            uploadId,
+            abortController,
+            dispatch,
+            concurrency,
+            generateAiMetadata
+        }).then((result)=>result.error ? result : {
+                data: [
+                    ...earlier,
+                    ...result.data ?? []
+                ]
+            });
+    });
+    trackPoolRun(uploadId, run);
+    return run;
+};
 /* -------------------------------------------------------------------------------------------------
  * URL upload flow (SSE) — kept as-is for this iteration
  * -----------------------------------------------------------------------------------------------*/ /**
@@ -240,7 +309,7 @@ const unregisterAbortController = (uploadId)=>{
 /**
  * Processes an SSE stream from the URL upload endpoint.
  * Dispatches Redux actions for each file event and returns the final result.
- */ const processSSEStream = async ({ response, dispatch, uploadId, generateAiMetadata })=>{
+ */ const processSSEStream = async ({ response, dispatch, uploadId, generateAiMetadata, folderId })=>{
     const reader = response.body.getReader();
     const decoder = new TextDecoder();
     let streamResult = null;
@@ -271,7 +340,8 @@ const unregisterAbortController = (uploadId)=>{
                         dispatch(uploadProgress.setFileUploading({
                             name: parsed.url,
                             index,
-                            size: 0
+                            size: 0,
+                            uploadId
                         }));
                         break;
                     }
@@ -281,7 +351,8 @@ const unregisterAbortController = (uploadId)=>{
                         dispatch(uploadProgress.setFileUploading({
                             name: payload.name,
                             index,
-                            size: payload.size
+                            size: payload.size,
+                            uploadId
                         }));
                         break;
                     }
@@ -290,7 +361,9 @@ const unregisterAbortController = (uploadId)=>{
                         const payload = parsed;
                         dispatch(uploadProgress.setFileComplete({
                             index,
-                            file: payload.file
+                            file: withTargetFolder(payload.file, folderId),
+                            uploadId,
+                            completedAt: Date.now()
                         }));
                         // Same fire-and-forget semantics as the file flow.
                         maybeGenerateMetadata({
@@ -308,7 +381,8 @@ const unregisterAbortController = (uploadId)=>{
                         dispatch(uploadProgress.setFileError({
                             index,
                             name: payload.name,
-                            message: payload.message
+                            message: payload.message,
+                            uploadId
                         }));
                         break;
                     }
@@ -357,6 +431,38 @@ const uploadApi = strapiAdmin.adminApi.enhanceEndpoints({
                         }));
                     const fileNames = entries.map((entry)=>entry.fileInfo.name ?? entry.file.name);
                     const fileSizes = entries.map((entry)=>entry.file.size);
+                    // `uploadFromUrls` also leaves rows `pending`, but registers no batch —
+                    // so an unregistered batch is not ours to merge into, and appending would
+                    // land on top of its rows.
+                    const progress = getState().uploadProgress;
+                    const batch = getUploadEntries(progress.uploadId);
+                    const isMerge = batch !== undefined && uploadProgress.isUploadInFlight(progress.files);
+                    if (isMerge) {
+                        const { uploadId } = progress;
+                        const offset = batch.entries.length;
+                        // No `totalFiles`: the reducer derives it from the rows it appends.
+                        dispatch(uploadProgress.appendUploadFiles({
+                            uploadId,
+                            fileNames,
+                            fileSizes
+                        }));
+                        const mergedEntries = [
+                            ...batch.entries,
+                            ...entries
+                        ];
+                        // Merged files adopt the batch's flags: a new concurrency would raise
+                        // the ceiling it exists to impose.
+                        registerUploadEntries(uploadId, mergedEntries, batch.generateAiMetadata, batch.concurrency);
+                        return runMergedUploadPool({
+                            entries: mergedEntries,
+                            indices: entries.map((_, index)=>offset + index),
+                            token,
+                            uploadId,
+                            dispatch,
+                            concurrency: batch.concurrency,
+                            generateAiMetadata: batch.generateAiMetadata
+                        });
+                    }
                     // Open the progress dialog
                     dispatch(uploadProgress.openUploadProgress({
                         totalFiles,
@@ -370,7 +476,7 @@ const uploadApi = strapiAdmin.adminApi.enhanceEndpoints({
                     // One AbortController per batch
                     const abortController = new AbortController();
                     registerAbortController(uploadId, abortController);
-                    return runUploadPool({
+                    const run = runUploadPool({
                         entries,
                         indices: entries.map((_, index)=>index),
                         token,
@@ -380,6 +486,8 @@ const uploadApi = strapiAdmin.adminApi.enhanceEndpoints({
                         concurrency,
                         generateAiMetadata
                     });
+                    trackPoolRun(uploadId, run);
+                    return run;
                 },
                 // `Folder, LIST` refreshes the folder header count, which changes when
                 // files are added to it.
@@ -413,7 +521,11 @@ const uploadApi = strapiAdmin.adminApi.enhanceEndpoints({
                             data: uploaded
                         };
                     } catch (err) {
-                        const message = err instanceof Error ? err.message : 'Upload failed';
+                        // Only pass on text the server actually sent. The XHR layer's own
+                        // fallbacks are hardcoded English, and callers here (crop → "Save
+                        // as copy") have a localized message of their own; an empty string
+                        // reads as "nothing usable" and lets theirs win.
+                        const message = err instanceof uploadFileViaXHR.UploadFileError && err.isServerMessage ? err.message : '';
                         return {
                             error: {
                                 name: 'UnknownError',
@@ -466,7 +578,7 @@ const uploadApi = strapiAdmin.adminApi.enhanceEndpoints({
                     // Fresh AbortController for the retry run
                     const abortController = new AbortController();
                     registerAbortController(uploadId, abortController);
-                    return runUploadPool({
+                    const run = runUploadPool({
                         entries: batch.entries,
                         indices: cancelledIndices,
                         token,
@@ -477,6 +589,11 @@ const uploadApi = strapiAdmin.adminApi.enhanceEndpoints({
                         concurrency: batch.concurrency,
                         generateAiMetadata: batch.generateAiMetadata
                     });
+                    // Retried rows are `pending` again, so a drop lands on the merge branch.
+                    // Untracked, that merge would find no tail to queue behind and run its
+                    // pool beside this one — two pools of `concurrency` each.
+                    trackPoolRun(uploadId, run);
+                    return run;
                 },
                 // `Folder, LIST` refreshes the folder header count, which changes when
                 // files are added to it.
@@ -546,7 +663,8 @@ const uploadApi = strapiAdmin.adminApi.enhanceEndpoints({
                             response,
                             dispatch,
                             uploadId,
-                            generateAiMetadata
+                            generateAiMetadata,
+                            folderId
                         });
                         unregisterAbortController(uploadId);
                         if (streamResult && streamResult.data.length > 0) {