@jupyterlab/filebrowser 4.5.0-alpha.0 → 4.5.0-alpha.2

package/src/upload.ts

@@ -9,6 +9,8 @@ import {
 } from '@jupyterlab/translation';
 import { fileUploadIcon, ToolbarButton } from '@jupyterlab/ui-components';
 import { FileBrowserModel } from './model';
+import { Contents } from '@jupyterlab/services';
+import { ISignal, Signal } from '@lumino/signaling';
 
 /**
  * A widget which provides an upload button.
@@ -24,7 +26,8 @@ export class Uploader extends ToolbarButton {
       onClick: () => {
         this._input.click();
       },
-      tooltip: Private.translateToolTip(options.translator)
+      tooltip: Private.translateToolTip(options.translator),
+      enabled: options.model.allowFileUploads
     });
     this.fileBrowserModel = options.model;
     this.translator = options.translator || nullTranslator;
@@ -34,6 +37,13 @@ export class Uploader extends ToolbarButton {
     this.addClass('jp-id-upload');
   }
 
+  /**
+   * A signal emitted with file info when a batch of upload completes.
+   */
+  get filesUploaded(): ISignal<this, Contents.IModel[]> {
+    return this._filesUploaded;
+  }
+
   /**
    * The underlying file browser fileBrowserModel for the widget.
    *
@@ -47,12 +57,17 @@ export class Uploader extends ToolbarButton {
   private _onInputChanged = () => {
     const files = Array.prototype.slice.call(this._input.files) as File[];
     const pending = files.map(file => this.fileBrowserModel.upload(file));
-    void Promise.all(pending).catch(error => {
-      void showErrorMessage(
-        this._trans._p('showErrorMessage', 'Upload Error'),
-        error
-      );
-    });
+    void Promise.all(pending)
+      .then(models => {
+        // emit the batch
+        this._filesUploaded.emit(models);
+      })
+      .catch(error => {
+        void showErrorMessage(
+          this._trans._p('showErrorMessage', 'Upload Error'),
+          error
+        );
+      });
   };
 
   /**
@@ -67,6 +82,7 @@ export class Uploader extends ToolbarButton {
   protected translator: ITranslator;
   private _trans: TranslationBundle;
   private _input = Private.createUploadInput();
+  private _filesUploaded = new Signal<this, Contents.IModel[]>(this);
 }
 
 /**

package/src/uploadstatus.tsx

@@ -212,7 +212,7 @@ export namespace FileUploadStatus {
           this._items,
           val => val.path === uploads.newValue.path
         );
-      }
+      } else return;
 
       this.stateChanged.emit(void 0);
     };