@magmamath/students-features 0.2.22 → 0.3.0-rc.0

package/src/features/chatbot/types/model.types.ts

@@ -20,17 +20,9 @@ export type ConversationMessage = {
   translatedMessage?: string
 }
 
-export type EntityIds = {
-  entityId: string
-  fieldId: string
-}
-
-export type ChatMessagesModel = EntityIds & { messages: ConversationMessage[] }
-export type ThreadIdsModel = EntityIds & { threadId: string }
-export type AvailableChatsModel = EntityIds & { isAvailable: boolean }
-
 export type ChatbotModelProps = {
-  credits: {
+  $key?: Store<string>
+  credits?: {
     $assignmentId: Store<string>
     $exerciseId: Store<string>
   }
@@ -54,13 +46,15 @@ export type SendHelpParams = {
 }
 
 export type SendHelpProps = SendHelpParams & {
-  assignmentId: string
-  exerciseId: string
-  messages: Record<string, Record<string, { messages: ConversationMessage[] }>>
+  key: string
+  messages: Record<string, ConversationMessage[]>
   isTranslated: boolean
 }
 
-export type SetHintMessageProps = EntityIds & ConversationMessage
+export type SetHintMessageProps = {
+  entityId: string
+  fieldId: string
+} & ConversationMessage
 
 export enum MessageVariant {
   SENT = 'sent',

package/src/features/chatbot/types/translation.types.ts

@@ -2,22 +2,20 @@ import { ConversationMessage } from './model.types'
 import { GetAlternativesResponse } from './api.types'
 
 export type TranslateBatchFxProps = {
-    messages: Record<string, Record<string, { messages: ConversationMessage[] }>>
-    assignmentId: string
-    exerciseId: string
-    params: {
-        targetLanguage: string
-    }
+  messages: ConversationMessage[]
+  params: {
+    targetLanguage: string
+  }
 }
 
 export type TranslateMessageFxProps = {
-    message: ConversationMessage
-    targetLanguage: string
+  message: ConversationMessage
+  targetLanguage: string
 }
 
 export type TranslateAlternativesFxProps = {
-    alternatives: GetAlternativesResponse | null
-    params: {
-        targetLanguage: string
-    }
+  alternatives: GetAlternativesResponse | null
+  params: {
+    targetLanguage: string
+  }
 }

package/src/features/feedback/model/model.ts

@@ -51,7 +51,7 @@ export class TeacherFeedbackModel {
         problemId: credits.$problemId,
       },
       filter: ({ data, assignmentId, problemId }, isOpen) => {
-        const comments = data?.get(assignmentId)?.[problemId]?.comments
+        const comments = data?.get(assignmentId)?.[problemId].comments
         const isOnlyNoCommentsMessage =
           comments?.length === 1 && comments[0]._id === EMPTY_COMMENT_ID
         return !isOpen && isOnlyNoCommentsMessage

package/src/lib/effector/createEntityFieldStore.ts

@@ -1,43 +1,17 @@
 import { createEvent, createStore } from 'effector'
 
 type UpdateField<T> = {
-    entityId: string
-    fieldId: string
-    data: T
+  key: string
+  data: T
 }
 
-type CreateEntityFieldStoreSettings<T, U> = {
-    mapper?: (value: U) => UpdateField<T>
-}
-
-export function createEntityFieldStore<T, U = UpdateField<T>>({
-    mapper = (value: any) => value,
-}: CreateEntityFieldStoreSettings<T, U> = {}) {
-    const initialState: Record<string, Record<string, T>> = {}
-    const fieldAdded = createEvent<UpdateField<T>>()
-    const reset = createEvent()
-
-    const setField = (value: U) => {
-        fieldAdded(mapper(value))
-    }
-
-    const $state = createStore(initialState)
-        .on(fieldAdded, (state, { entityId, fieldId, data }) => {
-            if (!fieldId || !entityId) {
-                console.error('fieldId or entityId missing in createValuePersistorModel.ts')
-                return state
-            }
-
-            const newState = { ...state }
-
-            if (!newState[entityId]) {
-                newState[entityId] = {}
-            }
+export function createEntityFieldStore<T>() {
+  const setField = createEvent<UpdateField<T>>()
+  const reset = createEvent()
 
-            newState[entityId][fieldId] = data
-            return newState
-        })
-        .reset(reset)
+  const $state = createStore<Record<string, T>>({})
+    .on(setField, (state, { key, data }) => ({ ...state, [key]: data }))
+    .reset(reset)
 
-    return { $state, setField, fieldAdded, reset }
+  return { $state, setField, reset }
 }