add user feedback

so they know that something is happening
transloadit · Mar 29, 2023 · 4060019 · 4060019
1 parent 80bd293
commit 4060019
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/packages/@uppy/core/src/locale.js b/packages/@uppy/core/src/locale.js
@@ -49,6 +49,7 @@ export default {
  enterTextToSearch: 'Enter text to search for images',
  search: 'Search',
  emptyFolderAdded: 'No files were added from empty folder',
+ traversingSubfolders: 'Traversing %{numSubFolders} subfolder(s) inside "%{folder}"',
  folderAlreadyAdded: 'The folder "%{folder}" was already added',
  folderAdded: {
  0: 'Added %{smart_count} file from %{folder}',

diff --git a/packages/@uppy/provider-views/src/Loader.jsx b/packages/@uppy/provider-views/src/Loader.jsx
@@ -1,9 +1,10 @@
 import { h } from 'preact'
 
-export default ({ i18n }) => {
+export default ({ i18n, loading }) => {
  return (
  <div className="uppy-Provider-loading">
  <span>{i18n('loading')}</span>
+ {typeof loading === 'string' && <span>{loading}</span>}
  </div>
  )
 }
diff --git a/packages/@uppy/provider-views/src/ProviderView/ProviderView.jsx b/packages/@uppy/provider-views/src/ProviderView/ProviderView.jsx
@@ -232,19 +232,24 @@ export default class ProviderView extends View {
  }
  }
 
- async recursivelyListAllFiles (path, files = []) {
- let curPath = path
+ async recursivelyListAllFiles (folder, files = []) {
+ let curPath = folder.requestPath
 
  // need to repeat the list call until there are no more pages
  while (curPath) {
  const res = await this.provider.list(curPath)
 
+ const numSubFolders = res.items.filter((item) => item.isFolder).length
+ if (numSubFolders > 0) {
+ this.setLoading(this.plugin.uppy.i18n('traversingSubfolders', { numSubFolders, folder: folder.name }))
+ }
+
  // limit concurrency (because what if we have a folder with 1000 folders inside!)
  // todo this might still lead to a memory run-off
  await pMap(res.items, async (item) => {
  if (item.isFolder) {
  // recursively call self for folder
- await this.recursivelyListAllFiles(item.requestPath, files)
+ await this.recursivelyListAllFiles(item, files)
  } else {
  files.push(item)
  }
@@ -268,7 +273,7 @@ export default class ProviderView extends View {
  for (const file of currentSelection) {
  if (file.isFolder) {
  const folder = file
- const filesInFolder = await this.recursivelyListAllFiles(folder.requestPath)
+ const filesInFolder = await this.recursivelyListAllFiles(folder)
 
  // If the same folder is added again, we don't want to send
  // X amount of duplicate file notifications, we want to say
@@ -369,7 +374,7 @@ export default class ProviderView extends View {
  if (loading) {
  return (
  <CloseWrapper onUnmount={this.clearSelection}>
- <LoaderView i18n={this.plugin.uppy.i18n} />
+ <LoaderView i18n={this.plugin.uppy.i18n} loading={loading} />
  </CloseWrapper>
  )
  }

diff --git a/packages/@uppy/provider-views/src/SearchProviderView/SearchProviderView.jsx b/packages/@uppy/provider-views/src/SearchProviderView/SearchProviderView.jsx
@@ -166,7 +166,7 @@ export default class SearchProviderView extends View {
  if (loading) {
  return (
  <CloseWrapper onUnmount={this.clearSelection}>
- <LoaderView i18n={this.plugin.uppy.i18n} />
+ <LoaderView i18n={this.plugin.uppy.i18n} loading={loading} />
  </CloseWrapper>
  )
  }