@gamelearn/arcade-components 1.3.4 → 1.3.5-hotfix-login-GAT-4291

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/text-click-puzzle-component/components/TextClickPuzzleComponent.js

@@ -55,7 +55,6 @@ var TextClickPuzzleComponent = function TextClickPuzzleComponent(_ref) {
       soundActions = _ref.soundActions,
       description = _ref.description,
       setInfo = _ref.setInfo,
-      setShowPoints = _ref.setShowPoints,
       setResolveAction = _ref.setResolveAction;
 
   var _useState = (0, _react.useState)({
@@ -132,7 +131,12 @@ var TextClickPuzzleComponent = function TextClickPuzzleComponent(_ref) {
 
           return acc;
         }, []);
-        setShowPoints(totalRewards);
+        emitEvent({
+          type: 'addPoints',
+          complex: true,
+          finish: true,
+          payload: totalRewards
+        });
       } else {
         parsedText.current = null;
         setCurrentSlide(currentSlide + 1);
@@ -142,7 +146,7 @@ var TextClickPuzzleComponent = function TextClickPuzzleComponent(_ref) {
         }, 1200);
       }
     }
-  }, [isCompleted, correctTextFragmentsAccumulated, numberAllCorrectFragments, setShowPoints, currentSlide]);
+  }, [isCompleted, correctTextFragmentsAccumulated, numberAllCorrectFragments, emitEvent, currentSlide]);
   var handleFeedbackFuncionOnClose = (0, _react.useCallback)(function () {
     emitEvent({
       type: 'hidePuzzleButtons',
@@ -383,10 +387,15 @@ var TextClickPuzzleComponent = function TextClickPuzzleComponent(_ref) {
           type: 'hidePuzzleButtons',
           payload: false
         });
-        setShowPoints(resolveRewards);
+        emitEvent({
+          type: 'addPoints',
+          complex: true,
+          finish: true,
+          payload: resolveRewards
+        });
       }, 2000);
     });
-  }, [setResolveAction, emitEvent, setShowPoints, list, currentSlide]);
+  }, [setResolveAction, emitEvent, list, currentSlide]);
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
     className: "text-click text-click--".concat(styles),
     style: feedbackData.show ? {

package/dist/components/text-click-puzzle-component/mocks/mockForStory.js

@@ -17,7 +17,6 @@ exports.messages = messages;
 var mockProps = {
   emitEvent: _mocker.emitEvent,
   setResolveAction: function setResolveAction() {},
-  setShowPoints: _mocker.setShowPoints,
   showFrames: true,
   soundActions: _mocker.soundActions,
   styles: 'chalkboard',
@@ -252,7 +251,6 @@ exports.mockProps = mockProps;
 var mockPropsOnce = {
   emitEvent: _mocker.emitEvent,
   setResolveAction: function setResolveAction() {},
-  setShowPoints: _mocker.setShowPoints,
   showFrames: true,
   soundActions: _mocker.soundActions,
   styles: 'chalkboard',

package/dist/components/web-builder-puzzle-component/components/WebBuilderPuzzleComponent.js

@@ -77,8 +77,7 @@ var WebBuilderPuzzleComponent = function WebBuilderPuzzleComponent(_ref) {
       emitEvent = _ref.emitEvent,
       setResolveAction = _ref.setResolveAction,
       soundActions = _ref.soundActions,
-      disableExit = _ref.disableExit,
-      setShowPoints = _ref.setShowPoints;
+      disableExit = _ref.disableExit;
 
   var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
@@ -175,7 +174,12 @@ var WebBuilderPuzzleComponent = function WebBuilderPuzzleComponent(_ref) {
       var rewards = info.solution.right.rewards;
       var wrongRewards = info.solution.wrong.rewards;
       playSound(failed ? 'fail' : 'score');
-      setShowPoints(failed ? wrongRewards : rewards);
+      emitEvent({
+        type: 'addPoints',
+        complex: true,
+        finish: true,
+        payload: failed ? wrongRewards : rewards
+      });
     }
   };
 
@@ -304,11 +308,16 @@ var WebBuilderPuzzleComponent = function WebBuilderPuzzleComponent(_ref) {
       showReference(false);
       setTimeout(function () {
         showCurrentFeed('');
-        setShowPoints(info.resolve.rewards);
+        emitEvent({
+          type: 'addPoints',
+          complex: true,
+          finish: true,
+          payload: info.resolve.rewards
+        });
       }, 4000);
     });
     disableExit(true);
-  }, [setResolveAction, disableExit, setShowPoints, info.resolve.rewards]);
+  }, [setResolveAction, disableExit, info.resolve.rewards, emitEvent]);
   var props = {
     showingReference: showingReference || resolved,
     isFacebook: isFacebook,

package/dist/components/web-builder-puzzle-component/mocks/mockForStory.js

@@ -21,7 +21,6 @@ var mockProps = {
   },
   emitEvent: _mocker.emitEvent,
   soundActions: _mocker.soundActions,
-  setShowPoints: _mocker.setShowPoints,
   setResolveAction: noop,
   disableExit: noop
 };

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

