[ARVADOS-WORKBENCH2] updated: 1.2.0-761-g986ff42
Git user
git at public.curoverse.com
Tue Oct 30 08:13:21 EDT 2018
Summary of changes:
src/store/sharing-dialog/sharing-dialog-actions.ts | 43 ++++++++++++----------
src/store/sharing-dialog/sharing-dialog-types.ts | 8 +++-
.../sharing-dialog/sharing-dialog-component.tsx | 34 +++++++++++++++--
.../sharing-dialog/sharing-dialog.tsx | 12 ++++--
4 files changed, 71 insertions(+), 26 deletions(-)
via 986ff42ab49d2fd9a2da53fcc0f08a7933719b64 (commit)
from 59ad75d2aca135adeb1aadc9847653e5c273ccc1 (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 986ff42ab49d2fd9a2da53fcc0f08a7933719b64
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date: Tue Oct 30 13:13:06 2018 +0100
Add loading indicator, serialize updates
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 586ab66..fe23b32 100644
--- a/src/store/sharing-dialog/sharing-dialog-actions.ts
+++ b/src/store/sharing-dialog/sharing-dialog-actions.ts
@@ -8,7 +8,7 @@ import { SHARING_DIALOG_NAME, SharingPublicAccessFormData, SHARING_PUBLIC_ACCESS
import { Dispatch } from 'redux';
import { ServiceRepository } from "~/services/services";
import { FilterBuilder } from '~/services/api/filter-builder';
-import { initialize, getFormValues, isDirty, reset } from 'redux-form';
+import { initialize, getFormValues, reset } from 'redux-form';
import { SHARING_MANAGEMENT_FORM_NAME } from '~/store/sharing-dialog/sharing-dialog-types';
import { RootState } from '~/store/store';
import { getDialog } from '~/store/dialog/dialog-reducer';
@@ -16,6 +16,8 @@ import { PermissionLevel } from '~/models/permission';
import { getPublicGroupUuid } from "~/store/workflow-panel/workflow-panel-actions";
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';
export const openSharingDialog = (resourceUuid: string) =>
(dispatch: Dispatch) => {
@@ -27,8 +29,11 @@ export const closeSharingDialog = () =>
dialogActions.CLOSE_DIALOG({ id: SHARING_DIALOG_NAME });
export const connectSharingDialog = withDialog(SHARING_DIALOG_NAME);
+export const connectSharingDialogProgress = withProgress(SHARING_DIALOG_NAME);
+
export const saveSharingDialogChanges = async (dispatch: Dispatch) => {
+ dispatch(progressIndicatorActions.START_WORKING(SHARING_DIALOG_NAME));
await dispatch<any>(savePublicPermissionChanges);
await dispatch<any>(saveManagementChanges);
await dispatch<any>(sendInvitations);
@@ -36,19 +41,16 @@ export const saveSharingDialogChanges = async (dispatch: Dispatch) => {
await dispatch<any>(loadSharingDialog);
};
-export const hasChanges = (state: RootState) =>
- isDirty(SHARING_PUBLIC_ACCESS_FORM_NAME)(state) ||
- isDirty(SHARING_MANAGEMENT_FORM_NAME)(state) ||
- isDirty(SHARING_INVITATION_FORM_NAME)(state);
-
const loadSharingDialog = async (dispatch: Dispatch, getState: () => RootState, { permissionService }: ServiceRepository) => {
const dialog = getDialog<string>(getState().dialog, SHARING_DIALOG_NAME);
if (dialog) {
+ dispatch(progressIndicatorActions.START_WORKING(SHARING_DIALOG_NAME));
const { items } = await permissionService.listResourcePermissions(dialog.data);
dispatch<any>(initializePublicAccessForm(items));
await dispatch<any>(initializeManagementForm(items));
+ dispatch(progressIndicatorActions.STOP_WORKING(SHARING_DIALOG_NAME));
}
};
@@ -146,9 +148,9 @@ const saveManagementChanges = async (_: Dispatch, getState: () => RootState, { p
if (visibility === VisibilityLevel.PRIVATE) {
- await Promise.all(initialPermissions.map(({ permissionUuid, permissions }) =>
- permissionService.delete(permissionUuid)
- ));
+ for (const permission of initialPermissions) {
+ await permissionService.delete(permission.permissionUuid);
+ }
} else {
@@ -158,13 +160,14 @@ const saveManagementChanges = async (_: Dispatch, getState: () => RootState, { p
(a, b) => a.permissionUuid === b.permissionUuid
);
- await Promise.all(cancelledPermissions.map(({ permissionUuid }) =>
- permissionService.delete(permissionUuid)
- ));
+ for (const { permissionUuid } of cancelledPermissions) {
+ await permissionService.delete(permissionUuid);
+ }
+
+ for (const permission of permissions) {
+ await permissionService.update(permission.permissionUuid, { name: permission.permissions });
+ }
- await Promise.all(permissions.map(({ permissionUuid, permissions }) =>
- permissionService.update(permissionUuid, { name: permissions })
- ));
}
}
};
@@ -177,15 +180,17 @@ const sendInvitations = async (_: Dispatch, getState: () => RootState, { permiss
const invitations = getFormValues(SHARING_INVITATION_FORM_NAME)(state) as SharingInvitationFormData;
- const promises = invitations.invitedPeople
+ const invitationData = invitations.invitedPeople
.map(person => ({
ownerUuid: user.uuid,
headUuid: dialog.data,
tailUuid: person.uuid,
name: invitations.permissions
- }))
- .map(data => permissionService.create(data));
+ }));
+
+ for (const invitation of invitationData) {
+ await permissionService.create(invitation);
+ }
- await Promise.all(promises);
}
};
diff --git a/src/store/sharing-dialog/sharing-dialog-types.ts b/src/store/sharing-dialog/sharing-dialog-types.ts
index 97e1979..da6ca9e 100644
--- a/src/store/sharing-dialog/sharing-dialog-types.ts
+++ b/src/store/sharing-dialog/sharing-dialog-types.ts
@@ -3,7 +3,8 @@
// SPDX-License-Identifier: AGPL-3.0
import { PermissionLevel } from '~/models/permission';
-import { getFormValues } from 'redux-form';
+import { getFormValues, isDirty } from 'redux-form';
+import { RootState } from '~/store/store';
export const SHARING_DIALOG_NAME = 'SHARING_DIALOG_NAME';
export const SHARING_PUBLIC_ACCESS_FORM_NAME = 'SHARING_PUBLIC_ACCESS_FORM_NAME';
@@ -48,3 +49,8 @@ export const getSharingMangementFormData = (state: any) =>
export const getSharingPublicAccessFormData = (state: any) =>
getFormValues(SHARING_PUBLIC_ACCESS_FORM_NAME)(state) as SharingPublicAccessFormData;
+
+export const hasChanges = (state: RootState) =>
+ isDirty(SHARING_PUBLIC_ACCESS_FORM_NAME)(state) ||
+ isDirty(SHARING_MANAGEMENT_FORM_NAME)(state) ||
+ isDirty(SHARING_INVITATION_FORM_NAME)(state);
diff --git a/src/views-components/sharing-dialog/sharing-dialog-component.tsx b/src/views-components/sharing-dialog/sharing-dialog-component.tsx
index 2dcb609..1792bd6 100644
--- a/src/views-components/sharing-dialog/sharing-dialog-component.tsx
+++ b/src/views-components/sharing-dialog/sharing-dialog-component.tsx
@@ -3,12 +3,14 @@
// SPDX-License-Identifier: AGPL-3.0
import * as React from 'react';
-import { Dialog, DialogTitle, Button, Grid, DialogContent } from '@material-ui/core';
+import { Dialog, DialogTitle, Button, Grid, DialogContent, CircularProgress, Paper } from '@material-ui/core';
import { DialogActions } from '~/components/dialog-actions/dialog-actions';
+import { StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core/styles';
export interface SharingDialogDataProps {
open: boolean;
+ loading: boolean;
saveEnabled: boolean;
advancedEnabled: boolean;
children: React.ReactNode;
@@ -20,11 +22,13 @@ export interface SharingDialogActionProps {
onAdvanced: () => void;
}
export default (props: SharingDialogDataProps & SharingDialogActionProps) => {
- const { children, open, advancedEnabled, saveEnabled, onAdvanced, onClose, onExited, onSave } = props;
+ const { children, open, loading, advancedEnabled, saveEnabled, onAdvanced, onClose, onExited, onSave } = props;
return <Dialog
{...{ open, onClose, onExited }}
fullWidth
- maxWidth='sm'>
+ maxWidth='sm'
+ disableBackdropClick
+ disableEscapeKeyDown>
<DialogTitle>
Sharing settings
</DialogTitle>
@@ -59,5 +63,29 @@ export default (props: SharingDialogDataProps & SharingDialogActionProps) => {
</Grid>
</Grid>
</DialogActions>
+ {
+ loading && <LoadingIndicator />
+ }
</Dialog>;
};
+
+const loadingIndicatorStyles: StyleRulesCallback<'root'> = theme => ({
+ root: {
+ position: 'absolute',
+ top: 0,
+ right: 0,
+ bottom: 0,
+ left: 0,
+ display: 'flex',
+ alignItems: 'center',
+ justifyContent: 'center',
+ backgroundColor: 'rgba(255, 255, 255, 0.8)',
+ },
+});
+
+const LoadingIndicator = withStyles(loadingIndicatorStyles)(
+ (props: WithStyles<'root'>) =>
+ <Paper classes={props.classes}>
+ <CircularProgress />
+ </Paper>
+);
diff --git a/src/views-components/sharing-dialog/sharing-dialog.tsx b/src/views-components/sharing-dialog/sharing-dialog.tsx
index b50c74c..69c467e 100644
--- a/src/views-components/sharing-dialog/sharing-dialog.tsx
+++ b/src/views-components/sharing-dialog/sharing-dialog.tsx
@@ -6,22 +6,27 @@ import { compose, Dispatch } from 'redux';
import { connect } from 'react-redux';
import * as React from 'react';
-import { connectSharingDialog, saveSharingDialogChanges, hasChanges } from '~/store/sharing-dialog/sharing-dialog-actions';
+import { connectSharingDialog, saveSharingDialogChanges, connectSharingDialogProgress } from '~/store/sharing-dialog/sharing-dialog-actions';
import { WithDialogProps } from '~/store/dialog/with-dialog';
import { RootState } from '~/store/store';
import SharingDialogComponent, { SharingDialogDataProps, SharingDialogActionProps } from './sharing-dialog-component';
import { SharingDialogContent } from './sharing-dialog-content';
import { connectAdvancedViewSwitch, AdvancedViewSwitchInjectedProps } from './advanced-view-switch';
+import { hasChanges } from '~/store/sharing-dialog/sharing-dialog-types';
+import { WithProgressStateProps } from '~/store/progress-indicator/with-progress';
-const mapStateToProps = (state: RootState, { advancedViewOpen, ...props }: WithDialogProps<string> & AdvancedViewSwitchInjectedProps): SharingDialogDataProps => ({
+type Props = WithDialogProps<string> & AdvancedViewSwitchInjectedProps & WithProgressStateProps;
+
+const mapStateToProps = (state: RootState, { advancedViewOpen, working, ...props }: Props): SharingDialogDataProps => ({
...props,
saveEnabled: hasChanges(state),
+ loading: working,
advancedEnabled: !advancedViewOpen,
children: <SharingDialogContent {...{ advancedViewOpen }} />,
});
-const mapDispatchToProps = (dispatch: Dispatch, { toggleAdvancedView, ...props }: WithDialogProps<string> & AdvancedViewSwitchInjectedProps): SharingDialogActionProps => ({
+const mapDispatchToProps = (dispatch: Dispatch, { toggleAdvancedView, ...props }: Props): SharingDialogActionProps => ({
...props,
onClose: props.closeDialog,
onExited: toggleAdvancedView,
@@ -34,6 +39,7 @@ const mapDispatchToProps = (dispatch: Dispatch, { toggleAdvancedView, ...props }
export const SharingDialog = compose(
connectAdvancedViewSwitch,
connectSharingDialog,
+ connectSharingDialogProgress,
connect(mapStateToProps, mapDispatchToProps)
)(SharingDialogComponent);
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list