@instructure/outcomes-ui 2.1.7 → 2.1.9

package/lib/translated/ru/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/ru/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/ru/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/lib/translated/sl/components/AlignmentItem/index.js

@@ -49,7 +49,8 @@ var AlignmentItem = function AlignmentItem(_ref) {
       shouldFocus = _ref.shouldFocus,
       isOutcomeSelected = _ref.isOutcomeSelected,
       selectOutcomeIds = _ref.selectOutcomeIds,
-      deselectOutcomeIds = _ref.deselectOutcomeIds;
+      deselectOutcomeIds = _ref.deselectOutcomeIds,
+      features = _ref.features;
 
   var _useState = (0, _react.useState)(true),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -235,7 +236,8 @@ var AlignmentItem = function AlignmentItem(_ref) {
     ratings: scoring_tiers,
     truncated: truncated,
     isTray: isTray,
-    canManageOutcomes: canManageOutcomes
+    canManageOutcomes: canManageOutcomes,
+    features: features
   })))));
 };
 
@@ -247,7 +249,8 @@ AlignmentItem.propTypes = {
   shouldFocus: _propTypes.default.bool,
   isOutcomeSelected: _propTypes.default.func,
   selectOutcomeIds: _propTypes.default.func,
-  deselectOutcomeIds: _propTypes.default.func
+  deselectOutcomeIds: _propTypes.default.func,
+  features: _propTypes.default.array
 };
 AlignmentItem.defaultProps = {
   removeAlignment: function removeAlignment() {},
@@ -256,7 +259,8 @@ AlignmentItem.defaultProps = {
   shouldFocus: false,
   isOutcomeSelected: function isOutcomeSelected() {},
   selectOutcomeIds: function selectOutcomeIds() {},
-  deselectOutcomeIds: function deselectOutcomeIds() {}
+  deselectOutcomeIds: function deselectOutcomeIds() {},
+  features: []
 };
 var _default = AlignmentItem;
 exports.default = _default;

package/lib/translated/sl/components/AlignmentWidget/index.js

@@ -128,7 +128,8 @@ var AlignmentWidget = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles
 
       var _this$props2 = _this.props,
           alignedOutcomes = _this$props2.alignedOutcomes,
-          canManageOutcomes = _this$props2.canManageOutcomes;
+          canManageOutcomes = _this$props2.canManageOutcomes,
+          features = _this$props2.features;
       return /*#__PURE__*/_react.default.createElement(_uiList.List, {
         isUnstyled: true,
         margin: "small 0",
@@ -145,7 +146,8 @@ var AlignmentWidget = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles
           },
           outcome: outcome,
           canManageOutcomes: canManageOutcomes,
-          shouldFocus: index === _this.state.focusedItem
+          shouldFocus: index === _this.state.focusedItem,
+          features: features
         }));
       }), alignedOutcomes.length > 0 && /*#__PURE__*/_react.default.createElement(_uiList.List.Item, {
         key: "delimiter-1"
@@ -159,13 +161,15 @@ var AlignmentWidget = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles
           OutcomeTray = _this$props3.tray,
           liveRegion = _this$props3.liveRegion,
           screenreaderNotification = _this$props3.screenreaderNotification,
-          showAlert = _this$props3.showAlert;
+          showAlert = _this$props3.showAlert,
+          features = _this$props3.features;
       return /*#__PURE__*/_react.default.createElement(OutcomeTray, Object.assign({
         screenreaderNotification: screenreaderNotification,
         liveRegion: liveRegion,
         scope: scope,
         shouldModifyArtifact: true,
-        showAlert: showAlert
+        showAlert: showAlert,
+        features: features
       }, pickerProps));
     };
 
@@ -253,7 +257,8 @@ var AlignmentWidget = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles
   screenreaderNotification: _propTypes.default.func,
   liveRegion: _index.default.propTypes.liveRegion,
   canManageOutcomes: _propTypes.default.bool.isRequired,
-  showAlert: _propTypes.default.func
+  showAlert: _propTypes.default.func,
+  features: _propTypes.default.array
 }, _class2.defaultProps = {
   alignedOutcomes: [],
   pickerProps: {},
@@ -261,6 +266,7 @@ var AlignmentWidget = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles
   screenreaderNotification: null,
   liveRegion: null,
   canManageOutcomes: true,
-  showAlert: function showAlert() {}
+  showAlert: function showAlert() {},
+  features: []
 }, _temp)) || _class);
 exports.default = AlignmentWidget;

