@instructure/outcomes-ui 2.1.7 → 2.1.8

package/lib/translated/zh-Hant/store/report/__tests__/reducers.test.js

@@ -8,6 +8,8 @@ var _chai = require("chai");
 
 var _immutable = require("immutable");
 
+var _constants = require("../../../constants.js");
+
 var _actions = require("../actions.js");
 
 var _reducers = _interopRequireDefault(require("../reducers.js"));
@@ -16,13 +18,20 @@ describe('reports/reducers', function () {
   // eslint-disable-next-line camelcase
   var user_uuid = '560fddd9-9b16-4e3a-969c-2f095e7afc78';
   var state = (0, _immutable.fromJS)({
-    rollups: {
+    outcomes: {
       100: {
         id: 100,
         label: 'blue',
         title: 'green'
       }
     },
+    rollups: [{
+      outcomeId: '100',
+      averageScore: 0.8,
+      count: 1,
+      masteryCount: 1,
+      childArtifactCount: 0
+    }],
     results: {
       1955: (0, _defineProperty2.default)({}, user_uuid, {
         user_uuid: user_uuid,
@@ -47,6 +56,12 @@ describe('reports/reducers', function () {
       var newState = (0, _reducers.default)(state, (0, _actions.setPage)(newPage));
       (0, _chai.expect)(newState.get('page').toJS()).to.deep.equal(newPage);
     });
+    it('is cleared by clearReportData', function () {
+      var newState = (0, _reducers.default)(state, (0, _actions.clearReportData)());
+      (0, _chai.expect)(newState.get('page').toJS()).to.deep.equal({
+        number: void 0
+      });
+    });
   });
   describe('pageData', function () {
     it('is updated by setPageData', function () {
@@ -57,17 +72,64 @@ describe('reports/reducers', function () {
       var newState = (0, _reducers.default)(state, (0, _actions.setPageData)(newPageData));
       (0, _chai.expect)(newState.get('pageData').toJS()).to.deep.equal(newPageData);
     });
+    it('is cleared by clearReportData', function () {
+      var newState = (0, _reducers.default)(state, (0, _actions.clearReportData)());
+      (0, _chai.expect)(newState.get('pageData').toJS()).to.deep.equal(new Map());
+    });
+  });
+  describe('loading', function () {
+    it('is updated by setLoading', function () {
+      var newState = (0, _reducers.default)(state, (0, _actions.setLoading)(true));
+      (0, _chai.expect)(newState.get('loading')).to.be.true;
+    });
+    it('is cleared by clearReportData', function () {
+      var newState = (0, _reducers.default)(state, (0, _actions.clearReportData)());
+      (0, _chai.expect)(newState.get('loading')).to.be.false;
+    });
+  });
+  describe('loadingRemainingPages', function () {
+    it('is updated by setLoadingRemainingPages', function () {
+      var newState = (0, _reducers.default)(state, (0, _actions.setLoadingRemainingPages)(_constants.IN_PROGRESS));
+      (0, _chai.expect)(newState.get('loadingRemainingPages')).to.eq(_constants.IN_PROGRESS);
+    });
+    it('is cleared by clearReportData', function () {
+      var newState = (0, _reducers.default)(state, (0, _actions.clearReportData)());
+      (0, _chai.expect)(newState.get('loadingRemainingPages')).to.eq(_constants.NOT_FETCHING);
+    });
+  });
+  describe('outcomes', function () {
+    it('is updated by setReportOutcomes', function () {
+      var newOutcome = {
+        200: {
+          id: 200,
+          label: 'yellow',
+          title: 'red'
+        }
+      };
+      var newState = (0, _reducers.default)(state, (0, _actions.setReportOutcomes)(newOutcome));
+      (0, _chai.expect)(newState.get('outcomes').toJS()).to.deep.equal(newOutcome);
+    });
+    it('is cleared by clearReportData', function () {
+      var newState = (0, _reducers.default)(state, (0, _actions.clearReportData)());
+      (0, _chai.expect)(newState.get('outcomes').toJS()).to.deep.equal(new Map());
+    });
   });
   describe('rollups', function () {
     it('is updated by setRollups', function () {
       var newRollup = {
-        id: 200,
-        label: 'yellow',
-        title: 'red'
+        outcomeId: 200,
+        averageScore: 0.9,
+        count: 1,
+        masteryCount: 1,
+        childArtifactCount: 0
       };
       var newState = (0, _reducers.default)(state, (0, _actions.setRollups)([newRollup]));
       (0, _chai.expect)(newState.get('rollups').toJS()).to.deep.equal([newRollup]);
     });
+    it('is cleared by clearReportData', function () {
+      var newState = (0, _reducers.default)(state, (0, _actions.clearReportData)());
+      (0, _chai.expect)(newState.get('rollups').toJS()).to.deep.equal([]);
+    });
   });
   describe('results', function () {
     it('is updated by setResults', function () {
@@ -114,6 +176,10 @@ describe('reports/reducers', function () {
         pointsPossible: seenResult.pointsPossible
       });
     });
+    it('is cleared by clearReportData', function () {
+      var newState = (0, _reducers.default)(state, (0, _actions.clearReportData)());
+      (0, _chai.expect)(newState.get('results').toJS()).to.deep.equal(new Map());
+    });
   });
   describe('openReportAlignmentId', function () {
     it('is set by VIEW_REPORT_ALIGNMENT', function () {
@@ -137,5 +203,9 @@ describe('reports/reducers', function () {
       var newState = (0, _reducers.default)(state, (0, _actions.setUsers)(newUsers));
       (0, _chai.expect)(newState.get('users').toJS()).to.deep.equal(newUsers);
     });
+    it('is cleared by clearReportData', function () {
+      var newState = (0, _reducers.default)(state, (0, _actions.clearReportData)());
+      (0, _chai.expect)(newState.get('users').toJS()).to.deep.equal(new Map());
+    });
   });
 });

package/lib/translated/zh-Hant/store/report/actions.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getPaginatedUserList = exports.getUserList = exports.loadRemainingResults = exports.loadRemainingUsers = exports.loadRemainingPages = exports.loadRollups = exports.loadPage = exports.loadUsers = exports.setLoadingRemainingPages = exports.setLoading = exports.setPage = exports.setPageData = exports.setUsers = exports.closeReportAlignment = exports.viewReportAlignment = exports.setResults = exports.setRollups = exports.setReportOutcomes = void 0;
+exports.getPaginatedUserList = exports.getUserList = exports.clearReportStore = exports.loadRemainingResults = exports.loadRemainingUsers = exports.loadRemainingPages = exports.loadRollups = exports.loadPage = exports.loadUsers = exports.closeReportAlignment = exports.viewReportAlignment = exports.clearReportData = exports.setLoadingRemainingPages = exports.setLoading = exports.setPage = exports.setPageData = exports.setUsers = exports.setResults = exports.setRollups = exports.setReportOutcomes = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
@@ -32,10 +32,6 @@ var setRollups = (0, _reduxActions.createAction)(_constants.SET_REPORT_ROLLUPS);
 exports.setRollups = setRollups;
 var setResults = (0, _reduxActions.createAction)(_constants.SET_REPORT_RESULTS);
 exports.setResults = setResults;
-var viewReportAlignment = (0, _reduxActions.createAction)(_constants.VIEW_REPORT_ALIGNMENT);
-exports.viewReportAlignment = viewReportAlignment;
-var closeReportAlignment = (0, _reduxActions.createAction)(_constants.CLOSE_REPORT_ALIGNMENT);
-exports.closeReportAlignment = closeReportAlignment;
 var setUsers = (0, _reduxActions.createAction)(_constants.SET_REPORT_USERS);
 exports.setUsers = setUsers;
 var setPageData = (0, _reduxActions.createAction)(_constants.SET_REPORT_PAGE_DATA);
@@ -44,9 +40,15 @@ var setPage = (0, _reduxActions.createAction)(_constants.SET_REPORT_PAGE);
 exports.setPage = setPage;
 var setLoading = (0, _reduxActions.createAction)(_constants.SET_REPORT_LOADING);
 exports.setLoading = setLoading;
-var setLoadingRemainingPages = (0, _reduxActions.createAction)(_constants.SET_REMAINING_PAGES_LOADING); // Function calls to Outcome Service
-
+var setLoadingRemainingPages = (0, _reduxActions.createAction)(_constants.SET_REMAINING_PAGES_LOADING);
 exports.setLoadingRemainingPages = setLoadingRemainingPages;
+var clearReportData = (0, _reduxActions.createAction)(_constants.CLEAR_REPORT_DATA);
+exports.clearReportData = clearReportData;
+var viewReportAlignment = (0, _reduxActions.createAction)(_constants.VIEW_REPORT_ALIGNMENT);
+exports.viewReportAlignment = viewReportAlignment;
+var closeReportAlignment = (0, _reduxActions.createAction)(_constants.CLOSE_REPORT_ALIGNMENT); // Function calls to Outcome Service
+
+exports.closeReportAlignment = closeReportAlignment;
 
 var loadUsers = function loadUsers(artifactType, artifactId, pageNumber) {
   return function (dispatch, getState, _arg, scope) {
@@ -109,10 +111,10 @@ var loadPage = function loadPage(artifactType, artifactId, pageNumber, loadUsers
 
     if (!loading) {
       if (hasSeenPage) {
-        dispatch(setPage({
+        return Promise.resolve(dispatch(setPage({
           number: pageNumber,
           loading: false
-        }));
+        })));
       } else {
         dispatch(setLoading(true));
         dispatch(setPage({
@@ -283,10 +285,18 @@ var loadRemainingResults = function loadRemainingResults(artifactType, artifactI
       dispatch(setLoadingRemainingPages(_constants.ERROR));
     });
   };
+};
+
+exports.loadRemainingResults = loadRemainingResults;
+
+var clearReportStore = function clearReportStore() {
+  return function (dispatch, _getState, _arg, _scope) {
+    dispatch(clearReportData());
+  };
 }; // Helpers
 
 
-exports.loadRemainingResults = loadRemainingResults;
+exports.clearReportStore = clearReportStore;
 
 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

package/lib/translated/zh-Hant/store/report/reducers.js

@@ -21,30 +21,48 @@ var _constants = require("../../constants.js");
 
 var _actions = require("./actions.js");
 
-var users = (0, _reduxActions.handleActions)((0, _defineProperty2.default)({}, _actions.setUsers, function (state, action) {
+var _handleActions, _handleActions2, _handleActions3, _handleActions4, _handleActions5, _handleActions6, _handleActions7, _handleActions8;
+
+var users = (0, _reduxActions.handleActions)((_handleActions = {}, (0, _defineProperty2.default)(_handleActions, _actions.setUsers, function (_state, action) {
   return (0, _immutable.fromJS)(action.payload);
-}), (0, _immutable.Map)());
-var page = (0, _reduxActions.handleActions)((0, _defineProperty2.default)({}, _actions.setPage, function (state, action) {
+}), (0, _defineProperty2.default)(_handleActions, _actions.clearReportData, function (_state, _action) {
+  return (0, _immutable.Map)();
+}), _handleActions), (0, _immutable.Map)());
+var page = (0, _reduxActions.handleActions)((_handleActions2 = {}, (0, _defineProperty2.default)(_handleActions2, _actions.setPage, function (state, action) {
   return (0, _immutable.fromJS)(action.payload);
-}), (0, _immutable.fromJS)({
+}), (0, _defineProperty2.default)(_handleActions2, _actions.clearReportData, function (_state, _action) {
+  return (0, _immutable.fromJS)({
+    number: void 0
+  });
+}), _handleActions2), (0, _immutable.fromJS)({
   number: void 0
 }));
-var pageData = (0, _reduxActions.handleActions)((0, _defineProperty2.default)({}, _actions.setPageData, function (state, action) {
+var pageData = (0, _reduxActions.handleActions)((_handleActions3 = {}, (0, _defineProperty2.default)(_handleActions3, _actions.setPageData, function (state, action) {
   return (0, _immutable.fromJS)(action.payload);
-}), (0, _immutable.Map)());
-var outcomes = (0, _reduxActions.handleActions)((0, _defineProperty2.default)({}, _actions.setReportOutcomes, function (state, action) {
+}), (0, _defineProperty2.default)(_handleActions3, _actions.clearReportData, function (_state, _action) {
+  return (0, _immutable.Map)();
+}), _handleActions3), (0, _immutable.Map)());
+var outcomes = (0, _reduxActions.handleActions)((_handleActions4 = {}, (0, _defineProperty2.default)(_handleActions4, _actions.setReportOutcomes, function (state, action) {
   return (0, _immutable.fromJS)(action.payload);
-}), (0, _immutable.Map)());
-var rollups = (0, _reduxActions.handleActions)((0, _defineProperty2.default)({}, _actions.setRollups, function (state, action) {
+}), (0, _defineProperty2.default)(_handleActions4, _actions.clearReportData, function (_state, _action) {
+  return (0, _immutable.Map)();
+}), _handleActions4), (0, _immutable.Map)());
+var rollups = (0, _reduxActions.handleActions)((_handleActions5 = {}, (0, _defineProperty2.default)(_handleActions5, _actions.setRollups, function (state, action) {
   return (0, _immutable.fromJS)(action.payload);
-}), (0, _immutable.List)());
-var loading = (0, _reduxActions.handleActions)((0, _defineProperty2.default)({}, _actions.setLoading, function (state, action) {
+}), (0, _defineProperty2.default)(_handleActions5, _actions.clearReportData, function (_state, _action) {
+  return (0, _immutable.List)();
+}), _handleActions5), (0, _immutable.List)());
+var loading = (0, _reduxActions.handleActions)((_handleActions6 = {}, (0, _defineProperty2.default)(_handleActions6, _actions.setLoading, function (state, action) {
   return (0, _immutable.fromJS)(action.payload);
-}), false);
-var loadingRemainingPages = (0, _reduxActions.handleActions)((0, _defineProperty2.default)({}, _actions.setLoadingRemainingPages, function (state, action) {
+}), (0, _defineProperty2.default)(_handleActions6, _actions.clearReportData, function (_state, _action) {
+  return false;
+}), _handleActions6), false);
+var loadingRemainingPages = (0, _reduxActions.handleActions)((_handleActions7 = {}, (0, _defineProperty2.default)(_handleActions7, _actions.setLoadingRemainingPages, function (state, action) {
   return (0, _immutable.fromJS)(action.payload);
-}), _constants.NOT_FETCHING);
-var results = (0, _reduxActions.handleActions)((0, _defineProperty2.default)({}, _actions.setResults, function (state, action) {
+}), (0, _defineProperty2.default)(_handleActions7, _actions.clearReportData, function (_state, _action) {
+  return _constants.NOT_FETCHING;
+}), _handleActions7), _constants.NOT_FETCHING);
+var results = (0, _reduxActions.handleActions)((_handleActions8 = {}, (0, _defineProperty2.default)(_handleActions8, _actions.setResults, function (state, action) {
   var _action$payload = action.payload,
       outcomeId = _action$payload.outcomeId,
       results = _action$payload.results,
@@ -67,7 +85,9 @@ var results = (0, _reduxActions.handleActions)((0, _defineProperty2.default)({},
   var fetchedResults = (0, _immutable.Map)(resultMap);
   var allResults = (0, _immutable.Map)([].concat((0, _toConsumableArray2.default)(fetchedResults), (0, _toConsumableArray2.default)(seenResults)));
   return state.set(outcomeId, allResults);
-}), (0, _immutable.Map)());
+}), (0, _defineProperty2.default)(_handleActions8, _actions.clearReportData, function (_state, _action) {
+  return (0, _immutable.Map)();
+}), _handleActions8), (0, _immutable.Map)());
 var openReportAlignmentId = (0, _reduxActions.handleActions)({
   VIEW_REPORT_ALIGNMENT: function VIEW_REPORT_ALIGNMENT(state, action) {
     return action.payload;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/outcomes-ui",
-  "version": "2.1.7",
+  "version": "2.1.8",
   "description": "Outcomes Application for general alignment and assessment",
   "author": "Instructure, Inc. Engineering and Product Design",
   "license": "MIT",