@pie-element/multiple-choice 11.0.1-next.27 → 11.0.1-next.28

package/configure/package.json

@@ -8,9 +8,9 @@
     "@material-ui/core": "^3.9.2",
     "@material-ui/icons": "^3.0.1",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/config-ui": "^11.25.0",
-    "@pie-lib/editable-html": "^11.17.0",
-    "@pie-lib/render-ui": "^4.31.0",
+    "@pie-lib/config-ui": "^11.25.1",
+    "@pie-lib/editable-html": "^11.17.1",
+    "@pie-lib/render-ui": "^4.31.1",
     "debug": "^3.1.0",
     "lodash": "^4.17.15",
     "prop-types": "^15.6.2",

package/controller/package.json

@@ -8,7 +8,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@pie-lib/controller-utils": "^0.18.0",
+    "@pie-lib/controller-utils": "^0.19.4",
     "debug": "^3.1.0",
     "lodash": "^4.17.15"
   }

package/module/controller.js

@@ -2541,26 +2541,6 @@ var defaults = {
   keyboardEventsEnabled: false,
 };
 
-const enabled = (config, env, defaultValue) => {
-  // if model.partialScoring = false
-  //  - if env.partialScoring = false || env.partialScoring = true => use dichotomous scoring
-  // else if model.partialScoring = true || undefined
-  //  - if env.partialScoring = false, use dichotomous scoring
-  //  - else if env.partialScoring = true, use partial scoring
-  config = config || {};
-  env = env || {};
-
-  if (config.partialScoring === false) {
-    return false;
-  }
-
-  if (env.partialScoring === false) {
-    return false;
-  }
-
-  return typeof defaultValue === 'boolean' ? defaultValue : true;
-};
-
 var baseGetTag = _baseGetTag,
     isObjectLike = isObjectLike_1;
 
