@pie-element/ebsr 6.6.2 → 6.6.3-next.1016

package/controller/src/index.js

@@ -60,7 +60,7 @@ const parsePart = (part, key, session, env) => {
   };
 };
 
-export const normalize = question => ({
+export const normalize = ({ partA = {}, partB = {}, ...question }) => ({
   partLabels: true,
   partLabelType: 'Letters',
   ...question,
@@ -71,8 +71,9 @@ export const normalize = question => ({
     promptEnabled: true,
     teacherInstructionsEnabled: true,
     studentInstructionsEnabled: true,
-    verticalMode: true,
-    ...question.partA
+    gridColumns: '2',
+    ...partA,
+    choicesLayout: partA.choicesLayout || (partA.verticalMode === false && 'horizontal') || 'vertical'
   },
   partB: {
     ...defaults.partB,
@@ -81,8 +82,9 @@ export const normalize = question => ({
     feedbackEnabled: true,
     teacherInstructionsEnabled: true,
     studentInstructionsEnabled: true,
-    verticalMode: true,
-    ...question.partB
+    gridColumns: '2',
+    ...partB,
+    choicesLayout: partB.choicesLayout || (partB.verticalMode === false && 'horizontal') || 'vertical'
   }
 });
 
@@ -296,3 +298,58 @@ export const createCorrectResponseSession = (question, env) => {
     }
   });
 };
+
+const validatePart = (model = {}, config = {}) => {
+  const { choices } = model;
+  const { minAnswerChoices = 2, maxAnswerChoices } = config;
+  const reversedChoices = [...choices || []].reverse();
+  const choicesErrors = {};
+  let hasCorrectResponse = false;
+
+  reversedChoices.forEach((choice, index) => {
+    const { correct, value, label } = choice;
+
+    if (correct) {
+      hasCorrectResponse = true;
+    }
+
+    if (label === '' || label === '<div></div>') {
+      choicesErrors[value] = 'Content should not be empty.';
+    } else {
+      const identicalAnswer = reversedChoices.slice(index + 1).some(c => c.label === label);
+
+      if (identicalAnswer) {
+        choicesErrors[value] = 'Content should be unique.';
+      }
+    }
+  });
+
+  const errors = {};
+  const nbOfChoices = (choices || []).length;
+
+  if (nbOfChoices < minAnswerChoices) {
+    errors.answerChoicesError = `There should be at least ${minAnswerChoices} choices defined.`;
+  } else if (nbOfChoices > maxAnswerChoices) {
+    errors.answerChoicesError = `No more than ${maxAnswerChoices} choices should be defined.`;
+  }
+
+  if (!hasCorrectResponse) {
+    errors.correctResponseError = 'No correct response defined.';
+  }
+
+  if (!isEmpty(choicesErrors)) {
+    errors.choicesErrors = choicesErrors;
+  }
+
+  return errors;
+};
+
+export const validate = (model = {}, config = {}) => {
+  const { partA, partB } = model || {};
+  const { partA: partAConfig, partB: partBConfig } = config || {};
+
+  const partAErrors = validatePart(partA, partAConfig);
+  const partBErrors = validatePart(partB, partBConfig);
+
+  return { partA: partAErrors, partB: partBErrors };
+};

package/docs/config-schema.json

@@ -119,6 +119,22 @@
             }
           }
         },
+        "spellCheck": {
+          "title": "ConfigureProp",
+          "type": "object",
+          "properties": {
+            "settings": {
+              "description": "Indicates if the item has to be displayed in the Settings Panel",
+              "type": "boolean",
+              "title": "settings"
+            },
+            "label": {
+              "description": "Indicates the label for the item that has to be displayed in the Settings Panel",
+              "type": "string",
+              "title": "label"
+            }
+          }
+        },
         "rationale": {
           "title": "ConfigureProp",
           "type": "object",
@@ -167,7 +183,7 @@
             }
           }
         },
