@instructure/outcomes-ui 3.1.0 → 3.2.0

package/es/translated/it/components/OutcomesPerStudent/__tests__/index.test.js

@@ -5,19 +5,24 @@ import { shallow, mount } from 'enzyme';
 import OutcomesPerStudent from "../index.js";
 import checkA11y from "../../../test/checkA11y.js";
 import styles from '../styles.js';
-import { REPORT_DOWNLOAD_FF } from "../../../constants.js";
+import { COMPLETED, REPORT_DOWNLOAD_FF } from "../../../constants.js";
 import Header from "../Header/index.js";
 import Score from "../Score/index.js";
 import { PaginationButton } from '@instructure/ui-pagination';
 import { Billboard } from '@instructure/ui-billboard';
 import ExportCSVButton from "../ExportCSVButton/index.js";
 import { findElementsWithStyle } from "../../../util/__tests__/findElementsWithStyle.js";
+import generateComponentTheme from "../../theme.js";
 chai.use(require('sinon-chai'));
 describe('OutcomesPerStudent/index', function () {
   function makeProps() {
     var props = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
     return Object.assign({
       loadPage: sinon.stub().returns(Promise.resolve()),
+      loading: false,
+      loadRemainingPages: sinon.spy(),
+      csvFetchingStatus: COMPLETED,
+      formatCSVData: sinon.spy(),
       clearReportStore: sinon.spy(),
       getReportOutcome: sinon.stub().returns({
         id: 1,
@@ -31,6 +36,7 @@ describe('OutcomesPerStudent/index', function () {
       closeReportAlignment: sinon.spy(),
       artifactType: 'foo',
       artifactId: 'bar',
+      scope: 'foo:bar',
       hasAnyOutcomes: true,
       currentPage: 3,
       pageCount: 5,
@@ -89,8 +95,7 @@ describe('OutcomesPerStudent/index', function () {
     var wrapper = mount( /*#__PURE__*/React.createElement(OutcomesPerStudent, makeProps()), {
       disableLifecycleMethods: true
     });
-    // expect(wrapper.find(`.${styles.studentRow}`)).to.have.length(5)
-    expect(findElementsWithStyle(wrapper, styles().studentRow)).to.have.length(5);
+    expect(findElementsWithStyle(wrapper, styles(generateComponentTheme).studentRow)).to.have.length(5);
   });
   it('renders a score for each student score', function () {
     var wrapper = mount( /*#__PURE__*/React.createElement(OutcomesPerStudent, makeProps()), {

package/es/translated/it/components/OutcomesPerStudent/styles.js

@@ -1,4 +1,4 @@
-var generateStyle = function generateStyle() {
+var generateStyle = function generateStyle(componentTheme) {
   return {
     reportWrapper: {
       position: 'relative',
@@ -25,21 +25,21 @@ var generateStyle = function generateStyle() {
       display: 'flex',
       flexDirection: 'column',
       alignItems: 'center',
-      justifyContent: 'center'
-    },
-    '.headerCell, .corner': {
-      boxSizing: 'border-box',
+      justifyContent: 'center',
       height: '5.5rem',
-      borderRight: 'var(--reportBorder)',
-      borderBottom: 'var(--reportBorder)'
+      borderRight: componentTheme.reportBorder,
+      borderBottom: componentTheme.reportBorder
     },
     headerCell: {
       boxSizing: 'border-box',
-      borderTop: 'var(--reportBorder)',
+      borderTop: componentTheme.reportBorder,
       padding: '0.5rem',
       flex: '1 0 10rem',
       overflow: 'hidden',
-      textOverflow: 'ellipsis'
+      textOverflow: 'ellipsis',
+      height: '5.5rem',
+      borderRight: componentTheme.reportBorder,
+      borderBottom: componentTheme.reportBorder
     },
     loadingSpinner: {
       width: '100%',
@@ -61,25 +61,25 @@ var generateStyle = function generateStyle() {
       width: '13rem',
       height: '4rem',
       paddingLeft: '0.5rem',
-      borderRight: 'var(--reportBorder)',
+      borderRight: componentTheme.reportBorder,
       display: 'flex',
       justifyContent: 'flex-start',
-      borderBottom: 'var(--reportBorder)',
-      alignItems: 'center',
-      '& .avatar': {
-        paddingRight: '.5rem'
-      },
-      '& .name': {
-        textAlign: 'left',
-        textOverflow: 'ellipsis',
-        overflowX: 'hidden',
-        whiteSpace: 'nowrap'
-      }
+      borderBottom: componentTheme.reportBorder,
+      alignItems: 'center'
+    },
+    avatar: {
+      paddingRight: '0.5rem'
+    },
+    name: {
+      textAlign: 'left',
+      textOverflow: 'ellipsis',
+      overflowX: 'hidden',
+      whiteSpace: 'nowrap'
     },
     scoreCell: {
       boxSizing: 'border-box',
       flex: '1 0 10rem',
-      borderBottom: 'var(--reportBorder)'
+      borderBottom: componentTheme.reportBorder
     }
   };
 };

package/es/translated/it/components/Ratings/index.js

@@ -101,9 +101,9 @@ var Ratings = function Ratings(_ref) {
   }))), renderDisplayMasteryPoints());
 };
 Ratings.propTypes = {
-  ratings: PropTypes.arrayOf(scoringTierShape).isRequired,
-  masteryPercent: PropTypes.number.isRequired,
-  pointsPossible: PropTypes.number.isRequired,
+  ratings: PropTypes.arrayOf(scoringTierShape),
+  masteryPercent: PropTypes.number,
+  pointsPossible: PropTypes.number,
   isTray: PropTypes.bool
 };
 Ratings.defaultProps = {

package/es/translated/it/components/WithAlignmentSet.js

@@ -28,12 +28,13 @@ var WithAlignmentSet = function WithAlignmentSet(ComponentClass) {
       key: "loadIfNeeded",
       value: function loadIfNeeded(props) {
         var alignmentSetId = props.alignmentSetId,
-          loadAlignments = props.loadAlignments;
+          loadAlignments = props.loadAlignments,
+          launchContexts = props.launchContexts;
         if (!this.state || this.state.alignmentSetId !== alignmentSetId) {
           this.setState({
             alignmentSetId: alignmentSetId
           });
-          loadAlignments(alignmentSetId);
+          loadAlignments(alignmentSetId, launchContexts);
         }
       }
     }, {

package/es/translated/it/components/__tests__/WithAlignmentSet.test.js

@@ -27,4 +27,19 @@ describe('WithAlignmentSet', function () {
     expect(props.loadAlignments.calledOnce).to.be.true;
     expect(props.loadAlignments.calledWith('xxxooo')).to.be.true;
   });
+  it('loads launch contexts on mount', function () {
+    var launchContexts = [{
+      uuid: 'foo',
+      name: 'foo'
+    }, {
+      uuid: 'bar',
+      name: 'bar'
+    }];
+    var props = makeProps({
+      launchContexts: launchContexts
+    });
+    mount( /*#__PURE__*/React.createElement(AlignedDummy, props));
+    expect(props.loadAlignments.calledOnce).to.be.true;
+    expect(props.loadAlignments.getCall(0).args[1]).to.eql(launchContexts);
+  });
 });

package/es/translated/it/constants.js

@@ -13,8 +13,6 @@ export var UNSELECT_OUTCOME_IDS = 'UNSELECT_OUTCOME_IDS';
 export var SET_SCORING_METHOD = 'SET_SCORING_METHOD';
 export var SET_FEATURES = 'SET_FEATURES';
 export var SET_CONTEXT = 'SET_CONTEXT';
-export var SET_SHARED_CONTEXTS = 'SET_SHARED_CONTEXTS';
-export var SET_SELECTED_SHARED_CONTEXT = 'SET_SELECTED_SHARED_CONTEXT';
 
 /*
  * alignments
@@ -24,6 +22,7 @@ export var SET_ALIGNMENTS = 'SET_ALIGNMENTS';
 export var VIEW_ALIGNMENT = 'VIEW_ALIGNMENT';
 export var CLOSE_ALIGNMENT = 'CLOSE_ALIGNMENT';
 export var UPDATE_ALIGNMENT = 'UPDATE_ALIGNMENT';
+export var SET_LAUNCH_CONTEXTS = 'SET_LAUNCH_CONTEXTS';
 
 /*
  * picker
@@ -35,6 +34,7 @@ export var TOGGLE_EXPANDED_IDS = 'TOGGLE_EXPANDED_IDS';
 export var RESET_EXPANDED_IDS = 'RESET_EXPANDED_IDS';
 export var SET_SCOPE = 'SET_SCOPE';
 export var RESET_OUTCOME_PICKER = 'RESET_OUTCOME_PICKER';
+export var SET_SELECTED_LAUNCH_CONTEXT = 'SET_SELECTED_LAUNCH_CONTEXT';
 
 /*
  * reporting

package/es/translated/it/containers/ConnectedAlignmentList.js

@@ -4,7 +4,7 @@ import { compose } from 'redux';
 import { connect } from 'react-redux';
 import AlignmentList from "../components/AlignmentList/index.js";
 import WithAlignmentSet from "../components/WithAlignmentSet.js";
-import { getAlignedOutcomes, makeIsOpen } from "../store/alignments/selectors.js";
+import { getAlignedOutcomes, getLaunchContexts, makeIsOpen } from "../store/alignments/selectors.js";
 import * as contextActions from "../store/context/actions.js";
 import * as alignmentActions from "../store/alignments/actions.js";
 import * as outcomePickerActions from "../store/OutcomePicker/actions.js";
@@ -16,6 +16,7 @@ var mapStateToProps = function mapStateToProps(state, ownProps) {
   return {
     addModal: pickerType === 'tray' ? ConnectedOutcomeTray : ConnectedOutcomePickerModal,
     alignedOutcomes: getAlignedOutcomes(state, scope),
+    launchContext: getLaunchContexts(state, scope),
     isOpen: makeIsOpen(state, scope)
   };
 };

package/es/translated/it/containers/ConnectedOutcomeTree.js

@@ -4,8 +4,9 @@ import { connect } from 'react-redux';
 import * as contextActions from "../store/context/actions.js";
 import * as outcomePickerActions from "../store/OutcomePicker/actions.js";
 import { getRootOutcomeIds, getCollectionData, makeGetOutcomeSummary } from "../store/context/selectors.js";
-import { getActiveCollection, getExpandedIds, makeIsOutcomeSelected, getActiveChildren, getSharedContexts, getSelectedSharedContext } from "../store/OutcomePicker/selectors.js";
+import { getActiveCollection, getExpandedIds, makeIsOutcomeSelected, getActiveChildren, getSelectedLaunchContext } from "../store/OutcomePicker/selectors.js";
 import OutcomeTree from "../components/OutcomeTree/index.js";
+import { getLaunchContexts } from "../store/alignments/selectors.js";
 var mapStateToProps = function mapStateToProps(state, ownProps) {
   var scope = ownProps.scope;
   return {
@@ -16,8 +17,8 @@ var mapStateToProps = function mapStateToProps(state, ownProps) {
     rootOutcomeIds: getRootOutcomeIds(state, scope),
     activeCollection: getActiveCollection(state, scope),
     expandedIds: getExpandedIds(state, scope),
-    sharedContexts: getSharedContexts(state, scope),
-    selectedSharedContext: getSelectedSharedContext(state, scope)
+    launchContexts: getLaunchContexts(state, scope),
+    selectedLaunchContext: getSelectedLaunchContext(state, scope)
   };
 };
 function mapDispatchToProps(dispatch, ownProps) {

package/es/translated/it/containers/__tests__/ConnectedAlignmentLabels.test.js

@@ -29,6 +29,8 @@ describe('ConnectedAlignmentLabels', function () {
     })));
     // Enzyme finds two OutcomeLabels components because of the instui decorator on the component
     expect(wrapper.find('OutcomeLabels')).to.have.length(2);
-    expect(wrapper.text()).to.match(/baz,woz/);
+
+    // There is a   after the comma
+    expect(wrapper.text()).to.equal("baz,\xA0woz");
   });
 });

package/es/translated/it/containers/__tests__/ConnectedOutcomePicker.test.js

@@ -13,7 +13,16 @@ describe('ConnectedOutcomePicker', function () {
           focusedOutcome: null,
           state: 'loading',
           activeChildren: [],
-          scope: 'scopeForTest'
+          scope: 'scopeForTest',
+          search: {
+            searchText: 'abc',
+            pagination: {
+              page: 1,
+              total: null
+            },
+            isLoading: true,
+            entries: []
+          }
         }
       }
     }));

package/es/translated/it/containers/__tests__/OutcomesPerStudentReport.test.js

@@ -4,6 +4,7 @@ import { mount } from 'enzyme';
 import OutcomesPerStudentReport from "../OutcomesPerStudentReport.js";
 import styles from '../../components/OutcomesPerStudent/styles.js';
 import { findElementsWithStyle } from "../../util/__tests__/findElementsWithStyle.js";
+import generateComponentTheme from "../../components/theme.js";
 describe('OutcomesPerStudentReport', function () {
   function makeProps() {
     return {
@@ -30,6 +31,6 @@ describe('OutcomesPerStudentReport', function () {
     var wrapper = mount( /*#__PURE__*/React.createElement("div", {
       id: "app"
     }, /*#__PURE__*/React.createElement(OutcomesPerStudentReport, makeProps())));
-    expect(findElementsWithStyle(wrapper, styles().background)).to.have.length(1);
+    expect(findElementsWithStyle(wrapper, styles(generateComponentTheme).background)).to.have.length(1);
   });
 });

package/es/translated/it/demo.js

@@ -235,7 +235,7 @@ var DemoAlignment = function DemoAlignment(props) {
     artifactId = props.artifactId,
     artifactTypeName = props.artifactTypeName,
     contextUuid = props.contextUuid,
-    sharedContexts = props.sharedContexts,
+    launchContexts = props.launchContexts,
     emptySetHeading = props.emptySetHeading,
     displayMasteryDescription = props.displayMasteryDescription,
     displayMasteryPercentText = props.displayMasteryPercentText,
@@ -257,7 +257,7 @@ var DemoAlignment = function DemoAlignment(props) {
     artifactType: artifactType,
     artifactId: artifactId,
     contextUuid: contextUuid,
-    sharedContexts: sharedContexts,
+    launchContexts: launchContexts,
     host: outcomesHost,
     jwt: jwt,
     emptyText: "No outcomes are aligned"
@@ -276,7 +276,7 @@ var DemoAlignment = function DemoAlignment(props) {
     alignmentSetId: alignmentSetId,
     pickerType: currentPicker,
     contextUuid: contextUuid,
-    sharedContexts: sharedContexts,
+    launchContexts: launchContexts,
     emptySetHeading: emptySetHeading,
     onUpdate: console.log,
     artifactType: artifactType,
@@ -407,7 +407,7 @@ function rerender() {
     artifactType: "artifactType",
     artifactId: "artifactId",
     contextUuid: "dummy_uuid",
-    sharedContexts: [{
+    launchContexts: [{
       uuid: 'dummy_uuid',
       name: 'Dummy UUID - Default uuid'
     }, {
@@ -416,12 +416,6 @@ function rerender() {
     }, {
       uuid: '1-science',
       name: 'One Science #1'
-    }, {
-      uuid: 'euYV4xoDWZgrdFDiIsOhJ8IKXfQfS5nL3iD8OhvK',
-      name: 'Empty Context'
-    }, {
-      uuid: 'contextDoesNotExistHereForTestingErrorHandling',
-      name: 'Error Handling'
     }],
     emptySetHeading: "Align Institution outcomes to this quiz.",
     displayMasteryDescription: true,

package/es/translated/it/services/OutcomesService.js

@@ -17,6 +17,92 @@ var getTotal = function getTotal(response) {
   var total = response.headers.get('total');
   return total ? Number.parseInt(total) : 0;
 };
+var SUB_ACCOUNT_OUTCOME = 'SUB_ACCOUNT_OUTCOME';
+var NOT_IN_SUB_ACCOUNT = 'NOT_IN_SUB_ACCOUNT';
+var COURSE_OUTCOME = 'COURSE_OUTCOME';
+var NOT_IN_COURSE = 'NOT_IN_COURSE';
+var HIDE = 'HIDE';
+var DECORATOR_SORT_ORDER = {
+  null: 0,
+  undefined: 0,
+  SUB_ACCOUNT_OUTCOME: 1,
+  NOT_IN_SUB_ACCOUNT: 2,
+  COURSE_OUTCOME: 3,
+  NOT_IN_COURSE: 4,
+  HIDE: 5
+};
+var byDecorator = function byDecorator(o1, o2) {
+  var d1 = DECORATOR_SORT_ORDER[o1.decorator];
+  var d2 = DECORATOR_SORT_ORDER[o2.decorator];
+  if (d1 < d2) {
+    return -1;
+  } else if (d1 > d2) {
+    return 1;
+  }
+  return 0;
+};
+
+/* eslint-disable no-param-reassign */
+var decorateAlignments = function decorateAlignments(alignmentSet, launchContext, isLaunchingFromRootAccount) {
+  var outcomes = alignmentSet.outcomes;
+  if (!launchContext || !outcomes) {
+    return alignmentSet;
+  }
+  outcomes.forEach(function (outcome) {
+    if (isLaunchingFromRootAccount) {
+      // No need to decorate if outcome is in root account
+      if (!outcome.in_launch_context) {
+        var _outcome$source_conte;
+        switch ((_outcome$source_conte = outcome.source_context_info) === null || _outcome$source_conte === void 0 ? void 0 : _outcome$source_conte.context_type) {
+          case 'course':
+            outcome.decorator = COURSE_OUTCOME;
+            break;
+          case 'account':
+            outcome.decorator = SUB_ACCOUNT_OUTCOME;
+            break;
+        }
+      }
+    } else if (outcome.launch_context_type === 'account') {
+      // No need to decorate if outcome is in the sub-account
+      if (!outcome.in_launch_context) {
+        var _outcome$source_conte2;
+        switch ((_outcome$source_conte2 = outcome.source_context_info) === null || _outcome$source_conte2 === void 0 ? void 0 : _outcome$source_conte2.context_type) {
+          case 'course':
+            outcome.decorator = COURSE_OUTCOME;
+            break;
+          case 'account':
+            outcome.decorator = NOT_IN_SUB_ACCOUNT;
+            break;
+        }
+      }
+    } else if (outcome.launch_context_type === 'course') {
+      // No need to decorate if outcome is in the course
+      if (!outcome.in_launch_context) {
+        var _outcome$source_conte3;
+        switch ((_outcome$source_conte3 = outcome.source_context_info) === null || _outcome$source_conte3 === void 0 ? void 0 : _outcome$source_conte3.context_type) {
+          case 'course':
+            outcome.decorator = HIDE;
+            break;
+          case 'account':
+            outcome.decorator = NOT_IN_COURSE;
+            break;
+        }
+      }
+    }
+  });
+
+  // Now that the outcomes are populated with the decorator, sort by title,
+  // filter out those that we need to hide, then sort by decorator.
+  alignmentSet.outcomes = outcomes.sort(function (a, b) {
+    var titleA = a && a.title || 'ZZZZZZZZZZZZ'; // treat null as really large
+    var titleB = b && b.title || 'ZZZZZZZZZZZZ'; // treat null as really large
+    return titleA.localeCompare(titleB);
+  }).filter(function (outcome) {
+    return outcome.decorator !== HIDE;
+  }).sort(byDecorator);
+  return alignmentSet;
+};
+/* eslint-enable no-param-reassign */
 var OutcomesService = /*#__PURE__*/function () {
   function OutcomesService() {
     _classCallCheck(this, OutcomesService);
@@ -86,16 +172,19 @@ var OutcomesService = /*#__PURE__*/function () {
     }
   }, {
     key: "getAlignments",
-    value: function getAlignments(host, jwt, alignmentSetId, contextUuid) {
+    value: function getAlignments(host, jwt, alignmentSetId, contextUuid, launchContext, isLaunchingFromRootAccount) {
       if (!alignmentSetId) {
         return Promise.resolve([]);
       }
-      var params = 'includes[]=outcomes&includes[]=friendly_description';
+      var params = 'includes[]=outcomes&includes[]=friendly_description&includes[]=source_context_info';
       if (contextUuid) {
         params += "&context_uuid=".concat(contextUuid);
       }
+      if (launchContext) {
+        params += "&launch_context=".concat(launchContext);
+      }
       return this.get(host, jwt, "/api/alignment_sets/".concat(alignmentSetId, "?").concat(params)).then(checkResponse).then(toJson).then(function (json) {
-        return json.alignment_set || json;
+        return decorateAlignments(json.alignment_set || json, launchContext, isLaunchingFromRootAccount);
       });
     }
   }, {
@@ -132,17 +221,21 @@ var OutcomesService = /*#__PURE__*/function () {
     }
   }, {
     key: "createAlignmentSet",
-    value: function createAlignmentSet(host, jwt, outcomeIds) {
+    value: function createAlignmentSet(host, jwt, outcomeIds, launchContext, isLaunchingFromRootAccount) {
       if (!outcomeIds.length) {
         return Promise.resolve({
           guid: null
         });
       }
       var params = {
-        outcome_ids: outcomeIds
+        outcome_ids: outcomeIds,
+        includes: ['outcomes', 'source_context_info']
       };
+      if (launchContext) {
+        params.launch_context = launchContext;
+      }
       return this.post(host, jwt, '/api/alignment_sets', params).then(checkResponse).then(toJson).then(function (json) {
-        return json.alignment_set || json;
+        return decorateAlignments(json.alignment_set || json, launchContext, isLaunchingFromRootAccount);
       });
     }
   }, {