@instructure/quiz-core 17.46.2-rc.12 → 17.46.2-rc.13

package/lib/common/components/resources/entry/EntrySave/presenter.js

@@ -25,6 +25,8 @@ 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 _uiView = require("@instructure/ui-view");
@@ -63,11 +65,75 @@ var EntrySave = /*#__PURE__*/function (_Component) {
       _this.props.screenreaderNotification(msg);
     };
 
+    _this.confirmShareableContent = function () {
+      var _this$props = _this.props,
+          canvasOrigin = _this$props.canvasOrigin,
+          checkContentShareability = _this$props.checkContentShareability,
+          entry = _this$props.entry,
+          withConfirm = _this$props.withConfirm;
+
+      _this.setState({
+        canSubmit: false
+      });
+
+      checkContentShareability(entry.getWorkingInstance(), canvasOrigin).then(function () {
+        _this.successfulSubmit();
+      }).catch( /*#__PURE__*/function () {
+        var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(err) {
+          var _err$response, _err$response2;
+
+          var body, text;
+          return _regenerator.default.wrap(function _callee$(_context) {
+            while (1) {
+              switch (_context.prev = _context.next) {
+                case 0:
+                  _context.next = 2;
+                  return (_err$response = err.response) === null || _err$response === void 0 ? void 0 : _err$response.json();
+
+                case 2:
+                  body = _context.sent;
+                  text = (0, _formatMessage.default)('There was an error attempting to validate shareability.');
+
+                  if (((_err$response2 = err.response) === null || _err$response2 === void 0 ? void 0 : _err$response2.status) === 400 && body.shareable === false) {
+                    text = (0, _formatMessage.default)('You are attempting to save content containing course links which may not work when used in other courses.');
+                  }
+
+                  withConfirm(function () {
+                    _this.successfulSubmit();
+                  }, {
+                    title: (0, _formatMessage.default)('Are you sure?'),
+                    text: text,
+                    continueText: (0, _formatMessage.default)('Save anyway'),
+                    onCancel: function onCancel() {
+                      _this.setState({
+                        canSubmit: true
+                      });
+                    }
+                  });
+
+                case 6:
+                case "end":
+                  return _context.stop();
+              }
+            }
+          }, _callee);
+        }));
+
+        return function (_x) {
+          return _ref.apply(this, arguments);
+        };
+      }());
+    };
+
     _this.onSubmit = function (e) {
       e.preventDefault();
 
       if (_this.props.isValid) {
-        _this.successfulSubmit();
+        if (_this.props.checkBankedContentShareabilityEnabled && _this.props.shouldValidateShareableContent) {
+          _this.confirmShareableContent();
+        } else {
+          _this.successfulSubmit();
+        }
       } else {
         _this.createScreenReaderNotification();
 
@@ -111,24 +177,24 @@ var EntrySave = /*#__PURE__*/function (_Component) {
   }, {
     key: "successfulSubmit",
     value: function () {
-      var _successfulSubmit = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+      var _successfulSubmit = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
         var validationResult;
-        return _regenerator.default.wrap(function _callee$(_context) {
+        return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) {
-            switch (_context.prev = _context.next) {
+            switch (_context2.prev = _context2.next) {
               case 0:
                 this.setState({
                   canSubmit: false
                 });
-                _context.prev = 1;
-                _context.next = 4;
+                _context2.prev = 1;
+                _context2.next = 4;
                 return this.props.submitHandler();
 
               case 4:
-                validationResult = _context.sent;
+                validationResult = _context2.sent;
 
                 if (!(validationResult === _quizCommon.API_INPUT_VALIDATION_ERROR)) {
-                  _context.next = 8;
+                  _context2.next = 8;
                   break;
                 }
 
@@ -136,16 +202,16 @@ var EntrySave = /*#__PURE__*/function (_Component) {
                 throw new Error('User input validation error received from API.');
 
               case 8:
-                _context.next = 14;
+                _context2.next = 14;
                 break;
 
               case 10:
-                _context.prev = 10;
-                _context.t0 = _context["catch"](1);
+                _context2.prev = 10;
+                _context2.t0 = _context2["catch"](1);
                 this.setState({
                   canSubmit: true
                 });
-                return _context.abrupt("return");
+                return _context2.abrupt("return");
 
               case 14:
                 this.props.switchOffEditing();
@@ -154,10 +220,10 @@ var EntrySave = /*#__PURE__*/function (_Component) {
 
               case 17:
               case "end":
-                return _context.stop();
+                return _context2.stop();
             }
           }
-        }, _callee, this, [[1, 10]]);
+        }, _callee2, this, [[1, 10]]);
       }));
 
       function successfulSubmit() {
@@ -193,29 +259,38 @@ var EntrySave = /*#__PURE__*/function (_Component) {
 
 exports.EntrySave = EntrySave;
 EntrySave.propTypes = {
-  displayPosition: _propTypes.default.number,
-  disableSubmit: _propTypes.default.bool,
-  guid: _propTypes.default.string,
-  submitHandler: _propTypes.default.func.isRequired,
   cancelHandler: _propTypes.default.func,
+  canvasOrigin: _propTypes.default.string,
+  checkBankedContentShareabilityEnabled: _propTypes.default.bool,
+  checkContentShareability: _propTypes.default.func.isRequired,
   clearChanges: _propTypes.default.func.isRequired,
   // From connected component
   clearNextQuizEntry: _propTypes.default.func.isRequired,
+  disableSubmit: _propTypes.default.bool,
+  displayPosition: _propTypes.default.number,
+  entry: _reactImmutableProptypes.default.record.isRequired,
+  guid: _propTypes.default.string,
   hideError: _propTypes.default.func.isRequired,
+  initialFocusId: _propTypes.default.string,
   isValid: _propTypes.default.bool.isRequired,
   showError: _propTypes.default.func.isRequired,
   screenreaderNotification: _propTypes.default.func.isRequired,
+  shouldValidateShareableContent: _propTypes.default.bool,
+  submitHandler: _propTypes.default.func.isRequired,
   // from makescrollable / from props being passed in occasionally
   switchOnEditing: _propTypes.default.func.isRequired,
   switchOffEditing: _propTypes.default.func.isRequired,
-  initialFocusId: _propTypes.default.string
+  withConfirm: _propTypes.default.func.isRequired
 };
 EntrySave.defaultProps = {
-  displayPosition: null,
   cancelHandler: _noop.default,
+  canvasOrigin: '',
+  checkBankedContentShareabilityEnabled: false,
+  displayPosition: null,
   disableSubmit: false,
   guid: null,
-  initialFocusId: null
+  initialFocusId: null,
+  shouldValidateShareableContent: false
 };
 var _default = EntrySave;
 exports.default = _default;

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

@@ -413,6 +413,7 @@ var StimulusEdit = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles),
         onAdd: this.handleAddToBank,
         onContinue: this.handleAddToBankContinue,
         getEntry: this.getEntryForBank,
+        workingEntry: this.props.workingStimulus,
         entryId: this.props.guid,
         entryType: this.props.quizEntry.entryType
       });

