touchstudy-core 0.1.95 → 0.1.97

package/dist/index.modern.js

@@ -7394,8 +7394,10 @@ var useMessageList = function useMessageList(_ref) {
     var _state$common, _state$common$user;
     return (state === null || state === void 0 ? void 0 : (_state$common = state.common) === null || _state$common === void 0 ? void 0 : (_state$common$user = _state$common.user) === null || _state$common$user === void 0 ? void 0 : _state$common$user.roles) || [];
   });
-  var isTeacher = roles === null || roles === void 0 ? void 0 : roles.includes(Role.Teacher);
-  var isFirst = true;
+  var isAdmin = roles === null || roles === void 0 ? void 0 : roles.includes(Role.Admin);
+  var isTeacher = (roles === null || roles === void 0 ? void 0 : roles.includes(Role.Teacher)) && !isAdmin;
+  var isStudent = !isTeacher && !isAdmin;
+  var firstRef = useRef(true);
   var getMessageList = function getMessageList(conversationId) {
     try {
       var _temp3 = function _temp3() {
@@ -7415,14 +7417,14 @@ var useMessageList = function useMessageList(_ref) {
               });
             });
             var _temp = function () {
-              if (isFirst && isTeacher) {
+              if (firstRef.current && !isStudent) {
                 return Promise.resolve(createRecentUserActionListApi({
                   userId: (student === null || student === void 0 ? void 0 : student.id) || 0,
                   action: RecentUserAction$1.ViewedQNA,
                   data: "" + conversationId,
-                  isAdmin: !isTeacher
+                  isAdmin: false
                 })).then(function () {
-                  isFirst = false;
+                  firstRef.current = false;
                 });
               }
             }();
@@ -16445,7 +16447,6 @@ var singleLogo = function singleLogo(_ref) {
 };
 
 var Header = function Header(_ref) {
-  var _user$roles;
   var academyListRoute = _ref.academyListRoute,
     homeRoute = _ref.homeRoute,
     registerRoute = _ref.registerRoute,
@@ -16457,27 +16458,24 @@ var Header = function Header(_ref) {
     t = _useTranslation.t;
   var location = useLocation();
   var theme = useTheme();
-  var user = 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 param = window.location.pathname;
   var language = useSelector(function (state) {
-    var _state$common2;
-    return state === null || state === void 0 ? void 0 : (_state$common2 = state.common) === null || _state$common2 === void 0 ? void 0 : _state$common2.language;
+    var _state$common;
+    return state === null || state === void 0 ? void 0 : (_state$common = state.common) === null || _state$common === void 0 ? void 0 : _state$common.language;
   });
-  var isTeacher = user === null || user === void 0 ? void 0 : (_user$roles = user.roles) === null || _user$roles === void 0 ? void 0 : _user$roles.includes(Role.Teacher);
+  var isTeacherSide = param.includes('teacher');
   var isLargerThanXL = useMediaQuery(theme.breakpoints.up("xl"));
   var academyDomain = useSelector(function (state) {
-    var _state$common3, _state$common3$user;
-    return state === null || state === void 0 ? void 0 : (_state$common3 = state.common) === null || _state$common3 === void 0 ? void 0 : (_state$common3$user = _state$common3.user) === null || _state$common3$user === void 0 ? void 0 : _state$common3$user.academyDomain;
+    var _state$common2, _state$common2$user;
+    return state === null || state === void 0 ? void 0 : (_state$common2 = state.common) === null || _state$common2 === void 0 ? void 0 : (_state$common2$user = _state$common2.user) === null || _state$common2$user === void 0 ? void 0 : _state$common2$user.academyDomain;
   });
   var logo = useMemo(function () {
-    if (isTeacher) {
+    if (isTeacherSide) {
       return language === Language.en ? React__default.createElement(teacherFullLogoEn, null) : React__default.createElement(teacherFullLogoKo, null);
     } else {
       return language === Language.en ? React__default.createElement(studentFullLogoEn, null) : React__default.createElement(studentFullLogoKo, null);
     }
-  }, [isTeacher, language]);
+  }, [isTeacherSide, language]);
   var pathname = location.pathname.toLowerCase();
   return React__default.createElement(Stack, {
     width: "100%",
@@ -18662,7 +18660,7 @@ var StudentList = function StudentList(_ref) {
     selectedStudent = _ref.selectedStudent,
     t = _ref.t,
     textSearchRef = _ref.textSearchRef,
-    isOneRoleExists = _ref.isOneRoleExists,
+    disabled = _ref.disabled,
     handleOpenDeleteClassDialog = _ref.handleOpenDeleteClassDialog,
     handleCloseConfirmDialog = _ref.handleCloseConfirmDialog,
     handleSort = _ref.handleSort,
@@ -18722,7 +18720,7 @@ var StudentList = function StudentList(_ref) {
     },
     placeholder: t("search_for"),
     onChange: handleChangeSearchText
-  }))), isOneRoleExists && React__default.createElement(Grid, {
+  }))), !disabled && React__default.createElement(Grid, {
     item: true,
     xs: 6,
     className: "d-flex align-items-center"
@@ -18758,11 +18756,11 @@ var StudentList = function StudentList(_ref) {
       className: "d-flex"
     }, React__default.createElement(IconButton, {
       color: "default",
-      className: (!isOneRoleExists ? "bg-secondary" : "bg-danger") + " text-white",
+      className: (disabled ? "bg-secondary" : "bg-danger") + " text-white",
       onClick: function onClick() {
         return handleOpenDeleteClassDialog(i);
       },
-      disabled: !isOneRoleExists
+      disabled: disabled
     }, React__default.createElement(FaTrashCan, {
       size: 12
     })))));
@@ -19487,6 +19485,7 @@ var useClassDetail = function useClassDetail(_ref) {
   var roles = (user === null || user === void 0 ? void 0 : user.roles) || [];
   var isOneRoleExists = roles.length === 1;
   var isAdmin = roles.includes(Role.Admin) && role === Role.Admin;
+  var isTeacher = roles.includes(Role.Teacher) && !roles.includes(Role.Admin) && role === Role.Teacher;
   var _useState = useState(),
     course = _useState[0],
     setCourse = _useState[1];
@@ -19909,6 +19908,7 @@ var useClassDetail = function useClassDetail(_ref) {
     isAdmin: isAdmin,
     paging: paging,
     filter: filter,
+    isTeacher: isTeacher,
     listUserSelected: selected,
     isSelected: isSelected,
     textSearchRef: textSearchRef,
@@ -20291,6 +20291,7 @@ var ClassDetail = function ClassDetail(_ref) {
     schema = _useClassDetail.schema,
     paging = _useClassDetail.paging,
     isAdmin = _useClassDetail.isAdmin,
+    isTeacher = _useClassDetail.isTeacher,
     filter = _useClassDetail.filter,
     listUserSelected = _useClassDetail.listUserSelected,
     userList = _useClassDetail.userList,
@@ -20307,7 +20308,6 @@ 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,
@@ -20395,7 +20395,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({
-    isOneRoleExists: isOneRoleExists,
+    disabled: !isTeacher && !isAdmin,
     onAdd: handleOpenSelectDialog
   }, studentListProps))), React__default.createElement(CustomTabPanel, {
     value: selected,