From 0e160108bb1d42785c9e24f1cf29a1d7e54fc174 Mon Sep 17 00:00:00 2001
From: Demetriad Sinzeanu <demetriad.sinzeanu@thinslices.com>
Date: Thu, 25 Oct 2018 10:48:31 +0300
Subject: [PATCH] fix(PublonsTable): Spinner on Publons now works on reviewer
suggestions
---
packages/component-faraday-ui/src/PublonsTable.js | 11 +++++++----
.../src/components/ManuscriptLayout.js | 11 +++++++----
.../src/components/ManuscriptPage.js | 2 +-
3 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/packages/component-faraday-ui/src/PublonsTable.js b/packages/component-faraday-ui/src/PublonsTable.js
index 4b7a53511..391cd6806 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 81d2be237..1e7bc702c 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 b5cf99de5..23778ad59 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,
},
--
GitLab