@instructure/quiz-core 17.63.1-rc.0 → 17.63.1-rc.12

package/es/building/api/qtiImports.js

@@ -17,8 +17,8 @@ export var getQTIInfo = function getQTIInfo(quizId) {
     return fetcher.get(url).then(addImportsToStore);
   };
 };
-export var pollForQtiInfo = function pollForQtiInfo(parentId, parentType) {
-  var opts = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : {
+export var pollForQtiInfo = function pollForQtiInfo(parentId, parentType, waitForAssignmentSettingsImported) {
+  var opts = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : {
     getExistingBankAndEntries: getExistingBankAndEntries,
     getExistingQuizAndItems: getExistingQuizAndItems,
     pollForQtiInfo: pollForQtiInfo
@@ -47,11 +47,17 @@ export var pollForQtiInfo = function pollForQtiInfo(parentId, parentType) {
               dispatch(opts.getExistingBankAndEntries(parentId));
             }
 
-            dispatch(setUploadStatus(FILE_UPLOAD_SUCCESS));
+            if (waitForAssignmentSettingsImported) {
+              waitForAssignmentSettingsImported().then(function () {
+                dispatch(setUploadStatus(FILE_UPLOAD_SUCCESS));
+              });
+            } else {
+              dispatch(setUploadStatus(FILE_UPLOAD_SUCCESS));
+            }
           } else if (importsList.find(function (qtiImport) {
             return qtiImport.status !== 'failed';
           })) {
-            dispatch(opts.pollForQtiInfo(parentId, parentType, opts));
+            dispatch(opts.pollForQtiInfo(parentId, parentType, waitForAssignmentSettingsImported, opts));
           } else {
             dispatch(setUploadStatus(FILE_UPLOAD_FAILURE));
           }
@@ -68,7 +74,7 @@ export var pollForQtiInfo = function pollForQtiInfo(parentId, parentType) {
 // the url from the first response, and finally receives the promise.
 // Exported for testing purposes
 
-export var postQtiCreate = function postQtiCreate(qtiImportUrl, dispatch, onError) {
+export var postQtiCreate = function postQtiCreate(qtiImportUrl, dispatch, onError, waitForAssignmentSettingsImported) {
   return function (url) {
     var qtiCreateFetcher = new Fetcher({
       callType: CREATE_QTI_IMPORT,
@@ -81,7 +87,7 @@ export var postQtiCreate = function postQtiCreate(qtiImportUrl, dispatch, onErro
     var addImportToStore = function addImportToStore(importData) {
       dispatch(handleQtiImportsResponse([importData]));
       var parentType = importData.parent_type === 'Quiz' ? PARENT_TYPE_QUIZ : PARENT_TYPE_BANK;
-      dispatch(pollForQtiInfo(importData.parent_id, parentType));
+      dispatch(pollForQtiInfo(importData.parent_id, parentType, waitForAssignmentSettingsImported));
     };
 
     return qtiCreateFetcher.post(qtiImportUrl, {
@@ -89,9 +95,9 @@ export var postQtiCreate = function postQtiCreate(qtiImportUrl, dispatch, onErro
     }).then(addImportToStore);
   };
 };
-export var qtiFileUpload = function qtiFileUpload(file, parentId, parentType, onError) {
-  var withUrlCallback = arguments.length > 4 && arguments[4] !== void 0 ? arguments[4] : sendFileToS3;
-  var qtiCreateFxn = arguments.length > 5 && arguments[5] !== void 0 ? arguments[5] : postQtiCreate;
+export var qtiFileUpload = function qtiFileUpload(file, parentId, parentType, onError, waitForAssignmentSettingsImported) {
+  var withUrlCallback = arguments.length > 5 && arguments[5] !== void 0 ? arguments[5] : sendFileToS3;
+  var qtiCreateFxn = arguments.length > 6 && arguments[6] !== void 0 ? arguments[6] : postQtiCreate;
   return function (dispatch, getState) {
     var qtiImportUrl;
 
@@ -102,7 +108,7 @@ export var qtiFileUpload = function qtiFileUpload(file, parentId, parentType, on
     }
 
     var pathToGetUrl = "".concat(qtiImportUrl, "/upload_url");
-    var onSuccess = qtiCreateFxn(qtiImportUrl, dispatch, onError);
+    var onSuccess = qtiCreateFxn(qtiImportUrl, dispatch, onError, waitForAssignmentSettingsImported);
     return getUploadUrl(pathToGetUrl).then(withUrlCallback(file, onSuccess, onError));
   };
 };

package/es/building/components/QTIImportModal/index.js

@@ -23,7 +23,7 @@ export var mapDispatchToProps = function mapDispatchToProps(dispatch, props) {
   return {
     onContinue: bindActionCreators(clearQtiImports, dispatch),
     fileUpload: function fileUpload(file, cancelAction) {
-      boundQtiFileUpload(file, props.parentId, props.parentType, cancelAction);
+      boundQtiFileUpload(file, props.parentId, props.parentType, cancelAction, props.waitForAssignmentSettingsImported);
     }
   };
 };

package/es/common/actions/analyses.js

@@ -1,4 +1,4 @@
-import { SET_QUIZ_ANALYSIS, SET_ITEM_ANALYSES, SET_ANALYSIS_FETCH_IN_PROGRESS, SET_ANALYSIS_GENERATION_IN_PROGRESS, SET_ANALYSIS_ERROR } from '@instructure/quiz-common';
+import { SET_QUIZ_ANALYSIS, SET_ITEM_ANALYSES, SET_ANALYSIS_FETCH_IN_PROGRESS, SET_ANALYSIS_GENERATION_IN_PROGRESS, SET_ANALYSIS_ERROR, SET_STATUS_POLLING_IN_PROGRESS } from '@instructure/quiz-common';
 export function setQuizAnalysis(quizAnalysis) {
   return {
     type: SET_QUIZ_ANALYSIS,
@@ -17,6 +17,12 @@ export function setFetchInProgress(inProgress) {
     payload: inProgress
   };
 }
+export function setStatusPollingInProgress(inProgress) {
+  return {
+    type: SET_STATUS_POLLING_IN_PROGRESS,
+    payload: inProgress
+  };
+}
 export function setGenerationInProgress(inProgress) {
   return {
     type: SET_ANALYSIS_GENERATION_IN_PROGRESS,

package/es/common/components/shared/spinner/Spinner.js

@@ -7,20 +7,19 @@ var _dec, _class, _class2, _temp;
 
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
+import { Text } from '@instructure/ui-text';
 import { Spinner } from '@instructure/ui-spinner';
-import { Heading } from '@instructure/ui-heading';
 import { PresentationContent } from '@instructure/ui-a11y-content';
 import { themeable } from '@instructure/ui-themeable';
 import t from '@instructure/quiz-i18n/es/format-message';
 var styles = {
-  componentId: 'ebGcj',
+  componentId: 'cJgyM',
   template: function template(theme) {
-    return "\n\n.ebGcj_gasz{align-items:center;display:inline-flex;flex:1 1 auto;height:100%;justify-content:center;min-height:500px;width:100%}\n\n:root .ebGcj_gasz,_:-ms-fullscreen{height:10rem}\n\n.ebGcj_bZBM .ebGcj_qrQc{flex:1 1 auto}\n\n.ebGcj_fBqo{font-size:".concat(theme.mainTextFontSize || 'inherit', "}");
+    return "\n\n.cJgyM_gasz{align-items:center;column-gap:10px;display:inline-flex;flex:1 1 auto;height:100%;justify-content:center;width:100%}\n\n:root .cJgyM_gasz,_:-ms-fullscreen{height:10rem}\n\n.cJgyM_bZBM .cJgyM_qrQc{flex:1 1 auto}";
   },
-  'wrapper': 'ebGcj_gasz',
-  'left': 'ebGcj_bZBM',
-  'right': 'ebGcj_qrQc',
-  'mainText': 'ebGcj_fBqo'
+  'wrapper': 'cJgyM_gasz',
+  'left': 'cJgyM_bZBM',
+  'right': 'cJgyM_qrQc'
 };
 import theme from "./theme.js";
 export var QuizzesSpinner = (_dec = themeable(theme, styles), _dec(_class = (_temp = _class2 = /*#__PURE__*/function (_Component) {
@@ -37,34 +36,50 @@ export var QuizzesSpinner = (_dec = themeable(theme, styles), _dec(_class = (_te
   _createClass(QuizzesSpinner, [{
     key: "mainText",
     value: function mainText() {
-      return this.props.mainText || t('Loading...');
+      var _this$props = this.props,
+          color = _this$props.color,
+          mainText = _this$props.mainText,
+          fontSize = _this$props.fontSize;
+      return /*#__PURE__*/React.createElement(Text, {
+        size: fontSize,
+        color: color
+      }, mainText || t('Loading...'));
     }
   }, {
     key: "render",
     value: function render() {
+      var _this$props2 = this.props,
+          size = _this$props2.size,
+          minHeight = _this$props2.minHeight;
       return /*#__PURE__*/React.createElement("div", {
-        className: styles.wrapper
+        className: styles.wrapper,
+        style: {
+          minHeight: minHeight
+        }
       }, /*#__PURE__*/React.createElement("div", {
         className: styles.left
       }, /*#__PURE__*/React.createElement(Spinner, {
         renderTitle: this.mainText(),
-        size: "large"
+        size: size
       })), /*#__PURE__*/React.createElement("div", {
         className: styles.right
-      }, /*#__PURE__*/React.createElement(PresentationContent, null, /*#__PURE__*/React.createElement(Heading, {
-        level: "h2",
-        as: "h1"
-      }, /*#__PURE__*/React.createElement("div", {
-        className: styles.mainText
-      }, this.mainText())))));
+      }, /*#__PURE__*/React.createElement(PresentationContent, null, this.mainText())));
     }
   }]);
 
   QuizzesSpinner.displayName = "QuizzesSpinner";
   return QuizzesSpinner;
 }(Component), _class2.propTypes = {
-  mainText: PropTypes.string
+  mainText: PropTypes.string,
+  fontSize: PropTypes.oneOf(['x-small', 'small', 'medium', 'large', 'x-large', 'xx-large']),
+  size: PropTypes.oneOf(['x-small', 'small', 'medium', 'large']),
+  color: PropTypes.string,
+  minHeight: PropTypes.string
 }, _class2.defaultProps = {
-  mainText: null
+  mainText: null,
+  size: 'large',
+  fontSize: 'xx-large',
+  minHeight: '500px',
+  color: 'primary'
 }, _temp)) || _class);
 export default QuizzesSpinner;

package/es/common/components/shared/spinner/theme.js

@@ -1,6 +1,3 @@
-export default function generator(_ref) {
-  var typography = _ref.typography;
-  return {
-    mainTextFontSize: typography.fontSizeXXLarge
-  };
+export default function generator() {
+  return {};
 }

package/es/common/reducers/analyses.js

@@ -1,17 +1,16 @@
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+
+var _fromJS;
+
 import { fromJS } from 'immutable';
-import { SET_QUIZ_ANALYSIS, SET_ITEM_ANALYSES, SET_ANALYSIS_FETCH_IN_PROGRESS, SET_ANALYSIS_GENERATION_IN_PROGRESS, SET_ANALYSIS_ERROR } from '@instructure/quiz-common';
+import { SET_QUIZ_ANALYSIS, SET_ITEM_ANALYSES, SET_ANALYSIS_FETCH_IN_PROGRESS, SET_ANALYSIS_GENERATION_IN_PROGRESS, SET_STATUS_POLLING_IN_PROGRESS, SET_ANALYSIS_ERROR } from '@instructure/quiz-common';
 export var quizAnalysisKey = 'quizAnalysis';
 export var itemAnalysesKey = 'itemAnalyses';
 export var fetchInProgressKey = 'fetchInProgress';
 export var generationInProgressKey = 'generationInProgress';
+export var statusPollingInProgressKey = 'statusPollingInProgress';
 export var errorKey = 'analysisError';
-export var defaultState = fromJS({
-  quizAnalysisKey: void 0,
-  itemAnalysesKey: void 0,
-  fetchStateKey: false,
-  generationStateKey: false,
-  errorKey: void 0
-});
+export var defaultState = fromJS((_fromJS = {}, _defineProperty(_fromJS, quizAnalysisKey, void 0), _defineProperty(_fromJS, itemAnalysesKey, void 0), _defineProperty(_fromJS, fetchInProgressKey, false), _defineProperty(_fromJS, generationInProgressKey, false), _defineProperty(_fromJS, statusPollingInProgressKey, false), _defineProperty(_fromJS, errorKey, void 0), _fromJS));
 export default (function () {
   var state = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : defaultState;
   var action = arguments.length > 1 ? arguments[1] : void 0;
@@ -29,6 +28,9 @@ export default (function () {
     case SET_ANALYSIS_GENERATION_IN_PROGRESS:
       return state.set(generationInProgressKey, action.payload);
 
+    case SET_STATUS_POLLING_IN_PROGRESS:
+      return state.set(statusPollingInProgressKey, action.payload);
+
     case SET_ANALYSIS_ERROR:
       return state.set(errorKey, action.payload);
 

package/es/common/selectors/analyses.js

@@ -12,6 +12,9 @@ export var getItemAnalyses = function getItemAnalyses(state) {
 export var getFetchInProgress = function getFetchInProgress(state) {
   return state.getIn([path, 'fetchInProgress'], false);
 };
+export var getStatusPollingInProgress = function getStatusPollingInProgress(state) {
+  return state.getIn([path, 'statusPollingInProgress'], false);
+};
 export var getGenerationInProgress = function getGenerationInProgress(state) {
   return state.getIn([path, 'generationInProgress'], false);
 };

package/es/reporting/components/resources/NewQuizAndItemAnalysis/AnswerSummaryTable/ChoiceInfo/presenter.js

@@ -7,11 +7,6 @@ import t from '@instructure/quiz-i18n/es/format-message';
 import { Table } from '@instructure/ui-table';
 import Row from "../Row/index.js";
 import PropTypes from 'prop-types';
-
-var _ref = /*#__PURE__*/React.createElement(Table.ColHeader, {
-  width: "46px"
-});
-
 export var ChoiceInfo = /*#__PURE__*/function (_Component) {
   _inherits(ChoiceInfo, _Component);
 
@@ -58,15 +53,26 @@ export var ChoiceInfo = /*#__PURE__*/function (_Component) {
     value: function render() {
       var _this$props = this.props,
           choices = _this$props.choices,
-          noAnswer = _this$props.noAnswer;
+          noAnswer = _this$props.noAnswer,
+          itemId = _this$props.itemId;
       var numberOfChoices = choices.length;
+      var spacingHeaderId = "answer-frequency-summary-spacing-".concat(itemId);
+      var answerHeaderId = "answer-frequency-summary-answer-".concat(itemId);
+      var respondentsHeaderId = "answer-frequency-summary-respondents-".concat(itemId);
+      var percentageHeaderId = "answer-frequency-summary-percentage-".concat(itemId);
       return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Table, {
         caption: t('Answer Frequency Summary')
-      }, /*#__PURE__*/React.createElement(Table.Head, null, /*#__PURE__*/React.createElement(Table.Row, null, _ref, /*#__PURE__*/React.createElement(Table.ColHeader, {
+      }, /*#__PURE__*/React.createElement(Table.Head, null, /*#__PURE__*/React.createElement(Table.Row, null, /*#__PURE__*/React.createElement(Table.ColHeader, {
+        id: spacingHeaderId,
+        width: "46px"
+      }), /*#__PURE__*/React.createElement(Table.ColHeader, {
+        id: answerHeaderId,
         height: "47px"
       }, t('Answer')), /*#__PURE__*/React.createElement(Table.ColHeader, {
+        id: respondentsHeaderId,
         height: "47px"
       }, t('Respondents')), /*#__PURE__*/React.createElement(Table.ColHeader, {
+        id: percentageHeaderId,
         height: "47px",
         textAlign: "center"
       }, t('%')))), /*#__PURE__*/React.createElement(Table.Body, null, choices.map(this.renderRow), this.renderNoAnswer(noAnswer, numberOfChoices))));
@@ -77,6 +83,7 @@ export var ChoiceInfo = /*#__PURE__*/function (_Component) {
   return ChoiceInfo;
 }(Component);
 ChoiceInfo.propTypes = {
+  itemId: PropTypes.number,
   choices: PropTypes.arrayOf(PropTypes.shape({
     body: PropTypes.string,
     correct: PropTypes.bool,

package/es/reporting/components/resources/NewQuizAndItemAnalysis/AnswerSummaryTable/presenter.js

@@ -22,6 +22,7 @@ var styles = {
 import { ChoiceInfo } from "./ChoiceInfo/presenter.js";
 import t from '@instructure/quiz-i18n/es/format-message';
 import { answerSummaryPropType } from "../propTypes.js";
+import { PropTypes } from '@instructure/quiz-interactions';
 export var AnswerSummaryTable = (_dec = themeable(theme, styles), _dec(_class = (_temp = _class2 = /*#__PURE__*/function (_Component) {
   _inherits(AnswerSummaryTable, _Component);
 
@@ -42,12 +43,14 @@ export var AnswerSummaryTable = (_dec = themeable(theme, styles), _dec(_class =
       var _this$props$answerSum = _this.props.answerSummary,
           choices = _this$props$answerSum.choices,
           no_answer = _this$props$answerSum.no_answer;
+      var itemId = _this.props.itemId;
       return /*#__PURE__*/React.createElement("div", {
         className: styles.tableWrapper
       }, /*#__PURE__*/React.createElement(Heading, {
         margin: "large 0 small 0",
         level: "h3"
       }, t('Answer Frequency Summary')), /*#__PURE__*/React.createElement(ChoiceInfo, {
+        itemId: itemId,
         choices: choices,
         noAnswer: no_answer
       }));
@@ -58,5 +61,6 @@ export var AnswerSummaryTable = (_dec = themeable(theme, styles), _dec(_class =
 
   return AnswerSummaryTable;
 }(Component), _class2.propTypes = {
+  itemId: PropTypes.number,
   answerSummary: answerSummaryPropType
 }.isRequired, _temp)) || _class);