@selfcommunity/react-ui 0.10.2-courses.147 → 0.10.2-courses.149

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/lib/cjs/components/CourseDashboard/Student.js +8 -4
  2. package/lib/esm/components/CourseDashboard/Student.js +9 -5
  3. package/lib/umd/react-ui.js +1 -1
  4. package/package.json +8 -8
package/lib/cjs/components/CourseDashboard/Student.js CHANGED
@@ -51,15 +51,19 @@ function getUrlNextLesson(course) {
51
51
  if (isNextLessonInThisSection) {
52
52
  Object.assign(data, {
53
53
  section_id: section.id,
54
- lesson_id: section.lessons[section.num_lessons_completed].id
54
+ lesson_id: section.lessons.find((lesson) => lesson.completion_status === types_1.SCCourseLessonCompletionStatusType.UNCOMPLETED).id
55
55
  });
56
56
  }
57
57
  return isNextLessonInThisSection;
58
58
  });
59
59
  return data;
60
60
  }
61
- function getIsNextLessonAvailable(course) {
62
- return course.sections.some((section) => section.num_lessons_completed < section.num_lessons && !section.lessons[section.num_lessons_completed].locked);
61
+ function getIsNextLessonLocked(course) {
62
+ return course.sections.some((section) => {
63
+ var _a;
64
+ return (section.num_lessons_completed < section.num_lessons &&
65
+ ((_a = section.lessons.find((lesson) => lesson.completion_status === types_1.SCCourseLessonCompletionStatusType.UNCOMPLETED)) === null || _a === void 0 ? void 0 : _a.locked));
66
+ });
63
67
  }
64
68
  const Root = (0, material_1.styled)(material_1.Box, {
65
69
  name: constants_1.PREFIX,
@@ -119,7 +123,7 @@ function Student(inProps) {
119
123
  const actionButton = (0, react_1.useMemo)(() => {
120
124
  return ((0, jsx_runtime_1.jsxs)(material_1.Stack, Object.assign({ className: classes.actionsWrapper }, { children: [((scCourse === null || scCourse === void 0 ? void 0 : scCourse.join_status) === types_1.SCCourseJoinStatusType.CREATOR || (scCourse === null || scCourse === void 0 ? void 0 : scCourse.join_status) === types_1.SCCourseJoinStatusType.MANAGER) && ((0, jsx_runtime_1.jsx)(ActionButton_1.default, { labelId: messages.dashboard, to: scRoutingContext.url(react_core_1.SCRoutes.COURSE_DASHBOARD_ROUTE_NAME, scCourse), color: "inherit", variant: "outlined" })), ((scCourse === null || scCourse === void 0 ? void 0 : scCourse.join_status) === types_1.SCCourseJoinStatusType.MANAGER || (scCourse === null || scCourse === void 0 ? void 0 : scCourse.join_status) === types_1.SCCourseJoinStatusType.JOINED) &&
121
125
  ((scCourse === null || scCourse === void 0 ? void 0 : scCourse.join_status) !== null || (scCourse === null || scCourse === void 0 ? void 0 : scCourse.privacy) !== types_1.SCCoursePrivacyType.PRIVATE) &&
122
- (scCourse === null || scCourse === void 0 ? void 0 : scCourse.user_completion_rate) < 100 && ((0, jsx_runtime_1.jsx)(ActionButton_1.default, { labelId: scCourse.num_lessons_completed === 0 ? messages.start : messages.continue, to: scRoutingContext.url(react_core_1.SCRoutes.COURSE_LESSON_ROUTE_NAME, getUrlNextLesson(scCourse)), disabled: getIsNextLessonAvailable(scCourse) })), (scCourse === null || scCourse === void 0 ? void 0 : scCourse.privacy) === types_1.SCCoursePrivacyType.PRIVATE &&
126
+ (scCourse === null || scCourse === void 0 ? void 0 : scCourse.user_completion_rate) < 100 && ((0, jsx_runtime_1.jsx)(ActionButton_1.default, { labelId: scCourse.num_lessons_completed === 0 ? messages.start : messages.continue, to: scRoutingContext.url(react_core_1.SCRoutes.COURSE_LESSON_ROUTE_NAME, getUrlNextLesson(scCourse)), disabled: getIsNextLessonLocked(scCourse) })), (scCourse === null || scCourse === void 0 ? void 0 : scCourse.privacy) === types_1.SCCoursePrivacyType.PRIVATE &&
123
127
  ((scCourse === null || scCourse === void 0 ? void 0 : scCourse.join_status) === null || (scCourse === null || scCourse === void 0 ? void 0 : scCourse.join_status) === types_1.SCCourseJoinStatusType.REQUESTED) && ((0, jsx_runtime_1.jsx)(ActionButton_1.default, { labelId: sentRequest ? messages.cancel : messages.request, color: "inherit", variant: "outlined", loading: loadingRequest, onClick: handleRequest }))] })));
124
128
  }, [scCourse, sentRequest, loadingRequest, handleRequest]);
125
129
  if (!scCourse) {
package/lib/esm/components/CourseDashboard/Student.js CHANGED
@@ -5,7 +5,7 @@ import { PREFIX } from './constants';
5
5
  import { Avatar, Box, Divider, LinearProgress, Stack, styled, Typography, useThemeProps } from '@mui/material';
6
6
  import classNames from 'classnames';
7
7
  import HeaderCourseDashboard from './Header';
8
- import { SCCourseJoinStatusType, SCCoursePrivacyType } from '@selfcommunity/types';
8
+ import { SCCourseJoinStatusType, SCCourseLessonCompletionStatusType, SCCoursePrivacyType } from '@selfcommunity/types';
9
9
  import { FormattedMessage, useIntl } from 'react-intl';
10
10
  import ActionButton from './Student/ActionButton';
11
11
  import { CLAPPING } from '../../assets/courses/clapping';
@@ -49,15 +49,19 @@ function getUrlNextLesson(course) {
49
49
  if (isNextLessonInThisSection) {
50
50
  Object.assign(data, {
51
51
  section_id: section.id,
52
- lesson_id: section.lessons[section.num_lessons_completed].id
52
+ lesson_id: section.lessons.find((lesson) => lesson.completion_status === SCCourseLessonCompletionStatusType.UNCOMPLETED).id
53
53
  });
54
54
  }
55
55
  return isNextLessonInThisSection;
56
56
  });
57
57
  return data;
58
58
  }
59
- function getIsNextLessonAvailable(course) {
60
- return course.sections.some((section) => section.num_lessons_completed < section.num_lessons && !section.lessons[section.num_lessons_completed].locked);
59
+ function getIsNextLessonLocked(course) {
60
+ return course.sections.some((section) => {
61
+ var _a;
62
+ return (section.num_lessons_completed < section.num_lessons &&
63
+ ((_a = section.lessons.find((lesson) => lesson.completion_status === SCCourseLessonCompletionStatusType.UNCOMPLETED)) === null || _a === void 0 ? void 0 : _a.locked));
64
+ });
61
65
  }
62
66
  const Root = styled(Box, {
63
67
  name: PREFIX,
@@ -117,7 +121,7 @@ function Student(inProps) {
117
121
  const actionButton = useMemo(() => {
118
122
  return (_jsxs(Stack, Object.assign({ className: classes.actionsWrapper }, { children: [((scCourse === null || scCourse === void 0 ? void 0 : scCourse.join_status) === SCCourseJoinStatusType.CREATOR || (scCourse === null || scCourse === void 0 ? void 0 : scCourse.join_status) === SCCourseJoinStatusType.MANAGER) && (_jsx(ActionButton, { labelId: messages.dashboard, to: scRoutingContext.url(SCRoutes.COURSE_DASHBOARD_ROUTE_NAME, scCourse), color: "inherit", variant: "outlined" })), ((scCourse === null || scCourse === void 0 ? void 0 : scCourse.join_status) === SCCourseJoinStatusType.MANAGER || (scCourse === null || scCourse === void 0 ? void 0 : scCourse.join_status) === SCCourseJoinStatusType.JOINED) &&
119
123
  ((scCourse === null || scCourse === void 0 ? void 0 : scCourse.join_status) !== null || (scCourse === null || scCourse === void 0 ? void 0 : scCourse.privacy) !== SCCoursePrivacyType.PRIVATE) &&
120
- (scCourse === null || scCourse === void 0 ? void 0 : scCourse.user_completion_rate) < 100 && (_jsx(ActionButton, { labelId: scCourse.num_lessons_completed === 0 ? messages.start : messages.continue, to: scRoutingContext.url(SCRoutes.COURSE_LESSON_ROUTE_NAME, getUrlNextLesson(scCourse)), disabled: getIsNextLessonAvailable(scCourse) })), (scCourse === null || scCourse === void 0 ? void 0 : scCourse.privacy) === SCCoursePrivacyType.PRIVATE &&
124
+ (scCourse === null || scCourse === void 0 ? void 0 : scCourse.user_completion_rate) < 100 && (_jsx(ActionButton, { labelId: scCourse.num_lessons_completed === 0 ? messages.start : messages.continue, to: scRoutingContext.url(SCRoutes.COURSE_LESSON_ROUTE_NAME, getUrlNextLesson(scCourse)), disabled: getIsNextLessonLocked(scCourse) })), (scCourse === null || scCourse === void 0 ? void 0 : scCourse.privacy) === SCCoursePrivacyType.PRIVATE &&
121
125
  ((scCourse === null || scCourse === void 0 ? void 0 : scCourse.join_status) === null || (scCourse === null || scCourse === void 0 ? void 0 : scCourse.join_status) === SCCourseJoinStatusType.REQUESTED) && (_jsx(ActionButton, { labelId: sentRequest ? messages.cancel : messages.request, color: "inherit", variant: "outlined", loading: loadingRequest, onClick: handleRequest }))] })));
122
126
  }, [scCourse, sentRequest, loadingRequest, handleRequest]);
123
127
  if (!scCourse) {