mario-core 2.6.7 → 2.7.1

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.css

@@ -212,7 +212,7 @@
     width: 70%; }
 
 ._wWIyO {
-  padding: 89px 50px;
+  padding: 60px 50px;
   position: relative; }
   ._wWIyO label:not(._11FZt) {
     color: #8f9bb3;
@@ -490,10 +490,6 @@
   ._1INnO {
     display: none; } }
 
-@media (min-width: 992px) {
-  ._2e7fZ {
-    width: 80%; } }
-
 @media (min-width: 992px) and (max-width: 1199px) {
   ._2LIqK {
     display: none; } }

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

@@ -46,7 +46,7 @@ function _catch(body, recover) {
 	return result;
 }
 
-var styles = {"notification-count":"_2sew7","text-introduction":"_3OgWF","btn-trans-border":"_r9cAh","contact":"_NszFe","learn-more":"_MDjzH","title-quote":"_1Swkw","descriptions-quote":"_gi8vj","descriptions-icon":"_3SOdX","box-login":"_38Lo1","block-verification":"_1OzGy","block-login":"_wWIyO","title-login":"_3nuns","title-forgot-password":"_21qb6","btn-close":"_NhW9l","btn-login":"_3IL10","return-to-login":"_Ce3Kg","recover-account":"_2t6d9","link-to-login":"_3bDsd","remember":"_11FZt","term-and-conditions":"_3LXoI","descriptions-forgot-pass":"_PMcjT","content-icon":"_2rZY6","title-icon":"_y9lM2","nav-home":"_1TT1q","box-introduction":"_32V6L","icon":"_20YJX","form-user-name":"_39BJD","checkbox-remember":"_2K9b2","block-reset-password":"_23Sua","block-forgot-pass":"_3CWP6","page-not-login":"_3Wmco","content-quote":"_13Rk0","home-page":"_o6HKW","red-background":"_jOY7o","login":"_F-hjL","img-box":"_2v-L_","img-login":"_3ncTL","img-login-rectangle":"_2kOvJ","c-main":"_39l0X","container-fluid":"_1BMwK","input-file-label":"_1XNpH","delete-avatar-button":"_1z5h9","header-logo":"_Gewcf","sidebar-logo":"_1hXpy","nav-mobile":"_1qjbW","filter-media-file":"_1I62C","div":"_3cLcM","dropdown-menu":"_1krbH","header-avatar":"_RQaHE","dropdown-content":"_3ys4W","dropdown-change":"_ToOW_","item-address":"_3sQlR","item-logout":"_3bqSM","title-address":"_1jgSI","img-avatar":"_35Ttz","item-contact":"_1wc7o","logout":"_1_9tV","content-text":"_3S4f2","hide-in-mobile":"_1INnO","block-form":"_2e7fZ","hide-in-desktop":"_2LIqK","control-input":"_2Zz97","custom-control":"_3-yp5"};
+var styles = {"notification-count":"_2sew7","text-introduction":"_3OgWF","btn-trans-border":"_r9cAh","contact":"_NszFe","learn-more":"_MDjzH","title-quote":"_1Swkw","descriptions-quote":"_gi8vj","descriptions-icon":"_3SOdX","box-login":"_38Lo1","block-verification":"_1OzGy","block-login":"_wWIyO","title-login":"_3nuns","title-forgot-password":"_21qb6","btn-close":"_NhW9l","btn-login":"_3IL10","return-to-login":"_Ce3Kg","recover-account":"_2t6d9","link-to-login":"_3bDsd","remember":"_11FZt","term-and-conditions":"_3LXoI","descriptions-forgot-pass":"_PMcjT","content-icon":"_2rZY6","title-icon":"_y9lM2","nav-home":"_1TT1q","box-introduction":"_32V6L","icon":"_20YJX","form-user-name":"_39BJD","checkbox-remember":"_2K9b2","block-reset-password":"_23Sua","block-forgot-pass":"_3CWP6","page-not-login":"_3Wmco","content-quote":"_13Rk0","home-page":"_o6HKW","red-background":"_jOY7o","login":"_F-hjL","img-box":"_2v-L_","img-login":"_3ncTL","img-login-rectangle":"_2kOvJ","c-main":"_39l0X","container-fluid":"_1BMwK","input-file-label":"_1XNpH","delete-avatar-button":"_1z5h9","header-logo":"_Gewcf","sidebar-logo":"_1hXpy","nav-mobile":"_1qjbW","filter-media-file":"_1I62C","div":"_3cLcM","dropdown-menu":"_1krbH","header-avatar":"_RQaHE","dropdown-content":"_3ys4W","dropdown-change":"_ToOW_","item-address":"_3sQlR","item-logout":"_3bqSM","title-address":"_1jgSI","img-avatar":"_35Ttz","item-contact":"_1wc7o","logout":"_1_9tV","content-text":"_3S4f2","hide-in-mobile":"_1INnO","hide-in-desktop":"_2LIqK","control-input":"_2Zz97","custom-control":"_3-yp5"};
 
 var style = {
   fontSize: "0.85rem"
@@ -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");
@@ -536,16 +537,20 @@ var BlockLogin = function BlockLogin(_ref) {
       className: "" + styles["btn-login"],
       type: "submit"
     }, "LOGIN")), React__default.createElement("div", {
-      className: "d-flex justify-content-end"
+      className: "d-flex justify-content-between"
     }, React__default.createElement(reactRouterDom.Link, {
       to: "/forgot-password",
       className: "" + styles["link-to-login"]
-    }, "Forgot password ?"))))), React__default.createElement(reactstrap.Col, {
+    }, "Forgot password?"), React__default.createElement("a", {
+      href: "https://marioframework.com/privacy-policy/",
+      target: "blank",
+      className: "" + styles["link-to-login"]
+    }, "Privacy Policy"))))), React__default.createElement(reactstrap.Col, {
       lg: 4,
       md: 4,
       className: "" + styles["img-box"]
     }, React__default.createElement("img", {
-      src: "/images/img-login.png",
+      src: "/images/img-login.jpg",
       className: "" + styles["img-login"]
     })));
   });
