From 7da07c29fe1d2b7aa4bfa06db11d07f2072ea629 Mon Sep 17 00:00:00 2001 From: Robert DiMartino Date: Fri, 11 Mar 2022 00:00:22 -0500 Subject: [PATCH] Order Google Drive results by folder to show all folders first (#3546) --- .../@uppy/companion/src/server/provider/drive/index.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/packages/@uppy/companion/src/server/provider/drive/index.js b/packages/@uppy/companion/src/server/provider/drive/index.js index f2673d274..4de390ca3 100644 --- a/packages/@uppy/companion/src/server/provider/drive/index.js +++ b/packages/@uppy/companion/src/server/provider/drive/index.js @@ -17,10 +17,6 @@ const SHARED_DRIVE_FIELDS = '*' // Hopefully this name will not be used by Google const VIRTUAL_SHARED_DIR = 'shared-with-me' -function sortByName (first, second) { - return first.name.localeCompare(second.name) -} - async function waitForFailedResponse (resp) { const buf = await new Promise((resolve) => { let data = '' @@ -71,7 +67,7 @@ function adaptData (listFilesResp, sharedDrivesResp, directory, query, showShare const adaptedItems = [ ...(virtualItem ? [virtualItem] : []), // shared folder first - ...([...sharedDrives, ...items].map(adaptItem).sort(sortByName)), + ...([...sharedDrives, ...items].map(adaptItem)), ] return { @@ -143,6 +139,7 @@ class Drive extends Provider { pageToken: query.cursor, q, // pageSize: 10, // can be used for testing pagination if you don't have many files + orderBy: 'folder,name', includeItemsFromAllDrives: true, supportsAllDrives: true, }