-        "verticalMode": {
+        "choicesLayout": {
           "title": "ConfigureProp",
           "type": "object",
           "properties": {
@@ -182,6 +198,84 @@
               "title": "label"
             }
           }
+        },
+        "gridColumns": {
+          "title": "ConfigureProp",
+          "type": "object",
+          "properties": {
+            "settings": {
+              "description": "Indicates if the item has to be displayed in the Settings Panel",
+              "type": "boolean",
+              "title": "settings"
+            },
+            "label": {
+              "description": "Indicates the label for the item that has to be displayed in the Settings Panel",
+              "type": "string",
+              "title": "label"
+            }
+          }
+        },
+        "minAnswerChoices": {
+          "description": "Minimum number of answer choices",
+          "type": "number",
+          "title": "minAnswerChoices"
+        },
+        "maxAnswerChoices": {
+          "description": "Maximum number of answer choices",
+          "type": "number",
+          "title": "maxAnswerChoices"
+        },
+        "maxImageWidth": {
+          "title": "ConfigureMaxImageDimensionsProp",
+          "type": "object",
+          "properties": {
+            "teacherInstructions": {
+              "description": "Indicates the max dimension for images in teacher instructions",
+              "type": "number",
+              "title": "teacherInstructions"
+            },
+            "prompt": {
+              "description": "Indicates the max dimension for images in prompt - this is also the default dimension for all other input fields if it's not specified",
+              "type": "number",
+              "title": "prompt"
+            },
+            "rationale": {
+              "description": "Indicates the max dimension for images in rationale",
+              "type": "number",
+              "title": "rationale"
+            },
+            "choices": {
+              "description": "Indicates the max dimension for images in choices",
+              "type": "number",
+              "title": "choices"
+            }
+          }
+        },
+        "maxImageHeight": {
+          "title": "ConfigureMaxImageDimensionsProp",
+          "type": "object",
+          "properties": {
+            "teacherInstructions": {
+              "description": "Indicates the max dimension for images in teacher instructions",
+              "type": "number",
+              "title": "teacherInstructions"
+            },
+            "prompt": {
+              "description": "Indicates the max dimension for images in prompt - this is also the default dimension for all other input fields if it's not specified",
+              "type": "number",
+              "title": "prompt"
+            },
+            "rationale": {
+              "description": "Indicates the max dimension for images in rationale",
+              "type": "number",
+              "title": "rationale"
+            },
+            "choices": {
+              "description": "Indicates the max dimension for images in choices",
+              "type": "number",
+              "title": "choices"
+            }
+          }
         }
       }
     },
@@ -301,6 +395,22 @@
             }
           }
         },
+        "spellCheck": {
+          "title": "ConfigureProp",
+          "type": "object",
+          "properties": {
+            "settings": {
+              "description": "Indicates if the item has to be displayed in the Settings Panel",
+              "type": "boolean",
+              "title": "settings"
+            },
+            "label": {
+              "description": "Indicates the label for the item that has to be displayed in the Settings Panel",
+              "type": "string",
+              "title": "label"
+            }
+          }
+        },
         "rationale": {
           "title": "ConfigureProp",
           "type": "object",
@@ -349,7 +459,23 @@
             }
           }
         },
-        "verticalMode": {
+        "choicesLayout": {
+          "title": "ConfigureProp",
+          "type": "object",
+          "properties": {
+            "settings": {
+              "description": "Indicates if the item has to be displayed in the Settings Panel",
+              "type": "boolean",
+              "title": "settings"
+            },
+            "label": {
+              "description": "Indicates the label for the item that has to be displayed in the Settings Panel",
+              "type": "string",
+              "title": "label"
+            }
+          }
+        },
+        "gridColumns": {
           "title": "ConfigureProp",
           "type": "object",
           "properties": {
@@ -364,6 +490,68 @@
               "title": "label"
             }
           }
+        },
+        "minAnswerChoices": {
+          "description": "Minimum number of answer choices",
+          "type": "number",
+          "title": "minAnswerChoices"
+        },
+        "maxAnswerChoices": {
+          "description": "Maximum number of answer choices",
+          "type": "number",
+          "title": "maxAnswerChoices"
+        },
+        "maxImageWidth": {
+          "title": "ConfigureMaxImageDimensionsProp",
+          "type": "object",
+          "properties": {
+            "teacherInstructions": {
+              "description": "Indicates the max dimension for images in teacher instructions",
+              "type": "number",
+              "title": "teacherInstructions"
+            },
+            "prompt": {
+              "description": "Indicates the max dimension for images in prompt - this is also the default dimension for all other input fields if it's not specified",
+              "type": "number",
+              "title": "prompt"
+            },
+            "rationale": {
+              "description": "Indicates the max dimension for images in rationale",
+              "type": "number",
+              "title": "rationale"
+            },
+            "choices": {
+              "description": "Indicates the max dimension for images in choices",
+              "type": "number",
+              "title": "choices"
+            }
+          }
+        },
+        "maxImageHeight": {
+          "title": "ConfigureMaxImageDimensionsProp",
+          "type": "object",
+          "properties": {
+            "teacherInstructions": {
+              "description": "Indicates the max dimension for images in teacher instructions",
+              "type": "number",
+              "title": "teacherInstructions"
+            },
+            "prompt": {
+              "description": "Indicates the max dimension for images in prompt - this is also the default dimension for all other input fields if it's not specified",
+              "type": "number",
+              "title": "prompt"
+            },
+            "rationale": {
+              "description": "Indicates the max dimension for images in rationale",
+              "type": "number",
+              "title": "rationale"
+            },
+            "choices": {
+              "description": "Indicates the max dimension for images in choices",
+              "type": "number",
+              "title": "choices"
+            }
+          }
         }
       }
     },
