@instructure/quiz-core 20.24.0 → 20.26.0

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

@@ -16,25 +16,22 @@ import Bank from "../../../common/records/Bank.js";
 import BankSelection from "../../../common/components/resources/BankSelection/index.js";
 import { Spinner } from '@instructure/ui-spinner';
 import { Text } from '@instructure/ui-text';
-import { IconCheckLine, IconNoLine, IconWarningLine } from '@instructure/ui-icons';
+import { IconNoLine, IconWarningLine } from '@instructure/ui-icons';
 import { View } from '@instructure/ui-view';
 import { Flex } from '@instructure/ui-flex';
 import t from '@instructure/quiz-i18n/es/format-message';
 import { Modal, ModalHeader, ModalBody, ModalFooter, ADD_TO_BANK_MODAL_BANK_SELECTION, XSMALL_SIDE_MARGIN } from '@instructure/quiz-common';
 import { featureOn } from "../../../common/util/featureCheck.js";
-var _ref2 = /*#__PURE__*/React.createElement(IconCheckLine, {
-  color: "success"
-});
-var _ref3 = /*#__PURE__*/React.createElement(Flex.Item, {
+var _ref2 = /*#__PURE__*/React.createElement(Flex.Item, {
   padding: "0 small 0 0"
 }, /*#__PURE__*/React.createElement(IconNoLine, {
   color: "error",
   size: "small"
 }));
-var _ref4 = /*#__PURE__*/React.createElement(IconWarningLine, {
+var _ref3 = /*#__PURE__*/React.createElement(IconWarningLine, {
   color: "warning"
 });
-var _ref5 = /*#__PURE__*/React.createElement("br", null);
+var _ref4 = /*#__PURE__*/React.createElement("br", null);
 export var AddToBankModal = /*#__PURE__*/function (_Component) {
   _inherits(AddToBankModal, _Component);
   var _super = _createSuper(AddToBankModal);
@@ -211,9 +208,11 @@ export var AddToBankModal = /*#__PURE__*/function (_Component) {
             renderTitle: t('Checking content shareability...')
           }), "\xA0", t('Validating content...'));
         } else if (this.state.contentShareable === 'true') {
-          content = /*#__PURE__*/React.createElement(Text, null, _ref2, "\xA0", t('Good to go!'));
+          // No message needed. The API call to check shareability is very fast in most cases,
+          // so the user may be distracted by a message here.
+          content = null;
         } else if (this.state.contentShareable === 'false') {
-          content = /*#__PURE__*/React.createElement(Flex, null, _ref3, /*#__PURE__*/React.createElement(Flex.Item, {
+          content = /*#__PURE__*/React.createElement(Flex, null, _ref2, /*#__PURE__*/React.createElement(Flex.Item, {
             shouldShrink: true
           }, /*#__PURE__*/React.createElement(Text, {
             color: "danger"
@@ -221,7 +220,7 @@ export var AddToBankModal = /*#__PURE__*/function (_Component) {
         } else {
           content = /*#__PURE__*/React.createElement(Text, {
             color: "warning"
-          }, _ref4, "\xA0", t('There was an error attempting to validate shareability.'));
+          }, _ref3, "\xA0", t('There was an error attempting to validate shareability.'));
         }
         return /*#__PURE__*/React.createElement(View, {
           as: "div",
@@ -243,7 +242,7 @@ export var AddToBankModal = /*#__PURE__*/function (_Component) {
       }), /*#__PURE__*/React.createElement(RadioInput, {
         value: "new",
         label: t('New item bank')
-      })), _ref5, this.renderBankTypeContent(), this.renderContentShareabilityMessage());
+      })), _ref4, this.renderBankTypeContent(), this.renderContentShareabilityMessage());
     }
   }, {
     key: "render",

package/es/moderating/components/resources/AccommodationsModal/ReduceAnswerChoicesSettings/index.js

@@ -0,0 +1,78 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
+import _createClass from "@babel/runtime/helpers/esm/createClass";
+import _inherits from "@babel/runtime/helpers/esm/inherits";
+import _createSuper from "@babel/runtime/helpers/esm/createSuper";
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { Checkbox } from '@instructure/ui-checkbox';
+import { IconButton } from '@instructure/ui-buttons';
+import { IconInfoLine as IconInfo } from '@instructure/ui-icons';
+import { Tooltip } from '@instructure/ui-tooltip';
+import { View } from '@instructure/ui-view';
+import t from '@instructure/quiz-i18n/es/format-message';
+export var ReduceAnswerChoicesSettings = /*#__PURE__*/function (_Component) {
+  _inherits(ReduceAnswerChoicesSettings, _Component);
+  var _super = _createSuper(ReduceAnswerChoicesSettings);
+  function ReduceAnswerChoicesSettings() {
+    var _this;
+    _classCallCheck(this, ReduceAnswerChoicesSettings);
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+    _this = _super.call.apply(_super, [this].concat(args));
+    _this.onChangeReduceChoices = function () {
+      var update = _objectSpread(_objectSpread({}, _this.props.courseAccommodationSettings), {}, {
+        reduceChoicesEnabled: !_this.props.courseAccommodationSettings.reduceChoicesEnabled
+      });
+      _this.props.onChange(update);
+    };
+    _this.renderSettingLabel = function (label, tooltip) {
+      return /*#__PURE__*/React.createElement("span", null, label, /*#__PURE__*/React.createElement(Tooltip, {
+        color: "primary-inverse",
+        renderTip: tooltip,
+        placement: "bottom",
+        on: ['click', 'hover', 'focus']
+      }, /*#__PURE__*/React.createElement(IconButton, {
+        renderIcon: IconInfo,
+        color: "secondary",
+        size: "small",
+        shape: "circle",
+        withBackground: false,
+        withBorder: false,
+        interaction: "readonly",
+        screenReaderLabel: tooltip
+      })));
+    };
+    return _this;
+  }
+  _createClass(ReduceAnswerChoicesSettings, [{
+    key: "render",
+    value: function render() {
+      return /*#__PURE__*/React.createElement(View, {
+        display: "block",
+        margin: "medium none"
+      }, /*#__PURE__*/React.createElement(Checkbox, {
+        variant: "toggle",
+        checked: this.props.courseAccommodationSettings.reduceChoicesEnabled || false,
+        label: this.renderSettingLabel(t('Reduced answer choices'), t('Removes one incorrect answer from all multiple-choice questions that have 4 or more answer choices.')),
+        onChange: this.onChangeReduceChoices,
+        value: "reduce_choices_enabled"
+      }));
+    }
+  }]);
+  ReduceAnswerChoicesSettings.displayName = "ReduceAnswerChoicesSettings";
+  return ReduceAnswerChoicesSettings;
+}(Component);
+ReduceAnswerChoicesSettings.propTypes = {
+  courseAccommodationSettings: PropTypes.shape({
+    reduceChoicesEnabled: PropTypes.bool
+  }).isRequired,
+  onChange: PropTypes.func.isRequired
+};
+ReduceAnswerChoicesSettings.defaultProps = {
+  courseAccommodationSettings: {
+    reduceChoicesEnabled: false
+  }
+};
+export default ReduceAnswerChoicesSettings;

package/es/moderating/components/resources/ModerateTableRow/presenter.js

@@ -261,9 +261,6 @@ export var ModerateTableRow = (_dec = withStyle(generateStyle, generateComponent
             }, t('{ name }: { value }', elem)));
           }));
         }
