@pie-element/graphing 3.5.3 → 3.5.4-next.1016

package/configure/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.js"],"names":["log","sortedAnswers","answers","Object","keys","sort","reduce","result","key","GraphLinesConfigure","model","_model","_render","dispatchEvent","ModelUpdatedEvent","config","_configuration","handler","InsertImageEvent","src","done","DeleteImageEvent","createDefaultModel","defaultValues","configuration","m","c","el","React","createElement","Configure","onModelChanged","onConfigurationChanged","imageSupport","add","insertImage","onDeleteImage","ReactDOM","render","HTMLElement","hasOwnProperty","assign","correctAnswer"],"mappings":"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","sourcesContent":["import React from 'react';\nimport ReactDOM from 'react-dom';\nimport Configure from './configure';\nimport { DeleteImageEvent, InsertImageEvent, ModelUpdatedEvent } from '@pie-framework/pie-configure-events';\nimport debug from 'debug';\n\nimport defaultValues from './defaults';\n\nconst log = debug('pie-elements:graphing:configure');\nimport isEmpty from 'lodash/isEmpty';\n\n// this function is implemented in controller as well\nconst sortedAnswers = (answers) => {\n  answers = answers || {};\n\n  return Object.keys(answers).sort().reduce((result, key) => {\n    result[key] = answers[key];\n\n    return result;\n  }, {});\n};\n\nexport default class GraphLinesConfigure extends HTMLElement {\n  static createDefaultModel = (model = {}) => {\n    \n    if (!isEmpty(model.answers) && model.answers.hasOwnProperty('correctAnswer')) {\n        model.answers = Object.assign({ correctAnswer: model.answers.correctAnswer }, sortedAnswers(model.answers));\n    }\n\n    return { ...defaultValues.model, ...model }\n  };\n\n  constructor() {\n    super();\n    this._model = GraphLinesConfigure.createDefaultModel();\n    this._configuration = defaultValues.configuration;\n  }\n\n  set model(m) {\n    this._model = GraphLinesConfigure.createDefaultModel(m);\n    this._render();\n  }\n\n  set configuration(c) {\n    this._configuration = c;\n    this._render();\n  }\n\n  onModelChanged = (model) => {\n    this._model = model;\n    this._render();\n\n    log('[onModelChanged]: ', this._model);\n\n    this.dispatchEvent(new ModelUpdatedEvent(this._model, true));\n  };\n\n  onConfigurationChanged = (config) => {\n    this._configuration = config;\n    this._render();\n  };\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  _render() {\n    if (this._model) {\n      const el = React.createElement(Configure, {\n        onModelChanged: this.onModelChanged,\n        onConfigurationChanged: this.onConfigurationChanged,\n        model: this._model,\n        configuration: this._configuration,\n        imageSupport: {\n          add: this.insertImage,\n          delete: this.onDeleteImage,\n        }\n      });\n      ReactDOM.render(el, this);\n    }\n  }\n}\n"],"file":"index.js"}
+{"version":3,"sources":["../src/index.js"],"names":["log","sortedAnswers","answers","Object","keys","sort","reduce","result","key","GraphLinesConfigure","model","_model","_render","dispatchEvent","ModelUpdatedEvent","config","_configuration","handler","InsertImageEvent","src","done","DeleteImageEvent","createDefaultModel","defaultValues","configuration","m","c","el","React","createElement","Configure","onModelChanged","onConfigurationChanged","imageSupport","add","insertImage","onDeleteImage","ReactDOM","render","HTMLElement","normalizedModel","domain","defaultTool","graph","range","standardGrid","toolbarTools","toolbarToolsNoLabel","filter","tool","normalizedDefaultTool","length","correctAnswer","min","max","step","labelStep","height","width"],"mappings":"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","sourcesContent":["import React from 'react';\nimport ReactDOM from 'react-dom';\nimport Configure from './configure';\nimport { DeleteImageEvent, InsertImageEvent, ModelUpdatedEvent } from '@pie-framework/pie-configure-events';\nimport debug from 'debug';\nimport defaultValues from './defaults';\n\nconst log = debug('pie-elements:graphing:configure');\n\n// this function is implemented in controller as well\nconst sortedAnswers = answers => Object.keys(answers || {}).sort().reduce((result, key) => {\n  if (key !== 'correctAnswer') {\n    result[key] = answers[key];\n  }\n\n  return result;\n}, {});\n\nexport default class GraphLinesConfigure extends HTMLElement {\n  static createDefaultModel = (model = {}) => {\n    const normalizedModel = { ...defaultValues.model, ...model };\n    const {\n      answers = {},\n      domain = {},\n      defaultTool,\n      graph = {},\n      range = {},\n      standardGrid,\n      toolbarTools\n    } = normalizedModel;\n\n    // added support for models without defaultTool defined; also used in packages/graphing/controller/src/index.js\n    const toolbarToolsNoLabel = (toolbarTools || []).filter(tool => tool !== 'label');\n    const normalizedDefaultTool = defaultTool || toolbarToolsNoLabel.length && toolbarToolsNoLabel[0] || '';\n\n    return {\n      ...normalizedModel,\n      answers: answers && answers.correctAnswer && {\n        correctAnswer: answers.correctAnswer,\n        ...sortedAnswers(answers)\n      } || answers,\n      defaultTool: normalizedDefaultTool,\n      range: standardGrid && {\n        ...range,\n        min: domain.min,\n        max: domain.max,\n        step: domain.step,\n        labelStep: domain.labelStep\n      } || range,\n      graph: standardGrid && { ...graph, height: graph.width } || graph\n    };\n  };\n\n  constructor() {\n    super();\n    this._model = GraphLinesConfigure.createDefaultModel();\n    this._configuration = defaultValues.configuration;\n  }\n\n  set model(m) {\n    this._model = GraphLinesConfigure.createDefaultModel(m);\n    this._render();\n  }\n\n  set configuration(c) {\n    this._configuration = c;\n    this._render();\n  }\n\n  onModelChanged = (model) => {\n    this._model = model;\n    this._render();\n\n    log('[onModelChanged]: ', this._model);\n\n    this.dispatchEvent(new ModelUpdatedEvent(this._model));\n  };\n\n  onConfigurationChanged = (config) => {\n    this._configuration = config;\n    this._render();\n  };\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  _render() {\n    if (this._model) {\n      const el = React.createElement(Configure, {\n        onModelChanged: this.onModelChanged,\n        onConfigurationChanged: this.onConfigurationChanged,\n        model: this._model,\n        configuration: this._configuration,\n        imageSupport: {\n          add: this.insertImage,\n          delete: this.onDeleteImage,\n        }\n      });\n      ReactDOM.render(el, this);\n    }\n  }\n}\n"],"file":"index.js"}

