mario-teacher-student-client 2.1.106-admin → 2.1.108-admin

package/dist/index.js

@@ -686,7 +686,6 @@ var STEP_PROFILE = {
   message: "Edit your personal settings."
 };
 
-var prioritizedRoles = ["Admin", "Teacher", "Assistant", "EduTeacher", "Student", "Parent"];
 var handleUserRole = function handleUserRole(userRoles) {
   if (userRoles !== null && userRoles !== void 0 && userRoles.includes("Teacher") && userRoles !== null && userRoles !== void 0 && userRoles.includes("Assistant")) {
     var roles = userRoles.filter(function (r) {
@@ -1147,7 +1146,7 @@ var HeaderSideBar = function HeaderSideBar(_ref) {
     style: {
       paddingTop: 0
     }
-  }, !!navigations && navigations.map(function (navigation) {
+  }, !!navigations && (navigations === null || navigations === void 0 ? void 0 : navigations.map(function (navigation) {
     var _navigation$to, _navigation$to2, _navigation$to3, _navigation$to4, _ICON_NAV$find;
 
     return React__default.createElement(core.ListItem, {
@@ -1202,7 +1201,7 @@ var HeaderSideBar = function HeaderSideBar(_ref) {
         fontSize: tabLargeFontSize(defaultFont)
       }
     }, navigation === null || navigation === void 0 ? void 0 : navigation.name)));
-  }))), isLoginFirst && !isEduTeacher && !isParent && showNotification()) : isOpenSideBar && React__default.createElement(core.SwipeableDrawer, {
+  })))), isLoginFirst && !isEduTeacher && !isParent && showNotification()) : isOpenSideBar && React__default.createElement(core.SwipeableDrawer, {
     anchor: "left",
     open: isOpenSideBar,
     onClose: toggleSideBar,
@@ -1212,7 +1211,7 @@ var HeaderSideBar = function HeaderSideBar(_ref) {
     }
   }, React__default.createElement(core.List, {
     className: classes.listItem
-  }, !!navigations && navigations.map(function (navigation) {
+  }, !!navigations && (navigations === null || navigations === void 0 ? void 0 : navigations.map(function (navigation) {
     var _navigation$to5, _navigation$to6, _ICON_NAV$find2;
 
     return React__default.createElement(core.ListItem, {
@@ -1228,7 +1227,7 @@ var HeaderSideBar = function HeaderSideBar(_ref) {
     })) === null || _ICON_NAV$find2 === void 0 ? void 0 : _ICON_NAV$find2.icon), React__default.createElement(core.ListItemText, {
       primary: navigation === null || navigation === void 0 ? void 0 : navigation.name
     }));
-  })))), React__default.createElement("main", {
+  }))))), React__default.createElement("main", {
     className: clsx(classes.content, (_clsx = {}, _clsx[classes.contentShift] = isAdmin ? false : isOpenSideBar, _clsx))
   }, children));
 };
@@ -1594,7 +1593,7 @@ var MainLayout = function MainLayout(_ref) {
     try {
       var _temp6 = _catch(function () {
         return Promise.resolve(marioCore.getInfo()).then(function (info) {
-          var _roles, _roles2, _roles3, _roles4, _roles5, _roles6;
+          var _info$data;
 
           function _temp4() {
             dispatch(marioCore.setUser(_extends({}, user, userData, {
@@ -1608,40 +1607,12 @@ var MainLayout = function MainLayout(_ref) {
             resetAuth();
           }
 
-          var roles = [];
+          var roles = (_info$data = info.data) === null || _info$data === void 0 ? void 0 : _info$data.roles;
           var userData = info.data;
-          console.log({
-            userData: userData
-          });
-
-          for (var _iterator = _createForOfIteratorHelperLoose(prioritizedRoles), _step; !(_step = _iterator()).done;) {
-            var _userData$roles;
-
-            var r = _step.value;
-
-            if (userData !== null && userData !== void 0 && (_userData$roles = userData.roles) !== null && _userData$roles !== void 0 && _userData$roles.includes(r)) {
-              var _userData$roles2;
-
-              roles.push(r);
-
-              if (userData !== null && userData !== void 0 && (_userData$roles2 = userData.roles) !== null && _userData$roles2 !== void 0 && _userData$roles2.includes("Assistant")) {
-                roles.push("Assistant");
-              }
-
-              return;
-            }
-          }
-
-          roles = roles.filter(function (value, index, self) {
-            return self.indexOf(value) === index;
-          });
-          console.log({
-            roles: roles
-          });
-          var isTeacher = ((_roles = roles) === null || _roles === void 0 ? void 0 : _roles.includes("Teacher")) || ((_roles2 = roles) === null || _roles2 === void 0 ? void 0 : _roles2.includes("Assistant"));
+          var isTeacher = roles.includes("Teacher") || roles.includes("Assistant");
           var isStudent = roles.includes("Student");
-          var isAssistant = !((_roles3 = roles) !== null && _roles3 !== void 0 && _roles3.includes("Teacher")) && ((_roles4 = roles) === null || _roles4 === void 0 ? void 0 : _roles4.includes("Assistant"));
-          var isTeacherAssistant = ((_roles5 = roles) === null || _roles5 === void 0 ? void 0 : _roles5.includes("Teacher")) && ((_roles6 = roles) === null || _roles6 === void 0 ? void 0 : _roles6.includes("Assistant"));
+          var isAssistant = !roles.includes("Teacher") && roles.includes("Assistant");
+          var isTeacherAssistant = roles.includes("Teacher") && roles.includes("Assistant");
 
           var _temp3 = function () {
             if (isTeacher || isStudent || isTeacherAssistant) {