[ARVADOS-WORKBENCH2] updated: 1.1.4-654-g75db1e8

Git user git at public.curoverse.com
Mon Aug 20 05:17:13 EDT 2018


Summary of changes:
 src/common/file.ts                                 |  15 ++
 src/common/webdav.test.ts                          |   4 +-
 src/common/webdav.ts                               |   8 +-
 .../collection-panel-files.tsx                     |  66 ++++-----
 .../file-upload-dialog/file-upload-dialog.tsx      |  52 +++++++
 src/models/tree.test.ts                            |  10 +-
 src/models/tree.ts                                 |  35 +++--
 .../collection-manifest-mapper.ts                  |   4 +-
 .../collection-service-files-response.ts           |  54 +++++++
 .../collection-service/collection-service.ts       | 162 ++++-----------------
 src/services/services.ts                           |   2 +-
 .../collection-panel-files-actions.ts              |   5 +-
 .../collection-panel-files-reducer.ts              |   6 +-
 .../creator/collection-creator-action.ts           |  30 ++--
 .../uploader/collection-uploader-actions.ts        |  38 +++++
 src/store/tree-picker/tree-picker-reducer.test.ts  |   6 +-
 .../collection-panel-files.ts                      |  11 +-
 src/views-components/tree-picker/tree-picker.ts    |   6 +-
 .../upload-collection-files-dialog.ts              |  29 ++++
 src/views/workbench/workbench.tsx                  |   4 +-
 20 files changed, 311 insertions(+), 236 deletions(-)
 create mode 100644 src/common/file.ts
 create mode 100644 src/components/file-upload-dialog/file-upload-dialog.tsx
 create mode 100644 src/services/collection-service/collection-service-files-response.ts
 create mode 100644 src/views-components/upload-collection-files-dialog/upload-collection-files-dialog.ts

       via  75db1e88374315f84fdfb30faee84253e1383a28 (commit)
       via  fa26c423867036cbc290ba68bf001a4bea76fddd (commit)
       via  80a9ee470d066aeb95e84338c8f57d558f715113 (commit)
       via  c0e5f8f04311c22ca8e0be32c1c1da88ae1cceec (commit)
       via  18bb503b7ba881d9c6b09446e3ecb70eb11fa17e (commit)
       via  57c0b10d162183c24cf9bab52f85ffe3d2754b32 (commit)
       via  8acf2e5e84bb64fe57ae0eb819d9a4556af10afa (commit)
       via  f45dd93f467fe02c33908c0b4b3ff8ba01827bc9 (commit)
       via  158a4936f754ad78004e1bbcbb5af053a6a4073a (commit)
       via  5a40b5b582b25e410622da8b7e484fad757f6bd1 (commit)
       via  e13e7dd672160e4ab5569c24133f4f6032db4a9a (commit)
       via  d260d2473cd7faefb0f06cedfb26ef5abda7e012 (commit)
       via  8c259b5122df8254613e8d23b0d860a7b1b37b41 (commit)
       via  a49f059145a3054052e1c79555bdeadf660d1c6a (commit)
      from  fafe45583ad0aaa1a2325004a953d3154e6c15a9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 75db1e88374315f84fdfb30faee84253e1383a28
Merge: fafe455 fa26c42
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date:   Mon Aug 20 11:16:54 2018 +0200

    Merge branch '14013-upload-collection-files-using-webdav'
    
    refs #14013
    
    Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>


commit fa26c423867036cbc290ba68bf001a4bea76fddd
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date:   Mon Aug 20 11:16:23 2018 +0200

    Update test
    
    Feature #14013
    
    Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>

diff --git a/src/common/webdav.test.ts b/src/common/webdav.test.ts
index e1eefad..c85f30e 100644
--- a/src/common/webdav.test.ts
+++ b/src/common/webdav.test.ts
@@ -41,15 +41,13 @@ describe('WebDAV', () => {
 
     it('PUT', async () => {
         const { open, send, load, progress, createRequest } = mockCreateRequest();
-        const onUploadProgress = jest.fn();
         const webdav = new WebDAV(undefined, createRequest);
-        const promise = webdav.put('foo', 'Test data', { onUploadProgress });
+        const promise = webdav.put('foo', 'Test data');
         progress();
         load();
         const request = await promise;
         expect(open).toHaveBeenCalledWith('PUT', 'foo');
         expect(send).toHaveBeenCalledWith('Test data');
-        expect(onUploadProgress).toHaveBeenCalled();
         expect(request).toBeInstanceOf(XMLHttpRequest);
     });
 

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list