touchstudy-core 0.1.21 → 0.1.23

package/dist/index.modern.js

@@ -9,7 +9,7 @@ import { useDispatch, useSelector } from 'react-redux';
 import axios from 'axios';
 import { useTranslation, initReactI18next } from 'react-i18next';
 export { I18nextProvider, useTranslation } from 'react-i18next';
-import { Grid, Dialog, DialogTitle, IconButton, DialogContent, TextField, DialogActions, Button, Box, Typography, Pagination, CircularProgress, FormControl, RadioGroup, FormControlLabel, Radio, FormGroup, FormLabel, Table } from '@mui/material';
+import { Grid, Dialog, DialogTitle, IconButton, DialogContent, TextField, DialogActions, Button, Box, Typography, Pagination, Stack, CircularProgress, FormControl, RadioGroup, FormControlLabel, Radio, FormGroup, FormLabel, Table } from '@mui/material';
 import { gapi } from 'gapi-script';
 import { IoClose, IoCloseOutline } from 'react-icons/io5';
 import i18n from 'i18next';
@@ -139,6 +139,7 @@ var Role;
   Role["Student"] = "Student";
   Role["Teacher"] = "Teacher";
   Role["Admin"] = "Admin";
+  Role["AcademyAdmin"] = "AcademyAdmin";
 })(Role || (Role = {}));
 
 // A type of promise-like that resolves synchronously and supports only one observer
