@magmamath/students-features 1.2.1-rc.39 → 1.2.1-rc.4

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

@@ -1,273 +0,0 @@
-import { COLORS } from '@magmamath/react-native-ui'
-import type { ProgressMatrixStatsDto } from '@matteappen/skills-utils/enhanceProgressData/types'
-import {
-  Domain,
-  DomainStandard,
-  Grade,
-  Skill,
-  SkillsMapping,
-  StatsResponse,
-  TreeMappingResponse,
-  User,
-} from './pmProgress.types'
-import { CustomDomain, DOMAIN_BORDER_COLORS, DOMAIN_COLORS } from './pmProgress.constants'
-import { dynamicCornerRadius, dynamicInnerRadius } from '../components/chart/chart.helpers'
-import type { PieChartManagerConfig } from '../components/chart/chart.types'
-import { getText } from '../../../shared/translation/helpers'
-import type { GradeLabelsMap } from './pmProgress.types'
-
-function groupStandardsByDomain(
-  standardStats: ProgressMatrixStatsDto[number]['standardStats'],
-  treeMapping: TreeMappingResponse['treeMapping'],
-) {
-  const grouped = new Map<string, Domain['standards']>()
-
-  for (const [standardId, stat] of Object.entries(standardStats)) {
-    const { domainId, skillIds, skillsCount, scorePercentage, skillsToPractice } = stat
-
-    if (!grouped.has(domainId)) {
-      grouped.set(domainId, [])
-    }
-
-    const completed =
-      !skillsToPractice ||
-      (skillsToPractice.failed.length === 0 && skillsToPractice.unattempted.length === 0)
-    const left = skillsToPractice
-      ? skillsToPractice.failed.length + skillsToPractice.unattempted.length
-      : 0
-
-    grouped.get(domainId)!.push({
-      standardId,
-      title:
-        treeMapping[standardId].shortDescriptionTranslations ||
-        treeMapping[standardId].nameTranslations,
-      subtitle: treeMapping[standardId].originalId,
-      skillIds,
-      skillsToPractice,
-      skillsCount,
-      isCompleted: completed,
-      skillsLeft: left,
-      scorePercentage,
-    })
-  }
-
-  return grouped
-}
-
-function averageScorePercentage(standards: Domain['standards']): number {
-  const sum = standards.reduce((acc, s) => acc + s.scorePercentage, 0)
-  return Math.round((sum / standards.length) * 10) / 10
-}
-
-export function getDomainStructure(
-  data: ProgressMatrixStatsDto[number],
-  treeMapping: TreeMappingResponse['treeMapping'],
-): Domain[] {
-  const grouped = groupStandardsByDomain(data.standardStats, treeMapping)
-
-  return Array.from(grouped.entries()).map(([domainId, standards], index) => {
-    const title = treeMapping[domainId].nameTranslations
-    const isFluency = title.toLowerCase() === CustomDomain.FLUENCY.toLowerCase()
-
-    return {
-      domainId,
-      title,
-      color: isFluency
-        ? COLORS.PRIMARY_ORANGE
-        : (DOMAIN_COLORS[index] ?? DOMAIN_COLORS[DOMAIN_COLORS.length - 1]),
-      borderColor: isFluency
-        ? COLORS.ORANGE_6
-        : (DOMAIN_BORDER_COLORS[index] ?? DOMAIN_BORDER_COLORS[DOMAIN_BORDER_COLORS.length - 1]),
-      backgroundColor: COLORS.NEUTRAL_4,
-      standards,
-      scorePercentage: averageScorePercentage(standards),
-    }
-  })
-}
-
-type GetInitialPmGradeParams = {
-  treeGrades: number[]
-  lockedGrades: number[]
-  enrolledGrades: number[]
-  userGrade: number | null | undefined
-}
-
-/**
- * Resolves which grade a student should practice on.
- *
- * When userGrade is -1, null, or undefined (i.e. not explicitly set), we fall back
- * to the student's enrolled grades and pick the lowest one that isn't locked.
- * If userGrade is set but locked, we find the closest unlocked grade.
- * All candidates are filtered against lockedGrades, so only unlocked grades are ever returned.
- *
- * Examples:
- *   locked=[1,2],     enrolled=[2,5], grade=4  → 4 (unlocked, use as-is)
- *   locked=[1,2],     enrolled=[2,5], grade=-1 → 5 (lowest unlocked enrolled)
- *   locked=[0,1,2,5], enrolled=[2,5], grade=-1 → 3 (no enrolled available, first unlocked)
- *   locked=[0,1],     enrolled=[2,5], grade=-1 → 2 (lowest unlocked enrolled)
- *   locked=[0,1,2,3], enrolled=[3,9], grade=-1 → 9 (lowest unlocked enrolled)
- *   locked=[1,2,3],   enrolled=[2,5], grade=2  → 4 (grade locked, closest below=none, above=4)
- */
-
-export function getInitialPmGrade({
-  treeGrades,
-  lockedGrades,
-  enrolledGrades,
-  userGrade,
-}: GetInitialPmGradeParams): number | null {
-  const locked = new Set(lockedGrades)
-  const unlocked = treeGrades.filter((g) => !locked.has(g)).sort((a, b) => a - b)
-
-  if (unlocked.length === 0) {
-    return null
-  }
-
-  const isUserGradeMissing = userGrade === null || userGrade === -1 || userGrade === undefined
-  if (isUserGradeMissing) {
-    const unlockedEnrolled = enrolledGrades.filter((g) => unlocked.includes(g))
-    return unlockedEnrolled.length > 0 ? Math.min(...unlockedEnrolled) : unlocked[0]
-  }
-
-  if (unlocked.includes(userGrade)) return userGrade
-
-  const nearestBelow = [...unlocked].reverse().find((grade) => grade < userGrade)
-  const nearestAbove = unlocked.find((grade) => grade > userGrade)
-  return nearestBelow ?? nearestAbove ?? unlocked[0] ?? 0
-}
-
-export function formatTime(ms: number): string {
-  const totalMinutes = Math.floor(ms / 60_000)
-  if (totalMinutes < 60) return `${totalMinutes}m`
-  const hours = Math.round(totalMinutes / 60)
-  return `${hours}h`
-}
-
-export const isTreeDataReady = (source: {
-  tree: TreeMappingResponse | null
-  stats: StatsResponse | null
-  user: User | null
-  grade: number | null
-}): source is { tree: TreeMappingResponse; stats: StatsResponse; user: User; grade: number } =>
-  source.tree !== null && source.stats !== null && source.user !== null && source.grade !== null
-
-const MARGIN = 5
-export const createChartConfig = (size: number): PieChartManagerConfig => ({
-  size,
-  outerRadius: size / 2 - MARGIN,
-  innerRadius: dynamicInnerRadius,
-  gapBetweenSlices: 8,
-  cornerRadius: dynamicCornerRadius,
-  pressOffset: 4,
-  borderWidth: 4,
-  colors: {
-    background: 'white',
-    highlightedBackground: COLORS.NEUTRAL_6,
-  },
-  outerArc: {
-    color: '#FFFFFF40',
-    strokeWidth: 11.75,
-    dashWidth: 22,
-  },
-})
-
-/**
- * Returns uncompleted skills from a single standard.
- * Failed skills come first, then unattempted.
- */
-export function getUncompletedSkillsFromStandard(
-  standard: DomainStandard,
-  skillsMapping: SkillsMapping,
-): Skill[] {
-  if (!standard.skillsToPractice) return []
-
-  return [...standard.skillsToPractice.failed, ...standard.skillsToPractice.unattempted]
-    .map(({ skillId }) => skillsMapping[skillId])
-    .filter(Boolean)
-    .sort((a, b) => skillsMapping[a._id]?.difficulty - skillsMapping[b._id]?.difficulty)
-}
-
-/**
- * Returns uncompleted skills from a domain, scanning standards from the beginning.
- * Optionally excludes a standard (used when student selected a specific one).
- */
-export function getUncompletedSkillsFromDomain(
-  domain: Domain,
-  skillsMapping: SkillsMapping,
-  excludeStandardId?: string,
-): Skill[] {
-  return domain.standards
-    .filter((s) => !s.isCompleted && s.standardId !== excludeStandardId)
-    .flatMap((s) => getUncompletedSkillsFromStandard(s, skillsMapping))
-}
-
-/**
- * Returns all uncompleted skills across all domains in list order.
- * Used as a fallback when recommendation arrays are empty.
- */
-export function getAllUncompletedSkills(domains: Domain[], skillsMapping: SkillsMapping): Skill[] {
-  return domains
-    .filter((d) => d.standards.some((s) => !s.isCompleted))
-    .flatMap((d) => getUncompletedSkillsFromDomain(d, skillsMapping))
-}
-
-/** Moves item with the given id to the front: [0,1,2,3,4] with id of 3rd → [3,0,1,2,4] */
-export function shiftToBeginningOfArray(id: string, items: Skill[]): Skill[] {
-  const index = items.findIndex((item) => item._id === id)
-  if (index <= 0) return items
-  return [items[index], ...items.slice(0, index), ...items.slice(index + 1)]
-}
-
-export function withoutDuplicates(skills: (Skill | undefined)[]): Skill[] {
-  const seen = new Set<string>()
-  return skills.filter((skill): skill is Skill => {
-    if (!skill) return false
-    if (seen.has(skill._id)) return false
-    seen.add(skill._id)
-    return true
-  })
-}
-
-// Reorders grades starting from the given grade, wrapping around. [1,2,3] with start=2 → [2,3,1]
-export function startGradesFrom(grades: Grade[], startGrade: number): Grade[] {
-  const index = grades.findIndex(({ value }) => value === startGrade)
-  if (index <= 0) return grades
-  return [...grades.slice(index), ...grades.slice(0, index)]
-}
-
-export const isFluencyDomain = (title: string) => {
-  return title.toLowerCase() === CustomDomain.FLUENCY.toLowerCase()
-}
-
-export function formatGradeName(grade: number): string {
-  if (grade === -1) return getText('pmProgress.gradeOther')
-  if (grade === 0) return `${getText('pmProgress.grade')} ${getText('pmProgress.gradeK')}`
-  return `${getText('pmProgress.grade')} ${grade}`
-}
-
-export function formatGradeLabel(grade: number, customLabelsMap?: GradeLabelsMap): string {
-  if (!customLabelsMap) return formatGradeName(grade)
-
-  const label = customLabelsMap[String(grade)]
-
-  if (!label) return formatGradeName(grade)
-  if (label.noPrefix) return label.name
-  return `${getText('pmProgress.grade')} ${label.name}`
-}
-
-export function getTreeGrades(tree: TreeMappingResponse, user: User): Grade[] {
-  const lockedGrades = new Set(user.setting.practiceModeLockedGrades)
-
-  const gradeNodes = Object.values(tree.treeMapping).filter(
-    (node) => node?.type === 'grade' && node.attributes.grade !== null,
-  )
-
-  const uniqueSortedGrades = [...new Set(gradeNodes.map((node) => node.attributes.grade))].sort(
-    (a, b) => a - b,
-  )
-
-  return uniqueSortedGrades.map((grade) => ({
-    name: formatGradeName(grade),
-    value: grade,
-    isLocked: lockedGrades.has(grade),
-  }))
-}

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

