@instructure/quiz-core 21.0.1-rc.4 → 21.0.1-rc.6

package/es/common/components/resources/stimulus/StimulusEditInfo/index.js

@@ -2,12 +2,16 @@ import { bindActionCreators } from 'redux';
 import { connect } from "../../../../react-redux.js";
 import * as modificationActions from "../../../../actions/modifications.js";
 import { featureOn } from "../../../../../common/util/featureCheck.js";
+import { getActiveQuizId, getQuizById } from "../../../../../common/selectors/quizzes.js";
 import StimulusEditInfo from "./presenter.js";
 function mapStateToProps(state, props) {
+  var quizId = getActiveQuizId(state);
+  var quiz = getQuizById(state, quizId);
   return {
     workingStimulus: props.stimulus.getWorkingInstance(),
     errorsShowing: state.getIn(['errorsShowing', props.guid], props.errorsShowing || false),
-    stimulusOrientationEnabled: featureOn('customizable_stimulus_orientation')
+    stimulusOrientationEnabled: featureOn('customizable_stimulus_orientation'),
+    shuffleQuestionsEnabled: quiz.shuffleQuestions
   };
 }
 function mapDispatchToProps(dispatch) {

package/es/common/components/resources/stimulus/StimulusEditInfo/presenter.js

@@ -18,6 +18,7 @@ import { SimpleSelect, TextInput, TOP, withStyleOverrides, FormFieldGroup, FormF
 import t from '@instructure/quiz-i18n/es/format-message';
 import generateStyle from "./styles.js";
 import generateComponentTheme from "./theme.js";
+import { Alert } from '@instructure/ui-alerts';
 var _ref3 = jsx(IconUpdownLine, {
   rotate: "90"
 });
@@ -96,6 +97,16 @@ export var StimulusEditInfo = (_dec = withStyleOverrides(generateStyle, generate
         value: "top"
       }, t('Questions below'))));
     }
