@magmamath/students-features 0.2.2 → 0.2.4

package/dist/typescript/module/features/feedback/model/model.d.ts

@@ -0,0 +1,27 @@
+import { Store } from 'effector';
+import { TeacherFeedbackAPI } from './api';
+import { TeacherComments } from './comments';
+import { GetCommentsPayload, GetCommentsResponse, TeacherComment, UpdateCommentStatusSeenPayload } from '../types';
+export type TeacherFeedbackModelProps = {
+    api: {
+        getComments: (props: GetCommentsPayload) => Promise<GetCommentsResponse>;
+        updateCommentStatusSeen: (props: UpdateCommentStatusSeenPayload) => Promise<void>;
+    };
+    socket: any;
+    credits: {
+        $assignmentId: Store<string>;
+        $problemId: Store<string>;
+    };
+    defaults: {
+        EMPTY_COMMENT: TeacherComment;
+    };
+};
+export declare class TeacherFeedbackModel {
+    private readonly sockets;
+    readonly api: TeacherFeedbackAPI;
+    readonly comments: TeacherComments;
+    readonly setIsOpen: import("effector").EventCallable<boolean>;
+    readonly $isOpen: import("effector").StoreWritable<boolean>;
+    constructor({ api, socket, credits }: TeacherFeedbackModelProps);
+}
+//# sourceMappingURL=model.d.ts.map

package/dist/typescript/module/features/feedback/model/model.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../../../../src/features/feedback/model/model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgC,KAAK,EAAE,MAAM,UAAU,CAAA;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,OAAO,CAAA;AAE1C,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAE5C,OAAO,EACL,kBAAkB,EAClB,mBAAmB,EACnB,cAAc,EACd,8BAA8B,EAC/B,MAAM,UAAU,CAAA;AAEjB,MAAM,MAAM,yBAAyB,GAAG;IACtC,GAAG,EAAE;QACH,WAAW,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,OAAO,CAAC,mBAAmB,CAAC,CAAA;QACxE,uBAAuB,EAAE,CAAC,KAAK,EAAE,8BAA8B,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;KAClF,CAAA;IACD,MAAM,EAAE,GAAG,CAAA;IACX,OAAO,EAAE;QACP,aAAa,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;QAC5B,UAAU,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;KAC1B,CAAA;IACD,QAAQ,EAAE;QAAE,aAAa,EAAE,cAAc,CAAA;KAAE,CAAA;CAC5C,CAAA;AAED,qBAAa,oBAAoB;IAC/B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAwB;IAChD,SAAgB,GAAG,EAAE,kBAAkB,CAAA;IACvC,SAAgB,QAAQ,EAAE,eAAe,CAAA;IACzC,SAAgB,SAAS,4CAAyB;IAClD,SAAgB,OAAO,4CAAiC;gBAE5C,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,yBAAyB;CAqEhE"}

package/dist/typescript/module/features/feedback/model/sockets.d.ts

@@ -0,0 +1,10 @@
+import { TeacherComment } from '../types';
+export declare class TeacherFeedbackSockets {
+    private readonly socket;
+    readonly commentAdded: import("effector").EventCallable<TeacherComment>;
+    readonly commentDeleted: import("effector").EventCallable<TeacherComment>;
+    constructor(socket: any);
+    connect(): void;
+    off(): void;
+}
+//# sourceMappingURL=sockets.d.ts.map

package/dist/typescript/module/features/feedback/model/sockets.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sockets.d.ts","sourceRoot":"","sources":["../../../../../../src/features/feedback/model/sockets.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAwB,MAAM,UAAU,CAAA;AAE/D,qBAAa,sBAAsB;IACjC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAK;IAC5B,SAAgB,YAAY,mDAAgC;IAC5D,SAAgB,cAAc,mDAAgC;gBAElD,MAAM,EAAE,GAAG;IAIvB,OAAO;IAKP,GAAG;CAIJ"}

package/dist/typescript/module/features/feedback/types.d.ts