@@ -1,218 +0,0 @@
-import { DOMAIN_COLORS, SolvingFlow } from './pmProgress.constants'
-import type { SkillsToPracticeDto } from '@matteappen/skills-utils/enhanceProgressData/types'
-
-type StatsSkill = {
-  userId: string
-  skillId: string
-  achievedSkills: number
-  failedSkills: number
-  totalSkills: number
-}
-
-export type StatsPayload = {
-  entityIds: string[]
-}
-
-export type StatsResponse = {
-  entityId: string
-  skills: StatsSkill[]
-}[]
-
-export type GetRecommendationsPayload = {
-  limit?: number
-}
-
-type Ability = {
-  functionName: string
-  problemCount: number
-  sectionId: string
-  visibility: unknown[]
-}
-
-export type Skill = {
-  _id: string
-  nameTranslations: string
-  shortDescriptionTranslations: string
-  descriptionTranslations: string
-  ability: Ability
-  theory: {
-    languageCode: string
-    theory: string
-  }[]
-  type?: SolvingFlow
-}
-
-type MappingTree = {
-  _id: string
-  parents: string[]
-  type: string
-  nameTranslations: string
-  shortDescriptionTranslations: string
-  descriptionTranslations: string
-  order: number
-  children: string[]
-  skills: string[]
-  originalId: string
-  originalPath: string
-  attributes: { grade: number }
-}
-
-export type TreeId = string
-
-export type SkillsMapping = Record<string, Skill & { difficulty: number }>
-
-export type TreeMappingResponse = {
-  rootId: string
-  skillsMapping: SkillsMapping
-  treeMapping: Record<string, MappingTree>
-}
-
-export enum RecommendationType {
-  MAGMA = 'magma',
-  TEACHER = 'teacher',
-}
-
-type Recommendation<T extends string = RecommendationType> = {
-  _id: string
-  type: T
-  skillId: string
-  teacherId: string
-  studentId: string
-  exerciseIds: string[]
-  failedAttempts: string[]
-  refreshedAt: string
-  createdAt: string
-  updatedAt: string
-}
-
-export type RecsResponse<T extends RecommendationType = RecommendationType.MAGMA> = {
-  offset: number
-  limit: number
-  total: number
-  items: Recommendation<T>[]
-}
-
-export type Recommendations = {
-  items: Skill[]
-  offset: number
-  limit: number
-  total: number
-}
-
-export type UserTimeframeStats = {
-  studentId: string
-  practiceModeStatsByTimeFrame: {
-    all: {
-      timeInPracticeMs: number
-      numberOfStars: number
-    }
-    week: {
-      timeInPracticeMs: number
-      numberOfStars: number
-    }
-    lastWeek: {
-      timeInPracticeMs: number
-      numberOfStars: number
-    }
-  }
-}
-
-export type SkillsCount = {
-  total: number
-  achieved: number
-  failed: number
-}
-
-export type DomainStandard = {
-  standardId: string
-  title: string
-  subtitle: string
-  skillIds: string[]
-  skillsToPractice?: SkillsToPracticeDto
-  skillsCount: SkillsCount
-  isCompleted: boolean
-  skillsLeft: number
-  scorePercentage: number
-}
-
-export type Domain = {
-  domainId: string
-  title: string
-  color: string
-  borderColor: string
-  backgroundColor: string
-  standards: DomainStandard[]
-  scorePercentage: number
-}
-
-// TODO: to /shared/user.types.ts and create full type? any sense to duplicate it??
-export type User = {
-  _id: string
-  fullName: string
-  grade: number | null
-  enrolledGrades: number[]
-  setting: {
-    practiceModeTreeId: string
-    practiceModeLockedGrades: number[]
-  }
-}
-
-export type Grade = {
-  name: string
-  value: number
-  isLocked: boolean
-}
-
-export type GradeLabel = {
-  name: string
-  noPrefix?: boolean
-}
-
-export type GradeLabelsMap = Record<string, GradeLabel>
-
-export type PmProgressGateProps = {
-  user: User
-}
-
-export type SetupInitialGradeProps = { tree: TreeMappingResponse; user: User }
-
-export type GetTreeContextFxParams = {
-  tree: TreeMappingResponse
-  stats: StatsResponse
-  user: User
-  grade: number
-}
-
-export type TreeContext = {
-  tree: TreeMappingResponse
-  stats: StatsResponse
-  user: User
-  treeWithStats: unknown
-}
-
-export type QueueBuilderData<T extends StartSolvingProps = StartSolvingProps> = {
-  domains: Domain[]
-  context: TreeContext
-} & T
-
-export type TeacherQueueData = QueueBuilderData<StartSolvingTeacher>
-export type MagmaQueueData = QueueBuilderData<StartSolvingMagma>
-export type StandardQueueData = QueueBuilderData<StartSolvingStandard>
-
-export type StartSolvingTeacher = {
-  type: SolvingFlow.TEACHER
-  skillId?: string
-}
-
-export type StartSolvingMagma = {
-  type: SolvingFlow.MAGMA
-}
-
-export type StartSolvingStandard = {
-  type: SolvingFlow.STANDARD
-  standardId: string
-}
-
-export type StartSolvingProps = StartSolvingTeacher | StartSolvingMagma | StartSolvingStandard
-
-export type DomainColor = (typeof DOMAIN_COLORS)[number]

