@instructure/quiz-core 17.19.2-rc.5 → 17.19.3-rc.2

package/lib/common/api/schema.js

@@ -0,0 +1,109 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.stimulusSchema = exports.sessionItemSchema = exports.sessionItemResultSchema = exports.shareBankSchema = exports.resumeDataSchema = exports.quizSessionSchema = exports.quizSessionResultSchema = exports.quizSessionEventSchema = exports.quizSchema = exports.quizEntrySchema = exports.quizEntriesSchema = exports.quizAnalysisSchema = exports.qtiImportSchema = exports.itemSchema = exports.itemAnalysisSchema = exports.interactionTypeSchema = exports.bankSchema = exports.bankEntrySchema = void 0;
+
+var _normalizr = require("normalizr");
+
+var bankSchema = new _normalizr.schema.Entity('banks');
+exports.bankSchema = bankSchema;
+var bankEntrySchema = new _normalizr.schema.Entity('bankEntries');
+exports.bankEntrySchema = bankEntrySchema;
+var interactionTypeSchema = new _normalizr.schema.Entity('interactionTypes');
+exports.interactionTypeSchema = interactionTypeSchema;
+var itemAnalysisSchema = new _normalizr.schema.Entity('itemAnalyses', {}, {
+  idAttribute: 'item_id'
+});
+exports.itemAnalysisSchema = itemAnalysisSchema;
+var quizAnalysisSchema = new _normalizr.schema.Entity('quizAnalyses', {}, {
+  idAttribute: 'quiz_id'
+});
+exports.quizAnalysisSchema = quizAnalysisSchema;
+var itemSchema = new _normalizr.schema.Entity('items');
+exports.itemSchema = itemSchema;
+var qtiImportSchema = new _normalizr.schema.Entity('qtiImports');
+exports.qtiImportSchema = qtiImportSchema;
+var quizSchema = new _normalizr.schema.Entity('quizzes');
+exports.quizSchema = quizSchema;
+var quizSessionEventSchema = new _normalizr.schema.Entity('quizSessionEvents', {}, {
+  idAttribute: 'created_at' // indexed by createdAt
+
+});
+exports.quizSessionEventSchema = quizSessionEventSchema;
+var shareBankSchema = new _normalizr.schema.Entity('sharedBanks');
+exports.shareBankSchema = shareBankSchema;
+var quizSessionResultSchema = new _normalizr.schema.Entity('quizSessionResults');
+exports.quizSessionResultSchema = quizSessionResultSchema;
+var quizSessionSchema = new _normalizr.schema.Entity('quizSessions');
+exports.quizSessionSchema = quizSessionSchema;
+var quizEntrySchema = new _normalizr.schema.Entity('quizEntry');
+exports.quizEntrySchema = quizEntrySchema;
+var quizEntriesSchema = new _normalizr.schema.Entity('quizEntries');
+exports.quizEntriesSchema = quizEntriesSchema;
+var resumeDataSchema = new _normalizr.schema.Entity('resumeData');
+exports.resumeDataSchema = resumeDataSchema;
+var sessionItemResultSchema = new _normalizr.schema.Entity('sessionItemResults');
+exports.sessionItemResultSchema = sessionItemResultSchema;
+var sessionItemSchema = new _normalizr.schema.Entity('sessionItems');
+exports.sessionItemSchema = sessionItemSchema;
+var stimulusSchema = new _normalizr.schema.Entity('stimuli'); // =================
+//   relationships
+// =================
+
+exports.stimulusSchema = stimulusSchema;
+bankEntrySchema.define({
+  entry: new _normalizr.schema.Union({
+    Item: itemSchema,
+    Stimulus: stimulusSchema
+  }, function (value, parent, key) {
+    return parent.entry_type;
+  })
+});
+itemSchema.define({
+  interaction_type: interactionTypeSchema
+});
+stimulusSchema.define({});
+quizSchema.define({
+  items: [itemSchema],
+  // Probably shouldn't have this at the root anymore...
+  quizEntries: [quizEntrySchema],
+  itemAnalyses: [itemAnalysisSchema],
+  quizAnalysis: quizAnalysisSchema
+});
+var quizEntryNestedDef = {
+  interaction_types: [interactionTypeSchema],
+  entry: new _normalizr.schema.Union({
+    Bank: bankSchema,
+    BankEntry: bankEntrySchema,
+    Item: itemSchema,
+    Stimulus: stimulusSchema
+  }, function (value, parent, key) {
+    return parent.entry_type;
+  })
+};
+quizEntrySchema.define(quizEntryNestedDef);
+quizEntriesSchema.define(quizEntryNestedDef); // 'item' is within the sessionItem, but it should remain
+// denormalized because sessionItems of the same id can
+// actually represent different objects
+// however we do want to normalize the interaction types
+// within it
+
+sessionItemSchema.define({
+  item: {
+    interaction_type: interactionTypeSchema
+  }
+});
+sessionItemResultSchema.define({
+  quiz_session: quizSessionSchema,
+  session_items: [sessionItemSchema]
+});
+quizSessionSchema.define({
+  authoritative_result: quizSessionResultSchema,
+  quiz: quizSchema,
+  quiz_session_results: [quizSessionResultSchema]
+});
+quizSessionEventSchema.define({
+  quiz_session: quizSessionSchema
+});

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

