@instructure/quiz-core 17.46.2-rc.7 → 17.47.0

package/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [17.47.0](https://gerrit.instructure.com/quizzes-ui/compare/v17.46.1...v17.47.0) (2023-01-30)
+
+
+### Bug Fixes
+
+* **submissionUpdate:** include percentage in post submissionUpdate message ([626af1e](https://gerrit.instructure.com/quizzes-ui/commits/626af1e04e57fc9ca7cc8a135f12d3c9e08bd201))
+
+
+### Features
+
+* **RCE5:** check for course links in bank content ([6f637ee](https://gerrit.instructure.com/quizzes-ui/commits/6f637eeea7510a882f6fef1c8ecb4924d3157b0e))
+
+
+
+
+
 ## [17.46.1](https://gerrit.instructure.com/quizzes-ui/compare/v17.46.0...v17.46.1) (2023-01-10)
 
 **Note:** Version bump only for package @instructure/quiz-core

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

@@ -1,6 +1,8 @@
 import { connect } from "../../../common/react-redux.js";
 import { createBank } from "../../api/banks.js";
 import { createBankEntry } from "../../api/bankEntries.js";
+import { checkItemShareability } from "../../../building/api/items.js";
+import { checkStimulusShareability } from "../../../building/api/stimuli.js";
 import AddToBankModal from "./presenter.js";
 import * as modalActions from "../../../common/actions/modal.js";
 import { disassociateEntry } from "../../../common/actions/banks.js";
@@ -8,10 +10,14 @@ import * as uiActions from "../../../common/actions/ui.js";
 import Bank from "../../../common/records/Bank.js";
 import { ADD_TO_BANK_MODAL_BANK_SELECTION, ADD_TO_BANK_MODAL } from '@instructure/quiz-common';
 import { getModalTrigger } from "../../../common/util/modalHelpers.js";
+import { featureOn } from "../../../common/util/featureCheck.js";
 export function mapStateToProps(state, props) {
   var selectedBankOption = state.getIn(['ui', ADD_TO_BANK_MODAL_BANK_SELECTION]);
   var selectedBank = selectedBankOption && new Bank(state.getIn(['banks', selectedBankOption]));
   return {
+    canvasOrigin: state.getIn(['config', 'canvasOrigin']),
+    checkBankedContentShareabilityEnabled: featureOn('check_banked_content_shareability'),
+    checkContentShareability: props.entryType === 'Item' ? checkItemShareability : checkStimulusShareability,
     selectedBank: selectedBank,
     modalTrigger: getModalTrigger(state),
     modalOpen: state.getIn(['modal', 'isOpen']) === [ADD_TO_BANK_MODAL, props.entryType, props.entryId].join(':')

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

@@ -1,3 +1,5 @@
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _inherits from "@babel/runtime/helpers/esm/inherits";
@@ -12,10 +14,30 @@ import { RadioInputGroup, RadioInput } from '@instructure/ui-radio-input';
 import { ScreenReaderContent } from '@instructure/ui-a11y-content';
 import Bank from "../../../common/records/Bank.js";
 import BankSelection from "../../../common/components/resources/BankSelection/index.js";
+import { Spinner } from '@instructure/ui-spinner';
+import { Text } from '@instructure/ui-text';
+import { IconCheckLine, IconNoLine, IconWarningLine } from '@instructure/ui-icons';
+import { View } from '@instructure/ui-view';
+import { Flex } from '@instructure/ui-flex';
 import t from '@instructure/quiz-i18n/es/format-message';
 import { Modal, ModalHeader, ModalBody, ModalFooter, ADD_TO_BANK_MODAL_BANK_SELECTION, XSMALL_SIDE_MARGIN } from '@instructure/quiz-common';
 
-var _ref = /*#__PURE__*/React.createElement("br", null);
+var _ref2 = /*#__PURE__*/React.createElement(IconCheckLine, {
+  color: "success"
+});
+
+var _ref3 = /*#__PURE__*/React.createElement(Flex.Item, {
+  padding: "0 small 0 0"
+}, /*#__PURE__*/React.createElement(IconNoLine, {
+  color: "error",
+  size: "small"
+}));
+
+var _ref4 = /*#__PURE__*/React.createElement(IconWarningLine, {
+  color: "warning"
+});
+
+var _ref5 = /*#__PURE__*/React.createElement("br", null);
 
 export var AddToBankModal = /*#__PURE__*/function (_Component) {
   _inherits(AddToBankModal, _Component);
@@ -34,6 +56,7 @@ export var AddToBankModal = /*#__PURE__*/function (_Component) {
     _this = _super.call.apply(_super, [this].concat(args));
     _this.state = {
       bankType: 'existing',
+      contentShareable: 'loading',
       newBankTitle: ''
     };
 
@@ -98,6 +121,65 @@ export var AddToBankModal = /*#__PURE__*/function (_Component) {
   }
 
   _createClass(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 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(err) {
+            var _err$response, _err$response2;
+
+            var body;
+            return _regeneratorRuntime.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.createElement(Button, {
@@ -110,8 +192,11 @@ export 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.createElement(Button, {
         type: "button",
         variant: "primary",
@@ -119,7 +204,7 @@ export var AddToBankModal = /*#__PURE__*/function (_Component) {
         disabled: disabled,
         margin: XSMALL_SIDE_MARGIN,
         "data-automation": "sdk-add-to-bank-button"
-      }, t('Add'));
+      }, checkBankedContentShareabilityEnabled && !contentShareableLoading && contentShareable !== 'true' ? t('Add anyway') : t('Add'));
     }
   }, {
     key: "renderBankTypeContent",
@@ -139,6 +224,37 @@ export 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.createElement(Text, null, /*#__PURE__*/React.createElement(Spinner, {
+            size: "x-small",
+            renderTitle: t('Checking content shareability...')
+          }), "\xA0", t('Validating content...'));
+        } else if (this.state.contentShareable === 'true') {
+          content = /*#__PURE__*/React.createElement(Text, null, _ref2, "\xA0", t('Good to go!'));
+        } else if (this.state.contentShareable === 'false') {
+          content = /*#__PURE__*/React.createElement(Flex, null, _ref3, /*#__PURE__*/React.createElement(Flex.Item, {
+            shouldShrink: true
+          }, /*#__PURE__*/React.createElement(Text, {
+            color: "error"
+          }, t('You are attempting to add content containing course links which may not work when used in other courses.'))));
+        } else {
+          content = /*#__PURE__*/React.createElement(Text, {
+            color: "warning"
+          }, _ref4, "\xA0", t('There was an error attempting to validate shareability.'));
+        }
+
+        return /*#__PURE__*/React.createElement(View, {
+          as: "div",
+          margin: "small 0 0 0"
+        }, content);
+      }
+    }
   }, {
     key: "renderContent",
     value: function renderContent() {
@@ -153,7 +269,7 @@ export var AddToBankModal = /*#__PURE__*/function (_Component) {
       }), /*#__PURE__*/React.createElement(RadioInput, {
         value: "new",
         label: t('New item bank')
-      })), _ref, this.renderBankTypeContent());
+      })), _ref5, this.renderBankTypeContent(), this.renderContentShareabilityMessage());
     }
   }, {
     key: "render",
@@ -180,6 +296,9 @@ export var AddToBankModal = /*#__PURE__*/function (_Component) {
   return AddToBankModal;
 }(Component);
 AddToBankModal.propTypes = {
+  canvasOrigin: PropTypes.string,
+  checkBankedContentShareabilityEnabled: PropTypes.bool,
+  checkContentShareability: PropTypes.func.isRequired,
   closeModal: PropTypes.func.isRequired,
   createBank: PropTypes.func.isRequired,
   createBankEntry: PropTypes.func.isRequired,
@@ -191,15 +310,18 @@ AddToBankModal.propTypes = {
   entryType: PropTypes.string.isRequired,
   // Resolve to the bank entry's entry, or create it if it does not yet exist.
   getEntry: PropTypes.func.isRequired,
+  handleValidationErrorsFromApi: PropTypes.func.isRequired,
   label: PropTypes.string.isRequired,
   modalOpen: PropTypes.bool.isRequired,
   onAdd: PropTypes.func,
   onContinue: PropTypes.func,
   selectedBank: ImmutablePropTypes.record,
   uiSet: PropTypes.func.isRequired,
-  handleValidationErrorsFromApi: PropTypes.func.isRequired
+  workingEntry: ImmutablePropTypes.record.isRequired
 };
 AddToBankModal.defaultProps = {
+  canvasOrigin: '',
+  checkBankedContentShareabilityEnabled: false,
   onAdd: function onAdd() {},
   onContinue: function onContinue() {},
   selectedBank: null

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

@@ -193,17 +193,18 @@ export var BankEntry = (_dec = themeable(theme, styles), _dec(_class = (_temp =
       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: 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/es/building/api/items.js

@@ -29,6 +29,19 @@ export function getItem(itemId) {
     });
   };
 }
+export function checkItemShareability(item, canvasOrigin) {
+  var url = '/api/items/check_shareability';
+  var requestBody = JSON.stringify({
+    item: updateItemParams(item),
+    source_origin: canvasOrigin
+  });
+  var fetcher = new Fetcher({
+    onError: function onError() {}
+  });
+  return fetcher.post(url, {
+    body: requestBody
+  });
+}
 export function createItem(item, parentId, parentType) {
   var parentItemId = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : null;
   var resource = parentType === 'bank' ? 'banks' : 'quizzes';
@@ -135,10 +148,8 @@ export function createItem(item, parentId, parentType) {
 // =====================
 // =====================
 
-export 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,
@@ -150,8 +161,13 @@ export function updateItem(item, parentId, parentType) {
     calculator_type: item.calculatorType,
     answer_feedback: item.answerFeedback
   };
+}
+
+export 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/es/building/api/stimuli.js

@@ -45,18 +45,21 @@ export function createStimulus(stimulus, parentId, parentType) {
 // =====================
 // =====================
 
-export 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
   };
+}
+
+export 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 = {
@@ -73,4 +76,17 @@ export function updateStimulus(stimulus, parentId, parentType) {
       return stimulusData;
     });
   };
+}
+export function checkStimulusShareability(stimulus, canvasOrigin) {
+  var url = '/api/stimuli/check_shareability';
+  var requestBody = JSON.stringify({
+    stimulus: updateStimulusParams(stimulus),
+    source_origin: canvasOrigin
+  });
+  var fetcher = new Fetcher({
+    onError: function onError() {}
+  });
+  return fetcher.post(url, {
+    body: requestBody
+  });
 }

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

@@ -390,6 +390,7 @@ var QuizEntryEdit = (_dec = themeable(theme, styles), _dec(_class = (_temp = _cl
         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/es/common/actions/config.js

@@ -1,4 +1,4 @@
-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';
 export function setAPIEndpoint(endpoint) {
   return {
     type: SET_API_ENDPOINT,
@@ -10,4 +10,10 @@ export function setUserToken(token) {
     type: SET_USER_TOKEN,
     payload: token
   };
+}
+export function setCanvasOrigin(canvasHost) {
+  return {
+    type: SET_CANVAS_ORIGIN,
+    payload: canvasHost
+  };
 }

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

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

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

@@ -19,7 +19,7 @@ import store from "../../../reduxStore.js";
 import { getLocale } from '@instructure/quiz-common';
 import { getFeatures } from "../../api/features.js";
 import { set } from "../../actions/ui.js";
-import { setAPIEndpoint, setUserToken } from "../../actions/config.js";
+import { setAPIEndpoint, setCanvasOrigin, setUserToken } from "../../actions/config.js";
 import { setContextUuid, setOutcomesEndpoint, setOutcomesToken } from "../../actions/outcomes.js";
 import { addFeatures, removeFeatures } from "../../actions/features.js";
 import renderAlerts from "../../util/renderAlerts.js";
@@ -78,7 +78,9 @@ export var SDKApp = (_dec = themeable(theme, styles), _dec(_class = (_temp = _cl
   }, {
     key: "componentWillMount",
     value: function componentWillMount() {
-      this.store.dispatch([setAPIEndpoint(this.props.apiEndpoint), this.setAppContainer(this.props.appContainer), setUserToken(this.props.userToken), setOutcomesEndpoint(this.props.outcomesEndpoint), setOutcomesToken(this.props.outcomesToken), setContextUuid(this.props.contextUuid)]);
+      var _this$props$rceConfig;
+
+      this.store.dispatch([setAPIEndpoint(this.props.apiEndpoint), setCanvasOrigin((_this$props$rceConfig = this.props.rceConfig) === null || _this$props$rceConfig === void 0 ? void 0 : _this$props$rceConfig.canvasOrigin), this.setAppContainer(this.props.appContainer), setUserToken(this.props.userToken), setOutcomesEndpoint(this.props.outcomesEndpoint), setOutcomesToken(this.props.outcomesToken), setContextUuid(this.props.contextUuid)]);
       this.store.dispatch(getFeatures());
 
       if (this.props.itemBankSharingEnabled) {
@@ -95,10 +97,16 @@ export var SDKApp = (_dec = themeable(theme, styles), _dec(_class = (_temp = _cl
   }, {
     key: "componentWillReceiveProps",
     value: function componentWillReceiveProps(newProps) {
+      var _newProps$rceConfig, _this$props$rceConfig2;
+
       if (newProps.apiEndpoint !== this.props.apiEndpoint) {
         this.store.dispatch(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(setCanvasOrigin(newProps.rceConfig.canvasOrigin));
+      }
+
       if (newProps.appContainer !== this.props.appContainer) {
         this.store.dispatch(this.setAppContainer(newProps.appContainer));
       }

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

@@ -1,23 +1,29 @@
 import { connect } from "../../../../react-redux.js";
+import { checkItemShareability } from "../../../../../building/api/items.js";
+import { checkStimulusShareability } from "../../../../../building/api/stimuli.js";
 import makeEditable from "../../../shared/functionality/makeEditable.js";
 import { showError, hideError } from "../../../../actions/errorsShowing.js";
 import { screenreaderNotification } from "../../../../actions/alerts.js";
 import { clearNextQuizEntry } from "../../../../actions/modifications.js";
+import { withConfirm } from "../../../../actions/modal.js";
+import { featureOn } from "../../../../util/featureCheck.js";
 import EntrySave from "./presenter.js";
-
-function mapStateToProps(state, props) {
+export function mapStateToProps(state, props) {
   // Error Related:
   var workingEntry = props.entry.getWorkingInstance();
   var isValid = props.isValid !== void 0 ? props.isValid : workingEntry.isValid();
   return {
+    canvasOrigin: state.getIn(['config', 'canvasOrigin']),
+    checkBankedContentShareabilityEnabled: featureOn('check_banked_content_shareability'),
+    checkContentShareability: props.entry.isStimulus ? checkStimulusShareability : checkItemShareability,
     isValid: isValid
   };
 }
-
 var mapDispatchToProps = {
   clearNextQuizEntry: clearNextQuizEntry,
-  showError: showError,
   hideError: hideError,
-  screenreaderNotification: screenreaderNotification
+  screenreaderNotification: screenreaderNotification,
+  showError: showError,
+  withConfirm: withConfirm
 };
 export default makeEditable(connect(mapStateToProps, mapDispatchToProps)(EntrySave));