package/src/shared/icons/PentagonIcon.tsx

@@ -1,17 +0,0 @@
-import React from 'react'
-import Svg, { G, Path, Defs } from 'react-native-svg'
-import { IconProps } from './icon.types'
-
-export const PentagonIcon = ({ size = 32, color }: IconProps) => {
-  return (
-    <Svg width={size} height={size} viewBox="0 0 32 31" fill="none">
-      <G filter="url(#filter0_dd_2255_6755)">
-        <Path
-          d="M14.025 2.573a3 3 0 013.527 0l9.788 7.111a3 3 0 011.09 3.355l-3.74 11.506a3 3 0 01-2.852 2.073H9.739a3 3 0 01-2.853-2.073L3.147 13.038a3 3 0 011.09-3.354l9.788-7.111z"
-          fill={color}
-        />
-      </G>
-      <Defs></Defs>
-    </Svg>
-  )
-}

package/src/shared/icons/SketchArrowRight.tsx

@@ -1,18 +0,0 @@
-import React from 'react'
-import Svg, { Path } from 'react-native-svg'
-import { IconProps } from './icon.types'
-
-export const SketchArrowRight = ({ size = 46, color = '#4D4D63' }: IconProps) => {
-  const sizeRatio = 1.65
-  return (
-    <Svg width={size} height={size * sizeRatio} viewBox="0 0 46 28" fill="none">
-      <Path
-        d="M2 14.714c17.875-3.906 41.975-1.466 41.975-1.466m0 0s-7.319-9-11.4-11.248m11.4 11.248s-8.773 6.653-10.562 12.737"
-        stroke={color}
-        strokeWidth={4}
-        strokeLinecap="round"
-        strokeLinejoin="round"
-      />
-    </Svg>
-  )
-}

