diff --git a/packages/component-modal/src/components/withModal.js b/packages/component-modal/src/components/withModal.js index 60eaf034fac97351d7326340bb1384c908fde3ac..941fde711362f178e7337b6c3b5b03904f0eb8f3 100644 --- a/packages/component-modal/src/components/withModal.js +++ b/packages/component-modal/src/components/withModal.js @@ -20,8 +20,10 @@ const mapDispatch = modalKey => (dispatch, propss) => ({ const mapDispatch2 = (dispatch, props) => ({ hideModal: () => dispatch(hideModal()), - showModal: (modalProps = {}) => - dispatch(showModal(props.modalKey, modalProps)), + showModal: (modalProps = {}) => { + console.log('showing modal dispatch', modalProps, props) + dispatch(showModal(props.modalKey, modalProps)) + }, setModalError: errorMessage => dispatch(setModalError(errorMessage)), }) @@ -34,6 +36,7 @@ export const withModal2 = mapperFn => BaseComponent => modalError, modalsVisibility, modalKey, + showModal, ...rest } = baseProps return ( diff --git a/packages/components-faraday/src/components/Reviewers/InviteReviewers.js b/packages/components-faraday/src/components/Reviewers/InviteReviewers.js index c4238c7f7cb81023019a9035793f85000a56ae23..e1432a82ccaf99d9731c66e136ac0b55bd8ab258 100644 --- a/packages/components-faraday/src/components/Reviewers/InviteReviewers.js +++ b/packages/components-faraday/src/components/Reviewers/InviteReviewers.js @@ -38,28 +38,32 @@ const InviteReviewersModal = compose( collectionId, reviewers, getReviewers, - }) => ( - <Root> - <CloseIcon data-test="icon-modal-hide" onClick={hideModal}> - <Icon color={theme.colorPrimary}>x</Icon> - </CloseIcon> + }) => { + console.log('InviteReviewersModal ->', showModal) + return ( + <Root> + <CloseIcon data-test="icon-modal-hide" onClick={hideModal}> + <Icon color={theme.colorPrimary}>x</Icon> + </CloseIcon> - <Title>Invite Reviewers</Title> + <Title>Invite Reviewers</Title> - <Subtitle>Invite reviewer</Subtitle> - <ReviewerForm collectionId={collectionId} getReviewers={getReviewers} /> + <Subtitle>Invite reviewer</Subtitle> + <ReviewerForm collectionId={collectionId} getReviewers={getReviewers} /> - <Subtitle>Reviewers Info</Subtitle> - <ReviewersList - collectionId={collectionId} - reviewers={reviewers} - showModal={showModal} - /> - </Root> - ), + <Subtitle>Reviewers Info</Subtitle> + <ReviewersList + collectionId={collectionId} + reviewers={reviewers} + showModal={showModal} + /> + </Root> + ) + }, ) const ModalSwitcher = ({ type, ...rest }) => { + console.log('modal switcher', type, rest) switch (type) { case 'invite-reviewers': return <InviteReviewersModal {...rest} /> @@ -73,11 +77,10 @@ export default compose( modalComponent: ModalSwitcher, })), withHandlers({ - showInviteModal: ({ showModal, hideModal, project, reviewers }) => () => { + showInviteModal: ({ showModal, hideModal, project }) => () => { showModal({ type: 'invite-reviewers', collectionId: project.id, - reviewers, onConfirm: () => { hideModal() }, diff --git a/packages/components-faraday/src/components/Reviewers/ReviewerList.js b/packages/components-faraday/src/components/Reviewers/ReviewerList.js index 911522856f5bf94515f31a192f9c8d965d288f6b..e9e41772a57a31d76e5d63ef75471ad2222f1dea 100644 --- a/packages/components-faraday/src/components/Reviewers/ReviewerList.js +++ b/packages/components-faraday/src/components/Reviewers/ReviewerList.js @@ -111,6 +111,7 @@ export default compose( inviteReviewer, collectionId, }) => reviewer => () => { + console.log('show confirm resend', showModal) showModal({ title: 'Resend confirmation', onConfirm: () => {