@@ -1042,6 +1043,7 @@ var CommonDialog = function CommonDialog(_ref) {
     _ref$isShowHeader = _ref.isShowHeader,
     isShowHeader = _ref$isShowHeader === void 0 ? true : _ref$isShowHeader,
     titleClassName = _ref.titleClassName,
+    minWidth = _ref.minWidth,
     onClose = _ref.onClose;
   return React.createElement(Dialog, {
     open: open,
@@ -1054,7 +1056,8 @@ var CommonDialog = function CommonDialog(_ref) {
     },
     PaperProps: {
       sx: {
-        overflowY: "unset"
+        overflowY: "unset",
+        minWidth: minWidth
       }
     }
   }, isShowHeader ? React.createElement(Fragment$1, null, React.createElement(DialogTitle, {
@@ -1456,6 +1459,17 @@ var parent_phone_number = "학부모 전화번호";
 var update_textbook_title = "교과서 제목 업데이트";
 var invalid_weekly_day_time = "주간 요일 시간이 잘못되었습니다";
 var no_image = "이미지 없음";
+var school_name = "학교 이름";
+var phone_number = "전화번호";
+var major = "주요한";
+var roles = "역할";
+var searching_for = "검색 중...";
+var parent_name = "부모님 성함";
+var users = "사용자";
+var new_user = "새로운 사용자";
+var academy_admin = "아카데미 관리자";
+var switch_academy_admin = "스위치 아카데미 관리자";
+var there_are_no_lessons_this_week = "이번주는 수업이 없습니다";
 var lang_ko = {
 	problem_solving: problem_solving,
 	my_story: my_story,
@@ -1698,7 +1712,18 @@ var lang_ko = {
 	parent_phone_number: parent_phone_number,
 	update_textbook_title: update_textbook_title,
 	invalid_weekly_day_time: invalid_weekly_day_time,
-	no_image: no_image
+	no_image: no_image,
+	school_name: school_name,
+	phone_number: phone_number,
+	major: major,
+	roles: roles,
+	searching_for: searching_for,
+	parent_name: parent_name,
+	users: users,
+	new_user: new_user,
+	academy_admin: academy_admin,
+	switch_academy_admin: switch_academy_admin,
+	there_are_no_lessons_this_week: there_are_no_lessons_this_week
 };
 
 var problem_solving$1 = "Problem Solving";
@@ -1968,7 +1993,7 @@ var add_new_chapter_to_textbook$1 = "Add new chapter to the textbook";
 var add_new_subchapter_to_parent_chapter$1 = "Add new subchapter to the parent chapter ({{ chapterName }})";
 var add$1 = "Add";
 var add_new_article_to_chapter$1 = "Add new article to the chapter ({{ chapterName }})";
-var score_format$1 = "{{score}}points";
+var score_format$1 = "{{score}}pts";
 var round$1 = "{{number}} round";
 var number_grade$1 = "Grade {{number}}";
 var print$1 = "Print";
@@ -1979,6 +2004,17 @@ var parent_phone_number$1 = "Parent Phone Number";
 var update_textbook_title$1 = "Update textbook title";
 var invalid_weekly_day_time$1 = "Invalid weekly day time";
 var no_image$1 = "No image";
+var school_name$1 = "School name";
+var phone_number$1 = "Phone Number";
+var major$1 = "Major";
+var roles$1 = "Roles";
+var searching_for$1 = "Searching for...";
+var parent_name$1 = "Parent name";
+var users$1 = "Users";
+var new_user$1 = "New user";
+var academy_admin$1 = "Academy Admin";
+var switch_academy_admin$1 = "Switch Academy Admin";
+var there_are_no_lessons_this_week$1 = "There are no lessons this week";
 var lang_en = {
 	problem_solving: problem_solving$1,
 	my_story: my_story$1,
@@ -2255,7 +2291,18 @@ var lang_en = {
 	parent_phone_number: parent_phone_number$1,
 	update_textbook_title: update_textbook_title$1,
 	invalid_weekly_day_time: invalid_weekly_day_time$1,
-	no_image: no_image$1
+	no_image: no_image$1,
+	school_name: school_name$1,
+	phone_number: phone_number$1,
+	major: major$1,
+	roles: roles$1,
+	searching_for: searching_for$1,
+	parent_name: parent_name$1,
+	users: users$1,
+	new_user: new_user$1,
+	academy_admin: academy_admin$1,
+	switch_academy_admin: switch_academy_admin$1,
+	there_are_no_lessons_this_week: there_are_no_lessons_this_week$1
 };
 
 i18n.use(initReactI18next).init({
@@ -2440,6 +2487,8 @@ var useSwitchAcademy = function useSwitchAcademy(role, navigate, homeAcademyUrl,
     var _state$common2;
     return state === null || state === void 0 ? void 0 : (_state$common2 = state.common) === null || _state$common2 === void 0 ? void 0 : _state$common2.isReFetchUserAcademies;
   });
+  var _useTranslation = useTranslation(),
+    t = _useTranslation.t;
   var getAcademies = function getAcademies(isLoading) {
     if (isLoading === void 0) {
       isLoading = true;
@@ -2500,7 +2549,7 @@ var useSwitchAcademy = function useSwitchAcademy(role, navigate, homeAcademyUrl,
         });
       }, function (error) {
         var _error$response2, _error$response2$data;
-        toast.error((error === null || error === void 0 ? void 0 : (_error$response2 = error.response) === null || _error$response2 === void 0 ? void 0 : (_error$response2$data = _error$response2.data) === null || _error$response2$data === void 0 ? void 0 : _error$response2$data.title) || "Switch academy failed");
+        toast.error((error === null || error === void 0 ? void 0 : (_error$response2 = error.response) === null || _error$response2 === void 0 ? void 0 : (_error$response2$data = _error$response2.data) === null || _error$response2$data === void 0 ? void 0 : _error$response2$data.title) || t("switch_academy_admin"));
       });
       return Promise.resolve(_temp4 && _temp4.then ? _temp4.then(_temp5) : _temp5(_temp4));
     } catch (e) {
@@ -2544,6 +2593,8 @@ var TheAcademyDropdown = function TheAcademyDropdown(_ref) {
   });
   var isAdmin = role === Role.Admin;
   var isSuperAdmin = user && !user.academyDomain && ((_user$roles = user.roles) === null || _user$roles === void 0 ? void 0 : _user$roles.includes(Role.Admin));
+  var _useTranslation = useTranslation(),
+    t = _useTranslation.t;
   var _useState = useState(null),
     open = _useState[0],
     setOpen = _useState[1];
@@ -2580,7 +2631,7 @@ var TheAcademyDropdown = function TheAcademyDropdown(_ref) {
       color: "#5458D5",
       minWidth: 150
     }
-  }, (selectedAcademy === null || selectedAcademy === void 0 ? void 0 : selectedAcademy.name) || "Switch Academy Admin"), React.createElement("div", {
+  }, (selectedAcademy === null || selectedAcademy === void 0 ? void 0 : selectedAcademy.name) || t("switch_academy_admin")), React.createElement("div", {
     className: "" + stylesGlobal["switch-icon"]
   }, React.createElement(GoArrowSwitch, {
     size: 14
@@ -2763,7 +2814,8 @@ var ChatRightItem = function ChatRightItem(_ref) {
     showTimestamp = _ref.showTimestamp,
     isStudent = _ref.isStudent,
     showName = _ref.showName,
-    contentType = _ref.contentType;
+    contentType = _ref.contentType,
+    toggleImageDialog = _ref.toggleImageDialog;
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
   return React.createElement("div", null, showTimestamp && React.createElement(Typography, {
@@ -2791,6 +2843,7 @@ var ChatRightItem = function ChatRightItem(_ref) {
     lineHeight: "16.71px",
     color: "#5458D5"
   }, sender === null || sender === void 0 ? void 0 : sender.fullName)), contentType ? React.createElement("img", {
+    onClick: toggleImageDialog,
     src: content,
     style: {
       backgroundRepeat: "no-repeat",
@@ -2820,7 +2873,8 @@ var ChatLeftItem = function ChatLeftItem(_ref) {
     showTimestamp = _ref.showTimestamp,
     isStudent = _ref.isStudent,
     showName = _ref.showName,
-    contentType = _ref.contentType;
+    contentType = _ref.contentType,
+    toggleImageDialog = _ref.toggleImageDialog;
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
   return React.createElement("div", null, showTimestamp && React.createElement(Typography, {
@@ -2862,6 +2916,7 @@ var ChatLeftItem = function ChatLeftItem(_ref) {
   }, t("student")))), React.createElement(Box, {
     padding: "4px 0px"
   }), contentType ? React.createElement("img", {
+    onClick: toggleImageDialog,
     src: content,
     style: {
       backgroundRepeat: "no-repeat",
@@ -2881,6 +2936,115 @@ var ChatLeftItem = function ChatLeftItem(_ref) {
   }, content))));
 };
 
+var ImageDetailDialog = function ImageDetailDialog(_ref) {
+  var open = _ref.open,
+    toggleDialog = _ref.toggleDialog,
+    content = _ref.content,
+    downloadFile = _ref.downloadFile;
+  var _useTranslation = useTranslation(),
+    t = _useTranslation.t;
+  return React.createElement(CommonDialog, {
+    open: open,
+    onClose: toggleDialog,
+    size: "sm",
+    title: t("image")
+  }, React.createElement(DialogContent, {
+    sx: {
+      overflowY: "unset"
+    }
+  }, React.createElement(Stack, null, React.createElement(Stack, {
+    display: "flex",
+    justifyContent: "center",
+    alignItems: "center"
+  }, React.createElement("img", {
+    src: content,
+    style: {
+      width: "500px",
+      height: "500px",
+      position: "relative",
+      objectFit: "cover"
+    }
+  })), React.createElement(Button, {
+    sx: {
+      margin: "10px 0"
+    },
+    variant: "outlined",
+    fullWidth: true,
+    onClick: function onClick() {
+      return downloadFile(content);
+    }
+  }, t("download")))));
+};
+
+var CONVERSATION_URL = BASE_URL + "/api/conversation";
+var apiAddMessage = function apiAddMessage(conversationId, message) {
+  return api.post(CONVERSATION_URL + "/" + conversationId + "/messages", message);
+};
+var getMessagesByConversation = function getMessagesByConversation(conversationId, filter) {
+  return api.get(CONVERSATION_URL + "/" + conversationId + "/messages", {
+    params: filter
+  });
+};
+var updateLastTimeReadConversation = function updateLastTimeReadConversation(conversationId) {
+  return api.put(CONVERSATION_URL + "/" + conversationId);
+};
+var completeConversation = function completeConversation(conversationId) {
+  return api.post(CONVERSATION_URL + "/" + conversationId + "/finish");
+};
+var apiUploadImageFile = function apiUploadImageFile(file) {
+  return apiUpload.post(BASE_URL + "/api/file/images", file);
+};
+
+var FileSaver_min = createCommonjsModule(function (module, exports) {
+(function(a,b){b();})(commonjsGlobal,function(){function b(a,b){return "undefined"==typeof b?b={autoBom:!1}:"object"!=typeof b&&(console.warn("Deprecated: Expected third argument to be a object"),b={autoBom:!b}),b.autoBom&&/^\s*(?:text\/\S*|application\/xml|\S*\/\S*\+xml)\s*;.*charset\s*=\s*utf-8/i.test(a.type)?new Blob(["\uFEFF",a],{type:a.type}):a}function c(a,b,c){var d=new XMLHttpRequest;d.open("GET",a),d.responseType="blob",d.onload=function(){g(d.response,b,c);},d.onerror=function(){console.error("could not download file");},d.send();}function d(a){var b=new XMLHttpRequest;b.open("HEAD",a,!1);try{b.send();}catch(a){}return 200<=b.status&&299>=b.status}function e(a){try{a.dispatchEvent(new MouseEvent("click"));}catch(c){var b=document.createEvent("MouseEvents");b.initMouseEvent("click",!0,!0,window,0,0,0,80,20,!1,!1,!1,!1,0,null),a.dispatchEvent(b);}}var f="object"==typeof window&&window.window===window?window:"object"==typeof self&&self.self===self?self:"object"==typeof commonjsGlobal&&commonjsGlobal.global===commonjsGlobal?commonjsGlobal:void 0,a=f.navigator&&/Macintosh/.test(navigator.userAgent)&&/AppleWebKit/.test(navigator.userAgent)&&!/Safari/.test(navigator.userAgent),g=f.saveAs||("object"!=typeof window||window!==f?function(){}:"download"in HTMLAnchorElement.prototype&&!a?function(b,g,h){var i=f.URL||f.webkitURL,j=document.createElement("a");g=g||b.name||"download",j.download=g,j.rel="noopener","string"==typeof b?(j.href=b,j.origin===location.origin?e(j):d(j.href)?c(b,g,h):e(j,j.target="_blank")):(j.href=i.createObjectURL(b),setTimeout(function(){i.revokeObjectURL(j.href);},4E4),setTimeout(function(){e(j);},0));}:"msSaveOrOpenBlob"in navigator?function(f,g,h){if(g=g||f.name||"download","string"!=typeof f)navigator.msSaveOrOpenBlob(b(f,h),g);else if(d(f))c(f,g,h);else {var i=document.createElement("a");i.href=f,i.target="_blank",setTimeout(function(){e(i);});}}:function(b,d,e,g){if(g=g||open("","_blank"),g&&(g.document.title=g.document.body.innerText="downloading..."),"string"==typeof b)return c(b,d,e);var h="application/octet-stream"===b.type,i=/constructor/i.test(f.HTMLElement)||f.safari,j=/CriOS\/[\d]+/.test(navigator.userAgent);if((j||h&&i||a)&&"undefined"!=typeof FileReader){var k=new FileReader;k.onloadend=function(){var a=k.result;a=j?a:a.replace(/^data:[^;]*;/,"data:attachment/file;"),g?g.location.href=a:location=a,g=null;},k.readAsDataURL(b);}else {var l=f.URL||f.webkitURL,m=l.createObjectURL(b);g?g.location=m:location.href=m,g=null,setTimeout(function(){l.revokeObjectURL(m);},4E4);}});f.saveAs=g.saveAs=g,(module.exports=g);});
+
+//# sourceMappingURL=FileSaver.min.js.map
+});
+
+var useDialog = function useDialog() {
+  var _useState = useState(false),
+    openConfirmDialog = _useState[0],
+    setOpenConfirmDialog = _useState[1];
+  var toggleConfirmDialog = function toggleConfirmDialog() {
+    setOpenConfirmDialog(function (state) {
+      return !state;
+    });
+  };
+  var handleConfirm = function handleConfirm(conversationId) {
+    try {
+      var _temp2 = function _temp2() {
+        setLoading(false);
+      };
+      setLoading(true);
+      var _temp = _catch(function () {
+        return Promise.resolve(completeConversation(conversationId)).then(function () {
+          toggleConfirmDialog();
+          toast.success("Complete conversation success");
+        });
+      }, function () {
+        toast.error("Failed to complete conversation");
+      });
+      return Promise.resolve(_temp && _temp.then ? _temp.then(_temp2) : _temp2(_temp));
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  };
+  var downloadFile = function downloadFile(content) {
+    try {
+      FileSaver_min.saveAs(content, "image.png");
+      return Promise.resolve();
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  };
+  return {
+    openConfirmDialog: openConfirmDialog,
+    toggleConfirmDialog: toggleConfirmDialog,
+    handleConfirm: handleConfirm,
+    downloadFile: downloadFile
+  };
+};
+
 var ChatItemType;
 (function (ChatItemType) {
   ChatItemType[ChatItemType["Default"] = 0] = "Default";
@@ -2889,7 +3053,20 @@ var ChatItemType;
 })(ChatItemType || (ChatItemType = {}));
 var ChatItem = function ChatItem(props) {
   var isMe = props.isMe;
-  return React.createElement(Fragment$1, null, isMe ? React.createElement(ChatRightItem, Object.assign({}, props)) : React.createElement(ChatLeftItem, Object.assign({}, props)));
+  var _useDialog = useDialog(),
+    openConfirmDialog = _useDialog.openConfirmDialog,
+    toggleConfirmDialog = _useDialog.toggleConfirmDialog,
+    downloadFile = _useDialog.downloadFile;
+  return React.createElement(Fragment$1, null, isMe ? React.createElement(ChatRightItem, Object.assign({}, props, {
+    toggleImageDialog: toggleConfirmDialog
+  })) : React.createElement(ChatLeftItem, Object.assign({}, props, {
+    toggleImageDialog: toggleConfirmDialog
+  })), React.createElement(ImageDetailDialog, {
+    open: openConfirmDialog,
+    toggleDialog: toggleConfirmDialog,
+    content: props.content || "",
+    downloadFile: downloadFile
+  }));
 };
 
 var MessageSortBy;
@@ -3155,57 +3332,6 @@ var iconChecked = function iconChecked(_ref) {
   }));
 };
 
-var CONVERSATION_URL = BASE_URL + "/api/conversation";
-var apiAddMessage = function apiAddMessage(conversationId, message) {
-  return api.post(CONVERSATION_URL + "/" + conversationId + "/messages", message);
-};
-var getMessagesByConversation = function getMessagesByConversation(conversationId, filter) {
-  return api.get(CONVERSATION_URL + "/" + conversationId + "/messages", {
-    params: filter
-  });
-};
-var completeConversation = function completeConversation(conversationId) {
-  return api.post(CONVERSATION_URL + "/" + conversationId + "/finish");
-};
-var apiUploadImageFile = function apiUploadImageFile(file) {
-  return apiUpload.post(BASE_URL + "/api/file/images", file);
-};
-
-var useDialog = function useDialog() {
-  var _useState = useState(false),
-    openConfirmDialog = _useState[0],
-    setOpenConfirmDialog = _useState[1];
-  var toggleConfirmDialog = function toggleConfirmDialog() {
-    setOpenConfirmDialog(function (state) {
-      return !state;
-    });
-  };
-  var handleConfirm = function handleConfirm(conversationId) {
-    try {
-      var _temp2 = function _temp2() {
-        setLoading(false);
-      };
-      setLoading(true);
-      var _temp = _catch(function () {
-        return Promise.resolve(completeConversation(conversationId)).then(function () {
-          toggleConfirmDialog();
-          toast.success("Complete conversation success");
-        });
-      }, function () {
-        toast.error("Failed to complete conversation");
-      });
-      return Promise.resolve(_temp && _temp.then ? _temp.then(_temp2) : _temp2(_temp));
-    } catch (e) {
-      return Promise.reject(e);
-    }
-  };
-  return {
-    openConfirmDialog: openConfirmDialog,
-    toggleConfirmDialog: toggleConfirmDialog,
-    handleConfirm: handleConfirm
-  };
-};
-
 var ChatHeader = function ChatHeader(_ref) {
   var fullName = _ref.fullName,
     examTitle = _ref.examTitle,
@@ -3420,6 +3546,10 @@ var ChatContainer = function ChatContainer(_ref) {
                 if (scrollTop <= scrollOffset) {
                   return Promise.resolve(onReachTop === null || onReachTop === void 0 ? void 0 : onReachTop()).then(function (isSuccessLoad) {
                     if (isSuccessLoad) {
+                      var _listItemRef$current, _listItemRef$current$;
+                      (_listItemRef$current = listItemRef.current) === null || _listItemRef$current === void 0 ? void 0 : (_listItemRef$current$ = _listItemRef$current.lastElementChild) === null || _listItemRef$current$ === void 0 ? void 0 : _listItemRef$current$.scrollIntoView({
+                        behavior: "smooth"
+                      });
                       listRef.current.scrollTop = listRef.current.scrollHeight - scrollHeight;
                     }
                   });
@@ -3437,24 +3567,20 @@ var ChatContainer = function ChatContainer(_ref) {
     }
   };
   useEffect(function () {
-    var _listRef$current, _chatListProps$messag, _listRef$current3;
+    var _listRef$current, _chatListProps$messag, _listRef$current2;
     scrollRef.current && clearTimeout(scrollRef.current);
     addEventTimeout.current && clearTimeout(addEventTimeout.current);
     (_listRef$current = listRef.current) === null || _listRef$current === void 0 ? void 0 : _listRef$current.removeEventListener("scroll", handleScroll);
     if (isScrollToEnd && !isLoading && (_chatListProps$messag = chatListProps.messages) !== null && _chatListProps$messag !== void 0 && _chatListProps$messag.length) {
-      var _listItemRef$current, _listItemRef$current$;
-      (_listItemRef$current = listItemRef.current) === null || _listItemRef$current === void 0 ? void 0 : (_listItemRef$current$ = _listItemRef$current.lastElementChild) === null || _listItemRef$current$ === void 0 ? void 0 : _listItemRef$current$.scrollIntoView({
+      var _listItemRef$current2, _listItemRef$current3;
+      (_listItemRef$current2 = listItemRef.current) === null || _listItemRef$current2 === void 0 ? void 0 : (_listItemRef$current3 = _listItemRef$current2.lastElementChild) === null || _listItemRef$current3 === void 0 ? void 0 : _listItemRef$current3.scrollIntoView({
         behavior: "smooth"
       });
       onEndScrollToEnd === null || onEndScrollToEnd === void 0 ? void 0 : onEndScrollToEnd();
-      addEventTimeout.current = setTimeout(function () {
-        var _listRef$current2;
-        (_listRef$current2 = listRef.current) === null || _listRef$current2 === void 0 ? void 0 : _listRef$current2.addEventListener("scroll", handleScroll);
-      }, 800);
-    } else (_listRef$current3 = listRef.current) === null || _listRef$current3 === void 0 ? void 0 : _listRef$current3.addEventListener("scroll", handleScroll);
+    } else (_listRef$current2 = listRef.current) === null || _listRef$current2 === void 0 ? void 0 : _listRef$current2.addEventListener("scroll", handleScroll);
     return function () {
-      var _listRef$current4;
-      (_listRef$current4 = listRef.current) === null || _listRef$current4 === void 0 ? void 0 : _listRef$current4.removeEventListener("scroll", handleScroll);
+      var _listRef$current3;
+      (_listRef$current3 = listRef.current) === null || _listRef$current3 === void 0 ? void 0 : _listRef$current3.removeEventListener("scroll", handleScroll);
       scrollRef.current && clearTimeout(scrollRef.current);
       addEventTimeout.current && clearTimeout(addEventTimeout.current);
     };
@@ -3504,14 +3630,16 @@ var useMessageList = function useMessageList() {
       var _temp = _catch(function () {
         var filter = _extends({}, messageFilter);
         return Promise.resolve(getMessagesByConversation(conversationId, filter)).then(function (res) {
-          setMessages(function (prev) {
-            var _res$data$items;
-            return [].concat((_res$data$items = res.data.items) === null || _res$data$items === void 0 ? void 0 : _res$data$items.reverse(), prev);
-          });
-          setMessageFilter(function (prev) {
-            return _extends({}, prev, {
-              totalItems: res.data.totalItems,
-              totalPages: res.data.totalPages
+          return Promise.resolve(updateLastTimeReadConversation(conversationId)).then(function () {
+            setMessages(function (prev) {
+              var _res$data$items;
+              return [].concat((_res$data$items = res.data.items) === null || _res$data$items === void 0 ? void 0 : _res$data$items.reverse(), prev);
+            });
+            setMessageFilter(function (prev) {
+              return _extends({}, prev, {
+                totalItems: res.data.totalItems,
+                totalPages: res.data.totalPages
+              });
             });
           });
         });
@@ -3531,28 +3659,30 @@ var useMessageList = function useMessageList() {
         return true;
       };
       var _exit = false;
-      if (isLoading) return Promise.resolve();
+      if (isLoading || messageFilter.currentPage === messageFilter.totalPages) return Promise.resolve();
       var filter = _extends({}, messageFilter, {
         currentPage: ((messageFilter === null || messageFilter === void 0 ? void 0 : messageFilter.currentPage) || 1) + 1
       });
-      setMessageFilter(filter);
       setLoading(true);
       var _temp3 = _catch(function () {
         return Promise.resolve(getMessagesByConversation(conversationId, filter)).then(function (res) {
-          setMessages(function (prev) {
-            var _res$data$items2;
-            var data = [].concat((_res$data$items2 = res.data.items) === null || _res$data$items2 === void 0 ? void 0 : _res$data$items2.reverse(), prev);
-            var dataFilter = new Set(data);
-            return Array.from(dataFilter);
-          });
-          if (res.data.items) {
-            setMessageFilter(function (prev) {
-              return _extends({}, prev, {
-                totalItems: res.data.totalItems,
-                totalPages: res.data.totalPages
+          return Promise.resolve(updateLastTimeReadConversation(conversationId)).then(function () {
+            if (res.data.items.length) {
+              setMessages(function (prev) {
+                var _res$data$items2;
+                var data = [].concat((_res$data$items2 = res.data.items) === null || _res$data$items2 === void 0 ? void 0 : _res$data$items2.reverse(), prev);
+                var dataFilter = new Set(data);
+                return Array.from(dataFilter);
               });
-            });
-          }
+              setMessageFilter(function (prev) {
+                return _extends({}, prev, {
+                  totalItems: res.data.totalItems,
+                  totalPages: res.data.totalPages,
+                  currentPage: res.data.page
+                });
+              });
+            }
+          });
         });
       }, function () {
         toast.error("Fail to fetch data!");
@@ -3665,34 +3795,26 @@ var useChatContainer = function useChatContainer(props) {
     }
   };
   var handleUploadImage = function handleUploadImage(file) {
-    try {
-      console.log({
-        file: file
-      });
-      if (!file) return Promise.resolve();
-      return Promise.resolve(_finally(function () {
-        return _catch(function () {
-          var formData = new FormData();
-          formData.append("upload", file);
-          return Promise.resolve(apiUploadImageFile(formData)).then(function (res) {
-            var _res$data;
-            setSelectedFile({
-              content: res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.url
-            });
-          });
-        }, function (error) {
-          var _error$response2;
-          setMessages(function (state) {
-            return [].concat(state.filter(function (i) {
-              return (i === null || i === void 0 ? void 0 : i.id) !== 0;
-            }));
+    return file ? Promise.resolve(_finally(function () {
+      return _catch(function () {
+        var formData = new FormData();
+        formData.append("upload", file);
+        return Promise.resolve(apiUploadImageFile(formData)).then(function (res) {
+          var _res$data;
+          setSelectedFile({
+            content: res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.url
           });
-          toast.error((_error$response2 = error.response) === null || _error$response2 === void 0 ? void 0 : _error$response2.data);
         });
-      }, function () {}));
-    } catch (e) {
-      return Promise.reject(e);
-    }
+      }, function (error) {
+        var _error$response2;
+        setMessages(function (state) {
+          return [].concat(state.filter(function (i) {
+            return (i === null || i === void 0 ? void 0 : i.id) !== 0;
+          }));
+        });
+        toast.error((_error$response2 = error.response) === null || _error$response2 === void 0 ? void 0 : _error$response2.data);
+      });
+    }, function () {})) : Promise.resolve();
   };
   var handleChangeInput = function handleChangeInput(text) {
     setMessage({
@@ -3706,6 +3828,14 @@ var useChatContainer = function useChatContainer(props) {
       return [].concat(state, [data]);
     });
   };
+  var handleNewConversation = function handleNewConversation(data) {
+    if (!data) return;
+    var item = JSON.parse(data);
+    setScrollToEnd(true);
+    setMessages(function (state) {
+      return [].concat(state, [item]);
+    });
+  };
   var handleCompletedConversation = function handleCompletedConversation(data) {
     if (!data) return;
     setSelectedConversation(JSON.parse(data));
@@ -3722,8 +3852,10 @@ var useChatContainer = function useChatContainer(props) {
     setSelectedFile(null);
   };
   var cleanupPusher = function cleanupPusher() {
-    var _pusher$current;
+    var _pusher$current, _pusher$current2, _pusher$current3;
     (_pusher$current = pusher.current) === null || _pusher$current === void 0 ? void 0 : _pusher$current.unbind("new-message-event", handleNewMessageSent);
+    (_pusher$current2 = pusher.current) === null || _pusher$current2 === void 0 ? void 0 : _pusher$current2.unbind("completed-conversation-event", handleCompletedConversation);
+    (_pusher$current3 = pusher.current) === null || _pusher$current3 === void 0 ? void 0 : _pusher$current3.unbind("new-conversation-event", handleNewConversation);
     channelName.current && pusher.current && pusher.current.unsubscribe(channelName.current);
   };
   useEffect(function () {
@@ -3740,10 +3872,11 @@ var useChatContainer = function useChatContainer(props) {
           }, _headers[AcademyHeaders] = academyDomain, _headers)
         }
       });
-      channelName.current = "presence-conversation-channel-" + (selectedConversation === null || selectedConversation === void 0 ? void 0 : selectedConversation.id);
+      channelName.current = "presence-conversation-channel-" + (selectedConversation === null || selectedConversation === void 0 ? void 0 : selectedConversation.id) + "-" + academyDomain.trim().toUpperCase();
       channel.current = pusher.current.subscribe(channelName.current);
       pusher.current.bind("new-message-event", handleNewMessageSent);
       pusher.current.bind("completed-conversation-event", handleCompletedConversation);
+      pusher.current.bind("new-conversation-event", handleNewConversation);
     }
     return cleanupPusher;
   }, [selectedConversation === null || selectedConversation === void 0 ? void 0 : selectedConversation.id, academyDomain]);
@@ -3861,7 +3994,7 @@ var usePusherConversation = function usePusherConversation(onNewMessageConversat
           }, _headers[AcademyHeaders] = academyDomain, _headers)
         }
       });
-      channelName.current = "presence-conversation-channel-userId-" + userId;
+      channelName.current = "presence-conversation-channel-userId-" + userId + "-" + academyDomain.trim().toUpperCase();
       channel.current = pusher.current.subscribe(channelName.current);
       channel.current.bind("message-conversation-event", handleNewMessageConversationCreated);
       channel.current.bind("message-conversation-read-event", handleReadMessageConversation);
@@ -4128,12 +4261,16 @@ var ScoreSelector = function ScoreSelector(_ref) {
     isDisabled = _ref.isDisabled;
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
-  var scoreOptions = SCORE_OPTIONS.map(function (i) {
-    return {
-      label: "" + t(i + "\uC810") + (DEFAULT_SCORE === i ? " (" + t("default").toLocaleLowerCase() + ")" : ""),
-      value: i
-    };
-  });
+  var scoreOptions = useMemo(function () {
+    return SCORE_OPTIONS.map(function (i) {
+      return {
+        label: "" + t("score_format", {
+          score: i
+        }) + (DEFAULT_SCORE === i ? " (" + t("default").toLocaleLowerCase() + ")" : ""),
+        value: i
+      };
+    });
+  }, [t]);
   return React.createElement(CustomSelect, {
     inputId: id,
     value: value,
@@ -4150,6 +4287,8 @@ var QuestionView = function QuestionView(_ref) {
     isDisabled = _ref.isDisabled,
     onChangeCorrectAnswers = _ref.onChangeCorrectAnswers,
     onChangeScoreAnswer = _ref.onChangeScoreAnswer;
+  var _useTranslation = useTranslation(),
+    t = _useTranslation.t;
   var handleChangeCorrectAnswer = function handleChangeCorrectAnswer(e) {
     return onChangeCorrectAnswers(e.target.value, index);
   };
@@ -4159,7 +4298,9 @@ var QuestionView = function QuestionView(_ref) {
     className: "d-flex flex-grow-1"
   }, React.createElement("div", {
     className: styles$1["question-title"] + " me-2 text-nowrap"
-  }, "\uBB38\uC81C ", question.questionOrder + 1, "\uBC88"), React.createElement(FormControl, {
+  }, t("problem_number_question", {
+    number: question.questionOrder + 1
+  })), React.createElement(FormControl, {
     className: "flex-grow-1 w-100"
   }, React.createElement(RadioGroup, {
     value: question.correctAnswers[0],
@@ -4180,7 +4321,9 @@ var QuestionView = function QuestionView(_ref) {
       control: React.createElement(Radio, {
         size: "small"
       }),
-      label: i + "\uBC88"
+      label: t("number_question", {
+        number: i
+      })
     });
   })))), React.createElement("div", {
     className: "d-flex align-items-center"
@@ -4562,6 +4705,26 @@ var useExamDetailView = function useExamDetailView(props) {
       }))
     }));
   };
+  var handleDeleteArticle = function handleDeleteArticle(article) {
+    if (!exam) return;
+    var removedQuestions = exam.questions.filter(function (i) {
+      return i.article === +article;
+    }).map(function (i) {
+      return i.questionOrder;
+    });
+    var max = Math.max.apply(Math, removedQuestions);
+    var examQuestions = exam.questions.filter(function (i) {
+      return i.article !== +article;
+    }).map(function (i) {
+      return _extends({}, i, {
+        article: i.article > article ? i.article - 1 : i.article,
+        questionOrder: i.questionOrder > max ? i.questionOrder - removedQuestions.length : i.questionOrder
+      });
+    });
+    onChangeExam(_extends({}, exam, {
+      questions: [].concat(examQuestions)
+    }));
+  };
   var handleChangeAnswerCount = function handleChangeAnswerCount(article, newAnswerCount, answerCount) {
     if (!exam) return;
     if (newAnswerCount === answerCount) return;
@@ -4689,10 +4852,10 @@ var useExamDetailView = function useExamDetailView(props) {
     return options;
   }, [exam.duration]);
   useEffect(function () {
-    onChangeExam(_extends({}, exam, {
+    if ((selectedSubject === null || selectedSubject === void 0 ? void 0 : selectedSubject.id) !== exam.subjectId) onChangeExam(_extends({}, exam, {
       subjectId: (selectedSubject === null || selectedSubject === void 0 ? void 0 : selectedSubject.id) || 0
     }));
-  }, [selectedSubject === null || selectedSubject === void 0 ? void 0 : selectedSubject.id]);
+  }, [selectedSubject === null || selectedSubject === void 0 ? void 0 : selectedSubject.id, exam.subjectId]);
   return {
     t: t,
     durationOptions: durationOptions,
@@ -4704,7 +4867,8 @@ var useExamDetailView = function useExamDetailView(props) {
     handleChangeCorrectAnswers: handleChangeCorrectAnswers,
     handleChangeAnswerCount: handleChangeAnswerCount,
     handleChangeQuestionCount: handleChangeQuestionCount,
-    handleChangeCategory: handleChangeCategory
+    handleChangeCategory: handleChangeCategory,
+    handleDeleteArticle: handleDeleteArticle
   };
 };
 
@@ -4734,7 +4898,8 @@ var ExamDetailView = function ExamDetailView(_ref) {
     handleChangeCorrectAnswers = _useExamDetailView.handleChangeCorrectAnswers,
     handleChangeAnswerCount = _useExamDetailView.handleChangeAnswerCount,
     handleChangeQuestionCount = _useExamDetailView.handleChangeQuestionCount,
-    handleChangeCategory = _useExamDetailView.handleChangeCategory;
+    handleChangeCategory = _useExamDetailView.handleChangeCategory,
+    handleDeleteArticle = _useExamDetailView.handleDeleteArticle;
   return React.createElement(Grid, {
     container: true,
     spacing: 3,
@@ -4773,7 +4938,7 @@ var ExamDetailView = function ExamDetailView(_ref) {
   }, React.createElement("label", {
     className: stylesGlobal["form-label"] + " " + styles$1["question-label"],
     htmlFor: "duration"
-  }, " ", t("subject")), React.createElement(CustomSelect, {
+  }, t("subject"), " ", selectedSubject === null || selectedSubject === void 0 ? void 0 : selectedSubject.name), React.createElement(CustomSelect, {
     inputId: "subject",
     value: selectedSubject === null || selectedSubject === void 0 ? void 0 : selectedSubject.id,
     options: subjectOptions,
@@ -4792,8 +4957,10 @@ var ExamDetailView = function ExamDetailView(_ref) {
       onChangeAnswerCount: handleChangeAnswerCount,
       onChangeCorrectAnswers: handleChangeCorrectAnswers,
       onChangeScoreAnswer: handleChangeScoreAnswer,
+      onDelete: handleDeleteArticle,
       isDisabled: isDisabled,
-      selectedSubject: selectedSubject
+      selectedSubject: selectedSubject,
+      isDeletable: examGroupByArticle.length > 1
     })));
   }), React.createElement(Grid, {
     item: true,
@@ -7301,7 +7468,12 @@ function CreateNewQuestionDialog(_ref) {
     t = _useTranslation.t;
   return React.createElement(Dialog, {
     onClose: toggleCreateQuestion,
-    open: openCreateQuestionDialog
+    open: openCreateQuestionDialog,
+    PaperProps: {
+      sx: {
+        minWidth: "363px"
+      }
+    }
   }, React.createElement(DialogTitle$1, {
     id: "customized-dialog-title"
   }, React.createElement(Typography$1, {
@@ -8009,7 +8181,12 @@ function CreateNewQuestionDialog$1(_ref) {
     examSessionId = _ref.examSessionId;
   return React.createElement(Dialog, {
     onClose: toggleCreateQuestion,
-    open: openCreateQuestionDialog
+    open: openCreateQuestionDialog,
+    PaperProps: {
+      sx: {
+        minWidth: "363px"
+      }
+    }
   }, React.createElement(DialogTitle$1, {
     id: "customized-dialog-title"
   }, React.createElement(Typography$1, {