@instructure/quiz-core 20.5.2-rc.2 → 20.5.2-rc.4

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

@@ -425,8 +425,6 @@ export var StimulusEdit = (_dec = themeable(theme, styles), _dec(_class = (_temp
         guid: this.props.guid,
         stimulus: this.props.stimulus,
         isBankedContent: this.props.isBankedContent,
-        parentId: this.props.quizId,
-        parentType: "quiz",
         setTitleRef: this.setTitleRef
       }), this.renderAddToBankOptions())), /*#__PURE__*/React.createElement("div", {
         className: styles.footer

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

@@ -8,15 +8,13 @@ var _dec, _class, _class2, _temp;
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
-import { List, Map } from 'immutable';
 import { ScreenReaderContent } from '@instructure/ui-a11y-content';
 import { TextInput } from '@instructure/ui-text-input';
-import { FormFieldLabel, FormFieldGroup } from '@instructure/ui-form-field';
+import { FormField, FormFieldGroup } from '@instructure/ui-form-field';
 import { themeable } from '@instructure/ui-themeable';
 import { Heading } from '@instructure/ui-heading';
-import RichContentInput from "../../../RichContentInput/index.js";
+import { RichContentInput, RCE_SINGLE_LINE_HEIGHT } from '@instructure/quiz-rce';
 import { toErrors } from "../../../../util/instUIMessages.js";
-import Errors from "../../../shared/errors/Errors.js";
 import { SimpleSelect } from '@instructure/ui-simple-select';
 import { IconUpdownLine } from '@instructure/ui-icons';
 import { ToggleDetails } from '@instructure/ui-toggle-details';
@@ -85,22 +83,6 @@ export var StimulusEditInfo = (_dec = themeable(theme, styles), _dec(_class = (_
       _this.props.modifyStimulus(newData);
     };
 
-    _this.errorsList = function (field) {
-      if (_this.props.errorsShowing) {
-        var errorMap = _this.props.workingStimulus.getErrors() || Map();
-        return errorMap.get(field) || List();
-      }
-    };
-
-    _this.fileUploadUrl = function () {
-      var _this$props = _this.props,
-          stimulus = _this$props.stimulus,
-          parentId = _this$props.parentId,
-          parentType = _this$props.parentType;
-      var resource = parentType === 'bank' ? 'banks' : 'quizzes';
-      return "/api/".concat(resource, "/").concat(parentId, "/stimuli/").concat(stimulus.id, "/media_upload_url");
-    };
-
     return _this;
   }
 
@@ -144,6 +126,8 @@ export var StimulusEditInfo = (_dec = themeable(theme, styles), _dec(_class = (_
     key: "render",
     value: function render() {
       var stimulus = this.props.workingStimulus;
+      var textAreaId = "stimulusBodyEdit_".concat(stimulus.id, "_").concat(this.props.isBankedContent);
+      var stimulusBodyId = "stimulusBodyEdit_".concat(stimulus.id, "_body");
       return /*#__PURE__*/React.createElement(FormFieldGroup, {
         messages: this.inputErrors('onSelf'),
         description: /*#__PURE__*/React.createElement(ScreenReaderContent, null, t('Edit Stimulus'))
@@ -168,18 +152,21 @@ export var StimulusEditInfo = (_dec = themeable(theme, styles), _dec(_class = (_
         value: stimulus.get('instructions')
       })), /*#__PURE__*/React.createElement("div", {
         className: styles.section
-      }, /*#__PURE__*/React.createElement(FormFieldLabel, null, t('Content')), /*#__PURE__*/React.createElement(RichContentInput, {
-        label: "" // eslint-disable-next-line react/jsx-no-literals
-        ,
-        textareaId: "stimulusBodyEdit_".concat(stimulus.id, "_").concat(this.props.isBankedContent),
+      }, /*#__PURE__*/React.createElement(FormField, {
+        id: stimulusBodyId,
+        label: t('Content'),
+        messages: this.inputErrors('body')
+      }, /*#__PURE__*/React.createElement(RichContentInput, {
+        actsAsInput: true,
+        label: "",
+        placeholder: t('Add Stimulus Content...'),
+        textareaId: textAreaId,
         defaultContent: stimulus.get('body'),
         onKeyUp: this.onBodyChange,
         onBlur: this.onBodyChange,
         onChange: this.onBodyChange,
-        uploadPath: this.fileUploadUrl()
-      }), /*#__PURE__*/React.createElement(Errors, {
-        errorList: this.errorsList('body')
-      })), /*#__PURE__*/React.createElement("div", {
+        height: RCE_SINGLE_LINE_HEIGHT
+      }))), /*#__PURE__*/React.createElement("div", {
         className: styles.section
       }, /*#__PURE__*/React.createElement(ToggleDetails, {
         defaultExpanded: true,
@@ -205,8 +192,6 @@ export var StimulusEditInfo = (_dec = themeable(theme, styles), _dec(_class = (_
   workingStimulus: ImmutablePropTypes.record.isRequired,
   errorsShowing: PropTypes.bool.isRequired,
   modifyStimulus: PropTypes.func.isRequired,
-  parentId: PropTypes.string.isRequired,
-  parentType: PropTypes.string.isRequired,
   setTitleRef: PropTypes.func,
   stimulusOrientationEnabled: PropTypes.bool.isRequired
 }, _class2.defaultProps = {

package/es/reporting/components/resources/NewQuizAndItemAnalysis/AnswerFrequencySummary/shared/ChoiceGroupTypeTable/presenter.js

@@ -53,6 +53,10 @@ export var ChoiceGroupTypeTable = (_dec = withStyle(generateStyle, generateCompo
       }
     };
 
+    _this.getTranslatedEmptyMessage = function () {
+      return t('There are no entries for this open entry question.');
+    };
+
     _this.handleBodyToggle = function () {
       _this.setState({
         bodyExpanded: !_this.state.bodyExpanded
@@ -122,11 +126,29 @@ export var ChoiceGroupTypeTable = (_dec = withStyle(generateStyle, generateCompo
       })));
     };
 
+    _this.renderEmptyInfo = function () {
+      return jsx(Flex, {
+        direction: "column",
+        justifyItems: "start"
+      }, jsx(Flex.Item, {
+        shouldShrink: true,
+        shouldGrow: true,
+        padding: "none none x-small small"
+      }, jsx(Text, null, _this.getTranslatedEmptyMessage())));
+    };
+
     _this.render = function () {
+      var _this$props3 = _this.props,
+          styles = _this$props3.styles,
+          blank = _this$props3.blank;
+      var groupWrapper = styles.groupWrapper,
+          cardWrapper = styles.cardWrapper;
+      var areThereChoices = Array.isArray(blank.choices) && blank.choices.length > 0;
+      var bodyExpanded = _this.state.bodyExpanded;
       return jsx("div", {
-        css: _this.props.styles.groupWrapper
+        css: groupWrapper
       }, jsx(Card, {
-        css: _this.props.styles.cardWrapper
+        css: cardWrapper
       }, jsx(Flex, {
         direction: "column",
         justifyItems: "start"
@@ -142,10 +164,10 @@ export var ChoiceGroupTypeTable = (_dec = withStyle(generateStyle, generateCompo
         shouldShrink: true,
         padding: "x-small small x-small medium",
         overflowY: "hidden"
-      }, _this.renderGroup()), _this.state.bodyExpanded && jsx(Flex.Item, {
+      }, _this.renderGroup()), bodyExpanded && jsx(Flex.Item, {
         shouldShrink: true,
         padding: "x-small small x-small small"
-      }, _this.renderTable())))))));
+      }, areThereChoices ? _this.renderTable() : _this.renderEmptyInfo())))))));
     };
 
     return _this;
@@ -159,7 +181,7 @@ export var ChoiceGroupTypeTable = (_dec = withStyle(generateStyle, generateCompo
     blank_text: PropTypes.string.isRequired,
     blank_type: PropTypes.string.isRequired
   }).isRequired,
-  blankInfo: PropTypes.node.isRequired,
+  blankInfo: PropTypes.node,
   index: PropTypes.number.isRequired,
   styles: PropTypes.object
 }.isRequired, _temp)) || _class);

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

@@ -462,8 +462,6 @@ var StimulusEdit = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles),
         guid: this.props.guid,
         stimulus: this.props.stimulus,
         isBankedContent: this.props.isBankedContent,
