Private/public consolidation (#161)

* Most of the changes to join endpoints * Fix loading admin names in group hierarchy * Fix loading on user pages * More privateData fixes * More fixes * Fix redirect after auth * Do not duplicate users name container
ReCodEx · Jan 8, 2018 · 135c5f1 · 135c5f1
1 parent 6e1fa17
commit 135c5f1
Show file tree

Hide file tree

Showing 32 changed files with 240 additions and 328 deletions.
diff --git a/src/components/Groups/AdminsView/AdminsView.js b/src/components/Groups/AdminsView/AdminsView.js
@@ -33,7 +33,10 @@ const AdminsView = ({ group, addSubgroup, formValues, intl: { locale } }) =>
             />
           }
         >
-          <AddSupervisor instanceId={group.instanceId} groupId={group.id} />
+          <AddSupervisor
+            instanceId={group.privateData.instanceId}
+            groupId={group.id}
+          />
         </Box>
       </Col>
       <Col md={6}>

diff --git a/src/components/Groups/GroupDetail/GroupDetail.js b/src/components/Groups/GroupDetail/GroupDetail.js
@@ -1,6 +1,5 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import ImmutablePropTypes from 'react-immutable-proptypes';
 import { FormattedMessage, FormattedNumber, injectIntl } from 'react-intl';
 import { Row, Col, Table } from 'react-bootstrap';
 import ReactMarkdown from 'react-remarkable';