@@ -0,0 +1,40 @@
+export type GetCommentsPayload = {
+    id: string;
+};
+export type GetCommentsResponse = {
+    [problemId: string]: {
+        comments: TeacherComment[];
+    };
+};
+export type UpdateCommentStatusSeenPayload = {
+    ids: string[];
+};
+export type TeacherComment = {
+    _id: string;
+    teacherId: string;
+    teacherName: string;
+    studentId: string;
+    problemId: string;
+    exerciseId: string;
+    content: string;
+    isRead: boolean;
+    createdAt: Date;
+    updatedAt: Date;
+    __v: number;
+};
+export type FeedbackEntity = {
+    comments: TeacherComment[];
+    unreadMessagesCount: number;
+};
+export type CommentsMap = Map<string, {
+    [problemId: string]: FeedbackEntity;
+}>;
+export type Credits = {
+    assignmentId: string;
+    problemId: string;
+};
+export declare enum FeedbackSocketEvents {
+    COMMENT_ADDED = "exerciseCommentCreated",
+    COMMENT_DELETED = "exerciseCommentDeleted"
+}
+//# sourceMappingURL=types.d.ts.map

package/dist/typescript/module/features/feedback/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../src/features/feedback/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,kBAAkB,GAAG;IAC/B,EAAE,EAAE,MAAM,CAAA;CACX,CAAA;AAED,MAAM,MAAM,mBAAmB,GAAG;IAChC,CAAC,SAAS,EAAE,MAAM,GAAG;QAAE,QAAQ,EAAE,cAAc,EAAE,CAAA;KAAE,CAAA;CACpD,CAAA;AAED,MAAM,MAAM,8BAA8B,GAAG;IAC3C,GAAG,EAAE,MAAM,EAAE,CAAA;CACd,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,GAAG,EAAE,MAAM,CAAA;IACX,SAAS,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE,MAAM,CAAA;IACnB,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,EAAE,MAAM,CAAA;IAClB,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,OAAO,CAAA;IACf,SAAS,EAAE,IAAI,CAAA;IACf,SAAS,EAAE,IAAI,CAAA;IACf,GAAG,EAAE,MAAM,CAAA;CACZ,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,EAAE,cAAc,EAAE,CAAA;IAC1B,mBAAmB,EAAE,MAAM,CAAA;CAC5B,CAAA;AAED,MAAM,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,EAAE;IAAE,CAAC,SAAS,EAAE,MAAM,GAAG,cAAc,CAAA;CAAE,CAAC,CAAA;AAE9E,MAAM,MAAM,OAAO,GAAG;IACpB,YAAY,EAAE,MAAM,CAAA;IACpB,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,oBAAY,oBAAoB;IAC9B,aAAa,2BAA2B;IACxC,eAAe,2BAA2B;CAC3C"}

package/dist/typescript/module/lib/helpers/helpers.d.ts

@@ -1,2 +1,4 @@
+import { Locale } from '@magmamath/students-features';
 export declare const generateRandomId: () => string;
+export declare const getRelativeTimeText: (date: Date, lang: Locale) => string;
 //# sourceMappingURL=helpers.d.ts.map