-        parentId: this.props.quizId,
-        parentType: "quiz",
         setTitleRef: this.setTitleRef
       }), this.renderAddToBankOptions())), /*#__PURE__*/_react.default.createElement("div", {
         className: styles.footer

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

@@ -23,8 +23,6 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _reactImmutableProptypes = _interopRequireDefault(require("react-immutable-proptypes"));
 
-var _immutable = require("immutable");
-
 var _uiA11yContent = require("@instructure/ui-a11y-content");
 
 var _uiTextInput = require("@instructure/ui-text-input");
@@ -35,12 +33,10 @@ var _uiThemeable = require("@instructure/ui-themeable");
 
 var _uiHeading = require("@instructure/ui-heading");
 
-var _index = _interopRequireDefault(require("../../../RichContentInput/index.js"));
+var _quizRce = require("@instructure/quiz-rce");
 
 var _instUIMessages = require("../../../../util/instUIMessages.js");
 
-var _Errors = _interopRequireDefault(require("../../../shared/errors/Errors.js"));
-
 var _uiSimpleSelect = require("@instructure/ui-simple-select");
 
 var _uiIcons = require("@instructure/ui-icons");
@@ -117,22 +113,6 @@ var StimulusEditInfo = (_dec = (0, _uiThemeable.themeable)(_theme.default, style
       _this.props.modifyStimulus(newData);
     };
 
-    _this.errorsList = function (field) {
-      if (_this.props.errorsShowing) {
-        var errorMap = _this.props.workingStimulus.getErrors() || (0, _immutable.Map)();
-        return errorMap.get(field) || (0, _immutable.List)();
-      }
-    };
-
-    _this.fileUploadUrl = function () {
-      var _this$props = _this.props,
-          stimulus = _this$props.stimulus,
-          parentId = _this$props.parentId,
-          parentType = _this$props.parentType;
-      var resource = parentType === 'bank' ? 'banks' : 'quizzes';
-      return "/api/".concat(resource, "/").concat(parentId, "/stimuli/").concat(stimulus.id, "/media_upload_url");
-    };
-
     return _this;
   }
 
@@ -176,6 +156,8 @@ var StimulusEditInfo = (_dec = (0, _uiThemeable.themeable)(_theme.default, style
     key: "render",
     value: function render() {
       var stimulus = this.props.workingStimulus;
+      var textAreaId = "stimulusBodyEdit_".concat(stimulus.id, "_").concat(this.props.isBankedContent);
+      var stimulusBodyId = "stimulusBodyEdit_".concat(stimulus.id, "_body");
       return /*#__PURE__*/_react.default.createElement(_uiFormField.FormFieldGroup, {
         messages: this.inputErrors('onSelf'),
         description: /*#__PURE__*/_react.default.createElement(_uiA11yContent.ScreenReaderContent, null, (0, _formatMessage.default)('Edit Stimulus'))
@@ -200,18 +182,21 @@ var StimulusEditInfo = (_dec = (0, _uiThemeable.themeable)(_theme.default, style
         value: stimulus.get('instructions')
       })), /*#__PURE__*/_react.default.createElement("div", {
         className: styles.section
-      }, /*#__PURE__*/_react.default.createElement(_uiFormField.FormFieldLabel, null, (0, _formatMessage.default)('Content')), /*#__PURE__*/_react.default.createElement(_index.default, {
-        label: "" // eslint-disable-next-line react/jsx-no-literals
-        ,
-        textareaId: "stimulusBodyEdit_".concat(stimulus.id, "_").concat(this.props.isBankedContent),
+      }, /*#__PURE__*/_react.default.createElement(_uiFormField.FormField, {
+        id: stimulusBodyId,
+        label: (0, _formatMessage.default)('Content'),
+        messages: this.inputErrors('body')
+      }, /*#__PURE__*/_react.default.createElement(_quizRce.RichContentInput, {
+        actsAsInput: true,
+        label: "",
+        placeholder: (0, _formatMessage.default)('Add Stimulus Content...'),
+        textareaId: textAreaId,
         defaultContent: stimulus.get('body'),
         onKeyUp: this.onBodyChange,
         onBlur: this.onBodyChange,
         onChange: this.onBodyChange,
-        uploadPath: this.fileUploadUrl()
-      }), /*#__PURE__*/_react.default.createElement(_Errors.default, {
-        errorList: this.errorsList('body')
-      })), /*#__PURE__*/_react.default.createElement("div", {
+        height: _quizRce.RCE_SINGLE_LINE_HEIGHT
+      }))), /*#__PURE__*/_react.default.createElement("div", {
         className: styles.section
       }, /*#__PURE__*/_react.default.createElement(_uiToggleDetails.ToggleDetails, {
         defaultExpanded: true,
@@ -236,8 +221,6 @@ var StimulusEditInfo = (_dec = (0, _uiThemeable.themeable)(_theme.default, style
   workingStimulus: _reactImmutableProptypes.default.record.isRequired,
   errorsShowing: _propTypes.default.bool.isRequired,
   modifyStimulus: _propTypes.default.func.isRequired,
-  parentId: _propTypes.default.string.isRequired,
-  parentType: _propTypes.default.string.isRequired,
   setTitleRef: _propTypes.default.func,
   stimulusOrientationEnabled: _propTypes.default.bool.isRequired
 }, _class2.defaultProps = {

package/lib/reporting/components/resources/NewQuizAndItemAnalysis/AnswerFrequencySummary/shared/ChoiceGroupTypeTable/presenter.js

@@ -76,6 +76,10 @@ var ChoiceGroupTypeTable = (_dec = (0, _emotion.withStyle)(_styles.default, _the
       }
     };
 
+    _this.getTranslatedEmptyMessage = function () {
+      return (0, _formatMessage.default)('There are no entries for this open entry question.');
+    };
+
     _this.handleBodyToggle = function () {
       _this.setState({
         bodyExpanded: !_this.state.bodyExpanded
@@ -145,11 +149,29 @@ var ChoiceGroupTypeTable = (_dec = (0, _emotion.withStyle)(_styles.default, _the
       })));
     };
 
+    _this.renderEmptyInfo = function () {
+      return (0, _emotion.jsx)(_uiFlex.Flex, {
+        direction: "column",
+        justifyItems: "start"
+      }, (0, _emotion.jsx)(_uiFlex.Flex.Item, {
+        shouldShrink: true,
+        shouldGrow: true,
+        padding: "none none x-small small"
+      }, (0, _emotion.jsx)(_uiText.Text, null, _this.getTranslatedEmptyMessage())));
+    };
+
     _this.render = function () {
+      var _this$props3 = _this.props,
+          styles = _this$props3.styles,
+          blank = _this$props3.blank;
+      var groupWrapper = styles.groupWrapper,
+          cardWrapper = styles.cardWrapper;
+      var areThereChoices = Array.isArray(blank.choices) && blank.choices.length > 0;
+      var bodyExpanded = _this.state.bodyExpanded;
       return (0, _emotion.jsx)("div", {
-        css: _this.props.styles.groupWrapper
+        css: groupWrapper
       }, (0, _emotion.jsx)(_index2.default, {
-        css: _this.props.styles.cardWrapper
+        css: cardWrapper
       }, (0, _emotion.jsx)(_uiFlex.Flex, {
         direction: "column",
         justifyItems: "start"
@@ -165,10 +187,10 @@ var ChoiceGroupTypeTable = (_dec = (0, _emotion.withStyle)(_styles.default, _the
         shouldShrink: true,
         padding: "x-small small x-small medium",
         overflowY: "hidden"
-      }, _this.renderGroup()), _this.state.bodyExpanded && (0, _emotion.jsx)(_uiFlex.Flex.Item, {
+      }, _this.renderGroup()), bodyExpanded && (0, _emotion.jsx)(_uiFlex.Flex.Item, {
         shouldShrink: true,
         padding: "x-small small x-small small"
-      }, _this.renderTable())))))));
+      }, areThereChoices ? _this.renderTable() : _this.renderEmptyInfo())))))));
     };
 
     return _this;
@@ -182,7 +204,7 @@ var ChoiceGroupTypeTable = (_dec = (0, _emotion.withStyle)(_styles.default, _the
     blank_text: _propTypes.default.string.isRequired,
     blank_type: _propTypes.default.string.isRequired
   }).isRequired,
-  blankInfo: _propTypes.default.node.isRequired,
+  blankInfo: _propTypes.default.node,
   index: _propTypes.default.number.isRequired,
   styles: _propTypes.default.object
 }.isRequired, _temp)) || _class);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/quiz-core",
