@gamelearn/arcade-components 1.3.17 → 1.3.18

package/dist/components/test-component/components/TestComponent.js

@@ -98,30 +98,23 @@ var TestComponent = function TestComponent(_ref) {
       isFirst = _useState16[0],
       changeFirst = _useState16[1];
 
-  var _useState17 = (0, _react.useState)({
-    negatives: {},
-    positives: {}
-  }),
+  var _useState17 = (0, _react.useState)({}),
       _useState18 = _slicedToArray(_useState17, 2),
-      resultHolder = _useState18[0],
-      setResultHolder = _useState18[1];
+      showingResult = _useState18[0],
+      setShowingResult = _useState18[1];
 
   var _useState19 = (0, _react.useState)({}),
       _useState20 = _slicedToArray(_useState19, 2),
-      showingResult = _useState20[0],
-      setShowingResult = _useState20[1];
+      historicAnswers = _useState20[0],
+      setHistoric = _useState20[1];
 
-  var _useState21 = (0, _react.useState)({}),
+  var _useState21 = (0, _react.useState)(false),
       _useState22 = _slicedToArray(_useState21, 2),
-      historicAnswers = _useState22[0],
-      setHistoric = _useState22[1];
-
-  var _useState23 = (0, _react.useState)(false),
-      _useState24 = _slicedToArray(_useState23, 2),
-      timeOver = _useState24[0],
-      setTimeOver = _useState24[1];
+      timeOver = _useState22[0],
+      setTimeOver = _useState22[1];
 
   var isRequired = required || test.required || false;
+  var rewardedCorrectAnswers = (0, _react.useRef)({});
 
   var _soundActions = _slicedToArray(soundActions, 2),
       playSound = _soundActions[0],
@@ -180,11 +173,6 @@ var TestComponent = function TestComponent(_ref) {
 
     var parsedShowingResult = _objectSpread({}, showingResult);
 
-    Object.keys(resultHolder.positives).forEach(function (questionID) {
-      if (parsedShowingResult[questionID] && parsedShowingResult[questionID].id === resultHolder.positives[questionID].id) {
-        delete parsedShowingResult[questionID];
-      }
-    });
     setShowingResult(parsedShowingResult);
     stop('test_bg');
   };
@@ -195,9 +183,10 @@ var TestComponent = function TestComponent(_ref) {
       result: result,
       status: 'resolved'
     };
-    Object.keys(actualResult.result).forEach(function (questionID) {
-      if (resultHolder.negatives[questionID]) {
-        actualResult.result[questionID].rewards = [].concat(_toConsumableArray(actualResult.result[questionID].rewards), _toConsumableArray(resultHolder.negatives[questionID].rewards));
+    var resultKeys = Object.keys(result);
+    resultKeys.forEach(function (k) {
+      if (rewardedCorrectAnswers.current[result[k].id]) {
+        result[k].rewards = [];
       }
     });
     emitEvent({
@@ -207,25 +196,36 @@ var TestComponent = function TestComponent(_ref) {
   };
 
   var restartTest = function restartTest() {
-    var holder = _objectSpread({}, resultHolder);
-
-    Object.keys(result).forEach(function (questionID) {
-      var isCorrect = result[questionID].isCorrect ? 'positives' : 'negatives';
+    var finishAddPoints = function finishAddPoints() {
+      setShowingResult({});
+      setHistoric({});
+      changeView('test');
+      setResult({});
+      setTime(countdown.time);
+      setTimeOver(false);
+      stop('test_bg');
+    };
 
-      if (holder[isCorrect][questionID]) {
-        holder[isCorrect][questionID].rewards = [].concat(_toConsumableArray(holder[isCorrect][questionID].rewards), _toConsumableArray(result[questionID].rewards));
-      } else {
-        holder[isCorrect][questionID] = result[questionID];
+    var resultAnswers = Object.values(result);
+    resultAnswers.forEach(function (a) {
+      if (a.isCorrect) {
+        if (!rewardedCorrectAnswers.current[a.id]) {
+          rewardedCorrectAnswers.current[a.id] = true;
+        } else {
+          a.rewards = [];
+        }
       }
     });
-    setShowingResult({});
-    setHistoric({});
-    setResultHolder(holder);
-    changeView('test');
-    setResult({});
-    setTime(countdown.time);
-    setTimeOver(false);
-    stop('test_bg');
+    var rewards = resultAnswers.reduce(function (acc, current) {
+      return [].concat(_toConsumableArray(acc), _toConsumableArray(current.rewards));
+    }, []);
+    emitEvent({
+      type: 'addPoints',
+      payload: rewards,
+      complex: true,
+      finish: false,
+      onFinish: finishAddPoints
+    });
   };
 
   var translate = function translate(id, values) {

package/dist/components/writer-puzzle-component/components/WriterPuzzleComponent.js

@@ -51,7 +51,6 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 var WriterPuzzleComponent = function WriterPuzzleComponent(_ref) {
   var emitEvent = _ref.emitEvent,
-      info = _ref.info,
       styles = _ref.styles,
       nodeId = _ref.nodeId,
       retry = _ref.retry,
@@ -137,6 +136,7 @@ var WriterPuzzleComponent = function WriterPuzzleComponent(_ref) {
   var _soundActions = _slicedToArray(soundActions, 1),
       playSound = _soundActions[0];
 
+  var rewardedCorrectAnswers = (0, _react.useRef)({});
   (0, _react.useEffect)(function () {
     if (finished) {
       setDisableExit(false);
@@ -243,52 +243,24 @@ var WriterPuzzleComponent = function WriterPuzzleComponent(_ref) {
     });
   };
 
-  var endPoints = function endPoints() {
-    var accumulatedRewards;
-
-    if (info.solution && info.solution.right) {
-      var rewards = info.solution.right.rewards;
-
-      if (rewards && Array.isArray(rewards) && rewards.length) {
-        accumulatedRewards = Array.from(rewards.concat(rewardsStack));
-      } else {
-        accumulatedRewards = Array.from(rewardsStack);
-      }
-    } else {
-      accumulatedRewards = Array.from(rewardsStack);
-    }
-
-    var wrongRewards = info.solution.wrong.rewards;
-    var rightRewards = info.solution.right.rewards;
+  var endGame = function endGame() {
     var AllDecisionsCorrect = checkAllDecisionsAreCorrect(); // if any is wrong count as wrong if  there are no individual points assigned
 
-    var pointsToEmit = [];
-
     if (failed) {
       playSound('fail');
-      pointsToEmit = accumulatedRewards;
     } else {
       playSound(AllDecisionsCorrect ? 'score' : 'fail');
-      pointsToEmit = AllDecisionsCorrect ? rightRewards : wrongRewards;
     }
 
     emitEvent({
       type: 'addPoints',
       complex: true,
       finish: true,
-      payload: pointsToEmit
+      payload: rewardsStack,
+      onFinish: type !== 'view' ? handleLectures : null
     });
   };
 
-  var endGame = function endGame() {
-    if (type !== 'view') {
-      handleLectures();
-      endPoints();
-    } else {
-      endPoints();
-    }
-  };
-
   var handleFinish = function handleFinish() {
     if (!checkIfFeedbackNeeded()) {
       // THis case is for when we do not have any Decision
@@ -321,18 +293,24 @@ var WriterPuzzleComponent = function WriterPuzzleComponent(_ref) {
   };
 
   var retryPuzzle = function retryPuzzle() {
-    setDecisionsList([]);
+    setFinished(false);
     setCurrentTextParagraph(0);
+    setDecisionsList([]);
+    setRewardsStack([]);
     setDoneTyping(false);
-    setFinished(false);
     setShowFeedback(false);
     setReviewDone(false);
-    setTextHolder({});
     setTextHolder(_defineProperty({}, "text_".concat(0), _objectSpread(_objectSpread({}, texts[0]), {}, {
       id: "text_".concat(0),
       correct: ''
     })));
     setIsActive(true);
+    emitEvent({
+      type: 'addPoints',
+      complex: true,
+      finish: false,
+      payload: rewardsStack
+    });
   };
 
   var noColor = function noColor() {
@@ -344,10 +322,17 @@ var WriterPuzzleComponent = function WriterPuzzleComponent(_ref) {
   };
 
   var handleSelectedOption = function handleSelectedOption(index) {
-    var currentRewards = texts[currenTextParagraph].electionTexts[index].feedback.rewards;
+    var currentElection = texts[currenTextParagraph].electionTexts[index];
+    var currentRewards = currentElection.feedback.rewards;
 
     if (currentRewards && currentRewards[0] && currentRewards[0].points) {
-      setRewardsStack([].concat(_toConsumableArray(rewardsStack), _toConsumableArray(currentRewards)));
+      if (!rewardedCorrectAnswers.current["t".concat(currenTextParagraph, "_e").concat(index)]) {
+        if (currentElection.correct) {
+          rewardedCorrectAnswers.current["t".concat(currenTextParagraph, "_e").concat(index)] = true;
+        }
+
+        setRewardsStack([].concat(_toConsumableArray(rewardsStack), _toConsumableArray(currentRewards)));
+      }
     }
 
     var checkColor = function checkColor() {
@@ -355,18 +340,18 @@ var WriterPuzzleComponent = function WriterPuzzleComponent(_ref) {
         return 'none';
       }
 
-      return texts[currenTextParagraph].electionTexts[index].correct ? 'green' : 'red';
+      return currentElection.correct ? 'green' : 'red';
     };
 
     var decision = {
       currenTextParagraph: currenTextParagraph,
-      fullText: texts[currenTextParagraph].electionTexts[index].fullText,
+      fullText: currentElection.fullText,
       index: index,
       isCorrect: checkColor()
     };
     setTextHolder(_objectSpread(_objectSpread({}, textHolder), {}, _defineProperty({}, "text_".concat(currenTextParagraph), {
       type: 'fixed',
-      fullText: texts[currenTextParagraph].electionTexts[index].fullText,
+      fullText: currentElection.fullText,
       correct: decision.isCorrect
     })));
     setDecisionsList([].concat(_toConsumableArray(decisionsList), [decision]));
@@ -461,9 +446,7 @@ var WriterPuzzleComponent = function WriterPuzzleComponent(_ref) {
     retry: retry,
     skip: skip,
     checkCorrect: checkAllDecisionsAreCorrect,
-    retryAction: function retryAction() {
-      return retryPuzzle();
-    },
+    retryAction: retryPuzzle,
     rewardsStack: rewardsStack,
     nodeId: nodeId,
     soundActions: soundActions

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gamelearn/arcade-components",
   "license": "Gamelearn",
-  "version": "1.3.17",
+  "version": "1.3.18",
   "main": "dist/index.js",
   "files": [
     "dist",