@instructure/quiz-core 17.52.1-rc.6 → 17.52.1-rc.7

package/es/building/components/resources/quizEntry/QuizEntry/index.js

@@ -47,7 +47,8 @@ export var mapStateToProps = function mapStateToProps(state, props) {
     shouldClone: state.getIn(['ui', SHOULD_CLONE_ITEM]),
     tagAssociations: tagAssociations,
     useBankTags: useBankTags,
-    workingEntry: entry.getWorkingInstance()
+    workingEntry: entry.getWorkingInstance(),
+    workingQuizEntry: props.quizEntry.getWorkingInstance()
   };
 };
 var dispatchToProps = {

package/es/building/components/resources/quizEntry/QuizEntry/presenter.js

@@ -203,7 +203,7 @@ export var QuizEntry = (_dec = themeable(theme, styles), _dec(_class = (_temp =
     value: function renderBank() {
       var QuizEntryComponent = this.props.isEditing ? QuizEntryEdit : QuizEntryShow;
       var QuizEntryBankComponent = this.props.isEditing ? QuizEntryBankEdit : QuizEntryBankShow;
-      var bank = this.props.entry;
+      var bank = this.props.workingQuizEntry.getEntry();
       var bankProps = {
         title: bank.title,
         entry: bank,
@@ -241,7 +241,7 @@ export var QuizEntry = (_dec = themeable(theme, styles), _dec(_class = (_temp =
       var quizEntryProps = Object.assign({}, this.props, overrideProps);
       var QuizEntryComponent = this.isEditing() ? QuizEntryEdit : QuizEntryShow;
       var itemProps = this.propsForItem();
-      var mergedItem = this.isEditing() ? this.props.quizEntry.getWorkingInstance().getItem() : itemProps.entry;
+      var mergedItem = this.isEditing() ? this.props.workingQuizEntry.getItem() : itemProps.entry;
       var ItemComponent = this.isOverriding() ? ItemOverride : ItemShow;
       return /*#__PURE__*/React.createElement(QuizEntryComponent, quizEntryProps, /*#__PURE__*/React.createElement(WarningWrapper, Object.assign({}, bankEntryWarningWrapperProps, {
         disableChildren: this.isEditing() && !this.isOverridable()
@@ -369,6 +369,7 @@ export var QuizEntry = (_dec = themeable(theme, styles), _dec(_class = (_temp =
   tagAssociations: ImmutablePropTypes.listOf(ImmutablePropTypes.map),
   useBankTags: PropTypes.bool,
   workingEntry: ImmutablePropTypes.record.isRequired,
+  workingQuizEntry: ImmutablePropTypes.record.isRequired,
   editQuizEntryToggle: PropTypes.bool.isRequired,
   onEditQuizEntryToggle: PropTypes.func.isRequired,
   handleValidationErrorsFromApi: PropTypes.func.isRequired,

package/es/building/components/resources/quizEntry/QuizEntryEdit/Header/index.js

@@ -12,6 +12,7 @@ import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import partial from 'lodash/partial';
 import { ScreenReaderContent } from '@instructure/ui-a11y-content';
+import { Button } from '@instructure/ui-buttons';
 import { TextInput } from '@instructure/ui-text-input';
 import { themeable } from '@instructure/ui-themeable';
 import { FillBlankInteractionType } from '@instructure/quiz-interactions';
@@ -21,7 +22,7 @@ import { convertFITBtoRich } from "../../../../../../common/util/fitbCopyHelper.
 import PositionBox from "../../../../../../common/components/resources/positionBox/PositionBox.js";
 import Item from "../../../../../../common/records/Item.js";
 import ActionButtons from "../../../ActionButtons/index.js";
-import { DELETED_QUIZ_ENTRY, API_INPUT_VALIDATION_ERROR } from '@instructure/quiz-common';
+import { DELETED_QUIZ_ENTRY, API_INPUT_VALIDATION_ERROR, BUILD_TRAY_OPEN } from '@instructure/quiz-common';
 var styles = {
   componentId: 'cCKjK',
   template: function template(theme) {
@@ -178,6 +179,16 @@ var QuizEntryHeader = (_dec = themeable(theme, styles), _dec(_class = (_temp = _
       };
     }();
 
+    _this.handleBankClick = function () {
+      if (_this.props.newActiveBank) {
+        var bankId = _this.props.workingQuizEntry.getEntry().id;
+
+        _this.props.newActiveBank(bankId);
+
+        _this.props.setUi(BUILD_TRAY_OPEN, true);
+      }
+    };
+
     return _this;
   }
 
@@ -220,10 +231,27 @@ var QuizEntryHeader = (_dec = themeable(theme, styles), _dec(_class = (_temp = _
   }, {
     key: "renderBankedContent",
     value: function renderBankedContent() {
-      if (this.props.quizEntry.entryType === 'Bank' || this.props.quizEntry.entryType === 'BankEntry') {
+      if (this.props.quizEntry.isBank || this.props.quizEntry.isBankEntry) {
         return _ref2;
       }
     }
+  }, {
+    key: "renderName",
+    value: function renderName() {
+      if (this.props.quizEntry.isBank && this.props.newActiveBank) {
+        return /*#__PURE__*/React.createElement(Button, {
+          variant: "link",
+          size: "small",
+          onClick: this.handleBankClick,
+          "data-automation": "sdk-quiz-entry-interaction-type"
+        }, this.props.name);
+      }
+
+      return /*#__PURE__*/React.createElement("div", {
+        className: styles.interactionType,
+        "data-automation": "sdk-quiz-entry-interaction-type"
+      }, this.props.name);
+    }
   }, {
     key: "renderTitleHolder",
     value: function renderTitleHolder() {
@@ -268,10 +296,7 @@ var QuizEntryHeader = (_dec = themeable(theme, styles), _dec(_class = (_temp = _
         position: position,
         headingText: positionText,
         "data-automation": "sdk-quiz-entry-positionbox"
-      }), this.renderBankedContent(), /*#__PURE__*/React.createElement("div", {
-        className: styles.interactionType,
-        "data-automation": "sdk-quiz-entry-interaction-type"
-      }, this.props.name), /*#__PURE__*/React.createElement("div", {
+      }), this.renderBankedContent(), this.renderName(), /*#__PURE__*/React.createElement("div", {
         className: styles.dividingLine
       }), this.renderTitleHolder());
     }
@@ -282,7 +307,7 @@ var QuizEntryHeader = (_dec = themeable(theme, styles), _dec(_class = (_temp = _
         connectDragSource: this.connectDragSource,
         deleteText: this.getVOText('Remove', this.props.displayPosition),
         displayPosition: this.props.displayPosition,
-        onCopy: this.props.quizEntry.entryType === 'Bank' ? null : this.copyItem,
+        onCopy: this.props.quizEntry.isBank ? null : this.copyItem,
         onDelete: this.removeItem,
         quizEntries: this.props.quizEntries,
         quizEntry: this.props.quizEntry,
@@ -320,6 +345,7 @@ var QuizEntryHeader = (_dec = themeable(theme, styles), _dec(_class = (_temp = _
   initialFocusId: PropTypes.string,
   isValid: PropTypes.bool.isRequired,
   name: PropTypes.string,
+  newActiveBank: PropTypes.func,
   quizEntries: ImmutablePropTypes.listOf(ImmutablePropTypes.record).isRequired,
   quizEntry: ImmutablePropTypes.record.isRequired,
   quizId: PropTypes.string.isRequired,
@@ -339,6 +365,7 @@ var QuizEntryHeader = (_dec = themeable(theme, styles), _dec(_class = (_temp = _
   disabledForRegrade: false,
   initialFocusId: null,
   name: null,
+  newActiveBank: null,
   richFITBEnabled: false,
   richFITBInteractionID: '',
   shouldClone: false

package/es/building/components/resources/quizEntry/QuizEntryEdit/index.js

@@ -6,7 +6,7 @@ import * as alertActions from "../../../../../common/actions/alerts.js";
 import * as errorsShowingActions from "../../../../../common/actions/errorsShowing.js";
 import * as itemApiActions from "../../../../api/items.js";
 import * as modalActions from "../../../../../common/actions/modal.js";
-import { set as setUI } from "../../../../../common/actions/ui.js";
+import { set as setUI, newActiveBank } from "../../../../../common/actions/ui.js";
 import * as modificationActions from "../../../../../common/actions/modifications.js";
 import * as quizEntryApiActions from "../../../../api/quizEntries.js";
 import { featureOn } from "../../../../../common/util/featureCheck.js";
@@ -56,6 +56,7 @@ function mapDispatchToProps(dispatch) {
   return {
     screenreaderNotification: bindActionCreators(alertActions, dispatch).screenreaderNotification,
     setUI: bindActionCreators(setUI, dispatch),
+    newActiveBank: bindActionCreators(newActiveBank, dispatch),
     changeItemTitle: boundModificationActions.changeItemTitle,
     changeQuizEntryPoints: boundModificationActions.changeQuizEntryPoints,
     clearModifications: boundModificationActions.clearModifications,

package/es/building/components/resources/quizEntry/QuizEntryEdit/presenter.js

@@ -399,7 +399,7 @@ var QuizEntryEdit = (_dec = themeable(theme, styles), _dec(_class = (_temp = _cl
   }, {
     key: "renderHeader",
     value: function renderHeader() {
-      var headerProps = pick(this.props, ['changeItemTitle', 'clearModifications', 'clearTemporaryItem', 'connectDragSource', 'createTempItem', 'disabledForRegrade', 'displayPosition', 'entry', 'guid', 'hideError', 'initialFocusId', 'name', 'quizEntries', 'quizEntry', 'quizId', 'removeQuizEntry', 'richFITBEnabled', 'richFITBInteractionID', 'screenreaderNotification', 'setUi', 'shouldClone', 'showError', 'withConfirm', 'workingEntry', 'workingQuizEntry']);
+      var headerProps = pick(this.props, ['changeItemTitle', 'clearModifications', 'clearTemporaryItem', 'connectDragSource', 'createTempItem', 'disabledForRegrade', 'displayPosition', 'entry', 'guid', 'hideError', 'initialFocusId', 'name', 'newActiveBank', 'quizEntries', 'quizEntry', 'quizId', 'removeQuizEntry', 'richFITBEnabled', 'richFITBInteractionID', 'screenreaderNotification', 'setUi', 'shouldClone', 'showError', 'withConfirm', 'workingEntry', 'workingQuizEntry']);
       return /*#__PURE__*/React.createElement(QuizEntryEditHeader, Object.assign({
         isValid: this.isValid(),
         successfulSubmit: this.successfulSubmit,
@@ -468,6 +468,7 @@ var QuizEntryEdit = (_dec = themeable(theme, styles), _dec(_class = (_temp = _cl
   initialFocusId: PropTypes.string,
   isOccluded: PropTypes.bool,
   name: PropTypes.string,
+  newActiveBank: PropTypes.func,
   nextQuizEntry: ImmutablePropTypes.map,
   openRegradeModal: PropTypes.func.isRequired,
   quizEntries: ImmutablePropTypes.listOf(ImmutablePropTypes.record).isRequired,
@@ -502,6 +503,7 @@ var QuizEntryEdit = (_dec = themeable(theme, styles), _dec(_class = (_temp = _cl
   isOccluded: false,
   name: null,
   nextQuizEntry: null,
+  newActiveBank: null,
   onEditQuizEntryToggle: Function.prototype,
   richFITBEnabled: false,
   richFITBInteractionID: '',

package/lib/building/components/resources/quizEntry/QuizEntry/index.js

@@ -72,7 +72,8 @@ var mapStateToProps = function mapStateToProps(state, props) {
     shouldClone: state.getIn(['ui', _quizCommon.SHOULD_CLONE_ITEM]),
     tagAssociations: tagAssociations,
     useBankTags: useBankTags,
-    workingEntry: entry.getWorkingInstance()
+    workingEntry: entry.getWorkingInstance(),
+    workingQuizEntry: props.quizEntry.getWorkingInstance()
   };
 };
 

package/lib/building/components/resources/quizEntry/QuizEntry/presenter.js

@@ -244,7 +244,7 @@ var QuizEntry = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _de
     value: function renderBank() {
       var QuizEntryComponent = this.props.isEditing ? _index10.default : _index9.default;
       var QuizEntryBankComponent = this.props.isEditing ? _index3.default : _index2.default;
-      var bank = this.props.entry;
+      var bank = this.props.workingQuizEntry.getEntry();
       var bankProps = {
         title: bank.title,
         entry: bank,
@@ -282,7 +282,7 @@ var QuizEntry = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _de
       var quizEntryProps = Object.assign({}, this.props, overrideProps);
       var QuizEntryComponent = this.isEditing() ? _index10.default : _index9.default;
       var itemProps = this.propsForItem();
-      var mergedItem = this.isEditing() ? this.props.quizEntry.getWorkingInstance().getItem() : itemProps.entry;
+      var mergedItem = this.isEditing() ? this.props.workingQuizEntry.getItem() : itemProps.entry;
       var ItemComponent = this.isOverriding() ? _index6.default : _index5.default;
       return /*#__PURE__*/_react.default.createElement(QuizEntryComponent, quizEntryProps, /*#__PURE__*/_react.default.createElement(_index.default, Object.assign({}, bankEntryWarningWrapperProps, {
         disableChildren: this.isEditing() && !this.isOverridable()
@@ -409,6 +409,7 @@ var QuizEntry = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _de
   tagAssociations: _reactImmutableProptypes.default.listOf(_reactImmutableProptypes.default.map),
   useBankTags: _propTypes.default.bool,
   workingEntry: _reactImmutableProptypes.default.record.isRequired,
+  workingQuizEntry: _reactImmutableProptypes.default.record.isRequired,
   editQuizEntryToggle: _propTypes.default.bool.isRequired,
   onEditQuizEntryToggle: _propTypes.default.func.isRequired,
   handleValidationErrorsFromApi: _propTypes.default.func.isRequired,

package/lib/building/components/resources/quizEntry/QuizEntryEdit/Header/index.js

@@ -31,6 +31,8 @@ var _partial = _interopRequireDefault(require("lodash/partial"));
 
 var _uiA11yContent = require("@instructure/ui-a11y-content");
 
+var _uiButtons = require("@instructure/ui-buttons");
+
 var _uiTextInput = require("@instructure/ui-text-input");
 
 var _uiThemeable = require("@instructure/ui-themeable");
@@ -210,6 +212,16 @@ var QuizEntryHeader = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles
       };
     }();
 
+    _this.handleBankClick = function () {
+      if (_this.props.newActiveBank) {
+        var bankId = _this.props.workingQuizEntry.getEntry().id;
+
+        _this.props.newActiveBank(bankId);
+
+        _this.props.setUi(_quizCommon.BUILD_TRAY_OPEN, true);
+      }
+    };
+
     return _this;
   }
 
@@ -252,10 +264,27 @@ var QuizEntryHeader = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles
   }, {
     key: "renderBankedContent",
     value: function renderBankedContent() {
-      if (this.props.quizEntry.entryType === 'Bank' || this.props.quizEntry.entryType === 'BankEntry') {
+      if (this.props.quizEntry.isBank || this.props.quizEntry.isBankEntry) {
         return _ref2;
       }
     }
+  }, {
+    key: "renderName",
+    value: function renderName() {
+      if (this.props.quizEntry.isBank && this.props.newActiveBank) {
+        return /*#__PURE__*/_react.default.createElement(_uiButtons.Button, {
+          variant: "link",
+          size: "small",
+          onClick: this.handleBankClick,
+          "data-automation": "sdk-quiz-entry-interaction-type"
+        }, this.props.name);
+      }
+
+      return /*#__PURE__*/_react.default.createElement("div", {
+        className: styles.interactionType,
+        "data-automation": "sdk-quiz-entry-interaction-type"
+      }, this.props.name);
+    }
   }, {
     key: "renderTitleHolder",
     value: function renderTitleHolder() {
@@ -300,10 +329,7 @@ var QuizEntryHeader = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles
         position: position,
         headingText: positionText,
         "data-automation": "sdk-quiz-entry-positionbox"
-      }), this.renderBankedContent(), /*#__PURE__*/_react.default.createElement("div", {
-        className: styles.interactionType,
-        "data-automation": "sdk-quiz-entry-interaction-type"
-      }, this.props.name), /*#__PURE__*/_react.default.createElement("div", {
+      }), this.renderBankedContent(), this.renderName(), /*#__PURE__*/_react.default.createElement("div", {
         className: styles.dividingLine
       }), this.renderTitleHolder());
     }
@@ -314,7 +340,7 @@ var QuizEntryHeader = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles
         connectDragSource: this.connectDragSource,
         deleteText: this.getVOText('Remove', this.props.displayPosition),
         displayPosition: this.props.displayPosition,
-        onCopy: this.props.quizEntry.entryType === 'Bank' ? null : this.copyItem,
+        onCopy: this.props.quizEntry.isBank ? null : this.copyItem,
         onDelete: this.removeItem,
         quizEntries: this.props.quizEntries,
         quizEntry: this.props.quizEntry,
@@ -351,6 +377,7 @@ var QuizEntryHeader = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles
   initialFocusId: _propTypes.default.string,
   isValid: _propTypes.default.bool.isRequired,
   name: _propTypes.default.string,
+  newActiveBank: _propTypes.default.func,
   quizEntries: _reactImmutableProptypes.default.listOf(_reactImmutableProptypes.default.record).isRequired,
   quizEntry: _reactImmutableProptypes.default.record.isRequired,
   quizId: _propTypes.default.string.isRequired,
@@ -370,6 +397,7 @@ var QuizEntryHeader = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles
   disabledForRegrade: false,
   initialFocusId: null,
   name: null,
+  newActiveBank: null,
   richFITBEnabled: false,
   richFITBInteractionID: '',
   shouldClone: false

package/lib/building/components/resources/quizEntry/QuizEntryEdit/index.js

@@ -80,6 +80,7 @@ function mapDispatchToProps(dispatch) {
   return {
     screenreaderNotification: (0, _redux.bindActionCreators)(alertActions, dispatch).screenreaderNotification,
     setUI: (0, _redux.bindActionCreators)(_ui.set, dispatch),
+    newActiveBank: (0, _redux.bindActionCreators)(_ui.newActiveBank, dispatch),
     changeItemTitle: boundModificationActions.changeItemTitle,
     changeQuizEntryPoints: boundModificationActions.changeQuizEntryPoints,
     clearModifications: boundModificationActions.clearModifications,

package/lib/building/components/resources/quizEntry/QuizEntryEdit/presenter.js

@@ -433,7 +433,7 @@ var QuizEntryEdit = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles),
   }, {
     key: "renderHeader",
     value: function renderHeader() {
-      var headerProps = (0, _pick.default)(this.props, ['changeItemTitle', 'clearModifications', 'clearTemporaryItem', 'connectDragSource', 'createTempItem', 'disabledForRegrade', 'displayPosition', 'entry', 'guid', 'hideError', 'initialFocusId', 'name', 'quizEntries', 'quizEntry', 'quizId', 'removeQuizEntry', 'richFITBEnabled', 'richFITBInteractionID', 'screenreaderNotification', 'setUi', 'shouldClone', 'showError', 'withConfirm', 'workingEntry', 'workingQuizEntry']);
+      var headerProps = (0, _pick.default)(this.props, ['changeItemTitle', 'clearModifications', 'clearTemporaryItem', 'connectDragSource', 'createTempItem', 'disabledForRegrade', 'displayPosition', 'entry', 'guid', 'hideError', 'initialFocusId', 'name', 'newActiveBank', 'quizEntries', 'quizEntry', 'quizId', 'removeQuizEntry', 'richFITBEnabled', 'richFITBInteractionID', 'screenreaderNotification', 'setUi', 'shouldClone', 'showError', 'withConfirm', 'workingEntry', 'workingQuizEntry']);
       return /*#__PURE__*/_react.default.createElement(_index3.default, Object.assign({
         isValid: this.isValid(),
         successfulSubmit: this.successfulSubmit,
@@ -501,6 +501,7 @@ var QuizEntryEdit = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles),
   initialFocusId: _propTypes.default.string,
   isOccluded: _propTypes.default.bool,
   name: _propTypes.default.string,
+  newActiveBank: _propTypes.default.func,
   nextQuizEntry: _reactImmutableProptypes.default.map,
   openRegradeModal: _propTypes.default.func.isRequired,
   quizEntries: _reactImmutableProptypes.default.listOf(_reactImmutableProptypes.default.record).isRequired,
@@ -535,6 +536,7 @@ var QuizEntryEdit = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles),
   isOccluded: false,
   name: null,
   nextQuizEntry: null,
+  newActiveBank: null,
   onEditQuizEntryToggle: Function.prototype,
   richFITBEnabled: false,
   richFITBInteractionID: '',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/quiz-core",
-  "version": "17.52.1-rc.6+f03aeff76",
+  "version": "17.52.1-rc.7+9833fd26e",
   "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.7",
-    "@instructure/quiz-common": "17.52.1-rc.6+f03aeff76",
-    "@instructure/quiz-i18n": "17.52.1-rc.6+f03aeff76",
-    "@instructure/quiz-interactions": "17.52.1-rc.6+f03aeff76",
-    "@instructure/quiz-number-input": "17.52.1-rc.6+f03aeff76",
-    "@instructure/quiz-rce": "17.52.1-rc.6+f03aeff76",
+    "@instructure/quiz-common": "17.52.1-rc.7+9833fd26e",
+    "@instructure/quiz-i18n": "17.52.1-rc.7+9833fd26e",
+    "@instructure/quiz-interactions": "17.52.1-rc.7+9833fd26e",
+    "@instructure/quiz-number-input": "17.52.1-rc.7+9833fd26e",
+    "@instructure/quiz-rce": "17.52.1-rc.7+9833fd26e",
     "@instructure/ui-a11y-content": "^7.20.0",
     "@instructure/ui-alerts": "^7.20.0",
     "@instructure/ui-avatar": "^7.20.0",
@@ -106,7 +106,7 @@
     "eventemitter3": "^3.1.0",
     "humps": "^2.0.0",
     "immutable": "^3.8.1",
-    "instructure-validations": "17.52.1-rc.6+f03aeff76",
+    "instructure-validations": "17.52.1-rc.7+9833fd26e",
     "ipaddr.js": "^1.5.4",
     "isomorphic-fetch": "^2.2.0",
     "isuuid": "^0.1.0",
@@ -156,7 +156,7 @@
     "intl": "^1.2.4",
     "jquery": "^2.2.3",
     "most-subject": "^5.3.0",
-    "quiz-presets": "17.52.1-rc.6+f03aeff76",
+    "quiz-presets": "17.52.1-rc.7+9833fd26e",
     "react": "^16.8.6",
     "react-addons-test-utils": "^15.6.2",
     "react-dom": "^16.8.6",
@@ -172,5 +172,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f03aeff76aef057bb50621d64d5e46a420f73479"
+  "gitHead": "9833fd26e4e880996c7512ab0e75a6a9bc9fee00"
 }