[ARVADOS-WORKBENCH2] updated: 1.1.4-661-g9cbd623

[Git user]

Summary of changes:
 package.json                                       |  26 +--
 src/common/file.ts                                 |   5 +-
 src/common/webdav.test.ts                          |   4 +-
 src/components/data-explorer/data-explorer.tsx     |   6 +
 .../file-upload-dialog/file-upload-dialog.tsx      |   2 +-
 src/components/side-panel/side-panel.tsx           |  28 ++--
 src/index.tsx                                      |  12 +-
 src/models/tree.test.ts                            |  10 +-
 src/models/tree.ts                                 |  35 +++--
 .../collection-manifest-mapper.ts                  |   4 +-
 .../collection-service-files-response.ts           |  12 +-
 .../collection-service/collection-service.ts       |   1 +
 src/store/auth/auth-action.ts                      |   6 +-
 .../collection-panel-files-reducer.ts              |   6 +-
 .../collection-panel-files-state.ts                |   4 +-
 .../uploader/collection-uploader-actions.ts        |   6 +-
 .../data-explorer/data-explorer-reducer.test.tsx   |  10 +-
 src/store/data-explorer/data-explorer-reducer.ts   |  16 +-
 src/store/navigation/navigation-action.ts          |  22 +--
 src/store/side-panel/side-panel-action.ts          |   5 +-
 src/store/side-panel/side-panel-reducer.test.ts    |  55 +------
 src/store/side-panel/side-panel-reducer.ts         |  80 +++++-----
 src/store/tree-picker/tree-picker-reducer.test.ts  |   6 +-
 .../collection-panel-files.ts                      |   6 +-
 .../data-explorer/data-explorer.tsx                |  64 ++++----
 src/views-components/main-app-bar/main-app-bar.tsx |   5 +-
 src/views-components/tree-picker/tree-picker.ts    |   6 +-
 src/views/workbench/workbench.tsx                  |  10 +-
 yarn.lock                                          | 174 ++++++++++++---------
 29 files changed, 325 insertions(+), 301 deletions(-)

       via  9cbd6231837df8564953330fc63ce0fb9b9454cc (commit)
       via  75db1e88374315f84fdfb30faee84253e1383a28 (commit)
       via  fa26c423867036cbc290ba68bf001a4bea76fddd (commit)
       via  80a9ee470d066aeb95e84338c8f57d558f715113 (commit)
       via  c0e5f8f04311c22ca8e0be32c1c1da88ae1cceec (commit)
       via  18bb503b7ba881d9c6b09446e3ecb70eb11fa17e (commit)
       via  57c0b10d162183c24cf9bab52f85ffe3d2754b32 (commit)
       via  8acf2e5e84bb64fe57ae0eb819d9a4556af10afa (commit)
       via  fafe45583ad0aaa1a2325004a953d3154e6c15a9 (commit)
       via  a31bf8e640b88349dc99b6d56bc5d537410d5694 (commit)
       via  fce00188736e1d25abf13f4f04cdff2d168e6cc6 (commit)
       via  d60eaaa5549bcd863d4d202aecc2368de1f00db6 (commit)
       via  b8616dbf687fc2569c8b6252a4751f8b571457b6 (commit)
       via  5d2d4c926ba82b3147c7a315e1b5c8a49b71e9d2 (commit)
       via  24034b05e619fefd6015db12be27c812e9b4393d (commit)
       via  4fe47dee802ef6491649317f335a8558f9f75c40 (commit)
       via  da8c21590f014d5c94e9f5c26dde76f48b20f9bc (commit)
       via  12f1a2196ccab628a5e899b70052fcf6ccb0f79f (commit)
       via  eb4491eea9ba873845f7a5796d139d19977f8112 (commit)
       via  9f1bcc2882ee4b7581192f992b042187e6fe39e8 (commit)
       via  31afa127fa9b354c46fd78a2fe28228f958df71f (commit)
      from  f70757a56d4d119c0da5d675242268be786f0cbc (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 9cbd6231837df8564953330fc63ce0fb9b9454cc
Merge: f70757a 75db1e8
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date:   Mon Aug 20 11:23:39 2018 +0200

    Merge branch 'master'
    
    Feature #14014
    
    Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>

diff --cc src/store/collection-panel/collection-panel-files/collection-panel-files-reducer.ts
index a34fc21,dde622a..5796153
--- a/src/store/collection-panel/collection-panel-files/collection-panel-files-reducer.ts
+++ b/src/store/collection-panel/collection-panel-files/collection-panel-files-reducer.ts
@@@ -2,9 -2,9 +2,9 @@@
  //
  // SPDX-License-Identifier: AGPL-3.0
  
 -import { CollectionPanelFilesState, CollectionPanelFile, CollectionPanelDirectory, mapCollectionFileToCollectionPanelFile, mergeCollectionPanelFilesStates } from "./collection-panel-files-state";
 +import { CollectionPanelFilesState, CollectionPanelFile, CollectionPanelDirectory, mapCollectionFileToCollectionPanelFile, mergeCollectionPanelFilesStates } from './collection-panel-files-state';
  import { CollectionPanelFilesAction, collectionPanelFilesAction } from "./collection-panel-files-actions";
- import { createTree, mapTreeValues, getNode, setNode, getNodeAncestors, getNodeDescendants, setNodeValueWith, mapTree } from "~/models/tree";
+ import { createTree, mapTreeValues, getNode, setNode, getNodeAncestorsIds, getNodeDescendantsIds, setNodeValueWith, mapTree } from "~/models/tree";
  import { CollectionFileType } from "~/models/collection-file";
  
  export const collectionPanelFilesReducer = (state: CollectionPanelFilesState = createTree(), action: CollectionPanelFilesAction) => {
diff --cc src/store/collection-panel/collection-panel-files/collection-panel-files-state.ts
index 8c5ebd7,35b81d2..9d5b06c
--- a/src/store/collection-panel/collection-panel-files/collection-panel-files-state.ts
+++ b/src/store/collection-panel/collection-panel-files/collection-panel-files-state.ts
@@@ -34,14 -34,4 +34,12 @@@ export const mergeCollectionPanelFilesS
                  : { ...value, selected: oldValue.selected }
              : value;
      })(newState);
 -}; 
 +};
 +
 +export const filterCollectionFilesBySelection = (tree: CollectionPanelFilesState, selected: boolean) => {
-     const allFiles = getNodeDescendants('')(tree)
-         .map(id => getNodeValue(id)(tree))
-         .filter(file => file !== undefined) as Array<CollectionPanelDirectory | CollectionPanelFile>;
++    const allFiles = getNodeDescendants('')(tree).map(node => node.value);
 +
 +    const selectedDirectories = allFiles.filter(file => file.selected === selected && file.type === CollectionFileType.DIRECTORY);
 +    const selectedFiles = allFiles.filter(file => file.selected === selected && !selectedDirectories.some(dir => dir.id === file.path));
 +    return [...selectedDirectories, ...selectedFiles];
 +};

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


hooks/post-receive
--