package/configure/lib/utils.js

@@ -0,0 +1,94 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getLabelValues = exports.getGridValues = exports.applyConstraints = exports.VALID_LABEL_VALUES = void 0;
+
+var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
+
+var VALID_GRID_VALUES = [0.01, 0.02, 0.04, 0.05, 0.0625, 0.1, 0.125, 0.2, 0.25, 0.5, 1, 2, 3, 4, 5, 8, 10, 12, 15, 20, 40, 50, 64, 100, 500, 1000]; // same as VALID_GRID_VALUES but next values are excluded: 0.04, 0.0625, 0.125, 3, 4, 8, 12, 15, 40, 64
+
+var PREFERRED_VALID_GRID_VALUES = [0.01, 0.02, 0.05, 0.1, 0.2, 0.25, 0.5, 1, 2, 5, 10, 20, 50, 100, 500, 1000];
+var VALID_LABEL_VALUES = {
+  '0.01': [0, 0.01, 0.02, 0.04, 0.05, 0.1],
+  '0.02': [0, 0.02, 0.04, 0.1],
+  '0.04': [0, 0.04, 0.08, 0.16, 0.2],
+  '0.05': [0, 0.05, 0.1, 0.2, 0.25],
+  '0.0625': [0, 0.0625, 0.125, 0.25, 0.5],
+  '0.1': [0, 0.1, 0.2, 0.4, 0.5, 1],
+  '0.125': [0, 0.125, 0.25, 0.5, 1],
+  '0.2': [0, 0.2, 0.5, 0.1],
+  '0.25': [0, 0.25, 0.5, 1, 2],
+  '0.5': [0, 0.5, 1, 2],
+  '1': [0, 1, 2, 4, 5, 10],
+  '2': [0, 2, 4, 8, 10],
+  '3': [0, 3, 6, 12, 15],
+  '4': [0, 4, 8, 16, 20],
+  '5': [0, 5, 10, 20, 25],
+  '8': [0, 8, 16, 32, 40, 64],
+  '10': [0, 10, 20, 40, 50, 100],
+  '12': [0, 12, 24],
+  '15': [0, 15, 30, 60],
+  '20': [0, 20, 40, 80, 100],
+  '40': [0, 40, 80, 160, 200],
+  '50': [0, 50, 100, 200, 250],
+  '64': [0, 64, 128],
+  '100': [0, 100, 200, 400, 500],
+  '500': [0, 500, 1000, 2500],
+  '1000': [0, 1000, 2000, 4000, 5000]
+};
+exports.VALID_LABEL_VALUES = VALID_LABEL_VALUES;
+
+var getGridValues = function getGridValues(axis, size) {
+  var prefferedValues = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+  var minValue = 10 * (axis.max - axis.min) / size;
+  var maxValue = minValue * 10;
+  var values = prefferedValues ? PREFERRED_VALID_GRID_VALUES : VALID_GRID_VALUES;
+  return values.filter(function (value) {
+    return value >= minValue && value <= maxValue;
+  });
+};
+
+exports.getGridValues = getGridValues;
+
+var getLabelValues = function getLabelValues(value) {
+  return VALID_LABEL_VALUES[value] || [];
+};
+
+exports.getLabelValues = getLabelValues;
+
+var applyConstraints = function applyConstraints(axis, size, oldGridValues, oldLabelValues) {
+  var gridValues = getGridValues(axis, size);
+  var labelValues = getLabelValues(axis.step);
+
+  if (!(0, _isEqual["default"])(oldGridValues, gridValues) && !gridValues.includes(axis.step)) {
+    var preferredValues = getGridValues(axis, size, true);
+    var lowestValue = preferredValues[0] || 1;
+    axis.step = lowestValue;
+    labelValues = getLabelValues(lowestValue);
+
+    if (!labelValues.includes(axis.labelStep)) {
+      axis.labelStep = lowestValue;
+    }
+
+    return {
+      gridValues: gridValues,
+      labelValues: labelValues
+    };
+  }
+
+  if (!(0, _isEqual["default"])(oldLabelValues, labelValues) && !labelValues.includes(axis.labelStep)) {
+    axis.labelStep = axis.step;
+  }
+
+  return {
+    gridValues: gridValues,
+    labelValues: labelValues
+  };
+};
+
+exports.applyConstraints = applyConstraints;
+//# sourceMappingURL=utils.js.map

package/configure/lib/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/utils.js"],"names":["VALID_GRID_VALUES","PREFERRED_VALID_GRID_VALUES","VALID_LABEL_VALUES","getGridValues","axis","size","prefferedValues","minValue","max","min","maxValue","values","filter","value","getLabelValues","applyConstraints","oldGridValues","oldLabelValues","gridValues","labelValues","step","includes","preferredValues","lowestValue","labelStep"],"mappings":"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","sourcesContent":["import isEqual from 'lodash/isEqual';\n\nconst VALID_GRID_VALUES = [\n  0.01, 0.02, 0.04, 0.05, 0.0625, 0.1, 0.125, 0.2, 0.25, 0.5,\n  1, 2, 3, 4, 5, 8, 10, 12, 15, 20, 40, 50, 64, 100, 500, 1000\n];\n\n// same as VALID_GRID_VALUES but next values are excluded: 0.04, 0.0625, 0.125, 3, 4, 8, 12, 15, 40, 64\nconst PREFERRED_VALID_GRID_VALUES = [ 0.01, 0.02, 0.05, 0.1, 0.2, 0.25, 0.5, 1, 2, 5, 10, 20, 50, 100, 500, 1000 ];\n\nexport const VALID_LABEL_VALUES = {\n  '0.01': [0, 0.01, 0.02, 0.04, 0.05, 0.1],\n  '0.02': [0, 0.02, 0.04, 0.1],\n  '0.04': [0, 0.04, 0.08, 0.16, 0.2],\n  '0.05': [0, 0.05, 0.1, 0.2, 0.25],\n  '0.0625': [0, 0.0625, 0.125, 0.25, 0.5],\n  '0.1': [0, 0.1, 0.2, 0.4, 0.5, 1],\n  '0.125': [0, 0.125, 0.25, 0.5, 1],\n  '0.2': [0, 0.2, 0.5, 0.1],\n  '0.25': [0, 0.25, 0.5, 1, 2],\n  '0.5': [0, 0.5, 1, 2],\n  '1': [0, 1, 2, 4, 5, 10],\n  '2': [0, 2, 4, 8, 10],\n  '3': [0, 3, 6, 12, 15],\n  '4': [0, 4, 8, 16, 20],\n  '5': [0, 5, 10, 20, 25],\n  '8': [0, 8, 16, 32, 40, 64],\n  '10': [0, 10, 20, 40, 50, 100],\n  '12': [0, 12, 24],\n  '15': [0, 15, 30, 60],\n  '20': [0, 20, 40, 80, 100],\n  '40': [0, 40, 80, 160, 200],\n  '50': [0, 50, 100, 200, 250],\n  '64': [0, 64, 128],\n  '100': [0, 100, 200, 400, 500],\n  '500': [0, 500, 1000, 2500],\n  '1000': [0, 1000, 2000, 4000, 5000]\n};\n\nexport const getGridValues = (axis, size, prefferedValues = false) => {\n  const minValue = 10 * (axis.max - axis.min) / size;\n  const maxValue = minValue * 10;\n  const values = prefferedValues ? PREFERRED_VALID_GRID_VALUES : VALID_GRID_VALUES;\n\n  return values.filter(value => value >= minValue && value <= maxValue);\n};\n\nexport const getLabelValues = value => VALID_LABEL_VALUES[value] || [];\n\nexport const applyConstraints = (axis, size, oldGridValues, oldLabelValues) => {\n  const gridValues = getGridValues(axis, size);\n  let labelValues = getLabelValues(axis.step);\n\n  if (!isEqual(oldGridValues, gridValues) && !gridValues.includes(axis.step)) {\n    const preferredValues = getGridValues(axis, size, true);\n    const lowestValue = preferredValues[0] || 1;\n\n    axis.step = lowestValue;\n    labelValues = getLabelValues(lowestValue);\n\n    if (!labelValues.includes(axis.labelStep)) {\n      axis.labelStep = lowestValue;\n    }\n\n    return { gridValues, labelValues };\n  }\n\n  if (!isEqual(oldLabelValues, labelValues) && !labelValues.includes(axis.labelStep)) {\n    axis.labelStep = axis.step;\n  }\n\n  return { gridValues, labelValues };\n};\n"],"file":"utils.js"}

