@instructure/outcomes-ui 2.1.4 → 2.1.6

package/es/store/report/__tests__/selectors.test.js

@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { Map, fromJS } from 'immutable';
-import { getPageCount, getPageNumber, getRollups, getScore, isOpen, getUsers, getReportOutcome } from "../selectors.js";
+import { formatCSVData, getPageCount, getPageNumber, getRollups, getScore, isOpen, getUsers, getReportOutcome, getHighestPageSeen } from "../selectors.js";
 describe('report/selectors', function () {
   var state = fromJS({
     scopeForTest: {
@@ -14,28 +14,63 @@ describe('report/selectors', function () {
           total: 149
         },
         rollups: [{
-          a: 1,
-          b: 2
+          outcomeId: '123',
+          usesBank: false,
+          childArtifactCount: 0
         }],
         results: {
-          1: {
-            2: {
+          123: {
+            10: {
+              percentScore: 0.5,
+              points: 100,
+              pointsPossible: 200,
+              attempt: 1
+            },
+            20: {
+              percentScore: 0.6,
+              points: 120,
+              pointsPossible: 200,
+              attempt: 1
+            },
+            100: {
               percentScore: 0.5,
               points: 100,
-              pointsPossible: 200
+              pointsPossible: 200,
+              attempt: 1
+            },
+            200: {
+              percentScore: 0.6,
+              points: 120,
+              pointsPossible: 200,
+              attempt: 1
             }
           }
         },
-        users: [{
-          uuid: '100'
-        }, {
-          uuid: '200'
-        }],
+        users: {
+          1: [{
+            uuid: '10',
+            full_name: 'Student 1'
+          }, {
+            uuid: '20',
+            full_name: 'Student 2'
+          }],
+          2: [{
+            uuid: '100',
+            full_name: 'Student 3'
+          }, {
+            uuid: '200',
+            full_name: 'Student 4'
+          }]
+        },
         openReportAlignmentId: 12,
         outcomes: {
           123: {
             id: '123',
-            label: 'foo'
+            label: 'foo',
+            title: 'foobar',
+            scoring_method: {
+              mastery_percent: 0.6
+            }
           }
         }
       }
@@ -58,8 +93,9 @@ describe('report/selectors', function () {
   describe('getRollups', function () {
     it('retrieves the correct rollups', function () {
       expect(getRollups(state, 'scopeForTest')).to.deep.equal([{
-        a: 1,
-        b: 2
+        outcomeId: '123',
+        usesBank: false,
+        childArtifactCount: 0
       }]);
     });
     it('returns an empty array if no outcomes are selected', function () {
@@ -69,10 +105,11 @@ describe('report/selectors', function () {
   });
   describe('getScore', function () {
     it('returns score if outcome id and user id are present', function () {
-      expect(getScore(state, 'scopeForTest', '1', '2')).to.deep.equal({
+      expect(getScore(state, 'scopeForTest', '123', '10')).to.deep.equal({
         percentScore: 0.5,
         points: 100,
-        pointsPossible: 200
+        pointsPossible: 200,
+        attempt: 1
       });
     });
     it('returns null if outcome is not present', function () {
@@ -96,10 +133,13 @@ describe('report/selectors', function () {
   });
   describe('getUsers', function () {
     it('retrieves the correct users', function () {
-      expect(getUsers(state, 'scopeForTest')).to.deep.equal([{
-        uuid: '100'
+      var pageNumber = getPageNumber(state, 'scopeForTest');
+      expect(getUsers(state, 'scopeForTest', pageNumber)).to.deep.equal([{
+        uuid: '100',
+        full_name: 'Student 3'
       }, {
-        uuid: '200'
+        uuid: '200',
+        full_name: 'Student 4'
       }]);
     });
     it('returns an empty array if no users are present', function () {
@@ -111,11 +151,30 @@ describe('report/selectors', function () {
     it('retrieves the correct outcome', function () {
       expect(getReportOutcome(state, 'scopeForTest', '123')).to.deep.equal({
         id: '123',
-        label: 'foo'
+        label: 'foo',
+        title: 'foobar',
+        scoring_method: {
+          mastery_percent: 0.6
+        }
       });
     });
     it('returns nil if no outcome is found', function () {
       expect(getReportOutcome(state, 'scopeForTest', '124')).to.equal(null);
     });
   });
+  describe('getHighestPageSeen', function () {
+    it('retrieves the highest page the user has viewed', function () {
+      expect(getHighestPageSeen(state, 'scopeForTest')).to.equal(2);
+    });
+    it('returns 0 if no pages have been viewed', function () {
+      var newState = Map();
+      expect(getHighestPageSeen(newState, 'scopeForTest')).to.equal(0);
+    });
+  });
+  describe('formatCSVData', function () {
+    it('has a row for each user result', function () {
+      var formattedData = formatCSVData(state, 'scopeForTest');
+      expect(formattedData.length).to.eq(4);
+    });
+  });
 });

package/es/store/report/actions.js

@@ -1,8 +1,9 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { createAction } from 'redux-actions';
 import { CALL_SERVICE } from '@instructure/redux-service-middleware';
-import { getUsers, getPageLoading } from "./selectors.js";
-import { SET_REPORT_PAGE, SET_REPORT_PAGE_DATA, SET_REPORT_OUTCOMES, SET_REPORT_ROLLUPS, SET_REPORT_RESULTS, SET_REPORT_USERS, VIEW_REPORT_ALIGNMENT, CLOSE_REPORT_ALIGNMENT, SET_REPORT_LOADING } from "../../constants.js";
+import { getUsers, getPageLoading, getPageNumber, getResults, getHighestPageSeen, getPageCount, getRollups, getLoadingRemainingPages } from "./selectors.js";
+import { SET_REPORT_PAGE, SET_REPORT_PAGE_DATA, SET_REPORT_OUTCOMES, SET_REPORT_ROLLUPS, SET_REPORT_RESULTS, SET_REPORT_USERS, VIEW_REPORT_ALIGNMENT, CLOSE_REPORT_ALIGNMENT, SET_REPORT_LOADING, SET_REMAINING_PAGES_LOADING, ALL_USERS, ERROR, IN_PROGRESS, COMPLETED } from "../../constants.js";
 import { getConfig } from "../config/selectors.js";
 import { setError } from "../context/actions.js";
 /*
@@ -18,6 +19,8 @@ export var setUsers = createAction(SET_REPORT_USERS);
 export var setPageData = createAction(SET_REPORT_PAGE_DATA);
 export var setPage = createAction(SET_REPORT_PAGE);
 export var setLoading = createAction(SET_REPORT_LOADING);
+export var setLoadingRemainingPages = createAction(SET_REMAINING_PAGES_LOADING); // Function calls to Outcome Service
+
 export var loadUsers = function loadUsers(artifactType, artifactId, pageNumber) {
   return function (dispatch, getState, _arg, scope) {
     var _getConfig = getConfig(getState(), scope),
@@ -34,48 +37,87 @@ export var loadUsers = function loadUsers(artifactType, artifactId, pageNumber)
     });
   };
 };
+
+var getOutcomeResults = function getOutcomeResults(artifactType, artifactId, outcomeId, userList) {
+  return function (dispatch, getState, _arg, scope) {
+    var _getConfig2 = getConfig(getState(), scope),
+        host = _getConfig2.host,
+        jwt = _getConfig2.jwt;
+
+    return dispatch({
+      type: CALL_SERVICE,
+      payload: {
+        service: 'outcomes',
+        method: 'getOutcomeResults',
+        args: [host, jwt, artifactType, artifactId, outcomeId, userList]
+      }
+    });
+  };
+};
+
+var getOutcomeRollups = function getOutcomeRollups(artifactType, artifactId) {
+  return function (dispatch, getState, _arg, scope) {
+    var _getConfig3 = getConfig(getState(), scope),
+        host = _getConfig3.host,
+        jwt = _getConfig3.jwt;
+
+    return dispatch({
+      type: CALL_SERVICE,
+      payload: {
+        service: 'outcomes',
+        method: 'getOutcomeRollups',
+        args: [host, jwt, artifactType, artifactId]
+      }
+    });
+  };
+}; // Functions for loading the Outcome Analysis Report
+
+
 export var loadPage = function loadPage(artifactType, artifactId, pageNumber, loadUsersOverride) {
   return function (dispatch, getState, _arg, scope) {
+    var hasSeenPage = getHighestPageSeen(getState(), scope) >= pageNumber;
     var loading = getPageLoading(getState(), scope);
 
     if (!loading) {
-      dispatch(setLoading(true));
-      dispatch(setPage({
-        number: pageNumber,
-        loading: true
-      }));
-      var usersPromiseChain;
-
-      if (loadUsersOverride) {
-        // if the override function is provided, we assume the upstream application has handled dispatching and is
-        // returning a promise to us
-        usersPromiseChain = loadUsersOverride(artifactType, artifactId, pageNumber);
-      } else {
-        usersPromiseChain = dispatch(loadUsers(artifactType, artifactId, pageNumber));
-      }
-
-      return usersPromiseChain.then(function (_ref) {
-        var users = _ref.users,
-            perPage = _ref.perPage,
-            total = _ref.total;
-        var pageData = {
-          perPage: perPage,
-          total: total
-        };
-        dispatch(setUsers(users));
-        return dispatch(setPageData(pageData));
-      }).then(function () {
-        return dispatch(loadRollups(artifactType, artifactId));
-      }).then(function () {
-        return dispatch(setPage({
+      if (hasSeenPage) {
+        dispatch(setPage({
           number: pageNumber,
           loading: false
         }));
-      }).then(function () {
-        return dispatch(setLoading(false));
-      }).catch(function (e) {
-        return dispatch(setError(e));
-      });
+      } else {
+        dispatch(setLoading(true));
+        dispatch(setPage({
+          number: pageNumber,
+          loading: true
+        }));
+        var usersPromiseChain = getUsersPromise(dispatch, artifactType, artifactId, pageNumber, loadUsersOverride);
+        return usersPromiseChain.then(function (_ref) {
+          var users = _ref.users,
+              perPage = _ref.perPage,
+              total = _ref.total;
+          var pageData = {
+            perPage: perPage,
+            total: total
+          };
+          var seenUsers = getUsers(getState(), scope, ALL_USERS);
+
+          var allUsers = _objectSpread(_defineProperty({}, pageNumber, users), seenUsers);
+
+          dispatch(setUsers(allUsers));
+          return dispatch(setPageData(pageData));
+        }).then(function () {
+          return dispatch(loadRollups(artifactType, artifactId));
+        }).then(function () {
+          return dispatch(setPage({
+            number: pageNumber,
+            loading: false
+          }));
+        }).then(function () {
+          return dispatch(setLoading(false));
+        }).catch(function (e) {
+          return dispatch(setError(e));
+        });
+      }
     } else {
       return Promise.resolve();
     }
@@ -83,22 +125,10 @@ export var loadPage = function loadPage(artifactType, artifactId, pageNumber, lo
 };
 export var loadRollups = function loadRollups(artifactType, artifactId) {
   return function (dispatch, getState, _arg, scope) {
-    var _getConfig2 = getConfig(getState(), scope),
-        host = _getConfig2.host,
-        jwt = _getConfig2.jwt;
-
-    var userList = getUsers(getState(), scope).map(function (user) {
-      return user.uuid;
-    });
-    var jsonPromise = dispatch({
-      type: CALL_SERVICE,
-      payload: {
-        service: 'outcomes',
-        method: 'getOutcomeRollups',
-        args: [host, jwt, artifactType, artifactId]
-      }
-    });
-    return jsonPromise.then(function (json) {
+    var pageNumber = getPageNumber(getState(), scope);
+    var userList = getUserList(getState(), scope, pageNumber);
+    var rollupsPromise = dispatch(getOutcomeRollups(artifactType, artifactId));
+    return rollupsPromise.then(function (json) {
       var outcomes = json.reduce(function (acc, el) {
         return Object.assign(acc, _defineProperty({}, el.outcome.id, el.outcome));
       }, {});
@@ -114,26 +144,18 @@ export var loadRollups = function loadRollups(artifactType, artifactId) {
       });
       dispatch(setReportOutcomes(outcomes));
       dispatch(setRollups(rollups));
-
-      var getOutcomeResults = function getOutcomeResults(outcomeId) {
-        return dispatch({
-          type: CALL_SERVICE,
-          payload: {
-            service: 'outcomes',
-            method: 'getOutcomeResults',
-            args: [host, jwt, artifactType, artifactId, outcomeId, userList]
-          }
-        });
-      };
-
       var resultPromises = json.map(function (el) {
-        return getOutcomeResults(el.outcome.id) // eslint-disable-line promise/no-nesting
-        .then(function (results) {
+        var resultPromise = dispatch(getOutcomeResults(artifactType, artifactId, el.outcome.id, userList));
+        return resultPromise.then(function (results) {
+          var seenResults = getResults(getState(), scope, el.outcome.id);
           dispatch(setResults({
             outcomeId: el.outcome.id,
-            results: results
+            results: results,
+            seenResults: seenResults
           }));
           return results;
+        }).catch(function (e) {
+          return dispatch(setError(e));
         });
       });
       return Promise.all(resultPromises);
@@ -141,4 +163,109 @@ export var loadRollups = function loadRollups(artifactType, artifactId) {
       return dispatch(setError(e));
     });
   };
+}; // Functions for fetching the remaining data for the Outcome Analysis Report CSV Download
+
+export var loadRemainingPages = function loadRemainingPages(artifactType, artifactId, loadUsersOverride) {
+  return function (dispatch, getState, _arg, scope) {
+    var loadingRemainingPages = getLoadingRemainingPages(getState(), scope);
+
+    if (loadingRemainingPages !== IN_PROGRESS) {
+      // If there was an error in the last fetch, then the only data that is guaranteed to be
+      // loaded is up to the page the user is currently on
+      var startPage = loadingRemainingPages === ERROR ? getPageNumber(getState(), scope) : getHighestPageSeen(getState(), scope) + 1;
+      var endPage = getPageCount(getState(), scope);
+      dispatch(setLoadingRemainingPages(IN_PROGRESS));
+      return dispatch(loadRemainingUsers(artifactType, artifactId, startPage, endPage, loadUsersOverride)).then(function () {
+        return dispatch(loadRemainingResults(artifactType, artifactId, startPage, endPage));
+      }).catch(function (e) {
+        dispatch(setError(e));
+        dispatch(setLoadingRemainingPages(ERROR));
+      });
+    } else {
+      return Promise.resolve();
+    }
+  };
+};
+export var loadRemainingUsers = function loadRemainingUsers(artifactType, artifactId, startPage, endPage, loadUsersOverride) {
+  return function (dispatch, getState, _arg, scope) {
+    var userPromises = [];
+
+    var _loop = function _loop(pageNumber) {
+      var usersPromise = getUsersPromise(dispatch, artifactType, artifactId, pageNumber, loadUsersOverride);
+      var usersPromiseChain = usersPromise.then(function (_ref2) {
+        var users = _ref2.users,
+            perPage = _ref2.perPage,
+            total = _ref2.total;
+        var pageData = {
+          perPage: perPage,
+          total: total
+        };
+        var seenUsers = getUsers(getState(), scope, ALL_USERS);
+
+        var allUsers = _objectSpread(_defineProperty({}, pageNumber, users), seenUsers);
+
+        dispatch(setUsers(allUsers));
+        dispatch(setPageData(pageData));
+      });
+      userPromises.push(usersPromiseChain);
+    };
+
+    for (var pageNumber = startPage; pageNumber <= endPage; pageNumber++) {
+      _loop(pageNumber);
+    }
+
+    return Promise.all(userPromises).catch(function (e) {
+      dispatch(setError(e));
+      dispatch(setLoadingRemainingPages(ERROR));
+    });
+  };
+};
+export var loadRemainingResults = function loadRemainingResults(artifactType, artifactId, startPage, endPage) {
+  return function (dispatch, getState, _arg, scope) {
+    var rollups = getRollups(getState(), scope);
+    var resultPromises = [];
+    rollups.forEach(function (rollup) {
+      var outcomeId = rollup.outcomeId;
+      var paginatedUserList = getPaginatedUserList(getState(), scope, startPage, endPage);
+      paginatedUserList.forEach(function (userList) {
+        var resultPromise = dispatch(getOutcomeResults(artifactType, artifactId, outcomeId, userList)).then(function (results) {
+          var seenResults = getResults(getState(), scope, outcomeId);
+          dispatch(setResults({
+            outcomeId: outcomeId,
+            results: results,
+            seenResults: seenResults
+          }));
+        });
+        resultPromises.push(resultPromise);
+      });
+    });
+    return Promise.all(resultPromises).then(function () {
+      return dispatch(setLoadingRemainingPages(COMPLETED));
+    }).catch(function (e) {
+      dispatch(setError(e));
+      dispatch(setLoadingRemainingPages(ERROR));
+    });
+  };
+}; // Helpers
+
+var getUsersPromise = function getUsersPromise(dispatch, artifactType, artifactId, pageNumber, loadUsersOverride) {
+  // if the override function is provided, we assume the upstream application has handled dispatching and is
+  // returning a promise to us
+  return loadUsersOverride ? loadUsersOverride(artifactType, artifactId, pageNumber) : dispatch(loadUsers(artifactType, artifactId, pageNumber));
+};
+
+export var getUserList = function getUserList(state, scope, page) {
+  return getUsers(state, scope, page).map(function (user) {
+    return user.uuid;
+  });
+};
+export var getPaginatedUserList = function getPaginatedUserList(state, scope, startPage, endPage) {
+  var userList = [];
+
+  for (var i = startPage; i <= endPage; i++) {
+    var users = getUserList(state, scope, i);
+    userList.push(users);
+  }
+
+  return userList;
 };

package/es/store/report/reducers.js

@@ -1,11 +1,13 @@
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import { List, Map, fromJS } from 'immutable';
 import { handleActions } from 'redux-actions';
 import { combineReducers } from 'redux-immutable';
-import { setPage, setPageData, setUsers, setReportOutcomes, setRollups, setResults, setLoading } from "./actions.js";
+import { NOT_FETCHING } from "../../constants.js";
+import { setPage, setPageData, setUsers, setReportOutcomes, setRollups, setResults, setLoading, setLoadingRemainingPages } from "./actions.js";
 var users = handleActions(_defineProperty({}, setUsers, function (state, action) {
   return fromJS(action.payload);
-}), List());
+}), Map());
 var page = handleActions(_defineProperty({}, setPage, function (state, action) {
   return fromJS(action.payload);
 }), fromJS({
@@ -23,24 +25,32 @@ var rollups = handleActions(_defineProperty({}, setRollups, function (state, act
 var loading = handleActions(_defineProperty({}, setLoading, function (state, action) {
   return fromJS(action.payload);
 }), false);
+var loadingRemainingPages = handleActions(_defineProperty({}, setLoadingRemainingPages, function (state, action) {
+  return fromJS(action.payload);
+}), NOT_FETCHING);
 var results = handleActions(_defineProperty({}, setResults, function (state, action) {
   var _action$payload = action.payload,
       outcomeId = _action$payload.outcomeId,
-      results = _action$payload.results;
+      results = _action$payload.results,
+      seenResults = _action$payload.seenResults;
   var resultMap = results.map(function (_ref) {
     var userId = _ref.user_uuid,
         percentScore = _ref.percent_score,
         points = _ref.points,
-        pointsPossible = _ref.points_possible;
+        pointsPossible = _ref.points_possible,
+        attempt = _ref.attempt;
     var ungulated = fromJS({
       userId: userId,
       percentScore: percentScore,
       points: points,
-      pointsPossible: pointsPossible
+      pointsPossible: pointsPossible,
+      attempt: attempt !== null && attempt !== void 0 ? attempt : 1
     });
     return [userId.toString(), ungulated];
   });
-  return state.set(outcomeId, Map(resultMap));
+  var fetchedResults = Map(resultMap);
+  var allResults = Map([].concat(_toConsumableArray(fetchedResults), _toConsumableArray(seenResults)));
+  return state.set(outcomeId, allResults);
 }), Map());
 var openReportAlignmentId = handleActions({
   VIEW_REPORT_ALIGNMENT: function VIEW_REPORT_ALIGNMENT(state, action) {
@@ -58,5 +68,6 @@ export default combineReducers({
   results: results,
   rollups: rollups,
   openReportAlignmentId: openReportAlignmentId,
-  loading: loading
+  loading: loading,
+  loadingRemainingPages: loadingRemainingPages
 });

package/es/store/report/selectors.js

@@ -1,4 +1,7 @@
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import { Map } from 'immutable';
+import { ALL_USERS } from "../../constants.js";
+import { formatDataIntoRow } from "../../util/outcomesReportUtils.js";
 
 function restrict(state, scope) {
   return state.getIn([scope, 'report']) || Map();
@@ -22,15 +25,26 @@ export function getPageCount(state, scope) {
 export function getLoading(state, scope) {
   return state && restrict(state, scope).get('loading');
 }
+export function getLoadingRemainingPages(state, scope) {
+  return state && restrict(state, scope).get('loadingRemainingPages');
+}
 export function getPageNumber(state, scope) {
   return state && restrict(state, scope).getIn(['page', 'number']);
 }
 export function getPageLoading(state, scope) {
   return state && restrict(state, scope).getIn(['page', 'loading'], false);
 }
-export function getUsers(state, scope) {
-  var users = state && restrict(state, scope).get('users');
-  return users ? users.toJS() : [];
+export function getUsers(state, scope, pageNumber) {
+  return pageNumber == ALL_USERS ? getAllUsers(state, scope) : getUsersForPage(state, scope, pageNumber);
+}
+export function getHighestPageSeen(state, scope) {
+  var seenPages = state && restrict(state, scope).get('users');
+
+  var pagesList = seenPages && _toConsumableArray(seenPages.keys()).map(function (pageNumber) {
+    return parseInt(pageNumber);
+  });
+
+  return pagesList ? Math.max.apply(Math, _toConsumableArray(pagesList)) : 0;
 }
 export function getRollups(state, scope) {
   var rollups = state && restrict(state, scope).get('rollups');
@@ -40,6 +54,10 @@ export function getScore(state, scope, outcomeId, userId) {
   var score = state && restrict(state, scope).getIn(['results', outcomeId, userId]);
   return score ? score.toJS() : null;
 }
+export function getResults(state, scope, outcomeId) {
+  var results = state && restrict(state, scope).getIn(['results', outcomeId]);
+  return results ? results : Map();
+}
 export function isOpen(state, scope, outcomeId) {
   return restrict(state, scope).get('openReportAlignmentId') === outcomeId;
 }
@@ -49,4 +67,31 @@ export function getReportOutcome(state, scope, outcomeId) {
 }
 export function hasAnyOutcomes(state, scope) {
   return state && restrict(state, scope).getIn(['outcomes']).size > 0;
-}
+}
+export function formatCSVData(state, scope) {
+  var rows = [];
+  var users = Object.values(getAllUsers(state, scope)).flat();
+  var rollups = getRollups(state, scope);
+  users.forEach(function (user) {
+    rollups.forEach(function (rollup) {
+      var outcome = getReportOutcome(state, scope, rollup.outcomeId);
+      var result = getScore(state, scope, rollup.outcomeId, user.uuid);
+
+      if (result) {
+        var row = formatDataIntoRow(user, outcome, rollup, result);
+        rows.push(row);
+      }
+    });
+  });
+  return rows;
+} // Helpers
+
+var getAllUsers = function getAllUsers(state, scope) {
+  var allUsers = state && restrict(state, scope).get('users');
+  return allUsers ? allUsers.toJS() : {};
+};
+
+var getUsersForPage = function getUsersForPage(state, scope, pageNumber) {
+  var users = pageNumber != void 0 && state && restrict(state, scope).getIn(['users', pageNumber.toString()]);
+  return users ? users.toJS() : [];
+};

package/es/translated/ar/components/AlignmentItem/__tests__/index.test.js

@@ -23,7 +23,7 @@ describe('AlignmentItem', function () {
 
   it('renders title', function () {
     var wrapper = shallow( /*#__PURE__*/React.createElement(AlignmentItem, makeProps()));
-    expect(wrapper.find('Text')).to.have.length(1);
+    expect(wrapper.find('Heading')).to.have.length(1);
   });
   it('renders the friendly name if user cannot manage outcomes', function () {
     var wrapper = mount( /*#__PURE__*/React.createElement(AlignmentItem, makeProps({