@@ -20,16 +19,17 @@ const GroupDetail = ({
     externalId,
     name,
     localizedTexts,
-    description,
-    threshold,
-    parentGroupId,
-    isPublic = false,
-    childGroups,
     primaryAdminsIds,
-    ...group
+    childGroups,
+    privateData: {
+      description,
+      threshold,
+      parentGroupId,
+      isPublic = false,
+      ...privateGroup
+    }
   },
   groups,
-  publicGroups,
   supervisors,
   isAdmin,
   intl: { locale }
@@ -120,7 +120,7 @@ const GroupDetail = ({
                   deletable={false}
                   isAdmin={isAdmin}
                   isOpen
-                  groups={publicGroups}
+                  groups={groups}
                   level={1}
                 />
               </Box>
@@ -147,7 +147,7 @@ const GroupDetail = ({
             users={supervisors}
             isAdmin={isAdmin}
             primaryAdminsIds={primaryAdminsIds}
-            isLoaded={supervisors.length === group.supervisors.length}
+            isLoaded={supervisors.length === privateGroup.supervisors.length}
           />
         </Box>
       </Col>
@@ -158,19 +158,20 @@ GroupDetail.propTypes = {
   group: PropTypes.shape({
     id: PropTypes.string.isRequired,
     name: PropTypes.string.isRequired,
-    description: PropTypes.string.isRequired,
     parentGroupId: PropTypes.string,
     childGroups: PropTypes.shape({
       all: PropTypes.array,
       public: PropTypes.array.isRequired
     }),
     threshold: PropTypes.number,
-    isPublic: PropTypes.bool,
-    supervisors: PropTypes.array.isRequired,
-    primaryAdminsIds: PropTypes.array.isRequired
+    primaryAdminsIds: PropTypes.array.isRequired,
+    privateData: PropTypes.shape({
+      description: PropTypes.string.isRequired,
+      isPublic: PropTypes.bool,
+      supervisors: PropTypes.array.isRequired
+    })
   }),
   groups: PropTypes.object.isRequired,
-  publicGroups: ImmutablePropTypes.map.isRequired,
   supervisors: PropTypes.array.isRequired,
   isAdmin: PropTypes.bool,
   intl: PropTypes.shape({ locale: PropTypes.string.isRequired }).isRequired

diff --git a/src/components/Groups/GroupTree/GroupTree.js b/src/components/Groups/GroupTree/GroupTree.js
@@ -61,9 +61,9 @@ class GroupTree extends Component {
     const {
       name,
       localizedTexts,
-      admins,
+      canView,
       childGroups: { all: allChildGroups, public: publicChildGroups },
-      canView
+      primaryAdminsIds
     } = getJsData(group);
 
     return (
@@ -79,7 +79,7 @@ class GroupTree extends Component {
               />
             }
             level={level}
-            admins={admins}
+            admins={primaryAdminsIds}
             isOpen={currentGroupId === id || isOpen}
             actions={
               currentGroupId !== id && canView

diff --git a/src/components/Groups/SupervisorsView/SupervisorsView.js b/src/components/Groups/SupervisorsView/SupervisorsView.js
@@ -91,7 +91,10 @@ const SupervisorsView = ({
           }
           isOpen
         >
-          <AddStudent instanceId={group.instanceId} groupId={group.id} />
+          <AddStudent
+            instanceId={group.privateData.instanceId}
+            groupId={group.id}
+          />
         </Box>
         <Box
           title={

diff --git a/src/components/widgets/TreeView/TreeViewLeaf.js b/src/components/widgets/TreeView/TreeViewLeaf.js
@@ -5,6 +5,7 @@ import Icon from 'react-fontawesome';
 import { LoadingIcon } from '../../icons';
 import LevelGap from './LevelGap';
 import GroupsName from '../../../components/Groups/GroupsName';
+import UsersNameContainer from '../../../containers/UsersNameContainer';
 
 const TreeViewLeaf = ({
   loading = false,
@@ -32,9 +33,9 @@ const TreeViewLeaf = ({
       <span>
         &nbsp;&nbsp; (<small>
           <em>
-            {admins
-              .map(a => a.name.firstName + ' ' + a.name.lastName)
-              .join(', ')}
+            {admins.map(a =>
+              <UsersNameContainer key={a} userId={a} isSimple />
+            )}
           </em>
         </small>)
       </span>}

diff --git a/src/containers/GroupsNameContainer/GroupsNameContainer.js b/src/containers/GroupsNameContainer/GroupsNameContainer.js
@@ -3,8 +3,8 @@ import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { connect } from 'react-redux';
 
-import { fetchPublicGroupIfNeeded } from '../../redux/modules/publicGroups';
-import { publicGroupSelector } from '../../redux/selectors/publicGroups';
+import { fetchGroupIfNeeded } from '../../redux/modules/groups';
+import { groupSelector } from '../../redux/selectors/groups';
 import ResourceRenderer from '../../components/helpers/ResourceRenderer';
 import GroupsName, {
   LoadingGroupsName
@@ -22,7 +22,7 @@ class GroupsNameContainer extends Component {
   }
 
   static loadAsync = ({ groupId }, dispatch) => {
-    dispatch(fetchPublicGroupIfNeeded(groupId));
+    dispatch(fetchGroupIfNeeded(groupId));
   };
 
   render() {
@@ -44,7 +44,7 @@ GroupsNameContainer.propTypes = {
 
 export default connect(
   (state, { groupId }) => ({
-    group: publicGroupSelector(groupId)(state)
+    group: groupSelector(groupId)(state)
   }),
   (dispatch, { groupId }) => ({
     loadAsync: () => GroupsNameContainer.loadAsync({ groupId }, dispatch)

diff --git a/src/containers/HierarchyLineContainer/HierarchyLineContainer.js b/src/containers/HierarchyLineContainer/HierarchyLineContainer.js
@@ -30,7 +30,7 @@ class HierarchyLineContainer extends Component {
         {group =>
           <HierarchyLine
             groupId={group.id}
-            parentGroupsIds={group.parentGroupsIds}
+            parentGroupsIds={group.privateData.parentGroupsIds}
           />}
       </ResourceRenderer>
     );

diff --git a/src/containers/MakeRemoveSupervisorButtonContainer/MakeRemoveSupervisorButtonContainer.js b/src/containers/MakeRemoveSupervisorButtonContainer/MakeRemoveSupervisorButtonContainer.js
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { makeSupervisor, removeSupervisor } from '../../redux/modules/groups';
-import { fetchProfileIfNeeded } from '../../redux/modules/publicProfiles';
+import { fetchUserIfNeeded } from '../../redux/modules/users';
 import { isSupervisorOf } from '../../redux/selectors/users';
 
 import MakeSupervisorButton from '../../components/Groups/MakeSupervisorButton';
@@ -14,7 +14,7 @@ const MakeRemoveSupervisorButtonContainer = ({
   groupId,
   makeSupervisor,
   removeSupervisor,
-  fetchProfileIfNeeded,
+  fetchUserIfNeeded,
   ...props
 }) =>
   isSupervisor
@@ -26,9 +26,7 @@ const MakeRemoveSupervisorButtonContainer = ({
     : <MakeSupervisorButton
         {...props}
         onClick={() => {
-          fetchProfileIfNeeded(userId).then(() =>
-            makeSupervisor(groupId, userId)
-          );
+          fetchUserIfNeeded(userId).then(() => makeSupervisor(groupId, userId));
         }}
         bsSize="xs"
       />;
@@ -39,7 +37,7 @@ MakeRemoveSupervisorButtonContainer.propTypes = {
   isSupervisor: PropTypes.bool.isRequired,
   makeSupervisor: PropTypes.func.isRequired,
   removeSupervisor: PropTypes.func.isRequired,
-  fetchProfileIfNeeded: PropTypes.func.isRequired
+  fetchUserIfNeeded: PropTypes.func.isRequired
 };
 
 const mapStateToProps = (state, { groupId, userId }) => ({
@@ -49,7 +47,7 @@ const mapStateToProps = (state, { groupId, userId }) => ({
 const mapDispatchToProps = {
   makeSupervisor,
   removeSupervisor,
-  fetchProfileIfNeeded
+  fetchUserIfNeeded
 };
 
 export default connect(mapStateToProps, mapDispatchToProps)(

diff --git a/src/containers/SisSupervisorGroupsContainer/SisSupervisorGroupsContainer.js b/src/containers/SisSupervisorGroupsContainer/SisSupervisorGroupsContainer.js
@@ -9,7 +9,7 @@ import Button from '../../components/widgets/FlatButton';
 import { LinkContainer } from 'react-router-bootstrap';
 import Icon from 'react-fontawesome';
 
-import { fetchPublicGroupsIfNeeded } from '../../redux/modules/publicGroups';
+import { fetchGroupsIfNeeded } from '../../redux/modules/groups';
 import { fetchSisStatusIfNeeded } from '../../redux/modules/sisStatus';
 import {
   fetchSisSupervisedCourses,
@@ -21,7 +21,7 @@ import { sisPossibleParentsSelector } from '../../redux/selectors/sisPossiblePar
 import { sisStateSelector } from '../../redux/selectors/sisStatus';
 import { sisSupervisedCoursesSelector } from '../../redux/selectors/sisSupervisedCourses';
 import { loggedInUserIdSelector } from '../../redux/selectors/auth';
-import { publicGroupDataAccessorSelector } from '../../redux/selectors/publicGroups';
+import { groupDataAccessorSelector } from '../../redux/selectors/groups';
 
 import UsersNameContainer from '../UsersNameContainer';
 import ResourceRenderer from '../../components/helpers/ResourceRenderer';
@@ -73,7 +73,7 @@ class SisSupervisorGroupsContainer extends Component {
                     .then(parents =>
                       parents.map(parent =>
                         dispatch(
-                          fetchPublicGroupsIfNeeded(
+                          fetchGroupsIfNeeded(
                             parent.id,
                             ...parent.parentGroupsIds
                           )
@@ -346,7 +346,7 @@ export default injectIntl(
           currentUserId,
           sisCourses: sisSupervisedCoursesSelector(state),
           sisPossibleParents: sisPossibleParentsSelector(state),
-          groupsAccessor: publicGroupDataAccessorSelector(state)
+          groupsAccessor: groupDataAccessorSelector(state)
         };
       },
       dispatch => ({

diff --git a/src/containers/StudentsListContainer/StudentsListContainer.js b/src/containers/StudentsListContainer/StudentsListContainer.js
@@ -24,14 +24,13 @@ class StudentsListContainer extends Component {
     const { group, students, stats, ...props } = this.props;
     return (
       <ResourceRenderer resource={group}>
-        {group => (
+        {group =>
           <StudentsList
             {...props}
             users={students}
-            isLoaded={students.length === group.students.length}
+            isLoaded={students.length === group.privateData.students.length}
             stats={stats}
-          />
-        )}
+          />}
       </ResourceRenderer>
     );
   }

diff --git a/src/containers/UsersNameContainer/UsersNameContainer.css b/src/containers/UsersNameContainer/UsersNameContainer.css
@@ -0,0 +1,5 @@
+.simpleName {
+  margin-left: 4px;
+  margin-right: 4px;
+  white-space: nowrap;
+}
diff --git a/src/containers/UsersNameContainer/UsersNameContainer.js b/src/containers/UsersNameContainer/UsersNameContainer.js
@@ -3,15 +3,17 @@ import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { connect } from 'react-redux';
 
-import { fetchProfileIfNeeded } from '../../redux/modules/publicProfiles';
-import { getProfile } from '../../redux/selectors/publicProfiles';
+import { fetchUserIfNeeded } from '../../redux/modules/users';
+import { getUser } from '../../redux/selectors/users';
 import { loggedInUserIdSelector } from '../../redux/selectors/auth';
 import ResourceRenderer from '../../components/helpers/ResourceRenderer';
 import UsersName, {
   LoadingUsersName,
   FailedUsersName
 } from '../../components/Users/UsersName';
 
+import './UsersNameContainer.css';
+
 class UsersNameContainer extends Component {
   componentWillMount() {
     this.props.loadAsync();
@@ -24,11 +26,11 @@ class UsersNameContainer extends Component {
   }
 
   static loadAsync = ({ userId }, dispatch) => {
-    dispatch(fetchProfileIfNeeded(userId));
+    dispatch(fetchUserIfNeeded(userId));
   };
 
   render() {
-    const { user, large, noLink, currentUserId } = this.props;
+    const { user, large, noLink, currentUserId, isSimple = false } = this.props;
     const size = large ? 45 : 22;
     return (
       <ResourceRenderer
@@ -37,13 +39,17 @@ class UsersNameContainer extends Component {
         failed={<FailedUsersName size={size} />}
       >
         {user =>
-          <UsersName
-            {...user}
-            large={large}
-            size={size}
-            noLink={noLink}
-            currentUserId={currentUserId}
-          />}
+          isSimple
+            ? <span className="simpleName">
+                {user.name.firstName} {user.name.lastName}
+              </span>
+            : <UsersName
+                {...user}
+                large={large}
+                size={size}
+                noLink={noLink}
+                currentUserId={currentUserId}
+              />}
       </ResourceRenderer>
     );
   }
@@ -55,16 +61,17 @@ UsersNameContainer.propTypes = {
   large: PropTypes.bool,
   user: ImmutablePropTypes.map,
   noLink: PropTypes.bool,
-  loadAsync: PropTypes.func.isRequired
+  loadAsync: PropTypes.func.isRequired,
+  isSimple: PropTypes.bool
 };
 
 export default connect(
   (state, { userId }) => ({
-    user: getProfile(userId)(state),
+    user: getUser(userId)(state),
     currentUserId: loggedInUserIdSelector(state)
   }),
   (dispatch, { userId }) => ({
-    loadProfileIfNeeded: () => dispatch(fetchProfileIfNeeded(userId)),
+    loadProfileIfNeeded: () => dispatch(fetchUserIfNeeded(userId)),
     loadAsync: () => UsersNameContainer.loadAsync({ userId }, dispatch)
   })
 )(UsersNameContainer);