Fix dashboard SIS panel to correctly fetch public groups instead of g…

…roups when accessing group names.

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 { fetchGroupsIfNeeded } from '../../redux/modules/groups';
+import { fetchPublicGroupsIfNeeded } from '../../redux/modules/publicGroups';
 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 { groupDataAccessorSelector } from '../../redux/selectors/groups';
+import { publicGroupDataAccessorSelector } from '../../redux/selectors/publicGroups';
 
 import UsersNameContainer from '../UsersNameContainer';
 import ResourceRenderer from '../../components/helpers/ResourceRenderer';
@@ -72,7 +72,12 @@ class SisSupervisorGroupsContainer extends Component {
                     .then(res => res.value)
                     .then(parents =>
                       parents.map(parent =>
-                        dispatch(fetchGroupsIfNeeded(...parent.parentGroupsIds))
+                        dispatch(
+                          fetchPublicGroupsIfNeeded(
+                            parent.id,
+                            ...parent.parentGroupsIds
+                          )
+                        )
                       )
                     )
                 )
@@ -341,7 +346,7 @@ export default injectIntl(
           currentUserId,
           sisCourses: sisSupervisedCoursesSelector(state),
           sisPossibleParents: sisPossibleParentsSelector(state),
-          groupsAccessor: groupDataAccessorSelector(state)
+          groupsAccessor: publicGroupDataAccessorSelector(state)
         };
       },
       dispatch => ({

src/pages/Dashboard/Dashboard.js

@@ -23,6 +23,7 @@ import {
   fetchGroupsIfNeeded,
   fetchInstanceGroupsIfNeeded
 } from '../../redux/modules/groups';
+import { fetchPublicGroupsIfNeeded } from '../../redux/modules/publicGroups';
 
 import {
   getUser,
@@ -86,7 +87,13 @@ class Dashboard extends Component {
               groups.map(({ value: group }) =>
                 Promise.all([
                   dispatch(fetchAssignmentsForGroup(group.id)),
-                  dispatch(fetchGroupsStatsIfNeeded(group.id))
+                  dispatch(fetchGroupsStatsIfNeeded(group.id)),
+                  dispatch(
+                    fetchPublicGroupsIfNeeded(
+                      group.id,
+                      ...group.parentGroupsIds
+                    )
+                  )
                 ])
               )
             )

src/redux/modules/publicGroups.js

@@ -11,6 +11,7 @@ const { actions, reduceActions } = factory({
  * Actions
  */
 
+export const fetchPublicGroupsIfNeeded = actions.fetchIfNeeded;
 export const fetchPublicGroupIfNeeded = actions.fetchOneIfNeeded;
 
 export const fetchInstancePublicGroups = instanceId =>

src/redux/selectors/publicGroups.js

@@ -1,11 +1,18 @@
 import { createSelector } from 'reselect';
+import { Map } from 'immutable';
 
 /**
  * Select groups part of the state
  */
+const EMPTY_MAP = Map();
 
 export const publicGroupsSelectors = state =>
   state.publicGroups.get('resources');
 
 export const publicGroupSelector = id =>
   createSelector(publicGroupsSelectors, groups => groups.get(id));
+
+export const publicGroupDataAccessorSelector = createSelector(
+  publicGroupsSelectors,
+  groups => groupId => groups.getIn([groupId, 'data'], EMPTY_MAP)
+);