mario-core 2.6.8 → 2.7.2

package/dist/containers/User/hooks/useUserDetail.d.ts

@@ -11,7 +11,7 @@ declare type UserDetail = {
 };
 declare const useUserDetail: (id?: string | undefined) => {
     userDetail: UserDetail;
-    backToList: () => void;
+    backToList: (user?: string | undefined) => void;
     confirmData: (data: any) => Promise<void>;
     file: any;
     setFile: import("react").Dispatch<any>;

package/dist/containers/User/hooks/useUserList.d.ts

@@ -2,6 +2,7 @@ declare const useUserList: () => {
     userList: any;
     totalItems: any;
     filters: import("../../..").Filter;
+    fullName: string | null;
     getData: () => Promise<void>;
     removeData: (id: string) => void;
     changeFilters: (updatedFilters: any) => void;

package/dist/index.d.ts

@@ -57,7 +57,7 @@ import getFileUrl from "./utils/getFileUrl";
 import getTextFromHTML from "./utils/getTextFromHTML";
 import utcToLocalTime from "./utils/utcToLocalTime";
 import { uploadFile, systemStudentBadge, systemCertificateUpload } from "./services/fileServices";
-import { setLoading, setModal, setAlert, setUser, reset, setCurrentStudentId, setCurrentStudentUserId, setCurrentStudentName, setTurnOffPassWhenChangeMode } from "./redux/commons/action";
+import { setLoading, setModal, setAlert, setUser, reset, setCurrentStudentId, setCurrentStudentUserId, setCurrentStudentName, setTurnOffPassWhenChangeMode, showMenuBar } from "./redux/commons/action";
 import { setClassList } from "./redux/classes/action";
 import { setConferenceRubricList } from "./redux/conferenceRubrics/action";
 import { setSuggestionList } from "./redux/suggestionBanks/action";
@@ -100,4 +100,4 @@ import { setFilterWidget } from "./redux/widget/action";
 import { setBandScoreList } from "./redux/bandScores/action";
 import { setStudentIdSelectedByTeacher } from "./redux/navMobile/action";
 import useFilters from "./hooks/useFilters";
-export { Login, Dashboard, TheLayout, TheContent, NotFound, EmailTemplateList, EmailTemplateDetail, FaqList, SkillList, UserList, UserDetail, Loading, NotificationModal, CommonHeader, CommonModal, AddButton, DeleteButtonIcon, EditButtonIcon, LinkEditButton, ToggleButton, EmptyDataAlert, CreatableSelector, CustomPagination, SearchBox, FileInput, QuitPrompt, QuestionTypeSelector, QuestionCategorySelector, SuggestionCategorySelector, ErrorHandler, DetailActionButtons, RequiredLabel, StarRatingSelector, ReactNotification, NotificationList, CustomSelector, UploadFileButton, SearchBoxContainer, CustomTab, CommonAlert, GalleryList, MediaList, useGalleryList, AcademicClassSelector, SchoolList, store, setLoading, setModal, setAlert, setClassList, setConferenceRubricList, setSuggestionList, setStrategyList, setSubjectList, setLearningSupportCategoryList, setQuestionList, setUserList, setStudentList, setBadgeList, setGoalExampleList, setSemesterList, setFeedbackList, setAssessmentList, setQuestionByCategory, setSelectQuestion, setMoveItemQuestion, setReflectionList, setReflectionResultList, setEditItemQuesion, setResetQuestionList, setMailCategory, setUser, setAssignmentList, setAssistantList, setSessionTemplateList, setTutorialScreenList, setSessionTemplateGeneralClassList, setCustomAlertList, setCertificateList, closeTab, addTab, editTab, clearTab, changeNote, changeTags, answerQuestion, setSessionPlayer, setStartTime, setTurnOffPassWhenChangeMode, reset, setImproveMyClass, setSchoolBlankDayList, api, apiUpload, uploadFile, systemStudentBadge, systemCertificateUpload, BASE_URL, DEFAULT_FILTER, LICENSE_AGGRID, TINY_MCE_API_KEY, QUESTION_TYPES, QUESTION_TYPES_OPTIONS, ANSWER_EDITOR_HEIGHT, CHAT_CHANNEL, NOTIFICATION_CHANNEL, DATE_RESULT, DATE_FORMAT, FULL_DATE_RESULT, ACCESS_TOKEN, GOOGLE_RECAPTCHA_KEY, EMOTIONS, TAB_COLORS, Filter, Conversation, Message, ConversationMember, NavbarTab, editorConfig, generateRandomString, isInViewport, debounce, firstCheckToken, canAccessRoute, getFileUrl, getTextFromHTML, utcToLocalTime, getInfo, Images, setQuestionCateList, setMyStudent, setDataPlayer, answerQuestionDataPlayer, setCurrentStudentUserId, setCurrentStudentId, setCurrentStudentName, setFilterWidget, setBandScoreList, setStudentIdSelectedByTeacher, useFilters };
+export { Login, Dashboard, TheLayout, TheContent, NotFound, EmailTemplateList, EmailTemplateDetail, FaqList, SkillList, UserList, UserDetail, Loading, NotificationModal, CommonHeader, CommonModal, AddButton, DeleteButtonIcon, EditButtonIcon, LinkEditButton, ToggleButton, EmptyDataAlert, CreatableSelector, CustomPagination, SearchBox, FileInput, QuitPrompt, QuestionTypeSelector, QuestionCategorySelector, SuggestionCategorySelector, ErrorHandler, DetailActionButtons, RequiredLabel, StarRatingSelector, ReactNotification, NotificationList, CustomSelector, UploadFileButton, SearchBoxContainer, CustomTab, CommonAlert, GalleryList, MediaList, useGalleryList, AcademicClassSelector, SchoolList, store, showMenuBar, setLoading, setModal, setAlert, setClassList, setConferenceRubricList, setSuggestionList, setStrategyList, setSubjectList, setLearningSupportCategoryList, setQuestionList, setUserList, setStudentList, setBadgeList, setGoalExampleList, setSemesterList, setFeedbackList, setAssessmentList, setQuestionByCategory, setSelectQuestion, setMoveItemQuestion, setReflectionList, setReflectionResultList, setEditItemQuesion, setResetQuestionList, setMailCategory, setUser, setAssignmentList, setAssistantList, setSessionTemplateList, setTutorialScreenList, setSessionTemplateGeneralClassList, setCustomAlertList, setCertificateList, closeTab, addTab, editTab, clearTab, changeNote, changeTags, answerQuestion, setSessionPlayer, setStartTime, setTurnOffPassWhenChangeMode, reset, setImproveMyClass, setSchoolBlankDayList, api, apiUpload, uploadFile, systemStudentBadge, systemCertificateUpload, BASE_URL, DEFAULT_FILTER, LICENSE_AGGRID, TINY_MCE_API_KEY, QUESTION_TYPES, QUESTION_TYPES_OPTIONS, ANSWER_EDITOR_HEIGHT, CHAT_CHANNEL, NOTIFICATION_CHANNEL, DATE_RESULT, DATE_FORMAT, FULL_DATE_RESULT, ACCESS_TOKEN, GOOGLE_RECAPTCHA_KEY, EMOTIONS, TAB_COLORS, Filter, Conversation, Message, ConversationMember, NavbarTab, editorConfig, generateRandomString, isInViewport, debounce, firstCheckToken, canAccessRoute, getFileUrl, getTextFromHTML, utcToLocalTime, getInfo, Images, setQuestionCateList, setMyStudent, setDataPlayer, answerQuestionDataPlayer, setCurrentStudentUserId, setCurrentStudentId, setCurrentStudentName, setFilterWidget, setBandScoreList, setStudentIdSelectedByTeacher, useFilters };

package/dist/index.js

@@ -229,6 +229,7 @@ var setUser = toolkit.createAction("common/setUser");
 var setSidebar = toolkit.createAction("common/setSidebar");
 var setAlert = toolkit.createAction("common/setAlert");
 var reset = toolkit.createAction("common/reset");
+var showMenuBar = toolkit.createAction("common/showMenuBar");
 var setCurrentStudentId = toolkit.createAction("common/setCurrentStudentId");
 var setCurrentStudentUserId = toolkit.createAction("common/setCurrentStudentUserId");
 var setCurrentStudentName = toolkit.createAction("common/setCurrentStudentName");
@@ -540,7 +541,7 @@ var BlockLogin = function BlockLogin(_ref) {
     }, React__default.createElement(reactRouterDom.Link, {
       to: "/forgot-password",
       className: "" + styles["link-to-login"]
-    }, "Forgot password ?"), React__default.createElement("a", {
+    }, "Forgot password?"), React__default.createElement("a", {
       href: "https://marioframework.com/privacy-policy/",
       target: "blank",
       className: "" + styles["link-to-login"]
@@ -4079,6 +4080,8 @@ var TITLE$8 = "User list";
 
 var useUserList = function useUserList() {
   var history = reactRouterDom.useHistory();
+  var query = new URLSearchParams(location.search);
+  var fullName = query.get("query");
   var userList = reactRedux.useSelector(function (state) {
     return state.users.userList;
   });
@@ -4129,6 +4132,11 @@ var useUserList = function useUserList() {
   React.useEffect(function () {
     getData();
   }, [filters]);
+  React.useEffect(function () {
+    changeFilters({
+      searchString: fullName
+    });
+  }, [fullName]);
   var removeData = React.useCallback(function (id) {
     dispatch(setLoading(true));
 
@@ -4174,6 +4182,7 @@ var useUserList = function useUserList() {
     userList: userList,
     totalItems: totalItems,
     filters: filters,
+    fullName: fullName,
     getData: getData,
     removeData: removeData,
     changeFilters: changeFilters,
@@ -4250,6 +4259,7 @@ var header$2 = "User";
 
 var UserList = function UserList() {
   var _useUserList = useUserList(),
+      fullName = _useUserList.fullName,
       userList = _useUserList.userList,
       totalItems = _useUserList.totalItems,
       filters = _useUserList.filters,
@@ -4270,7 +4280,7 @@ var UserList = function UserList() {
     onClick: function onClick() {
       return reDirectDetailPage();
     },
-    initValue: "",
+    initValue: !!fullName ? fullName : '',
     onSearch: function onSearch(searchString) {
       return changeFilters({
         searchString: searchString
@@ -4509,8 +4519,8 @@ var useUserDetail = function useUserDetail(id) {
       return Promise.reject(e);
     }
   }, [id]);
-  var backToList = React.useCallback(function () {
-    history.push(USER_LIST_URL);
+  var backToList = React.useCallback(function (user) {
+    !!user ? history.push(USER_LIST_URL + ("?query=" + user)) : history.push(USER_LIST_URL);
   }, []);
   var confirmData = React.useCallback(function (data) {
     try {
@@ -4524,12 +4534,17 @@ var useUserDetail = function useUserDetail(id) {
         function _temp6() {
           var next = !!id ? update$3 : create$3;
           !id && delete data.id;
-          return Promise.resolve(next(data)).then(function () {
+          return Promise.resolve(next(data)).then(function (result) {
+            if (!!result) {
+              getById$3(result.data.id).then(function (e) {
+                backToList(e.data.fullName);
+              });
+            }
+
             dispatch(setAlert({
               type: "success",
               message: (!!id ? "Update" : "Create") + " user successfully"
             }));
-            backToList();
           });
         }
 
@@ -6619,7 +6634,8 @@ var initialState = {
   currentStudentId: parseInt((_localStorage$getItem = localStorage.getItem("currentStudentId")) != null ? _localStorage$getItem : "0"),
   currentStudentUserId: localStorage.getItem("currentStudentUserId") || "",
   currentStudentName: localStorage.getItem("currentStudentName") || "",
-  turnOffPassWhenChangeMode: false
+  turnOffPassWhenChangeMode: false,
+  menuBar: true
 };
 var commonReducer = toolkit.createReducer(initialState, function (builder) {
   builder.addCase(setLoading, function (state, action) {
@@ -6645,6 +6661,8 @@ var commonReducer = toolkit.createReducer(initialState, function (builder) {
     state.currentStudentName = action.payload;
   }).addCase(setTurnOffPassWhenChangeMode, function (state, action) {
     state.turnOffPassWhenChangeMode = action.payload;
+  }).addCase(showMenuBar, function (state, action) {
+    state.menuBar = action.payload;
   });
 });
 
@@ -7683,6 +7701,7 @@ exports.setTurnOffPassWhenChangeMode = setTurnOffPassWhenChangeMode;
 exports.setTutorialScreenList = setTutorialScreenList;
 exports.setUser = setUser;
 exports.setUserList = setUserList;
+exports.showMenuBar = showMenuBar;
 exports.store = store;
 exports.systemCertificateUpload = systemCertificateUpload;
 exports.systemStudentBadge = systemStudentBadge;