package/lib/translated/sl/components/OutcomeDescription/index.js

@@ -40,7 +40,9 @@ var OutcomeDescription = function OutcomeDescription(_ref) {
       ratings = _ref.ratings,
       truncated = _ref.truncated,
       isTray = _ref.isTray,
-      canManageOutcomes = _ref.canManageOutcomes;
+      canManageOutcomes = _ref.canManageOutcomes,
+      features = _ref.features;
+  var newDecayingAvgFFEnabled = features.includes(_constants.NEW_DECAYING_AVERAGE_FF);
   var descriptionDisplay = !canManageOutcomes && friendlyDescription ? friendlyDescription : description;
 
   var stripHtmlTags = function stripHtmlTags(text) {
@@ -61,6 +63,35 @@ var OutcomeDescription = function OutcomeDescription(_ref) {
     return /*#__PURE__*/_react.default.createElement(_uiText.Text, null, renderedText);
   };
 
+  var renderUserFacingMethod = function renderUserFacingMethod(calculationMethod) {
+    var displayMethod = _constants.DECAYING_AVERAGE;
+    var percent = calculationInt.decaying_average_percent;
+
+    if (newDecayingAvgFFEnabled) {
+      switch (calculationMethod) {
+        case _constants.DECAYING_AVERAGE:
+          {
+            displayMethod = _constants.WEIGHTED_AVERAGE;
+            percent = calculationInt.decaying_average_percent;
+            break;
+          }
+
+        case _constants.STANDARD_DECAYING_AVERAGE:
+          {
+            displayMethod = _constants.STANDARD_DECAYING_AVERAGE;
+            percent = calculationInt.standard_decaying_average_percent;
+            break;
+          }
+      }
+    }
+
+    var complement = 100 - percent;
+    return (0, _formatMessage.default)(_constants.CALCULATION_METHODS[displayMethod], {
+      percent: percent,
+      complement: complement
+    });
+  };
+
   var formatCalculationMethodText = function formatCalculationMethodText() {
     var method = '';
 
@@ -93,13 +124,10 @@ var OutcomeDescription = function OutcomeDescription(_ref) {
         }
 
       case _constants.DECAYING_AVERAGE:
+      case _constants.STANDARD_DECAYING_AVERAGE:
         {
-          var percent = calculationInt.decaying_average_percent;
-          var complement = 100 - percent;
-          method = (0, _formatMessage.default)(_constants.CALCULATION_METHODS[_constants.DECAYING_AVERAGE], {
-            percent: percent,
-            complement: complement
-          });
+          method = renderUserFacingMethod(calculationMethod);
+          break;
         }
     }
 
@@ -174,7 +202,8 @@ OutcomeDescription.propTypes = {
   ratings: _propTypes.default.arrayOf(_shapes.scoringTierShape),
   truncated: _propTypes.default.bool,
   isTray: _propTypes.default.bool,
-  canManageOutcomes: _propTypes.default.bool
+  canManageOutcomes: _propTypes.default.bool,
+  features: _propTypes.default.array
 };
 OutcomeDescription.defaultProps = {
   label: '',
@@ -189,7 +218,8 @@ OutcomeDescription.defaultProps = {
   pointsPossible: null,
   ratings: [],
   truncated: true,
-  canManageOutcomes: true
+  canManageOutcomes: true,
+  features: []
 };
 var _default = OutcomeDescription;
 exports.default = _default;

package/lib/translated/sl/components/OutcomeTray/OutcomeList/index.js

@@ -47,7 +47,8 @@ var OutcomeList = /*#__PURE__*/function (_React$Component) {
           outcomes = _this$props.outcomes,
           isOutcomeSelected = _this$props.isOutcomeSelected,
           selectOutcomeIds = _this$props.selectOutcomeIds,
-          deselectOutcomeIds = _this$props.deselectOutcomeIds;
+          deselectOutcomeIds = _this$props.deselectOutcomeIds,
+          features = _this$props.features;
       return outcomes.map(function (outcome) {
         return /*#__PURE__*/_react.default.createElement("div", {
           key: outcome.id
@@ -56,7 +57,8 @@ var OutcomeList = /*#__PURE__*/function (_React$Component) {
           isOutcomeSelected: isOutcomeSelected,
           selectOutcomeIds: selectOutcomeIds,
           deselectOutcomeIds: deselectOutcomeIds,
-          isTray: true
+          isTray: true,
+          features: features
         }));
       });
     }
@@ -116,8 +118,10 @@ OutcomeList.propTypes = {
   getOutcomesList: _propTypes.default.func.isRequired,
   isLoading: _propTypes.default.bool.isRequired,
   listPage: _propTypes.default.number.isRequired,
-  listTotal: _propTypes.default.number
+  listTotal: _propTypes.default.number,
+  features: _propTypes.default.array
 };
 OutcomeList.defaultProps = {
-  listTotal: null
+  listTotal: null,
+  features: []
 };

package/lib/translated/sl/components/OutcomeTray/index.js

@@ -95,7 +95,8 @@ var OutcomeTray = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _
           isFetching = _this$props2.isFetching,
           listPage = _this$props2.listPage,
           listTotal = _this$props2.listTotal,
-          getOutcomesList = _this$props2.getOutcomesList;
+          getOutcomesList = _this$props2.getOutcomesList,
+          features = _this$props2.features;
       return /*#__PURE__*/_react.default.createElement(_uiView.View, {
         display: "block",
         padding: "small none none none"
@@ -107,7 +108,8 @@ var OutcomeTray = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _
         isLoading: isFetching,
         listPage: listPage,
         listTotal: listTotal,
-        getOutcomesList: getOutcomesList
+        getOutcomesList: getOutcomesList,
+        features: features
       }));
     }
   }, {
@@ -283,7 +285,8 @@ var OutcomeTray = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _
   displayMasteryPercentText: _propTypes.default.bool,
   shouldModifyArtifact: _propTypes.default.bool,
   scope: _propTypes.default.string.isRequired,
-  showAlert: _propTypes.default.func
+  showAlert: _propTypes.default.func,
+  features: _propTypes.default.array
 }, _class2.defaultProps = {
   screenreaderNotification: null,
   liveRegion: null,
@@ -298,6 +301,7 @@ var OutcomeTray = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _
   shouldModifyArtifact: false,
   searchTotal: null,
   listTotal: null,
-  showAlert: function showAlert() {}
+  showAlert: function showAlert() {},
+  features: []
 }, _temp)) || _class);
 exports.default = OutcomeTray;

