feat(content-uploader): batching onComplete for resumable uploads (#1791)

* feat(content-uploader): batching onComplete uploads under FF

* feat(content-uploader): added tests for batching onComplete

* refactor(content-uploader): updateViewAndCollections test refactored

Author: borajimin

src/elements/content-uploader/ContentUploader.js

@@ -854,13 +854,17 @@ class ContentUploader extends Component<Props, State> {
      * @return {void}
      */
     updateViewAndCollection(items: UploadItem[], callback?: Function) {
-        const { onComplete, useUploadsManager }: Props = this.props;
+        const { onComplete, useUploadsManager, isResumableUploadsEnabled }: Props = this.props;
         const someUploadIsInProgress = items.some(uploadItem => uploadItem.status !== STATUS_COMPLETE);
         const someUploadHasFailed = items.some(uploadItem => uploadItem.status === STATUS_ERROR);
         const allItemsArePending = !items.some(uploadItem => uploadItem.status !== STATUS_PENDING);
+        const noFileIsPendingOrInProgress = items.every(
+            uploadItem => uploadItem.status !== STATUS_PENDING && uploadItem.status !== STATUS_IN_PROGRESS,
+        );
         const areAllItemsFinished = items.every(
             uploadItem => uploadItem.status === STATUS_COMPLETE || uploadItem.status === STATUS_ERROR,
         );
+        const uploadItemsStatus = isResumableUploadsEnabled ? areAllItemsFinished : noFileIsPendingOrInProgress;
 
         let view = '';
         if ((items && items.length === 0) || allItemsArePending) {
@@ -879,7 +883,7 @@ class ContentUploader extends Component<Props, State> {
             }
         }
 
-        if (areAllItemsFinished && useUploadsManager) {
+        if (uploadItemsStatus && useUploadsManager) {
             if (this.isAutoExpanded) {
                 this.resetUploadManagerExpandState();
             } // Else manually expanded so don't close

src/elements/content-uploader/__tests__/ContentUploader.test.js

@@ -62,15 +62,40 @@ describe('elements/content-uploader/ContentUploader', () => {
         test('should set itemIds to be an empty when method is called with an empty array', () => {
             const onComplete = jest.fn();
             const useUploadsManager = false;
+            const isResumableUploadsEnabled = false;
             const wrapper = getWrapper({
                 onComplete,
                 useUploadsManager,
+                isResumableUploadsEnabled,
             });
 
             wrapper.instance().updateViewAndCollection([], null);
 
             expect(wrapper.state().itemIds).toEqual({});
         });
+
+        test.each([
+            ['not', true, 'not', STATUS_PENDING, 0],
+            ['', true, '', STATUS_COMPLETE, 1],
+            ['', false, 'not', STATUS_STAGED, 1],
+        ])(
+            'should %s call onComplete when isResumableUploadsEnabled is %s and %s all items are finished',
+            (a, isResumableUploadsEnabled, b, status, expected) => {
+                const onComplete = jest.fn();
+                const useUploadsManager = true;
+                const wrapper = getWrapper({
+                    onComplete,
+                    useUploadsManager,
+                    isResumableUploadsEnabled,
+                });
+                const instance = wrapper.instance();
+                const items = [{ status }, { status: STATUS_COMPLETE }, { status: STATUS_ERROR }];
+
+                instance.updateViewAndCollection(items, null);
+
+                expect(onComplete).toHaveBeenCalledTimes(expected);
+            },
+        );
     });
 
     describe('addFilesToUploadQueue()', () => {