@pie-element/rubric 3.0.3 → 3.0.4-next.16

package/configure/package.json

@@ -8,7 +8,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "1.1.1",
+    "@pie-lib/pie-toolbox": "1.2.0",
     "debug": "^4.1.1",
     "react": "^16.8.6",
     "react-dom": "^16.8.6"

package/controller/lib/index.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.model = model;
+exports.validate = validate;
 
 function model(model, session, env) {
   return new Promise(function (resolve) {
@@ -11,4 +12,33 @@ function model(model, session, env) {
     resolve(env && env.role && env.role === 'instructor' ? modelResult : {});
   });
 }
+
+function markupToText(s) {
+  return (s || '').replace(/(<([^>]+)>)/ig, '');
+}
+
+function validate(model, config) {
+  var points = model.points;
+  var errors = {};
+  var pointsDescriptorsErrors = {};
+  (points || []).forEach(function (point, index) {
+    if (!point || point === '<div></div>') {
+      pointsDescriptorsErrors[index] = 'Points descriptors cannot be empty.';
+    } else {
+      var identicalPointDescr = points.slice(index + 1).some(function (p) {
+        return markupToText(p) === markupToText(point);
+      });
+
+      if (identicalPointDescr) {
+        pointsDescriptorsErrors[index] = 'Points descriptors should be unique.';
+      }
+    }
+  });
+
+  if (Object.keys(pointsDescriptorsErrors).length > 0) {
+    errors.pointsDescriptorsErrors = pointsDescriptorsErrors;
+  }
+
+  return errors;
+}
 //# sourceMappingURL=index.js.map

package/controller/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.js"],"names":["model","session","env","Promise","resolve","modelResult","role"],"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","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"],"file":"index.js"}
+{"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;;AAGM,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\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"}

package/controller/package.json

@@ -7,7 +7,7 @@
     "test": "./node_modules/.bin/jest"
   },
   "dependencies": {
-    "@pie-lib/pie-toolbox": "1.1.1",
+    "@pie-lib/pie-toolbox": "1.2.0",
     "lodash": "^4.17.15"
   }
 }

package/controller/src/index.js

@@ -4,3 +4,34 @@ export function model(model, session, env) {
     resolve(env && env.role && env.role === 'instructor' ? modelResult : {});
   });
 }
+
+
+function markupToText(s) {
+  return (s || '').replace(/(<([^>]+)>)/ig, '');
+}
+
+
+export function validate (model, config) {
+  const { points } = model;
+  const errors = {};
+  const pointsDescriptorsErrors = {};
+
+  (points || []).forEach((point, index) => {
+    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) {
+        pointsDescriptorsErrors[index] = 'Points descriptors should be unique.';
+      }
+    }
+  });
+
+  if(Object.keys(pointsDescriptorsErrors).length > 0){
+    errors.pointsDescriptorsErrors = pointsDescriptorsErrors;
+  }
+
+  return errors;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pie-element/rubric",
-  "version": "3.0.3",
+  "version": "3.0.4-next.16+1d20148ed",
   "main": "lib/index.js",
   "module": "src/index.js",
   "description": "Rubric Scoring Interaction",
@@ -10,12 +10,12 @@
   },
   "dependencies": {
     "@material-ui/core": "^3.9.2",
-    "@pie-lib/pie-toolbox": "1.1.1",
+    "@pie-lib/pie-toolbox": "1.2.0",
     "prop-types": "^15.7.2"
   },
   "author": "pie framework developers",
   "license": "ISC",
-  "gitHead": "41ec62fd9015443d35df1370d164c9e605e4d9d6",
+  "gitHead": "1d20148ed6abb750252b3cf604080abe71af5194",
   "scripts": {
     "postpublish": "../../scripts/postpublish"
   },