touchstudy-core 0.1.96 → 0.1.98

package/dist/index.modern.js

@@ -7441,8 +7441,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() {
@@ -7462,14 +7464,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;
                 });
               }
             }();
@@ -9744,7 +9746,8 @@ var ActionButtons = function ActionButtons(_ref) {
     hideSave = _ref$hideSave === void 0 ? false : _ref$hideSave,
     onBack = _ref.onBack,
     onSave = _ref.onSave,
-    onAltSave = _ref.onAltSave;
+    onAltSave = _ref.onAltSave,
+    isReadonly = _ref.isReadonly;
   return React__default.createElement(Stack, {
     direction: "row",
     spacing: 1,
@@ -9763,7 +9766,7 @@ var ActionButtons = function ActionButtons(_ref) {
       size: 16
     }),
     onClick: onSave,
-    disabled: saveDisabled
+    disabled: saveDisabled || isReadonly
   }, saveText), !!altSaveText && onAltSave && React__default.createElement(Button, {
     variant: "contained",
     color: "primary",
@@ -9791,6 +9794,7 @@ var TextbookActionButtons = function TextbookActionButtons(_ref) {
       size: 14
     }) : undefined,
     saveText: t(!(textbook !== null && textbook !== void 0 && textbook.id) ? "create_and_continue" : isReadonly ? "update" : "update_textbook_title"),
+    isReadonly: isReadonly,
     hideSave: hideSave,
     onSave: onSave
   });