package/dist/typescript/module/lib/helpers/helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../../../src/lib/helpers/helpers.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,gBAAgB,cACsC,CAAA"}
+{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../../../src/lib/helpers/helpers.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAA;AAErD,eAAO,MAAM,gBAAgB,cACsC,CAAA;AAEnE,eAAO,MAAM,mBAAmB,SAAU,IAAI,QAAQ,MAAM,WAqB3D,CAAA"}

package/dist/typescript/module/shared/translation/constants.d.ts

@@ -3,4 +3,45 @@ export declare const LOCALIZATION_CONFIGS: {
     "en-GB": {};
     "sv-SE": {};
 };
+export declare const RELATIVE_TIME_LABELS: {
+    "en-SE": {
+        justNow: string;
+        minuteAgo: string;
+        minutesAgo: string;
+        hourAgo: string;
+        hoursAgo: string;
+        dayAgo: string;
+        daysAgo: string;
+        monthAgo: string;
+        monthsAgo: string;
+        yearAgo: string;
+        yearsAgo: string;
+    };
+    "sv-SE": {
+        justNow: string;
+        minuteAgo: string;
+        minutesAgo: string;
+        hourAgo: string;
+        hoursAgo: string;
+        dayAgo: string;
+        daysAgo: string;
+        monthAgo: string;
+        monthsAgo: string;
+        yearAgo: string;
+        yearsAgo: string;
+    };
+    "en-GB": {
+        justNow: string;
+        minuteAgo: string;
+        minutesAgo: string;
+        hourAgo: string;
+        hoursAgo: string;
+        dayAgo: string;
+        daysAgo: string;
+        monthAgo: string;
+        monthsAgo: string;
+        yearAgo: string;
+        yearsAgo: string;
+    };
+};
 //# sourceMappingURL=constants.d.ts.map

package/dist/typescript/module/shared/translation/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../../src/shared/translation/constants.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,oBAAoB;;;;CAIhC,CAAA"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../../src/shared/translation/constants.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,oBAAoB;;;;CAIhC,CAAA;AAED,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAwChC,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magmamath/students-features",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "description": "Magmamath features library",
   "source": "src/index.ts",
   "main": "dist/commonjs/index.js",

package/src/features/chatbot/constants.ts

@@ -1,30 +1,38 @@
 import { Platform } from 'react-native'
 
 export const AUDIO_CONFIG = {
-    audioEncoding: 'LINEAR16',
-    pitch: 0,
-    speakingRate: 0.8,
+  audioEncoding: 'LINEAR16',
+  pitch: 0,
+  speakingRate: 0.8,
 }
 
 export const DEFAULT_VOICE = {
-    languageCode: 'en-US',
-    name: 'en-US-Wavenet-C',
+  languageCode: 'en-US',
+  name: 'en-US-Wavenet-C',
 }
 
-export const TEXT_TO_SPEECH_CONFIG =
-    Platform.OS === 'ios'
-        ? {
-              audioConfig: {
-                  audioEncoding: 'MP3',
-                  pitch: 0.8,
-                  speakingRate: 0.8,
-              },
-              voice: {
-                  languageCode: 'en-US',
-                  name: 'en-US-Wavenet-C',
-              },
-          }
-        : {
-              audioConfig: AUDIO_CONFIG,
-              voice: DEFAULT_VOICE,
-          }
+export const TEXT_TO_SPEECH_CONFIG = Platform.select({
+  ios: {
+    audioConfig: {
+      audioEncoding: 'MP3',
+      pitch: 0.8,
+      speakingRate: 0.8,
+    },
+    voice: {
+      languageCode: 'en-US',
+      name: 'en-US-Wavenet-C',
+    },
+  },
+  default: {
+    audioConfig: AUDIO_CONFIG,
+    voice: DEFAULT_VOICE,
+  },
+})
+
+export const KATEX_REPLACEMENTS = {
+  '\\$': '__KATEX_DOLLAR_SYMBOL__',
+} as const
+
+export const KATEX_REPLACEMENTS_REVERSE = {
+  __KATEX_DOLLAR_SYMBOL__: '$',
+} as const

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

@@ -4,25 +4,55 @@ import { createControllerEffect } from '../../../lib/effector'
 import { ControlledEffect } from '../../../lib/effector/createControllerEffect'
 import { ChatbotModelProps } from '../types/model.types'
 import {
-    GetAlternativesResponse,
-    PostMessagePayload,
-    PostMessageResponse,
-    GoogleTranslatePayload,
-    GoogleTranslateResponse,
-    GoogleText2SpeechPayload,
-    GoogleText2SpeechResponse,
+  GetAlternativesResponse,
+  PostMessagePayload,
+  PostMessageResponse,
+  GoogleTranslatePayload,
+  GoogleTranslateResponse,
+  GoogleText2SpeechPayload,
+  GoogleText2SpeechResponse,
 } from '../types/api.types'
+import { KATEX_REPLACEMENTS, KATEX_REPLACEMENTS_REVERSE } from '../constants'
 
 export class ChatbotAPI {
-    postMessageFx: ControlledEffect<PostMessagePayload, PostMessageResponse>
-    getAlternativesFx: Effect<void, GetAlternativesResponse>
-    translateTextFx: Effect<GoogleTranslatePayload, GoogleTranslateResponse>
-    textToSpeechTextFx: Effect<GoogleText2SpeechPayload, GoogleText2SpeechResponse>
+  postMessageFx: ControlledEffect<PostMessagePayload, PostMessageResponse>
+  getAlternativesFx: Effect<void, GetAlternativesResponse>
+  translateTextFx: Effect<GoogleTranslatePayload, GoogleTranslateResponse>
+  textToSpeechTextFx: Effect<GoogleText2SpeechPayload, GoogleText2SpeechResponse>
 
-    constructor(api: ChatbotModelProps['api']) {
-        this.postMessageFx = createControllerEffect(api.postMessage)
-        this.getAlternativesFx = createEffect(api.getAlternatives)
-        this.translateTextFx = createEffect(api.postTranslateText)
-        this.textToSpeechTextFx = createEffect(api.postTextToSpeech)
-    }
+  private replaceKatexSyntax(texts: string[], reverse = false) {
+    const replacements = reverse
+      ? Object.entries(KATEX_REPLACEMENTS_REVERSE)
+      : Object.entries(KATEX_REPLACEMENTS)
+
+    return texts.map(text =>
+      replacements.reduce(
+        (newText, [pattern, placeholder]) => newText.replace(new RegExp(pattern, 'g'), placeholder),
+        text,
+      ),
+    )
+  }
+
+  constructor(api: ChatbotModelProps['api']) {
+    this.postMessageFx = createControllerEffect(api.postMessage)
+    this.getAlternativesFx = createEffect(api.getAlternatives)
+    this.translateTextFx = createEffect(async (payload: GoogleTranslatePayload) => {
+      const response = await api.postTranslateText({
+        ...payload,
+        text: this.replaceKatexSyntax(payload.text),
+      })
+
+      return {
+        ...response,
+        data: {
+          ...response.data,
+          translations: response.data.translations.map(translation => ({
+            ...translation,
+            translatedText: this.replaceKatexSyntax([translation.translatedText], true)[0],
+          })),
+        },
+      }
+    })
+    this.textToSpeechTextFx = createEffect(api.postTextToSpeech)
+  }
 }

package/src/features/feedback/components/{EmptyComment/EmptyComment.tsx → EmptyComment.tsx}

@@ -1,8 +1,8 @@
 import React from 'react'
 import { StyleSheet, Text, View } from 'react-native'
 import { COLORS } from '@magmamath/react-native-ui'
-import { BUENOS_AIRES_FONT, NO_COMMENTS_SWE, NO_COMMENTS_ENG } from '../../constants'
-import { Locale } from '../../types/teacherFeedback.types'
+import { BUENOS_AIRES_FONT, NO_COMMENTS_SWE, NO_COMMENTS_ENG } from '../constants'
+import { Locale } from '../../../shared/translation/types'
 
 type EmptyCommentProps = {
   locale: Locale | null
@@ -11,7 +11,7 @@ type EmptyCommentProps = {
 export const EmptyComment = ({ locale }: EmptyCommentProps) => {
   return (
     <View style={styles.container}>
-      <Text style={styles.text}>{locale === Locale.SV ? NO_COMMENTS_SWE : NO_COMMENTS_ENG}</Text>
+      <Text style={styles.text}>{locale === Locale.SW ? NO_COMMENTS_SWE : NO_COMMENTS_ENG}</Text>
     </View>
   )
 }

package/src/features/feedback/components/{ListCardCommentsCount/ListCardCommentsCount.tsx → ListCardCommentsCount.tsx}

@@ -1,8 +1,8 @@
 import React from 'react'
 import { Text, View, StyleSheet } from 'react-native'
-import { MessageBubbleIcon } from '../icons/MessageBubbleIcon'
+import { MessageBubbleIcon } from '../assets/icons/MessageBubbleIcon'
 import { COLORS } from '@magmamath/react-native-ui'
-import { BUENOS_AIRES_FONT } from '../../constants'
+import { BUENOS_AIRES_FONT } from '../constants'
 
 type ListCardCommentsCountProps = {
   count: number

package/src/features/feedback/components/TeacherFeedback.tsx

@@ -3,24 +3,32 @@ import { useStoreMap, useUnit } from 'effector-react'
 import { View, StyleSheet } from 'react-native'
 import { TeacherFeedbackButton } from './TeacherFeedbackButton/TeacherFeedbackButton'
 import { TeacherFeedbackComments } from './TeacherFeedbackComments/TeacherFeedbackComments'
-import { TeacherFeedbackModel } from '../model/teacherFeedback.model'
 import { FeedbackButtonColors, FeedbackButtonSize, FeedbackMode } from '../constants'
+import { TeacherFeedbackModel } from '../model/model'
+import { Locale } from '../../../shared/translation'
 
 type TeacherFeedbackProps = {
   model: TeacherFeedbackModel
   mode: FeedbackMode
+  locale: Locale
+  assignmentId: string
+  problemId: string
   isExam: boolean
 }
 
-export const TeacherFeedback = ({ model, mode, isExam = false }: TeacherFeedbackProps) => {
-  const isOpen = useUnit(model.$isOpened)
-  const assignmentId = useUnit(model.$assignmentId)
-  const problemId = useUnit(model.$currentProblemId)
-  const locale = useUnit(model.$locale)
-  const isLoading = useUnit(model.getCommentsByAssignmentIdFx.pending)
+export const TeacherFeedback = ({
+  model,
+  mode,
+  assignmentId,
+  problemId,
+  locale,
+  isExam = false,
+}: TeacherFeedbackProps) => {
+  const isOpen = useUnit(model.$isOpen)
+  const isLoading = useUnit(model.api.getCommentsFx.pending)
   const teacherFeedback = useStoreMap({
-    store: model.$comments,
-    fn: (feedback, [assignmentId, problemId]) => feedback.get(assignmentId)?.[problemId] ?? null,
+    store: model.comments.$data,
+    fn: (feedback, [assignmentId, problemId]) => feedback?.get(assignmentId)?.[problemId] ?? null,
     keys: [assignmentId, problemId],
   })
 
@@ -28,9 +36,11 @@ export const TeacherFeedback = ({ model, mode, isExam = false }: TeacherFeedback
 
   return (
     <View style={styles.container}>
-      {isOpen && <TeacherFeedbackComments comments={teacherFeedback.comments} locale={locale} mode={mode} />}
+      {isOpen && (
+        <TeacherFeedbackComments comments={teacherFeedback.comments} locale={locale} mode={mode} />
+      )}
       <TeacherFeedbackButton
-        onPress={() => model.setIsOpened(!isOpen)}
+        onPress={() => model.setIsOpen(!isOpen)}
         unreadCommentsCount={teacherFeedback.unreadMessagesCount}
         isOpen={isOpen}
         isLoading={isLoading}

package/src/features/feedback/components/TeacherFeedbackButton/TeacherFeedbackButton.tsx

@@ -2,8 +2,8 @@ import React from 'react'
 import { StyleSheet, View } from 'react-native'
 import { Button, COLORS } from '@magmamath/react-native-ui'
 import { UnreadMessagesBadge } from '../UnreadMessagesBadge'
-import { MessageBubbleIcon } from '../icons/MessageBubbleIcon'
-import { XCloseIcon } from '../icons/XCloseIcon'
+import { MessageBubbleIcon } from '../../assets/icons/MessageBubbleIcon'
+import { XCloseIcon } from '../../assets/icons/XCloseIcon'
 import { COLOR_SCHEMES } from './colorSchemes'
 import {
   FeedbackButtonColors,

package/src/features/feedback/components/TeacherFeedbackComments/TeacherComment.tsx

@@ -1,9 +1,9 @@
 import React from 'react'
 import { View, Text, StyleSheet } from 'react-native'
 import { COLORS } from '@magmamath/react-native-ui'
-import { getRelativeTime } from '../../helpers'
 import { BUENOS_AIRES_FONT } from '../../constants'
-import { Locale } from '../../types/teacherFeedback.types'
+import { getRelativeTimeText } from '../../../../lib/helpers/helpers'
+import { Locale } from '@magmamath/students-features'
 
 type TeacherCommentProps = {
   content: string
@@ -13,7 +13,13 @@ type TeacherCommentProps = {
   isLastComment: boolean
 }
 
-export const TeacherComment = ({ content, teacherName, createdAt, locale, isLastComment }: TeacherCommentProps) => {
+export const TeacherComment = ({
+  content,
+  teacherName,
+  createdAt,
+  locale,
+  isLastComment,
+}: TeacherCommentProps) => {
   return (
     <View style={{ marginBottom: isLastComment ? 8 : 0 }}>
       <View style={styles.authorInfo}>
@@ -22,7 +28,7 @@ export const TeacherComment = ({ content, teacherName, createdAt, locale, isLast
         </Text>
         <View style={styles.spacer} />
         <Text style={styles.dateAdded} numberOfLines={1}>
-          {getRelativeTime(createdAt, locale ?? Locale.US)}
+          {getRelativeTimeText(createdAt, locale ?? Locale.EN)}
         </Text>
       </View>
 

package/src/features/feedback/components/TeacherFeedbackComments/TeacherFeedbackComments.tsx

@@ -1,17 +1,18 @@
 import React, { useEffect, useRef } from 'react'
 import { Platform, ScrollView, StyleSheet, useWindowDimensions, View } from 'react-native'
-import { Locale, TeacherComment as FeedbackComment } from '../../types/teacherFeedback.types'
 import { TeacherComment } from './TeacherComment'
-import { EmptyComment } from '../EmptyComment/EmptyComment'
+import { EmptyComment } from '../EmptyComment'
 import { EMPTY_COMMENT_ID, FeedbackMode } from '../../constants'
 import { COLORS } from '@magmamath/react-native-ui'
+import { Locale } from '../../../../shared/translation'
+import { TeacherComment as TeacherCommentEntity } from '../../types'
 
 const TOOLBAR_HEIGHT = 140
 const BOTTOM_OFFSET = Platform.OS === 'web' ? 270 : 304
 const SIMPLE_MODE_OFFSET = 70
 
 type TeacherFeedbackCommentsProps = {
-  comments: FeedbackComment[] | null
+  comments: TeacherCommentEntity[] | null
   locale: Locale | null
   mode: FeedbackMode
 }

package/src/features/feedback/components/index.ts

@@ -2,4 +2,4 @@ export { TeacherFeedbackComments } from './TeacherFeedbackComments/TeacherFeedba
 export { TeacherFeedbackButton } from './TeacherFeedbackButton/TeacherFeedbackButton'
 export { TeacherFeedback } from './TeacherFeedback'
 export { UnreadMessagesBadge } from './UnreadMessagesBadge'
-export { ListCardCommentsCount } from './ListCardCommentsCount/ListCardCommentsCount'
+export { ListCardCommentsCount } from './ListCardCommentsCount'

package/src/features/feedback/constants.ts

@@ -1,28 +1,12 @@
 import { Platform } from 'react-native'
-import { Locale } from './types/teacherFeedback.types'
 
-export const BUENOS_AIRES_FONT = Platform.OS === 'web' ? 'Buenos Aires, sans-serif' : 'BuenosAires-Regular'
+export const BUENOS_AIRES_FONT =
+  Platform.OS === 'web' ? 'Buenos Aires, sans-serif' : 'BuenosAires-Regular'
 
 export const NO_COMMENTS_ENG = 'No comments yet'
 export const NO_COMMENTS_SWE = 'Inga kommentarer än'
 export const EMPTY_COMMENT_ID = 'empty-comment'
 
-export const getEmptyComment = (problemId: string, locale: Locale | null) => {
-  return {
-    __v: 0,
-    _id: EMPTY_COMMENT_ID,
-    content: locale === Locale.SV ? NO_COMMENTS_SWE : NO_COMMENTS_ENG,
-    createdAt: new Date(),
-    exerciseId: '',
-    isRead: true,
-    problemId,
-    studentId: '',
-    teacherId: '',
-    teacherName: '',
-    updatedAt: new Date(),
-  }
-}
-
 export const TEACHER_FEEDBACK_BUTTON_ID = 'teacherFeedbackButton'
 
 export enum FeedbackButtonColors {

package/src/features/feedback/helpers.ts

@@ -1,66 +1,33 @@
-import { Locale } from './types/teacherFeedback.types'
+import { CommentsMap, FeedbackEntity, GetCommentsResponse } from './types'
 
-const RELATIVE_TIME_LABELS = {
-  [Locale.US]: {
-    justNow: 'just now',
-    minuteAgo: 'minute ago',
-    minutesAgo: 'minutes ago',
-    hourAgo: 'hour ago',
-    hoursAgo: 'hours ago',
-    dayAgo: 'day ago',
-    daysAgo: 'days ago',
-    monthAgo: 'month ago',
-    monthsAgo: 'months ago',
-    yearAgo: 'year ago',
-    yearsAgo: 'years ago',
-  },
-  [Locale.SV]: {
-    justNow: 'alldeles nyss',
-    minuteAgo: 'minut sedan',
-    minutesAgo: 'minuter sedan',
-    hourAgo: 'timme sedan',
-    hoursAgo: 'timmar sedan',
-    dayAgo: 'dag sedan',
-    daysAgo: 'dagar sedan',
-    monthAgo: 'månad sedan',
-    monthsAgo: 'månader sedan',
-    yearAgo: 'år sedan',
-    yearsAgo: 'år sedan',
-  },
-  [Locale.GB]: {
-    justNow: 'just now',
-    minuteAgo: 'minute ago',
-    minutesAgo: 'minutes ago',
-    hourAgo: 'hour ago',
-    hoursAgo: 'hours ago',
-    dayAgo: 'day ago',
-    daysAgo: 'days ago',
-    monthAgo: 'month ago',
-    monthsAgo: 'months ago',
-    yearAgo: 'year ago',
-    yearsAgo: 'years ago',
-  },
-}
+export function generateCommentsMap(assignmentId: string, data: GetCommentsResponse): CommentsMap {
+  const problemsMap = Object.entries(data).reduce<Record<string, FeedbackEntity>>(
+    (acc, [problemId, feedback]) => {
+      const unreadMessages = feedback.comments.filter(({ isRead }) => !isRead)
+
+      acc[problemId] = {
+        comments: feedback.comments,
+        unreadMessagesCount: unreadMessages.length,
+      }
 
-export const getRelativeTime = (date: Date, lang: Locale) => {
-  const t = RELATIVE_TIME_LABELS[lang] || RELATIVE_TIME_LABELS[Locale.US]
-  const timeBufferMs = 2000 // adds 2 seconds time buffer because when used with sockets, it displayed -1 seconds ago, instead of 1 second ago.
+      return acc
+    },
+    {},
+  )
 
-  const now = new Date().getTime()
-  const targetDate = new Date(date).getTime() - timeBufferMs
-  const diffTime = now - targetDate
+  return new Map().set(assignmentId, problemsMap)
+}
 
-  const seconds = Math.floor(diffTime / 1000)
-  const minutes = Math.floor(seconds / 60)
-  const hours = Math.floor(minutes / 60)
-  const days = Math.floor(hours / 24)
-  const months = Math.floor(days / 30)
-  const years = Math.floor(days / 365)
+type FindCommentsByCreditsProps = {
+  data: CommentsMap | null
+  assignmentId: string
+  problemId: string
+}
 
-  if (seconds < 60) return t.justNow
-  if (minutes < 60) return `${minutes} ${minutes === 1 ? t.minuteAgo : t.minutesAgo}`
-  if (hours < 24) return `${hours} ${hours === 1 ? t.hourAgo : t.hoursAgo}`
-  if (days < 30) return `${days} ${days === 1 ? t.dayAgo : t.daysAgo}`
-  if (months < 12) return `${months} ${months === 1 ? t.monthAgo : t.monthsAgo}`
-  return `${years} ${years === 1 ? t.yearAgo : t.yearsAgo}`
+export function findCommentsByCredits({
+  data,
+  assignmentId,
+  problemId,
+}: FindCommentsByCreditsProps) {
+  return data?.get(assignmentId)?.[problemId]?.comments ?? []
 }

package/src/features/feedback/index.ts

@@ -1,4 +1,4 @@
-export * from './model/teacherFeedback.model'
-export * from './types/teacherFeedback.types'
+export * from './model/model'
+export * from './types'
 export * from './constants'
 export * from './components'

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

@@ -0,0 +1,13 @@
+import { createEffect, Effect } from 'effector'
+import { TeacherFeedbackModelProps } from './model'
+import { GetCommentsPayload, GetCommentsResponse, UpdateCommentStatusSeenPayload } from '../types'
+
+export class TeacherFeedbackAPI {
+  public readonly getCommentsFx: Effect<GetCommentsPayload, GetCommentsResponse>
+  public readonly updateCommentStatusSeenFx: Effect<UpdateCommentStatusSeenPayload, void>
+
+  constructor(api: TeacherFeedbackModelProps['api']) {
+    this.getCommentsFx = createEffect(api.getComments)
+    this.updateCommentStatusSeenFx = createEffect(api.updateCommentStatusSeen)
+  }
+}