[ARVADOS-WORKBENCH2] updated: 1.1.4-581-ga2cb695

[Git user]

Summary of changes:
 .../collection-panel-files-actions.ts              | 29 ++++++++++++++++++--
 .../action-sets/collection-files-action-set.ts     |  5 ++--
 .../multiple-files-remove-dialog.ts                | 31 +++++-----------------
 3 files changed, 36 insertions(+), 29 deletions(-)

       via  a2cb695cb495ad156634b2caa4363a0753981203 (commit)
      from  2ddeeb1b278734e895128feb2caa2bf720192b3d (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 a2cb695cb495ad156634b2caa4363a0753981203
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date:   Fri Aug 10 16:09:38 2018 +0200

    Implement removal of selected files
    
    Feature #13990
    
    Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>

diff --git a/src/store/collection-panel/collection-panel-files/collection-panel-files-actions.ts b/src/store/collection-panel/collection-panel-files/collection-panel-files-actions.ts
index 12e6413..31a9d5d 100644
--- a/src/store/collection-panel/collection-panel-files/collection-panel-files-actions.ts
+++ b/src/store/collection-panel/collection-panel-files/collection-panel-files-actions.ts
@@ -9,7 +9,8 @@ import { ServiceRepository } from "../../../services/services";
 import { RootState } from "../../store";
 import { snackbarActions } from "../../snackbar/snackbar-actions";
 import { dialogActions } from "../../dialog/dialog-actions";
-import { getNodeValue } from "../../../models/tree";
+import { getNodeValue, getNodeDescendants } from "../../../models/tree";
+import { CollectionPanelDirectory, CollectionPanelFile } from "./collection-panel-files-state";
 
 export const collectionPanelFilesAction = unionize({
     SET_COLLECTION_FILES: ofType<CollectionFilesTree>(),
@@ -39,6 +40,19 @@ export const removeCollectionFiles = (filePaths: string[]) =>
         }
     };
 
+export const removeCollectionsSelectedFiles = () =>
+    (dispatch: Dispatch, getState: () => RootState) => {
+        const tree = getState().collectionPanelFiles;
+        const allFiles = getNodeDescendants('')(tree)
+            .map(id => getNodeValue(id)(tree))
+            .filter(file => file !== undefined) as Array<CollectionPanelDirectory | CollectionPanelFile>;
+
+        const selectedDirectories = allFiles.filter(file => file.selected && file.type === CollectionFileType.DIRECTORY);
+        const selectedFiles = allFiles.filter(file => file.selected && !selectedDirectories.some(dir => dir.id === file.path));
+        const paths = [...selectedDirectories, ...selectedFiles].map(file => file.id);
+        dispatch<any>(removeCollectionFiles(paths));
+    };
+
 export const FILE_REMOVE_DIALOG = 'fileRemoveDialog';
 export const openFileRemoveDialog = (filePath: string) =>
     (dispatch: Dispatch, getState: () => RootState) => {
@@ -61,4 +75,15 @@ export const openFileRemoveDialog = (filePath: string) =>
                 }
             }));
         }
-    };
\ No newline at end of file
+    };
+
+export const MULTIPLE_FILES_REMOVE_DIALOG = 'multipleFilesRemoveDialog';
+export const openMultipleFilesRemoveDialog = () =>
+    dialogActions.OPEN_DIALOG({
+        id: MULTIPLE_FILES_REMOVE_DIALOG,
+        data: {
+            title: 'Removing files',
+            text: 'Are you sure you want to remove selected files?',
+            confirmButtonLabel: 'Remove'
+        }
+    });
\ No newline at end of file
diff --git a/src/views-components/context-menu/action-sets/collection-files-action-set.ts b/src/views-components/context-menu/action-sets/collection-files-action-set.ts
index 91fa2b0..69668a9 100644
--- a/src/views-components/context-menu/action-sets/collection-files-action-set.ts
+++ b/src/views-components/context-menu/action-sets/collection-files-action-set.ts
@@ -3,8 +3,7 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import { ContextMenuActionSet } from "../context-menu-action-set";
-import { collectionPanelFilesAction } from "../../../store/collection-panel/collection-panel-files/collection-panel-files-actions";
-import { openMultipleFilesRemoveDialog } from "../../file-remove-dialog/multiple-files-remove-dialog";
+import { collectionPanelFilesAction, openMultipleFilesRemoveDialog } from "../../../store/collection-panel/collection-panel-files/collection-panel-files-actions";
 import { createCollectionWithSelected } from "../../create-collection-dialog-with-selected/create-collection-dialog-with-selected";
 
 
@@ -20,7 +19,7 @@ export const collectionFilesActionSet: ContextMenuActionSet = [[{
     }
 }, {
     name: "Remove selected",
-    execute: (dispatch, resource) => {
+    execute: (dispatch) => {
         dispatch(openMultipleFilesRemoveDialog());
     }
 }, {
diff --git a/src/views-components/file-remove-dialog/multiple-files-remove-dialog.ts b/src/views-components/file-remove-dialog/multiple-files-remove-dialog.ts
index 8810e23..aa12fa1 100644
--- a/src/views-components/file-remove-dialog/multiple-files-remove-dialog.ts
+++ b/src/views-components/file-remove-dialog/multiple-files-remove-dialog.ts
@@ -5,33 +5,16 @@
 import { Dispatch } from "redux";
 import { connect } from "react-redux";
 import { ConfirmationDialog } from "../../components/confirmation-dialog/confirmation-dialog";
-import { withDialog } from "../../store/dialog/with-dialog";
-import { dialogActions } from "../../store/dialog/dialog-actions";
-import { snackbarActions } from "../../store/snackbar/snackbar-actions";
+import { withDialog, WithDialogProps } from "../../store/dialog/with-dialog";
+import { MULTIPLE_FILES_REMOVE_DIALOG, removeCollectionsSelectedFiles } from "../../store/collection-panel/collection-panel-files/collection-panel-files-actions";
 
-const MULTIPLE_FILES_REMOVE_DIALOG = 'multipleFilesRemoveDialog';
-
-const mapDispatchToProps = (dispatch: Dispatch) => ({
+const mapDispatchToProps = (dispatch: Dispatch, props: WithDialogProps<any>) => ({
     onConfirm: () => {
-        // TODO: dispatch action that removes multiple files
-        dispatch(dialogActions.CLOSE_DIALOG({ id: MULTIPLE_FILES_REMOVE_DIALOG }));
-        dispatch(snackbarActions.OPEN_SNACKBAR({message: 'Removing files...', hideDuration: 2000}));
-        setTimeout(() => {
-            dispatch(snackbarActions.OPEN_SNACKBAR({message: 'Files removed.', hideDuration: 2000}));
-        }, 1000);
+        props.closeDialog();
+        dispatch<any>(removeCollectionsSelectedFiles());
     }
 });
 
-export const openMultipleFilesRemoveDialog = () =>
-    dialogActions.OPEN_DIALOG({
-        id: MULTIPLE_FILES_REMOVE_DIALOG,
-        data: {
-            title: 'Removing files',
-            text: 'Are you sure you want to remove selected files?',
-            confirmButtonLabel: 'Remove'
-        }
-    });
-
 export const [MultipleFilesRemoveDialog] = [ConfirmationDialog]
-    .map(withDialog(MULTIPLE_FILES_REMOVE_DIALOG))
-    .map(connect(undefined, mapDispatchToProps));
\ No newline at end of file
+    .map(connect(undefined, mapDispatchToProps))
+    .map(withDialog(MULTIPLE_FILES_REMOVE_DIALOG));
\ No newline at end of file

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


hooks/post-receive
--