@pie-element/match 6.3.3-next.9 → 7.0.1-next.0

package/CHANGELOG.md

@@ -3,6 +3,29 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [7.0.0](https://github.com/pie-framework/pie-elements/compare/@pie-element/match@6.3.2...@pie-element/match@7.0.0) (2024-03-04)
+
+
+### Bug Fixes
+
+* **match:** adjust player to work with an author model PD-3499 ([130307b](https://github.com/pie-framework/pie-elements/commit/130307b7de9ea6e40f3b88170306faaeca3fc70e))
+* **match:** refactor player model structure PD-3499 ([95cfbbb](https://github.com/pie-framework/pie-elements/commit/95cfbbbce4030f8738f2c4f135135643627a1243))
+
+
+### Features
+
+* **match:** use model copy in PLAYER environments to reset model after set configuration PD-3509 ([9af9909](https://github.com/pie-framework/pie-elements/commit/9af9909cc83627d5ebce977a34283c890943979f))
+* update pie-lib/pie-toolbox version PD-1870 and PD-3501 ([8df1d8d](https://github.com/pie-framework/pie-elements/commit/8df1d8d281a0d6023d5a9c0e6fdd29fea71b6ac1))
+
+
+### BREAKING CHANGES
+
+* **match:** config object was removed from the player model and should no longer be used
+
+
+
+
+
 ## [6.3.2](https://github.com/pie-framework/pie-elements/compare/@pie-element/match@6.3.1...@pie-element/match@6.3.2) (2024-02-20)
 
 

package/configure/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [6.4.0](https://github.com/pie-framework/pie-elements/compare/@pie-element/match-configure@6.3.2...@pie-element/match-configure@6.4.0) (2024-03-04)
+
+
+### Features
+
+* **match:** use model copy in PLAYER environments to reset model after set configuration PD-3509 ([9af9909](https://github.com/pie-framework/pie-elements/commit/9af9909cc83627d5ebce977a34283c890943979f))
+* update pie-lib/pie-toolbox version PD-1870 and PD-3501 ([8df1d8d](https://github.com/pie-framework/pie-elements/commit/8df1d8d281a0d6023d5a9c0e6fdd29fea71b6ac1))
+
+
+
+
+
 ## [6.3.2](https://github.com/pie-framework/pie-elements/compare/@pie-element/match-configure@6.3.1...@pie-element/match-configure@6.3.2) (2024-02-20)
 
 

package/configure/lib/index.js

@@ -11,6 +11,8 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/cl
 
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 
+var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
+
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
@@ -33,6 +35,8 @@ var _debug = _interopRequireDefault(require("debug"));
 
 var _defaults = _interopRequireDefault(require("./defaults"));
 
+var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -53,8 +57,26 @@ var MatchConfigure = /*#__PURE__*/function (_HTMLElement) {
 
     (0, _classCallCheck2["default"])(this, MatchConfigure);
     _this = _super.call(this);
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "resetModelAfterConfigurationIsSet", function () {
+      if (_this.hasPlayerAsParent) {
+        if (_this._modelCopy) {
+          _this._model = _this._modelCopy;
+        } else {
+          delete _this._modelCopy;
+        }
+      }
+    });
     _this._model = MatchConfigure.createDefaultModel();
-    _this._configuration = _defaults["default"].configuration;
+    _this._configuration = _defaults["default"].configuration; // In environments that use pie-player-components, model is set before configuration.
+    // This is the reason why sometimes the model gets altered non-reversible
+    // (altered using default configuration instead of client configuration, because at that point client configuration was not set yet)
+    // Therefore, in such environments, we will make sure to keep a modelCopy (initialised in set model) and use it to reset
+    // the model in set configuration (resetModelAfterConfigurationIsSet) if set configuration is ever called
+
+    var pieAuthors = document.querySelectorAll('pie-author');
+    _this.hasPlayerAsParent = Array.from(pieAuthors).some(function (author) {
+      return author.contains((0, _assertThisInitialized2["default"])(_this));
+    });
     return _this;
   }
 
@@ -62,6 +84,7 @@ var MatchConfigure = /*#__PURE__*/function (_HTMLElement) {
     key: "model",
     set: function set(m) {
       this._model = MatchConfigure.createDefaultModel(m);
+      this._modelCopy = (0, _cloneDeep["default"])(this._model);
 
       this._render();
     }
@@ -73,7 +96,8 @@ var MatchConfigure = /*#__PURE__*/function (_HTMLElement) {
 
       var newConfiguration = _objectSpread(_objectSpread({}, _defaults["default"].configuration), c);
 
-      this._configuration = newConfiguration; // if language:enabled is true, then the corresponding default item model should include a language value;
+      this._configuration = newConfiguration;
+      this.resetModelAfterConfigurationIsSet(); // if language:enabled is true, then the corresponding default item model should include a language value;
       // if it is false, then the language field should be omitted from the item model.
       // if a default item model includes a language value (e.g., en_US) and the corresponding authoring view settings have language:settings = true,
       // then (a) language:enabled should also be true, and (b) that default language value should be represented in languageChoices[] (as a key).

package/configure/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.js"],"names":["log","MatchConfigure","_model","createDefaultModel","_configuration","defaultValues","configuration","m","_render","c","newConfiguration","language","enabled","languageChoices","options","length","value","settings","find","option","push","label","model","dispatchEvent","ModelUpdatedEvent","config","handler","InsertImageEvent","src","done","DeleteImageEvent","InsertSoundEvent","DeleteSoundEvent","el","React","createElement","Configure","onModelChanged","bind","onConfigurationChanged","imageSupport","add","insertImage","onDeleteImage","uploadSoundSupport","insertSound","onDeleteSound","ReactDOM","render","HTMLElement"],"mappings":"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","sourcesContent":["import React from 'react';\nimport ReactDOM from 'react-dom';\nimport Configure from './configure';\nimport {\n  ModelUpdatedEvent,\n  DeleteImageEvent,\n  InsertImageEvent,\n  InsertSoundEvent,\n  DeleteSoundEvent,\n} from '@pie-framework/pie-configure-events';\nimport debug from 'debug';\nimport defaultValues from './defaults';\n\nconst log = debug('pie-elements:match:configure');\n\nexport default class MatchConfigure extends HTMLElement {\n  static createDefaultModel = (model = {}) => ({\n    ...defaultValues.model,\n    ...model,\n  });\n\n  constructor() {\n    super();\n    this._model = MatchConfigure.createDefaultModel();\n    this._configuration = defaultValues.configuration;\n  }\n\n  set model(m) {\n    this._model = MatchConfigure.createDefaultModel(m);\n    this._render();\n  }\n\n  set configuration(c) {\n    const newConfiguration = {\n      ...defaultValues.configuration,\n      ...c,\n    };\n\n    this._configuration = newConfiguration;\n\n    // if language:enabled is true, then the corresponding default item model should include a language value;\n    // if it is false, then the language field should be omitted from the item model.\n    // if a default item model includes a language value (e.g., en_US) and the corresponding authoring view settings have language:settings = true,\n    // then (a) language:enabled should also be true, and (b) that default language value should be represented in languageChoices[] (as a key).\n    if (newConfiguration?.language?.enabled) {\n      if (newConfiguration?.languageChoices?.options?.length) {\n        this._model.language = newConfiguration?.languageChoices.options[0].value;\n      }\n    } else if (newConfiguration.language.settings && this._model.language) {\n      this._configuration.language.enabled = true;\n\n      if (!this._configuration.languageChoices.options || !this._configuration.languageChoices.options.length) {\n        this._configuration.languageChoices.options = [];\n      }\n\n      // check if the language is already included in the languageChoices.options array\n      // and if not, then add it.\n      if (!this._configuration.languageChoices.options.find(option => option.value === this._model.language)) {\n        this._configuration.languageChoices.options.push({\n          value: this._model.language,\n          label: this._model.language,\n        });\n      }\n    } else {\n      delete this._model.language;\n    }\n\n    this._render();\n  }\n\n  onModelChanged(model) {\n    this._model = model;\n    log('[onModelChanged]: ', this._model);\n    this._render();\n    this.dispatchEvent(new ModelUpdatedEvent(this._model));\n  }\n\n  onConfigurationChanged(config) {\n    this._configuration = config;\n    this._render();\n  }\n\n  /**\n   *\n   * @param {done, progress, file} handler\n   */\n  insertImage(handler) {\n    this.dispatchEvent(new InsertImageEvent(handler));\n  }\n\n  onDeleteImage(src, done) {\n    this.dispatchEvent(new DeleteImageEvent(src, done));\n  }\n\n  insertSound(handler) {\n    this.dispatchEvent(new InsertSoundEvent(handler));\n  }\n\n  onDeleteSound(src, done) {\n    this.dispatchEvent(new DeleteSoundEvent(src, done));\n  }\n\n  _render() {\n    if (this._model) {\n      const el = React.createElement(Configure, {\n        onModelChanged: this.onModelChanged.bind(this),\n        onConfigurationChanged: this.onConfigurationChanged.bind(this),\n        model: this._model,\n        configuration: this._configuration,\n        imageSupport: {\n          add: this.insertImage.bind(this),\n          delete: this.onDeleteImage.bind(this),\n        },\n        uploadSoundSupport: {\n          add: this.insertSound.bind(this),\n          delete: this.onDeleteSound.bind(this),\n        },\n      });\n      ReactDOM.render(el, this);\n    }\n  }\n}\n"],"file":"index.js"}
+{"version":3,"sources":["../src/index.js"],"names":["log","MatchConfigure","hasPlayerAsParent","_modelCopy","_model","createDefaultModel","_configuration","defaultValues","configuration","pieAuthors","document","querySelectorAll","Array","from","some","author","contains","m","_render","c","newConfiguration","resetModelAfterConfigurationIsSet","language","enabled","languageChoices","options","length","value","settings","find","option","push","label","model","dispatchEvent","ModelUpdatedEvent","config","handler","InsertImageEvent","src","done","DeleteImageEvent","InsertSoundEvent","DeleteSoundEvent","el","React","createElement","Configure","onModelChanged","bind","onConfigurationChanged","imageSupport","add","insertImage","onDeleteImage","uploadSoundSupport","insertSound","onDeleteSound","ReactDOM","render","HTMLElement"],"mappings":"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","sourcesContent":["import React from 'react';\nimport ReactDOM from 'react-dom';\nimport Configure from './configure';\nimport {\n  ModelUpdatedEvent,\n  DeleteImageEvent,\n  InsertImageEvent,\n  InsertSoundEvent,\n  DeleteSoundEvent,\n} from '@pie-framework/pie-configure-events';\nimport debug from 'debug';\nimport defaultValues from './defaults';\nimport cloneDeep from 'lodash/cloneDeep';\n\nconst log = debug('pie-elements:match:configure');\n\nexport default class MatchConfigure extends HTMLElement {\n  static createDefaultModel = (model = {}) => ({\n    ...defaultValues.model,\n    ...model,\n  });\n\n  constructor() {\n    super();\n    this._model = MatchConfigure.createDefaultModel();\n    this._configuration = defaultValues.configuration;\n\n    // In environments that use pie-player-components, model is set before configuration.\n    // This is the reason why sometimes the model gets altered non-reversible\n    // (altered using default configuration instead of client configuration, because at that point client configuration was not set yet)\n    // Therefore, in such environments, we will make sure to keep a modelCopy (initialised in set model) and use it to reset\n    // the model in set configuration (resetModelAfterConfigurationIsSet) if set configuration is ever called\n    const pieAuthors = document.querySelectorAll('pie-author');\n    this.hasPlayerAsParent = Array.from(pieAuthors).some((author) => author.contains(this));\n  }\n\n  set model(m) {\n    this._model = MatchConfigure.createDefaultModel(m);\n    this._modelCopy = cloneDeep(this._model);\n\n    this._render();\n  }\n\n  resetModelAfterConfigurationIsSet = () => {\n    if (this.hasPlayerAsParent) {\n      if (this._modelCopy) {\n        this._model = this._modelCopy;\n      } else {\n        delete this._modelCopy;\n      }\n    }\n  };\n\n  set configuration(c) {\n    const newConfiguration = {\n      ...defaultValues.configuration,\n      ...c,\n    };\n\n    this._configuration = newConfiguration;\n\n    this.resetModelAfterConfigurationIsSet();\n\n    // if language:enabled is true, then the corresponding default item model should include a language value;\n    // if it is false, then the language field should be omitted from the item model.\n    // if a default item model includes a language value (e.g., en_US) and the corresponding authoring view settings have language:settings = true,\n    // then (a) language:enabled should also be true, and (b) that default language value should be represented in languageChoices[] (as a key).\n    if (newConfiguration?.language?.enabled) {\n      if (newConfiguration?.languageChoices?.options?.length) {\n        this._model.language = newConfiguration?.languageChoices.options[0].value;\n      }\n    } else if (newConfiguration.language.settings && this._model.language) {\n      this._configuration.language.enabled = true;\n\n      if (!this._configuration.languageChoices.options || !this._configuration.languageChoices.options.length) {\n        this._configuration.languageChoices.options = [];\n      }\n\n      // check if the language is already included in the languageChoices.options array\n      // and if not, then add it.\n      if (!this._configuration.languageChoices.options.find((option) => option.value === this._model.language)) {\n        this._configuration.languageChoices.options.push({\n          value: this._model.language,\n          label: this._model.language,\n        });\n      }\n    } else {\n      delete this._model.language;\n    }\n\n    this._render();\n  }\n\n  onModelChanged(model) {\n    this._model = model;\n    log('[onModelChanged]: ', this._model);\n    this._render();\n    this.dispatchEvent(new ModelUpdatedEvent(this._model));\n  }\n\n  onConfigurationChanged(config) {\n    this._configuration = config;\n    this._render();\n  }\n\n  /**\n   *\n   * @param {done, progress, file} handler\n   */\n  insertImage(handler) {\n    this.dispatchEvent(new InsertImageEvent(handler));\n  }\n\n  onDeleteImage(src, done) {\n    this.dispatchEvent(new DeleteImageEvent(src, done));\n  }\n\n  insertSound(handler) {\n    this.dispatchEvent(new InsertSoundEvent(handler));\n  }\n\n  onDeleteSound(src, done) {\n    this.dispatchEvent(new DeleteSoundEvent(src, done));\n  }\n\n  _render() {\n    if (this._model) {\n      const el = React.createElement(Configure, {\n        onModelChanged: this.onModelChanged.bind(this),\n        onConfigurationChanged: this.onConfigurationChanged.bind(this),\n        model: this._model,\n        configuration: this._configuration,\n        imageSupport: {\n          add: this.insertImage.bind(this),\n          delete: this.onDeleteImage.bind(this),\n        },\n        uploadSoundSupport: {\n          add: this.insertSound.bind(this),\n          delete: this.onDeleteSound.bind(this),\n        },\n      });\n      ReactDOM.render(el, this);\n    }\n  }\n}\n"],"file":"index.js"}

package/configure/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pie-element/match-configure",
   "private": true,
-  "version": "6.3.2",
+  "version": "6.4.0",
   "description": "",
   "main": "lib/index.js",
   "module": "src/index.js",
@@ -10,9 +10,10 @@
     "@material-ui/core": "^3.9.2",
     "@material-ui/icons": "^3.0.1",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "1.7.4",
+    "@pie-lib/pie-toolbox": "1.8.1",
     "classnames": "^2.2.5",
     "debug": "^3.1.0",
+    "lodash": "^4.17.15",
     "prop-types": "^15.6.2",
     "react": "^16.8.1",
     "react-dnd": "^14.0.5",

package/controller/CHANGELOG.md

@@ -3,6 +3,27 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [6.0.0](https://github.com/pie-framework/pie-elements/compare/@pie-element/match-controller@5.2.2...@pie-element/match-controller@6.0.0) (2024-03-04)
+
+
+### Bug Fixes
+
+* **match:** refactor player model structure PD-3499 ([95cfbbb](https://github.com/pie-framework/pie-elements/commit/95cfbbbce4030f8738f2c4f135135643627a1243))
+
+
+### Features
+
+* update pie-lib/pie-toolbox version PD-1870 and PD-3501 ([8df1d8d](https://github.com/pie-framework/pie-elements/commit/8df1d8d281a0d6023d5a9c0e6fdd29fea71b6ac1))
+
+
+### BREAKING CHANGES
+
+* **match:** config object was removed from the player model and should no longer be used
+
+
+
+
+
 ## [5.2.2](https://github.com/pie-framework/pie-elements/compare/@pie-element/match-controller@5.2.1...@pie-element/match-controller@5.2.2) (2024-02-20)
 
 

package/controller/lib/defaults.js

@@ -5,19 +5,17 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 var _default = {
-  config: {
-    rows: [{
-      id: 1,
-      title: 'Question Text 1',
-      values: [false, false]
-    }, {
-      id: 2,
-      title: 'Question Text 2',
-      values: [false, false]
-    }],
-    layout: 3,
-    headers: ['Column 1', 'Column 2', 'Column 3']
-  }
+  rows: [{
+    id: 1,
+    title: 'Question Text 1',
+    values: [false, false]
+  }, {
+    id: 2,
+    title: 'Question Text 2',
+    values: [false, false]
+  }],
+  layout: 3,
+  headers: ['Column 1', 'Column 2', 'Column 3']
 };
 exports["default"] = _default;
 //# sourceMappingURL=defaults.js.map

package/controller/lib/defaults.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/defaults.js"],"names":["config","rows","id","title","values","layout","headers"],"mappings":";;;;;;eAAe;AACbA,EAAAA,MAAM,EAAE;AACNC,IAAAA,IAAI,EAAE,CACJ;AACEC,MAAAA,EAAE,EAAE,CADN;AAEEC,MAAAA,KAAK,EAAE,iBAFT;AAGEC,MAAAA,MAAM,EAAE,CAAC,KAAD,EAAQ,KAAR;AAHV,KADI,EAMJ;AACEF,MAAAA,EAAE,EAAE,CADN;AAEEC,MAAAA,KAAK,EAAE,iBAFT;AAGEC,MAAAA,MAAM,EAAE,CAAC,KAAD,EAAQ,KAAR;AAHV,KANI,CADA;AAaNC,IAAAA,MAAM,EAAE,CAbF;AAcNC,IAAAA,OAAO,EAAE,CAAC,UAAD,EAAa,UAAb,EAAyB,UAAzB;AAdH;AADK,C","sourcesContent":["export default {\n  config: {\n    rows: [\n      {\n        id: 1,\n        title: 'Question Text 1',\n        values: [false, false],\n      },\n      {\n        id: 2,\n        title: 'Question Text 2',\n        values: [false, false],\n      },\n    ],\n    layout: 3,\n    headers: ['Column 1', 'Column 2', 'Column 3'],\n  },\n};\n"],"file":"defaults.js"}
+{"version":3,"sources":["../src/defaults.js"],"names":["rows","id","title","values","layout","headers"],"mappings":";;;;;;eAAe;AACbA,EAAAA,IAAI,EAAE,CACJ;AACEC,IAAAA,EAAE,EAAE,CADN;AAEEC,IAAAA,KAAK,EAAE,iBAFT;AAGEC,IAAAA,MAAM,EAAE,CAAC,KAAD,EAAQ,KAAR;AAHV,GADI,EAMJ;AACEF,IAAAA,EAAE,EAAE,CADN;AAEEC,IAAAA,KAAK,EAAE,iBAFT;AAGEC,IAAAA,MAAM,EAAE,CAAC,KAAD,EAAQ,KAAR;AAHV,GANI,CADO;AAabC,EAAAA,MAAM,EAAE,CAbK;AAcbC,EAAAA,OAAO,EAAE,CAAC,UAAD,EAAa,UAAb,EAAyB,UAAzB;AAdI,C","sourcesContent":["export default {\n  rows: [\n    {\n      id: 1,\n      title: 'Question Text 1',\n      values: [false, false],\n    },\n    {\n      id: 2,\n      title: 'Question Text 2',\n      values: [false, false],\n    },\n  ],\n  layout: 3,\n  headers: ['Column 1', 'Column 2', 'Column 3'],\n};\n"],"file":"defaults.js"}

package/controller/lib/index.js

@@ -14,6 +14,8 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
@@ -32,6 +34,8 @@ var _debug = _interopRequireDefault(require("debug"));
 
 var _defaults = _interopRequireDefault(require("./defaults"));
 
+var _excluded = ["feedbackEnabled", "promptEnabled", "prompt", "lockChoiceOrder"];
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -265,17 +269,20 @@ function model(question, session, env, updateSession) {
               });
               fb = env.mode === 'evaluate' && normalizedQuestion.feedbackEnabled ? (0, _feedback.getFeedbackForCorrectness)(correctInfo.correctness, normalizedQuestion.feedback) : Promise.resolve(undefined);
               fb.then(function (feedback) {
-                var out = {
-                  allowFeedback: normalizedQuestion.feedbackEnabled,
-                  prompt: normalizedQuestion.promptEnabled ? normalizedQuestion.prompt : null,
-                  config: _objectSpread(_objectSpread({}, normalizedQuestion), {}, {
-                    shuffled: !normalizedQuestion.lockChoiceOrder
-                  }),
+                var feedbackEnabled = normalizedQuestion.feedbackEnabled,
+                    promptEnabled = normalizedQuestion.promptEnabled,
+                    prompt = normalizedQuestion.prompt,
+                    lockChoiceOrder = normalizedQuestion.lockChoiceOrder,
+                    essentials = (0, _objectWithoutProperties2["default"])(normalizedQuestion, _excluded);
+
+                var out = _objectSpread(_objectSpread({}, essentials), {}, {
+                  allowFeedback: feedbackEnabled,
+                  prompt: promptEnabled ? prompt : null,
+                  shuffled: !lockChoiceOrder,
                   feedback: feedback,
                   disabled: env.mode !== 'gather',
-                  view: env.mode === 'view',
-                  language: normalizedQuestion.language
-                };
+                  view: env.mode === 'view'
+                });
 
                 if (env.role === 'instructor' && (env.mode === 'view' || env.mode === 'evaluate')) {
                   out.teacherInstructions = normalizedQuestion.teacherInstructionsEnabled ? normalizedQuestion.teacherInstructions : null;
@@ -283,8 +290,6 @@ function model(question, session, env, updateSession) {
                 } else {
                   out.rationale = null;
                   out.teacherInstructions = null;
-                  out.config.rationale = null;
-                  out.config.teacherInstructions = null;
                 }
 
                 if (env.mode === 'evaluate') {
@@ -333,7 +338,7 @@ var createCorrectResponseSession = function createCorrectResponseSession(questio
 exports.createCorrectResponseSession = createCorrectResponseSession;
 
 var markupToText = function markupToText(s) {
-  return (s || '').replace(/(<([^>]+)>)/ig, '');
+  return (s || '').replace(/(<([^>]+)>)/gi, '');
 };
 
 var validate = function validate() {
@@ -397,7 +402,7 @@ var validate = function validate() {
 
   if (maxLengthFirstColumnHeading && headers[0].length > maxLengthFirstColumnHeading) {
     columnsErrors[0] = "The first column heading should have the maximum length of ".concat(maxLengthFirstColumnHeading, " characters.");
-  } //remove first column since it does not require validation
+  } // remove first column since it does not require validation
 
 
   var validateHeaders = ((0, _cloneDeep["default"])(headers) || []).map(function (heading) {

package/controller/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.js"],"names":["log","getResponseCorrectness","model","answers","env","isPartialScoring","partialScoring","enabled","rows","checkboxMode","choiceMode","Object","keys","length","totalCorrectAnswers","getTotalCorrectAnswers","getTotalCorrect","correctAnswers","incorrectAnswers","checkboxes","getCheckboxes","getCorrectRadios","getCorrectness","question","mode","forEach","row","answer","id","values","v","i","matchingTable","layout","noOfTotalCorrectAnswers","value","getPartialScore","totalCorrect","total","extraAnswers","score","parseFloat","toFixed","getOutComeScore","correctness","outcome","session","Promise","resolve","undefined","completed","empty","out","createDefaultModel","defaults","normalize","feedbackEnabled","promptEnabled","rationaleEnabled","teacherInstructionsEnabled","studentInstructionsEnabled","updateSession","normalizedQuestion","correctResponse","correctInfo","lockChoiceOrder","fb","feedback","then","allowFeedback","prompt","config","shuffled","disabled","view","language","role","teacherInstructions","rationale","assign","createCorrectResponseSession","r","markupToText","s","replace","validate","headers","minQuestions","maxQuestions","maxLengthQuestionsHeading","maxAnswers","maxLengthAnswers","maxLengthFirstColumnHeading","rowsErrors","columnsErrors","errors","noOfRowsError","index","title","hasCorrectResponse","identicalAnswer","slice","some","columnsLengthError","validateHeaders","map","heading","shift","h","indexOf","hasRowErrors","entries","rowError","noCorrectAnswer","includes","correctResponseError"],"mappings":"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","sourcesContent":["import isEqual from 'lodash/isEqual';\nimport isEmpty from 'lodash/isEmpty';\nimport cloneDeep from 'lodash/cloneDeep';\nimport { getFeedbackForCorrectness } from '@pie-lib/pie-toolbox/feedback';\nimport { lockChoices, getShuffledChoices, partialScoring } from '@pie-lib/pie-toolbox/controller-utils';\nimport debug from 'debug';\n\nconst log = debug('@pie-element:match:controller');\n\nimport defaults from './defaults';\n\nconst getResponseCorrectness = (model, answers, env = {}) => {\n  const isPartialScoring = partialScoring.enabled(model, env);\n  const rows = model.rows;\n  const checkboxMode = model.choiceMode === 'checkbox';\n\n  if (!answers || Object.keys(answers).length === 0) {\n    return 'unanswered';\n  }\n\n  const totalCorrectAnswers = checkboxMode ? getTotalCorrectAnswers(model) : getTotalCorrect(model);\n  let correctAnswers;\n  let incorrectAnswers = 0;\n\n  if (checkboxMode) {\n    const checkboxes = getCheckboxes(rows, answers);\n\n    correctAnswers = checkboxes.correctAnswers;\n    incorrectAnswers = checkboxes.incorrectAnswers;\n  } else {\n    correctAnswers = getCorrectRadios(rows, answers);\n  }\n\n  if (totalCorrectAnswers === correctAnswers && !incorrectAnswers) {\n    return 'correct';\n  } else if (correctAnswers === 0) {\n    return 'incorrect';\n  } else if (isPartialScoring) {\n    return 'partial';\n  }\n\n  return 'incorrect';\n};\n\nconst getCorrectness = (question, env, answers = {}) => {\n  if (env.mode === 'evaluate') {\n    return getResponseCorrectness(question, answers, env);\n  }\n};\n\nconst getCheckboxes = (rows, answers) => {\n  let correctAnswers = 0;\n  let incorrectAnswers = 0;\n\n  rows.forEach((row) => {\n    const answer = answers[row.id];\n\n    if (answer) {\n      row.values.forEach((v, i) => {\n        if (answer[i] && answer[i] === v) {\n          correctAnswers += 1;\n        } else if (answer[i] && answer[i] !== v) {\n          incorrectAnswers += 1;\n        }\n      });\n    }\n  });\n\n  return { correctAnswers, incorrectAnswers };\n};\n\nconst getCorrectRadios = (rows, answers) => {\n  let correctAnswers = 0;\n\n  rows.forEach((row) => {\n    if (isEqual(row.values, answers[row.id])) {\n      correctAnswers += 1;\n    }\n  });\n\n  return correctAnswers;\n};\n\nconst getTotalCorrect = (question) => {\n  const checkboxMode = question.choiceMode === 'checkbox';\n  const matchingTable = checkboxMode ? question.layout - 1 : 1;\n  return (question.rows.length || 0) * matchingTable;\n};\n\nconst getTotalCorrectAnswers = (question) => {\n  let noOfTotalCorrectAnswers = 0;\n\n  question.rows.forEach((row) => {\n    row.values.forEach((value) => {\n      if (value) {\n        noOfTotalCorrectAnswers += 1;\n      }\n    });\n  });\n\n  return noOfTotalCorrectAnswers;\n};\n\nconst getPartialScore = (question, answers) => {\n  const checkboxMode = question.choiceMode === 'checkbox';\n\n  if (checkboxMode) {\n    const { correctAnswers, incorrectAnswers } = getCheckboxes(question.rows, answers);\n    const totalCorrect = getTotalCorrectAnswers(question);\n\n    const total = totalCorrect === 0 ? 1 : totalCorrect;\n\n    if (correctAnswers + incorrectAnswers > totalCorrect) {\n      const extraAnswers = correctAnswers + incorrectAnswers - totalCorrect;\n      const score = parseFloat(((correctAnswers - extraAnswers) / total).toFixed(2));\n\n      return score < 0 ? 0 : score;\n    } else {\n      return parseFloat((correctAnswers / total).toFixed(2));\n    }\n  } else {\n    const correctAnswers = getCorrectRadios(question.rows, answers);\n    const totalCorrect = getTotalCorrect(question) === 0 ? 1 : getTotalCorrect(question);\n\n    return parseFloat((correctAnswers / totalCorrect).toFixed(2));\n  }\n};\n\nconst getOutComeScore = (question, env, answers = {}) => {\n  const correctness = getCorrectness(question, env, answers);\n  const isPartialScoring = partialScoring.enabled(question, env);\n\n  return correctness === 'correct'\n    ? 1\n    : correctness === 'partial' && isPartialScoring\n      ? getPartialScore(question, answers)\n      : 0;\n};\n\nexport const outcome = (question, session, env) => {\n  return new Promise((resolve) => {\n    if (env.mode !== 'evaluate') {\n      resolve({ score: undefined, completed: undefined });\n    } else {\n      if (!session || isEmpty(session)) {\n        resolve({ score: 0, empty: true });\n      }\n\n      const out = {\n        score: getOutComeScore(question, env, session.answers),\n      };\n\n      resolve(out);\n    }\n  });\n};\n\nexport function createDefaultModel(model = {}) {\n  return new Promise((resolve) => {\n    resolve({\n      ...defaults,\n      ...model,\n    });\n  });\n}\n\nexport const normalize = (question) => ({\n  feedbackEnabled: false,\n  promptEnabled: true,\n  rationaleEnabled: true,\n  teacherInstructionsEnabled: true,\n  studentInstructionsEnabled: true,\n  ...question,\n});\n\n/**\n *\n * @param {*} question\n * @param {*} session\n * @param {*} env\n * @param {*} updateSession - optional - a function that will set the properties passed into it on the session.\n */\nexport function model(question, session, env, updateSession) {\n  return new Promise(async (resolve) => {\n    const normalizedQuestion = cloneDeep(normalize(question));\n    let correctness, score;\n\n    if ((!session || isEmpty(session)) && env.mode === 'evaluate') {\n      correctness = 'unanswered';\n      score = '0%';\n    } else {\n      correctness = getCorrectness(normalizedQuestion, env, session && session.answers);\n      score = `${getOutComeScore(normalizedQuestion, env, session && session.answers) * 100}%`;\n    }\n\n    const correctResponse = {};\n    const correctInfo = {\n      score,\n      correctness,\n    };\n\n    const lockChoiceOrder = lockChoices(normalizedQuestion, session, env);\n\n    if (!lockChoiceOrder) {\n      normalizedQuestion.rows = await getShuffledChoices(normalizedQuestion.rows, session, updateSession, 'id');\n    }\n\n    normalizedQuestion.rows.forEach((row) => {\n      correctResponse[row.id] = row.values;\n\n      if (env.mode !== 'evaluate') {\n        delete row.values;\n      }\n    });\n\n    const fb =\n      env.mode === 'evaluate' && normalizedQuestion.feedbackEnabled\n        ? getFeedbackForCorrectness(correctInfo.correctness, normalizedQuestion.feedback)\n        : Promise.resolve(undefined);\n\n    fb.then((feedback) => {\n      const out = {\n        allowFeedback: normalizedQuestion.feedbackEnabled,\n        prompt: normalizedQuestion.promptEnabled ? normalizedQuestion.prompt : null,\n        config: {\n          ...normalizedQuestion,\n          shuffled: !normalizedQuestion.lockChoiceOrder,\n        },\n        feedback,\n        disabled: env.mode !== 'gather',\n        view: env.mode === 'view',\n        language: normalizedQuestion.language\n      };\n\n      if (env.role === 'instructor' && (env.mode === 'view' || env.mode === 'evaluate')) {\n        out.teacherInstructions = normalizedQuestion.teacherInstructionsEnabled\n          ? normalizedQuestion.teacherInstructions\n          : null;\n        out.rationale = normalizedQuestion.rationaleEnabled ? normalizedQuestion.rationale : null;\n      } else {\n        out.rationale = null;\n        out.teacherInstructions = null;\n        out.config.rationale = null;\n        out.config.teacherInstructions = null;\n      }\n\n      if (env.mode === 'evaluate') {\n        Object.assign(out, {\n          correctResponse,\n          correctness: correctInfo,\n        });\n      }\n\n      log('out: ', out);\n      resolve(out);\n    });\n  });\n}\n\nexport const createCorrectResponseSession = (question, env) => {\n  return new Promise((resolve) => {\n    if (env.mode !== 'evaluate' && env.role === 'instructor') {\n      const { rows } = question;\n      const answers = {};\n\n      rows.forEach((r) => {\n        answers[r.id] = r.values;\n      });\n\n      resolve({\n        answers,\n        id: '1',\n      });\n    } else {\n      resolve(null);\n    }\n  });\n};\n\nconst markupToText = (s) => {\n  return (s || '').replace(/(<([^>]+)>)/ig, '');\n};\n\nexport const validate = (model = {}, config = {}) => {\n  const { rows, choiceMode, headers } = model;\n  const {\n    minQuestions,\n    maxQuestions,\n    maxLengthQuestionsHeading,\n    maxAnswers,\n    maxLengthAnswers,\n    maxLengthFirstColumnHeading\n  } = config;\n  const rowsErrors = {};\n  const columnsErrors = {};\n  const errors = {};\n\n  if (rows.length < minQuestions) {\n    errors.noOfRowsError = `There should be at least ${minQuestions} question rows.`;\n  } else if (rows.length > maxQuestions) {\n    errors.noOfRowsError = `No more than ${maxQuestions} question rows should be defined.`;\n  }\n\n  (rows || []).forEach((row, index) => {\n    const { id, values = [], title } = row;\n    let hasCorrectResponse = false;\n\n    rowsErrors[id] = '';\n\n    if (maxLengthQuestionsHeading && markupToText(title).length > maxLengthQuestionsHeading) {\n      rowsErrors[id] += `Questions rows content length should not be more than ${maxLengthQuestionsHeading} characters. `;\n    } else if (title === '' || title === '<div></div>') {\n      rowsErrors[id] += 'Content should not be empty. ';\n    } else {\n      const identicalAnswer = rows.slice(index + 1).some((r) => {\n        return markupToText(r.title) === markupToText(title);\n      });\n\n      if (identicalAnswer) {\n        rowsErrors[id] = 'Content should be unique. ';\n      }\n    }\n\n    values.forEach((value) => {\n      if (value) {\n        hasCorrectResponse = true;\n      }\n    });\n\n    if (!hasCorrectResponse) {\n      rowsErrors[id] += 'No correct response defined.';\n    }\n  });\n\n  if (maxAnswers && headers.length - 1 > maxAnswers) {\n    errors.columnsLengthError = `There should be maximum ${maxAnswers} answers.`;\n  }\n\n  if (maxLengthFirstColumnHeading && headers[0].length > maxLengthFirstColumnHeading) {\n    columnsErrors[0] = `The first column heading should have the maximum length of ${maxLengthFirstColumnHeading} characters.`;\n  }\n\n  //remove first column since it does not require validation\n  const validateHeaders = (cloneDeep(headers) || []).map(heading => markupToText(heading));\n  validateHeaders.shift();\n\n  (validateHeaders || []).forEach((heading, index) => {\n    if (heading === '' || heading === '<div></div>') {\n      columnsErrors[index + 1] = 'Content should not be empty.';\n    } else if (maxLengthAnswers && heading.length > maxLengthAnswers) {\n      columnsErrors[index + 1] = `Content length should be maximum ${maxLengthAnswers} characters.`;\n    } else {\n      const identicalAnswer = validateHeaders.some((h, index) => {\n        if (h === heading) {\n          return validateHeaders.indexOf(h) !== index;\n        }\n      });\n\n      if (identicalAnswer) {\n        columnsErrors[index + 1] = 'Content should be unique.';\n      }\n    }\n  });\n\n  let hasRowErrors = false;\n  Object.entries(rowsErrors).forEach(([, rowError]) => {\n    if (rowError.length) {\n      hasRowErrors = true;\n    }\n  });\n\n  if (hasRowErrors) {\n    errors.rowsErrors = rowsErrors;\n    let noCorrectAnswer = false;\n\n    Object.entries(rowsErrors).forEach(([, rowError]) => {\n      if ((rowError || '').includes('No correct response defined.')) {\n        noCorrectAnswer = true;\n      }\n    });\n\n    if (noCorrectAnswer) {\n      errors.correctResponseError =\n        choiceMode === 'radio'\n          ? 'There should be a correct response defined for every row.'\n          : 'There should be at least one correct response defined for every row.';\n    }\n  }\n\n  if (!isEmpty(columnsErrors)) {\n    errors.columnsErrors = columnsErrors;\n  }\n\n  return errors;\n};\n"],"file":"index.js"}
+{"version":3,"sources":["../src/index.js"],"names":["log","getResponseCorrectness","model","answers","env","isPartialScoring","partialScoring","enabled","rows","checkboxMode","choiceMode","Object","keys","length","totalCorrectAnswers","getTotalCorrectAnswers","getTotalCorrect","correctAnswers","incorrectAnswers","checkboxes","getCheckboxes","getCorrectRadios","getCorrectness","question","mode","forEach","row","answer","id","values","v","i","matchingTable","layout","noOfTotalCorrectAnswers","value","getPartialScore","totalCorrect","total","extraAnswers","score","parseFloat","toFixed","getOutComeScore","correctness","outcome","session","Promise","resolve","undefined","completed","empty","out","createDefaultModel","defaults","normalize","feedbackEnabled","promptEnabled","rationaleEnabled","teacherInstructionsEnabled","studentInstructionsEnabled","updateSession","normalizedQuestion","correctResponse","correctInfo","lockChoiceOrder","fb","feedback","then","prompt","essentials","allowFeedback","shuffled","disabled","view","role","teacherInstructions","rationale","assign","createCorrectResponseSession","r","markupToText","s","replace","validate","config","headers","minQuestions","maxQuestions","maxLengthQuestionsHeading","maxAnswers","maxLengthAnswers","maxLengthFirstColumnHeading","rowsErrors","columnsErrors","errors","noOfRowsError","index","title","hasCorrectResponse","identicalAnswer","slice","some","columnsLengthError","validateHeaders","map","heading","shift","h","indexOf","hasRowErrors","entries","rowError","noCorrectAnswer","includes","correctResponseError"],"mappings":"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","sourcesContent":["import isEqual from 'lodash/isEqual';\nimport isEmpty from 'lodash/isEmpty';\nimport cloneDeep from 'lodash/cloneDeep';\nimport { getFeedbackForCorrectness } from '@pie-lib/pie-toolbox/feedback';\nimport { lockChoices, getShuffledChoices, partialScoring } from '@pie-lib/pie-toolbox/controller-utils';\nimport debug from 'debug';\n\nconst log = debug('@pie-element:match:controller');\n\nimport defaults from './defaults';\n\nconst getResponseCorrectness = (model, answers, env = {}) => {\n  const isPartialScoring = partialScoring.enabled(model, env);\n  const rows = model.rows;\n  const checkboxMode = model.choiceMode === 'checkbox';\n\n  if (!answers || Object.keys(answers).length === 0) {\n    return 'unanswered';\n  }\n\n  const totalCorrectAnswers = checkboxMode ? getTotalCorrectAnswers(model) : getTotalCorrect(model);\n  let correctAnswers;\n  let incorrectAnswers = 0;\n\n  if (checkboxMode) {\n    const checkboxes = getCheckboxes(rows, answers);\n\n    correctAnswers = checkboxes.correctAnswers;\n    incorrectAnswers = checkboxes.incorrectAnswers;\n  } else {\n    correctAnswers = getCorrectRadios(rows, answers);\n  }\n\n  if (totalCorrectAnswers === correctAnswers && !incorrectAnswers) {\n    return 'correct';\n  } else if (correctAnswers === 0) {\n    return 'incorrect';\n  } else if (isPartialScoring) {\n    return 'partial';\n  }\n\n  return 'incorrect';\n};\n\nconst getCorrectness = (question, env, answers = {}) => {\n  if (env.mode === 'evaluate') {\n    return getResponseCorrectness(question, answers, env);\n  }\n};\n\nconst getCheckboxes = (rows, answers) => {\n  let correctAnswers = 0;\n  let incorrectAnswers = 0;\n\n  rows.forEach((row) => {\n    const answer = answers[row.id];\n\n    if (answer) {\n      row.values.forEach((v, i) => {\n        if (answer[i] && answer[i] === v) {\n          correctAnswers += 1;\n        } else if (answer[i] && answer[i] !== v) {\n          incorrectAnswers += 1;\n        }\n      });\n    }\n  });\n\n  return { correctAnswers, incorrectAnswers };\n};\n\nconst getCorrectRadios = (rows, answers) => {\n  let correctAnswers = 0;\n\n  rows.forEach((row) => {\n    if (isEqual(row.values, answers[row.id])) {\n      correctAnswers += 1;\n    }\n  });\n\n  return correctAnswers;\n};\n\nconst getTotalCorrect = (question) => {\n  const checkboxMode = question.choiceMode === 'checkbox';\n  const matchingTable = checkboxMode ? question.layout - 1 : 1;\n  return (question.rows.length || 0) * matchingTable;\n};\n\nconst getTotalCorrectAnswers = (question) => {\n  let noOfTotalCorrectAnswers = 0;\n\n  question.rows.forEach((row) => {\n    row.values.forEach((value) => {\n      if (value) {\n        noOfTotalCorrectAnswers += 1;\n      }\n    });\n  });\n\n  return noOfTotalCorrectAnswers;\n};\n\nconst getPartialScore = (question, answers) => {\n  const checkboxMode = question.choiceMode === 'checkbox';\n\n  if (checkboxMode) {\n    const { correctAnswers, incorrectAnswers } = getCheckboxes(question.rows, answers);\n    const totalCorrect = getTotalCorrectAnswers(question);\n\n    const total = totalCorrect === 0 ? 1 : totalCorrect;\n\n    if (correctAnswers + incorrectAnswers > totalCorrect) {\n      const extraAnswers = correctAnswers + incorrectAnswers - totalCorrect;\n      const score = parseFloat(((correctAnswers - extraAnswers) / total).toFixed(2));\n\n      return score < 0 ? 0 : score;\n    } else {\n      return parseFloat((correctAnswers / total).toFixed(2));\n    }\n  } else {\n    const correctAnswers = getCorrectRadios(question.rows, answers);\n    const totalCorrect = getTotalCorrect(question) === 0 ? 1 : getTotalCorrect(question);\n\n    return parseFloat((correctAnswers / totalCorrect).toFixed(2));\n  }\n};\n\nconst getOutComeScore = (question, env, answers = {}) => {\n  const correctness = getCorrectness(question, env, answers);\n  const isPartialScoring = partialScoring.enabled(question, env);\n\n  return correctness === 'correct'\n    ? 1\n    : correctness === 'partial' && isPartialScoring\n    ? getPartialScore(question, answers)\n    : 0;\n};\n\nexport const outcome = (question, session, env) => {\n  return new Promise((resolve) => {\n    if (env.mode !== 'evaluate') {\n      resolve({ score: undefined, completed: undefined });\n    } else {\n      if (!session || isEmpty(session)) {\n        resolve({ score: 0, empty: true });\n      }\n\n      const out = {\n        score: getOutComeScore(question, env, session.answers),\n      };\n\n      resolve(out);\n    }\n  });\n};\n\nexport function createDefaultModel(model = {}) {\n  return new Promise((resolve) => {\n    resolve({\n      ...defaults,\n      ...model,\n    });\n  });\n}\n\nexport const normalize = (question) => ({\n  feedbackEnabled: false,\n  promptEnabled: true,\n  rationaleEnabled: true,\n  teacherInstructionsEnabled: true,\n  studentInstructionsEnabled: true,\n  ...question,\n});\n\n/**\n *\n * @param {*} question\n * @param {*} session\n * @param {*} env\n * @param {*} updateSession - optional - a function that will set the properties passed into it on the session.\n */\nexport function model(question, session, env, updateSession) {\n  return new Promise(async (resolve) => {\n    const normalizedQuestion = cloneDeep(normalize(question));\n    let correctness, score;\n\n    if ((!session || isEmpty(session)) && env.mode === 'evaluate') {\n      correctness = 'unanswered';\n      score = '0%';\n    } else {\n      correctness = getCorrectness(normalizedQuestion, env, session && session.answers);\n      score = `${getOutComeScore(normalizedQuestion, env, session && session.answers) * 100}%`;\n    }\n\n    const correctResponse = {};\n    const correctInfo = {\n      score,\n      correctness,\n    };\n\n    const lockChoiceOrder = lockChoices(normalizedQuestion, session, env);\n\n    if (!lockChoiceOrder) {\n      normalizedQuestion.rows = await getShuffledChoices(normalizedQuestion.rows, session, updateSession, 'id');\n    }\n\n    normalizedQuestion.rows.forEach((row) => {\n      correctResponse[row.id] = row.values;\n\n      if (env.mode !== 'evaluate') {\n        delete row.values;\n      }\n    });\n\n    const fb =\n      env.mode === 'evaluate' && normalizedQuestion.feedbackEnabled\n        ? getFeedbackForCorrectness(correctInfo.correctness, normalizedQuestion.feedback)\n        : Promise.resolve(undefined);\n\n    fb.then((feedback) => {\n      const { feedbackEnabled, promptEnabled, prompt, lockChoiceOrder, ...essentials } = normalizedQuestion;\n      const out = {\n        ...essentials,\n        allowFeedback: feedbackEnabled,\n        prompt: promptEnabled ? prompt : null,\n        shuffled: !lockChoiceOrder,\n        feedback,\n        disabled: env.mode !== 'gather',\n        view: env.mode === 'view',\n      };\n\n      if (env.role === 'instructor' && (env.mode === 'view' || env.mode === 'evaluate')) {\n        out.teacherInstructions = normalizedQuestion.teacherInstructionsEnabled\n          ? normalizedQuestion.teacherInstructions\n          : null;\n        out.rationale = normalizedQuestion.rationaleEnabled ? normalizedQuestion.rationale : null;\n      } else {\n        out.rationale = null;\n        out.teacherInstructions = null;\n      }\n\n      if (env.mode === 'evaluate') {\n        Object.assign(out, {\n          correctResponse,\n          correctness: correctInfo,\n        });\n      }\n\n      log('out: ', out);\n      resolve(out);\n    });\n  });\n}\n\nexport const createCorrectResponseSession = (question, env) => {\n  return new Promise((resolve) => {\n    if (env.mode !== 'evaluate' && env.role === 'instructor') {\n      const { rows } = question;\n      const answers = {};\n\n      rows.forEach((r) => {\n        answers[r.id] = r.values;\n      });\n\n      resolve({\n        answers,\n        id: '1',\n      });\n    } else {\n      resolve(null);\n    }\n  });\n};\n\nconst markupToText = (s) => {\n  return (s || '').replace(/(<([^>]+)>)/gi, '');\n};\n\nexport const validate = (model = {}, config = {}) => {\n  const { rows, choiceMode, headers } = model;\n  const {\n    minQuestions,\n    maxQuestions,\n    maxLengthQuestionsHeading,\n    maxAnswers,\n    maxLengthAnswers,\n    maxLengthFirstColumnHeading,\n  } = config;\n  const rowsErrors = {};\n  const columnsErrors = {};\n  const errors = {};\n\n  if (rows.length < minQuestions) {\n    errors.noOfRowsError = `There should be at least ${minQuestions} question rows.`;\n  } else if (rows.length > maxQuestions) {\n    errors.noOfRowsError = `No more than ${maxQuestions} question rows should be defined.`;\n  }\n\n  (rows || []).forEach((row, index) => {\n    const { id, values = [], title } = row;\n    let hasCorrectResponse = false;\n\n    rowsErrors[id] = '';\n\n    if (maxLengthQuestionsHeading && markupToText(title).length > maxLengthQuestionsHeading) {\n      rowsErrors[\n        id\n      ] += `Questions rows content length should not be more than ${maxLengthQuestionsHeading} characters. `;\n    } else if (title === '' || title === '<div></div>') {\n      rowsErrors[id] += 'Content should not be empty. ';\n    } else {\n      const identicalAnswer = rows.slice(index + 1).some((r) => {\n        return markupToText(r.title) === markupToText(title);\n      });\n\n      if (identicalAnswer) {\n        rowsErrors[id] = 'Content should be unique. ';\n      }\n    }\n\n    values.forEach((value) => {\n      if (value) {\n        hasCorrectResponse = true;\n      }\n    });\n\n    if (!hasCorrectResponse) {\n      rowsErrors[id] += 'No correct response defined.';\n    }\n  });\n\n  if (maxAnswers && headers.length - 1 > maxAnswers) {\n    errors.columnsLengthError = `There should be maximum ${maxAnswers} answers.`;\n  }\n\n  if (maxLengthFirstColumnHeading && headers[0].length > maxLengthFirstColumnHeading) {\n    columnsErrors[0] = `The first column heading should have the maximum length of ${maxLengthFirstColumnHeading} characters.`;\n  }\n\n  // remove first column since it does not require validation\n  const validateHeaders = (cloneDeep(headers) || []).map((heading) => markupToText(heading));\n  validateHeaders.shift();\n\n  (validateHeaders || []).forEach((heading, index) => {\n    if (heading === '' || heading === '<div></div>') {\n      columnsErrors[index + 1] = 'Content should not be empty.';\n    } else if (maxLengthAnswers && heading.length > maxLengthAnswers) {\n      columnsErrors[index + 1] = `Content length should be maximum ${maxLengthAnswers} characters.`;\n    } else {\n      const identicalAnswer = validateHeaders.some((h, index) => {\n        if (h === heading) {\n          return validateHeaders.indexOf(h) !== index;\n        }\n      });\n\n      if (identicalAnswer) {\n        columnsErrors[index + 1] = 'Content should be unique.';\n      }\n    }\n  });\n\n  let hasRowErrors = false;\n  Object.entries(rowsErrors).forEach(([, rowError]) => {\n    if (rowError.length) {\n      hasRowErrors = true;\n    }\n  });\n\n  if (hasRowErrors) {\n    errors.rowsErrors = rowsErrors;\n    let noCorrectAnswer = false;\n\n    Object.entries(rowsErrors).forEach(([, rowError]) => {\n      if ((rowError || '').includes('No correct response defined.')) {\n        noCorrectAnswer = true;\n      }\n    });\n\n    if (noCorrectAnswer) {\n      errors.correctResponseError =\n        choiceMode === 'radio'\n          ? 'There should be a correct response defined for every row.'\n          : 'There should be at least one correct response defined for every row.';\n    }\n  }\n\n  if (!isEmpty(columnsErrors)) {\n    errors.columnsErrors = columnsErrors;\n  }\n\n  return errors;\n};\n"],"file":"index.js"}

package/controller/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pie-element/match-controller",
   "private": true,
-  "version": "5.2.2",
+  "version": "6.0.0",
   "description": "",
   "main": "lib/index.js",
   "module": "src/index.js",
@@ -9,7 +9,7 @@
     "test": "./node_modules/.bin/jest"
   },
   "dependencies": {
-    "@pie-lib/pie-toolbox": "1.7.4",
+    "@pie-lib/pie-toolbox": "1.8.1",
     "debug": "^3.1.0"
   },
   "devDependencies": {

package/lib/index.js

@@ -13,6 +13,8 @@ Object.defineProperty(exports, "Component", {
 });
 exports.isComplete = exports["default"] = void 0;
 
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
@@ -35,17 +37,20 @@ var _piePlayerEvents = require("@pie-framework/pie-player-events");
 
 var _mathRendering = require("@pie-lib/pie-toolbox/math-rendering");
 
-var _get = _interopRequireDefault(require("lodash/get"));
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2["default"])(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2["default"])(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2["default"])(this, result); }; }
 
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
 var isComplete = function isComplete(session, model) {
-  var rows = (0, _get["default"])(model, 'config.rows');
-  var ids = rows.map(function (r) {
+  var _model$rows;
+
+  var ids = (model === null || model === void 0 ? void 0 : (_model$rows = model.rows) === null || _model$rows === void 0 ? void 0 : _model$rows.map(function (r) {
     return r.id;
-  });
+  })) || [];
   return ids.reduce(function (acc, id) {
     if (!acc) {
       return false;
@@ -72,7 +77,9 @@ var Match = /*#__PURE__*/function (_HTMLElement) {
   (0, _createClass2["default"])(Match, [{
     key: "model",
     set: function set(m) {
-      this._model = m;
+      // config object props should be part of the model props
+      // model.config should be no longer used
+      this._model = _objectSpread(_objectSpread({}, m), (m === null || m === void 0 ? void 0 : m.config) || {});
 
       this._render();
     }

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.js"],"names":["isComplete","session","model","rows","ids","map","r","id","reduce","acc","arr","answers","hasChoice","Array","isArray","includes","Match","m","_model","_render","_session","s","complete","dispatchEvent","SessionChangedEvent","tagName","toLowerCase","el","React","createElement","Main","onSessionChange","sessionChanged","bind","ReactDOM","render","HTMLElement"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;AACA;;AACA;;AACA;;AACA;;AACA;;;;;;AAIO,IAAMA,UAAU,GAAG,SAAbA,UAAa,CAACC,OAAD,EAAUC,KAAV,EAAoB;AAC5C,MAAMC,IAAI,GAAG,qBAAID,KAAJ,EAAW,aAAX,CAAb;AACA,MAAME,GAAG,GAAGD,IAAI,CAACE,GAAL,CAAS,UAACC,CAAD;AAAA,WAAOA,CAAC,CAACC,EAAT;AAAA,GAAT,CAAZ;AACA,SAAOH,GAAG,CAACI,MAAJ,CAAW,UAACC,GAAD,EAAMF,EAAN,EAAa;AAC7B,QAAI,CAACE,GAAL,EAAU;AACR,aAAO,KAAP;AACD;;AACD,QAAMC,GAAG,GAAGT,OAAO,CAACU,OAAR,IAAmBV,OAAO,CAACU,OAAR,CAAgBJ,EAAhB,CAA/B;AACA,QAAMK,SAAS,GAAGC,KAAK,CAACC,OAAN,CAAcJ,GAAd,KAAsBA,GAAG,CAACK,QAAJ,CAAa,IAAb,CAAxC;AACA,WAAOH,SAAS,IAAIH,GAApB;AACD,GAPM,EAOJ,IAPI,CAAP;AAQD,CAXM;;;;IAacO,K;;;;;AACnB,mBAAc;AAAA;AAAA;AAEb;;;;SAED,aAAUC,CAAV,EAAa;AACX,WAAKC,MAAL,GAAcD,CAAd;;AACA,WAAKE,OAAL;AACD;;;SAOD,eAAc;AACZ,aAAO,KAAKC,QAAZ;AACD,K;SAPD,aAAYC,CAAZ,EAAe;AACb,WAAKD,QAAL,GAAgBC,CAAhB;;AACA,WAAKF,OAAL;AACD;;;WAMD,wBAAeE,CAAf,EAAkB;AAChB,WAAKD,QAAL,CAAcT,OAAd,GAAwBU,CAAC,CAACV,OAA1B;AACA,UAAMW,QAAQ,GAAGtB,UAAU,CAAC,KAAKoB,QAAN,EAAgB,KAAKF,MAArB,CAA3B;AAEA,WAAKK,aAAL,CAAmB,IAAIC,oCAAJ,CAAwB,KAAKC,OAAL,CAAaC,WAAb,EAAxB,EAAoDJ,QAApD,CAAnB;;AAEA,WAAKH,OAAL;AACD;;;WAED,6BAAoB;AAClB,WAAKA,OAAL;AACD;;;WAED,mBAAU;AAAA;;AACR,UAAI,CAAC,KAAKD,MAAN,IAAgB,CAAC,KAAKE,QAA1B,EAAoC;AAClC;AACD;;AAED,UAAMO,EAAE,gBAAGC,kBAAMC,aAAN,CAAoBC,gBAApB,EAA0B;AACnC5B,QAAAA,KAAK,EAAE,KAAKgB,MADuB;AAEnCjB,QAAAA,OAAO,EAAE,KAAKmB,QAFqB;AAGnCW,QAAAA,eAAe,EAAE,KAAKC,cAAL,CAAoBC,IAApB,CAAyB,IAAzB;AAHkB,OAA1B,CAAX;;AAMAC,2BAASC,MAAT,CAAgBR,EAAhB,EAAoB,IAApB,EAA0B,YAAM;AAC9B,uCAAW,KAAX;AACD,OAFD;AAGD;;;kDA9CgCS,W","sourcesContent":["import React from 'react';\nimport ReactDOM from 'react-dom';\nimport Main from './main';\nimport { SessionChangedEvent } from '@pie-framework/pie-player-events';\nimport { renderMath } from '@pie-lib/pie-toolbox/math-rendering';\nimport get from 'lodash/get';\n\nexport { Main as Component };\n\nexport const isComplete = (session, model) => {\n  const rows = get(model, 'config.rows');\n  const ids = rows.map((r) => r.id);\n  return ids.reduce((acc, id) => {\n    if (!acc) {\n      return false;\n    }\n    const arr = session.answers && session.answers[id];\n    const hasChoice = Array.isArray(arr) && arr.includes(true);\n    return hasChoice && acc;\n  }, true);\n};\n\nexport default class Match extends HTMLElement {\n  constructor() {\n    super();\n  }\n\n  set model(m) {\n    this._model = m;\n    this._render();\n  }\n\n  set session(s) {\n    this._session = s;\n    this._render();\n  }\n\n  get session() {\n    return this._session;\n  }\n\n  sessionChanged(s) {\n    this._session.answers = s.answers;\n    const complete = isComplete(this._session, this._model);\n\n    this.dispatchEvent(new SessionChangedEvent(this.tagName.toLowerCase(), complete));\n\n    this._render();\n  }\n\n  connectedCallback() {\n    this._render();\n  }\n\n  _render() {\n    if (!this._model || !this._session) {\n      return;\n    }\n\n    const el = React.createElement(Main, {\n      model: this._model,\n      session: this._session,\n      onSessionChange: this.sessionChanged.bind(this),\n    });\n\n    ReactDOM.render(el, this, () => {\n      renderMath(this);\n    });\n  }\n}\n"],"file":"index.js"}
+{"version":3,"sources":["../src/index.js"],"names":["isComplete","session","model","ids","rows","map","r","id","reduce","acc","arr","answers","hasChoice","Array","isArray","includes","Match","m","_model","config","_render","_session","s","complete","dispatchEvent","SessionChangedEvent","tagName","toLowerCase","el","React","createElement","Main","onSessionChange","sessionChanged","bind","ReactDOM","render","HTMLElement"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;AACA;;AACA;;AACA;;AACA;;;;;;;;;;AAIO,IAAMA,UAAU,GAAG,SAAbA,UAAa,CAACC,OAAD,EAAUC,KAAV,EAAoB;AAAA;;AAC5C,MAAMC,GAAG,GAAG,CAAAD,KAAK,SAAL,IAAAA,KAAK,WAAL,2BAAAA,KAAK,CAAEE,IAAP,4DAAaC,GAAb,CAAiB,UAACC,CAAD;AAAA,WAAOA,CAAC,CAACC,EAAT;AAAA,GAAjB,MAAiC,EAA7C;AAEA,SAAOJ,GAAG,CAACK,MAAJ,CAAW,UAACC,GAAD,EAAMF,EAAN,EAAa;AAC7B,QAAI,CAACE,GAAL,EAAU;AACR,aAAO,KAAP;AACD;;AAED,QAAMC,GAAG,GAAGT,OAAO,CAACU,OAAR,IAAmBV,OAAO,CAACU,OAAR,CAAgBJ,EAAhB,CAA/B;AACA,QAAMK,SAAS,GAAGC,KAAK,CAACC,OAAN,CAAcJ,GAAd,KAAsBA,GAAG,CAACK,QAAJ,CAAa,IAAb,CAAxC;AAEA,WAAOH,SAAS,IAAIH,GAApB;AACD,GATM,EASJ,IATI,CAAP;AAUD,CAbM;;;;IAecO,K;;;;;AACnB,mBAAc;AAAA;AAAA;AAEb;;;;SAED,aAAUC,CAAV,EAAa;AACX;AACA;AACA,WAAKC,MAAL,mCAAmBD,CAAnB,GAA0B,CAAAA,CAAC,SAAD,IAAAA,CAAC,WAAD,YAAAA,CAAC,CAAEE,MAAH,KAAa,EAAvC;;AACA,WAAKC,OAAL;AACD;;;SAOD,eAAc;AACZ,aAAO,KAAKC,QAAZ;AACD,K;SAPD,aAAYC,CAAZ,EAAe;AACb,WAAKD,QAAL,GAAgBC,CAAhB;;AACA,WAAKF,OAAL;AACD;;;WAMD,wBAAeE,CAAf,EAAkB;AAChB,WAAKD,QAAL,CAAcV,OAAd,GAAwBW,CAAC,CAACX,OAA1B;AACA,UAAMY,QAAQ,GAAGvB,UAAU,CAAC,KAAKqB,QAAN,EAAgB,KAAKH,MAArB,CAA3B;AAEA,WAAKM,aAAL,CAAmB,IAAIC,oCAAJ,CAAwB,KAAKC,OAAL,CAAaC,WAAb,EAAxB,EAAoDJ,QAApD,CAAnB;;AAEA,WAAKH,OAAL;AACD;;;WAED,6BAAoB;AAClB,WAAKA,OAAL;AACD;;;WAED,mBAAU;AAAA;;AACR,UAAI,CAAC,KAAKF,MAAN,IAAgB,CAAC,KAAKG,QAA1B,EAAoC;AAClC;AACD;;AAED,UAAMO,EAAE,gBAAGC,kBAAMC,aAAN,CAAoBC,gBAApB,EAA0B;AACnC7B,QAAAA,KAAK,EAAE,KAAKgB,MADuB;AAEnCjB,QAAAA,OAAO,EAAE,KAAKoB,QAFqB;AAGnCW,QAAAA,eAAe,EAAE,KAAKC,cAAL,CAAoBC,IAApB,CAAyB,IAAzB;AAHkB,OAA1B,CAAX;;AAMAC,2BAASC,MAAT,CAAgBR,EAAhB,EAAoB,IAApB,EAA0B,YAAM;AAC9B,uCAAW,KAAX;AACD,OAFD;AAGD;;;kDAhDgCS,W","sourcesContent":["import React from 'react';\nimport ReactDOM from 'react-dom';\nimport Main from './main';\nimport { SessionChangedEvent } from '@pie-framework/pie-player-events';\nimport { renderMath } from '@pie-lib/pie-toolbox/math-rendering';\n\nexport { Main as Component };\n\nexport const isComplete = (session, model) => {\n  const ids = model?.rows?.map((r) => r.id) || [];\n\n  return ids.reduce((acc, id) => {\n    if (!acc) {\n      return false;\n    }\n\n    const arr = session.answers && session.answers[id];\n    const hasChoice = Array.isArray(arr) && arr.includes(true);\n\n    return hasChoice && acc;\n  }, true);\n};\n\nexport default class Match extends HTMLElement {\n  constructor() {\n    super();\n  }\n\n  set model(m) {\n    // config object props should be part of the model props\n    // model.config should be no longer used\n    this._model = { ...m, ...(m?.config || {}) };\n    this._render();\n  }\n\n  set session(s) {\n    this._session = s;\n    this._render();\n  }\n\n  get session() {\n    return this._session;\n  }\n\n  sessionChanged(s) {\n    this._session.answers = s.answers;\n    const complete = isComplete(this._session, this._model);\n\n    this.dispatchEvent(new SessionChangedEvent(this.tagName.toLowerCase(), complete));\n\n    this._render();\n  }\n\n  connectedCallback() {\n    this._render();\n  }\n\n  _render() {\n    if (!this._model || !this._session) {\n      return;\n    }\n\n    const el = React.createElement(Main, {\n      model: this._model,\n      session: this._session,\n      onSessionChange: this.sessionChanged.bind(this),\n    });\n\n    ReactDOM.render(el, this, () => {\n      renderMath(this);\n    });\n  }\n}\n"],"file":"index.js"}

package/lib/main.js

@@ -52,29 +52,38 @@ var Main = /*#__PURE__*/function (_React$Component) {
     (0, _classCallCheck2["default"])(this, Main);
     _this = _super.call(this, props);
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "generateAnswers", function (model) {
-      var config = model.config;
+      var _model$rows;
+
       var answers = {};
-      config.rows.forEach(function (row) {
-        answers[row.id] = new Array(config.layout - 1).fill(false);
+      (_model$rows = model.rows) === null || _model$rows === void 0 ? void 0 : _model$rows.forEach(function (row) {
+        answers[row.id] = new Array(model.layout - 1).fill(false);
       });
       return answers;
     });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "isAnswerRegenerationRequired", function (nextProps) {
+      var _this$props$model = _this.props.model;
+      _this$props$model = _this$props$model === void 0 ? {} : _this$props$model;
+      var choiceMode = _this$props$model.choiceMode,
+          layout = _this$props$model.layout,
+          rows = _this$props$model.rows;
+      var _nextProps$session = nextProps.session;
+      _nextProps$session = _nextProps$session === void 0 ? {} : _nextProps$session;
+      var answers = _nextProps$session.answers;
       var isRequired = false;
 
-      if (_this.props.model.config.choiceMode !== nextProps.model.config.choiceMode) {
+      if (choiceMode !== nextProps.model.choiceMode) {
         isRequired = true;
       }
 
-      if (_this.props.model.config.layout !== nextProps.model.config.layout) {
+      if (layout !== nextProps.model.layout) {
         isRequired = true;
       }
 
-      if (_this.props.model.config.rows.length !== nextProps.model.config.rows.length || nextProps.session.answers && nextProps.model.config.rows.length !== Object.keys(nextProps.session.answers).length) {
+      if (rows.length !== nextProps.model.rows.length || answers && nextProps.model.rows.length !== Object.keys(answers).length) {
         isRequired = true;
       }
 
-      return isRequired || !nextProps.session.answers;
+      return isRequired || !answers;
     });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "callOnSessionChange", function () {
       var onSessionChange = _this.props.onSessionChange;
@@ -165,10 +174,10 @@ var Main = /*#__PURE__*/function (_React$Component) {
         disabled: model.disabled,
         view: model.view,
         onAnswerChange: this.onAnswerChange,
-        choiceMode: model.config.choiceMode,
-        answers: showCorrect ? model.correctResponse : session.answers,
-        headers: model.config.headers,
-        rows: model.config.rows
+        choiceMode: model.choiceMode,
+        answers: showCorrect ? model.correctResponse || {} : session.answers,
+        headers: model.headers,
+        rows: model.rows
       }), model.rationale && (0, _renderUi.hasText)(model.rationale) && /*#__PURE__*/_react["default"].createElement(_renderUi.Collapsible, {
         labels: {
           hidden: 'Show Rationale',
@@ -178,7 +187,7 @@ var Main = /*#__PURE__*/function (_React$Component) {
       }, /*#__PURE__*/_react["default"].createElement(_renderUi.PreviewPrompt, {
         prompt: model.rationale
       })), model.feedback && /*#__PURE__*/_react["default"].createElement(_renderUi.Feedback, {
-        correctness: model.correctness.correctness,
+        correctness: correctness.correctness,
         feedback: model.feedback
       }));
     }

package/lib/main.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/main.jsx"],"names":["Main","props","model","config","answers","rows","forEach","row","id","Array","layout","fill","nextProps","isRequired","choiceMode","length","session","Object","keys","onSessionChange","state","show","setState","showCorrect","newAnswers","callOnSessionChange","generateAnswers","regenAnswers","isAnswerRegenerationRequired","disabled","classes","correctness","language","showCorrectAnswerToggle","mainContainer","teacherInstructions","hidden","visible","collapsible","prompt","toggleShowCorrect","correctResponse","view","onAnswerChange","headers","rationale","feedback","React","Component","PropTypes","object","func","styles","theme","color","text","backgroundColor","background","main","width","verticalAlign","marginBottom","spacing","unit"],"mappings":"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","sourcesContent":["import React from 'react';\nimport PropTypes from 'prop-types';\nimport {CorrectAnswerToggle} from '@pie-lib/pie-toolbox/correct-answer-toggle';\nimport { color, Collapsible, Feedback, hasText, PreviewPrompt } from '@pie-lib/pie-toolbox/render-ui';\nimport AnswerGrid from './answer-grid';\nimport { withStyles } from '@material-ui/core/styles';\n\nexport class Main extends React.Component {\n  static propTypes = {\n    classes: PropTypes.object,\n    session: PropTypes.object.isRequired,\n    onSessionChange: PropTypes.func,\n    model: PropTypes.object.isRequired,\n  };\n\n  constructor(props) {\n    super(props);\n\n    this.state = {\n      session: {\n        ...props.session,\n        answers: (props.session && props.session.answers) || this.generateAnswers(props.model),\n      },\n      showCorrect: false,\n    };\n\n    this.callOnSessionChange();\n  }\n\n  generateAnswers = (model) => {\n    const { config } = model;\n    const answers = {};\n\n    config.rows.forEach((row) => {\n      answers[row.id] = new Array(config.layout - 1).fill(false);\n    });\n\n    return answers;\n  };\n\n  isAnswerRegenerationRequired = (nextProps) => {\n    let isRequired = false;\n\n    if (this.props.model.config.choiceMode !== nextProps.model.config.choiceMode) {\n      isRequired = true;\n    }\n\n    if (this.props.model.config.layout !== nextProps.model.config.layout) {\n      isRequired = true;\n    }\n\n    if (\n      this.props.model.config.rows.length !== nextProps.model.config.rows.length ||\n      (nextProps.session.answers &&\n        nextProps.model.config.rows.length !== Object.keys(nextProps.session.answers).length)\n    ) {\n      isRequired = true;\n    }\n\n    return isRequired || !nextProps.session.answers;\n  };\n\n  UNSAFE_componentWillReceiveProps(nextProps) {\n    const regenAnswers = this.isAnswerRegenerationRequired(nextProps);\n\n    this.setState(\n      (state) => ({\n        session: {\n          ...nextProps.session,\n          // regenerate answers if layout or choiceMode change\n          answers: regenAnswers ? this.generateAnswers(nextProps.model) : nextProps.session.answers,\n        },\n        showCorrect:\n          this.props.model.disabled && !nextProps.model.disabled && state.showCorrect ? false : state.showCorrect,\n      }),\n      () => {\n        if (regenAnswers) this.callOnSessionChange();\n      },\n    );\n  }\n\n  callOnSessionChange = () => {\n    const { onSessionChange } = this.props;\n\n    if (onSessionChange) {\n      onSessionChange(this.state.session);\n    }\n  };\n\n  toggleShowCorrect = (show) => {\n    this.setState({ showCorrect: show });\n  };\n\n  onAnswerChange = (newAnswers) => {\n    this.setState(\n      (state) => ({\n        session: {\n          ...state.session,\n          answers: newAnswers,\n        },\n      }),\n      this.callOnSessionChange,\n    );\n  };\n\n  render() {\n    const { model, classes } = this.props;\n    const { showCorrect, session } = this.state;\n    const { correctness = {}, language } = model;\n    const showCorrectAnswerToggle = correctness.correctness && correctness.correctness !== 'correct';\n\n    return (\n      <div className={classes.mainContainer}>\n        {model.teacherInstructions && hasText(model.teacherInstructions) && (\n          <Collapsible\n            labels={{\n              hidden: 'Show Teacher Instructions',\n              visible: 'Hide Teacher Instructions',\n            }}\n            className={classes.collapsible}\n          >\n            <PreviewPrompt prompt={model.teacherInstructions} />\n          </Collapsible>\n        )}\n\n        {model.prompt && (\n          <div className={classes.prompt}>\n            <PreviewPrompt prompt={model.prompt} />\n          </div>\n        )}\n\n        <CorrectAnswerToggle\n          language={language}\n          show={showCorrectAnswerToggle}\n          toggled={showCorrect}\n          onToggle={this.toggleShowCorrect}\n        />\n\n        <AnswerGrid\n          showCorrect={showCorrect}\n          correctAnswers={model.correctResponse}\n          disabled={model.disabled}\n          view={model.view}\n          onAnswerChange={this.onAnswerChange}\n          choiceMode={model.config.choiceMode}\n          answers={showCorrect ? model.correctResponse : session.answers}\n          headers={model.config.headers}\n          rows={model.config.rows}\n        />\n\n        {model.rationale && hasText(model.rationale) && (\n          <Collapsible labels={{ hidden: 'Show Rationale', visible: 'Hide Rationale' }} className={classes.collapsible}>\n            <PreviewPrompt prompt={model.rationale} />\n          </Collapsible>\n        )}\n\n        {model.feedback && <Feedback correctness={model.correctness.correctness} feedback={model.feedback} />}\n      </div>\n    );\n  }\n}\n\nconst styles = (theme) => ({\n  mainContainer: {\n    color: color.text(),\n    backgroundColor: color.background(),\n  },\n  main: {\n    width: '100%',\n  },\n  prompt: {\n    verticalAlign: 'middle',\n  },\n  collapsible: {\n    marginBottom: theme.spacing.unit * 2,\n  },\n});\n\nexport default withStyles(styles)(Main);\n"],"file":"main.js"}
+{"version":3,"sources":["../src/main.jsx"],"names":["Main","props","model","answers","rows","forEach","row","id","Array","layout","fill","nextProps","choiceMode","session","isRequired","length","Object","keys","onSessionChange","state","show","setState","showCorrect","newAnswers","callOnSessionChange","generateAnswers","regenAnswers","isAnswerRegenerationRequired","disabled","classes","correctness","language","showCorrectAnswerToggle","mainContainer","teacherInstructions","hidden","visible","collapsible","prompt","toggleShowCorrect","correctResponse","view","onAnswerChange","headers","rationale","feedback","React","Component","PropTypes","object","func","styles","theme","color","text","backgroundColor","background","main","width","verticalAlign","marginBottom","spacing","unit"],"mappings":"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","sourcesContent":["import React from 'react';\nimport PropTypes from 'prop-types';\nimport { CorrectAnswerToggle } from '@pie-lib/pie-toolbox/correct-answer-toggle';\nimport { color, Collapsible, Feedback, hasText, PreviewPrompt } from '@pie-lib/pie-toolbox/render-ui';\nimport AnswerGrid from './answer-grid';\nimport { withStyles } from '@material-ui/core/styles';\n\nexport class Main extends React.Component {\n  static propTypes = {\n    classes: PropTypes.object,\n    session: PropTypes.object.isRequired,\n    onSessionChange: PropTypes.func,\n    model: PropTypes.object.isRequired,\n  };\n\n  constructor(props) {\n    super(props);\n\n    this.state = {\n      session: {\n        ...props.session,\n        answers: (props.session && props.session.answers) || this.generateAnswers(props.model),\n      },\n      showCorrect: false,\n    };\n\n    this.callOnSessionChange();\n  }\n\n  generateAnswers = (model) => {\n    const answers = {};\n\n    model.rows?.forEach((row) => {\n      answers[row.id] = new Array(model.layout - 1).fill(false);\n    });\n\n    return answers;\n  };\n\n  isAnswerRegenerationRequired = (nextProps) => {\n    const { model: { choiceMode, layout, rows } = {} } = this.props;\n    const { session: { answers } = {} } = nextProps;\n    let isRequired = false;\n\n    if (choiceMode !== nextProps.model.choiceMode) {\n      isRequired = true;\n    }\n\n    if (layout !== nextProps.model.layout) {\n      isRequired = true;\n    }\n\n    if (\n      rows.length !== nextProps.model.rows.length ||\n      (answers && nextProps.model.rows.length !== Object.keys(answers).length)\n    ) {\n      isRequired = true;\n    }\n\n    return isRequired || !answers;\n  };\n\n  UNSAFE_componentWillReceiveProps(nextProps) {\n    const regenAnswers = this.isAnswerRegenerationRequired(nextProps);\n\n    this.setState(\n      (state) => ({\n        session: {\n          ...nextProps.session,\n          // regenerate answers if layout or choiceMode change\n          answers: regenAnswers ? this.generateAnswers(nextProps.model) : nextProps.session.answers,\n        },\n        showCorrect:\n          this.props.model.disabled && !nextProps.model.disabled && state.showCorrect ? false : state.showCorrect,\n      }),\n      () => {\n        if (regenAnswers) this.callOnSessionChange();\n      },\n    );\n  }\n\n  callOnSessionChange = () => {\n    const { onSessionChange } = this.props;\n\n    if (onSessionChange) {\n      onSessionChange(this.state.session);\n    }\n  };\n\n  toggleShowCorrect = (show) => {\n    this.setState({ showCorrect: show });\n  };\n\n  onAnswerChange = (newAnswers) => {\n    this.setState(\n      (state) => ({\n        session: {\n          ...state.session,\n          answers: newAnswers,\n        },\n      }),\n      this.callOnSessionChange,\n    );\n  };\n\n  render() {\n    const { model, classes } = this.props;\n    const { showCorrect, session } = this.state;\n    const { correctness = {}, language } = model;\n    const showCorrectAnswerToggle = correctness.correctness && correctness.correctness !== 'correct';\n\n    return (\n      <div className={classes.mainContainer}>\n        {model.teacherInstructions && hasText(model.teacherInstructions) && (\n          <Collapsible\n            labels={{\n              hidden: 'Show Teacher Instructions',\n              visible: 'Hide Teacher Instructions',\n            }}\n            className={classes.collapsible}\n          >\n            <PreviewPrompt prompt={model.teacherInstructions} />\n          </Collapsible>\n        )}\n\n        {model.prompt && (\n          <div className={classes.prompt}>\n            <PreviewPrompt prompt={model.prompt} />\n          </div>\n        )}\n\n        <CorrectAnswerToggle\n          language={language}\n          show={showCorrectAnswerToggle}\n          toggled={showCorrect}\n          onToggle={this.toggleShowCorrect}\n        />\n\n        <AnswerGrid\n          showCorrect={showCorrect}\n          correctAnswers={model.correctResponse}\n          disabled={model.disabled}\n          view={model.view}\n          onAnswerChange={this.onAnswerChange}\n          choiceMode={model.choiceMode}\n          answers={showCorrect ? model.correctResponse || {} : session.answers}\n          headers={model.headers}\n          rows={model.rows}\n        />\n\n        {model.rationale && hasText(model.rationale) && (\n          <Collapsible labels={{ hidden: 'Show Rationale', visible: 'Hide Rationale' }} className={classes.collapsible}>\n            <PreviewPrompt prompt={model.rationale} />\n          </Collapsible>\n        )}\n\n        {model.feedback && <Feedback correctness={correctness.correctness} feedback={model.feedback} />}\n      </div>\n    );\n  }\n}\n\nconst styles = (theme) => ({\n  mainContainer: {\n    color: color.text(),\n    backgroundColor: color.background(),\n  },\n  main: {\n    width: '100%',\n  },\n  prompt: {\n    verticalAlign: 'middle',\n  },\n  collapsible: {\n    marginBottom: theme.spacing.unit * 2,\n  },\n});\n\nexport default withStyles(styles)(Main);\n"],"file":"main.js"}

package/package.json

@@ -4,7 +4,7 @@
     "access": "public"
   },
   "repository": "pie-framework/pie-elements",
-  "version": "6.3.3-next.9+0e3bad244",
+  "version": "7.0.1-next.0+6142ef5c9",
   "main": "lib/index.js",
   "description": "",
   "scripts": {
@@ -14,7 +14,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "1.7.4",
+    "@pie-lib/pie-toolbox": "1.8.1",
     "classnames": "^2.2.5",
     "debug": "^4.1.1",
     "lodash": "^4.17.10",
@@ -24,6 +24,6 @@
   },
   "author": "",
   "license": "ISC",
-  "gitHead": "0e3bad2448efb7228818808395371d5c4df6fca1",
+  "gitHead": "6142ef5c90d80fe9f0c50572e8a99693f6420731",
   "module": "src/index.js"
 }