-
-        // Display the Accommodations and the button in a flex container with reverse order
-        // so that the screen reader will read the accommodations first, and then the button
         return jsx(Table.Cell, {
           "data-automation": "sdk-moderate-accommodations-text"
         }, displayContent);

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

@@ -30,19 +30,16 @@ var _uiFlex = require("@instructure/ui-flex");
 var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
 var _quizCommon = require("@instructure/quiz-common");
 var _featureCheck = require("../../../common/util/featureCheck.js");
-var _ref2 = /*#__PURE__*/_react.default.createElement(_uiIcons.IconCheckLine, {
-  color: "success"
-});
-var _ref3 = /*#__PURE__*/_react.default.createElement(_uiFlex.Flex.Item, {
+var _ref2 = /*#__PURE__*/_react.default.createElement(_uiFlex.Flex.Item, {
   padding: "0 small 0 0"
 }, /*#__PURE__*/_react.default.createElement(_uiIcons.IconNoLine, {
   color: "error",
   size: "small"
 }));
-var _ref4 = /*#__PURE__*/_react.default.createElement(_uiIcons.IconWarningLine, {
+var _ref3 = /*#__PURE__*/_react.default.createElement(_uiIcons.IconWarningLine, {
   color: "warning"
 });
-var _ref5 = /*#__PURE__*/_react.default.createElement("br", null);
+var _ref4 = /*#__PURE__*/_react.default.createElement("br", null);
 var AddToBankModal = /*#__PURE__*/function (_Component) {
   (0, _inherits2.default)(AddToBankModal, _Component);
   var _super = (0, _createSuper2.default)(AddToBankModal);
@@ -219,9 +216,11 @@ var AddToBankModal = /*#__PURE__*/function (_Component) {
             renderTitle: (0, _formatMessage.default)('Checking content shareability...')
           }), "\xA0", (0, _formatMessage.default)('Validating content...'));
         } else if (this.state.contentShareable === 'true') {
-          content = /*#__PURE__*/_react.default.createElement(_uiText.Text, null, _ref2, "\xA0", (0, _formatMessage.default)('Good to go!'));
+          // No message needed. The API call to check shareability is very fast in most cases,
+          // so the user may be distracted by a message here.
+          content = null;
         } else if (this.state.contentShareable === 'false') {
-          content = /*#__PURE__*/_react.default.createElement(_uiFlex.Flex, null, _ref3, /*#__PURE__*/_react.default.createElement(_uiFlex.Flex.Item, {
+          content = /*#__PURE__*/_react.default.createElement(_uiFlex.Flex, null, _ref2, /*#__PURE__*/_react.default.createElement(_uiFlex.Flex.Item, {
             shouldShrink: true
           }, /*#__PURE__*/_react.default.createElement(_uiText.Text, {
             color: "danger"
@@ -229,7 +228,7 @@ var AddToBankModal = /*#__PURE__*/function (_Component) {
         } else {
           content = /*#__PURE__*/_react.default.createElement(_uiText.Text, {
             color: "warning"
-          }, _ref4, "\xA0", (0, _formatMessage.default)('There was an error attempting to validate shareability.'));
+          }, _ref3, "\xA0", (0, _formatMessage.default)('There was an error attempting to validate shareability.'));
         }
         return /*#__PURE__*/_react.default.createElement(_uiView.View, {
           as: "div",
@@ -251,7 +250,7 @@ var AddToBankModal = /*#__PURE__*/function (_Component) {
       }), /*#__PURE__*/_react.default.createElement(_uiRadioInput.RadioInput, {
         value: "new",
         label: (0, _formatMessage.default)('New item bank')
-      })), _ref5, this.renderBankTypeContent(), this.renderContentShareabilityMessage());
+      })), _ref4, this.renderBankTypeContent(), this.renderContentShareabilityMessage());
     }
   }, {
     key: "render",

package/lib/moderating/components/resources/AccommodationsModal/ReduceAnswerChoicesSettings/index.js

@@ -0,0 +1,88 @@
+"use strict";
+
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = exports.ReduceAnswerChoicesSettings = void 0;
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
+var _createSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/createSuper"));
+var _react = _interopRequireWildcard(require("react"));
+var _propTypes = _interopRequireDefault(require("prop-types"));
+var _uiCheckbox = require("@instructure/ui-checkbox");
+var _uiButtons = require("@instructure/ui-buttons");
+var _uiIcons = require("@instructure/ui-icons");
+var _uiTooltip = require("@instructure/ui-tooltip");
+var _uiView = require("@instructure/ui-view");
+var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
+var ReduceAnswerChoicesSettings = /*#__PURE__*/function (_Component) {
+  (0, _inherits2.default)(ReduceAnswerChoicesSettings, _Component);
+  var _super = (0, _createSuper2.default)(ReduceAnswerChoicesSettings);
+  function ReduceAnswerChoicesSettings() {
+    var _this;
+    (0, _classCallCheck2.default)(this, ReduceAnswerChoicesSettings);
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+    _this = _super.call.apply(_super, [this].concat(args));
+    _this.onChangeReduceChoices = function () {
+      var update = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _this.props.courseAccommodationSettings), {}, {
+        reduceChoicesEnabled: !_this.props.courseAccommodationSettings.reduceChoicesEnabled
+      });
+      _this.props.onChange(update);
+    };
+    _this.renderSettingLabel = function (label, tooltip) {
+      return /*#__PURE__*/_react.default.createElement("span", null, label, /*#__PURE__*/_react.default.createElement(_uiTooltip.Tooltip, {
+        color: "primary-inverse",
+        renderTip: tooltip,
+        placement: "bottom",
+        on: ['click', 'hover', 'focus']
+      }, /*#__PURE__*/_react.default.createElement(_uiButtons.IconButton, {
+        renderIcon: _uiIcons.IconInfoLine,
+        color: "secondary",
+        size: "small",
+        shape: "circle",
+        withBackground: false,
+        withBorder: false,
+        interaction: "readonly",
+        screenReaderLabel: tooltip
+      })));
+    };
+    return _this;
+  }
+  (0, _createClass2.default)(ReduceAnswerChoicesSettings, [{
+    key: "render",
+    value: function render() {
+      return /*#__PURE__*/_react.default.createElement(_uiView.View, {
+        display: "block",
+        margin: "medium none"
+      }, /*#__PURE__*/_react.default.createElement(_uiCheckbox.Checkbox, {
+        variant: "toggle",
+        checked: this.props.courseAccommodationSettings.reduceChoicesEnabled || false,
+        label: this.renderSettingLabel((0, _formatMessage.default)('Reduced answer choices'), (0, _formatMessage.default)('Removes one incorrect answer from all multiple-choice questions that have 4 or more answer choices.')),
+        onChange: this.onChangeReduceChoices,
+        value: "reduce_choices_enabled"
+      }));
+    }
+  }]);
+  ReduceAnswerChoicesSettings.displayName = "ReduceAnswerChoicesSettings";
+  return ReduceAnswerChoicesSettings;
+}(_react.Component);
+exports.ReduceAnswerChoicesSettings = ReduceAnswerChoicesSettings;
+ReduceAnswerChoicesSettings.propTypes = {
+  courseAccommodationSettings: _propTypes.default.shape({
+    reduceChoicesEnabled: _propTypes.default.bool
+  }).isRequired,
+  onChange: _propTypes.default.func.isRequired
+};
+ReduceAnswerChoicesSettings.defaultProps = {
+  courseAccommodationSettings: {
+    reduceChoicesEnabled: false
+  }
+};
+var _default = ReduceAnswerChoicesSettings;
+exports.default = _default;

