[DUOS-343][risk=no] Read preferences from the user (#179)

* read email preference from the user * updates for status and profile completion * fix researcher approval icons
DataBiosphere · Sep 16, 2019 · baf5410 · baf5410
1 parent 334ba0c
commit baf5410
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/src/components/modals/AddUserModal.js b/src/components/modals/AddUserModal.js
@@ -78,11 +78,9 @@ export const AddUserModal = hh(class AddUserModal extends Component {
     if (this.props.user && this.props.user !== undefined) {
 
       const user = await User.getByEmail(this.props.user.email);
-      let adminEmailPreference = false;
 
       user.roles.forEach(role => {
         rolesState[role.name.toUpperCase()] = true;
-        if (role.name === 'Admin') adminEmailPreference = !role.emailPreference;
       });
 
       this.setState({
@@ -95,7 +93,7 @@ export const AddUserModal = hh(class AddUserModal extends Component {
         rolesState: Object.assign({}, rolesState),
         originalRolesState: Object.assign({}, rolesState),
         originalRoles: user.roles.slice(),
-        emailPreference: adminEmailPreference,
+        emailPreference: !user.emailPreference,
         delegateDacUser: {
           needsDelegation: false,
           delegateCandidates: []

diff --git a/src/libs/ajax.js b/src/libs/ajax.js
@@ -287,7 +287,7 @@ export const DAR = {
       if (dar.ownerUser !== null) {
         dar.ownerUser.roles.map(role => {
           if (role.name === 'Researcher') {
-            dar.status = role.status;
+            dar.status = dar.ownerUser.status;
             return dar;
           }
           return dar;

diff --git a/src/pages/AdminManageUsers.js b/src/pages/AdminManageUsers.js
@@ -32,8 +32,7 @@ class AdminManageUsers extends Component {
       user.researcher = false;
       user.roles.forEach(role => {
         if (role.name === 'Researcher' || user.name === 'RESEARCHER') {
-          user.status = role.status;
-          user.completed = role.profileCompleted;
+          user.completed = user.profileCompleted;
           user.researcher = true;
         }
       });
@@ -222,7 +221,7 @@ class AdminManageUsers extends Component {
 
                       span({ className: "glyphicon glyphicon-thumbs-down cancel-color", isRendered: user.status === 'rejected' && user.completed, "data-tip": "Non-Bonafide researcher", "data-for": "tip_nonBonafide" }),
 
-                      span({ className: "glyphicon glyphicon-hand-right hover-color", isRendered: user.status === 'pending' && user.completed, "data-tip": "Researcher review pending", "data-for": "tip_pendingReview" }),
+                      span({ className: "glyphicon glyphicon-hand-right hover-color", isRendered: user.researcher && user.status === 'pending' && user.completed, "data-tip": "Researcher review pending", "data-for": "tip_pendingReview" }),
 
                       span({ className: "glyphicon glyphicon-hand-right dismiss-color", isRendered: !(user.completed) || (user.researcher === false), disabled: "disabled" }, []),
                     ]),