@@ -0,0 +1,37 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+
+var _redux = require("redux");
+
+var _immutable = require("immutable");
+
+var _reactRedux = require("../../react-redux.js");
+
+var _modal = require("../../actions/modal.js");
+
+var _presenter = _interopRequireDefault(require("./presenter.js"));
+
+var mapStateToProps = function mapStateToProps(state) {
+  var modal = state.get('modal');
+  return (0, _objectSpread2.default)({
+    modalOpen: !!modal.get('isOpen') && modal.get('isOpen') === modal.getIn(['options', 'title'])
+  }, (modal.get('options') || (0, _immutable.Map)()).toJS());
+};
+
+var mapDispatchToProps = function mapDispatchToProps(dispatch) {
+  return {
+    closeModal: (0, _redux.bindActionCreators)(_modal.closeModal, dispatch)
+  };
+};
+
+var _default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(_presenter.default);
+
+exports.default = _default;

package/lib/common/components/ConfirmationModal/presenter.js

@@ -0,0 +1,156 @@
+"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.ConfirmationModal = void 0;
+
+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 _uiButtons = require("@instructure/ui-buttons");
+
+var _uiText = require("@instructure/ui-text");
+
+var _uiHeading = require("@instructure/ui-heading");
+
+var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
+
+var _quizCommon = require("@instructure/quiz-common");
+
+var ConfirmationModal = /*#__PURE__*/function (_Component) {
+  (0, _inherits2.default)(ConfirmationModal, _Component);
+
+  var _super = (0, _createSuper2.default)(ConfirmationModal);
+
+  function ConfirmationModal() {
+    var _this;
+
+    (0, _classCallCheck2.default)(this, ConfirmationModal);
+
+    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.state = {
+      action: null
+    };
+
+    _this.continueAction = function () {
+      _this.setState({
+        action: 'continue'
+      }, _this.props.closeModal);
+    };
+
+    _this.cancelAction = function () {
+      _this.setState({
+        action: 'cancel'
+      }, _this.props.closeModal);
+    };
+
+    _this.doAction = function () {
+      var _this$props = _this.props,
+          onContinue = _this$props.onContinue,
+          onCancel = _this$props.onCancel;
+
+      if (_this.state.action === 'continue') {
+        onContinue && onContinue();
+      } else if (_this.state.action === 'cancel') {
+        onCancel && onCancel();
+      }
+
+      _this.setState({
+        action: null
+      });
+    };
+
+    return _this;
+  }
+
+  (0, _createClass2.default)(ConfirmationModal, [{
+    key: "render",
+    value: function render() {
+      var _this$props2 = this.props,
+          title = _this$props2.title,
+          text = _this$props2.text,
+          cancelText = _this$props2.cancelText,
+          continueText = _this$props2.continueText,
+          size = _this$props2.size,
+          shouldReturnFocus = _this$props2.shouldReturnFocus,
+          continueVariant = _this$props2.continueVariant;
+      return /*#__PURE__*/_react.default.createElement(_quizCommon.ImportantModal, {
+        open: this.props.modalOpen,
+        size: size || 'small',
+        label: title || (0, _formatMessage.default)('Confirm'),
+        onDismiss: this.cancelAction,
+        "data-automation": "sdk-confirmation-modal",
+        shouldReturnFocus: shouldReturnFocus,
+        onClose: this.doAction
+      }, /*#__PURE__*/_react.default.createElement(_quizCommon.ModalHeader, null, /*#__PURE__*/_react.default.createElement(_uiHeading.Heading, {
+        level: "reset",
+        as: "h2",
+        "data-automation": "sdk-confirmation-modal-heading"
+      }, title || (0, _formatMessage.default)('Confirm')), /*#__PURE__*/_react.default.createElement(_uiButtons.CloseButton, {
+        onClick: this.props.closeModal,
+        placement: "end",
+        offset: "medium",
+        screenReaderLabel: (0, _formatMessage.default)('Close')
+      })), /*#__PURE__*/_react.default.createElement(_quizCommon.ModalBody, null, /*#__PURE__*/_react.default.createElement(_uiText.Text, {
+        color: "primary"
+      }, text || (0, _formatMessage.default)('Are you sure?'))), /*#__PURE__*/_react.default.createElement(_quizCommon.ModalFooter, null, /*#__PURE__*/_react.default.createElement(_uiButtons.Button, {
+        onClick: this.cancelAction,
+        margin: _quizCommon.XSMALL_SIDE_MARGIN,
+        "data-automation": "sdk-confirmation-modal-cancel"
+      }, cancelText || (0, _formatMessage.default)('Cancel')), /*#__PURE__*/_react.default.createElement(_uiButtons.Button, {
+        variant: continueVariant || 'primary',
+        onClick: this.continueAction,
+        margin: _quizCommon.XSMALL_SIDE_MARGIN,
+        "data-automation": "sdk-confirmation-modal-confirm"
+      }, continueText || (0, _formatMessage.default)('Confirm'))));
+    }
+  }]);
+  ConfirmationModal.displayName = "ConfirmationModal";
+  return ConfirmationModal;
+}(_react.Component);
+
+exports.ConfirmationModal = ConfirmationModal;
+ConfirmationModal.propTypes = {
+  closeModal: _propTypes.default.func.isRequired,
+  modalOpen: _propTypes.default.bool.isRequired,
+  title: _propTypes.default.string,
+  text: _propTypes.default.string,
+  cancelText: _propTypes.default.string,
+  continueText: _propTypes.default.string,
+  continueVariant: _propTypes.default.string,
+  size: _propTypes.default.string,
+  shouldReturnFocus: _propTypes.default.bool,
+  onContinue: _propTypes.default.func,
+  onCancel: _propTypes.default.func
+};
+ConfirmationModal.defaultProps = {
+  title: null,
+  text: null,
+  cancelText: null,
+  continueText: null,
+  continueVariant: null,
+  size: null,
+  shouldReturnFocus: true,
+  onContinue: null,
+  onCancel: null
+};
+var _default = ConfirmationModal;
+exports.default = _default;

