@pie-element/complex-rubric 3.1.3 → 3.1.4-next.43

package/controller/src/index.js

@@ -1,7 +1,9 @@
 import defaults from './defaults';
 import { markupToText } from './utils';
 
-// todo the import from pie-lib/rubric might break webpack
+
+// todo the import from pie-lib/rubric WILL break pslb
+//  so don't use it unless you also test "yarn build"
 const RUBRIC_TYPES = {
   SIMPLE_RUBRIC: 'simpleRubric',
   MULTI_TRAIT_RUBRIC: 'multiTraitRubric',
@@ -9,10 +11,10 @@ const RUBRIC_TYPES = {
 };
 
 export function createDefaultModel(model = {}) {
-  return new Promise((resolve) => resolve({ ...defaults.model, ...model }));
+  return new Promise((resolve) => resolve({ ...defaults, ...model }));
 }
 
-export const normalize = (question) => ({ ...defaults.model, ...question });
+export const normalize = (question) => ({ ...defaults, ...question });
 
 /**
  * @param {*} question
@@ -22,20 +24,23 @@ export const normalize = (question) => ({ ...defaults.model, ...question });
 export async function model(question, session, env) {
   const normalizedQuestion = normalize(question);
 
-  if (normalizedQuestion.rubricType === RUBRIC_TYPES.SIMPLE_RUBRIC || normalizedQuestion.rubricType === 'rubricless') {
+  if (
+    normalizedQuestion.rubricType === RUBRIC_TYPES.SIMPLE_RUBRIC ||
+    normalizedQuestion.rubricType === RUBRIC_TYPES.RUBRICLESS
+  ) {
     return new Promise((resolve) => {
       resolve(
         env && env.role && env.role === 'instructor'
           ? {
-            ...normalizedQuestion,
-            rubrics: {
-              ...normalizedQuestion.rubrics,
-              multiTraitRubric: {
-                ...normalizedQuestion.rubrics.multiTraitRubric,
-                visible: false,
+              ...normalizedQuestion,
+              rubrics: {
+                ...normalizedQuestion.rubrics,
+                multiTraitRubric: {
+                  ...normalizedQuestion.rubrics.multiTraitRubric,
+                  visible: false,
+                },
               },
-            },
-          }
+            }
           : {},
       );
     });
@@ -111,7 +116,7 @@ const validateSimpleRubric = (model) => {
     if (!point || point === '<div></div>') {
       pointsDescriptorsErrors[index] = 'Points descriptors cannot be empty.';
     } else {
-      const identicalPointDescr = points.slice(index + 1).some(p => markupToText(p) === markupToText(point));
+      const identicalPointDescr = points.slice(index + 1).some((p) => markupToText(p) === markupToText(point));
 
       if (identicalPointDescr) {
         pointsDescriptorsErrors[index] = 'Points descriptors should be unique.';
@@ -140,64 +145,66 @@ const validateMultiTraitRubric = (model) => {
     const scaleErrors = {};
     const scorePointsLabelsErrors = {};
 
-    if(pointLabels) {
+    if (pointLabels) {
       scorePointsLabels.forEach((scorePointLabel, scoreIndex) => {
         if (!scorePointLabel || scorePointLabel === '<div></div>') {
           scorePointsLabelsErrors[scoreIndex] = 'Points labels should not be empty.';
         } else {
-          const identicalScorePointLabel = scorePointsLabels.slice(scoreIndex + 1).some(s => markupToText(s) === markupToText(scorePointLabel));
+          const identicalScorePointLabel = scorePointsLabels
+            .slice(scoreIndex + 1)
+            .some((s) => markupToText(s) === markupToText(scorePointLabel));
 
           if (identicalScorePointLabel) {
             scorePointsLabelsErrors[scoreIndex] = 'Points labels should be unique.';
           }
         }
-      })
+      });
     }
 
-    if(Object.keys(scorePointsLabelsErrors).length > 0){
+    if (Object.keys(scorePointsLabelsErrors).length > 0) {
       scorePointsErrors[scaleIndex] = scorePointsLabelsErrors;
     }
 
     traits.forEach((trait, traitIndex) => {
-      if(!trait.name || trait.name === '<div></div>') {
-        scaleErrors[traitIndex] = {name: 'Trait names should not be empty.'};
-      }
-      else{
-        const identicalTraitName = traits.slice(traitIndex + 1).some(t => markupToText(t.name) === markupToText(trait.name));
+      if (!trait.name || trait.name === '<div></div>') {
+        scaleErrors[traitIndex] = { name: 'Trait names should not be empty.' };
+      } else {
+        const identicalTraitName = traits
+          .slice(traitIndex + 1)
+          .some((t) => markupToText(t.name) === markupToText(trait.name));
 
         if (identicalTraitName) {
-          scaleErrors[traitIndex] = {name: 'Trait names should be unique.'};
+          scaleErrors[traitIndex] = { name: 'Trait names should be unique.' };
         }
       }
-      if(description && (!trait.description || trait.description === '<div></div>')) {
-        scaleErrors[traitIndex] = {... scaleErrors[traitIndex], description: 'Trait description should not be empty'};
-      }
-      else{
-        const identicalTraitDescr = traits.slice(traitIndex + 1).some(t => markupToText(t.description) === markupToText(trait.description));
+      if (description && (!trait.description || trait.description === '<div></div>')) {
+        scaleErrors[traitIndex] = { ...scaleErrors[traitIndex], description: 'Trait description should not be empty' };
+      } else {
+        const identicalTraitDescr = traits
+          .slice(traitIndex + 1)
+          .some((t) => markupToText(t.description) === markupToText(trait.description));
 
         if (description && identicalTraitDescr) {
-          scaleErrors[traitIndex] = {... scaleErrors[traitIndex], description: 'Trait descriptions should be unique.'};
+          scaleErrors[traitIndex] = { ...scaleErrors[traitIndex], description: 'Trait descriptions should be unique.' };
         }
       }
-
     });
-    if(Object.keys(scaleErrors).length > 0){
+    if (Object.keys(scaleErrors).length > 0) {
       traitsErrors[scaleIndex] = scaleErrors;
     }
   });
 
-  if(Object.keys(traitsErrors).length > 0){
+  if (Object.keys(traitsErrors).length > 0) {
     errors.traitsErrors = traitsErrors;
   }
 
-  if(Object.keys(scorePointsErrors).length > 0){
+  if (Object.keys(scorePointsErrors).length > 0) {
     errors.scorePointsErrors = scorePointsErrors;
   }
 
   return errors;
 };
 
-
 export const validate = (model = {}, config = {}) => {
   const { rubrics = {}, rubricType } = model;
   const { multiTraitRubric = {}, simpleRubric = {} } = rubrics;

package/module/configure.js

@@ -1,6 +1,6 @@
-import {_dll_react, _dll_prop_types, _dll_classnames, _dll_react_dom, _dll_debug, _dll_lodash, _dll_react_dom_server, _dll_pie_framework__mathquill} from "../../../@pie-lib/pie-toolbox-math-rendering-module@2.0.11/module/index.js";
+import {_dll_react, _dll_prop_types, _dll_classnames, _dll_react_dom, _dll_debug, _dll_lodash, _dll_react_dom_server, _dll_pie_framework__mathquill} from "../../../@pie-lib/pie-toolbox-math-rendering-module@2.0.12/module/index.js";
 import RubricConfigure from '@pie-element/rubric/configure/lib';
-import {_dll_pie_lib__pie_toolbox_editable_html, _dll_pie_lib__pie_toolbox_render_ui, _dll_pie_lib__pie_toolbox_config_ui} from "../../../@pie-lib/pie-toolbox-module@5.0.7/module/index.js";
+import {_dll_pie_lib__pie_toolbox_editable_html, _dll_pie_lib__pie_toolbox_render_ui, _dll_pie_lib__pie_toolbox_config_ui} from "../../../@pie-lib/pie-toolbox-module@5.0.11/module/index.js";
 function _mergeNamespaces(n, m) {
   m.forEach(function (e) {
     e && typeof e !== 'string' && !Array.isArray(e) && Object.keys(e).forEach(function (k) {
@@ -68486,15 +68486,15 @@ var defaults$1 = {};
   exports["default"] = void 0;
   var _default = {
     model: {
-      visibleToStudent: true,
-      halfScoring: false,
-      pointLabels: true,
+      addScaleEnabled: true,
       description: false,
-      standards: false,
-      scales: [],
       excludeZero: false,
+      halfScoring: false,
       maxPointsEnabled: true,
-      addScaleEnabled: true
+      pointLabels: true,
+      scales: [],
+      standards: false,
+      visibleToStudent: true
     },
     configuration: {
       baseInputConfiguration: {
@@ -88966,6 +88966,7 @@ toolbarButtons.RawMarkButton = RawMarkButton;
 (0, _defineProperty2$O["default"])(RawMarkButton, "propTypes", {
   onToggle: _propTypes$1g["default"].func.isRequired,
   mark: _propTypes$1g["default"].string,
+  label: _propTypes$1g["default"].string.isRequired,
   children: _propTypes$1g["default"].oneOfType([_propTypes$1g["default"].arrayOf(_propTypes$1g["default"].node), _propTypes$1g["default"].node]).isRequired,
   classes: _propTypes$1g["default"].object.isRequired,
   active: _propTypes$1g["default"].bool
@@ -97478,12 +97479,19 @@ const require$$10$q = _dll_debug;
     if (props.isMark) {
       var isActive = (0, _utils.hasMark)(props.value, props.type);
       log('[ToolbarButton] mark:isActive: ', isActive);
+      var ariaLabel;
+      if (props.type === 'sup') {
+        ariaLabel = 'Superscript (marks text as superscripted)';
+      } else if (props.type === 'sub') {
+        ariaLabel = 'Subscript (marks text as subscripted)';
+      } else {
+        ariaLabel = props.type;
+      }
       return _react["default"].createElement(_toolbarButtons.MarkButton, {
         active: isActive,
-        label: props.type,
         onToggle: onToggle,
         mark: props.type,
-        ariaLabel: props.type
+        label: ariaLabel
       }, props.icon);
     } else {
       var disabled = props.disabled;
@@ -100288,7 +100296,8 @@ const require$$3$y = _dll_prop_types;
         border: '1px solid #C0C3CF',
         boxSizing: 'border-box',
         borderRadius: '3px',
-        position: 'relative'
+        position: 'relative',
+        alignItems: 'center'
       }
     }, _react["default"].createElement("div", {
       style: {
@@ -100296,13 +100305,17 @@ const require$$3$y = _dll_prop_types;
         overflow: 'hidden',
         padding: '0 25px 0 8px',
         whiteSpace: 'nowrap',
-        textOverflow: 'ellipsis',
-        lineHeight: '35px'
+        textOverflow: 'ellipsis'
+      }
+    }, _react["default"].createElement("span", {
+      style: {
+        display: 'inline-block',
+        verticalAlign: 'middle'
       },
       dangerouslySetInnerHTML: {
         __html: html
       }
-    }), _react["default"].createElement(_icons.Chevron, {
+    })), _react["default"].createElement(_icons.Chevron, {
       direction: "down",
       style: {
         position: 'absolute',
@@ -105628,6 +105641,7 @@ function UndoRedo(type) {
     toolbar: {
       type: type,
       icon: _react$1e["default"].createElement(IconToUse, null),
+      ariaLabel: type === 'undo' ? 'Undo (revert the last action)' : 'Redo (reapply the last undone action)',
       onClick: function onClick(value, onChange) {
         var change = value.change();
         onChange(change[type]());
@@ -114689,7 +114703,8 @@ const require$$23 = _dll_classnames;
       (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "renderPlaceholder", function (props) {
         var editor = props.editor;
         var document = editor.value.document;
-        if (!editor.props.placeholder || document.text !== '' || document.nodes.size !== 1) {
+        var stateValue = _this.state.value;
+        if (!editor.props.placeholder || document.text !== '' || document.nodes.size !== 1 || !document.isEmpty || stateValue.isFocused) {
           return false;
         }
         return _react["default"].createElement("span", {
@@ -188862,13 +188877,13 @@ class Main extends React$1.Component {
 Main.__initStatic();
 var Main$1 = styles$1J.withStyles(styles)(Main);
 const multiTraitDefaultModel = {
-  visibleToStudent: true,
+  description: false,
+  excludeZero: false,
   halfScoring: false,
   pointLabels: true,
-  description: false,
-  standards: false,
   scales: [],
-  excludeZero: false
+  standards: false,
+  visibleToStudent: true
 };
 const rubricDefaultModel = {
   points: ['', '', '', ''],

package/module/controller.js

@@ -1,17 +1,25 @@
+// todo the import from pie-lib/rubric WILL break pslb
+//  so don't use it unless you also test "yarn build"
+const RUBRIC_TYPES$1 = {
+  SIMPLE_RUBRIC: 'simpleRubric',
+  MULTI_TRAIT_RUBRIC: 'multiTraitRubric',
+  'rubricless': 'rubricless',
+};
+
 const multiTraitDefaultModel = {
-  visibleToStudent: true,
+  description: false,
+  excludeZero: false,
   halfScoring: false,
   pointLabels: true,
-  description: false,
-  standards: false,
   scales: [],
-  excludeZero: false,
+  standards: false,
+  visibleToStudent: true,
 };
 
 const rubricDefaultModel = {
   points: ['', '', '', ''],
   sampleAnswers: [null, null, null, null],
-  maxPoints: 4,
+  maxPoints: 3,
   excludeZero: false,
 };
 
@@ -21,139 +29,12 @@ const rubriclessDefaultModel = {
   rubriclessInstructionEnabled: true,
 };
 
-const multiTraitDefaultConfiguration = {
-  settingsPanelDisabled: false,
-  excludeZeroDialogBoxContent: {
-    title: 'Exclude 0 (Zero) from Score Point Values.',
-    text: `<div>
-        You are about to exclude 0 from score point values.
-        <br/>
-        Some of the existing data has to be changed.
-        <br/>
-        Please choose if you want to:
-        <ul>
-          <li>
-            shift Labels and Descriptions to the left
-          </li>
-          <li>
-            remove 0 column with its Label and Description
-          </li>
-        </ul>
-      </div>`,
-  },
-  includeZeroDialogBoxContent: {
-    title: 'Include 0 (Zero) in Score Point Values.',
-    text: `<div>
-        You are about to include 0 in score point values.
-        <br/>
-        Some of the existing data has to be changed.
-        <br/>
-        Please choose if you want to:
-        <ul>
-          <li>
-            shift Labels and Descriptions to the right
-          </li>
-          <li>
-            add 0 column with empty Label and Descriptions
-          </li>
-        </ul>
-      </div>`,
-  },
-  deleteScaleDialogBoxContent: {
-    title: 'Delete Scale',
-    text: 'Are you sure you want to delete this scale?',
-  },
-  maxPointsDialogBoxContent: {
-    title: 'Decreasing Max Points.',
-    text: ` You are about to decrease max score point value.
-        <br/>
-        All the Labels and Descriptions for scores above Max Point will be deleted.`,
-  },
-  spellCheck: {
-    label: 'Spellcheck',
-    settings: false,
-    enabled: true,
-  },
-  showExcludeZero: {
-    settings: true,
-    label: 'Exclude Zero',
-  },
-  showScorePointLabels: {
-    settings: true,
-    label: 'Show Score Point Labels',
-  },
-  showDescription: {
-    settings: true,
-    label: 'Show Description',
-  },
-  showVisibleToStudent: {
-    settings: true,
-    label: 'Visible to Student',
-  },
-  showHalfScoring: {
-    settings: true,
-    label: 'Half Scoring',
-  },
-  width: '900px',
-  // these should not be set to true (should not be used) for now
-  showStandards: {
-    settings: false,
-    label: 'Show Standards',
-  },
-  showLevelTagInput: {
-    settings: false,
-    label: 'Show Level Tag Input',
-    enabled: false,
-  },
-  dragAndDrop: {
-    settings: true,
-    label: 'Enable Drag and Drop',
-    enabled: false,
-  },
-};
-
-const rubricDefaultConfiguration = {
-  showExcludeZero: {
-    settings: true,
-    label: 'Ability to exclude zero',
-  },
-  showMaxPoint: {
-    settings: true,
-    label: 'Show max points dropdown',
-  },
-  settingsPanelDisabled: false,
-};
-
-const rubriclessDefaultConfiguration = {
-  showExcludeZero: {
-    settings: true,
-    label: 'Ability to exclude zero',
-  },
-  showMaxPoint: {
-    settings: true,
-    label: 'Show max points dropdown',
-  },
-  settingsPanelDisabled: false,
-  // shows us if it simple rubric or rubricless(simple rubric with less structure)
-  rubricless: true,
-  // scoring instruction for rubricless
-  rubriclessInstruction: {
-    settings: true,
-    label: 'Instruction',
-  },
-  maxMaxPoints: 100,
-};
-
 var defaults = {
-  model: {
-    rubricOptions: ['simpleRubric', 'multiTraitRubric'],
-    rubricType: 'simpleRubric',
-    rubrics: { simpleRubric: rubricDefaultModel, multiTraitRubric: multiTraitDefaultModel, rubricless: rubriclessDefaultModel },
-  },
-  configuration: {
-    multiTraitRubric: multiTraitDefaultConfiguration,
-    simpleRubric: rubricDefaultConfiguration,
-    rubricless: rubriclessDefaultConfiguration,
+  rubricType: 'simpleRubric',
+  rubrics: {
+    [RUBRIC_TYPES$1.SIMPLE_RUBRIC]: rubricDefaultModel,
+    [RUBRIC_TYPES$1.MULTI_TRAIT_RUBRIC]: multiTraitDefaultModel,
+    [RUBRIC_TYPES$1.RUBRICLESS]: rubriclessDefaultModel,
   },
 };
 
@@ -161,7 +42,8 @@ const markupToText = (s) => {
     return (s || '').replace(/(<([^>]+)>)/ig, '');
 };
 
-// todo the import from pie-lib/rubric might break webpack
+// todo the import from pie-lib/rubric WILL break pslb
+//  so don't use it unless you also test "yarn build"
 const RUBRIC_TYPES = {
   SIMPLE_RUBRIC: 'simpleRubric',
   MULTI_TRAIT_RUBRIC: 'multiTraitRubric',
@@ -169,10 +51,10 @@ const RUBRIC_TYPES = {
 };
 
 function createDefaultModel(model = {}) {
-  return new Promise((resolve) => resolve({ ...defaults.model, ...model }));
+  return new Promise((resolve) => resolve({ ...defaults, ...model }));
 }
 
-const normalize = (question) => ({ ...defaults.model, ...question });
+const normalize = (question) => ({ ...defaults, ...question });
 
 /**
  * @param {*} question
@@ -182,20 +64,23 @@ const normalize = (question) => ({ ...defaults.model, ...question });
 async function model(question, session, env) {
   const normalizedQuestion = normalize(question);
 
-  if (normalizedQuestion.rubricType === RUBRIC_TYPES.SIMPLE_RUBRIC || normalizedQuestion.rubricType === 'rubricless') {
+  if (
+    normalizedQuestion.rubricType === RUBRIC_TYPES.SIMPLE_RUBRIC ||
+    normalizedQuestion.rubricType === RUBRIC_TYPES.RUBRICLESS
+  ) {
     return new Promise((resolve) => {
       resolve(
         env && env.role && env.role === 'instructor'
           ? {
-            ...normalizedQuestion,
-            rubrics: {
-              ...normalizedQuestion.rubrics,
-              multiTraitRubric: {
-                ...normalizedQuestion.rubrics.multiTraitRubric,
-                visible: false,
+              ...normalizedQuestion,
+              rubrics: {
+                ...normalizedQuestion.rubrics,
+                multiTraitRubric: {
+                  ...normalizedQuestion.rubrics.multiTraitRubric,
+                  visible: false,
+                },
               },
-            },
-          }
+            }
           : {},
       );
     });
@@ -271,7 +156,7 @@ const validateSimpleRubric = (model) => {
     if (!point || point === '<div></div>') {
       pointsDescriptorsErrors[index] = 'Points descriptors cannot be empty.';
     } else {
-      const identicalPointDescr = points.slice(index + 1).some(p => markupToText(p) === markupToText(point));
+      const identicalPointDescr = points.slice(index + 1).some((p) => markupToText(p) === markupToText(point));
 
       if (identicalPointDescr) {
         pointsDescriptorsErrors[index] = 'Points descriptors should be unique.';
@@ -300,12 +185,14 @@ const validateMultiTraitRubric = (model) => {
     const scaleErrors = {};
     const scorePointsLabelsErrors = {};
 
-    if(pointLabels) {
+    if (pointLabels) {
       scorePointsLabels.forEach((scorePointLabel, scoreIndex) => {
         if (!scorePointLabel || scorePointLabel === '<div></div>') {
           scorePointsLabelsErrors[scoreIndex] = 'Points labels should not be empty.';
         } else {
-          const identicalScorePointLabel = scorePointsLabels.slice(scoreIndex + 1).some(s => markupToText(s) === markupToText(scorePointLabel));
+          const identicalScorePointLabel = scorePointsLabels
+            .slice(scoreIndex + 1)
+            .some((s) => markupToText(s) === markupToText(scorePointLabel));
 
           if (identicalScorePointLabel) {
             scorePointsLabelsErrors[scoreIndex] = 'Points labels should be unique.';
@@ -314,50 +201,50 @@ const validateMultiTraitRubric = (model) => {
       });
     }
 
-    if(Object.keys(scorePointsLabelsErrors).length > 0){
+    if (Object.keys(scorePointsLabelsErrors).length > 0) {
       scorePointsErrors[scaleIndex] = scorePointsLabelsErrors;
     }
 
     traits.forEach((trait, traitIndex) => {
-      if(!trait.name || trait.name === '<div></div>') {
-        scaleErrors[traitIndex] = {name: 'Trait names should not be empty.'};
-      }
-      else {
-        const identicalTraitName = traits.slice(traitIndex + 1).some(t => markupToText(t.name) === markupToText(trait.name));
+      if (!trait.name || trait.name === '<div></div>') {
+        scaleErrors[traitIndex] = { name: 'Trait names should not be empty.' };
+      } else {
+        const identicalTraitName = traits
+          .slice(traitIndex + 1)
+          .some((t) => markupToText(t.name) === markupToText(trait.name));
 
         if (identicalTraitName) {
-          scaleErrors[traitIndex] = {name: 'Trait names should be unique.'};
+          scaleErrors[traitIndex] = { name: 'Trait names should be unique.' };
         }
       }
-      if(description && (!trait.description || trait.description === '<div></div>')) {
-        scaleErrors[traitIndex] = {... scaleErrors[traitIndex], description: 'Trait description should not be empty'};
-      }
-      else {
-        const identicalTraitDescr = traits.slice(traitIndex + 1).some(t => markupToText(t.description) === markupToText(trait.description));
+      if (description && (!trait.description || trait.description === '<div></div>')) {
+        scaleErrors[traitIndex] = { ...scaleErrors[traitIndex], description: 'Trait description should not be empty' };
+      } else {
+        const identicalTraitDescr = traits
+          .slice(traitIndex + 1)
+          .some((t) => markupToText(t.description) === markupToText(trait.description));
 
         if (description && identicalTraitDescr) {
-          scaleErrors[traitIndex] = {... scaleErrors[traitIndex], description: 'Trait descriptions should be unique.'};
+          scaleErrors[traitIndex] = { ...scaleErrors[traitIndex], description: 'Trait descriptions should be unique.' };
         }
       }
-
     });
-    if(Object.keys(scaleErrors).length > 0){
+    if (Object.keys(scaleErrors).length > 0) {
       traitsErrors[scaleIndex] = scaleErrors;
     }
   });
 
-  if(Object.keys(traitsErrors).length > 0){
+  if (Object.keys(traitsErrors).length > 0) {
     errors.traitsErrors = traitsErrors;
   }
 
-  if(Object.keys(scorePointsErrors).length > 0){
+  if (Object.keys(scorePointsErrors).length > 0) {
     errors.scorePointsErrors = scorePointsErrors;
   }
 
   return errors;
 };
 
-
 const validate = (model = {}, config = {}) => {
   const { rubrics = {}, rubricType } = model;
   const { multiTraitRubric = {}, simpleRubric = {} } = rubrics;