mario-education 2.4.566-feedback → 2.4.567-feedback

package/dist/containers/MyProfile/views/Profile.d.ts

@@ -2,8 +2,7 @@ import 'react-phone-number-input/style.css';
 interface IProps {
     dataProfile: any;
     updateProfile: any;
-    currentUser: any;
     goBack: any;
 }
-declare const Profile: ({ dataProfile, updateProfile, currentUser, goBack }: IProps) => JSX.Element;
+declare const Profile: ({ dataProfile, updateProfile, goBack }: IProps) => JSX.Element;
 export default Profile;

package/dist/index.js

@@ -76235,7 +76235,10 @@ var HeaderSideBar = function HeaderSideBar(_ref) {
     className: classes.menuItem
   }, React__default.createElement(LanguageDropdown, null)), !isReadOnly && React__default.createElement(core$1.MenuItem, {
     className: classes.menuItem,
-    onClick: openProfile
+    onClick: function onClick() {
+      openProfile();
+      handleClose();
+    }
   }, React__default.createElement("img", {
     className: classes.menuIcon,
     src: "/images/profile-icon.png"
@@ -80522,9 +80525,6 @@ var UPLOAD_FILE_URL = marioCore.BASE_URL + "/api/file";
 var SYSTEM_PROFILE = UPLOAD_FILE_URL + "/system/profile";
 var CHANGE_PASSWORD = marioCore.BASE_URL + "/api/Account/changePassword";
 var USER = marioCore.BASE_URL + "/api/User";
-var getProfileTeacher = function getProfileTeacher() {
-  return marioCore.api.get(TEACHER_PROFILE + "/current");
-};
 var updateProfileTeacher = function updateProfileTeacher(data) {
   return marioCore.api.put(TEACHER_PROFILE + "/current", data);
 };
@@ -80583,6 +80583,34 @@ var InitialData = {
   address: ''
 };
 
+var USER_URL$5 = marioCore.BASE_URL + "/api/user";
+var USER_EDU_URL$1 = marioCore.BASE_URL + "/api/User";
+var CHANGE_PASSWORD$1 = marioCore.BASE_URL + "/api/Account/changePassword";
+var ACCOUNT_URL$1 = marioCore.BASE_URL + "/api/account";
+var getById$q = function getById(id) {
+  return marioCore.api.get(USER_URL$5 + "/" + id);
+};
+var getByIdUser = function getByIdUser(id) {
+  return marioCore.api.get(USER_EDU_URL$1 + "/detail-user/" + id);
+};
+var create$o = function create(data) {
+  return marioCore.api.post("" + USER_URL$5, data);
+};
+var update$q = function update(data) {
+  return marioCore.api.put(USER_URL$5 + "/" + data.id, data);
+};
+var changePassword = function changePassword(formData) {
+  return marioCore.api.post(CHANGE_PASSWORD$1, formData);
+};
+var forgotChangePassword = function forgotChangePassword(data) {
+  return marioCore.api.post(ACCOUNT_URL$1 + "/forgotchangepassword", data);
+};
+var getTeachers = function getTeachers(filters) {
+  return marioCore.api.get(USER_URL$5 + "/all/teacher", {
+    params: filters
+  });
+};
+
 var useProfile = function useProfile() {
   var _useTranslation = marioCore.useTranslation(),
       t = _useTranslation.t;
@@ -80614,7 +80642,7 @@ var useProfile = function useProfile() {
       dispatch(marioCore.setLoading(true));
 
       var _temp4 = _catch(function () {
-        return Promise.resolve(getProfileTeacher()).then(function (res) {
+        return Promise.resolve(getByIdUser(currentUser === null || currentUser === void 0 ? void 0 : currentUser.id)).then(function (res) {
           var _res$data;
 
           setDataProfile(res.data);
@@ -80798,7 +80826,6 @@ var DoneCheckInIcon = function DoneCheckInIcon(_ref) {
 var Profile = function Profile(_ref) {
   var dataProfile = _ref.dataProfile,
       updateProfile = _ref.updateProfile,
-      currentUser = _ref.currentUser,
       goBack = _ref.goBack;
 
   var _useTranslation = marioCore.useTranslation(),
@@ -80816,8 +80843,6 @@ var Profile = function Profile(_ref) {
     },
     validationSchema: schema$l
   }, function (formikProps) {
-    var _currentUser$userRole;
-
     var values = formikProps.values,
         setFieldValue = formikProps.setFieldValue,
         handleSubmit = formikProps.handleSubmit,
@@ -80899,18 +80924,18 @@ var Profile = function Profile(_ref) {
     }))), React__default.createElement("div", {
       className: myProfile['edit-profile-container__form--field'] + " " + myProfile['edit-profile-container__form--width-70']
     }, React__default.createElement("p", null, " ", t("role")), React__default.createElement(core$1.Select, {
+      multiple: true,
+      disabled: true,
+      name: "roles",
       variant: "outlined",
-      value: !!(values !== null && values !== void 0 && values.teacherRole) && (values === null || values === void 0 ? void 0 : values.teacherRole),
-      onChange: function onChange(e) {
-        return setFieldValue("teacherRole", e.target.value);
+      value: (values === null || values === void 0 ? void 0 : values.roles) || [],
+      renderValue: function renderValue(selected) {
+        return selected.map(function (r) {
+          return r;
+        }).join(', ');
       },
       className: "" + myProfile["profile-value"]
-    }, currentUser === null || currentUser === void 0 ? void 0 : (_currentUser$userRole = currentUser.userRoles) === null || _currentUser$userRole === void 0 ? void 0 : _currentUser$userRole.map(function (role) {
-      return React__default.createElement(core$1.MenuItem, {
-        key: role,
-        value: role
-      }, role);
-    })))), React__default.createElement("div", {
+    }))), React__default.createElement("div", {
       className: myProfile['edit-profile-container__form--row']
     }, React__default.createElement("div", {
       className: myProfile['edit-profile-container__form--field'] + " " + myProfile['edit-profile-container__form--width-50']
@@ -81213,7 +81238,6 @@ var MyProfile = function MyProfile() {
   var componentByControl = [{
     value: TypeControl.Info,
     component: React__default.createElement(Profile, {
-      currentUser: currentUser,
       dataProfile: dataProfile,
       updateProfile: updateProfile,
       goBack: goBack
@@ -81747,34 +81771,6 @@ var ChangePassword$1 = function ChangePassword(_ref) {
   }));
 };
 
-var USER_URL$5 = marioCore.BASE_URL + "/api/user";
-var USER_EDU_URL$1 = marioCore.BASE_URL + "/api/User";
-var CHANGE_PASSWORD$1 = marioCore.BASE_URL + "/api/Account/changePassword";
-var ACCOUNT_URL$1 = marioCore.BASE_URL + "/api/account";
-var getById$q = function getById(id) {
-  return marioCore.api.get(USER_URL$5 + "/" + id);
-};
-var getByIdUser = function getByIdUser(id) {
-  return marioCore.api.get(USER_EDU_URL$1 + "/detail-user/" + id);
-};
-var create$o = function create(data) {
-  return marioCore.api.post("" + USER_URL$5, data);
-};
-var update$q = function update(data) {
-  return marioCore.api.put(USER_URL$5 + "/" + data.id, data);
-};
-var changePassword = function changePassword(formData) {
-  return marioCore.api.post(CHANGE_PASSWORD$1, formData);
-};
-var forgotChangePassword = function forgotChangePassword(data) {
-  return marioCore.api.post(ACCOUNT_URL$1 + "/forgotchangepassword", data);
-};
-var getTeachers = function getTeachers(filters) {
-  return marioCore.api.get(USER_URL$5 + "/all/teacher", {
-    params: filters
-  });
-};
-
 var initValue$v = {
   id: "",
   firstName: "",