package/src/shared/icons/SliceDiamondIcon.tsx

@@ -1,16 +0,0 @@
-import React from 'react'
-import { IconProps } from './icon.types'
-import Svg, { G, Path } from 'react-native-svg'
-
-export const SliceDiamondIcon = ({ color, size = 28 }: IconProps) => {
-  return (
-    <Svg width={size} height={size} viewBox="0 0 28 27" fill="none">
-      <G filter="url(#filter0_dd_1929_4175)">
-        <Path
-          d="M12.004 22.19a2.25 2.25 0 003.652 0l9.269-12.877a2.578 2.578 0 00-.27-3.329C18.677.005 8.983.005 3.005 5.984a2.578 2.578 0 00-.27 3.33l9.269 12.876z"
-          fill={color}
-        />
-      </G>
-    </Svg>
-  )
-}

package/src/shared/icons/StarIcon.tsx

@@ -1,17 +0,0 @@
-import React from 'react'
-import Svg, { Path } from 'react-native-svg'
-import { IconProps } from './icon.types'
-import { COLORS } from '@magmamath/react-native-ui'
-
-export const StarIcon = ({ width = 25, color = COLORS.NEUTRAL_1 }: IconProps) => {
-  return (
-    <Svg width={width} height={width} viewBox="0 0 25 25" fill="none">
-      <Path
-        fillRule="evenodd"
-        clipRule="evenodd"
-        d="M13.76.971c-.776-1.295-2.653-1.295-3.43 0L7.082 6.387l-5.565 1.39c-1.508.378-2.028 2.256-.929 3.355l4.128 4.128-1.368 6.502c-.35 1.659 1.394 2.973 2.892 2.18l5.795-3.068 3.865 2.147 2.007 1.004c1.497.748 3.196-.563 2.851-2.201l-1.381-6.564 4.128-4.128c1.099-1.099.579-2.977-.93-3.354L17.01 6.387 13.76.97zM8.796 7.416L12.046 2l3.249 5.416a2 2 0 001.23.91l5.565 1.392-4.129 4.128a2 2 0 00-.542 1.826l1.381 6.564-1.968-.984-3.827-2.126a2 2 0 00-1.907-.02l-5.794 3.068 1.368-6.502a2 2 0 00-.542-1.826L2 9.718l5.565-1.391a2 2 0 001.23-.911z"
-        fill={color}
-      />
-    </Svg>
-  )
-}

