From 1ae2671f4c09c61dfafc204783679a3d53f47d7c Mon Sep 17 00:00:00 2001 From: gitstart Date: Thu, 8 Dec 2022 16:22:35 +0000 Subject: [PATCH 1/3] fix: select all when page is greater than one --- packages/core/upload/admin/src/pages/App/MediaLibrary.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/upload/admin/src/pages/App/MediaLibrary.js b/packages/core/upload/admin/src/pages/App/MediaLibrary.js index 5c4c8f1085..63d995121e 100644 --- a/packages/core/upload/admin/src/pages/App/MediaLibrary.js +++ b/packages/core/upload/admin/src/pages/App/MediaLibrary.js @@ -211,7 +211,7 @@ export const MediaLibrary = () => { } selectAll([ ...assets.map((asset) => ({ ...asset, type: 'asset' })), - ...folders.map((folder) => ({ ...folder, type: 'folder' })), + ...(folders ?? []).map((folder) => ({ ...folder, type: 'folder' })), ]); }} /> From 664b5a8245aaaf82a0f8a3c1e2b105ad2f44b2e0 Mon Sep 17 00:00:00 2001 From: gitstart Date: Fri, 9 Dec 2022 16:26:08 +0000 Subject: [PATCH 2/3] chore: set default value for undefined folders --- packages/core/upload/admin/src/pages/App/MediaLibrary.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/core/upload/admin/src/pages/App/MediaLibrary.js b/packages/core/upload/admin/src/pages/App/MediaLibrary.js index 63d995121e..d8041b1288 100644 --- a/packages/core/upload/admin/src/pages/App/MediaLibrary.js +++ b/packages/core/upload/admin/src/pages/App/MediaLibrary.js @@ -82,7 +82,7 @@ export const MediaLibrary = () => { }); const { - data: folders, + data: folders = [], isLoading: foldersLoading, errors: foldersError, } = useFolders({ @@ -211,7 +211,7 @@ export const MediaLibrary = () => { } selectAll([ ...assets.map((asset) => ({ ...asset, type: 'asset' })), - ...(folders ?? []).map((folder) => ({ ...folder, type: 'folder' })), + ...folders.map((folder) => ({ ...folder, type: 'folder' })), ]); }} /> From 32972b043333f092f74b5bf70be7134c56b470d3 Mon Sep 17 00:00:00 2001 From: gitstart Date: Tue, 13 Dec 2022 10:03:59 +0000 Subject: [PATCH 3/3] chore: removes optional chaining --- packages/core/upload/admin/src/pages/App/MediaLibrary.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/upload/admin/src/pages/App/MediaLibrary.js b/packages/core/upload/admin/src/pages/App/MediaLibrary.js index d8041b1288..a4ccd227a1 100644 --- a/packages/core/upload/admin/src/pages/App/MediaLibrary.js +++ b/packages/core/upload/admin/src/pages/App/MediaLibrary.js @@ -103,7 +103,7 @@ export const MediaLibrary = () => { push(pathname); } - const folderCount = folders?.length || 0; + const folderCount = folders.length; const assets = assetsData?.results; const assetCount = assets?.length ?? 0; const isLoading = isCurrentFolderLoading || foldersLoading || permissionsLoading || assetsLoading;