@@ -773,16 +778,20 @@ var BlockForgetPassword = function BlockForgetPassword() {
         return handleSubmit();
       }
     }, "Continue")), React__default.createElement("p", {
-      className: "d-flex justify-content-end"
+      className: "d-flex justify-content-between"
     }, React__default.createElement(reactRouterDom.Link, {
       to: "/login",
       className: "" + styles["link-to-login"]
-    }, "Return to login"))))), React__default.createElement(reactstrap.Col, {
+    }, "Return to login"), React__default.createElement("a", {
+      href: "https://marioframework.com/privacy-policy/",
+      target: "blank",
+      className: "" + styles["link-to-login"]
+    }, "Privacy Policy"))))), React__default.createElement(reactstrap.Col, {
       lg: 4,
       md: 4,
       className: "" + styles["img-box"]
     }, React__default.createElement("img", {
-      src: "/images/img-login.png",
+      src: "/images/img-login.jpg",
       className: "" + styles["img-login"]
     })));
   });
@@ -879,16 +888,20 @@ var BlockResetPassword = function BlockResetPassword() {
         return handleSubmit();
       }
     }, "Confirm")), React__default.createElement("p", {
-      className: "d-flex justify-content-end"
+      className: "d-flex justify-content-between"
     }, React__default.createElement(reactRouterDom.Link, {
       to: "/login",
       className: "" + styles["link-to-login"]
-    }, "Return to login"))))), React__default.createElement(reactstrap.Col, {
+    }, "Return to login"), React__default.createElement("a", {
+      href: "https://marioframework.com/privacy-policy/",
+      target: "blank",
+      className: "" + styles["link-to-login"]
+    }, "Privacy Policy"))))), React__default.createElement(reactstrap.Col, {
       lg: 4,
       md: 4,
       className: "" + styles["img-box"]
     }, React__default.createElement("img", {
-      src: "/images/img-login.png",
+      src: "/images/img-login.jpg",
       className: "" + styles["img-login"]
     })));
   });
@@ -1116,16 +1129,20 @@ var BlockTwoFactorLogin = function BlockTwoFactorLogin() {
         return handleSubmit();
       }
     }, "Confirm")), React__default.createElement("p", {
-      className: "d-flex justify-content-end"
+      className: "d-flex justify-content-between"
     }, React__default.createElement(reactRouterDom.Link, {
       to: "/login",
       className: "" + styles["link-to-login"]
-    }, "Return to login"))))), React__default.createElement(reactstrap.Col, {
+    }, "Return to login"), React__default.createElement("a", {
+      href: "https://marioframework.com/privacy-policy/",
+      target: "blank",
+      className: "" + styles["link-to-login"]
+    }, "Privacy Policy"))))), React__default.createElement(reactstrap.Col, {
       lg: 4,
       md: 4,
       className: "" + styles["img-box"]
     }, React__default.createElement("img", {
-      src: "/images/img-login.png",
+      src: "/images/img-login.jpg",
       className: "" + styles["img-login"]
     })));
   });
@@ -4063,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;
   });
@@ -4113,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));
 
@@ -4158,6 +4182,7 @@ var useUserList = function useUserList() {
     userList: userList,
     totalItems: totalItems,
     filters: filters,
+    fullName: fullName,
     getData: getData,
     removeData: removeData,
     changeFilters: changeFilters,
@@ -4234,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,
@@ -4254,7 +4280,7 @@ var UserList = function UserList() {
     onClick: function onClick() {
       return reDirectDetailPage();
     },
-    initValue: "",
+    initValue: !!fullName ? fullName : '',
     onSearch: function onSearch(searchString) {
       return changeFilters({
         searchString: searchString
@@ -4493,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 {
@@ -4508,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();
           });
         }
 
@@ -6603,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) {
@@ -6629,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;
   });
 });
 
@@ -7667,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;