update branch

src/components/ActivityTypes/closeEndedQuestion.tsx

@@ -1,7 +1,15 @@
 import { CheckIcon, CloseIcon } from '@chakra-ui/icons';
 import { Box, Button, Flex, Icon, Textarea, useToast } from '@chakra-ui/react';
 import { Dispatch, SetStateAction, useEffect, useState } from 'react';
-import { PolyglotNodeValidation } from '../../types/polyglotElements';
+import { registerAnalyticsAction } from '../../data/AnalyticsFunctions';
+import { API } from '../../data/api';
+import {
+  OpenCloseNodeAction,
+  Platform,
+  PolyglotNodeValidation,
+  SubmitAction,
+  ZoneId,
+} from '../../types/polyglotElements';
 import FlexText from '../CostumTypography/FlexText';
 import HeadingSubtitle from '../CostumTypography/HeadingSubtitle';
 import HeadingTitle from '../CostumTypography/HeadingTitle';
@@ -13,6 +21,10 @@ type CloseEndedToolProps = {
   setSatisfiedConditions: Dispatch<SetStateAction<string[]>>;
   showNextButton: boolean;
   setShowNextButton: Dispatch<SetStateAction<boolean>>;
+  userId: string;
+  flowId: string;
+  lastAction: string;
+  setLastAction: Dispatch<SetStateAction<string>>;
 };
 
 type CloseEndedData = {
@@ -29,21 +41,50 @@ const CloseEndedTool = ({
   setSatisfiedConditions,
   showNextButton,
   setShowNextButton,
+  userId,
+  lastAction,
+  setLastAction,
+  flowId,
 }: CloseEndedToolProps) => {
   const [disable, setDisable] = useState(false);
   const [assessment, setAssessment] = useState<string>();
   const data = actualActivity?.data as CloseEndedData;
   const [inputValue, setInputValue] = useState('');
 
   useEffect(() => {
+    if (actualActivity?.type != 'closeEndedQuestionNode') return;
     if (!data) return;
     setDisable(false);
     setAssessment('');
     //to move in validation button
+
+    if (!isOpen) return;
+    try {
+      if (userId && actualActivity?._id) {
+        if (lastAction == 'open_node') return;
+        setLastAction('open_node');
+
+        registerAnalyticsAction({
+          timestamp: new Date(),
+          userId: userId,
+          actionType: 'open_node',
+          zoneId: ZoneId.WebAppZone,
+          platform: Platform.WebApp,
+          action: {
+            flowId: flowId,
+            nodeId: actualActivity?._id,
+            activity: actualActivity.type,
+          },
+        } as OpenCloseNodeAction);
+      }
+    } catch (e) {
+      console.log(e);
+    }
   }, [actualActivity]);
+
   const toast = useToast();
   if (!isOpen) return <></>;
-  console.log('close ended activity');
+
   return (
     <Box
       width={'80%'}
@@ -130,7 +171,28 @@ const CloseEndedTool = ({
                 return 'undefined';
               })
               .filter((edge) => edge !== 'undefined') ?? [];
-          if (edgesId) setSatisfiedConditions(edgesId);
+          if (edgesId) {
+            setSatisfiedConditions(edgesId);
+            const result = actualActivity?.validation.find((edge) =>
+              edgesId.includes(edge.id)
+            )?.data.conditionKind as string;
+            console.log(result);
+            registerAnalyticsAction({
+              timestamp: new Date(),
+              userId: userId,
+              actionType: 'submit_answer',
+              zoneId: ZoneId.WebAppZone,
+              platform: Platform.WebApp,
+              action: {
+                //miss other values
+                flowId: flowId,
+                nodeId: actualActivity?._id,
+                exerciseType: actualActivity?.type,
+                answer: assessment,
+                result: result,
+              },
+            } as SubmitAction);
+          }
           setShowNextButton(true);
         }}
       >

src/components/ActivityTypes/multichoiceQuestion.tsx

@@ -16,7 +16,15 @@ import {
   useEffect,
   useState,
 } from 'react';
-import { PolyglotNodeValidation } from '../../types/polyglotElements';
+import { registerAnalyticsAction } from '../../data/AnalyticsFunctions';
+import { API } from '../../data/api';
+import {
+  OpenCloseNodeAction,
+  Platform,
+  PolyglotNodeValidation,
+  SubmitAction,
+  ZoneId,
+} from '../../types/polyglotElements';
 import FlexText from '../CostumTypography/FlexText';
 import HeadingSubtitle from '../CostumTypography/HeadingSubtitle';
 import HeadingTitle from '../CostumTypography/HeadingTitle';
@@ -27,6 +35,10 @@ type MultichoiceToolProps = {
   setSatisfiedConditions: Dispatch<SetStateAction<string[]>>;
   showNextButton: boolean;
   setShowNextButton: Dispatch<SetStateAction<boolean>>;
+  userId: string;
+  flowId: string;
+  lastAction: string;
+  setLastAction: Dispatch<SetStateAction<string>>;
 };
 
 type MultichoiceQuestionData = {
@@ -42,6 +54,10 @@ const MultichoiceTool = ({
   setSatisfiedConditions,
   showNextButton,
   setShowNextButton,
+  userId,
+  lastAction,
+  setLastAction,
+  flowId,
 }: MultichoiceToolProps) => {
   const [disable, setDisable] = useState(false);
   const data = actualActivity?.data as MultichoiceQuestionData;
@@ -52,10 +68,34 @@ const MultichoiceTool = ({
   }, []);
 
   useEffect(() => {
+    if (actualActivity?.type != 'multipleChoiceQuestionNode') return;
     if (!data) return;
     setDisable(false);
     setCheckBoxValue('');
-    //to move in validation button
+
+    try {
+      if (!isOpen) return;
+      if (userId && actualActivity?._id) {
+        if (lastAction == 'open_node') return;
+        setLastAction('open_node');
+
+        console.log('choiceAction');
+        registerAnalyticsAction({
+          timestamp: new Date(),
+          userId: userId,
+          actionType: 'open_node',
+          zoneId: ZoneId.WebAppZone,
+          platform: Platform.WebApp,
+          action: {
+            flowId: flowId,
+            nodeId: actualActivity._id,
+            activity: actualActivity.type,
+          },
+        } as OpenCloseNodeAction);
+      }
+    } catch (e) {
+      console.log(e);
+    }
   }, [actualActivity]);
 
   const toast = useToast();
@@ -141,7 +181,27 @@ const MultichoiceTool = ({
               })
               .filter((edge) => edge !== 'undefined') ?? [];
           console.log(edgesId);
-          if (edgesId) setSatisfiedConditions(edgesId);
+          if (edgesId) {
+            setSatisfiedConditions(edgesId);
+            const result = actualActivity?.validation.find((edge) =>
+              edgesId.includes(edge.id)
+            )?.data.conditionKind as string;
+            console.log(result);
+            registerAnalyticsAction({
+              timestamp: new Date(),
+              userId: userId,
+              actionType: 'submit_answer',
+              zoneId: ZoneId.WebAppZone,
+              platform: Platform.WebApp,
+              action: {
+                flowId: flowId,
+                nodeId: actualActivity?._id,
+                exerciseType: actualActivity?.type,
+                answer: checkBoxValue,
+                result: result,
+              },
+            } as SubmitAction);
+          }
           setShowNextButton(true);
         }}
       >

src/components/ActivityTypes/openQuestion.tsx

@@ -12,7 +12,15 @@ import {
 import { AxiosResponse } from 'axios';
 import { Dispatch, SetStateAction, useEffect, useState } from 'react';
 import { API } from '../../data/api';
-import { PolyglotNodeValidation } from '../../types/polyglotElements';
+import {
+  OpenCloseNodeAction,
+  Platform,
+  PolyglotNodeValidation,
+  SubmitAction,
+  ZoneId,
+} from '../../types/polyglotElements';
+
+import { registerAnalyticsAction } from '../../data/AnalyticsFunctions';
 import FlexText from '../CostumTypography/FlexText';
 import HeadingSubtitle from '../CostumTypography/HeadingSubtitle';
 import HeadingTitle from '../CostumTypography/HeadingTitle';
@@ -24,6 +32,10 @@ type OpenQuestionToolProps = {
   setSatisfiedConditions: Dispatch<SetStateAction<string[]>>;
   showNextButton: boolean;
   setShowNextButton: Dispatch<SetStateAction<boolean>>;
+  userId: string;
+  flowId: string;
+  lastAction: string;
+  setLastAction: Dispatch<SetStateAction<string>>;
 };
 
 type OpenQuestionData = {
@@ -41,6 +53,10 @@ const OpenQuestionTool = ({
   setSatisfiedConditions,
   showNextButton,
   setShowNextButton,
+  userId,
+  flowId,
+  lastAction,
+  setLastAction,
 }: OpenQuestionToolProps) => {
   const [isDisable, setDisable] = useState(false);
   const [isLoading, setLoading] = useState(false);
@@ -49,11 +65,35 @@ const OpenQuestionTool = ({
   const [inputValue, setInputValue] = useState('');
 
   useEffect(() => {
+    if (!isOpen) return;
     if (!data) return;
     setDisable(false);
     setAssessment('');
     //to move in validation button
+
+    try {
+      if (userId && actualActivity?._id) {
+        if (lastAction == 'open_node') return;
+        setLastAction('open_node');
+
+        registerAnalyticsAction({
+          timestamp: new Date(),
+          userId: userId,
+          actionType: 'open_node',
+          zoneId: ZoneId.WebAppZone,
+          platform: Platform.WebApp,
+          action: {
+            flowId: flowId,
+            nodeId: actualActivity._id,
+            activity: actualActivity.type,
+          },
+        } as OpenCloseNodeAction);
+      }
+    } catch (e) {
+      console.log(e);
+    }
   }, [actualActivity]);
+
   const toast = useToast();
   if (!isOpen) return <></>;
   console.log('open question activity');
@@ -152,7 +192,24 @@ const OpenQuestionTool = ({
                 .filter((edge) => edge !== 'undefined') ?? [];
             unlock(true);
             setDisable(true);
-            if (edgesId) setSatisfiedConditions(edgesId);
+            if (edgesId) {
+              setSatisfiedConditions(edgesId);
+              registerAnalyticsAction({
+                timestamp: new Date(),
+                userId: userId,
+                actionType: 'submit_answer',
+                zoneId: ZoneId.WebAppZone,
+                platform: Platform.WebApp,
+                action: {
+                  //miss other values
+                  flowId: flowId,
+                  nodeId: actualActivity?._id,
+                  exerciseType: actualActivity?.type,
+                  answer: assessment,
+                  result: data.isAnswerCorrect.toString(),
+                },
+              } as SubmitAction);
+            }
             setLoading(false);
             setShowNextButton(true);
           } catch (err) {