M2-5308: Fixed DONE UserEvent is not being sent bug

src/entities/activity/lib/types/item.ts

@@ -50,6 +50,7 @@ export interface ActivityItemBase {
   answer: Answer
   additionalText?: string | null
   conditionalLogic: ConditionalLogic | null
+  isHidden: boolean
 }
 
 export type Config =

src/entities/activity/ui/ActivityCardItem.tsx

@@ -47,14 +47,16 @@ export const ActivityCardItem = ({
       <CardItem
         markdown={questionText}
         watermark={watermark}
-        isOptional={!isOptionalFlagHidden && (item.config.skippableItem || allowToSkipAllItems)}>
+        isOptional={!isOptionalFlagHidden && (item.config.skippableItem || allowToSkipAllItems)}
+        testId="active-item">
         <ItemPicker item={item} onValueChange={onValueChange} isDisabled={false} replaceText={replaceText} />
       </CardItem>
       {hasAdditionalResponse(item) && (
         <CardItem
           markdown={t("additional.additional_text")}
           watermark={watermark}
-          isOptional={!requiresAdditionalResponse(item)}>
+          isOptional={!requiresAdditionalResponse(item)}
+          testId="additional-text">
           <AdditionalTextResponse value={item.additionalText || ""} onValueChange={onItemAdditionalTextChange} />
         </CardItem>
       )}

src/entities/activity/ui/items/AudioPlayerItem.tsx

@@ -1,19 +1,31 @@
+import { useCallback } from "react"
+
 import Box from "@mui/material/Box"
 
 import { AudioPlayerItem as AudioPlayerItemType } from "../../lib/types/item"
 
 import { AudioPlayerItemBase } from "~/shared/ui"
+import { AudioPlayerFinished } from "~/shared/ui/Items/AudioPlayer/lib"
 
 type Props = {
   item: AudioPlayerItemType
+
+  value: string
+  onValueChange: (value: string[]) => void
 }
 
-export const AudioPlayerItem = ({ item }: Props) => {
+export const AudioPlayerItem = ({ item, onValueChange, value }: Props) => {
   const isAbleToPlayOnce = item.config.playOnce
 
+  const onFinish = useCallback(() => {
+    if (!value) {
+      onValueChange([AudioPlayerFinished])
+    }
+  }, [value, onValueChange])
+
   return (
     <Box display="flex" justifyContent="center" data-testid="audio-player-item">
-      <AudioPlayerItemBase src={item.responseValues.file} playOnce={isAbleToPlayOnce} />
+      <AudioPlayerItemBase src={item.responseValues.file} playOnce={isAbleToPlayOnce} onFinish={onFinish} />
     </Box>
   )
 }

src/entities/activity/ui/items/ItemPicker.tsx

@@ -70,7 +70,7 @@ export const ItemPicker = ({ item, onValueChange, isDisabled, replaceText }: Ite
       return <TimeRangeItem values={values} onValueChange={onValueChange} />
 
     case "audioPlayer":
-      return <AudioPlayerItem item={item} />
+      return <AudioPlayerItem item={item} value={values[0]} onValueChange={onValueChange} />
 
     default:
       return <></>

src/entities/applet/model/ConditionalLogicBuilder.ts

@@ -6,8 +6,31 @@ import { Condition } from "~/shared/api"
 export type ItemMapByName = Record<string, ItemRecord>
 
 class ConditionalLogicBuilder {
+  private hiddenOrSkippedItemNames: Set<string> = new Set()
+  private hiddenOrSkippedItemIds: Set<string> = new Set()
+
   public process(items: ItemRecord[]): ItemRecord[] {
-    return items.filter((item, index, array) => this.conditionalLogicFilter(item, index, array))
+    return items.filter((item, index, array) => {
+      const isItemVisible = this.conditionalLogicFilter(item, index, array)
+
+      this.handleItemVisibility(item, isItemVisible)
+
+      return isItemVisible
+    })
+  }
+
+  public getConditionallyHiddenItemIds() {
+    return this.hiddenOrSkippedItemIds
+  }
+
+  private handleItemVisibility(item: ItemRecord, isVisible: boolean) {
+    if (isVisible) {
+      this.hiddenOrSkippedItemNames.delete(item.name)
+      this.hiddenOrSkippedItemIds.delete(item.id)
+    } else {
+      this.hiddenOrSkippedItemNames.add(item.name)
+      this.hiddenOrSkippedItemIds.add(item.id)
+    }
   }
 
   private conditionalLogicFilter(item: ItemRecord, index: number, array: ItemRecord[]): boolean {
@@ -41,7 +64,7 @@ class ConditionalLogicBuilder {
     const checkResult = rules.every(rule => {
       const answer = itemsMap[rule.itemName].answer
 
-      if (!answer.length) {
+      if (!answer.length || this.hiddenOrSkippedItemNames.has(rule.itemName)) {
         return false
       }
 
@@ -55,7 +78,7 @@ class ConditionalLogicBuilder {
     const checkResult = rules.some(rule => {
       const answer = itemsMap[rule.itemName].answer
 
-      if (!answer.length) {
+      if (!answer.length || this.hiddenOrSkippedItemNames.has(rule.itemName)) {
         return false
       }
 

src/entities/applet/model/hooks/useActivityProgress.ts

@@ -31,11 +31,9 @@ export const useActivityProgress = () => {
         splashScreenItem = mapSplashScreenToRecord(props.activity.splashScreen)
       }
 
-      const preparedActivityItemProgressRecords = props.activity.items
-        .filter(x => !x.isHidden)
-        .map(item => {
-          return mapItemToRecord(item)
-        })
+      const preparedActivityItemProgressRecords = props.activity.items.map(item => {
+        return mapItemToRecord(item)
+      })
 
       const items = splashScreenItem
         ? [splashScreenItem, ...preparedActivityItemProgressRecords]

src/entities/applet/model/hooks/useSaveActivityItemAnswer.ts

@@ -40,8 +40,16 @@ export const useSaveItemAnswer = ({ activityId, eventId }: Props) => {
     [dispatch, activityId, eventId],
   )
 
+  const removeItemAnswer = useCallback(
+    (itemId: string) => {
+      saveItemAnswer(itemId, [])
+    },
+    [saveItemAnswer],
+  )
+
   return {
     saveItemAnswer,
     saveItemAdditionalText,
+    removeItemAnswer,
   }
 }

src/entities/applet/model/hooks/useStartEntity.ts

@@ -23,6 +23,15 @@ export const useStartEntity = () => {
     )
   }
 
+  function removeActivityProgress(activityId: string, eventId: string): void {
+    dispatch(
+      actions.removeActivityProgress({
+        activityId,
+        eventId,
+      }),
+    )
+  }
+
   function flowStarted(flowId: string, activityId: string, eventId: string, pipelineActivityOrder: number): void {
     dispatch(
       actions.flowStarted({
@@ -44,20 +53,31 @@ export const useStartEntity = () => {
     return activityStarted(activityId, eventId)
   }
 
-  function startFlow(flowId: string, eventId: string, flows: ActivityFlowDTO[]): void {
+  function startFlow(flowId: string, eventId: string, flows: ActivityFlowDTO[], shouldRestart: boolean): void {
     const isFlowInProgress = isInProgress(getProgress(flowId, eventId))
 
-    if (isFlowInProgress) {
+    if (isFlowInProgress && !shouldRestart) {
       return
     }
 
     const flow = flows.find(x => x.id === flowId)!
+
     const flowActivities: string[] = flow.activityIds
 
     const firstActivityId: string = flowActivities[0]
 
+    if (shouldRestart) {
+      removeFlowActivitiesProgress(flowActivities, eventId)
+    }
+
     return flowStarted(flowId, firstActivityId, eventId, 0)
   }
 
+  function removeFlowActivitiesProgress(actividyIds: string[], eventId: string): void {
+    for (const activityId of actividyIds) {
+      removeActivityProgress(activityId, eventId)
+    }
+  }
+
   return { startActivity, startFlow }
 }

src/entities/applet/model/hooks/useUserEvents.ts

@@ -25,18 +25,22 @@ export const useUserEvents = (props: Props) => {
     (type: UserEventTypes, item: ItemRecord) => {
       const activityItemScreenId = getActivityItemScreenId(props.activityId, item.id)
 
+      const newUserEvent = {
+        type,
+        screen: activityItemScreenId,
+        time: Date.now(),
+      }
+
       dispatch(
         actions.saveUserEvent({
           entityId: props.activityId,
           eventId: props.eventId,
           itemId: item.id,
-          userEvent: {
-            type,
-            screen: activityItemScreenId,
-            time: Date.now(),
-          },
+          userEvent: newUserEvent,
         }),
       )
+
+      return newUserEvent
     },
     [dispatch, props.activityId, props.eventId],
   )

src/entities/applet/model/mapper.ts

@@ -1,6 +1,7 @@
 import { ItemRecord, UserEventResponse } from "./types"
 
 import { ActivityItemDetailsDTO } from "~/shared/api"
+import { dateToDayMonthYear, dateToHourMinute } from "~/shared/utils"
 
 export const mapItemAnswerToUserEventResponse = (item: ItemRecord): UserEventResponse => {
   const responseType = item.responseType
@@ -20,6 +21,40 @@ export const mapItemAnswerToUserEventResponse = (item: ItemRecord): UserEventRes
     }
   }
 
+  if (responseType === "date") {
+    return {
+      value: dateToDayMonthYear(new Date(itemAnswer[0])),
+      text: item.additionalText ?? undefined,
+    }
+  }
+
+  if (responseType === "time") {
+    return {
+      value: dateToHourMinute(new Date(itemAnswer[0])),
+      text: item.additionalText ?? undefined,
+    }
+  }
+
+  if (responseType === "timeRange") {
+    const fromDate = itemAnswer[0] ? new Date(itemAnswer[0]) : new Date()
+    const toDate = itemAnswer[1] ? new Date(itemAnswer[1]) : new Date()
+
+    return {
+      value: {
+        from: { hour: fromDate.getHours(), minute: fromDate.getMinutes() },
+        to: { hour: toDate.getHours(), minute: toDate.getMinutes() },
+      },
+      text: item.additionalText ?? undefined,
+    }
+  }
+
+  if (responseType === "audioPlayer") {
+    return {
+      value: true,
+      text: item.additionalText ?? undefined,
+    }
+  }
+
   return {
     value: itemAnswer[0],
     text: item.additionalText ?? undefined,
@@ -59,5 +94,6 @@ export function mapSplashScreenToRecord(splashScreen: string): ItemRecord {
     responseValues: null,
     answer: [],
     conditionalLogic: null,
+    isHidden: false,
   }
 }

src/entities/applet/model/types.ts

@@ -12,13 +12,26 @@ import {
   TimeItem,
   TimeRangeItem,
 } from "~/entities/activity/lib"
+import { DayMonthYearDTO, HourMinuteDTO } from "~/shared/utils"
 
 export type UserEventTypes = "SET_ANSWER" | "PREV" | "NEXT" | "SKIP" | "DONE"
 
+export type TimeRangeUserEventDto = {
+  from: {
+    hour: number
+    minute: number
+  }
+
+  to: {
+    hour: number
+    minute: number
+  }
+}
+
 export type UserEventResponse =
   | string
   | {
-      value: string | string[] | number[]
+      value: boolean | string | string[] | number[] | DayMonthYearDTO | HourMinuteDTO | TimeRangeUserEventDto
       text?: string
     }
 

src/i18n/en/translation.json

@@ -16,6 +16,7 @@
     "optional": "Optional",
     "pleaseAnswerTheQuestion": "Please answer the question.",
     "pleaseProvideAdditionalText": "Please provide additional text",
+    "pleaseListenToAudio": "Please listen to the audio until the end.",
     "onlyNumbersAllowed": "Only numbers are allowed",
 
     "question_count_plural": "{{length}} questions",
@@ -240,7 +241,9 @@
       "saved_answers": "We've saved your answers!",
       "close": "Close",
       "resume_activity": "Resume activity",
-      "activity_resume_restart":"Would you like to resume this activity in progress or restart?",
+      "restart_activity": "Restart activity",
+      "cancel": "Cancel",
+      "activity_resume_restart": "Are you sure you want clear all progress and restart",
       "restart": "Restart",
       "resume": "Resume",
       "in_progress": "In Progress",
@@ -266,4 +269,4 @@
     "no_markdown": "The authors of this applet have not provided any information!",
     "no_applets": "You currently do not have any applets."
   }
-}
+}

src/i18n/fr/translation.json

@@ -16,8 +16,9 @@
     "optional": "Facultatif",
     "pleaseAnswerTheQuestion": "Veuillez répondre à la question.",
     "pleaseProvideAdditionalText": "Veuillez fournir un texte supplémentaire",
+    "pleaseListenToAudio": "Veuillez écouter l'audio jusqu'à la fin.",
     "onlyNumbersAllowed": "Seuls les numéros sont autorisés",
-    
+
 
     "question_count_plural": "{{length}} questions",
     "question_count_singular": "{{length}} question",
@@ -247,8 +248,10 @@
       "thanks": "Merci!",
       "saved_answers": "Réponses sauvegardées !",
       "close": "Fermer",
+      "restart_activity": "Redémarrer l'activité",
+      "cancel": "Annuler",
+      "activity_resume_restart": "Êtes-vous sûr de vouloir effacer toute la progression et redémarrer",
       "resume_activity": "Reprendre l'activité",
-      "activity_resume_restart":"Souhaitez-vous reprendre cette activité en cours ou la recommencer?",
       "restart": "Recommencer",
       "resume": "Reprendre",
       "in_progress": "En cours",

src/shared/api/types/activity.ts

@@ -103,6 +103,7 @@ export type AnswerTypesPayload =
   | DateAnswerPayload
   | TimeAnswerPayload
   | TimeRangeAnswerPayload
+  | AudioPlayerAnswerPayload
 
 export type EmptyAnswerPayload = null
 
@@ -158,7 +159,10 @@ export type TimeRangeAnswerPayload = {
   text: string | null
 }
 
-export type AudioPlayerAnswerPayload = null
+export type AudioPlayerAnswerPayload = {
+  value: boolean
+  text: string | null
+}
 
 export type CompletedEntityDTO = {
   id: string

src/shared/constants/theme.ts

@@ -16,6 +16,7 @@ export const Theme = {
       surface: "#FCFCFF",
       surfaceVariant: "#DEE3EB",
       surface1: "#EFF4FA",
+      surface2: "#E0EBF4",
       accentGreen: "#0F7B6C",
       accentGreen30: "rgba(15, 123, 108, 0.30)",
       accentYellow: "#DFAC03",