package/src/shared/icons/TimerIcon.tsx

@@ -1,21 +0,0 @@
-import React from 'react'
-import Svg, { Path } from 'react-native-svg'
-import { IconProps } from './icon.types'
-import { COLORS } from '@magmamath/react-native-ui'
-
-export const TimerIcon = ({ size = 25, color = COLORS.NEUTRAL_1 }: IconProps) => {
-  return (
-    <Svg width={size} height={size} viewBox="0 0 21 23" fill="none">
-      <Path
-        d="M10.781 8.984a1.078 1.078 0 10-2.156 0v3.235H6.828a1.078 1.078 0 100 2.156h2.875c.596 0 1.078-.483 1.078-1.078V8.984z"
-        fill={color}
-      />
-      <Path
-        fillRule="evenodd"
-        clipRule="evenodd"
-        d="M7.547 0a1.078 1.078 0 100 2.156h1.078v1.497C3.773 4.189 0 8.303 0 13.297 0 18.656 4.344 23 9.703 23c5.359 0 9.703-4.344 9.703-9.703 0-2.28-.787-4.377-2.103-6.033l1.034-1.058.666.666a1.078 1.078 0 101.525-1.525l-2.875-2.875a1.078 1.078 0 10-1.525 1.525l.684.684-1.029 1.054a9.663 9.663 0 00-5.002-2.082V2.156h1.078a1.078 1.078 0 000-2.156H7.547zm-5.39 13.297a7.547 7.547 0 1115.093 0 7.547 7.547 0 01-15.094 0z"
-        fill={color}
-      />
-    </Svg>
-  )
-}