[ARVADOS-WORKBENCH2] updated: 1.2.0-763-g9ee6e6c

[Git user]

Summary of changes:
 src/store/sharing-dialog/sharing-dialog-actions.ts     | 11 +++++++++++
 src/views-components/sharing-dialog/sharing-dialog.tsx | 16 ++++++++++++----
 2 files changed, 23 insertions(+), 4 deletions(-)

       via  9ee6e6ce8e776ad6184e9394e96dfaa74ed5226a (commit)
      from  f2997d75147187ccf0bc29d61e2af5a375a23e61 (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 9ee6e6ce8e776ad6184e9394e96dfaa74ed5226a
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date:   Tue Oct 30 14:40:44 2018 +0100

    Send invitations only if advanced mode was not enabled
    
    Feature #14365
    
    Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>

diff --git a/src/store/sharing-dialog/sharing-dialog-actions.ts b/src/store/sharing-dialog/sharing-dialog-actions.ts
index fe23b32..205d308 100644
--- a/src/store/sharing-dialog/sharing-dialog-actions.ts
+++ b/src/store/sharing-dialog/sharing-dialog-actions.ts
@@ -18,6 +18,7 @@ import { PermissionResource } from '~/models/permission';
 import { differenceWith } from "lodash";
 import { withProgress } from "~/store/progress-indicator/with-progress";
 import { progressIndicatorActions } from '~/store/progress-indicator/progress-indicator-actions.ts';
+import { snackbarActions, SnackbarKind } from "../snackbar/snackbar-actions";
 
 export const openSharingDialog = (resourceUuid: string) =>
     (dispatch: Dispatch) => {
@@ -41,6 +42,16 @@ export const saveSharingDialogChanges = async (dispatch: Dispatch) => {
     await dispatch<any>(loadSharingDialog);
 };
 
+export const sendSharingInvitations = async (dispatch: Dispatch) => {
+    dispatch(progressIndicatorActions.START_WORKING(SHARING_DIALOG_NAME));
+    await dispatch<any>(sendInvitations);
+    dispatch(closeSharingDialog());
+    dispatch(snackbarActions.OPEN_SNACKBAR({
+        message: 'New permissions created',
+        kind: SnackbarKind.SUCCESS,
+    }));
+};
+
 const loadSharingDialog = async (dispatch: Dispatch, getState: () => RootState, { permissionService }: ServiceRepository) => {
 
     const dialog = getDialog<string>(getState().dialog, SHARING_DIALOG_NAME);
diff --git a/src/views-components/sharing-dialog/sharing-dialog.tsx b/src/views-components/sharing-dialog/sharing-dialog.tsx
index 69c467e..b295f6d 100644
--- a/src/views-components/sharing-dialog/sharing-dialog.tsx
+++ b/src/views-components/sharing-dialog/sharing-dialog.tsx
@@ -6,7 +6,7 @@ import { compose, Dispatch } from 'redux';
 import { connect } from 'react-redux';
 
 import * as React from 'react';
-import { connectSharingDialog, saveSharingDialogChanges, connectSharingDialogProgress } from '~/store/sharing-dialog/sharing-dialog-actions';
+import { connectSharingDialog, saveSharingDialogChanges, connectSharingDialogProgress, sendSharingInvitations } from '~/store/sharing-dialog/sharing-dialog-actions';
 import { WithDialogProps } from '~/store/dialog/with-dialog';
 import { RootState } from '~/store/store';
 
@@ -26,12 +26,20 @@ const mapStateToProps = (state: RootState, { advancedViewOpen, working, ...props
     children: <SharingDialogContent {...{ advancedViewOpen }} />,
 });
 
-const mapDispatchToProps = (dispatch: Dispatch, { toggleAdvancedView, ...props }: Props): SharingDialogActionProps => ({
+const mapDispatchToProps = (dispatch: Dispatch, { toggleAdvancedView, advancedViewOpen, ...props }: Props): SharingDialogActionProps => ({
     ...props,
     onClose: props.closeDialog,
-    onExited: toggleAdvancedView,
+    onExited: () => {
+        if (advancedViewOpen) {
+            toggleAdvancedView();
+        }
+    },
     onSave: () => {
-        dispatch<any>(saveSharingDialogChanges);
+        if (advancedViewOpen) {
+            dispatch<any>(saveSharingDialogChanges);
+        } else {
+            dispatch<any>(sendSharingInvitations);
+        }
     },
     onAdvanced: toggleAdvancedView,
 });

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


hooks/post-receive
--