touchstudy-core 0.1.88 → 0.1.90

package/dist/components/Alerts/ReleaseAlert.d.ts

@@ -0,0 +1,3 @@
+import React from "react";
+declare const ReleaseAlert: () => React.JSX.Element | null;
+export default ReleaseAlert;

package/dist/components/Alerts/index.d.ts

@@ -0,0 +1,2 @@
+import ReleaseAlert from "./ReleaseAlert";
+export { ReleaseAlert };

package/dist/configs/constants.d.ts

@@ -9,3 +9,4 @@ export declare type Language = {
 };
 export declare const LANGUAGES: Language[];
 export declare const DEFAULT_LANGUAGE: Language;
+export declare const LOGIN_URL = "/login";

package/dist/containers/Classes/components/StudentList.d.ts

@@ -9,7 +9,7 @@ interface Props {
     t: any;
     selectedStudent: StudentClassResponse | undefined;
     textSearchRef: RefObject<HTMLInputElement> | null;
-    disabled?: boolean;
+    isOneRoleExists?: boolean;
     handleOpenDeleteClassDialog: (value: StudentClassResponse) => void;
     handleCloseConfirmDialog: () => void;
     handleSort: (key: UserClassSortBy) => void;

package/dist/containers/Classes/hooks/useClassDetail.d.ts

@@ -4,9 +4,14 @@ import _ from "lodash";
 import { ChangeEvent } from "react";
 import { ClassResponse, StudentClassResponse, TeacherClassResponse, ClassRequest, LessonRequest } from "../configs/types";
 import { PagingResponse } from "../../../utils/types/pagingResponse";
+import { Role } from "../../..";
 import { UserSortColumn } from "../../../utils/enums";
 declare type DialogOpenType = "Student" | "Teacher" | "Lesson";
-declare const useClassDetail: (history: any, id?: string | undefined) => {
+declare const useClassDetail: ({ history, id, role }: {
+    history: any;
+    id?: string | undefined;
+    role: Role;
+}) => {
     id: string | undefined;
     schema: import("yup").ObjectSchema<{
         name: string;
@@ -25,6 +30,7 @@ declare const useClassDetail: (history: any, id?: string | undefined) => {
         mainTeacherId: undefined;
         courseWeeklyDays: "";
     }, "">;
+    isAdmin: boolean;
     paging: PagingResponse;
     filter: import("../../../utils/types/searchQuery").BaseSearchQuery<UserSortColumn>;
     listUserSelected: number[];
@@ -43,6 +49,7 @@ declare const useClassDetail: (history: any, id?: string | undefined) => {
     course: ClassResponse | undefined;
     userList: StudentClassResponse[] | TeacherClassResponse[];
     teacherOptions: import("../configs/types").TeacherSimpleResponse[];
+    isOneRoleExists: boolean;
     studentListProps: {
         paging: PagingResponse;
         classList: StudentClassResponse[];

package/dist/index.d.ts

@@ -83,4 +83,5 @@ import ClassDetail from "./containers/Classes/views/ClassDetail";
 import UserList from "./containers/Users/views/UserList";
 import NotificationDetail from "./containers/Notifications/views/NotificationDetail";
 import NotificationList from "./containers/Notifications/views/NotificationList";
+export * from "./components/Alerts";
 export { diffFromNow, formatTime, utcToLocalTime, setLoading, setReadyRegisterPusher, BASE_URL, SUPER_ADMIN_BASE_URL, ACCESS_TOKEN, Login, store, setAlert, setUser, Loading, NotFound, LayoutContext, api, apiUpload, ConfirmDialog, CommonDialog, LoginWithEmail, NotificationList, CustomPagination, useGoogleSignOut, RecentUserAction, PUSHER_CONFIG, ExamEvent, EXAM_CHANNEL, EXAM_STUDENT_CHANNEL, setLanguage, i18n, TheLanguageDropdown, PrintExamView2, TheAcademyDropdown, useTranslation, I18nextProvider, DATE_MIN_VALUE, DATE_TIME_MIN_VALUE, ACADEMY_DOMAIN, minutesToTimeSpan, toISOString, canAccessRoute, CustomSelect, NotificationDetail, CustomAsyncSelect, CustomSelectOption, LoginWithPassword, getRecentUserActionListApi, getAccessToken, ChatContainer, getOrdinalSuffix, IChatContainerProps, IChatItemProps, IChatHeaderProps, IInputChatProps, ChatItemType, useChatContainer, ConversationResponse, usePusherConversation, ExamResultV2, ToastContainer, toast, Role, useLanguage, useSwitchAcademy, LANGUAGES, CustomCreatable, moment, ExamDetailView, ExamDetailViewProps, Exam, Question, ArticleGroup, getAcademyDomain, useSubjectSelect, useLogin, useAutoAcademyDomain, createRecentUserActionListApi, LoginAccessTokenRequest, LoginRequest, setReFetchUserAcademies, ChatTypes, AcademyHeaders, Types, Enums, CoreHooks, Language, ArticleGroupView, AnswerCountSelector, QuestionCountSelector, ScoreSelector, ArticleCategorySelector, SubjectSelector, useCategorySelect, InputText, Textbook, TextbookDetail, TextbookList, timeUtils, Header, DEFAULT_PAGING_RESPONSE, PagingResponse, AcademyList, getErrorMessage, DefaultErrorMessage, useCountDownTimer, useLoadMore, useVirtualizeList, PassCodeCheck, PassCodeCheckProps, LoadingComponent, PrintExamResultView, checkSuperUrl, ClassList, ClassDetail, formatRole, getRole, UserList };

package/dist/index.js

@@ -87,6 +87,7 @@ var PUSHER_CONFIG = {
   cluster: process.env.REACT_APP_PUSHER_CONFIG_CLUSTER || "",
   key: process.env.REACT_APP_PUSHER_CONFIG_KEY || ""
 };
+var RELEASE_DATE = process.env.REACT_APP_RELEASE_VERSION || "";
 var ACCESS_TOKEN = "ACCESS_TOKEN";
 var ACADEMY_DOMAIN = "ACADEMY_DOMAIN";
 var REDIRECT_URL = "REDIRECT_URL";
@@ -1185,6 +1186,7 @@ var LANGUAGES = [{
   momentLangCode: "en-au"
 }];
 var DEFAULT_LANGUAGE = LANGUAGES[0];
+var LOGIN_URL = "/login";
 
 var getLanguage = (function () {
   try {
@@ -1226,7 +1228,9 @@ var useLanguage = function useLanguage(history) {
     moment.locale(languageItem.momentLangCode);
     localStorage.setItem(LANGUAGE, languageItem.code);
     dispatch(setLanguage(languageItem.code));
-    searchParams.set("lang", languageItem.code);
+    if (window.location.pathname === LOGIN_URL) {
+      if (RELEASE_DATE) return;else searchParams["delete"]("lang");
+    } else searchParams.set("lang", languageItem.code);
     pushTo(history, _extends({}, window.location, {
       search: searchParams.toString()
     }), true);
@@ -2947,6 +2951,9 @@ var total_exam = "총 시험 수";
 var total_exam_time = "총 시험 시간";
 var total_question = "총 질문 수";
 var the_exam_code_you_are_looking_for_was_not_found = "찾고 있는 시험 코드를 찾을 수 없습니다";
+var view_user = "사용자 보기";
+var exam_code = "시험 코드";
+var version = "버전";
 var lang_ko = {
 	problem_solving: problem_solving,
 	my_story: my_story,
@@ -3746,7 +3753,10 @@ var lang_ko = {
 	total_exam: total_exam,
 	total_exam_time: total_exam_time,
 	total_question: total_question,
-	the_exam_code_you_are_looking_for_was_not_found: the_exam_code_you_are_looking_for_was_not_found
+	the_exam_code_you_are_looking_for_was_not_found: the_exam_code_you_are_looking_for_was_not_found,
+	view_user: view_user,
+	exam_code: exam_code,
+	version: version
 };
 
 var problem_solving$1 = "Problem Solving";
@@ -4556,6 +4566,9 @@ var total_exam$1 = "Total Exam";
 var total_exam_time$1 = "Total Exam Time";
 var total_question$1 = "Total Question";
 var the_exam_code_you_are_looking_for_was_not_found$1 = "The exam code you are looking for was not found";
+var view_user$1 = "View User";
+var exam_code$1 = "exam code";
+var version$1 = "Version";
 var lang_en = {
 	problem_solving: problem_solving$1,
 	my_story: my_story$1,
@@ -5356,7 +5369,10 @@ var lang_en = {
 	total_exam: total_exam$1,
 	total_exam_time: total_exam_time$1,
 	total_question: total_question$1,
-	the_exam_code_you_are_looking_for_was_not_found: the_exam_code_you_are_looking_for_was_not_found$1
+	the_exam_code_you_are_looking_for_was_not_found: the_exam_code_you_are_looking_for_was_not_found$1,
+	view_user: view_user$1,
+	exam_code: exam_code$1,
+	version: version$1
 };
 
 i18n__default.use(reactI18next.initReactI18next).init({
@@ -10694,6 +10710,7 @@ var useAutoAcademyDomain = function useAutoAcademyDomain(logout, history, superU
     academyDomain = _ref.academyDomain;
   var pathname = window.location.pathname;
   var changeAcademySearchParams = function changeAcademySearchParams() {
+    var isLoginPage = LOGIN_URL === pathname;
     var search = window.location.search;
     var searchParams = new URLSearchParams(search);
     var paramAcademyDomain = searchParams.get("domain");
@@ -10702,6 +10719,9 @@ var useAutoAcademyDomain = function useAutoAcademyDomain(logout, history, superU
     var isSuperUrl = checkSuperUrl(superUrls, pathname);
     if (!academyDomain) {
       if (!isSuperUrl) {
+        if (isLoginPage) {
+          if (RELEASE_DATE) return;else searchParams["delete"]("domain");
+        }
         !paramAcademyDomain && domain && searchParams.set("domain", domain);
         pushTo(history, {
           pathname: homeUrl,
@@ -10730,6 +10750,9 @@ var useAutoAcademyDomain = function useAutoAcademyDomain(logout, history, superU
         return;
       }
       if (!paramAcademyDomain) {
+        if (isLoginPage) {
+          if (RELEASE_DATE) return;else searchParams["delete"]("domain");
+        }
         searchParams.set("domain", academyDomain);
         pushTo(history, _extends({}, window.location, {
           search: searchParams.toString()
@@ -18620,7 +18643,7 @@ var StudentList = function StudentList(_ref) {
     selectedStudent = _ref.selectedStudent,
     t = _ref.t,
     textSearchRef = _ref.textSearchRef,
-    disabled = _ref.disabled,
+    isOneRoleExists = _ref.isOneRoleExists,
     handleOpenDeleteClassDialog = _ref.handleOpenDeleteClassDialog,
     handleCloseConfirmDialog = _ref.handleCloseConfirmDialog,
     handleSort = _ref.handleSort,
@@ -18680,7 +18703,7 @@ var StudentList = function StudentList(_ref) {
     },
     placeholder: t("search_for"),
     onChange: handleChangeSearchText
-  }))), React__default.createElement(material.Grid, {
+  }))), isOneRoleExists && React__default.createElement(material.Grid, {
     item: true,
     xs: 6,
     className: "d-flex align-items-center"
@@ -18716,11 +18739,11 @@ var StudentList = function StudentList(_ref) {
       className: "d-flex"
     }, React__default.createElement(material.IconButton, {
       color: "default",
-      className: (disabled ? "bg-secondary" : "bg-danger") + " text-white",
+      className: (!isOneRoleExists ? "bg-secondary" : "bg-danger") + " text-white",
       onClick: function onClick() {
         return handleOpenDeleteClassDialog(i);
       },
-      disabled: disabled
+      disabled: !isOneRoleExists
     }, React__default.createElement(fa6.FaTrashCan, {
       size: 12
     })))));
@@ -18767,6 +18790,7 @@ var SelectDialog = function SelectDialog(_ref) {
     onSubmit = _ref.onSubmit;
   var _useTranslation = reactI18next.useTranslation(),
     t = _useTranslation.t;
+  var theme = material.useTheme();
   var handleSubmit = function handleSubmit() {
     onSubmit(selected);
     handleClear();
@@ -18866,7 +18890,12 @@ var SelectDialog = function SelectDialog(_ref) {
     disabled: !numSelected,
     onClick: handleSubmit
   }, submitText), React__default.createElement(material.Button, {
-    color: "secondary",
+    sx: {
+      background: theme.palette.grey[600],
+      "&:hover": {
+        background: theme.palette.grey[800]
+      }
+    },
     variant: "contained",
     onClick: onClose
   }, t('cancel'))));
@@ -18938,7 +18967,7 @@ var TeacherList = function TeacherList(_ref) {
       "aria-label": "search google maps"
     },
     onChange: handleChangeSearchText
-  }))), React__default.createElement(material.Grid, {
+  }))), !disabled && React__default.createElement(material.Grid, {
     item: true,
     xs: 6,
     className: "d-flex align-items-center"
@@ -18951,8 +18980,7 @@ var TeacherList = function TeacherList(_ref) {
     }),
     onClick: function onClick() {
       return onAdd === null || onAdd === void 0 ? void 0 : onAdd("Teacher");
-    },
-    disabled: disabled
+    }
   }, t("add_teachers"))), React__default.createElement(material.Grid, {
     item: true,
     xs: 12
@@ -19425,11 +19453,21 @@ var _excluded$9 = ["getStudents"],
   _excluded2 = ["getTeachers"],
   _excluded3 = ["getLessons"];
 var PAGE_TITLE$5 = "classes";
-var useClassDetail = function useClassDetail(history, id) {
+var useClassDetail = function useClassDetail(_ref) {
+  var history = _ref.history,
+    id = _ref.id,
+    role = _ref.role;
   var _useTranslation = reactI18next.useTranslation(),
     t = _useTranslation.t;
   var dispatch = reactRedux.useDispatch();
   var schema = ClassSchema(t);
+  var user = reactRedux.useSelector(function (state) {
+    var _state$common;
+    return state === null || state === void 0 ? void 0 : (_state$common = state.common) === null || _state$common === void 0 ? void 0 : _state$common.user;
+  });
+  var roles = (user === null || user === void 0 ? void 0 : user.roles) || [];
+  var isOneRoleExists = roles.length === 1;
+  var isAdmin = roles.includes(exports.Role.Admin) && role === exports.Role.Admin;
   var _useState = React.useState(),
     course = _useState[0],
     setCourse = _useState[1];
@@ -19849,6 +19887,7 @@ var useClassDetail = function useClassDetail(history, id) {
   return {
     id: id,
     schema: schema,
+    isAdmin: isAdmin,
     paging: paging,
     filter: filter,
     listUserSelected: selected,
@@ -19867,6 +19906,7 @@ var useClassDetail = function useClassDetail(history, id) {
     course: course,
     userList: openSelectDialog === "Student" ? students : teachers,
     teacherOptions: teacherOptions,
+    isOneRoleExists: isOneRoleExists,
     studentListProps: studentListProps,
     teacherListProps: teacherListProps,
     lessonListProps: lessonListProps,
@@ -20123,7 +20163,7 @@ var LessonList = function LessonList(_ref) {
     className: "d-flex mb-2"
   }, React__default.createElement(material.Typography, {
     variant: "h4"
-  }, t("lessons"))), React__default.createElement(material.Grid, {
+  }, t("lessons"))), !disabled && React__default.createElement(material.Grid, {
     item: true,
     xs: 6,
     className: "d-flex align-items-center"
@@ -20224,10 +20264,14 @@ var ClassDetail = function ClassDetail(_ref) {
     history = _ref.history,
     classListUrl = _ref.classListUrl,
     role = _ref.role;
-  var isAdmin = role === exports.Role.Admin;
-  var _useClassDetail = useClassDetail(history, id),
+  var _useClassDetail = useClassDetail({
+      history: history,
+      id: id,
+      role: role
+    }),
     schema = _useClassDetail.schema,
     paging = _useClassDetail.paging,
+    isAdmin = _useClassDetail.isAdmin,
     filter = _useClassDetail.filter,
     listUserSelected = _useClassDetail.listUserSelected,
     userList = _useClassDetail.userList,
@@ -20244,6 +20288,7 @@ var ClassDetail = function ClassDetail(_ref) {
     course = _useClassDetail.course,
     classRequest = _useClassDetail.classRequest,
     teacherOptions = _useClassDetail.teacherOptions,
+    isOneRoleExists = _useClassDetail.isOneRoleExists,
     studentListProps = _useClassDetail.studentListProps,
     teacherListProps = _useClassDetail.teacherListProps,
     lessonListProps = _useClassDetail.lessonListProps,
@@ -20331,7 +20376,7 @@ var ClassDetail = function ClassDetail(_ref) {
     value: selected,
     index: TabList$2[1].value
   }, !!id && !Number.isNaN(+id) && selected === TabList$2[1].value && React__default.createElement(StudentList, Object.assign({
-    disabled: !isAdmin,
+    isOneRoleExists: isOneRoleExists,
     onAdd: handleOpenSelectDialog
   }, studentListProps))), React__default.createElement(CustomTabPanel, {
     value: selected,
@@ -20586,7 +20631,7 @@ var UserDialog = function UserDialog(_ref) {
     open: open,
     onClose: onClose,
     size: "md",
-    title: t(data !== null && data !== void 0 && data.id ? "update_user" : "create_new_user")
+    title: !disabled ? t(data !== null && data !== void 0 && data.id ? "update_user" : "create_new_user") : t('view_user')
   }, React__default.createElement("form", {
     onSubmit: handleSubmit(onSubmit),
     style: {
@@ -20767,11 +20812,10 @@ var UserDialog = function UserDialog(_ref) {
     color: "secondary",
     className: "bg-secondary",
     onClick: onClose
-  }, t("cancel")), React__default.createElement(material.Button, {
+  }, t("cancel")), !disabled && React__default.createElement(material.Button, {
     variant: "contained",
     color: "primary",
-    type: "submit",
-    disabled: disabled
+    type: "submit"
   }, data !== null && data !== void 0 && data.id ? t("update") : t("create")))));
 };
 
@@ -21548,7 +21592,7 @@ var UserList = function UserList(_ref) {
       key: i.id
     }, React__default.createElement(TableCell, null, (paging.page - 1) * paging.limit + index + 1), React__default.createElement(TableCell, null, i.email), React__default.createElement(TableCell, null, i.fullName), React__default.createElement(TableCell, null, i.phoneNumber), React__default.createElement(TableCell, null, i.schoolName), React__default.createElement(TableCell, null, i.major), React__default.createElement(TableCell, null, i.grade), React__default.createElement(TableCell, null, utcToLocalTime(i.createdAt, t("date_time_format"))), React__default.createElement(TableCell, null, (_i$classes = i.classes) === null || _i$classes === void 0 ? void 0 : _i$classes.join(", ")), React__default.createElement(TableCell, null, !!i.roles && formatRole(i.roles, t)), React__default.createElement(TableCell, null, React__default.createElement("div", {
       className: "d-flex"
-    }, React__default.createElement(material.IconButton, {
+    }, isAdmin ? React__default.createElement(material.IconButton, {
       color: "default",
       className: styles$6["action-btn"] + " bg-warning text-white me-2",
       onClick: function onClick() {
@@ -21557,6 +21601,14 @@ var UserList = function UserList(_ref) {
     }, React__default.createElement(hi.HiOutlinePencilAlt, {
       className: styles$6["action-btn--pencil"],
       size: 16
+    })) : React__default.createElement(material.IconButton, {
+      color: "default",
+      className: "bg-primary text-white me-1",
+      onClick: function onClick() {
+        return handleOpenUserDialog(i);
+      }
+    }, React__default.createElement(fa.FaEye, {
+      size: 12
     })), isAdmin && React__default.createElement(material.IconButton, {
       onClick: function onClick() {
         return openDeleteDialog(i);
@@ -22553,6 +22605,34 @@ var NotificationList = function NotificationList(_ref) {
   })));
 };
 
+var ReleaseAlert = function ReleaseAlert() {
+  var _useTranslation = reactI18next.useTranslation(),
+    t = _useTranslation.t;
+  var releaseDate = RELEASE_DATE;
+  var isInValidDate = !releaseDate || releaseDate === DATE_MIN_VALUE || releaseDate === DATE_TIME_MIN_VALUE;
+  var isLoginPage = window.location.pathname === LOGIN_URL;
+  if (isInValidDate || !moment.utc(releaseDate).isValid()) return null;else {
+    var version = moment(releaseDate).format("HH.mm.YYYY.MM.DD");
+    return React__default.createElement(material.Box, {
+      sx: {
+        position: "fixed",
+        right: 10,
+        bottom: isLoginPage ? undefined : 5,
+        top: isLoginPage ? 10 : undefined,
+        userSelect: "none",
+        zIndex: 1
+      }
+    }, React__default.createElement(material.Typography, {
+      color: "success",
+      sx: {
+        fontSize: 10,
+        color: "#3DC674",
+        opacity: 0.8
+      }
+    }, t("version"), ": ", React__default.createElement("span", null, version)));
+  }
+};
+
 exports.moment = moment;
 Object.defineProperty(exports, 'I18nextProvider', {
     enumerable: true,
@@ -22625,6 +22705,7 @@ exports.PrintExamResultView = PrintExamResultView;
 exports.PrintExamView2 = PrintExamView2;
 exports.QuestionCountSelector = QuestionCountSelector;
 exports.RecentUserAction = RecentUserAction;
+exports.ReleaseAlert = ReleaseAlert;
 exports.SUPER_ADMIN_BASE_URL = SUPER_ADMIN_BASE_URL;
 exports.ScoreSelector = ScoreSelector;
 exports.SubjectSelector = SubjectSelector;