-  "version": "20.5.2-rc.2+8427bde12",
+  "version": "20.5.2-rc.4+803df26e2",
   "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.1.0",
-    "@instructure/quiz-common": "20.5.2-rc.2+8427bde12",
-    "@instructure/quiz-i18n": "20.5.2-rc.2+8427bde12",
-    "@instructure/quiz-interactions": "20.5.2-rc.2+8427bde12",
-    "@instructure/quiz-number-input": "20.5.2-rc.2+8427bde12",
-    "@instructure/quiz-rce": "20.5.2-rc.2+8427bde12",
+    "@instructure/quiz-common": "20.5.2-rc.4+803df26e2",
+    "@instructure/quiz-i18n": "20.5.2-rc.4+803df26e2",
+    "@instructure/quiz-interactions": "20.5.2-rc.4+803df26e2",
+    "@instructure/quiz-number-input": "20.5.2-rc.4+803df26e2",
+    "@instructure/quiz-rce": "20.5.2-rc.4+803df26e2",
     "@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.5.2-rc.2+8427bde12",
+    "instructure-validations": "20.5.2-rc.4+803df26e2",
     "ipaddr.js": "^1.5.4",
     "isomorphic-fetch": "^2.2.0",
     "isuuid": "^0.1.0",
@@ -163,7 +163,7 @@
     "intl": "^1.2.4",
     "jquery": "^2.2.3",
     "most-subject": "^5.3.0",
-    "quiz-presets": "20.5.2-rc.2+8427bde12",
+    "quiz-presets": "20.5.2-rc.4+803df26e2",
     "react": "^16.8.6",
     "react-addons-test-utils": "^15.6.2",
     "react-dom": "^16.8.6",
@@ -179,5 +179,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "8427bde127939d727962cc942f84156a8b97bfd4"
+  "gitHead": "803df26e28d3a74c5da47c537c4785a667938418"
 }