package/lib/common/reducers/config.js

@@ -21,6 +21,9 @@ var _default = function _default() {
     case _quizCommon.SET_API_ENDPOINT:
       return state.set('apiEndpoint', action.payload);
 
+    case _quizCommon.SET_CANVAS_ORIGIN:
+      return state.set('canvasOrigin', action.payload);
+
     case _quizCommon.SET_USER_TOKEN:
       return state.set('userToken', action.payload);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/quiz-core",
-  "version": "17.46.2-rc.12+74f3e9397",
+  "version": "17.46.2-rc.13+6f637eeea",
   "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.2",
-    "@instructure/quiz-common": "17.46.2-rc.12+74f3e9397",
-    "@instructure/quiz-i18n": "17.46.2-rc.12+74f3e9397",
-    "@instructure/quiz-interactions": "17.46.2-rc.12+74f3e9397",
-    "@instructure/quiz-number-input": "17.46.2-rc.12+74f3e9397",
-    "@instructure/quiz-rce": "17.46.2-rc.12+74f3e9397",
+    "@instructure/quiz-common": "17.46.2-rc.13+6f637eeea",
+    "@instructure/quiz-i18n": "17.46.2-rc.13+6f637eeea",
+    "@instructure/quiz-interactions": "17.46.2-rc.13+6f637eeea",
+    "@instructure/quiz-number-input": "17.46.2-rc.13+6f637eeea",
+    "@instructure/quiz-rce": "17.46.2-rc.13+6f637eeea",
     "@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.46.2-rc.12+74f3e9397",
+    "instructure-validations": "17.46.2-rc.13+6f637eeea",
     "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.46.2-rc.12+74f3e9397",
+    "quiz-presets": "17.46.2-rc.13+6f637eeea",
     "react": "^16.8.6",
     "react-addons-test-utils": "^15.6.2",
     "react-dom": "^16.8.6",
@@ -172,5 +172,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "74f3e93972c22dc05f63b450bb1bc90f6973d168"
+  "gitHead": "6f637eeea7510a882f6fef1c8ecb4924d3157b0e"
 }