package/lib/translated/sl/components/OutcomeView/MasteryDescription/index.js

@@ -27,6 +27,8 @@ var _uiThemeable = require("@instructure/ui-themeable");
 
 var _shapes = require("../../../store/shapes.js");
 
+var _constants = require("../../../constants.js");
+
 var _theme = _interopRequireDefault(require("../../theme.js"));
 
 var _percent_sl_number = Intl.NumberFormat("sl", { style: "percent" }).format,
@@ -45,10 +47,29 @@ var styles = {
   'scoreMasteryText': 'outcomes-ui__MasteryDescription--scoreMasteryText'
 };
 
-var scoringText = function scoringText(scoringMethod) {
+var renderUserFacingMethod = function renderUserFacingMethod(scoringMethod, newDecayingAvgFFEnabled) {
+  var legacyDecayingAverage = "Odli\u010Dnost, izra\u010Dunana z ute\u017Eeno povpre\u010Dno oceno Najnovej\u0161i \u0161teje kot " + _percent_sl_number(scoringMethod.algorithm_data.decaying_average_percent) + " ute\u017Ei odli\u010Dnosti, povpre\u010Dje vseh drugih rezultatov pa kot " + _percent_sl_number(1.0 - scoringMethod.algorithm_data.decaying_average_percent) + " ute\u017Ei. \u010Ce je rezultat samo en, bo vrnjena samo ena ocena.";
+
+  if (newDecayingAvgFFEnabled) {
+    switch (scoringMethod.algorithm) {
+      case 'decaying_average':
+        return "Mastery calculated by Weighted Average. Most recent counts as " + _percent_sl_number(scoringMethod.algorithm_data.decaying_average_percent) + " of mastery weight, average of all other results count as " + _percent_sl_number(1.0 - scoringMethod.algorithm_data.decaying_average_percent) + " of weight. If there is only one result, the single score will be returned.";
+
+      case 'standard_decaying_average':
+        return "Mastery calculated by Decaying Average. Between two assessments, the most recent assessment gets " + _percent_sl_number(scoringMethod.algorithm_data.standard_decaying_average_percent) + " weight, and the first gets " + _percent_sl_number(1.0 - scoringMethod.algorithm_data.standard_decaying_average_percent) + ". For each additional assessment, the sum of the previous score calculations decay by an additional " + _percent_sl_number(1.0 - scoringMethod.algorithm_data.standard_decaying_average_percent) + ". If there is only one result, the single score will be returned.";
+    }
+  } else {
+    return legacyDecayingAverage;
+  }
+};
+
+var scoringText = function scoringText(scoringMethod, newDecayingAvgFFEnabled) {
   switch (scoringMethod.algorithm) {
     case 'decaying_average':
-      return "Odli\u010Dnost, izra\u010Dunana z ute\u017Eeno povpre\u010Dno oceno Najnovej\u0161i \u0161teje kot " + _percent_sl_number(scoringMethod.algorithm_data.decaying_average_percent) + " ute\u017Ei odli\u010Dnosti, povpre\u010Dje vseh drugih rezultatov pa kot " + _percent_sl_number(1.0 - scoringMethod.algorithm_data.decaying_average_percent) + " ute\u017Ei. \u010Ce je rezultat samo en, bo vrnjena samo ena ocena.";
+      return renderUserFacingMethod(scoringMethod, newDecayingAvgFFEnabled);
+
+    case 'standard_decaying_average':
+      return renderUserFacingMethod(scoringMethod, newDecayingAvgFFEnabled);
 
     case 'n_mastery':
       return "Odli\u010Dnost, izra\u010Dunana z n-kratnikom. Odli\u010Dnost mora dose\u010Di vsaj " + _default_sl_number(scoringMethod.algorithm_data.n_mastery_count) + "-krat.  Rezultati, ki presegajo odli\u010Dnost, bodo za izra\u010Dun kon\u010Dne ocene povpre\u010Deni.";
@@ -59,6 +80,9 @@ var scoringText = function scoringText(scoringMethod) {
     case 'latest':
       return "Odli\u010Dnost, izra\u010Dunana glede na najnovej\u0161i rezultat. Rezultat odli\u010Dnosti izra\u017Ea najnovej\u0161e ocenjevanje z ocenami.";
 
+    case 'average':
+      return "Mastery reflects Average Score. Calculated by dividing the sum of all item scores by the number of scores.";
+
     default:
       return '';
   }
@@ -85,7 +109,9 @@ var MasteryDescription = (_dec = (0, _uiThemeable.themeable)(_theme.default, sty
       var _this$props = this.props,
           artifactTypeName = _this$props.artifactTypeName,
           displayMasteryPercentText = _this$props.displayMasteryPercentText,
-          scoringMethod = _this$props.scoringMethod;
+          scoringMethod = _this$props.scoringMethod,
+          features = _this$props.features;
+      var newDecayingAvgFFEnabled = features.includes(_constants.NEW_DECAYING_AVERAGE_FF);
 
       if (!scoringMethod) {
         return /*#__PURE__*/_react.default.createElement(_uiSpinner.Spinner, {
@@ -98,7 +124,7 @@ var MasteryDescription = (_dec = (0, _uiThemeable.themeable)(_theme.default, sty
         "data-automation": "outcomeView__scoreMethodDescription"
       }, /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_uiText.Text, {
         size: "small"
-      }, scoringText(scoringMethod))), displayMasteryPercentText && artifactTypeName && /*#__PURE__*/_react.default.createElement("div", {
+      }, scoringText(scoringMethod, newDecayingAvgFFEnabled))), displayMasteryPercentText && artifactTypeName && /*#__PURE__*/_react.default.createElement("div", {
         className: styles.scoreMasteryText
       }, /*#__PURE__*/_react.default.createElement(_uiText.Text, {
         size: "small"
@@ -110,9 +136,11 @@ var MasteryDescription = (_dec = (0, _uiThemeable.themeable)(_theme.default, sty
 }(_react.default.Component), _class2.propTypes = {
   artifactTypeName: _propTypes.default.string,
   displayMasteryPercentText: _propTypes.default.bool.isRequired,
-  scoringMethod: _shapes.scoringMethodShape
+  scoringMethod: _shapes.scoringMethodShape,
+  features: _propTypes.default.array
 }, _class2.defaultProps = {
   artifactTypeName: null,
-  scoringMethod: null
+  scoringMethod: null,
+  features: []
 }, _temp)) || _class);
 exports.default = MasteryDescription;

package/lib/translated/sl/components/OutcomeView/index.js

@@ -100,7 +100,8 @@ var OutcomeView = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _
           artifactTypeName = _this$props4.artifactTypeName,
           displayMasteryDescription = _this$props4.displayMasteryDescription,
           displayMasteryPercentText = _this$props4.displayMasteryPercentText,
-          friendlyDescription = _this$props4.friendlyDescription;
+          friendlyDescription = _this$props4.friendlyDescription,
+          features = _this$props4.features;
       var scoringMethod = this.getScoringMethod();
       var scoringTiers = this.getScoringTiers();
       var displayMasteryInformation = this.getDisplayMasteryInformation();
@@ -146,7 +147,8 @@ var OutcomeView = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _
       }), displayMasteryDescription && displayMasteryInformation && /*#__PURE__*/_react.default.createElement(_index3.default, {
         artifactTypeName: artifactTypeName,
         displayMasteryPercentText: displayMasteryPercentText,
-        scoringMethod: scoringMethod
+        scoringMethod: scoringMethod,
+        features: features
       }));
     }
   }]);
@@ -162,7 +164,8 @@ var OutcomeView = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _
   scoringTiers: _propTypes.default.arrayOf(_shapes.scoringTierShape),
   artifactTypeName: _propTypes.default.string,
   displayMasteryDescription: _propTypes.default.bool,
-  displayMasteryPercentText: _propTypes.default.bool
+  displayMasteryPercentText: _propTypes.default.bool,
+  features: _propTypes.default.array
 }, _class2.defaultProps = {
   context: null,
   outcomeResult: null,
@@ -171,6 +174,7 @@ var OutcomeView = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _
   artifactTypeName: null,
   displayMasteryDescription: false,
   displayMasteryPercentText: false,
-  friendlyDescription: null
+  friendlyDescription: null,
+  features: []
 }, _temp)) || _class);
 exports.default = OutcomeView;