Mirrors/uppy
1
0
Fork 0
mirror of https://github.com/transloadit/uppy.git synced 2026-07-19 09:34:02 +00:00
Code Issues Projects Releases Wiki Activity

Sort Google Drive list by name (#3069)

Browse source
This commit is contained in:
Merlijn Vos 2021-08-06 12:03:25 +02:00 • committed by GitHub
parent b7210b1375
commit 1d5ea81efa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

6
packages/@uppy/companion/src/server/provider/drive/index.js
View file

@ -16,6 +16,10 @@ 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)
}
function waitForFailedResponse (resp) {
return new Promise((resolve, reject) => {
let data = ''
@ -70,7 +74,7 @@ function adaptData (listFilesResp, sharedDrivesResp, directory, query, showShare
const adaptedItems = [
...(virtualItem ? [virtualItem] : []), // shared folder first
...([...sharedDrives, ...items].map(adaptItem)),
...([...sharedDrives, ...items].map(adaptItem).sort(sortByName)),
]
return {

2
packages/@uppy/provider-views/src/Browser.js
View file

@ -39,8 +39,6 @@ const Browser = (props) => {
}]}
folders={filteredFolders}
files={filteredFiles}
sortByTitle={props.sortByTitle}
sortByDate={props.sortByDate}
isChecked={props.isChecked}
handleFolderClick={props.getNextFolder}
toggleCheckbox={props.toggleCheckbox}

89
packages/@uppy/provider-views/src/ProviderView/ProviderView.js
View file

@ -48,8 +48,6 @@ module.exports = class ProviderView {
this.logout = this.logout.bind(this)
this.preFirstRender = this.preFirstRender.bind(this)
this.handleAuth = this.handleAuth.bind(this)
this.sortByTitle = this.sortByTitle.bind(this)
this.sortByDate = this.sortByDate.bind(this)
this.handleError = this.handleError.bind(this)
this.handleScroll = this.handleScroll.bind(this)
this.listAllFiles = this.listAllFiles.bind(this)
@ -209,91 +207,6 @@ module.exports = class ProviderView {
this.plugin.setPluginState({ ...state, filterInput: e ? e.target.value : '' })
}
sortByTitle () {
const state = { ...this.plugin.getPluginState() }
const { files, folders, sorting } = state
const sortedFiles = files.sort((fileA, fileB) => {
if (sorting === 'titleDescending') {
return fileB.name.localeCompare(fileA.name)
}
return fileA.name.localeCompare(fileB.name)
})
const sortedFolders = folders.sort((folderA, folderB) => {
if (sorting === 'titleDescending') {
return folderB.name.localeCompare(folderA.name)
}
return folderA.name.localeCompare(folderB.name)
})
this.plugin.setPluginState({
...state,
files: sortedFiles,
folders: sortedFolders,
sorting: (sorting === 'titleDescending') ? 'titleAscending' : 'titleDescending',
})
}
sortByDate () {
const state = { ...this.plugin.getPluginState() }
const { files, folders, sorting } = state
const sortedFiles = files.sort((fileA, fileB) => {
const a = new Date(fileA.modifiedDate)
const b = new Date(fileB.modifiedDate)
if (sorting === 'dateDescending') {
return a > b ? -1 : a < b ? 1 : 0
}
return a > b ? 1 : a < b ? -1 : 0
})
const sortedFolders = folders.sort((folderA, folderB) => {
const a = new Date(folderA.modifiedDate)
const b = new Date(folderB.modifiedDate)
if (sorting === 'dateDescending') {
return a > b ? -1 : a < b ? 1 : 0
}
return a > b ? 1 : a < b ? -1 : 0
})
this.plugin.setPluginState({
...state,
files: sortedFiles,
folders: sortedFolders,
sorting: (sorting === 'dateDescending') ? 'dateAscending' : 'dateDescending',
})
}
sortBySize () {
const state = { ...this.plugin.getPluginState() }
const { files, sorting } = state
// check that plugin supports file sizes
if (!files.length || !this.plugin.getItemData(files[0]).size) {
return
}
const sortedFiles = files.sort((fileA, fileB) => {
const a = fileA.size
const b = fileB.size
if (sorting === 'sizeDescending') {
return a > b ? -1 : a < b ? 1 : 0
}
return a > b ? 1 : a < b ? -1 : 0
})
this.plugin.setPluginState({
...state,
files: sortedFiles,
sorting: (sorting === 'sizeDescending') ? 'sizeAscending' : 'sizeDescending',
})
}
/**
* Adds all files found inside of specified folder.
*
@ -538,8 +451,6 @@ module.exports = class ProviderView {
getFolder: this.getFolder,
filterItems: this._sharedHandler.filterItems,
filterQuery: this.filterQuery,
sortByTitle: this.sortByTitle,
sortByDate: this.sortByDate,
logout: this.logout,
isChecked: this._sharedHandler.isChecked,
toggleCheckbox: this._sharedHandler.toggleCheckbox,