@@ -10706,7 +10710,7 @@ var TextbookViewDetail = function TextbookViewDetail(props) {
     textbook: textbook,
     onBack: handleGoToTextbookList,
     onSave: handleCreateOrUpdateTextbook,
-    hideSave: !isEditedTitle && !!id && !isReadonly || textbook.isCreatedByAdmin
+    hideSave: !isEditedTitle && !!id && !isReadonly || textbook.isCreatedByAdmin || !!id && isReadonly
   }))), React__default.createElement(Grid, {
     item: true,
     xs: 12,
@@ -10717,7 +10721,7 @@ var TextbookViewDetail = function TextbookViewDetail(props) {
     onClick: function onClick() {
       return handleOpenCreateExamDialog();
     },
-    disabled: isReadonly || !articlesSelected.length,
+    disabled: !articlesSelected.length,
     startIcon: React__default.createElement(FaPlus, {
       size: 12
     })
@@ -11298,7 +11302,9 @@ var getTeacherListApi = function getTeacherListApi(query) {
 };
 
 var useTextbookShare = function useTextbookShare(props) {
-  var getData = props.getData;
+  var _infoUser$roles;
+  var getData = props.getData,
+    role = props.role;
   var _useList = useList(function (search) {
       return getTeacherListApi(search);
     }, DefaultTeacherQuery),
@@ -11338,6 +11344,8 @@ var useTextbookShare = function useTextbookShare(props) {
     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 isAdmin = infoUser === null || infoUser === void 0 ? void 0 : (_infoUser$roles = infoUser.roles) === null || _infoUser$roles === void 0 ? void 0 : _infoUser$roles.includes(Role.Admin);
+  var isAdminSite = role === Role.Admin;
   useEffect(function () {
     if (!isUpdate) {
       filterTeacherNotShared(currentModel);
@@ -11424,12 +11432,8 @@ var useTextbookShare = function useTextbookShare(props) {
     });
     setShared(existsTeachers);
   };
-  var handleDisableShare = function handleDisableShare(textbook) {
-    return !textbook.isShared || textbook.sharedUsers.map(function (item) {
-      return item.trim();
-    }).filter(function (item) {
-      return item !== "";
-    }).includes(infoUser.email || "");
+  var handleDisable = function handleDisable(textbook) {
+    return isAdmin && !isAdminSite || !isAdmin && (!textbook.isShared || textbook.createdBy.id != infoUser.id);
   };
   var handleShareTextbook = function handleShareTextbook(teacherIds, textbookId) {
     try {
@@ -11506,18 +11510,16 @@ var useTextbookShare = function useTextbookShare(props) {
     handleOpenUpdateShareDialog: handleOpenUpdateShareDialog,
     isUpdate: isUpdate,
     handleUpdateSharedTextbook: handleUpdateSharedTextbook,
-    handleDisableShare: handleDisableShare,
-    currentModel: currentModel
+    currentModel: currentModel,
+    handleDisable: handleDisable,
+    isAdmin: isAdmin,
+    isAdminSite: isAdminSite
   };
 };
 
 var TextbookList = function TextbookList(props) {
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
-  var isAdmin = useSelector(function (state) {
-    var _state$common, _state$common$user, _state$common$user$ro;
-    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$ro = _state$common$user.roles) === null || _state$common$user$ro === void 0 ? void 0 : _state$common$user$ro.includes(Role.Admin);
-  });
   var _useTextbookList = useTextbookList(props),
     filter = _useTextbookList.filter,
     textbooks = _useTextbookList.textbooks,
@@ -11560,8 +11562,10 @@ var TextbookList = function TextbookList(props) {
     handleOpenUpdateShareDialog = _useTextbookShare.handleOpenUpdateShareDialog,
     isUpdate = _useTextbookShare.isUpdate,
     handleUpdateSharedTextbook = _useTextbookShare.handleUpdateSharedTextbook,
-    handleDisableShare = _useTextbookShare.handleDisableShare,
-    currentModel = _useTextbookShare.currentModel;
+    currentModel = _useTextbookShare.currentModel,
+    handleDisable = _useTextbookShare.handleDisable,
+    isAdmin = _useTextbookShare.isAdmin,
+    isAdminSite = _useTextbookShare.isAdminSite;
   return React__default.createElement(LayoutList, {
     title: t(TEXTBOOK_PAGE_TITLE)
   }, React__default.createElement(Grid, {
@@ -11583,15 +11587,14 @@ var TextbookList = function TextbookList(props) {
       justifyContent: "flex-end"
     },
     spacing: 2
-  }, React__default.createElement(Button, {
+  }, (!isAdmin || isAdminSite) && React__default.createElement(Button, {
     startIcon: React__default.createElement(FaPlus, {
       size: 12
     }),
     variant: "contained",
     color: "primary",
     onClick: handleCreateTextbook,
-    disabled: isAdmin,
-    className: (!isAdmin ? "bg-success" : "bg-secondary") + " text-white"
+    className: (isAdmin && !isAdminSite ? "bg-secondary" : "bg-success") + " text-white"
   }, t("create_textbook")))), React__default.createElement(Grid, {
     item: true,
     xs: 12,
@@ -11613,11 +11616,11 @@ var TextbookList = function TextbookList(props) {
       alignItems: "center"
     }, React__default.createElement(IconButton, {
       color: "default",
-      className: (i.isCreatedByAdmin ? "bg-secondary" : "bg-warning") + " text-white",
+      className: (handleDisable(i) ? "bg-secondary" : "bg-warning") + " text-white",
       onClick: function onClick() {
         return handleUpdateTextbook(i.id);
       },
-      disabled: !!i.isCreatedByAdmin
+      disabled: handleDisable(i)
     }, React__default.createElement(FaPencil, {
       size: 12
     })), React__default.createElement(IconButton, {
@@ -11629,16 +11632,16 @@ var TextbookList = function TextbookList(props) {
     }, React__default.createElement(FaEye, {
       size: 12
     })), React__default.createElement(IconButton, {
-      disabled: handleDisableShare(i) || isAdmin,
-      className: (handleDisableShare(i) || isAdmin ? "bg-secondary" : "bg-info") + " text-white me-1",
+      disabled: handleDisable(i) || isAdmin,
+      className: (handleDisable(i) || isAdmin ? "bg-secondary" : "bg-info") + " text-white me-1",
       onClick: function onClick() {
         return handleOpenShareDialog(i);
       }
     }, React__default.createElement(FaShare, {
       size: 12
     })), React__default.createElement(IconButton, {
-      disabled: handleDisableShare(i) || isAdmin,
-      className: (handleDisableShare(i) || isAdmin ? "bg-secondary" : "bg-success") + " text-white me-1",
+      disabled: handleDisable(i) || isAdmin,
+      className: (handleDisable(i) || isAdmin ? "bg-secondary" : "bg-success") + " text-white me-1",
       onClick: function onClick() {
         return handleOpenUpdateShareDialog(i);
       }
@@ -11646,11 +11649,11 @@ var TextbookList = function TextbookList(props) {
       size: 12
     })), React__default.createElement(IconButton, {
       color: "default",
-      className: (i.isCreatedByAdmin ? "bg-secondary" : "bg-danger") + " text-white mr-1",
+      className: (handleDisable(i) ? "bg-secondary" : "bg-danger") + " text-white mr-1",
       onClick: function onClick() {
         return handleSelectDeleteTextbook(i);
       },
-      disabled: !!i.isCreatedByAdmin
+      disabled: handleDisable(i)
     }, React__default.createElement(FaTrash, {
       size: 12
     })))));
@@ -16948,7 +16951,6 @@ var singleLogo = function singleLogo(_ref) {
 };
 
 var Header = function Header(_ref) {
-  var _user$roles;
   var academyListRoute = _ref.academyListRoute,
     homeRoute = _ref.homeRoute,
     registerRoute = _ref.registerRoute,
@@ -16960,27 +16962,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%",
@@ -19165,7 +19164,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,
@@ -19225,7 +19224,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"
@@ -19261,11 +19260,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
     })))));
@@ -19990,6 +19989,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];
@@ -20412,6 +20412,7 @@ var useClassDetail = function useClassDetail(_ref) {
     isAdmin: isAdmin,
     paging: paging,
     filter: filter,
+    isTeacher: isTeacher,
     listUserSelected: selected,
     isSelected: isSelected,
     textSearchRef: textSearchRef,
@@ -20794,6 +20795,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,
@@ -20810,7 +20812,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,
@@ -20898,7 +20899,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,