package/configure/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pie-element/graphing-configure",
   "private": true,
-  "version": "3.1.27",
+  "version": "3.3.15",
   "description": "",
   "main": "lib/index.js",
   "module": "src/index.js",
@@ -9,9 +9,9 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.2.0",
-    "@pie-lib/config-ui": "^10.9.2",
-    "@pie-lib/editable-html": "^7.16.19",
-    "@pie-lib/graphing": "^2.3.2",
+    "@pie-lib/config-ui": "^10.13.3",
+    "@pie-lib/editable-html": "^7.22.6",
+    "@pie-lib/graphing": "^2.6.3",
     "classnames": "^2.2.5",
     "debug": "^4.1.1",
     "prop-types": "^15.6.2",

package/controller/CHANGELOG.md

@@ -3,6 +3,46 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.4.5](https://github.com/pie-framework/pie-elements/compare/@pie-element/graphing-controller@3.4.4...@pie-element/graphing-controller@3.4.5) (2022-02-21)
+
+**Note:** Version bump only for package @pie-element/graphing-controller
+
+
+
+
+
+## [3.4.1](https://github.com/pie-framework/pie-elements/compare/@pie-element/graphing-controller@3.3.0...@pie-element/graphing-controller@3.4.1) (2021-11-11)
+
+**Note:** Version bump only for package @pie-element/graphing-controller
+
+
+
+
+
+# [3.4.0](https://github.com/pie-framework/pie-elements/compare/@pie-element/graphing-controller@3.2.16...@pie-element/graphing-controller@3.4.0) (2021-11-11)
+
+
+### Features
+
+* **graphing:** control over displaying graph arrows PD-483 ([6f98639](https://github.com/pie-framework/pie-elements/commit/6f98639b4bcce0e7ce75f28435c6fe1c8db8a4d4))
+* **graphing:** Displayed point coordinates on hover PD-188 \n BREAKING CHANGE: Added coordinatesOnHover property to the model ([124cc2d](https://github.com/pie-framework/pie-elements/commit/124cc2de418fbdd1825c6c39eee550875a3e24af))
+
+
+
+
+
+# [3.3.0](https://github.com/pie-framework/pie-elements/compare/@pie-element/graphing-controller@3.2.16...@pie-element/graphing-controller@3.3.0) (2021-08-05)
+
+
+### Features
+
+* **graphing:** control over displaying graph arrows PD-483 ([6f98639](https://github.com/pie-framework/pie-elements/commit/6f98639b4bcce0e7ce75f28435c6fe1c8db8a4d4))
+* **graphing:** Displayed point coordinates on hover PD-188 \n BREAKING CHANGE: Added coordinatesOnHover property to the model ([124cc2d](https://github.com/pie-framework/pie-elements/commit/124cc2de418fbdd1825c6c39eee550875a3e24af))
+
+
+
+
+
 ## [3.2.16](https://github.com/pie-framework/pie-elements/compare/@pie-element/graphing-controller@3.2.14...@pie-element/graphing-controller@3.2.16) (2021-08-05)
 
 

package/controller/lib/defaults.js

@@ -10,7 +10,12 @@ var allTools = ['circle', 'line', 'label', 'parabola', 'point', 'polygon', 'ray'
 
 var _default = {
   answers: {},
-  arrows: true,
+  arrows: {
+    left: true,
+    right: true,
+    up: true,
+    down: true
+  },
   backgroundMarks: [],
   domain: {
     min: -5,
@@ -23,7 +28,9 @@ var _default = {
     width: 500,
     height: 500
   },
+  includeAxes: true,
   labels: {},
+  coordinatesOnHover: false,
   padding: true,
   prompt: '',
   range: {
@@ -34,6 +41,7 @@ var _default = {
     axisLabel: 'y'
   },
   rationale: '',
+  standardGrid: false,
   title: '',
   toolbarTools: allTools,
   promptEnabled: true,

package/controller/lib/defaults.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/defaults.js"],"names":["allTools","answers","arrows","backgroundMarks","domain","min","max","step","labelStep","axisLabel","graph","width","height","labels","padding","prompt","range","rationale","title","toolbarTools","promptEnabled","rationaleEnabled","teacherInstructionsEnabled","studentInstructionsEnabled"],"mappings":";;;;;;AAAA;AACA,IAAMA,QAAQ,GAAG,CACf,QADe,EAEf,MAFe,EAGf,OAHe,EAIf,UAJe,EAKf,OALe,EAMf,SANe,EAOf,KAPe,EAQf,SARe,EASf,MATe,EAUf,QAVe,CAAjB;AAYA;;eACe;AACbC,EAAAA,OAAO,EAAE,EADI;AAEbC,EAAAA,MAAM,EAAE,IAFK;AAGbC,EAAAA,eAAe,EAAE,EAHJ;AAIbC,EAAAA,MAAM,EAAE;AACNC,IAAAA,GAAG,EAAE,CAAC,CADA;AAENC,IAAAA,GAAG,EAAE,CAFC;AAGNC,IAAAA,IAAI,EAAE,CAHA;AAINC,IAAAA,SAAS,EAAE,CAJL;AAKNC,IAAAA,SAAS,EAAE;AALL,GAJK;AAWbC,EAAAA,KAAK,EAAE;AACLC,IAAAA,KAAK,EAAE,GADF;AAELC,IAAAA,MAAM,EAAE;AAFH,GAXM;AAebC,EAAAA,MAAM,EAAE,EAfK;AAgBbC,EAAAA,OAAO,EAAE,IAhBI;AAiBbC,EAAAA,MAAM,EAAE,EAjBK;AAkBbC,EAAAA,KAAK,EAAE;AACLX,IAAAA,GAAG,EAAE,CAAC,CADD;AAELC,IAAAA,GAAG,EAAE,CAFA;AAGLC,IAAAA,IAAI,EAAE,CAHD;AAILC,IAAAA,SAAS,EAAE,CAJN;AAKLC,IAAAA,SAAS,EAAE;AALN,GAlBM;AAyBbQ,EAAAA,SAAS,EAAE,EAzBE;AA0BbC,EAAAA,KAAK,EAAE,EA1BM;AA2BbC,EAAAA,YAAY,EAAEnB,QA3BD;AA4BboB,EAAAA,aAAa,EAAE,IA5BF;AA6BbC,EAAAA,gBAAgB,EAAE,IA7BL;AA8BbC,EAAAA,0BAA0B,EAAE,IA9Bf;AA+BbC,EAAAA,0BAA0B,EAAE;AA/Bf,C","sourcesContent":["// TODO: This is lifted from @pie-lib/graphing, however importing this will break a controller build because it has jsx source in that package.\nconst allTools = [\n  'circle',\n  'line',\n  'label',\n  'parabola',\n  'point',\n  'polygon',\n  'ray',\n  'segment',\n  'sine',\n  'vector'];\n\n/* model defaults */\nexport default {\n  answers: {},\n  arrows: true,\n  backgroundMarks: [],\n  domain: {\n    min: -5,\n    max: 5,\n    step: 1,\n    labelStep: 1,\n    axisLabel: 'x'\n  },\n  graph: {\n    width: 500,\n    height: 500\n  },\n  labels: {},\n  padding: true,\n  prompt: '',\n  range: {\n    min: -5,\n    max: 5,\n    step: 1,\n    labelStep: 1,\n    axisLabel: 'y'\n  },\n  rationale: '',\n  title: '',\n  toolbarTools: allTools,\n  promptEnabled: true,\n  rationaleEnabled: true,\n  teacherInstructionsEnabled: true,\n  studentInstructionsEnabled: true\n};\n"],"file":"defaults.js"}
+{"version":3,"sources":["../src/defaults.js"],"names":["allTools","answers","arrows","left","right","up","down","backgroundMarks","domain","min","max","step","labelStep","axisLabel","graph","width","height","includeAxes","labels","coordinatesOnHover","padding","prompt","range","rationale","standardGrid","title","toolbarTools","promptEnabled","rationaleEnabled","teacherInstructionsEnabled","studentInstructionsEnabled"],"mappings":";;;;;;AAAA;AACA,IAAMA,QAAQ,GAAG,CACf,QADe,EAEf,MAFe,EAGf,OAHe,EAIf,UAJe,EAKf,OALe,EAMf,SANe,EAOf,KAPe,EAQf,SARe,EASf,MATe,EAUf,QAVe,CAAjB;AAaA;;eACe;AACbC,EAAAA,OAAO,EAAE,EADI;AAEbC,EAAAA,MAAM,EAAE;AACNC,IAAAA,IAAI,EAAE,IADA;AAENC,IAAAA,KAAK,EAAE,IAFD;AAGNC,IAAAA,EAAE,EAAE,IAHE;AAINC,IAAAA,IAAI,EAAE;AAJA,GAFK;AAQbC,EAAAA,eAAe,EAAE,EARJ;AASbC,EAAAA,MAAM,EAAE;AACNC,IAAAA,GAAG,EAAE,CAAC,CADA;AAENC,IAAAA,GAAG,EAAE,CAFC;AAGNC,IAAAA,IAAI,EAAE,CAHA;AAINC,IAAAA,SAAS,EAAE,CAJL;AAKNC,IAAAA,SAAS,EAAE;AALL,GATK;AAgBbC,EAAAA,KAAK,EAAE;AACLC,IAAAA,KAAK,EAAE,GADF;AAELC,IAAAA,MAAM,EAAE;AAFH,GAhBM;AAoBbC,EAAAA,WAAW,EAAE,IApBA;AAqBbC,EAAAA,MAAM,EAAE,EArBK;AAsBbC,EAAAA,kBAAkB,EAAE,KAtBP;AAuBbC,EAAAA,OAAO,EAAE,IAvBI;AAwBbC,EAAAA,MAAM,EAAE,EAxBK;AAyBbC,EAAAA,KAAK,EAAE;AACLb,IAAAA,GAAG,EAAE,CAAC,CADD;AAELC,IAAAA,GAAG,EAAE,CAFA;AAGLC,IAAAA,IAAI,EAAE,CAHD;AAILC,IAAAA,SAAS,EAAE,CAJN;AAKLC,IAAAA,SAAS,EAAE;AALN,GAzBM;AAgCbU,EAAAA,SAAS,EAAE,EAhCE;AAiCbC,EAAAA,YAAY,EAAE,KAjCD;AAkCbC,EAAAA,KAAK,EAAE,EAlCM;AAmCbC,EAAAA,YAAY,EAAE1B,QAnCD;AAoCb2B,EAAAA,aAAa,EAAE,IApCF;AAqCbC,EAAAA,gBAAgB,EAAE,IArCL;AAsCbC,EAAAA,0BAA0B,EAAE,IAtCf;AAuCbC,EAAAA,0BAA0B,EAAE;AAvCf,C","sourcesContent":["// TODO: This is lifted from @pie-lib/graphing, however importing this will break a controller build because it has jsx source in that package.\nconst allTools = [\n  'circle',\n  'line',\n  'label',\n  'parabola',\n  'point',\n  'polygon',\n  'ray',\n  'segment',\n  'sine',\n  'vector'\n];\n\n/* model defaults */\nexport default {\n  answers: {},\n  arrows: {\n    left: true,\n    right: true,\n    up: true,\n    down: true\n  },\n  backgroundMarks: [],\n  domain: {\n    min: -5,\n    max: 5,\n    step: 1,\n    labelStep: 1,\n    axisLabel: 'x'\n  },\n  graph: {\n    width: 500,\n    height: 500\n  },\n  includeAxes: true,\n  labels: {},\n  coordinatesOnHover: false,\n  padding: true,\n  prompt: '',\n  range: {\n    min: -5,\n    max: 5,\n    step: 1,\n    labelStep: 1,\n    axisLabel: 'y'\n  },\n  rationale: '',\n  standardGrid: false,\n  title: '',\n  toolbarTools: allTools,\n  promptEnabled: true,\n  rationaleEnabled: true,\n  teacherInstructionsEnabled: true,\n  studentInstructionsEnabled: true\n};\n"],"file":"defaults.js"}

package/controller/lib/index.js

@@ -5,9 +5,10 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.getBestAnswer = exports.getAnswerCorrected = exports.createCorrectResponseSession = exports.compareMarks = void 0;
 exports.model = model;
+exports.normalize = void 0;
 exports.outcome = outcome;
-exports.createCorrectResponseSession = exports.normalize = exports.getBestAnswer = exports.orderCorrectAnswers = exports.getAnswerCorrected = exports.compareMarks = void 0;
 
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 
@@ -29,9 +30,11 @@ var _utils = require("./utils");
 
 var _controllerUtils = require("@pie-lib/controller-utils");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+var _excluded = ["defaultTool", "prompt", "promptEnabled", "graph", "answers", "toolbarTools"];
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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; }
 
 var log = (0, _debug["default"])('@pie-element:graphing:controller');
 
@@ -89,26 +92,13 @@ var getPartialScoring = function getPartialScoring(_ref2) {
   }, env);
 };
 
-var orderCorrectAnswers = function orderCorrectAnswers(questionPossibleAnswers) {
-  questionPossibleAnswers = questionPossibleAnswers || {};
-
-  if (!questionPossibleAnswers.hasOwnProperty('correctAnswer')) {
-    (0, _utils.sortedAnswers)(questionPossibleAnswers);
-  }
-
-  return Object.assign({
-    correctAnswer: questionPossibleAnswers.correctAnswer
-  }, (0, _utils.sortedAnswers)(questionPossibleAnswers));
-};
-
-exports.orderCorrectAnswers = orderCorrectAnswers;
-
 var getBestAnswer = function getBestAnswer(question, session) {
   var env = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
 
   // questionPossibleAnswers contains all possible answers (correct response and alternates);
   var _ref3 = question || {},
-      questionPossibleAnswers = _ref3.answers,
+      _ref3$answers = _ref3.answers,
+      questionPossibleAnswers = _ref3$answers === void 0 ? {} : _ref3$answers,
       scoringType = _ref3.scoringType;
 
   var _ref4 = session || {},
@@ -122,7 +112,9 @@ var getBestAnswer = function getBestAnswer(question, session) {
       correctAnswer: initializeGraphMap()
     };
   } else {
-    orderCorrectAnswers(questionPossibleAnswers);
+    questionPossibleAnswers = _objectSpread({
+      correctAnswer: questionPossibleAnswers.correctAnswer
+    }, (0, _utils.sortedAnswers)(questionPossibleAnswers));
   }
 
   var partialScoringEnabled = getPartialScoring({
@@ -201,24 +193,57 @@ function model(question, session, env) {
     var normalizedQuestion = normalize(question);
 
     var _ref5 = normalizedQuestion || {},
+        defaultTool = _ref5.defaultTool,
         prompt = _ref5.prompt,
         promptEnabled = _ref5.promptEnabled,
         graph = _ref5.graph,
         answers = _ref5.answers,
-        questionProps = (0, _objectWithoutProperties2["default"])(_ref5, ["prompt", "promptEnabled", "graph", "answers"]);
+        toolbarTools = _ref5.toolbarTools,
+        questionProps = (0, _objectWithoutProperties2["default"])(_ref5, _excluded);
+
+    var arrows = normalizedQuestion.arrows;
 
     var _ref6 = env || {},
         mode = _ref6.mode,
-        role = _ref6.role;
+        role = _ref6.role; // This is used for offering support for old models which have the property arrows: boolean
+    // Same thing is set in authoring : packages/graphing/configure/src/configure.jsx - componentDidMount
+
+
+    if (typeof arrows === 'boolean') {
+      if (arrows) {
+        arrows = {
+          left: true,
+          right: true,
+          up: true,
+          down: true
+        };
+      } else {
+        arrows = {
+          left: false,
+          right: false,
+          up: false,
+          down: false
+        };
+      }
+    } // added support for models without defaultTool defined; also used in packages/graphing/configure/src/index.js
+
+
+    var toolbarToolsNoLabel = (toolbarTools || []).filter(function (tool) {
+      return tool !== 'label';
+    });
+    var normalizedDefaultTool = defaultTool || toolbarToolsNoLabel.length && toolbarToolsNoLabel[0] || '';
 
     var base = _objectSpread(_objectSpread({}, questionProps), {}, {
       answers: answers,
+      arrows: arrows,
+      defaultTool: normalizedDefaultTool,
       disabled: env.mode !== 'gather',
       prompt: promptEnabled ? prompt : null,
       rationale: null,
       size: graph,
       showToggle: env.mode === 'evaluate' && !(0, _isEmpty["default"])(answers),
-      teacherInstructions: null
+      teacherInstructions: null,
+      toolbarTools: toolbarTools
     });
 
     if (role === 'instructor' && (mode === 'view' || mode === 'evaluate')) {
@@ -244,7 +269,7 @@ function model(question, session, env) {
         base.correctResponse = bestScoreAnswerKey ? (answers[bestScoreAnswerKey] || {}).marks : [];
         base.showToggle = base.showToggle && bestScore !== 1;
       } else {
-        base.answersCorrected = [];
+        base.answersCorrected = session && session.answer || [];
         base.correctResponse = [];
       }
     }

package/controller/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.js"],"names":["log","initializeGraphMap","point","segment","line","ray","vector","polygon","circle","sine","parabola","compareMarks","mark1","mark2","type","equalMarks","getAnswerCorrected","sessionAnswers","correctAnswers","marks","reduce","correctedAnswer","answer","answerIsCorrect","find","mark","correctness","getPartialScoring","scoringType","env","pS","partialScoring","enabled","orderCorrectAnswers","questionPossibleAnswers","hasOwnProperty","Object","assign","correctAnswer","getBestAnswer","question","session","answers","partialScoringEnabled","possibleAnswers","entries","acc","entry","possibleAnswerKey","possibleAnswer","length","correctMarks","filter","maxScore","score","bestScore","foundOneSolution","parseFloat","toFixed","Math","floor","bestScoreAnswerKey","answersCorrected","map","normalize","defaults","model","Promise","resolve","normalizedQuestion","prompt","promptEnabled","graph","questionProps","mode","role","base","disabled","rationale","size","showToggle","teacherInstructions","rationaleEnabled","teacherInstructionsEnabled","correctResponse","outcome","empty","createCorrectResponseSession","values","firstCorrectAnswer","id"],"mappings":"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","sourcesContent":["import debug from 'debug';\n\nimport cloneDeep from 'lodash/cloneDeep';\nimport uniqWith from 'lodash/uniqWith';\nimport isEmpty from 'lodash/isEmpty';\nimport defaults from './defaults';\nimport { equalMarks, sortedAnswers } from './utils';\n\nimport { partialScoring } from '@pie-lib/controller-utils';\n\nconst log = debug('@pie-element:graphing:controller');\n\nconst initializeGraphMap = () => ({\n  point: [],\n  segment: [],\n  line: [],\n  ray: [],\n  vector: [],\n  polygon: [],\n  circle: [],\n  sine: [],\n  parabola: []\n});\n\nexport const compareMarks = (mark1, mark2) => {\n  // marks can be compared with equalMarks[type] function only if they have the same type;\n  // if type is different, they are clearly not equal\n  return !!(mark1 && mark2 && mark1.type === mark2.type && equalMarks[mark1.type] && equalMarks[mark1.type](mark1, mark2));\n};\n\nexport const getAnswerCorrected = ({ sessionAnswers, marks: correctAnswers }) => {\n  sessionAnswers = sessionAnswers || [];\n  correctAnswers = correctAnswers || [];\n\n  return cloneDeep(sessionAnswers).reduce((correctedAnswer, answer) => {\n    const answerIsCorrect = correctAnswers.find(mark => compareMarks(answer, mark));\n\n    answer.correctness = answerIsCorrect ? 'correct' : 'incorrect';\n\n    return [...correctedAnswer, answer];\n  }, []);\n};\n\nconst getPartialScoring = ({ scoringType, env }) => {\n  let pS = scoringType;\n\n  // if scoringType is undefined, partialScoring should be considered undefined (not set)\n  // because partialScoring.enabled is using that information\n  // if it has a value, we check if it is partial scoring or dichotomous\n  if (scoringType) {\n    pS = scoringType === 'partial scoring';\n  }\n\n  return partialScoring.enabled({ partialScoring: pS }, env);\n};\n\nexport const orderCorrectAnswers = (questionPossibleAnswers) => {\n  questionPossibleAnswers = questionPossibleAnswers || {};\n\n  if (!questionPossibleAnswers.hasOwnProperty('correctAnswer')) {\n    sortedAnswers(questionPossibleAnswers);\n  }\n\n  return Object.assign({ correctAnswer: questionPossibleAnswers.correctAnswer }, sortedAnswers(questionPossibleAnswers));\n};\n\nexport const getBestAnswer = (question, session, env = {}) => {\n  // questionPossibleAnswers contains all possible answers (correct response and alternates);\n  let { answers: questionPossibleAnswers, scoringType } = question || {};\n  let { answer } = session || {};\n\n  // initialize answer if no values\n  answer = answer || [];\n\n  // initialize one possible answer if no values\n  if (isEmpty(questionPossibleAnswers)) {\n    questionPossibleAnswers = { correctAnswer: initializeGraphMap() };\n  } else {\n    orderCorrectAnswers(questionPossibleAnswers);\n  }\n\n  const partialScoringEnabled = getPartialScoring({ scoringType, env });\n\n  // student's answers without DUPLICATES\n  const sessionAnswers = uniqWith(answer, compareMarks);\n  // array of possible answers entries\n  const possibleAnswers = Object.entries(questionPossibleAnswers);\n\n  return possibleAnswers.reduce((acc, entry) => {\n    // iterating each possible answer (main + alternates)\n    const possibleAnswerKey = entry[0];\n    const possibleAnswer = entry[1] || {};\n    let { marks } = possibleAnswer;\n\n    if (!marks || !marks.length) {\n      return acc;\n    }\n\n    // returns array of marks, each having 'correctness' property\n    const correctedAnswer = getAnswerCorrected({ sessionAnswers, marks });\n    const correctMarks = correctedAnswer.filter(answer => answer.correctness === 'correct');\n\n    const maxScore = marks.length;\n    let score = correctMarks.length;\n\n    // if extra placements\n    if (correctedAnswer.length > maxScore) {\n      score -= correctedAnswer.length - maxScore;\n    }\n\n    if (score < 0) {\n      score = 0;\n    }\n\n    if (score / maxScore > acc.bestScore || !acc.foundOneSolution) {\n      if (partialScoringEnabled) {\n        acc.bestScore = parseFloat((score / maxScore).toFixed(2));\n      } else {\n        acc.bestScore = Math.floor(score / maxScore);\n      }\n\n      acc.bestScoreAnswerKey = possibleAnswerKey;\n      acc.answersCorrected = correctedAnswer;\n      acc.foundOneSolution = true;\n    }\n\n    return acc;\n  }, {\n    bestScore: 0,\n    bestScoreAnswerKey: null,\n    // initially we just suppose all the answers are incorrect\n    answersCorrected: cloneDeep(sessionAnswers).map(answer => ({ ...answer, correctness: 'incorrect' })),\n    foundOneSolution: false\n  });\n};\n\nexport const normalize = question => ({ ...defaults, ...question });\n\nexport function model(question, session, env) {\n  return new Promise(resolve => {\n    const normalizedQuestion = normalize(question);\n    const { prompt, promptEnabled, graph, answers, ...questionProps } = normalizedQuestion || {};\n    const { mode, role } = env || {};\n\n    const base = {\n      ...questionProps,\n      answers,\n      disabled: env.mode !== 'gather',\n      prompt: promptEnabled ? prompt : null,\n      rationale: null,\n      size: graph,\n      showToggle: env.mode === 'evaluate' && !isEmpty(answers),\n      teacherInstructions: null,\n    };\n\n    if (role === 'instructor' && (mode === 'view' || mode === 'evaluate')) {\n      const { rationale, rationaleEnabled, teacherInstructions, teacherInstructionsEnabled } = normalizedQuestion || {};\n\n      base.rationale = rationaleEnabled ? rationale : null;\n      base.teacherInstructions = teacherInstructionsEnabled ? teacherInstructions : null;\n    }\n\n    if (mode === 'evaluate') {\n      if (!isEmpty(answers)) {\n        const { answersCorrected, bestScoreAnswerKey, bestScore } = getBestAnswer(normalizedQuestion, session, env);\n\n        // array of marks from session with 'correctness' property set\n        base.answersCorrected = answersCorrected;\n        base.correctResponse = bestScoreAnswerKey ? (answers[bestScoreAnswerKey] || {}).marks : [];\n        base.showToggle = base.showToggle && bestScore !== 1;\n      } else {\n        base.answersCorrected = [];\n        base.correctResponse = [];\n      }\n    }\n\n    log('base: ', base);\n    resolve(base);\n  });\n}\n\nexport function outcome(question, session, env = {}) {\n  return new Promise(resolve => {\n    if (!session || isEmpty(session)) {\n      resolve({ score: 0, empty: true });\n    }\n\n    if (env.mode !== 'evaluate' || isEmpty(question.answers)) {\n      resolve({ score: 0 });\n    }\n\n    const { bestScore } = getBestAnswer(question, session, env);\n\n    resolve({ score: bestScore });\n  });\n}\n\nexport const createCorrectResponseSession = (question, env) => {\n  return new Promise(resolve => {\n    if (env.mode !== 'evaluate' && env.role === 'instructor') {\n      const { answers } = question || {};\n      let marks = [];\n\n      if (answers && Object.values(answers)) {\n        const firstCorrectAnswer = Object.values(answers)[0] || {};\n\n        marks = firstCorrectAnswer.marks || [];\n      }\n\n      resolve({\n        answer: marks,\n        id: '1'\n      });\n    } else {\n      resolve(null);\n    }\n  });\n};\n"],"file":"index.js"}
+{"version":3,"sources":["../src/index.js"],"names":["log","initializeGraphMap","point","segment","line","ray","vector","polygon","circle","sine","parabola","compareMarks","mark1","mark2","type","equalMarks","getAnswerCorrected","sessionAnswers","correctAnswers","marks","reduce","correctedAnswer","answer","answerIsCorrect","find","mark","correctness","getPartialScoring","scoringType","env","pS","partialScoring","enabled","getBestAnswer","question","session","answers","questionPossibleAnswers","correctAnswer","partialScoringEnabled","possibleAnswers","Object","entries","acc","entry","possibleAnswerKey","possibleAnswer","length","correctMarks","filter","maxScore","score","bestScore","foundOneSolution","parseFloat","toFixed","Math","floor","bestScoreAnswerKey","answersCorrected","map","normalize","defaults","model","Promise","resolve","normalizedQuestion","defaultTool","prompt","promptEnabled","graph","toolbarTools","questionProps","arrows","mode","role","left","right","up","down","toolbarToolsNoLabel","tool","normalizedDefaultTool","base","disabled","rationale","size","showToggle","teacherInstructions","rationaleEnabled","teacherInstructionsEnabled","correctResponse","outcome","empty","createCorrectResponseSession","values","firstCorrectAnswer","id"],"mappings":"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","sourcesContent":["import debug from 'debug';\n\nimport cloneDeep from 'lodash/cloneDeep';\nimport uniqWith from 'lodash/uniqWith';\nimport isEmpty from 'lodash/isEmpty';\nimport defaults from './defaults';\nimport { equalMarks, sortedAnswers } from './utils';\n\nimport { partialScoring } from '@pie-lib/controller-utils';\n\nconst log = debug('@pie-element:graphing:controller');\n\nconst initializeGraphMap = () => ({\n  point: [],\n  segment: [],\n  line: [],\n  ray: [],\n  vector: [],\n  polygon: [],\n  circle: [],\n  sine: [],\n  parabola: []\n});\n\nexport const compareMarks = (mark1, mark2) => {\n  // marks can be compared with equalMarks[type] function only if they have the same type;\n  // if type is different, they are clearly not equal\n  return !!(mark1 && mark2 && mark1.type === mark2.type && equalMarks[mark1.type] && equalMarks[mark1.type](mark1, mark2));\n};\n\nexport const getAnswerCorrected = ({ sessionAnswers, marks: correctAnswers }) => {\n  sessionAnswers = sessionAnswers || [];\n  correctAnswers = correctAnswers || [];\n\n  return cloneDeep(sessionAnswers).reduce((correctedAnswer, answer) => {\n    const answerIsCorrect = correctAnswers.find(mark => compareMarks(answer, mark));\n\n    answer.correctness = answerIsCorrect ? 'correct' : 'incorrect';\n\n    return [...correctedAnswer, answer];\n  }, []);\n};\n\nconst getPartialScoring = ({ scoringType, env }) => {\n  let pS = scoringType;\n\n  // if scoringType is undefined, partialScoring should be considered undefined (not set)\n  // because partialScoring.enabled is using that information\n  // if it has a value, we check if it is partial scoring or dichotomous\n  if (scoringType) {\n    pS = scoringType === 'partial scoring';\n  }\n\n  return partialScoring.enabled({ partialScoring: pS }, env);\n};\n\nexport const getBestAnswer = (question, session, env = {}) => {\n  // questionPossibleAnswers contains all possible answers (correct response and alternates);\n  let { answers: questionPossibleAnswers = {}, scoringType } = question || {};\n  let { answer } = session || {};\n\n  // initialize answer if no values\n  answer = answer || [];\n\n  // initialize one possible answer if no values\n  if (isEmpty(questionPossibleAnswers)) {\n    questionPossibleAnswers = { correctAnswer: initializeGraphMap() };\n  } else {\n    questionPossibleAnswers = {\n      correctAnswer: questionPossibleAnswers.correctAnswer,\n      ...sortedAnswers(questionPossibleAnswers)\n    };\n  }\n\n  const partialScoringEnabled = getPartialScoring({ scoringType, env });\n\n  // student's answers without DUPLICATES\n  const sessionAnswers = uniqWith(answer, compareMarks);\n  // array of possible answers entries\n  const possibleAnswers = Object.entries(questionPossibleAnswers);\n\n  return possibleAnswers.reduce((acc, entry) => {\n    // iterating each possible answer (main + alternates)\n    const possibleAnswerKey = entry[0];\n    const possibleAnswer = entry[1] || {};\n    let { marks } = possibleAnswer;\n\n    if (!marks || !marks.length) {\n      return acc;\n    }\n\n    // returns array of marks, each having 'correctness' property\n    const correctedAnswer = getAnswerCorrected({ sessionAnswers, marks });\n    const correctMarks = correctedAnswer.filter(answer => answer.correctness === 'correct');\n\n    const maxScore = marks.length;\n    let score = correctMarks.length;\n\n    // if extra placements\n    if (correctedAnswer.length > maxScore) {\n      score -= correctedAnswer.length - maxScore;\n    }\n\n    if (score < 0) {\n      score = 0;\n    }\n\n    if (score / maxScore > acc.bestScore || !acc.foundOneSolution) {\n      if (partialScoringEnabled) {\n        acc.bestScore = parseFloat((score / maxScore).toFixed(2));\n      } else {\n        acc.bestScore = Math.floor(score / maxScore);\n      }\n\n      acc.bestScoreAnswerKey = possibleAnswerKey;\n      acc.answersCorrected = correctedAnswer;\n      acc.foundOneSolution = true;\n    }\n\n    return acc;\n  }, {\n    bestScore: 0,\n    bestScoreAnswerKey: null,\n    // initially we just suppose all the answers are incorrect\n    answersCorrected: cloneDeep(sessionAnswers).map(answer => ({ ...answer, correctness: 'incorrect' })),\n    foundOneSolution: false\n  });\n};\n\nexport const normalize = question => ({ ...defaults, ...question });\n\nexport function model(question, session, env) {\n  return new Promise(resolve => {\n    const normalizedQuestion = normalize(question);\n    const {\n      defaultTool,\n      prompt,\n      promptEnabled,\n      graph,\n      answers,\n      toolbarTools,\n      ...questionProps\n    } = normalizedQuestion || {};\n    let { arrows } = normalizedQuestion;\n    const { mode, role } = env || {};\n\n    // This is used for offering support for old models which have the property arrows: boolean\n    // Same thing is set in authoring : packages/graphing/configure/src/configure.jsx - componentDidMount\n    if (typeof arrows === 'boolean') {\n      if (arrows) {\n        arrows = {\n          left: true,\n          right: true,\n          up: true,\n          down: true\n        };\n      } else {\n        arrows = {\n          left: false,\n          right: false,\n          up: false,\n          down: false\n        };\n      }\n    }\n\n    // added support for models without defaultTool defined; also used in packages/graphing/configure/src/index.js\n    const toolbarToolsNoLabel = (toolbarTools || []).filter(tool => tool !== 'label');\n    const normalizedDefaultTool = defaultTool || (toolbarToolsNoLabel.length && toolbarToolsNoLabel[0]) || '';\n\n    const base = {\n      ...questionProps,\n      answers,\n      arrows,\n      defaultTool: normalizedDefaultTool,\n      disabled: env.mode !== 'gather',\n      prompt: promptEnabled ? prompt : null,\n      rationale: null,\n      size: graph,\n      showToggle: env.mode === 'evaluate' && !isEmpty(answers),\n      teacherInstructions: null,\n      toolbarTools\n    };\n\n    if (role === 'instructor' && (mode === 'view' || mode === 'evaluate')) {\n      const { rationale, rationaleEnabled, teacherInstructions, teacherInstructionsEnabled } = normalizedQuestion || {};\n\n      base.rationale = rationaleEnabled ? rationale : null;\n      base.teacherInstructions = teacherInstructionsEnabled ? teacherInstructions : null;\n    }\n\n    if (mode === 'evaluate') {\n      if (!isEmpty(answers)) {\n        const { answersCorrected, bestScoreAnswerKey, bestScore } = getBestAnswer(normalizedQuestion, session, env);\n\n        // array of marks from session with 'correctness' property set\n        base.answersCorrected = answersCorrected;\n        base.correctResponse = bestScoreAnswerKey ? (answers[bestScoreAnswerKey] || {}).marks : [];\n        base.showToggle = base.showToggle && bestScore !== 1;\n      } else {\n        base.answersCorrected = session && session.answer || [];\n        base.correctResponse = [];\n      }\n    }\n\n    log('base: ', base);\n    resolve(base);\n  });\n}\n\nexport function outcome(question, session, env = {}) {\n  return new Promise(resolve => {\n    if (!session || isEmpty(session)) {\n      resolve({ score: 0, empty: true });\n    }\n\n    if (env.mode !== 'evaluate' || isEmpty(question.answers)) {\n      resolve({ score: 0 });\n    }\n\n    const { bestScore } = getBestAnswer(question, session, env);\n\n    resolve({ score: bestScore });\n  });\n}\n\nexport const createCorrectResponseSession = (question, env) => {\n  return new Promise(resolve => {\n    if (env.mode !== 'evaluate' && env.role === 'instructor') {\n      const { answers } = question || {};\n      let marks = [];\n\n      if (answers && Object.values(answers)) {\n        const firstCorrectAnswer = Object.values(answers)[0] || {};\n\n        marks = firstCorrectAnswer.marks || [];\n      }\n\n      resolve({\n        answer: marks,\n        id: '1'\n      });\n    } else {\n      resolve(null);\n    }\n  });\n};\n"],"file":"index.js"}

package/controller/lib/utils.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.equalMarks = exports.equalParabola = exports.equalSine = exports.equalCircle = exports.equalPolygon = exports.removeInvalidSegments = exports.removeDuplicateSegments = exports.constructSegmentsFromPoints = exports.equalRay = exports.equalLine = exports.sortedAnswers = exports.equalVector = exports.equalSegment = exports.equalPoint = void 0;
+exports.sortedAnswers = exports.removeInvalidSegments = exports.removeDuplicateSegments = exports.equalVector = exports.equalSine = exports.equalSegment = exports.equalRay = exports.equalPolygon = exports.equalPoint = exports.equalParabola = exports.equalMarks = exports.equalLine = exports.equalCircle = exports.constructSegmentsFromPoints = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
@@ -19,9 +19,9 @@ var _differenceWith = _interopRequireDefault(require("lodash/differenceWith"));
 
 var _graphingUtils = require("@pie-lib/graphing-utils");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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; }
 
 var equalPoint = function equalPoint(A, B) {
   // x1 = x2 & y1 = y2
@@ -54,9 +54,11 @@ var equalVector = function equalVector(vector1, vector2) {
 exports.equalVector = equalVector;
 
 var sortedAnswers = function sortedAnswers(answers) {
-  answers = answers || {};
-  return Object.keys(answers).sort().reduce(function (result, key) {
-    result[key] = answers[key];
+  return Object.keys(answers || {}).sort().reduce(function (result, key) {
+    if (key !== 'correctAnswer') {
+      result[key] = answers[key];
+    }
+
     return result;
   }, {});
 };