diff --git a/packages/component-faraday-ui/src/PublonsTable.js b/packages/component-faraday-ui/src/PublonsTable.js index 4b7a53511d9312f03b61f77d11b52a83e8f5b85d..391cd68066d0530f9368ac9203048121ff7a3e06 100644 --- a/packages/component-faraday-ui/src/PublonsTable.js +++ b/packages/component-faraday-ui/src/PublonsTable.js @@ -58,8 +58,8 @@ const TableView = ({ <HiddenCell> <OpenModal confirmText="Invite" - isFetching={isFetching} onConfirm={modalProps => onInviteReviewer(reviewer, modalProps)} + publonsFetching={isFetching} setFetching={setFetching} title="Send invitation to review?" > @@ -77,9 +77,12 @@ const TableView = ({ ) } -const PublonsTable = ({ publonsFetching, ...rest }) => ( - <Fragment>{publonsFetching ? <Spinner /> : <TableView {...rest} />}</Fragment> -) +const PublonsTable = ({ publonsFetching, ...rest }) => + console.log('publonsFetching', publonsFetching) || ( + <Fragment> + {publonsFetching ? <Spinner /> : <TableView {...rest} />} + </Fragment> + ) export default compose( withFetching, diff --git a/packages/component-manuscript/src/components/ManuscriptLayout.js b/packages/component-manuscript/src/components/ManuscriptLayout.js index 81d2be237da6cecd3d7c9611c311455b1e6d31b5..1e7bc702c692dc3b222a4a5cc604fdf57e0c27f5 100644 --- a/packages/component-manuscript/src/components/ManuscriptLayout.js +++ b/packages/component-manuscript/src/components/ManuscriptLayout.js @@ -39,6 +39,8 @@ const ManuscriptLayout = ({ fragment = {}, changeForm, isFetching, + isFetchingData, + publonsFetching, fetchingError, formValues, heExpanded, @@ -82,7 +84,7 @@ const ManuscriptLayout = ({ fragment={fragment} handlingEditors={handlingEditors} inviteHE={toggleAssignHE} - isFetching={isFetching.editorsFetching} + isFetching={isFetchingData.editorsFetching} journal={journal} resendInvitation={inviteHandlingEditor.assignHE} revokeInvitation={inviteHandlingEditor.revokeHE} @@ -158,11 +160,12 @@ const ManuscriptLayout = ({ currentUser={currentUser} expanded={heExpanded} handlingEditors={handlingEditors} - isFetching={isFetching.editorsFetching} + isFetching={isFetchingData.editorsFetching} toggle={toggleAssignHE} /> - {get(currentUser, 'permissions.canViewReviewersDetails', false) && ( + {(get(currentUser, 'permissions.canViewReviewersDetails', false) && + console.log('Are you true?', isFetchingData)) || ( <ReviewerDetails currentUser={currentUser} expanded={reviewerDetailsExpanded} @@ -176,7 +179,7 @@ const ManuscriptLayout = ({ ) } invitations={invitationsWithReviewers} - isFetching={isFetching.publonsFetching} + isFetching={isFetchingData.publonsFetching} journal={journal} mb={2} publonReviewers={publonReviewers} diff --git a/packages/component-manuscript/src/components/ManuscriptPage.js b/packages/component-manuscript/src/components/ManuscriptPage.js index b5cf99de5920698973d35e857737db2e6cb0432c..23778ad590e33e52f37b3f58e6b400bbbf28fb4e 100644 --- a/packages/component-manuscript/src/components/ManuscriptPage.js +++ b/packages/component-manuscript/src/components/ManuscriptPage.js @@ -190,7 +190,7 @@ export default compose( ), }, }, - isFetching: { + isFetchingData: { editorsFetching: selectFetching(state), publonsFetching: isFetching, },