+  }, {
+    key: "renderPassageAlert",
+    value: function renderPassageAlert(stimulus) {
+      if (!stimulus.passage || !this.props.shuffleQuestionsEnabled) {
+        return null;
+      }
+      return jsx(Alert, {
+        variant: "warning"
+      }, t('The passage sections may not appear in their original order due to the shuffle setting.'));
+    }
   }, {
     key: "renderInstructions",
     value: function renderInstructions(stimulus) {
@@ -146,7 +157,7 @@ export var StimulusEditInfo = (_dec = withStyleOverrides(generateStyle, generate
       }, jsx(Heading, {
         level: "h3",
         as: "h2"
-      }, this.headerText(stimulus)), jsx("div", {
+      }, this.headerText(stimulus)), this.renderPassageAlert(stimulus), jsx("div", {
         css: this.props.styles.section
       }, jsx(TextInput, {
         messages: this.inputErrors('title'),
@@ -184,9 +195,11 @@ export var StimulusEditInfo = (_dec = withStyleOverrides(generateStyle, generate
   modifyStimulus: PropTypes.func.isRequired,
   setTitleRef: PropTypes.func,
   stimulusOrientationEnabled: PropTypes.bool.isRequired,
-  styles: PropTypes.object
+  styles: PropTypes.object,
+  shuffleQuestionsEnabled: PropTypes.bool
 }, _StimulusEditInfo.defaultProps = {
   isBankedContent: false,
+  shuffleQuestionsEnabled: false,
   setTitleRef: function setTitleRef() {}
 }, _StimulusEditInfo)) || _class);
 export default StimulusEditInfo;

package/es/common/components/resources/stimulus/StimulusShow/index.js

@@ -11,13 +11,13 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import { IconBankLine } from '@instructure/ui-icons';
 import { jsx } from '@instructure/emotion';
 import { Text } from '@instructure/ui-text';
+import { Flex, withStyleOverrides } from '@instructure/quiz-common';
 import StimulusShowInfo from "../StimulusShowInfo/index.js";
 import ActionButtons from "../../../../../building/components/resources/ActionButtons/index.js";
 import t from '@instructure/quiz-i18n/es/format-message';
 import generateStyle from "./styles.js";
 import generateComponentTheme from "./theme.js";
 import Overlay from "../../../shared/overlay/index.js";
-import { Flex, withStyleOverrides } from '@instructure/quiz-common';
 var _ref = jsx(IconBankLine, null);
 export var StimulusShow = (_dec = withStyleOverrides(generateStyle, generateComponentTheme), _dec(_class = (_StimulusShow = /*#__PURE__*/function (_Component) {
   _inherits(StimulusShow, _Component);

package/es/index.js

@@ -146,7 +146,7 @@ import * as takingActionCreators from "./common/actions/taking.js";
 export { takingActionCreators };
 
 // Selectors
-export { getQuizById, getActiveQuizId, getQuizEntryById, isActiveQuizWorkingInstanceOneQuestionAtATime, getActiveQuiz } from "./common/selectors/quizzes.js";
+export { getQuizById, getActiveQuizId, getQuizEntryById, getQuizEntriesByQuizId, isActiveQuizWorkingInstanceOneQuestionAtATime, getActiveQuiz } from "./common/selectors/quizzes.js";
 export { getItemById } from "./common/selectors/items.js";
 export { fileUploading } from "./common/selectors/calls.js";
 export { isTimeUp, getTimerData, getResponseDataByPosition } from "./common/selectors/taking.js";

package/lib/common/components/resources/stimulus/StimulusEditInfo/index.js

@@ -10,12 +10,16 @@ var _redux = require("redux");
 var _reactRedux = require("../../../../react-redux.js");
 var modificationActions = _interopRequireWildcard(require("../../../../actions/modifications.js"));
 var _featureCheck = require("../../../../../common/util/featureCheck.js");
+var _quizzes = require("../../../../../common/selectors/quizzes.js");
 var _presenter = _interopRequireDefault(require("./presenter.js"));
 function mapStateToProps(state, props) {
+  var quizId = (0, _quizzes.getActiveQuizId)(state);
+  var quiz = (0, _quizzes.getQuizById)(state, quizId);
   return {
     workingStimulus: props.stimulus.getWorkingInstance(),
     errorsShowing: state.getIn(['errorsShowing', props.guid], props.errorsShowing || false),
-    stimulusOrientationEnabled: (0, _featureCheck.featureOn)('customizable_stimulus_orientation')
+    stimulusOrientationEnabled: (0, _featureCheck.featureOn)('customizable_stimulus_orientation'),
+    shuffleQuestionsEnabled: quiz.shuffleQuestions
   };
 }
 function mapDispatchToProps(dispatch) {

package/lib/common/components/resources/stimulus/StimulusEditInfo/presenter.js

@@ -23,6 +23,7 @@ var _quizCommon = require("@instructure/quiz-common");
 var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
 var _styles = _interopRequireDefault(require("./styles.js"));
 var _theme = _interopRequireDefault(require("./theme.js"));
+var _uiAlerts = require("@instructure/ui-alerts");
 var _dec, _class, _StimulusEditInfo;
 /** @jsx jsx */
 var _ref3 = (0, _emotion.jsx)(_uiIcons.IconUpdownLine, {
@@ -103,6 +104,16 @@ var StimulusEditInfo = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.defau
         value: "top"
       }, (0, _formatMessage.default)('Questions below'))));
     }
+  }, {
+    key: "renderPassageAlert",
+    value: function renderPassageAlert(stimulus) {
+      if (!stimulus.passage || !this.props.shuffleQuestionsEnabled) {
+        return null;
+      }
+      return (0, _emotion.jsx)(_uiAlerts.Alert, {
+        variant: "warning"
+      }, (0, _formatMessage.default)('The passage sections may not appear in their original order due to the shuffle setting.'));
+    }
   }, {
     key: "renderInstructions",
     value: function renderInstructions(stimulus) {
@@ -153,7 +164,7 @@ var StimulusEditInfo = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.defau
       }, (0, _emotion.jsx)(_uiHeading.Heading, {
         level: "h3",
         as: "h2"
-      }, this.headerText(stimulus)), (0, _emotion.jsx)("div", {
+      }, this.headerText(stimulus)), this.renderPassageAlert(stimulus), (0, _emotion.jsx)("div", {
         css: this.props.styles.section
       }, (0, _emotion.jsx)(_quizCommon.TextInput, {
         messages: this.inputErrors('title'),
@@ -191,9 +202,11 @@ var StimulusEditInfo = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.defau
   modifyStimulus: _propTypes.default.func.isRequired,
   setTitleRef: _propTypes.default.func,
   stimulusOrientationEnabled: _propTypes.default.bool.isRequired,
-  styles: _propTypes.default.object
+  styles: _propTypes.default.object,
+  shuffleQuestionsEnabled: _propTypes.default.bool
 }, _StimulusEditInfo.defaultProps = {
   isBankedContent: false,
+  shuffleQuestionsEnabled: false,
   setTitleRef: function setTitleRef() {}
 }, _StimulusEditInfo)) || _class);
 exports.StimulusEditInfo = StimulusEditInfo;

package/lib/common/components/resources/stimulus/StimulusShow/index.js

@@ -15,13 +15,13 @@ var _reactImmutableProptypes = _interopRequireDefault(require("react-immutable-p
 var _uiIcons = require("@instructure/ui-icons");
 var _emotion = require("@instructure/emotion");
 var _uiText = require("@instructure/ui-text");
+var _quizCommon = require("@instructure/quiz-common");
 var _index = _interopRequireDefault(require("../StimulusShowInfo/index.js"));
 var _index2 = _interopRequireDefault(require("../../../../../building/components/resources/ActionButtons/index.js"));
 var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
 var _styles = _interopRequireDefault(require("./styles.js"));
 var _theme = _interopRequireDefault(require("./theme.js"));
 var _index3 = _interopRequireDefault(require("../../../shared/overlay/index.js"));
-var _quizCommon = require("@instructure/quiz-common");
 var _dec, _class, _StimulusShow;
 /** @jsx jsx */
 /* eslint "jsx-a11y/click-events-have-key-events": "warn" */

package/lib/index.js

@@ -203,6 +203,7 @@ var _exportNames = {
   getQuizById: true,
   getActiveQuizId: true,
   getQuizEntryById: true,
+  getQuizEntriesByQuizId: true,
   isActiveQuizWorkingInstanceOneQuestionAtATime: true,
   getActiveQuiz: true,
   getItemById: true,
@@ -1383,6 +1384,12 @@ Object.defineProperty(exports, "getQuizEntryById", {
     return _quizzes3.getQuizEntryById;
   }
 });
+Object.defineProperty(exports, "getQuizEntriesByQuizId", {
+  enumerable: true,
+  get: function get() {
+    return _quizzes3.getQuizEntriesByQuizId;
+  }
+});
 Object.defineProperty(exports, "isActiveQuizWorkingInstanceOneQuestionAtATime", {
   enumerable: true,
   get: function get() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/quiz-core",
-  "version": "21.0.1-rc.4+3f43e6751",
+  "version": "21.0.1-rc.6+155501196",
   "license": "MIT",
   "description": "The Quiz React SDK by Instructure Inc.",
   "author": "Instructure, Inc. Engineering and Product Design",
@@ -46,11 +46,11 @@
     "@instructure/emotion": "^9.11.1",
     "@instructure/grading-utils": "^1.0.0",
     "@instructure/outcomes-ui": "^3.2.2",
-    "@instructure/quiz-common": "21.0.1-rc.4+3f43e6751",
-    "@instructure/quiz-i18n": "21.0.1-rc.4+3f43e6751",
-    "@instructure/quiz-interactions": "21.0.1-rc.4+3f43e6751",
-    "@instructure/quiz-number-input": "21.0.1-rc.4+3f43e6751",
-    "@instructure/quiz-rce": "21.0.1-rc.4+3f43e6751",
+    "@instructure/quiz-common": "21.0.1-rc.6+155501196",
+    "@instructure/quiz-i18n": "21.0.1-rc.6+155501196",
+    "@instructure/quiz-interactions": "21.0.1-rc.6+155501196",
+    "@instructure/quiz-number-input": "21.0.1-rc.6+155501196",
+    "@instructure/quiz-rce": "21.0.1-rc.6+155501196",
     "@instructure/ui-a11y-content": "^9.11.1",
     "@instructure/ui-alerts": "^9.11.1",
     "@instructure/ui-avatar": "^9.11.1",
@@ -109,7 +109,7 @@
     "file-saver": "~2.0.5",
     "humps": "^2.0.0",
     "immutable": "^3.8.1",
-    "instructure-validations": "21.0.1-rc.4+3f43e6751",
+    "instructure-validations": "21.0.1-rc.6+155501196",
     "ipaddr.js": "^1.5.4",
     "isomorphic-fetch": "^2.2.0",
     "isuuid": "^0.1.0",
@@ -159,7 +159,7 @@
     "jquery": "^2.2.3",
     "karma-junit-reporter": "^2.0.1",
     "most-subject": "^5.3.0",
-    "quiz-presets": "21.0.1-rc.4+3f43e6751",
+    "quiz-presets": "21.0.1-rc.6+155501196",
     "react": "^16.8.6",
     "react-addons-test-utils": "^15.6.2",
     "react-dom": "^16.8.6",
@@ -175,5 +175,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "3f43e67514bd8d6c05992a28cfd95e5c2a94720f"
+  "gitHead": "155501196402b73337690ec007e733661b66f3bd"
 }