package/lib/common/components/ImportModal/ImportFileSelector/index.js

@@ -0,0 +1,167 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = exports.ImportFileSelector = void 0;
+
+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 _reactImmutableProptypes = _interopRequireDefault(require("react-immutable-proptypes"));
+
+var _uiButtons = require("@instructure/ui-buttons");
+
+var _uiGrid = require("@instructure/ui-grid");
+
+var _uiThemeable = require("@instructure/ui-themeable");
+
+var _uiIcons = require("@instructure/ui-icons");
+
+var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
+
+var _FileSelector = _interopRequireDefault(require("../../../../common/components/shared/file_selector/FileSelector.js"));
+
+var _theme = _interopRequireDefault(require("./theme.js"));
+
+var _dec, _class, _class2, _temp;
+
+var styles = {
+  componentId: 'fqArL',
+  template: function template(theme) {
+    return "\n\n.fqArL_dVrD{color:".concat(theme.uploadIconContainerColor || 'inherit', ";font-size:").concat(theme.uploadIconContainerColorFontSize || 'inherit', ";text-align:right}\n\n[dir=ltr] .fqArL_dVrD,[dir=rtl] .fqArL_dVrD{text-align:right}\n\n.fqArL_brQK{color:").concat(theme.checkIconContainerColor || 'inherit', ";font-size:").concat(theme.checkIconContainerFontSize || 'inherit', ";text-align:right}\n\n[dir=ltr] .fqArL_brQK,[dir=rtl] .fqArL_brQK{text-align:right}\n\n.fqArL_kOWE{color:").concat(theme.smallTextColor || 'inherit', ";font-size:").concat(theme.smallTextFontSize || 'inherit', ";padding:0 ").concat(theme.smallTextPadding || 'inherit', "}\n\n.fqArL_ddCj{margin-top:").concat(theme.selectorMargin || 'inherit', "}\n\n.fqArL_cHlQ{color:").concat(theme.fileListSuccessColor || 'inherit', "}");
+  },
+  'uploadIconContainer': 'fqArL_dVrD',
+  'checkIconContainer': 'fqArL_brQK',
+  'smallText': 'fqArL_kOWE',
+  'selector': 'fqArL_ddCj',
+  'fileListSuccess': 'fqArL_cHlQ'
+};
+
+var _ref3 = /*#__PURE__*/_react.default.createElement(_uiIcons.IconUploadLine, null);
+
+var _ref4 = /*#__PURE__*/_react.default.createElement(_uiIcons.IconCompleteLine, null);
+
+var ImportFileSelector = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _dec(_class = (_temp = _class2 = /*#__PURE__*/function (_Component) {
+  (0, _inherits2.default)(ImportFileSelector, _Component);
+
+  var _super = (0, _createSuper2.default)(ImportFileSelector);
+
+  function ImportFileSelector() {
+    var _this;
+
+    (0, _classCallCheck2.default)(this, ImportFileSelector);
+
+    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.renderFileList = function () {
+      var fileName = _this.props.files.get(0).name;
+
+      return /*#__PURE__*/_react.default.createElement("div", null, _formatMessage.default.rich('<0>{fileName}</0> <1>is ready.</1>', {
+        0: function _(_ref) {
+          var children = _ref.children;
+          return /*#__PURE__*/_react.default.createElement("span", {
+            className: styles.fileListSuccess,
+            key: "0"
+          }, children);
+        },
+        1: function _(_ref2) {
+          var children = _ref2.children;
+          return /*#__PURE__*/_react.default.createElement("span", {
+            key: "1"
+          }, children);
+        },
+        fileName: fileName
+      }));
+    };
+
+    return _this;
+  }
+
+  (0, _createClass2.default)(ImportFileSelector, [{
+    key: "renderUploadIcon",
+    value: function renderUploadIcon() {
+      return /*#__PURE__*/_react.default.createElement("div", {
+        className: styles.uploadIconContainer
+      }, _ref3);
+    }
+  }, {
+    key: "renderCheckmarkIcon",
+    value: function renderCheckmarkIcon() {
+      return /*#__PURE__*/_react.default.createElement("div", {
+        className: styles.checkIconContainer
+      }, _ref4);
+    }
+  }, {
+    key: "renderFilePickerText",
+    value: function renderFilePickerText() {
+      return /*#__PURE__*/_react.default.createElement("div", null, _formatMessage.default.rich('Drag & Drop here <0>or</0> <1>Browse</1>', [function (_ref5) {
+        var children = _ref5.children;
+        return /*#__PURE__*/_react.default.createElement("span", {
+          className: styles.smallText,
+          key: "0"
+        }, children);
+      }, function (_ref6) {
+        var children = _ref6.children;
+        return /*#__PURE__*/_react.default.createElement(_uiButtons.Button, {
+          key: "1"
+        }, children);
+      }]));
+    }
+  }, {
+    key: "renderWrapper",
+    value: function renderWrapper(renderIcon, renderText) {
+      return /*#__PURE__*/_react.default.createElement(_uiGrid.Grid, null, /*#__PURE__*/_react.default.createElement(_uiGrid.Grid.Row, {
+        vAlign: "middle"
+      }, /*#__PURE__*/_react.default.createElement(_uiGrid.Grid.Col, {
+        width: 3
+      }, renderIcon()), /*#__PURE__*/_react.default.createElement(_uiGrid.Grid.Col, null, renderText())));
+    }
+  }, {
+    key: "renderContent",
+    value: function renderContent() {
+      if (this.props.files && this.props.files.size) {
+        return this.renderWrapper(this.renderCheckmarkIcon, this.renderFileList);
+      } else {
+        return this.renderWrapper(this.renderUploadIcon, this.renderFilePickerText);
+      }
+    }
+  }, {
+    key: "render",
+    value: function render() {
+      return /*#__PURE__*/_react.default.createElement("div", {
+        className: styles.selector
+      }, /*#__PURE__*/_react.default.createElement(_FileSelector.default, {
+        content: this.renderContent(),
+        fileHandler: this.props.receiveFile,
+        acceptAttribute: this.props.acceptAttribute
+      }));
+    }
+  }]);
+  ImportFileSelector.displayName = "ImportFileSelector";
+  return ImportFileSelector;
+}(_react.Component), _class2.propTypes = {
+  files: _reactImmutableProptypes.default.list.isRequired,
+  receiveFile: _propTypes.default.func.isRequired,
+  acceptAttribute: _propTypes.default.string.isRequired
+}, _temp)) || _class);
+exports.ImportFileSelector = ImportFileSelector;
+var _default = ImportFileSelector;
+exports.default = _default;

