-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #49 from sulianova/VladimirFyodorov/small-landing-…
…fixes Vladimir fyodorov/small landing fixes
- Loading branch information
Showing
20 changed files
with
211 additions
and
78 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| import { useEffect, useRef } from 'react'; | ||
|
|
||
| export function useIsMounted() { | ||
| const isMounted = useRef(true); | ||
|
|
||
| useEffect(() => { | ||
| return () => { | ||
| isMounted.current = false; | ||
| }; | ||
| }, []); | ||
|
|
||
| return isMounted; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| import { useEffect, useState } from 'react'; | ||
| import type { Subscription } from 'rxjs'; | ||
|
|
||
| import { formatI18nT } from 'shared'; | ||
| import { addDays, formatDate } from 'utils'; | ||
|
|
||
| import { homeworkService } from 'services'; | ||
| import { userService } from 'services/user.service'; | ||
|
|
||
| import Fallback from 'ui/Fallback'; | ||
|
|
||
| import type { ILessonData } from 'types'; | ||
|
|
||
| const t = formatI18nT('courseLesson'); | ||
|
|
||
| interface IProps { | ||
| lesson: ILessonData | undefined | ||
| courseId: string | undefined | ||
| lessonId: string | undefined | ||
| } | ||
|
|
||
| export default function useCanShowResults(props: Readonly<IProps>) { | ||
| const { lesson, courseId, lessonId } = props; | ||
|
|
||
| const authedUser = userService.useAuthedUser(); | ||
| const [sentForReviewHomeworksCount, setSentForReviewHomeworksCount] = useState<number | null>(null); | ||
| const canShowResults = lesson && lesson.resultsEndDate < new Date() && sentForReviewHomeworksCount === 0 | ||
| || authedUser?.role === 'support'; | ||
|
|
||
| useEffect(() => { | ||
| if (!courseId || !lessonId) { | ||
| return; | ||
| } | ||
|
|
||
| let subscription: Subscription; | ||
| homeworkService.getHomeworkBS({ filter: { courseId, lessonId, state: 'SENT_FOR_REVIEW' } }) | ||
| .then(bs => { | ||
| subscription = bs.subscribe(e => { | ||
| if (e && !(e instanceof Error)) { | ||
| setSentForReviewHomeworksCount(e.homeworks.length) | ||
| } | ||
| }); | ||
| }); | ||
|
|
||
| return () => subscription?.unsubscribe(); | ||
| }, [courseId, lessonId]); | ||
|
|
||
| const fallBackType = !lesson ? null: | ||
| lesson.resultsEndDate > new Date() ? 'beforeDeadline' | ||
| : addDays(lesson.resultsEndDate, 1) > new Date() ? 'deadlineDay' | ||
| : 'pastDeadline'; | ||
| const fallBack = canShowResults || !fallBackType ? null : ( | ||
| <Fallback.Info> | ||
| {t(`fallback:noResults:${fallBackType}`, { | ||
| resultsEndDate: formatDate(lesson!.resultsEndDate, { timeZone: 'Europe/Moscow', wWeekDay: true }) | ||
| })} | ||
| </Fallback.Info> | ||
| ); | ||
|
|
||
| return { canShowResults, fallBack }; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.