@pie-element/rubric 3.1.8-next.0 → 3.1.8-next.2

package/controller/lib/index.js

@@ -19,10 +19,16 @@ function markupToText(s) {
 
 
 function validate(model, config) {
-  var points = model.points;
+  var points = model.points,
+      excludeZero = model.excludeZero;
   var errors = {};
   var pointsDescriptorsErrors = {};
   (points || []).forEach(function (point, index) {
+    if (index === 0 && excludeZero) {
+      // if excludeZero is true, the 0 point is not displayed, so it should not be validated
+      return;
+    }
+
     if (!point || point === '<div></div>') {
       pointsDescriptorsErrors[index] = 'Points descriptors cannot be empty.';
     } else {

package/controller/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.js"],"names":["model","session","env","Promise","resolve","modelResult","role","markupToText","s","replace","validate","config","points","errors","pointsDescriptorsErrors","forEach","point","index","identicalPointDescr","slice","some","p","Object","keys","length"],"mappings":";;;;;;;;AAAO,SAASA,KAAT,CAAeA,KAAf,EAAsBC,OAAtB,EAA+BC,GAA/B,EAAoC;AACzC,SAAO,IAAIC,OAAJ,CAAY,UAACC,OAAD,EAAa;AAC9B,QAAMC,WAAW,GAAG,CAACL,KAAD,GAAS,EAAT,GAAcA,KAAlC;AACAI,IAAAA,OAAO,CAACF,GAAG,IAAIA,GAAG,CAACI,IAAX,IAAmBJ,GAAG,CAACI,IAAJ,KAAa,YAAhC,GAA+CD,WAA/C,GAA6D,EAA9D,CAAP;AACD,GAHM,CAAP;AAID;;AAGD,SAASE,YAAT,CAAsBC,CAAtB,EAAyB;AACvB,SAAO,CAACA,CAAC,IAAI,EAAN,EAAUC,OAAV,CAAkB,eAAlB,EAAmC,EAAnC,CAAP;AACD,C,CAGD;;;AACO,SAASC,QAAT,CAAmBV,KAAnB,EAA0BW,MAA1B,EAAkC;AACvC,MAAQC,MAAR,GAAmBZ,KAAnB,CAAQY,MAAR;AACA,MAAMC,MAAM,GAAG,EAAf;AACA,MAAMC,uBAAuB,GAAG,EAAhC;AAEA,GAACF,MAAM,IAAI,EAAX,EAAeG,OAAf,CAAuB,UAACC,KAAD,EAAQC,KAAR,EAAkB;AACvC,QAAG,CAACD,KAAD,IAASA,KAAK,KAAK,aAAtB,EAAqC;AACnCF,MAAAA,uBAAuB,CAACG,KAAD,CAAvB,GAAiC,qCAAjC;AACD,KAFD,MAGI;AACF,UAAMC,mBAAmB,GAAGN,MAAM,CAACO,KAAP,CAAaF,KAAK,GAAG,CAArB,EAAwBG,IAAxB,CAA6B,UAAAC,CAAC;AAAA,eAAId,YAAY,CAACc,CAAD,CAAZ,KAAoBd,YAAY,CAACS,KAAD,CAApC;AAAA,OAA9B,CAA5B;;AAEA,UAAIE,mBAAJ,EAAyB;AACvBJ,QAAAA,uBAAuB,CAACG,KAAD,CAAvB,GAAiC,sCAAjC;AACD;AACF;AACF,GAXD;;AAaA,MAAGK,MAAM,CAACC,IAAP,CAAYT,uBAAZ,EAAqCU,MAArC,GAA8C,CAAjD,EAAmD;AACjDX,IAAAA,MAAM,CAACC,uBAAP,GAAiCA,uBAAjC;AACD;;AAED,SAAOD,MAAP;AACD","sourcesContent":["export function model(model, session, env) {\n  return new Promise((resolve) => {\n    const modelResult = !model ? {} : model;\n    resolve(env && env.role && env.role === 'instructor' ? modelResult : {});\n  });\n}\n\n\nfunction markupToText(s) {\n  return (s || '').replace(/(<([^>]+)>)/ig, '');\n}\n\n\n// IMPORTANT! If you make any changes to this function, please make sure you also update complex-rubric/controller/validateSimpleRubric function!“.\nexport function validate (model, config) {\n  const { points } = model;\n  const errors = {};\n  const pointsDescriptorsErrors = {};\n\n  (points || []).forEach((point, index) => {\n    if(!point|| point === '<div></div>') {\n      pointsDescriptorsErrors[index] = 'Points descriptors cannot be empty.';\n    }\n    else{\n      const identicalPointDescr = points.slice(index + 1).some(p => markupToText(p) === markupToText(point));\n\n      if (identicalPointDescr) {\n        pointsDescriptorsErrors[index] = 'Points descriptors should be unique.';\n      }\n    }\n  });\n\n  if(Object.keys(pointsDescriptorsErrors).length > 0){\n    errors.pointsDescriptorsErrors = pointsDescriptorsErrors;\n  }\n\n  return errors;\n}\n"],"file":"index.js"}
+{"version":3,"sources":["../src/index.js"],"names":["model","session","env","Promise","resolve","modelResult","role","markupToText","s","replace","validate","config","points","excludeZero","errors","pointsDescriptorsErrors","forEach","point","index","identicalPointDescr","slice","some","p","Object","keys","length"],"mappings":";;;;;;;;AAAO,SAASA,KAAT,CAAeA,KAAf,EAAsBC,OAAtB,EAA+BC,GAA/B,EAAoC;AACzC,SAAO,IAAIC,OAAJ,CAAY,UAACC,OAAD,EAAa;AAC9B,QAAMC,WAAW,GAAG,CAACL,KAAD,GAAS,EAAT,GAAcA,KAAlC;AACAI,IAAAA,OAAO,CAACF,GAAG,IAAIA,GAAG,CAACI,IAAX,IAAmBJ,GAAG,CAACI,IAAJ,KAAa,YAAhC,GAA+CD,WAA/C,GAA6D,EAA9D,CAAP;AACD,GAHM,CAAP;AAID;;AAGD,SAASE,YAAT,CAAsBC,CAAtB,EAAyB;AACvB,SAAO,CAACA,CAAC,IAAI,EAAN,EAAUC,OAAV,CAAkB,eAAlB,EAAmC,EAAnC,CAAP;AACD,C,CAGD;;;AACO,SAASC,QAAT,CAAkBV,KAAlB,EAAyBW,MAAzB,EAAiC;AACtC,MAAQC,MAAR,GAAgCZ,KAAhC,CAAQY,MAAR;AAAA,MAAgBC,WAAhB,GAAgCb,KAAhC,CAAgBa,WAAhB;AACA,MAAMC,MAAM,GAAG,EAAf;AACA,MAAMC,uBAAuB,GAAG,EAAhC;AAEA,GAACH,MAAM,IAAI,EAAX,EAAeI,OAAf,CAAuB,UAACC,KAAD,EAAQC,KAAR,EAAkB;AACvC,QAAIA,KAAK,KAAK,CAAV,IAAeL,WAAnB,EAAgC;AAC9B;AACA;AACD;;AAED,QAAI,CAACI,KAAD,IAAUA,KAAK,KAAK,aAAxB,EAAuC;AACrCF,MAAAA,uBAAuB,CAACG,KAAD,CAAvB,GAAiC,qCAAjC;AACD,KAFD,MAEO;AACL,UAAMC,mBAAmB,GAAGP,MAAM,CAACQ,KAAP,CAAaF,KAAK,GAAG,CAArB,EAAwBG,IAAxB,CAA6B,UAAAC,CAAC;AAAA,eAAIf,YAAY,CAACe,CAAD,CAAZ,KAAoBf,YAAY,CAACU,KAAD,CAApC;AAAA,OAA9B,CAA5B;;AAEA,UAAIE,mBAAJ,EAAyB;AACvBJ,QAAAA,uBAAuB,CAACG,KAAD,CAAvB,GAAiC,sCAAjC;AACD;AACF;AACF,GAfD;;AAiBA,MAAIK,MAAM,CAACC,IAAP,CAAYT,uBAAZ,EAAqCU,MAArC,GAA8C,CAAlD,EAAqD;AACnDX,IAAAA,MAAM,CAACC,uBAAP,GAAiCA,uBAAjC;AACD;;AAED,SAAOD,MAAP;AACD","sourcesContent":["export function model(model, session, env) {\n  return new Promise((resolve) => {\n    const modelResult = !model ? {} : model;\n    resolve(env && env.role && env.role === 'instructor' ? modelResult : {});\n  });\n}\n\n\nfunction markupToText(s) {\n  return (s || '').replace(/(<([^>]+)>)/ig, '');\n}\n\n\n// IMPORTANT! If you make any changes to this function, please make sure you also update complex-rubric/controller/validateSimpleRubric function!“.\nexport function validate(model, config) {\n  const { points, excludeZero } = model;\n  const errors = {};\n  const pointsDescriptorsErrors = {};\n\n  (points || []).forEach((point, index) => {\n    if (index === 0 && excludeZero) {\n      // if excludeZero is true, the 0 point is not displayed, so it should not be validated\n      return;\n    }\n\n    if (!point || point === '<div></div>') {\n      pointsDescriptorsErrors[index] = 'Points descriptors cannot be empty.';\n    } else {\n      const identicalPointDescr = points.slice(index + 1).some(p => markupToText(p) === markupToText(point));\n\n      if (identicalPointDescr) {\n        pointsDescriptorsErrors[index] = 'Points descriptors should be unique.';\n      }\n    }\n  });\n\n  if (Object.keys(pointsDescriptorsErrors).length > 0) {\n    errors.pointsDescriptorsErrors = pointsDescriptorsErrors;\n  }\n\n  return errors;\n}\n"],"file":"index.js"}

package/controller/src/index.js

@@ -12,16 +12,20 @@ function markupToText(s) {
 
 
 // IMPORTANT! If you make any changes to this function, please make sure you also update complex-rubric/controller/validateSimpleRubric function!“.
-export function validate (model, config) {
-  const { points } = model;
+export function validate(model, config) {
+  const { points, excludeZero } = model;
   const errors = {};
   const pointsDescriptorsErrors = {};
 
   (points || []).forEach((point, index) => {
-    if(!point|| point === '<div></div>') {
-      pointsDescriptorsErrors[index] = 'Points descriptors cannot be empty.';
+    if (index === 0 && excludeZero) {
+      // if excludeZero is true, the 0 point is not displayed, so it should not be validated
+      return;
     }
-    else{
+
+    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));
 
       if (identicalPointDescr) {
@@ -30,7 +34,7 @@ export function validate (model, config) {
     }
   });
 
-  if(Object.keys(pointsDescriptorsErrors).length > 0){
+  if (Object.keys(pointsDescriptorsErrors).length > 0) {
     errors.pointsDescriptorsErrors = pointsDescriptorsErrors;
   }
 

package/module/controller.js

@@ -19,10 +19,16 @@ function markupToText(s) {
 
 
 function validate(model, config) {
-  var points = model.points;
+  var points = model.points,
+      excludeZero = model.excludeZero;
   var errors = {};
   var pointsDescriptorsErrors = {};
   (points || []).forEach(function (point, index) {
+    if (index === 0 && excludeZero) {
+      // if excludeZero is true, the 0 point is not displayed, so it should not be validated
+      return;
+    }
+
     if (!point || point === '<div></div>') {
       pointsDescriptorsErrors[index] = 'Points descriptors cannot be empty.';
     } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pie-element/rubric",
-  "version": "3.1.8-next.0+69422f10e",
+  "version": "3.1.8-next.2+7521f7fde",
   "main": "lib/index.js",
   "module": "src/index.js",
   "description": "Rubric Scoring Interaction",
@@ -15,7 +15,7 @@
   },
   "author": "pie framework developers",
   "license": "ISC",
-  "gitHead": "69422f10e6790930605ab592d2b1e97353df4ada",
+  "gitHead": "7521f7fdef22c6f5918d299a7f323a4f54976023",
   "scripts": {
     "postpublish": "../../scripts/postpublish"
   },