@instructure/outcomes-ui 2.1.7 → 2.1.9

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

@@ -1,19 +1,27 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import { expect } from 'chai';
 import { fromJS } from 'immutable';
-import { setPage, setPageData, setRollups, setResults, setUsers, viewReportAlignment, closeReportAlignment } from "../actions.js";
+import { IN_PROGRESS, NOT_FETCHING } from "../../../constants.js";
+import { setPage, setPageData, setRollups, setResults, setUsers, setReportOutcomes, setLoading, setLoadingRemainingPages, clearReportData, viewReportAlignment, closeReportAlignment } from "../actions.js";
 import reducer from "../reducers.js";
 describe('reports/reducers', function () {
   // eslint-disable-next-line camelcase
   var user_uuid = '560fddd9-9b16-4e3a-969c-2f095e7afc78';
   var state = fromJS({
-    rollups: {
+    outcomes: {
       100: {
         id: 100,
         label: 'blue',
         title: 'green'
       }
     },
+    rollups: [{
+      outcomeId: '100',
+      averageScore: 0.8,
+      count: 1,
+      masteryCount: 1,
+      childArtifactCount: 0
+    }],
     results: {
       1955: _defineProperty({}, user_uuid, {
         user_uuid: user_uuid,
@@ -38,6 +46,12 @@ describe('reports/reducers', function () {
       var newState = reducer(state, setPage(newPage));
       expect(newState.get('page').toJS()).to.deep.equal(newPage);
     });
+    it('is cleared by clearReportData', function () {
+      var newState = reducer(state, clearReportData());
+      expect(newState.get('page').toJS()).to.deep.equal({
+        number: void 0
+      });
+    });
   });
   describe('pageData', function () {
     it('is updated by setPageData', function () {
@@ -48,17 +62,64 @@ describe('reports/reducers', function () {
       var newState = reducer(state, setPageData(newPageData));
       expect(newState.get('pageData').toJS()).to.deep.equal(newPageData);
     });
+    it('is cleared by clearReportData', function () {
+      var newState = reducer(state, clearReportData());
+      expect(newState.get('pageData').toJS()).to.deep.equal(new Map());
+    });
+  });
+  describe('loading', function () {
+    it('is updated by setLoading', function () {
+      var newState = reducer(state, setLoading(true));
+      expect(newState.get('loading')).to.be.true;
+    });
+    it('is cleared by clearReportData', function () {
+      var newState = reducer(state, clearReportData());
+      expect(newState.get('loading')).to.be.false;
+    });
+  });
+  describe('loadingRemainingPages', function () {
+    it('is updated by setLoadingRemainingPages', function () {
+      var newState = reducer(state, setLoadingRemainingPages(IN_PROGRESS));
+      expect(newState.get('loadingRemainingPages')).to.eq(IN_PROGRESS);
+    });
+    it('is cleared by clearReportData', function () {
+      var newState = reducer(state, clearReportData());
+      expect(newState.get('loadingRemainingPages')).to.eq(NOT_FETCHING);
+    });
+  });
+  describe('outcomes', function () {
+    it('is updated by setReportOutcomes', function () {
+      var newOutcome = {
+        200: {
+          id: 200,
+          label: 'yellow',
+          title: 'red'
+        }
+      };
+      var newState = reducer(state, setReportOutcomes(newOutcome));
+      expect(newState.get('outcomes').toJS()).to.deep.equal(newOutcome);
+    });
+    it('is cleared by clearReportData', function () {
+      var newState = reducer(state, clearReportData());
+      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 = reducer(state, setRollups([newRollup]));
       expect(newState.get('rollups').toJS()).to.deep.equal([newRollup]);
     });
+    it('is cleared by clearReportData', function () {
+      var newState = reducer(state, clearReportData());
+      expect(newState.get('rollups').toJS()).to.deep.equal([]);
+    });
   });
   describe('results', function () {
     it('is updated by setResults', function () {
@@ -105,6 +166,10 @@ describe('reports/reducers', function () {
         pointsPossible: seenResult.pointsPossible
       });
     });
+    it('is cleared by clearReportData', function () {
+      var newState = reducer(state, clearReportData());
+      expect(newState.get('results').toJS()).to.deep.equal(new Map());
+    });
   });
   describe('openReportAlignmentId', function () {
     it('is set by VIEW_REPORT_ALIGNMENT', function () {
@@ -128,5 +193,9 @@ describe('reports/reducers', function () {
       var newState = reducer(state, setUsers(newUsers));
       expect(newState.get('users').toJS()).to.deep.equal(newUsers);
     });
+    it('is cleared by clearReportData', function () {
+      var newState = reducer(state, clearReportData());
+      expect(newState.get('users').toJS()).to.deep.equal(new Map());
+    });
   });
 });

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

@@ -3,7 +3,7 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { createAction } from 'redux-actions';
 import { CALL_SERVICE } from '@instructure/redux-service-middleware';
 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 { SET_REPORT_PAGE, SET_REPORT_PAGE_DATA, SET_REPORT_OUTCOMES, SET_REPORT_ROLLUPS, SET_REPORT_RESULTS, SET_REPORT_USERS, SET_REPORT_LOADING, SET_REMAINING_PAGES_LOADING, CLEAR_REPORT_DATA, VIEW_REPORT_ALIGNMENT, CLOSE_REPORT_ALIGNMENT, ALL_USERS, ERROR, IN_PROGRESS, COMPLETED } from "../../constants.js";
 import { getConfig } from "../config/selectors.js";
 import { setError } from "../context/actions.js";
 /*
@@ -13,13 +13,14 @@ import { setError } from "../context/actions.js";
 export var setReportOutcomes = createAction(SET_REPORT_OUTCOMES);
 export var setRollups = createAction(SET_REPORT_ROLLUPS);
 export var setResults = createAction(SET_REPORT_RESULTS);
-export var viewReportAlignment = createAction(VIEW_REPORT_ALIGNMENT);
-export var closeReportAlignment = createAction(CLOSE_REPORT_ALIGNMENT);
 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 setLoadingRemainingPages = createAction(SET_REMAINING_PAGES_LOADING);
+export var clearReportData = createAction(CLEAR_REPORT_DATA);
+export var viewReportAlignment = createAction(VIEW_REPORT_ALIGNMENT);
+export var closeReportAlignment = createAction(CLOSE_REPORT_ALIGNMENT); // Function calls to Outcome Service
 
 export var loadUsers = function loadUsers(artifactType, artifactId, pageNumber) {
   return function (dispatch, getState, _arg, scope) {
@@ -80,10 +81,10 @@ export var loadPage = function loadPage(artifactType, artifactId, pageNumber, lo
 
     if (!loading) {
       if (hasSeenPage) {
-        dispatch(setPage({
+        return Promise.resolve(dispatch(setPage({
           number: pageNumber,
           loading: false
-        }));
+        })));
       } else {
         dispatch(setLoading(true));
         dispatch(setPage({
@@ -246,6 +247,11 @@ export var loadRemainingResults = function loadRemainingResults(artifactType, ar
       dispatch(setLoadingRemainingPages(ERROR));
     });
   };
+};
+export var clearReportStore = function clearReportStore() {
+  return function (dispatch, _getState, _arg, _scope) {
+    dispatch(clearReportData());
+  };
 }; // Helpers
 
 var getUsersPromise = function getUsersPromise(dispatch, artifactType, artifactId, pageNumber, loadUsersOverride) {

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

@@ -1,34 +1,53 @@
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+
+var _handleActions, _handleActions2, _handleActions3, _handleActions4, _handleActions5, _handleActions6, _handleActions7, _handleActions8;
+
 import { List, Map, fromJS } from 'immutable';
 import { handleActions } from 'redux-actions';
 import { combineReducers } from 'redux-immutable';
 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) {
+import { setPage, setPageData, setUsers, setReportOutcomes, setRollups, setResults, setLoading, setLoadingRemainingPages, clearReportData } from "./actions.js";
+var users = handleActions((_handleActions = {}, _defineProperty(_handleActions, setUsers, function (_state, action) {
   return fromJS(action.payload);
-}), Map());
-var page = handleActions(_defineProperty({}, setPage, function (state, action) {
+}), _defineProperty(_handleActions, clearReportData, function (_state, _action) {
+  return Map();
+}), _handleActions), Map());
+var page = handleActions((_handleActions2 = {}, _defineProperty(_handleActions2, setPage, function (state, action) {
   return fromJS(action.payload);
-}), fromJS({
+}), _defineProperty(_handleActions2, clearReportData, function (_state, _action) {
+  return fromJS({
+    number: void 0
+  });
+}), _handleActions2), fromJS({
   number: void 0
 }));
-var pageData = handleActions(_defineProperty({}, setPageData, function (state, action) {
+var pageData = handleActions((_handleActions3 = {}, _defineProperty(_handleActions3, setPageData, function (state, action) {
   return fromJS(action.payload);
-}), Map());
-var outcomes = handleActions(_defineProperty({}, setReportOutcomes, function (state, action) {
+}), _defineProperty(_handleActions3, clearReportData, function (_state, _action) {
+  return Map();
+}), _handleActions3), Map());
+var outcomes = handleActions((_handleActions4 = {}, _defineProperty(_handleActions4, setReportOutcomes, function (state, action) {
   return fromJS(action.payload);
-}), Map());
-var rollups = handleActions(_defineProperty({}, setRollups, function (state, action) {
+}), _defineProperty(_handleActions4, clearReportData, function (_state, _action) {
+  return Map();
+}), _handleActions4), Map());
+var rollups = handleActions((_handleActions5 = {}, _defineProperty(_handleActions5, setRollups, function (state, action) {
   return fromJS(action.payload);
-}), List());
-var loading = handleActions(_defineProperty({}, setLoading, function (state, action) {
+}), _defineProperty(_handleActions5, clearReportData, function (_state, _action) {
+  return List();
+}), _handleActions5), List());
+var loading = handleActions((_handleActions6 = {}, _defineProperty(_handleActions6, setLoading, function (state, action) {
   return fromJS(action.payload);
-}), false);
-var loadingRemainingPages = handleActions(_defineProperty({}, setLoadingRemainingPages, function (state, action) {
+}), _defineProperty(_handleActions6, clearReportData, function (_state, _action) {
+  return false;
+}), _handleActions6), false);
+var loadingRemainingPages = handleActions((_handleActions7 = {}, _defineProperty(_handleActions7, setLoadingRemainingPages, function (state, action) {
   return fromJS(action.payload);
-}), NOT_FETCHING);
-var results = handleActions(_defineProperty({}, setResults, function (state, action) {
+}), _defineProperty(_handleActions7, clearReportData, function (_state, _action) {
+  return NOT_FETCHING;
+}), _handleActions7), NOT_FETCHING);
+var results = handleActions((_handleActions8 = {}, _defineProperty(_handleActions8, setResults, function (state, action) {
   var _action$payload = action.payload,
       outcomeId = _action$payload.outcomeId,
       results = _action$payload.results,
@@ -51,7 +70,9 @@ var results = handleActions(_defineProperty({}, setResults, function (state, act
   var fetchedResults = Map(resultMap);
   var allResults = Map([].concat(_toConsumableArray(fetchedResults), _toConsumableArray(seenResults)));
   return state.set(outcomeId, allResults);
-}), Map());
+}), _defineProperty(_handleActions8, clearReportData, function (_state, _action) {
+  return Map();
+}), _handleActions8), Map());
 var openReportAlignmentId = handleActions({
   VIEW_REPORT_ALIGNMENT: function VIEW_REPORT_ALIGNMENT(state, action) {
     return action.payload;

package/lib/components/AlignmentItem/index.js

@@ -51,7 +51,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),
@@ -245,7 +246,8 @@ var AlignmentItem = function AlignmentItem(_ref) {
     ratings: scoring_tiers,
     truncated: truncated,
     isTray: isTray,
-    canManageOutcomes: canManageOutcomes
+    canManageOutcomes: canManageOutcomes,
+    features: features
   })))));
 };
 
@@ -257,7 +259,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() {},
@@ -266,7 +269,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/components/AlignmentWidget/index.js

@@ -130,7 +130,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",
@@ -147,7 +148,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"
@@ -161,13 +163,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));
     };
 
@@ -257,7 +261,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: {},
@@ -265,6 +270,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/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/components/OutcomeTray/OutcomeList/index.js

@@ -49,7 +49,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
@@ -58,7 +59,8 @@ var OutcomeList = /*#__PURE__*/function (_React$Component) {
           isOutcomeSelected: isOutcomeSelected,
           selectOutcomeIds: selectOutcomeIds,
           deselectOutcomeIds: deselectOutcomeIds,
-          isTray: true
+          isTray: true,
+          features: features
         }));
       });
     }
@@ -118,8 +120,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/components/OutcomeTray/index.js

@@ -97,7 +97,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"
@@ -109,7 +110,8 @@ var OutcomeTray = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _
         isLoading: isFetching,
         listPage: listPage,
         listTotal: listTotal,
-        getOutcomesList: getOutcomesList
+        getOutcomesList: getOutcomesList,
+        features: features
       }));
     }
   }, {
@@ -285,7 +287,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,
@@ -300,6 +303,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/components/OutcomeView/MasteryDescription/index.js

@@ -29,6 +29,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 _dec, _class, _class2, _temp;
@@ -42,13 +44,38 @@ var styles = {
   'scoreMasteryText': 'outcomes-ui__MasteryDescription--scoreMasteryText'
 };
 
-var scoringText = function scoringText(scoringMethod) {
+var renderUserFacingMethod = function renderUserFacingMethod(scoringMethod, newDecayingAvgFFEnabled) {
+  var legacyDecayingAverage = (0, _formatMessage.default)('Mastery calculated by Decaying Average. Most recent counts as ' + '{recent_percent, number, percent} of mastery weight, average of all ' + 'other results count as {remain_percent, number, percent} of weight. ' + 'If there is only one result, the single score will be returned.', {
+    recent_percent: scoringMethod.algorithm_data.decaying_average_percent,
+    remain_percent: 1.0 - scoringMethod.algorithm_data.decaying_average_percent
+  });
+
+  if (newDecayingAvgFFEnabled) {
+    switch (scoringMethod.algorithm) {
+      case 'decaying_average':
+        return (0, _formatMessage.default)('Mastery calculated by Weighted Average. Most recent counts as ' + '{recent_percent, number, percent} of mastery weight, average of all ' + 'other results count as {remain_percent, number, percent} of weight. ' + 'If there is only one result, the single score will be returned.', {
+          recent_percent: scoringMethod.algorithm_data.decaying_average_percent,
+          remain_percent: 1.0 - scoringMethod.algorithm_data.decaying_average_percent
+        });
+
+      case 'standard_decaying_average':
+        return (0, _formatMessage.default)('Mastery calculated by Decaying Average. Between two assessments, ' + 'the most recent assessment gets {recent_percent, number, percent} weight, ' + 'and the first gets {remain_percent, number, percent}. For each additional assessment, ' + 'the sum of the previous score calculations decay by an ' + 'additional {remain_percent, number, percent}. ' + 'If there is only one result, the single score will be returned.', {
+          recent_percent: scoringMethod.algorithm_data.standard_decaying_average_percent,
+          remain_percent: 1.0 - scoringMethod.algorithm_data.standard_decaying_average_percent
+        });
+    }
+  } else {
+    return legacyDecayingAverage;
+  }
+};
+
+var scoringText = function scoringText(scoringMethod, newDecayingAvgFFEnabled) {
   switch (scoringMethod.algorithm) {
     case 'decaying_average':
-      return (0, _formatMessage.default)('Mastery calculated by Decaying Average. Most recent counts as ' + '{recent_percent, number, percent} of mastery weight, average of all ' + 'other results count as {remain_percent, number, percent} of weight. ' + 'If there is only one result, the single score will be returned.', {
-        recent_percent: scoringMethod.algorithm_data.decaying_average_percent,
-        remain_percent: 1.0 - scoringMethod.algorithm_data.decaying_average_percent
-      });
+      return renderUserFacingMethod(scoringMethod, newDecayingAvgFFEnabled);
+
+    case 'standard_decaying_average':
+      return renderUserFacingMethod(scoringMethod, newDecayingAvgFFEnabled);
 
     case 'n_mastery':
       return (0, _formatMessage.default)('Mastery calculated by n Number of Times. Must achieve mastery at ' + 'least {n_times, number} times.  Scores above mastery will be ' + 'averaged to calculate final score.', {
@@ -61,6 +88,9 @@ var scoringText = function scoringText(scoringMethod) {
     case 'latest':
       return (0, _formatMessage.default)('Mastery calculated by Most Recent Score. Mastery score reflects the most recent graded assessment.');
 
+    case 'average':
+      return (0, _formatMessage.default)('Mastery reflects Average Score. Calculated by dividing the sum of all item scores by the number of scores.');
+
     default:
       return '';
   }
@@ -90,7 +120,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, {
@@ -103,7 +135,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"
@@ -115,9 +147,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/components/OutcomeView/index.js

@@ -102,7 +102,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();
@@ -148,7 +149,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
       }));
     }
   }]);
@@ -164,7 +166,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,
@@ -173,6 +176,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;