touchstudy-core 0.1.96 → 0.1.98

package/dist/components/Buttons/ActionButtons.d.ts

@@ -11,6 +11,7 @@ export interface ActionButtonsProps {
     onBack: () => void;
     onSave: () => void;
     onAltSave?: () => void;
+    isReadonly: boolean;
 }
 declare const ActionButtons: FC<ActionButtonsProps>;
 export default ActionButtons;

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

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

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

@@ -33,6 +33,7 @@ declare const useClassDetail: ({ history, id, role }: {
     isAdmin: boolean;
     paging: PagingResponse;
     filter: import("../../../utils/types/searchQuery").BaseSearchQuery<UserSortColumn>;
+    isTeacher: boolean;
     listUserSelected: number[];
     isSelected: (id: number) => boolean;
     textSearchRef: import("react").RefObject<HTMLInputElement>;

package/dist/containers/Textbooks/components/TextbookShareDialog.d.ts

@@ -0,0 +1,26 @@
+import React, { FC } from "react";
+import { TeacherSimpleResponse } from "../configs/types";
+import { SearchQuery } from "../../../utils/types/searchQuery";
+import { PagingResponse } from "../../../utils/types/pagingResponse";
+interface Props {
+    open: boolean;
+    selectedShare: number[];
+    textSearchShareRef: React.RefObject<HTMLInputElement>;
+    handleChangeSearchTextShare: (e: React.ChangeEvent<HTMLInputElement>) => void;
+    numSelectedShare: number;
+    isCheckAllShare: (teachers: TeacherSimpleResponse[], userLength: number) => boolean;
+    handleSelectAllClickShare: (event: React.ChangeEvent<HTMLInputElement>) => void;
+    teachers: TeacherSimpleResponse[];
+    handleSortShare: (sortColumnName: string) => void;
+    filterShare: SearchQuery;
+    pagingShare: PagingResponse;
+    handleChangePageShare: (_: any, page: number) => void;
+    handleShareTextbook: (teacherIds: number[], textbookId: number) => Promise<void>;
+    isSelectedShare: (id: number) => boolean;
+    handleCloseShareDialog: () => void;
+    handleClickCheckboxShare: (id: number) => void;
+    selectedTeacher: TeacherSimpleResponse | undefined;
+    currentTextbookId: number;
+}
+export declare const ShareTextbookDialog: FC<Props>;
+export {};

package/dist/containers/Textbooks/configs/types.d.ts

@@ -16,6 +16,7 @@ export declare type TextbookHeaderTable = TableHeaderType;
 export declare type TextbookSearchQuery = SearchQuery & {};
 export declare type CreatedBy = {
     email: string;
+    id: number;
 };
 export declare type TextbookResponse = {
     id: number;

package/dist/containers/Textbooks/hooks/useTextbookShare.d.ts

@@ -1,7 +1,9 @@
 /// <reference types="react" />
 import { TeacherSimpleResponse, TextbookResponse } from "../configs/types";
+import { Role } from "../../../utils/constants";
 export interface TextbookShareProps {
     getData: (isLoading?: boolean) => Promise<void>;
+    role: Role;
 }
 declare const useTextbookShare: (props: TextbookShareProps) => {
     filterShare: import("../../../utils/types").SearchQuery;
@@ -26,7 +28,9 @@ declare const useTextbookShare: (props: TextbookShareProps) => {
     handleOpenUpdateShareDialog: (textbook: TextbookResponse) => void;
     isUpdate: boolean;
     handleUpdateSharedTextbook: (teacherIds: number[], textbookId: number) => Promise<void>;
-    handleDisableShare: (textbook: TextbookResponse) => boolean;
     currentModel: TextbookResponse | undefined;
+    handleDisable: (textbook: TextbookResponse) => boolean;
+    isAdmin: any;
+    isAdminSite: boolean;
 };
 export default useTextbookShare;

package/dist/index.js

@@ -7439,8 +7439,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(exports.Role.Teacher);
-  var isFirst = true;
+  var isAdmin = roles === null || roles === void 0 ? void 0 : roles.includes(exports.Role.Admin);
+  var isTeacher = (roles === null || roles === void 0 ? void 0 : roles.includes(exports.Role.Teacher)) && !isAdmin;
+  var isStudent = !isTeacher && !isAdmin;
+  var firstRef = React.useRef(true);
   var getMessageList = function getMessageList(conversationId) {
     try {
       var _temp3 = function _temp3() {
@@ -7460,14 +7462,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;
                 });
               }
             }();
@@ -9742,7 +9744,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(material.Stack, {
     direction: "row",
     spacing: 1,
@@ -9761,7 +9764,7 @@ var ActionButtons = function ActionButtons(_ref) {
       size: 16
     }),
     onClick: onSave,
-    disabled: saveDisabled
+    disabled: saveDisabled || isReadonly
   }, saveText), !!altSaveText && onAltSave && React__default.createElement(material.Button, {
     variant: "contained",
     color: "primary",
@@ -9789,6 +9792,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
   });
@@ -10704,7 +10708,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(material.Grid, {
     item: true,
     xs: 12,
@@ -10715,7 +10719,7 @@ var TextbookViewDetail = function TextbookViewDetail(props) {
     onClick: function onClick() {
       return handleOpenCreateExamDialog();
     },
-    disabled: isReadonly || !articlesSelected.length,
+    disabled: !articlesSelected.length,
     startIcon: React__default.createElement(fa.FaPlus, {
       size: 12
     })
@@ -11296,7 +11300,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),
@@ -11336,6 +11342,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(exports.Role.Admin);
+  var isAdminSite = role === exports.Role.Admin;
   React.useEffect(function () {
     if (!isUpdate) {
       filterTeacherNotShared(currentModel);
@@ -11422,12 +11430,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 {
@@ -11504,18 +11508,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 = reactI18next.useTranslation(),
     t = _useTranslation.t;
-  var isAdmin = reactRedux.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(exports.Role.Admin);
-  });
   var _useTextbookList = useTextbookList(props),
     filter = _useTextbookList.filter,
     textbooks = _useTextbookList.textbooks,
@@ -11558,8 +11560,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(material.Grid, {
@@ -11581,15 +11585,14 @@ var TextbookList = function TextbookList(props) {
       justifyContent: "flex-end"
     },
     spacing: 2
-  }, React__default.createElement(material.Button, {
+  }, (!isAdmin || isAdminSite) && React__default.createElement(material.Button, {
     startIcon: React__default.createElement(fa.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(material.Grid, {
     item: true,
     xs: 12,
@@ -11611,11 +11614,11 @@ var TextbookList = function TextbookList(props) {
       alignItems: "center"
     }, React__default.createElement(material.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(fa6.FaPencil, {
       size: 12
     })), React__default.createElement(material.IconButton, {
@@ -11627,16 +11630,16 @@ var TextbookList = function TextbookList(props) {
     }, React__default.createElement(fa.FaEye, {
       size: 12
     })), React__default.createElement(material.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(fa.FaShare, {
       size: 12
     })), React__default.createElement(material.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);
       }
@@ -11644,11 +11647,11 @@ var TextbookList = function TextbookList(props) {
       size: 12
     })), React__default.createElement(material.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(fa.FaTrash, {
       size: 12
     })))));
@@ -16946,7 +16949,6 @@ var singleLogo = function singleLogo(_ref) {
 };
 
 var Header = function Header(_ref) {
-  var _user$roles;
   var academyListRoute = _ref.academyListRoute,
     homeRoute = _ref.homeRoute,
     registerRoute = _ref.registerRoute,
@@ -16958,27 +16960,24 @@ var Header = function Header(_ref) {
     t = _useTranslation.t;
   var location = reactRouterDom.useLocation();
   var theme = material.useTheme();
-  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 param = window.location.pathname;
   var language = reactRedux.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(exports.Role.Teacher);
+  var isTeacherSide = param.includes('teacher');
   var isLargerThanXL = material.useMediaQuery(theme.breakpoints.up("xl"));
   var academyDomain = reactRedux.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 = React.useMemo(function () {
-    if (isTeacher) {
+    if (isTeacherSide) {
       return language === exports.Language.en ? React__default.createElement(teacherFullLogoEn, null) : React__default.createElement(teacherFullLogoKo, null);
     } else {
       return language === exports.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(material.Stack, {
     width: "100%",
@@ -19163,7 +19162,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,
@@ -19223,7 +19222,7 @@ var StudentList = function StudentList(_ref) {
     },
     placeholder: t("search_for"),
     onChange: handleChangeSearchText
-  }))), isOneRoleExists && React__default.createElement(material.Grid, {
+  }))), !disabled && React__default.createElement(material.Grid, {
     item: true,
     xs: 6,
     className: "d-flex align-items-center"
@@ -19259,11 +19258,11 @@ var StudentList = function StudentList(_ref) {
       className: "d-flex"
     }, React__default.createElement(material.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(fa6.FaTrashCan, {
       size: 12
     })))));
@@ -19988,6 +19987,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(exports.Role.Admin) && role === exports.Role.Admin;
+  var isTeacher = roles.includes(exports.Role.Teacher) && !roles.includes(exports.Role.Admin) && role === exports.Role.Teacher;
   var _useState = React.useState(),
     course = _useState[0],
     setCourse = _useState[1];
@@ -20410,6 +20410,7 @@ var useClassDetail = function useClassDetail(_ref) {
     isAdmin: isAdmin,
     paging: paging,
     filter: filter,
+    isTeacher: isTeacher,
     listUserSelected: selected,
     isSelected: isSelected,
     textSearchRef: textSearchRef,
@@ -20792,6 +20793,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,
@@ -20808,7 +20810,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,
@@ -20896,7 +20897,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,