Fixing several issues where safeGet should have returned empty array …

…as fallback.
ReCodEx · Oct 7, 2021 · bccf304 · bccf304
1 parent 1362be2
commit bccf304
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 15 deletions.
diff --git a/src/components/helpers/group.js b/src/components/helpers/group.js
@@ -4,7 +4,7 @@ const computeMap = (groups, filter) => {
   const res = {};
   groups.filter(filter).forEach((group, id) => {
     res[id] = true;
-    group.getIn(['data', 'parentGroupsIds'], []).forEach(parentId => {
+    (group.getIn(['data', 'parentGroupsIds'], []) || []).forEach(parentId => {
       res[parentId] = true;
     });
   });

diff --git a/src/containers/ShadowAssignmentPointsContainer/ShadowAssignmentPointsContainer.js b/src/containers/ShadowAssignmentPointsContainer/ShadowAssignmentPointsContainer.js
@@ -54,7 +54,7 @@ export default connect(
   (dispatch, { groupId, id }) => ({
     loadAsync: () =>
       dispatch(fetchGroupIfNeeded(groupId)).then(({ value: group }) =>
-        dispatch(fetchByIds(safeGet(group, ['privateData', 'students'], [])))
+        dispatch(fetchByIds(safeGet(group, ['privateData', 'students']) || []))
       ),
     setPoints: ({ awardeeId, pointsId, points, note, awardedAt }) =>
       dispatch(setShadowAssignmentPoints(groupId, id, awardeeId, pointsId, points, note, awardedAt)),

diff --git a/src/containers/SisSupervisorGroupsContainer/SisSupervisorGroupsContainer.js b/src/containers/SisSupervisorGroupsContainer/SisSupervisorGroupsContainer.js
@@ -282,8 +282,10 @@ class SisSupervisorGroupsContainer extends Component {
                                                                   groupsAccessor,
                                                                   locale
                                                                 )}
-                                                                {safeGet(group, ['privateData', 'bindings', 'sis'], [])
-                                                                  .length > 1 && (
+                                                                {(
+                                                                  safeGet(group, ['privateData', 'bindings', 'sis']) ||
+                                                                  []
+                                                                ).length > 1 && (
                                                                   <OverlayTrigger
                                                                     placement="right"
                                                                     overlay={

diff --git a/src/containers/StudentsListContainer/StudentsListContainer.js b/src/containers/StudentsListContainer/StudentsListContainer.js
@@ -69,7 +69,7 @@ export default connect(
       Promise.all([
         dispatch(fetchGroupStatsIfNeeded(groupId)),
         dispatch(fetchGroupIfNeeded(groupId)).then(({ value: group }) =>
-          dispatch(fetchByIds(safeGet(group, ['privateData', 'students'], [])))
+          dispatch(fetchByIds(safeGet(group, ['privateData', 'students']) || []))
         ),
       ]),
   })

diff --git a/src/helpers/exercise/configAdvanced.js b/src/helpers/exercise/configAdvanced.js
@@ -7,7 +7,7 @@ import { safeGet, arrayToObject, encodeNumId, encodeId } from '../common';
  */
 export const getPipelines = defaultMemoize(config =>
   // There should be only one environment and all tests have the same pipelines (hence we take first and first)
-  safeGet(config, [0, 'tests', 0, 'pipelines'], []).map(({ name }) => name)
+  (safeGet(config, [0, 'tests', 0, 'pipelines']) || []).map(({ name }) => name)
 );
 
 /**

diff --git a/src/helpers/exercise/environments.js b/src/helpers/exercise/environments.js
@@ -87,7 +87,7 @@ export const getFirstEnvironmentId = environmentConfigs =>
  */
 export const getEnvironmentInitValues = environmentConfigs => {
   const environmentId = getFirstEnvironmentId(environmentConfigs);
-  const variables = safeGet(environmentConfigs, [0, 'variablesTable'], []);
+  const variables = safeGet(environmentConfigs, [0, 'variablesTable']) || [];
   return { environmentId, variables };
 };
 

diff --git a/src/pages/AssignmentStats/AssignmentStats.js b/src/pages/AssignmentStats/AssignmentStats.js
@@ -238,7 +238,7 @@ class AssignmentStats extends Component {
         .then(res => res.value)
         .then(assignment =>
           dispatch(fetchGroupIfNeeded(assignment.groupId)).then(({ value: group }) =>
-            dispatch(fetchByIds(safeGet(group, ['privateData', 'students'], [])))
+            dispatch(fetchByIds(safeGet(group, ['privateData', 'students']) || []))
           )
         ),
       dispatch(fetchRuntimeEnvironments()),

diff --git a/src/pages/GroupDetail/GroupDetail.js b/src/pages/GroupDetail/GroupDetail.js
@@ -74,7 +74,7 @@ class GroupDetail extends Component {
               ])
             : Promise.resolve(),
           hasPermissions(group, 'viewStudents')
-            ? dispatch(fetchByIds(safeGet(group, ['privateData', 'students'], [])))
+            ? dispatch(fetchByIds(safeGet(group, ['privateData', 'students']) || []))
             : Promise.resolve(),
           dispatch(fetchGroupStats(groupId)),
         ])

diff --git a/src/pages/GroupInfo/GroupInfo.js b/src/pages/GroupInfo/GroupInfo.js
@@ -54,9 +54,9 @@ class GroupInfo extends Component {
       .then(res => res.value)
       .then(group =>
         Promise.all([
-          dispatch(fetchByIds(safeGet(group, ['primaryAdminsIds'], []))),
-          dispatch(fetchByIds(safeGet(group, ['privateData', 'supervisors'], []))),
-          dispatch(fetchByIds(safeGet(group, ['privateData', 'observers'], []))),
+          dispatch(fetchByIds(safeGet(group, ['primaryAdminsIds']) || [])),
+          dispatch(fetchByIds(safeGet(group, ['privateData', 'supervisors']) || [])),
+          dispatch(fetchByIds(safeGet(group, ['privateData', 'observers']) || [])),
         ])
       );
 
@@ -73,13 +73,13 @@ class GroupInfo extends Component {
       const prevData = prevProps.group.toJS().data.privateData;
       const groupJs = this.props.group.toJS();
       if (safeGet(prevData, ['primaryAdmins', 'length'], -1) !== safeGet(newData, ['primaryAdmins', 'length'], -1)) {
-        this.props.refetchUsers(safeGet(groupJs, ['data', 'primaryAdminsIds'], []));
+        this.props.refetchUsers(safeGet(groupJs, ['data', 'primaryAdminsIds']) || []);
       }
       if (safeGet(prevData, ['supervisors', 'length'], -1) !== safeGet(newData, ['supervisors', 'length'], -1)) {
-        this.props.refetchUsers(safeGet(groupJs, ['data', 'privateData', 'supervisors'], []));
+        this.props.refetchUsers(safeGet(groupJs, ['data', 'privateData', 'supervisors']) || []);
       }
       if (safeGet(prevData, ['observers', 'length'], -1) !== safeGet(newData, ['observers', 'length'], -1)) {
-        this.props.refetchUsers(safeGet(groupJs, ['data', 'privateData', 'observers'], []));
+        this.props.refetchUsers(safeGet(groupJs, ['data', 'privateData', 'observers']) || []);
       }
     }
   }