@instructure/quiz-core 17.32.1-rc.0 → 17.32.1-rc.11

package/es/banks/components/BankEntry/presenter.js

@@ -305,7 +305,6 @@ export var BankEntry = (_dec = themeable(theme, styles), _dec(_class = (_temp =
           scope = _this$props.scope,
           closeTray = _this$props.closeTray,
           navigateToBanks = _this$props.navigateToBanks,
-          navigateToBank = _this$props.navigateToBank,
           navigateToBuild = _this$props.navigateToBuild,
           returnToUrl = _this$props.returnToUrl,
           bank = _this$props.bank;
@@ -318,7 +317,7 @@ export var BankEntry = (_dec = themeable(theme, styles), _dec(_class = (_temp =
         canvasReferrerLinkText: isScopeEmpty ? null : scope.title
       }, /*#__PURE__*/React.createElement(BreadcrumbLink, {
         key: "bank",
-        onClick: navigateToBank,
+        onClick: this.navigateToBank,
         ref: this.setNavToBankRef
       }, bank.title), /*#__PURE__*/React.createElement(BreadcrumbLink, {
         key: "bankEntry"

package/es/common/components/SDKApp/index.js

@@ -155,6 +155,13 @@ export var SDKApp = (_dec = themeable(theme, styles), _dec(_class = (_temp = _cl
   /* eslint-disable-line react/no-unused-prop-types */
   outcomesEndpoint: PropTypes.string,
   outcomesToken: PropTypes.string,
+  rceConfig: PropTypes.shape({
+    contextId: PropTypes.string.isRequired,
+    contextType: PropTypes.string.isRequired,
+    canvasUserId: PropTypes.string.isRequired,
+    rcsHost: PropTypes.string.isRequired,
+    tokenFetchFn: PropTypes.func.isRequired
+  }),
   timeZone: PropTypes.string,
   translations: PropTypes.objectOf(PropTypes.shape({
     message: PropTypes.string
@@ -168,6 +175,7 @@ export var SDKApp = (_dec = themeable(theme, styles), _dec(_class = (_temp = _cl
   locale: null,
   outcomesEndpoint: null,
   outcomesToken: null,
+  rceConfig: null,
   translations: null,
   timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone
 }, _temp)) || _class);

package/es/common/components/resources/item/ItemEdit/index.js

@@ -28,6 +28,7 @@ export function mapStateToProps(state, props) {
     workingItem: workingItem,
     isValid: isValid,
     isEditing: true,
+    fitbCommonWordbankEnabled: featureOn('fitb_common_wordbank'),
     editable: true,
     contextUuid: contextUuid,
     oneQuestionAtATime: isActiveQuizWorkingInstanceOneQuestionAtATime(state),

package/es/common/components/resources/item/ItemEdit/presenter.js

@@ -127,8 +127,8 @@ export var ItemEdit = /*#__PURE__*/function (_Component) {
     key: "render",
     value: function render() {
       var item = this.props.entry;
-      var interactionType = item.getInteractionType();
-      var Interaction = componentForItem(interactionType.slug, COMPONENT_EDIT);
+      var interactionType = item.getInteractionType().slug;
+      var Interaction = componentForItem(interactionType, COMPONENT_EDIT);
       var propsForInteraction = propsForInteractionEdit(this.props, this.additionalEditOptions());
       return /*#__PURE__*/React.createElement(FormFieldGroup, {
         messages: this.getError('onSelf'),
@@ -136,7 +136,6 @@ export var ItemEdit = /*#__PURE__*/function (_Component) {
         name: "edit_item_".concat(this.props.guid) // eslint-disable-line react/jsx-no-literals
 
       }, /*#__PURE__*/React.createElement(Interaction, Object.assign({}, propsForInteraction, {
-        interactionType: interactionType,
         itemId: this.props.guid,
         renderImportModal: this.renderImportModal
       })));
@@ -156,6 +155,7 @@ ItemEdit.propTypes = {
   appContainer: CustomPropTypes.selectors.isRequired,
   changeOutcomeAlignmentSetGuid: PropTypes.func.isRequired,
   entry: ImmutablePropTypes.record.isRequired,
+  fitbCommonWordbankEnabled: PropTypes.bool,
   guid: PropTypes.string.isRequired,
   occludeQuizEntries: PropTypes.func.isRequired,
   contextUuid: PropTypes.string,
@@ -191,6 +191,7 @@ ItemEdit.defaultProps = {
   additionalOptions: [],
   answerFeedbackEnabled: false,
   contextUuid: null,
+  fitbCommonWordbankEnabled: false,
   errorsAreShowing: false,
   outcomesEndpoint: null,
   outcomesToken: null,

package/es/common/util/fitbCopyHelper.js

@@ -1,4 +1,11 @@
-import { List, Map } from 'immutable';
+import { List, Map } from 'immutable'; // https://stackoverflow.com/questions/18749591/encode-html-entities-in-javascript
+
+function htmlEncode(input) {
+  return input.replace(/[\u00A0-\u9999<>&]/g, function (i) {
+    return '&#' + i.charCodeAt(0) + ';';
+  });
+}
+
 export function convertFITBtoRich(interactionTypeData, richFITBInteractionID) {
   var interactionData = interactionTypeData.interactionData,
       scoringData = interactionTypeData.scoringData;
@@ -7,12 +14,13 @@ export function convertFITBtoRich(interactionTypeData, richFITBInteractionID) {
   });
   var workingItemBody = sortedStemItems.reduce(function (itemBody, stemItem) {
     if (stemItem.get('type') === 'text') {
-      return itemBody + stemItem.get('value', '');
+      return itemBody + htmlEncode(stemItem.get('value', ''));
     } else {
       var blankScoringData = scoringData.get('value', List()).find(function (blank) {
         return blank.get('id') === stemItem.get('blankId');
       }) || Map();
-      return itemBody + "`".concat(blankScoringData.getIn(['scoringData', 'blankText']), "`");
+      var blankText = blankScoringData.getIn(['scoringData', 'blankText'], '');
+      return itemBody + "`".concat(htmlEncode(blankText), "`");
     }
   }, '');
   return Object.assign({}, interactionTypeData, {

package/es/common/util/interactionTypePropsHelper.js

@@ -38,10 +38,12 @@ export var propsForInteractionEdit = function propsForInteractionEdit(props, add
     errors: props.workingItem.getErrors().toJS(),
     validationErrorsFromApi: props.validationErrorsFromApi,
     errorsAreShowing: props.errorsAreShowing,
+    fitbCommonWordbankEnabled: props.fitbCommonWordbankEnabled,
     hiddenOptions: {
       calculator: !props.showCalculator
     },
     interactionData: item.interactionData,
+    interactionType: props.entry.getInteractionType(),
     // SHIM: canvas-rce breaks on null values now
     // this is a shim until canvas-rce deals with
     // null values better

package/lib/banks/components/BankEntry/presenter.js

@@ -357,7 +357,6 @@ var BankEntry = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _de
           scope = _this$props.scope,
           closeTray = _this$props.closeTray,
           navigateToBanks = _this$props.navigateToBanks,
-          navigateToBank = _this$props.navigateToBank,
           navigateToBuild = _this$props.navigateToBuild,
           returnToUrl = _this$props.returnToUrl,
           bank = _this$props.bank;
@@ -370,7 +369,7 @@ var BankEntry = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _de
         canvasReferrerLinkText: isScopeEmpty ? null : scope.title
       }, /*#__PURE__*/_react.default.createElement(_uiBreadcrumb.BreadcrumbLink, {
         key: "bank",
-        onClick: navigateToBank,
+        onClick: this.navigateToBank,
         ref: this.setNavToBankRef
       }, bank.title), /*#__PURE__*/_react.default.createElement(_uiBreadcrumb.BreadcrumbLink, {
         key: "bankEntry"

package/lib/common/components/SDKApp/index.js

@@ -183,6 +183,13 @@ var SDKApp = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _dec(_
   /* eslint-disable-line react/no-unused-prop-types */
   outcomesEndpoint: _propTypes.default.string,
   outcomesToken: _propTypes.default.string,
+  rceConfig: _propTypes.default.shape({
+    contextId: _propTypes.default.string.isRequired,
+    contextType: _propTypes.default.string.isRequired,
+    canvasUserId: _propTypes.default.string.isRequired,
+    rcsHost: _propTypes.default.string.isRequired,
+    tokenFetchFn: _propTypes.default.func.isRequired
+  }),
   timeZone: _propTypes.default.string,
   translations: _propTypes.default.objectOf(_propTypes.default.shape({
     message: _propTypes.default.string
@@ -196,6 +203,7 @@ var SDKApp = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _dec(_
   locale: null,
   outcomesEndpoint: null,
   outcomesToken: null,
+  rceConfig: null,
   translations: null,
   timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone
 }, _temp)) || _class);

package/lib/common/components/resources/item/ItemEdit/index.js

@@ -56,6 +56,7 @@ function mapStateToProps(state, props) {
     workingItem: workingItem,
     isValid: isValid,
     isEditing: true,
+    fitbCommonWordbankEnabled: (0, _featureCheck.featureOn)('fitb_common_wordbank'),
     editable: true,
     contextUuid: contextUuid,
     oneQuestionAtATime: (0, _quizzes2.isActiveQuizWorkingInstanceOneQuestionAtATime)(state),

package/lib/common/components/resources/item/ItemEdit/presenter.js

@@ -157,8 +157,8 @@ var ItemEdit = /*#__PURE__*/function (_Component) {
     key: "render",
     value: function render() {
       var item = this.props.entry;
-      var interactionType = item.getInteractionType();
-      var Interaction = (0, _componentForItem.default)(interactionType.slug, _quizCommon.COMPONENT_EDIT);
+      var interactionType = item.getInteractionType().slug;
+      var Interaction = (0, _componentForItem.default)(interactionType, _quizCommon.COMPONENT_EDIT);
       var propsForInteraction = (0, _interactionTypePropsHelper.propsForInteractionEdit)(this.props, this.additionalEditOptions());
       return /*#__PURE__*/_react.default.createElement(_uiFormField.FormFieldGroup, {
         messages: this.getError('onSelf'),
@@ -166,7 +166,6 @@ var ItemEdit = /*#__PURE__*/function (_Component) {
         name: "edit_item_".concat(this.props.guid) // eslint-disable-line react/jsx-no-literals
 
       }, /*#__PURE__*/_react.default.createElement(Interaction, Object.assign({}, propsForInteraction, {
-        interactionType: interactionType,
         itemId: this.props.guid,
         renderImportModal: this.renderImportModal
       })));
@@ -187,6 +186,7 @@ ItemEdit.propTypes = {
   appContainer: _CustomPropTypes.default.selectors.isRequired,
   changeOutcomeAlignmentSetGuid: _propTypes.default.func.isRequired,
   entry: _reactImmutableProptypes.default.record.isRequired,
+  fitbCommonWordbankEnabled: _propTypes.default.bool,
   guid: _propTypes.default.string.isRequired,
   occludeQuizEntries: _propTypes.default.func.isRequired,
   contextUuid: _propTypes.default.string,
@@ -222,6 +222,7 @@ ItemEdit.defaultProps = {
   additionalOptions: [],
   answerFeedbackEnabled: false,
   contextUuid: null,
+  fitbCommonWordbankEnabled: false,
   errorsAreShowing: false,
   outcomesEndpoint: null,
   outcomesToken: null,

package/lib/common/util/fitbCopyHelper.js

@@ -7,6 +7,13 @@ exports.convertFITBtoRich = convertFITBtoRich;
 
 var _immutable = require("immutable");
 
+// https://stackoverflow.com/questions/18749591/encode-html-entities-in-javascript
+function htmlEncode(input) {
+  return input.replace(/[\u00A0-\u9999<>&]/g, function (i) {
+    return '&#' + i.charCodeAt(0) + ';';
+  });
+}
+
 function convertFITBtoRich(interactionTypeData, richFITBInteractionID) {
   var interactionData = interactionTypeData.interactionData,
       scoringData = interactionTypeData.scoringData;
@@ -15,12 +22,13 @@ function convertFITBtoRich(interactionTypeData, richFITBInteractionID) {
   });
   var workingItemBody = sortedStemItems.reduce(function (itemBody, stemItem) {
     if (stemItem.get('type') === 'text') {
-      return itemBody + stemItem.get('value', '');
+      return itemBody + htmlEncode(stemItem.get('value', ''));
     } else {
       var blankScoringData = scoringData.get('value', (0, _immutable.List)()).find(function (blank) {
         return blank.get('id') === stemItem.get('blankId');
       }) || (0, _immutable.Map)();
-      return itemBody + "`".concat(blankScoringData.getIn(['scoringData', 'blankText']), "`");
+      var blankText = blankScoringData.getIn(['scoringData', 'blankText'], '');
+      return itemBody + "`".concat(htmlEncode(blankText), "`");
     }
   }, '');
   return Object.assign({}, interactionTypeData, {

package/lib/common/util/interactionTypePropsHelper.js

@@ -50,10 +50,12 @@ var propsForInteractionEdit = function propsForInteractionEdit(props, additional
     errors: props.workingItem.getErrors().toJS(),
     validationErrorsFromApi: props.validationErrorsFromApi,
     errorsAreShowing: props.errorsAreShowing,
+    fitbCommonWordbankEnabled: props.fitbCommonWordbankEnabled,
     hiddenOptions: {
       calculator: !props.showCalculator
     },
     interactionData: item.interactionData,
+    interactionType: props.entry.getInteractionType(),
     // SHIM: canvas-rce breaks on null values now
     // this is a shim until canvas-rce deals with
     // null values better

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/quiz-core",
-  "version": "17.32.1-rc.0+cf2608af9",
+  "version": "17.32.1-rc.11+78ad8eb24",
   "license": "MIT",
   "description": "The Quiz React SDK by Instructure Inc.",
   "author": "Instructure, Inc. Engineering and Product Design",
@@ -41,11 +41,11 @@
   ],
   "dependencies": {
     "@instructure/outcomes-ui": "^2.1.2",
-    "@instructure/quiz-common": "17.32.1-rc.0+cf2608af9",
-    "@instructure/quiz-i18n": "17.32.1-rc.0+cf2608af9",
-    "@instructure/quiz-interactions": "17.32.1-rc.0+cf2608af9",
-    "@instructure/quiz-number-input": "17.32.1-rc.0+cf2608af9",
-    "@instructure/quiz-rce": "17.32.1-rc.0+cf2608af9",
+    "@instructure/quiz-common": "17.32.1-rc.11+78ad8eb24",
+    "@instructure/quiz-i18n": "17.32.1-rc.11+78ad8eb24",
+    "@instructure/quiz-interactions": "17.32.1-rc.11+78ad8eb24",
+    "@instructure/quiz-number-input": "17.32.1-rc.11+78ad8eb24",
+    "@instructure/quiz-rce": "17.32.1-rc.11+78ad8eb24",
     "@instructure/ui-a11y-content": "^7.11.0",
     "@instructure/ui-alerts": "^7.11.0",
     "@instructure/ui-avatar": "^7.11.0",
@@ -106,7 +106,7 @@
     "eventemitter3": "^3.1.0",
     "humps": "^2.0.0",
     "immutable": "^3.8.1",
-    "instructure-validations": "17.32.1-rc.0+cf2608af9",
+    "instructure-validations": "17.32.1-rc.11+78ad8eb24",
     "ipaddr.js": "^1.5.4",
     "isomorphic-fetch": "^2.2.0",
     "isuuid": "^0.1.0",
@@ -137,7 +137,7 @@
     "uuid": "^3.2.1"
   },
   "devDependencies": {
-    "@instructure/quiz-scripts": "17.32.1-rc.0+cf2608af9",
+    "@instructure/quiz-scripts": "17.32.1-rc.11+78ad8eb24",
     "@instructure/ui-axe-check": "^7.11.0",
     "@instructure/ui-babel-preset": "^7.11.0",
     "@instructure/ui-karma-config": "^7.11.0",
@@ -156,7 +156,7 @@
     "intl": "^1.2.4",
     "jquery": "^2.2.3",
     "most-subject": "^5.3.0",
-    "quiz-presets": "17.32.1-rc.0+cf2608af9",
+    "quiz-presets": "17.32.1-rc.11+78ad8eb24",
     "react": "^16.8.6",
     "react-addons-test-utils": "^15.6.2",
     "react-dom": "^16.8.6",
@@ -172,5 +172,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "cf2608af9581e047bff600e1c23a1b051c1c6928"
+  "gitHead": "78ad8eb24fe924bcd0a5b08acafb89d8a16ecb00"
 }