bugfix sorting & grouping
All checks were successful
platform/bro/pipeline/head This commit looks good

This commit is contained in:
Primakov Alexandr Alexandrovich 2024-04-09 22:53:51 +03:00
parent 814e089a67
commit 0bdae7fc23

View File

@ -194,12 +194,13 @@ const LessonList = () => {
const toastRef = useRef(null) const toastRef = useRef(null)
const createdLessonRef = useRef(null) const createdLessonRef = useRef(null)
const [editLesson, setEditLesson] = useState<Lesson>(null) const [editLesson, setEditLesson] = useState<Lesson>(null)
const sorted = useMemo(() => [...(data?.body || [])]?.sort((a, b) => a.date < b.date ? 1 : -1), [data, data?.body])
const lessonCalc = useMemo(() => { const lessonCalc = useMemo(() => {
if (!isSuccess) { if (!isSuccess) {
return [] return []
} }
const sorted = [...data?.body].sort((a, b) => a.date > b.date ? 1 : -1)
if (!groupByDate) { if (!groupByDate) {
return [{ date: '', data: sorted }] return [{ date: '', data: sorted }]
@ -223,7 +224,7 @@ const LessonList = () => {
} }
return lessonsData return lessonsData
}, [groupByDate, isSuccess]) }, [groupByDate, isSuccess, sorted])
const onSubmit = (lessonData) => { const onSubmit = (lessonData) => {
toastRef.current = toast({ toastRef.current = toast({
@ -404,10 +405,10 @@ const LessonList = () => {
)} )}
</Box> </Box>
)} )}
{barFeature && ( {barFeature && sorted?.length && (
<Box height="300"> <Box height="300">
<Bar <Bar
data={data?.body.map((lesson, index) => ({ data={sorted.map((lesson, index) => ({
lessonIndex: `#${index + 1}`, lessonIndex: `#${index + 1}`,
count: lesson.students.length, count: lesson.students.length,
}))} }))}