@@ -3127,67 +3107,90 @@ function shuffle(collection) {
 
 var shuffle_1 = shuffle;
 
-// eslint-disable-next-line no-console
-const lg = (n) => console[n].bind(console, 'controller-utils:');
+const enabled = (config, env, defaultValue) => {
+  // if model.partialScoring = false
+  //  - if env.partialScoring = false || env.partialScoring = true => use dichotomous scoring
+  // else if model.partialScoring = true || undefined
+  //  - if env.partialScoring = false, use dichotomous scoring
+  //  - else if env.partialScoring = true, use partial scoring
+  config = config || {};
+  env = env || {};
+
+  if (config.partialScoring === false) {
+    return false;
+  }
+
+  if (env.partialScoring === false) {
+    return false;
+  }
+
+  return typeof defaultValue === 'boolean' ? defaultValue : true;
+};
+
+var partialScoring = /*#__PURE__*/Object.freeze({
+  __proto__: null,
+  enabled: enabled
+});
+
+const lg = n => console[n].bind(console, 'controller-utils:');
+
 const debug = lg('debug');
 const log = lg('log');
 const warn = lg('warn');
 const error = lg('error');
-
-const compact = (arr) => {
+const compact = arr => {
   if (Array.isArray(arr)) {
-    return arr.filter((v) => v !== null && v !== undefined);
+    return arr.filter(v => v !== null && v !== undefined);
   }
+
   return arr;
 };
-
-const getShuffledChoices = (choices, session, updateSession, choiceKey) =>
-  new Promise((resolve) => {
-    log('updateSession type: ', typeof updateSession);
-    log('session: ', session);
-
-    const currentShuffled = compact(session?.data?.shuffledValues || session?.shuffledValues || []);
-
-    if (!session) {
-      // eslint-disable-next-line quotes
-      warn("unable to save shuffled choices because there's no session.");
-      resolve(undefined);
-    } else if (!isEmpty_1(currentShuffled)) {
-      debug('use shuffledValues to sort the choices...', session.data?.shuffledValues);
-      resolve(compact(currentShuffled.map((v) => choices.find((c) => c[choiceKey] === v))));
-    } else {
-      const shuffledChoices = shuffle_1(choices);
-
-      if (updateSession && typeof updateSession === 'function') {
-        try {
-          //Note: session.id refers to the id of the element within a session
-          const shuffledValues = compact(shuffledChoices.map((c) => c[choiceKey]));
-          log('try to save shuffledValues to session...', shuffledValues);
-          log('call updateSession... ', session.id, session.element);
-          if (isEmpty_1(shuffledValues)) {
-            error(
-              `shuffledValues is an empty array? - refusing to call updateSession: shuffledChoices: ${JSON.stringify(
-                shuffledChoices,
-              )}, key: ${choiceKey}`,
-            );
-          } else {
-            updateSession(session.id, session.element, { shuffledValues }).catch((e) =>
-              // eslint-disable-next-line no-console
-              console.error('update session failed for: ', session.id, e),
-            );
-          }
-        } catch (e) {
-          warn('unable to save shuffled order for choices');
-          error(e);
+const getShuffledChoices = (choices, session, updateSession, choiceKey) => new Promise(resolve => {
+  var _session$data;
+
+  log('updateSession type: ', typeof updateSession);
+  log('session: ', session);
+  const currentShuffled = compact((session == null ? void 0 : (_session$data = session.data) == null ? void 0 : _session$data.shuffledValues) || (session == null ? void 0 : session.shuffledValues) || []);
+
+  if (!session) {
+    // eslint-disable-next-line quotes
+    warn("unable to save shuffled choices because there's no session.");
+    resolve(undefined);
+  } else if (!isEmpty_1(currentShuffled)) {
+    var _session$data2;
+
+    debug('use shuffledValues to sort the choices...', (_session$data2 = session.data) == null ? void 0 : _session$data2.shuffledValues);
+    resolve(compact(currentShuffled.map(v => choices.find(c => c[choiceKey] === v))));
+  } else {
+    const shuffledChoices = shuffle_1(choices);
+
+    if (updateSession && typeof updateSession === 'function') {
+      try {
+        //Note: session.id refers to the id of the element within a session
+        const shuffledValues = compact(shuffledChoices.map(c => c[choiceKey]));
+        log('try to save shuffledValues to session...', shuffledValues);
+        log('call updateSession... ', session.id, session.element);
+
+        if (isEmpty_1(shuffledValues)) {
+          error(`shuffledValues is an empty array? - refusing to call updateSession: shuffledChoices: ${JSON.stringify(shuffledChoices)}, key: ${choiceKey}`);
+        } else {
+          updateSession(session.id, session.element, {
+            shuffledValues
+          }).catch(e => // eslint-disable-next-line no-console
+          console.error('update session failed for: ', session.id, e));
         }
-      } else {
-        warn('unable to save shuffled choices, shuffle will happen every time.');
+      } catch (e) {
+        warn('unable to save shuffled order for choices');
+        error(e);
       }
-      //save this shuffle to the session for later retrieval
-      resolve(shuffledChoices);
-    }
-  });
+    } else {
+      warn('unable to save shuffled choices, shuffle will happen every time.');
+    } //save this shuffle to the session for later retrieval
 
+
+    resolve(shuffledChoices);
+  }
+});
 /**
  * If we return:
  * - true - that means that the order of the choices will be ordinal (as is created in the configure item)
@@ -3198,6 +3201,7 @@ const getShuffledChoices = (choices, session, updateSession, choiceKey) =>
  * @param env - env to check if we should lock order
  * @returns {boolean}
  */
+
 const lockChoices = (model, session, env) => {
   if (model.lockChoiceOrder) {
     return true;
@@ -3213,17 +3217,16 @@ const lockChoices = (model, session, env) => {
 
   if (role === 'instructor') {
     // TODO: .. in the future the instructor can toggle between ordinal and shuffled here, so keeping this code until then
-    /*const alreadyShuffled = hasShuffledValues(session);
 
-    if (alreadyShuffled) {
+    /*const alreadyShuffled = hasShuffledValues(session);
+     if (alreadyShuffled) {
       return false;
     }
-
-    return true;*/
+     return true;*/
     return true;
-  }
+  } // here it's a student, so don't lock and it will shuffle if needs be
+
 
-  // here it's a student, so don't lock and it will shuffle if needs be
   return false;
 };
 
@@ -3379,7 +3382,7 @@ function outcome(model, session, env) {
     if (!session || isEmpty_1(session)) {
       resolve({ score: 0, empty: true });
     } else {
-      const partialScoringEnabled = enabled(model, env) && model.choiceMode !== 'radio';
+      const partialScoringEnabled = partialScoring.enabled(model, env) && model.choiceMode !== 'radio';
       const score = getScore(model, session);
 
       resolve({ score: partialScoringEnabled ? score : score === 1 ? 1 : 0, empty: false });