@@ -549,6 +737,22 @@
             }
           }
         },
+        "spellCheck": {
+          "title": "ConfigureProp",
+          "type": "object",
+          "properties": {
+            "settings": {
+              "description": "Indicates if the item has to be displayed in the Settings Panel",
+              "type": "boolean",
+              "title": "settings"
+            },
+            "label": {
+              "description": "Indicates the label for the item that has to be displayed in the Settings Panel",
+              "type": "string",
+              "title": "label"
+            }
+          }
+        },
         "rationale": {
           "title": "ConfigureProp",
           "type": "object",
@@ -597,7 +801,7 @@
             }
           }
         },
-        "verticalMode": {
+        "choicesLayout": {
           "title": "ConfigureProp",
           "type": "object",
           "properties": {
@@ -612,6 +816,84 @@
               "title": "label"
             }
           }
+        },
+        "gridColumns": {
+          "title": "ConfigureProp",
+          "type": "object",
+          "properties": {
+            "settings": {
+              "description": "Indicates if the item has to be displayed in the Settings Panel",
+              "type": "boolean",
+              "title": "settings"
+            },
+            "label": {
+              "description": "Indicates the label for the item that has to be displayed in the Settings Panel",
+              "type": "string",
+              "title": "label"
+            }
+          }
+        },
+        "minAnswerChoices": {
+          "description": "Minimum number of answer choices",
+          "type": "number",
+          "title": "minAnswerChoices"
+        },
+        "maxAnswerChoices": {
+          "description": "Maximum number of answer choices",
+          "type": "number",
+          "title": "maxAnswerChoices"
+        },
+        "maxImageWidth": {
+          "title": "ConfigureMaxImageDimensionsProp",
+          "type": "object",
+          "properties": {
+            "teacherInstructions": {
+              "description": "Indicates the max dimension for images in teacher instructions",
+              "type": "number",
+              "title": "teacherInstructions"
+            },
+            "prompt": {
+              "description": "Indicates the max dimension for images in prompt - this is also the default dimension for all other input fields if it's not specified",
+              "type": "number",
+              "title": "prompt"
+            },
+            "rationale": {
+              "description": "Indicates the max dimension for images in rationale",
+              "type": "number",
+              "title": "rationale"
+            },
+            "choices": {
+              "description": "Indicates the max dimension for images in choices",
+              "type": "number",
+              "title": "choices"
+            }
+          }
+        },
+        "maxImageHeight": {
+          "title": "ConfigureMaxImageDimensionsProp",
+          "type": "object",
+          "properties": {
+            "teacherInstructions": {
+              "description": "Indicates the max dimension for images in teacher instructions",
+              "type": "number",
+              "title": "teacherInstructions"
+            },
+            "prompt": {
+              "description": "Indicates the max dimension for images in prompt - this is also the default dimension for all other input fields if it's not specified",
+              "type": "number",
+              "title": "prompt"
+            },
+            "rationale": {
+              "description": "Indicates the max dimension for images in rationale",
+              "type": "number",
+              "title": "rationale"
+            },
+            "choices": {
+              "description": "Indicates the max dimension for images in choices",
+              "type": "number",
+              "title": "choices"
+            }
+          }
         }
       }
     },
@@ -630,6 +912,32 @@
           "title": "label"
         }
       }
+    },
+    "ConfigureMaxImageDimensionsProp": {
+      "title": "ConfigureMaxImageDimensionsProp",
+      "type": "object",
+      "properties": {
+        "teacherInstructions": {
+          "description": "Indicates the max dimension for images in teacher instructions",
+          "type": "number",
+          "title": "teacherInstructions"
+        },
+        "prompt": {
+          "description": "Indicates the max dimension for images in prompt - this is also the default dimension for all other input fields if it's not specified",
+          "type": "number",
+          "title": "prompt"
+        },
+        "rationale": {
+          "description": "Indicates the max dimension for images in rationale",
+          "type": "number",
+          "title": "rationale"
+        },
+        "choices": {
+          "description": "Indicates the max dimension for images in choices",
+          "type": "number",
+          "title": "choices"
+        }
+      }
     }
   },
   "$schema": "http://json-schema.org/draft-07/schema#"