@@ -7,8 +7,6 @@ exports.default = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _RewardsComponent = _interopRequireDefault(require("../../rewards-component/components/RewardsComponent"));
-
 var _FeedbackElement = _interopRequireDefault(require("./FeedbackElement"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -37,7 +35,6 @@ var FeedbackComponent = function FeedbackComponent(_ref) {
       checkCorrect = _ref.checkCorrect,
       rewardsStack = _ref.rewardsStack,
       setFailed = _ref.setFailed,
-      nodeId = _ref.nodeId,
       soundActions = _ref.soundActions;
 
   var _soundActions = _slicedToArray(soundActions, 1),
@@ -50,19 +47,6 @@ var FeedbackComponent = function FeedbackComponent(_ref) {
     });
   };
 
-  var DecisionElement = function DecisionElement(_ref2) {
-    var decision = _ref2.decision;
-
-    if (texts[decision.currenTextParagraph].electionTexts[decision.index].feedback.body) {
-      return /*#__PURE__*/_react.default.createElement(_FeedbackElement.default, {
-        decision: texts[decision.currenTextParagraph].electionTexts[decision.index],
-        key: decision.index
-      });
-    }
-
-    return null;
-  };
-
   var close = function close() {
     playSound('click-ui');
     closingAction();
@@ -72,20 +56,19 @@ var FeedbackComponent = function FeedbackComponent(_ref) {
 
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "writer-feedback ".concat(!rewardsStack.length ? 'start' : '')
-  }, /*#__PURE__*/_react.default.createElement("div", {
-    className: "writer-feedback__points ".concat(!decisionsList ? 'center' : '')
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "writer-feedback__title"
-  }, translate('puzzles.feedback')), rewardsStack.length !== 0 && /*#__PURE__*/_react.default.createElement(_RewardsComponent.default, {
-    rewards: rewardsStack,
-    nodeId: nodeId,
-    emitEvent: emitEvent
-  })), /*#__PURE__*/_react.default.createElement("div", {
+  }, translate('puzzles.feedback')), /*#__PURE__*/_react.default.createElement("div", {
     className: "writer-feedback__decisions"
   }, decisionsList.map(function (decision) {
-    return /*#__PURE__*/_react.default.createElement(DecisionElement, {
-      decision: decision
-    });
+    if (texts[decision.currenTextParagraph].electionTexts[decision.index].feedback.body) {
+      return /*#__PURE__*/_react.default.createElement(_FeedbackElement.default, {
+        decision: texts[decision.currenTextParagraph].electionTexts[decision.index],
+        key: decision.index
+      });
+    }
+
+    return null;
   })), /*#__PURE__*/_react.default.createElement("div", {
     className: "writer-feedback__btns"
   }, skip && /*#__PURE__*/_react.default.createElement("button", {
@@ -124,7 +107,6 @@ FeedbackComponent.defaultProps = {
   retry: false,
   skip: false,
   checkCorrect: function checkCorrect() {},
-  rewardsStack: [{}],
   nodeId: '0'
 };
 var _default = FeedbackComponent;

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

@@ -15,12 +15,16 @@ var FeedbackElement = function FeedbackElement(_ref) {
       title = _decision$feedback.title,
       body = _decision$feedback.body;
   return /*#__PURE__*/_react.default.createElement("div", null, body !== '' && /*#__PURE__*/_react.default.createElement("div", {
-    className: "decision"
+    className: "writer-feedback-decision-item"
   }, title && /*#__PURE__*/_react.default.createElement("div", {
-    className: "decision__title"
+    className: "writer-feedback-decision-item__title"
   }, title, " "), body && /*#__PURE__*/_react.default.createElement("div", {
-    className: "decision__message"
-  }, body, " ")));
+    className: "writer-feedback-decision-item__message"
+  }, decision.correct ? /*#__PURE__*/_react.default.createElement("span", {
+    className: "icon-check-circle-black color--success"
+  }) : /*#__PURE__*/_react.default.createElement("span", {
+    className: "icon-error-circle-black color--error"
+  }), /*#__PURE__*/_react.default.createElement("span", null, body))));
 };
 
 FeedbackElement.defaultProps = {

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);
@@ -226,7 +226,7 @@ var WriterPuzzleComponent = function WriterPuzzleComponent(_ref) {
   var checkFeedbackScreen = function checkFeedbackScreen() {
     return decisionsList.find(function (decision) {
       var feedback = texts[decision.currenTextParagraph].electionTexts[decision.index].feedback;
-      return feedback.body || feedback.rewards && feedback.rewards.length > 0;
+      return feedback.body !== '';
     });
   };
 
@@ -243,48 +243,47 @@ 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',
-      payload: pointsToEmit
+      complex: true,
+      finish: true,
+      payload: rewardsStack,
+      onFinish: type !== 'view' ? handleLectures : null
     });
   };
 