package/lib/common/components/ImportModal/ImportFileSelector/theme.js

@@ -0,0 +1,23 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = generator;
+
+function generator(_ref) {
+  var spacing = _ref.spacing,
+      colors = _ref.colors,
+      typography = _ref.typography;
+  return {
+    uploadIconContainerColor: colors.ash,
+    uploadIconContainerColorFontSize: typography.fontSizeXLarge,
+    checkIconContainerFontSize: typography.fontSizeXLarge,
+    checkIconContainerColor: colors.shamrock,
+    smallTextFontSize: typography.fontSizeXSmall,
+    smallTextColor: colors.ash,
+    smallTextPadding: spacing.xSmall,
+    selectorMargin: spacing.xSmall,
+    fileListSuccessColor: colors.shamrock
+  };
+}

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

@@ -0,0 +1,78 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.callProgress = callProgress;
+exports.progressValue = progressValue;
+exports.default = exports.ImportModal = exports.generateImportModalId = void 0;
+
+var _immutable = require("immutable");
+
+var _reactRedux = require("../../react-redux.js");
+
+var _modal = require("../../../common/actions/modal.js");
+
+var _alerts = require("../../../common/actions/alerts.js");
+
+var _upload = require("../../../common/actions/upload.js");
+
+var _quizCommon = require("@instructure/quiz-common");
+
+var _presenter = require("./presenter.js");
+
+var callsToCheck = [_quizCommon.FILE_UPLOAD_URL_CALL, _quizCommon.FILE_UPLOAD_CALL];
+
+function callProgress(callsToCheck) {
+  var calls = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : (0, _immutable.Map)();
+  var successCount = calls.filter(function (value, key) {
+    return callsToCheck.includes(key) && value.get('requestStatus') === 'success';
+  }).size;
+  return successCount / callsToCheck.length;
+}
+
+function progressValue(progressNumber) {
+  var callsMade = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : (0, _immutable.Map)();
+  var callsToCheck = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : [];
+  var callProgressWhenCompleted = 1; // We are using 50 because 50 == (100 / 2.0) and import and API calls each contribute 1/2 of the overall progress
+
+  return progressNumber // If importing, then the calls are completed and we skip the calculation
+  ? (callProgressWhenCompleted + progressNumber) * 50 // If no progressNumber, then the callProgress counts is working on the first 50%
+  : callProgress(callsToCheck, callsMade) * 50;
+}
+
+var generateImportModalId = function generateImportModalId(id) {
+  return "".concat(id, "_").concat(_quizCommon.IMPORT_MODAL);
+}; // Every component ought to pass in the importModalId to help keep track of which importModal is supposed to be open
+
+
+exports.generateImportModalId = generateImportModalId;
+
+var mapStateToProps = function mapStateToProps(state, props) {
+  return {
+    altText: state.getIn(['upload', 'altText'], ''),
+    modalOpen: state.getIn(['modal', 'isOpen']) === generateImportModalId(props.importModalId),
+    files: state.getIn(['upload', 'files'], (0, _immutable.List)()),
+    uploadStatus: state.getIn(['upload', 'status'], _quizCommon.FILE_UPLOAD_SELECT),
+    progressValue: callProgress(callsToCheck, state.get('calls')) * 100
+  };
+};
+
+var mapDispatchToProps = {
+  clearAltText: _upload.clearAltText,
+  clearFiles: _upload.clearFiles,
+  closeModal: _modal.closeModal,
+  receiveFile: _upload.receiveFile,
+  setAltText: _upload.setAltText,
+  setUploadStatus: _upload.uploadStatus,
+  screenreaderNotification: _alerts.screenreaderNotification
+};
+
+var mergeProps = function mergeProps(stateProps, dispatchProps, ownProps) {
+  return Object.assign({}, stateProps, dispatchProps, ownProps);
+};
+
+var ImportModal = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps, mergeProps)(_presenter.ImportModal);
+exports.ImportModal = ImportModal;
+var _default = ImportModal;
+exports.default = _default;