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

package/es/common/reducers/config.js

@@ -1,5 +1,5 @@
 import { fromJS } from 'immutable';
-import { SET_API_ENDPOINT, SET_USER_TOKEN } from '@instructure/quiz-common';
+import { SET_API_ENDPOINT, SET_CANVAS_ORIGIN, SET_USER_TOKEN } from '@instructure/quiz-common';
 var defaultState = fromJS({
   apiEndpoint: ''
 });
@@ -11,6 +11,9 @@ export default (function () {
     case SET_API_ENDPOINT:
       return state.set('apiEndpoint', action.payload);
 
+    case SET_CANVAS_ORIGIN:
+      return state.set('canvasOrigin', action.payload);
+
     case SET_USER_TOKEN:
       return state.set('userToken', action.payload);
 

package/lib/banks/components/AddToBankModal/index.js

@@ -16,6 +16,10 @@ var _banks = require("../../api/banks.js");
 
 var _bankEntries = require("../../api/bankEntries.js");
 
+var _items = require("../../../building/api/items.js");
+
+var _stimuli = require("../../../building/api/stimuli.js");
+
 var _presenter = _interopRequireDefault(require("./presenter.js"));
 
 var modalActions = _interopRequireWildcard(require("../../../common/actions/modal.js"));
@@ -30,10 +34,15 @@ var _quizCommon = require("@instructure/quiz-common");
 
 var _modalHelpers = require("../../../common/util/modalHelpers.js");
 
+var _featureCheck = require("../../../common/util/featureCheck.js");
+
 function mapStateToProps(state, props) {
   var selectedBankOption = state.getIn(['ui', _quizCommon.ADD_TO_BANK_MODAL_BANK_SELECTION]);
   var selectedBank = selectedBankOption && new _Bank.default(state.getIn(['banks', selectedBankOption]));
   return {
+    canvasOrigin: state.getIn(['config', 'canvasOrigin']),
+    checkBankedContentShareabilityEnabled: (0, _featureCheck.featureOn)('check_banked_content_shareability'),
+    checkContentShareability: props.entryType === 'Item' ? _items.checkItemShareability : _stimuli.checkStimulusShareability,
     selectedBank: selectedBank,
     modalTrigger: (0, _modalHelpers.getModalTrigger)(state),
     modalOpen: state.getIn(['modal', 'isOpen']) === [_quizCommon.ADD_TO_BANK_MODAL, props.entryType, props.entryId].join(':')

package/lib/banks/components/AddToBankModal/presenter.js

@@ -9,6 +9,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = exports.AddToBankModal = void 0;
 
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
@@ -37,11 +41,36 @@ var _Bank = _interopRequireDefault(require("../../../common/records/Bank.js"));
 
 var _index = _interopRequireDefault(require("../../../common/components/resources/BankSelection/index.js"));
 
+var _uiSpinner = require("@instructure/ui-spinner");
+
+var _uiText = require("@instructure/ui-text");
+
+var _uiIcons = require("@instructure/ui-icons");
+
+var _uiView = require("@instructure/ui-view");
+
+var _uiFlex = require("@instructure/ui-flex");
+
 var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
 
 var _quizCommon = require("@instructure/quiz-common");
 
-var _ref = /*#__PURE__*/_react.default.createElement("br", null);
+var _ref2 = /*#__PURE__*/_react.default.createElement(_uiIcons.IconCheckLine, {
+  color: "success"
+});
+
+var _ref3 = /*#__PURE__*/_react.default.createElement(_uiFlex.Flex.Item, {
+  padding: "0 small 0 0"
+}, /*#__PURE__*/_react.default.createElement(_uiIcons.IconNoLine, {
+  color: "error",
+  size: "small"
+}));
+
+var _ref4 = /*#__PURE__*/_react.default.createElement(_uiIcons.IconWarningLine, {
+  color: "warning"
+});
+
+var _ref5 = /*#__PURE__*/_react.default.createElement("br", null);
 
 var AddToBankModal = /*#__PURE__*/function (_Component) {
   (0, _inherits2.default)(AddToBankModal, _Component);
@@ -60,6 +89,7 @@ var AddToBankModal = /*#__PURE__*/function (_Component) {
     _this = _super.call.apply(_super, [this].concat(args));
     _this.state = {
       bankType: 'existing',
+      contentShareable: 'loading',
       newBankTitle: ''
     };
 
@@ -124,6 +154,65 @@ var AddToBankModal = /*#__PURE__*/function (_Component) {
   }
 
   (0, _createClass2.default)(AddToBankModal, [{
+    key: "componentDidUpdate",
+    value: function componentDidUpdate(prevProps) {
+      var _this2 = this;
+
+      var _this$props = this.props,
+          canvasOrigin = _this$props.canvasOrigin,
+          checkBankedContentShareabilityEnabled = _this$props.checkBankedContentShareabilityEnabled,
+          modalOpen = _this$props.modalOpen,
+          checkContentShareability = _this$props.checkContentShareability,
+          workingEntry = _this$props.workingEntry;
+
+      if (checkBankedContentShareabilityEnabled && modalOpen && !prevProps.modalOpen) {
+        this.setState({
+          contentShareable: 'loading'
+        });
+        checkContentShareability(workingEntry, canvasOrigin).then(function () {
+          _this2.setState({
+            contentShareable: 'true'
+          });
+        }).catch( /*#__PURE__*/function () {
+          var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(err) {
+            var _err$response, _err$response2;
+
+            var body;
+            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;
+
+                    if (((_err$response2 = err.response) === null || _err$response2 === void 0 ? void 0 : _err$response2.status) === 400 && body.shareable === false) {
+                      _this2.setState({
+                        contentShareable: 'false'
+                      });
+                    } else {
+                      _this2.setState({
+                        contentShareable: 'unknown'
+                      });
+                    }
+
+                  case 4:
+                  case "end":
+                    return _context.stop();
+                }
+              }
+            }, _callee);
+          }));
+
+          return function (_x) {
+            return _ref.apply(this, arguments);
+          };
+        }());
+      }
+    }
+  }, {
     key: "cancelButton",
     value: function cancelButton() {
       return /*#__PURE__*/_react.default.createElement(_uiButtons.Button, {
@@ -136,8 +225,11 @@ var AddToBankModal = /*#__PURE__*/function (_Component) {
     value: function addToBankButton() {
       var _this$state = this.state,
           bankType = _this$state.bankType,
-          newBankTitle = _this$state.newBankTitle;
-      var disabled = bankType === 'existing' && !this.props.selectedBank || bankType === 'new' && (!newBankTitle || !newBankTitle.trim());
+          newBankTitle = _this$state.newBankTitle,
+          contentShareable = _this$state.contentShareable;
+      var checkBankedContentShareabilityEnabled = this.props.checkBankedContentShareabilityEnabled;
+      var contentShareableLoading = contentShareable === 'loading';
+      var disabled = bankType === 'existing' && !this.props.selectedBank || bankType === 'new' && (!newBankTitle || !newBankTitle.trim()) || checkBankedContentShareabilityEnabled && contentShareableLoading;
       return /*#__PURE__*/_react.default.createElement(_uiButtons.Button, {
         type: "button",
         variant: "primary",
@@ -145,7 +237,7 @@ var AddToBankModal = /*#__PURE__*/function (_Component) {
         disabled: disabled,
         margin: _quizCommon.XSMALL_SIDE_MARGIN,
         "data-automation": "sdk-add-to-bank-button"
-      }, (0, _formatMessage.default)('Add'));
+      }, checkBankedContentShareabilityEnabled && !contentShareableLoading && contentShareable !== 'true' ? (0, _formatMessage.default)('Add anyway') : (0, _formatMessage.default)('Add'));
     }
   }, {
     key: "renderBankTypeContent",
@@ -165,6 +257,37 @@ var AddToBankModal = /*#__PURE__*/function (_Component) {
         type: "text"
       });
     }
+  }, {
+    key: "renderContentShareabilityMessage",
+    value: function renderContentShareabilityMessage() {
+      if (this.props.checkBankedContentShareabilityEnabled) {
+        var content = null;
+
+        if (this.state.contentShareable === 'loading') {
+          content = /*#__PURE__*/_react.default.createElement(_uiText.Text, null, /*#__PURE__*/_react.default.createElement(_uiSpinner.Spinner, {
+            size: "x-small",
+            renderTitle: (0, _formatMessage.default)('Checking content shareability...')
+          }), "\xA0", (0, _formatMessage.default)('Validating content...'));
+        } else if (this.state.contentShareable === 'true') {
+          content = /*#__PURE__*/_react.default.createElement(_uiText.Text, null, _ref2, "\xA0", (0, _formatMessage.default)('Good to go!'));
+        } else if (this.state.contentShareable === 'false') {
+          content = /*#__PURE__*/_react.default.createElement(_uiFlex.Flex, null, _ref3, /*#__PURE__*/_react.default.createElement(_uiFlex.Flex.Item, {
+            shouldShrink: true
+          }, /*#__PURE__*/_react.default.createElement(_uiText.Text, {
+            color: "error"
+          }, (0, _formatMessage.default)('You are attempting to add content containing course links which may not work when used in other courses.'))));
+        } else {
+          content = /*#__PURE__*/_react.default.createElement(_uiText.Text, {
+            color: "warning"
+          }, _ref4, "\xA0", (0, _formatMessage.default)('There was an error attempting to validate shareability.'));
+        }
+
+        return /*#__PURE__*/_react.default.createElement(_uiView.View, {
+          as: "div",
+          margin: "small 0 0 0"
+        }, content);
+      }
+    }
   }, {
     key: "renderContent",
     value: function renderContent() {
@@ -179,7 +302,7 @@ var AddToBankModal = /*#__PURE__*/function (_Component) {
       }), /*#__PURE__*/_react.default.createElement(_uiRadioInput.RadioInput, {
         value: "new",
         label: (0, _formatMessage.default)('New item bank')
-      })), _ref, this.renderBankTypeContent());
+      })), _ref5, this.renderBankTypeContent(), this.renderContentShareabilityMessage());
     }
   }, {
     key: "render",
@@ -207,6 +330,9 @@ var AddToBankModal = /*#__PURE__*/function (_Component) {
 
 exports.AddToBankModal = AddToBankModal;
 AddToBankModal.propTypes = {
+  canvasOrigin: _propTypes.default.string,
+  checkBankedContentShareabilityEnabled: _propTypes.default.bool,
+  checkContentShareability: _propTypes.default.func.isRequired,
   closeModal: _propTypes.default.func.isRequired,
   createBank: _propTypes.default.func.isRequired,
   createBankEntry: _propTypes.default.func.isRequired,
@@ -218,15 +344,18 @@ AddToBankModal.propTypes = {
   entryType: _propTypes.default.string.isRequired,
   // Resolve to the bank entry's entry, or create it if it does not yet exist.
   getEntry: _propTypes.default.func.isRequired,
+  handleValidationErrorsFromApi: _propTypes.default.func.isRequired,
   label: _propTypes.default.string.isRequired,
   modalOpen: _propTypes.default.bool.isRequired,
   onAdd: _propTypes.default.func,
   onContinue: _propTypes.default.func,
   selectedBank: _reactImmutableProptypes.default.record,
   uiSet: _propTypes.default.func.isRequired,
-  handleValidationErrorsFromApi: _propTypes.default.func.isRequired
+  workingEntry: _reactImmutableProptypes.default.record.isRequired
 };
 AddToBankModal.defaultProps = {
+  canvasOrigin: '',
+  checkBankedContentShareabilityEnabled: false,
   onAdd: function onAdd() {},
   onContinue: function onContinue() {},
   selectedBank: null

package/lib/banks/components/BankEntry/presenter.js

@@ -245,17 +245,18 @@ var BankEntry = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _de
       return {
         cancelHandler: _this.navigateToBank,
         clearChanges: _this.clearChanges,
+        clearValidationErrorsFromApi: _this.clearValidationErrorsFromApi,
         contextUuid: null,
+        disableSubmit: Boolean(_this.state.validationErrorsFromApi && Object.values(_this.state.validationErrorsFromApi).length),
         entry: entry,
         guid: "".concat(_this.props.bankEntry.id, "_bank_entry_edit"),
         handleQuizEntryPointsChange: _this.handlePointsChange,
         parentId: _this.props.bankId,
         parentType: _quizCommon.PARENT_TYPE_BANK,
+        shouldValidateShareableContent: true,
         stimulus: entry,
         submitHandler: _this.submitHandler,
-        validationErrorsFromApi: _this.state.validationErrorsFromApi,
-        clearValidationErrorsFromApi: _this.clearValidationErrorsFromApi,
-        disableSubmit: Boolean(_this.state.validationErrorsFromApi && Object.values(_this.state.validationErrorsFromApi).length)
+        validationErrorsFromApi: _this.state.validationErrorsFromApi
       };
     };
 

package/lib/building/api/items.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getItem = getItem;
+exports.checkItemShareability = checkItemShareability;
 exports.createItem = createItem;
 exports.updateItem = updateItem;
 
@@ -50,6 +51,20 @@ function getItem(itemId) {
   };
 }
 
+function checkItemShareability(item, canvasOrigin) {
+  var url = '/api/items/check_shareability';
+  var requestBody = JSON.stringify({
+    item: updateItemParams(item),
+    source_origin: canvasOrigin
+  });
+  var fetcher = new _Fetcher.default({
+    onError: function onError() {}
+  });
+  return fetcher.post(url, {
+    body: requestBody
+  });
+}
+
 function createItem(item, parentId, parentType) {
   var parentItemId = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : null;
   var resource = parentType === 'bank' ? 'banks' : 'quizzes';
@@ -157,10 +172,8 @@ function createItem(item, parentId, parentType) {
 // =====================
 
 
-function updateItem(item, parentId, parentType) {
-  var resource = parentType === 'bank' ? 'banks' : 'quizzes';
-  var url = "/api/".concat(resource, "/").concat(parentId, "/items/").concat(item.id);
-  var itemData = {
+function updateItemParams(item) {
+  return {
     item_body: item.itemBody,
     title: item.title,
     scoring_data: item.scoringData,
@@ -172,8 +185,13 @@ function updateItem(item, parentId, parentType) {
     calculator_type: item.calculatorType,
     answer_feedback: item.answerFeedback
   };
+}
+
+function updateItem(item, parentId, parentType) {
+  var resource = parentType === 'bank' ? 'banks' : 'quizzes';
+  var url = "/api/".concat(resource, "/").concat(parentId, "/items/").concat(item.id);
   var reqBody = JSON.stringify({
-    item: itemData
+    item: updateItemParams(item)
   });
   return function (dispatch, getState) {
     var updateItemParams = {

package/lib/building/api/stimuli.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.createStimulus = createStimulus;
 exports.updateStimulus = updateStimulus;
+exports.checkStimulusShareability = checkStimulusShareability;
 
 var _quizCommon = require("@instructure/quiz-common");
 
@@ -61,18 +62,21 @@ function createStimulus(stimulus, parentId, parentType) {
 // =====================
 
 
-function updateStimulus(stimulus, parentId, parentType) {
-  var resource = parentType === 'bank' ? 'banks' : 'quizzes';
-  var url = "/api/".concat(resource, "/").concat(parentId, "/stimuli/").concat(stimulus.id);
-  var stimulusData = {
+function updateStimulusParams(stimulus) {
+  return {
     orientation: stimulus.orientation,
     title: stimulus.title,
     instructions: stimulus.instructions,
     body: stimulus.body,
     source_url: stimulus.sourceUrl
   };
+}
+
+function updateStimulus(stimulus, parentId, parentType) {
+  var resource = parentType === 'bank' ? 'banks' : 'quizzes';
+  var url = "/api/".concat(resource, "/").concat(parentId, "/stimuli/").concat(stimulus.id);
   var reqBody = JSON.stringify({
-    stimulus: stimulusData
+    stimulus: updateStimulusParams(stimulus)
   });
   return function (dispatch, getState) {
     var updateStimulusParams = {
@@ -89,4 +93,18 @@ function updateStimulus(stimulus, parentId, parentType) {
       return stimulusData;
     });
   };
+}
+
+function checkStimulusShareability(stimulus, canvasOrigin) {
+  var url = '/api/stimuli/check_shareability';
+  var requestBody = JSON.stringify({
+    stimulus: updateStimulusParams(stimulus),
+    source_origin: canvasOrigin
+  });
+  var fetcher = new _Fetcher.default({
+    onError: function onError() {}
+  });
+  return fetcher.post(url, {
+    body: requestBody
+  });
 }

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

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

package/lib/common/actions/config.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.setAPIEndpoint = setAPIEndpoint;
 exports.setUserToken = setUserToken;
+exports.setCanvasOrigin = setCanvasOrigin;
 
 var _quizCommon = require("@instructure/quiz-common");
 
@@ -20,4 +21,11 @@ function setUserToken(token) {
     type: _quizCommon.SET_USER_TOKEN,
     payload: token
   };
+}
+
+function setCanvasOrigin(canvasHost) {
+  return {
+    type: _quizCommon.SET_CANVAS_ORIGIN,
+    payload: canvasHost
+  };
 }

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

@@ -105,7 +105,7 @@ var ConfirmationModal = /*#__PURE__*/function (_Component) {
         as: "h2",
         "data-automation": "sdk-confirmation-modal-heading"
       }, title || (0, _formatMessage.default)('Confirm')), /*#__PURE__*/_react.default.createElement(_uiButtons.CloseButton, {
-        onClick: this.props.closeModal,
+        onClick: this.cancelAction,
         placement: "end",
         offset: "medium",
         screenReaderLabel: (0, _formatMessage.default)('Close')

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

@@ -108,7 +108,9 @@ var SDKApp = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _dec(_
   }, {
     key: "componentWillMount",
     value: function componentWillMount() {
-      this.store.dispatch([(0, _config.setAPIEndpoint)(this.props.apiEndpoint), this.setAppContainer(this.props.appContainer), (0, _config.setUserToken)(this.props.userToken), (0, _outcomes.setOutcomesEndpoint)(this.props.outcomesEndpoint), (0, _outcomes.setOutcomesToken)(this.props.outcomesToken), (0, _outcomes.setContextUuid)(this.props.contextUuid)]);
+      var _this$props$rceConfig;
+
+      this.store.dispatch([(0, _config.setAPIEndpoint)(this.props.apiEndpoint), (0, _config.setCanvasOrigin)((_this$props$rceConfig = this.props.rceConfig) === null || _this$props$rceConfig === void 0 ? void 0 : _this$props$rceConfig.canvasOrigin), this.setAppContainer(this.props.appContainer), (0, _config.setUserToken)(this.props.userToken), (0, _outcomes.setOutcomesEndpoint)(this.props.outcomesEndpoint), (0, _outcomes.setOutcomesToken)(this.props.outcomesToken), (0, _outcomes.setContextUuid)(this.props.contextUuid)]);
       this.store.dispatch((0, _features.getFeatures)());
 
       if (this.props.itemBankSharingEnabled) {
@@ -125,10 +127,16 @@ var SDKApp = (_dec = (0, _uiThemeable.themeable)(_theme.default, styles), _dec(_
   }, {
     key: "componentWillReceiveProps",
     value: function componentWillReceiveProps(newProps) {
+      var _newProps$rceConfig, _this$props$rceConfig2;
+
       if (newProps.apiEndpoint !== this.props.apiEndpoint) {
         this.store.dispatch((0, _config.setAPIEndpoint)(newProps.apiEndpoint));
       }
 
+      if (((_newProps$rceConfig = newProps.rceConfig) === null || _newProps$rceConfig === void 0 ? void 0 : _newProps$rceConfig.canvasOrigin) !== ((_this$props$rceConfig2 = this.props.rceConfig) === null || _this$props$rceConfig2 === void 0 ? void 0 : _this$props$rceConfig2.canvasOrigin)) {
+        this.store.dispatch((0, _config.setCanvasOrigin)(newProps.rceConfig.canvasOrigin));
+      }
+
       if (newProps.appContainer !== this.props.appContainer) {
         this.store.dispatch(this.setAppContainer(newProps.appContainer));
       }

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

@@ -5,10 +5,15 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.mapStateToProps = mapStateToProps;
 exports.default = void 0;
 
 var _reactRedux = require("../../../../react-redux.js");
 
+var _items = require("../../../../../building/api/items.js");
+
+var _stimuli = require("../../../../../building/api/stimuli.js");
+
 var _makeEditable = _interopRequireDefault(require("../../../shared/functionality/makeEditable.js"));
 
 var _errorsShowing = require("../../../../actions/errorsShowing.js");
@@ -17,6 +22,10 @@ var _alerts = require("../../../../actions/alerts.js");
 
 var _modifications = require("../../../../actions/modifications.js");
 
+var _modal = require("../../../../actions/modal.js");
+
+var _featureCheck = require("../../../../util/featureCheck.js");
+
 var _presenter = _interopRequireDefault(require("./presenter.js"));
 
 function mapStateToProps(state, props) {
@@ -24,15 +33,19 @@ function mapStateToProps(state, props) {
   var workingEntry = props.entry.getWorkingInstance();
   var isValid = props.isValid !== void 0 ? props.isValid : workingEntry.isValid();
   return {
+    canvasOrigin: state.getIn(['config', 'canvasOrigin']),
+    checkBankedContentShareabilityEnabled: (0, _featureCheck.featureOn)('check_banked_content_shareability'),
+    checkContentShareability: props.entry.isStimulus ? _stimuli.checkStimulusShareability : _items.checkItemShareability,
     isValid: isValid
   };
 }
 
 var mapDispatchToProps = {
   clearNextQuizEntry: _modifications.clearNextQuizEntry,
-  showError: _errorsShowing.showError,
   hideError: _errorsShowing.hideError,
-  screenreaderNotification: _alerts.screenreaderNotification
+  screenreaderNotification: _alerts.screenreaderNotification,
+  showError: _errorsShowing.showError,
+  withConfirm: _modal.withConfirm
 };
 
 var _default = (0, _makeEditable.default)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(_presenter.default));