-  var endGame = function endGame() {
-    if (type !== 'view') {
-      handleLectures();
-      endPoints();
-    } else {
-      endPoints();
-    }
+  var retryPuzzle = function retryPuzzle() {
+    setFinished(false);
+    setCurrentTextParagraph(0);
+    setDecisionsList([]);
+    setRewardsStack([]);
+
+    _setFailed(false);
+
+    setFeedbackScreen(false);
+    setDoneTyping(false);
+    setShowFeedback(false);
+    setReviewDone(false);
+    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 handleFinish = function handleFinish() {
@@ -313,26 +312,19 @@ var WriterPuzzleComponent = function WriterPuzzleComponent(_ref) {
       if (feedbackScreen && !showFeedback) {
         setShowFeedback(true);
       } else if (showFeedback || !feedbackScreen && !showFeedback) {
-        endGame();
+        if (!feedbackScreen && !showFeedback && retry) {
+          if (checkAllDecisionsAreCorrect()) {
+            endGame();
+          } else {
+            retryPuzzle();
+          }
+        } else {
+          endGame();
+        }
       }
     }
   };
 
-  var retryPuzzle = function retryPuzzle() {
-    setDecisionsList([]);
-    setCurrentTextParagraph(0);
-    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);
-  };
-
   var noColor = function noColor() {
     var correctTexts = texts[currenTextParagraph].electionTexts.filter(function (e) {
       return e.correct;
@@ -342,10 +334,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() {
@@ -353,18 +352,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]));
@@ -459,9 +458,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/dist/components/writer-puzzle-component/mocks/mockForStory.js

@@ -56,7 +56,6 @@ exports.messages = messages;
 var mock = {
   emitEvent: _mocker.emitEvent,
   soundActions: _mocker.soundActions,
-  setShowPoints: _mocker.setShowPoints,
   texts: [{
     type: 'fixed',
     fullText: messages.fullText1
@@ -165,7 +164,6 @@ exports.mock = mock;
 var mock2 = {
   emitEvent: _mocker.emitEvent,
   soundActions: _mocker.soundActions,
-  setShowPoints: _mocker.setShowPoints,
   texts: [{
     type: 'fixed',
     fullText: messages.fullText1
@@ -351,7 +349,6 @@ exports.mock2 = mock2;
 var mock3 = {
   emitEvent: _mocker.emitEvent,
   soundActions: _mocker.soundActions,
-  setShowPoints: _mocker.setShowPoints,
   texts: [{
     type: 'fixed',
     fullText: messages.fullText1
@@ -507,7 +504,6 @@ exports.mock3 = mock3;
 var mock4 = {
   emitEvent: _mocker.emitEvent,
   soundActions: _mocker.soundActions,
-  setShowPoints: _mocker.setShowPoints,
   texts: [{
     type: 'fixed',
     fullText: messages.fullText1
@@ -693,7 +689,6 @@ exports.mock4 = mock4;
 var mock5 = {
   emitEvent: _mocker.emitEvent,
   soundActions: _mocker.soundActions,
-  setShowPoints: _mocker.setShowPoints,
   texts: [{
     type: 'fixed',
     fullText: messages.fullText11
@@ -780,7 +775,6 @@ exports.mock5 = mock5;
 var mock6 = {
   emitEvent: _mocker.emitEvent,
   soundActions: _mocker.soundActions,
-  setShowPoints: _mocker.setShowPoints,
   texts: [{
     type: 'fixed',
     fullText: messages.fullText11
@@ -867,7 +861,6 @@ exports.mock6 = mock6;
 var mock7 = {
   emitEvent: _mocker.emitEvent,
   soundActions: _mocker.soundActions,
-  setShowPoints: _mocker.setShowPoints,
   texts: [{
     type: 'fixed',
     fullText: messages.fullText11
@@ -954,7 +947,6 @@ exports.mock7 = mock7;
 var mock8 = {
   emitEvent: _mocker.emitEvent,
   soundActions: _mocker.soundActions,
-  setShowPoints: _mocker.setShowPoints,
   texts: [{
     type: 'fixed',
     fullText: messages.fullText11

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gamelearn/arcade-components",
   "license": "Gamelearn",
-  "version": "1.3.4",
+  "version": "1.3.5-hotfix-login-GAT-4291",
   "main": "dist/index.js",
   "files": [
     "dist",