@magmamath/students-features 1.3.13 → 1.3.15

package/src/features/pmProgress/model/PmTreeModel.ts

@@ -1,4 +1,4 @@
-import { attach, createEffect, createEvent, createStore, restore, sample } from 'effector'
+import { attach, combine, createEffect, createEvent, createStore, restore, sample } from 'effector'
 import { createAction } from 'effector-action'
 import {
   Domain,
@@ -18,6 +18,7 @@ import {
   getInitialPmGrade,
   getTreeGrades,
   isTreeDataReady,
+  isTreeDataWithoutGradeReady,
 } from '../shared/pmProgress.helpers'
 import { TreeNormalizer } from '../shared/TreeNormalizer'
 import { persist } from 'effector-storage/session'
@@ -30,12 +31,14 @@ export class PmTreeModel {
   private readonly $user = createStore<User | null>(null)
 
   private readonly setupInitialGrade = createEvent<SetupInitialGradeProps>()
-  private readonly setDomains = createEvent<Domain[]>()
   public readonly setGrade = createEvent<number | null>()
 
   public readonly $isInitialized = createStore(false)
   public readonly $grade = restore(this.setGrade, null)
-  public readonly $domains = restore(this.setDomains, [])
+  public readonly $domains = createStore<Record<number, Domain[]>>({})
+  public readonly $domainsInGrade = combine(this.$domains, this.$grade, (domains, grade) =>
+    grade !== null ? (domains[grade] ?? []) : [],
+  )
   public readonly $grades = createStore<Grade[]>([])
   public readonly $status = createStore<PmProgressStatus | null>(null)
 
@@ -48,7 +51,7 @@ export class PmTreeModel {
     this.setupFailedAndLockedStatus()
     this.setupTreeInit()
     this.setupGradeInit()
-    this.setupDomainStructure()
+    this.setupDomainsInTree()
   }
 
   public readonly initTreeFx = createEffect(async ({ user }: PmProgressGateProps) => {
@@ -150,22 +153,28 @@ export class PmTreeModel {
     })
   }
 
-  private setupDomainStructure() {
+  private setupDomainsInTree() {
     sample({
-      clock: [this.$grade, this.initTreeFx.doneData],
-      source: { tree: this.$tree, stats: this.$stats, user: this.$user, grade: this.$grade },
-      filter: isTreeDataReady,
-      fn: ({ tree, stats, user, grade }) => {
-        const [treeWithUserStats] = enhanceProgressMatrixData(
-          Object.values(tree.treeMapping),
-          stats,
-          [{ entityId: user._id, name: user.fullName }],
-          grade as number,
+      clock: this.initTreeFx.doneData,
+      source: { tree: this.$tree, stats: this.$stats, user: this.$user },
+      filter: isTreeDataWithoutGradeReady,
+      fn: ({ tree, stats, user }) => {
+        const treeNodes = Object.values(tree.treeMapping)
+        const grades = getTreeGrades(tree, user).filter((g) => !g.isLocked)
+
+        return Object.fromEntries(
+          grades.map((grade) => {
+            const [treeWithStats] = enhanceProgressMatrixData(
+              treeNodes,
+              stats,
+              [{ entityId: user._id, name: user.fullName }],
+              grade.value,
+            )
+            return [grade.value, getDomainStructure(treeWithStats, tree.treeMapping)]
+          }),
         )
-
-        return getDomainStructure(treeWithUserStats, tree.treeMapping)
       },
-      target: this.setDomains,
+      target: this.$domains,
     })
   }
 }

package/src/features/pmProgress/shared/pmProgress.constants.ts

@@ -35,7 +35,7 @@ export enum PmProgressStatus {
 export enum SessionStorageKeys {
   SOLVING_QUEUE = 'PM_SOLVING_QUEUE',
   GRADE = 'PM_GRADE',
-  DOMAINS = 'PM_DOMAINS',
+  DOMAINS = 'PM_DOMAINS_IN_TREE',
 }
 
 /**

package/src/features/pmProgress/shared/pmProgress.helpers.ts

@@ -171,6 +171,14 @@ type TreeDataReady = {
 export const isTreeDataReady = (source: TreeDataSource): source is TreeDataReady =>
   source.tree !== null && source.stats !== null && source.user !== null && source.grade !== null
 
+type TreeDataWithoutGrade = Omit<TreeDataSource, 'grade'>
+type TreeDataWithoutGradeReady = Omit<TreeDataReady, 'grade'>
+
+export const isTreeDataWithoutGradeReady = (
+  source: TreeDataWithoutGrade,
+): source is TreeDataWithoutGradeReady =>
+  source.tree !== null && source.stats !== null && source.user !== null
+
 export const createChartConfig = (size: number): PieChartManagerConfig => {
   const OUTER_MARGIN = 5
   return {
@@ -261,6 +269,9 @@ export const withoutDuplicates = (skills: (Skill | undefined)[]): Skill[] => {
   })
 }
 
+export const findDomainBySkillId = (skillId: string, domains: Domain[]): Domain | undefined =>
+  domains.find((d) => d.standards.some((s) => s.skillIds.includes(skillId)))
+
 // Reorders grades starting from the given grade, wrapping around. [1,2,3] with start=2 → [2,3,1]
 export const startGradesFrom = (grades: Grade[], startGrade: number): Grade[] => {
   const index = grades.findIndex(({ value }) => value === startGrade)

package/src/features/voice/recording/components/VoiceRecordButton.tsx

@@ -12,7 +12,7 @@ import {
   IS_WEB,
   MicrophoneIcon,
 } from '@magmamath/react-native-ui'
-import { Pressable, StyleSheet, View } from 'react-native'
+import { Pressable, StyleSheet } from 'react-native'
 import { VoiceRecordModel } from '../model/VoiceRecord.model'
 import { useUnit } from 'effector-react'
 import { VOICE_RECORD_SHADOWS, VoiceRecorderState } from '../../constants'
@@ -31,6 +31,51 @@ const defaultButtonStyles: ButtonStyle = {
   },
 }
 
+type AdvancedButtonProps = {
+  isRecording: boolean
+  disabled: boolean
+  onPressIn: () => void
+}
+
+const AdvancedButton = ({ isRecording, disabled, onPressIn }: AdvancedButtonProps) => {
+  return (
+    <Pressable
+      style={[styles.advancedButtonContainer, disabled && styles.disabledCursor]}
+      onPressIn={onPressIn}
+      disabled={disabled}
+    >
+      <Button
+        customColorScheme={{
+          [ButtonStates.ACTIVE]: {
+            backgroundColor: COLORS.PRIMARY_BLUE,
+            borderColor: COLORS.PRIMARY_BLUE,
+            raiseColor: COLORS.PRIMARY_BLUE,
+            color: COLORS.PRIMARY_BLUE,
+          },
+        }}
+        style={{
+          button: styles.advancedButton,
+        }}
+        isActive={isRecording}
+        variant={ButtonVariant.TERTIARY}
+        onPressIn={onPressIn}
+        icon={
+          isRecording ? (
+            <CheckIcon size={25} color={COLORS.NEUTRAL_1} />
+          ) : (
+            <MicrophoneIcon
+              style={styles.advancedMicrophoneIcon}
+              color={
+                disabled ? COLORS.NEUTRAL_5 : isRecording ? COLORS.NEUTRAL_1 : COLORS.NEUTRAL_9
+              }
+            />
+          )
+        }
+      />
+    </Pressable>
+  )
+}
+
 export const VoiceRecordButton = ({ model, buttonVariant }: VoiceRecordButtonProps) => {
   const t = useText()
 
@@ -40,7 +85,6 @@ export const VoiceRecordButton = ({ model, buttonVariant }: VoiceRecordButtonPro
   const isInitializing = useUnit(model.initializeRecording.pending)
 
   const isRecording = voiceRecordState === VoiceRecorderState.RECORDING
-  const isIdle = voiceRecordState === VoiceRecorderState.IDLE
   const hasInputs = availableInputs.length > 0
 
   return (
@@ -56,7 +100,6 @@ export const VoiceRecordButton = ({ model, buttonVariant }: VoiceRecordButtonPro
       {buttonVariant === RecordButtonVariant.ADVANCED ? (
         <AdvancedButton
           isRecording={isRecording}
-          isIdle={isIdle}
           disabled={isButtonDisabled}
           onPressIn={() => model.recorderButtonHandler()}
         />
@@ -83,45 +126,6 @@ export const VoiceRecordButton = ({ model, buttonVariant }: VoiceRecordButtonPro
   )
 }
 
-type AdvancedButtonProps = {
-  isRecording: boolean
-  isIdle: boolean
-  disabled: boolean
-  onPressIn: () => void
-}
-
-const AdvancedButton = ({ isRecording, isIdle, disabled, onPressIn }: AdvancedButtonProps) => (
-  <Pressable
-    style={[styles.advancedButtonContainer, disabled && styles.disabledCursor]}
-    onPressIn={onPressIn}
-    disabled={disabled}
-  >
-    <Button
-      customColorScheme={{
-        [ButtonStates.ACTIVE]: {
-          backgroundColor: COLORS.PRIMARY_BLUE,
-          borderColor: COLORS.PRIMARY_BLUE,
-          raiseColor: COLORS.PRIMARY_BLUE,
-          color: COLORS.PRIMARY_BLUE,
-        },
-      }}
-      isActive={isRecording}
-      variant={ButtonVariant.TERTIARY}
-      onPressIn={onPressIn}
-      icon={
-        isRecording ? (
-          <CheckIcon size={25} color={COLORS.NEUTRAL_1} />
-        ) : (
-          <MicrophoneIcon
-            style={styles.advancedMicrophoneIcon}
-            color={disabled ? COLORS.NEUTRAL_5 : isIdle ? COLORS.NEUTRAL_9 : COLORS.NEUTRAL_1}
-          />
-        )
-      }
-    />
-  </Pressable>
-)
-
 const styles = StyleSheet.create({
   advancedButtonContainer: {
     width: 52,
@@ -158,4 +162,7 @@ const styles = StyleSheet.create({
     width: 14,
     height: 19,
   },
+  advancedButton: {
+    boxShadow: 'none',
+  },
 })