package/lib/moderating/components/resources/ModerateTableRow/presenter.js

@@ -268,9 +268,6 @@ var ModerateTableRow = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.d
             }, (0, _formatMessage.default)('{ name }: { value }', elem)));
           }));
         }
-
-        // Display the Accommodations and the button in a flex container with reverse order
-        // so that the screen reader will read the accommodations first, and then the button
         return (0, _emotion.jsx)(_uiTable.Table.Cell, {
           "data-automation": "sdk-moderate-accommodations-text"
         }, displayContent);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/quiz-core",
-  "version": "20.24.0",
+  "version": "20.26.0",
   "license": "MIT",
   "description": "The Quiz React SDK by Instructure Inc.",
   "author": "Instructure, Inc. Engineering and Product Design",
@@ -44,11 +44,11 @@
     "@instructure/emotion": "^8.51.0",
     "@instructure/grading-utils": "^1.0.0",
     "@instructure/outcomes-ui": "^3.2.2",
-    "@instructure/quiz-common": "^20.24.0",
-    "@instructure/quiz-i18n": "^20.24.0",
-    "@instructure/quiz-interactions": "^20.24.0",
-    "@instructure/quiz-number-input": "^20.24.0",
-    "@instructure/quiz-rce": "^20.24.0",
+    "@instructure/quiz-common": "^20.26.0",
+    "@instructure/quiz-i18n": "^20.26.0",
+    "@instructure/quiz-interactions": "^20.26.0",
+    "@instructure/quiz-number-input": "^20.26.0",
+    "@instructure/quiz-rce": "^20.26.0",
     "@instructure/ui-a11y-content": "^8.51.0",
     "@instructure/ui-alerts": "^8.51.0",
     "@instructure/ui-avatar": "^8.51.0",
@@ -112,7 +112,7 @@
     "file-saver": "~2.0.5",
     "humps": "^2.0.0",
     "immutable": "^3.8.1",
-    "instructure-validations": "^20.24.0",
+    "instructure-validations": "^20.26.0",
     "ipaddr.js": "^1.5.4",
     "isomorphic-fetch": "^2.2.0",
     "isuuid": "^0.1.0",
@@ -143,7 +143,7 @@
     "uuid": "^3.2.1"
   },
   "devDependencies": {
-    "@instructure/quiz-scripts": "^20.24.0",
+    "@instructure/quiz-scripts": "^20.26.0",
     "@instructure/ui-axe-check": "^8.51.0",
     "@instructure/ui-babel-preset": "^7.22.1",
     "@instructure/ui-test-utils": "^7.22.1",
@@ -161,7 +161,7 @@
     "jquery": "^2.2.3",
     "karma-junit-reporter": "^2.0.1",
     "most-subject": "^5.3.0",
-    "quiz-presets": "^20.24.0",
+    "quiz-presets": "^20.26.0",
     "react": "^16.8.6",
     "react-addons-test-utils": "^15.6.2",
     "react-dom": "^16.8.6",