X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/82db2694a5a0f54d4d8b07db08aecb0ca7d2f5ed..f9dafeec8d45f0cb19d71326b7fa877891a7eb9e:/src/views-components/sharing-dialog/sharing-dialog.tsx diff --git a/src/views-components/sharing-dialog/sharing-dialog.tsx b/src/views-components/sharing-dialog/sharing-dialog.tsx index 63ee19a74b..b295f6d167 100644 --- a/src/views-components/sharing-dialog/sharing-dialog.tsx +++ b/src/views-components/sharing-dialog/sharing-dialog.tsx @@ -6,32 +6,48 @@ import { compose, Dispatch } from 'redux'; import { connect } from 'react-redux'; import * as React from 'react'; -import { connectSharingDialog } 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'; 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 = (_: RootState, { advancedViewOpen, ...props }: WithDialogProps & AdvancedViewSwitchInjectedProps): SharingDialogDataProps => ({ +type Props = WithDialogProps & AdvancedViewSwitchInjectedProps & WithProgressStateProps; + +const mapStateToProps = (state: RootState, { advancedViewOpen, working, ...props }: Props): SharingDialogDataProps => ({ ...props, - saveEnabled: false, + saveEnabled: hasChanges(state), + loading: working, advancedEnabled: !advancedViewOpen, children: , }); -const mapDispatchToProps = (_: Dispatch, { toggleAdvancedView, ...props }: WithDialogProps & AdvancedViewSwitchInjectedProps): SharingDialogActionProps => ({ +const mapDispatchToProps = (dispatch: Dispatch, { toggleAdvancedView, advancedViewOpen, ...props }: Props): SharingDialogActionProps => ({ ...props, onClose: props.closeDialog, - onExited: toggleAdvancedView, - onSave: () => { console.log('save'); }, + onExited: () => { + if (advancedViewOpen) { + toggleAdvancedView(); + } + }, + onSave: () => { + if (advancedViewOpen) { + dispatch(saveSharingDialogChanges); + } else { + dispatch(sendSharingInvitations); + } + }, onAdvanced: toggleAdvancedView, }); export const SharingDialog = compose( connectAdvancedViewSwitch, connectSharingDialog, + connectSharingDialogProgress, connect(mapStateToProps, mapDispatchToProps) )(SharingDialogComponent);