mario-teacher-student-client 2.1.101-admin → 2.1.102-admin

package/dist/index.js

@@ -751,11 +751,11 @@ var HeaderSideBar = function HeaderSideBar(_ref) {
 
     return (_state$common3 = state.common) === null || _state$common3 === void 0 ? void 0 : (_state$common3$user = _state$common3.user) === null || _state$common3$user === void 0 ? void 0 : _state$common3$user.roles;
   });
-  var isTeacher = roles.includes("Teacher") || roles.includes("Assistant");
-  var isParent = roles.includes("Parent");
-  var isAssistant = roles.includes("Assistant") && !roles.includes("Teacher");
-  var isEduTeacher = roles.includes("EduTeacher");
-  var isStudent = roles.includes("Student");
+  var isTeacher = (roles === null || roles === void 0 ? void 0 : roles.includes("Teacher")) || (roles === null || roles === void 0 ? void 0 : roles.includes("Assistant"));
+  var isParent = roles === null || roles === void 0 ? void 0 : roles.includes("Parent");
+  var isAssistant = (roles === null || roles === void 0 ? void 0 : roles.includes("Assistant")) && !(roles !== null && roles !== void 0 && roles.includes("Teacher"));
+  var isEduTeacher = roles === null || roles === void 0 ? void 0 : roles.includes("EduTeacher");
+  var isStudent = roles === null || roles === void 0 ? void 0 : roles.includes("Student");
   var isOpenSideBar = reactRedux.useSelector(function (state) {
     var _state$common4;
 
@@ -1147,7 +1147,7 @@ var HeaderSideBar = function HeaderSideBar(_ref) {
       paddingTop: 0
     }
   }, !!navigations && navigations.map(function (navigation) {
-    var _ICON_NAV$find;
+    var _navigation$to, _navigation$to2, _navigation$to3, _navigation$to4, _ICON_NAV$find;
 
     return React__default.createElement(core.ListItem, {
       button: true,
@@ -1192,7 +1192,7 @@ var HeaderSideBar = function HeaderSideBar(_ref) {
           history.push(navigation.to);
         }
       },
-      className: classes.drawerItem + " " + (urlActive != "" && (navigation.to.includes(urlActive) || navigation.to.includes("my-student") && urlActive == "student-detail" || navigation.to.includes("my-one-to-one") && urlActive == "start-question" || navigation.to.includes("my-conferences") && urlActive == "start-conference") ? classes.drawerActive : "")
+      className: classes.drawerItem + " " + (urlActive != "" && (navigation !== null && navigation !== void 0 && (_navigation$to = navigation.to) !== null && _navigation$to !== void 0 && _navigation$to.includes(urlActive) || navigation !== null && navigation !== void 0 && (_navigation$to2 = navigation.to) !== null && _navigation$to2 !== void 0 && _navigation$to2.includes("my-student") && urlActive == "student-detail" || navigation !== null && navigation !== void 0 && (_navigation$to3 = navigation.to) !== null && _navigation$to3 !== void 0 && _navigation$to3.includes("my-one-to-one") && urlActive == "start-question" || navigation !== null && navigation !== void 0 && (_navigation$to4 = navigation.to) !== null && _navigation$to4 !== void 0 && _navigation$to4.includes("my-conferences") && urlActive == "start-conference") ? classes.drawerActive : "")
     }, React__default.createElement(core.ListItemIcon, null, (_ICON_NAV$find = ICON_NAV.find(function (nav) {
       return nav.name.trim().toLocaleLowerCase() == navigation.name.trim().toLocaleLowerCase();
     })) === null || _ICON_NAV$find === void 0 ? void 0 : _ICON_NAV$find.icon), React__default.createElement(core.ListItemText, null, React__default.createElement("span", {
@@ -1212,7 +1212,7 @@ var HeaderSideBar = function HeaderSideBar(_ref) {
   }, React__default.createElement(core.List, {
     className: classes.listItem
   }, !!navigations && navigations.map(function (navigation) {
-    var _ICON_NAV$find2;
+    var _navigation$to5, _navigation$to6, _ICON_NAV$find2;
 
     return React__default.createElement(core.ListItem, {
       button: true,
@@ -1221,7 +1221,7 @@ var HeaderSideBar = function HeaderSideBar(_ref) {
         toggleSideBar();
         history.push(navigation.to);
       },
-      className: classes.drawerItem + " " + (urlActive != "" && (navigation.to.includes(urlActive) || navigation.to.includes("my-student") && urlActive == "student-detail") ? classes.drawerActive : "")
+      className: classes.drawerItem + " " + (urlActive != "" && (navigation !== null && navigation !== void 0 && (_navigation$to5 = navigation.to) !== null && _navigation$to5 !== void 0 && _navigation$to5.includes(urlActive) || navigation !== null && navigation !== void 0 && (_navigation$to6 = navigation.to) !== null && _navigation$to6 !== void 0 && _navigation$to6.includes("my-student") && urlActive == "student-detail") ? classes.drawerActive : "")
     }, React__default.createElement(core.ListItemIcon, null, (_ICON_NAV$find2 = ICON_NAV.find(function (nav) {
       return nav.name == navigation.name;
     })) === null || _ICON_NAV$find2 === void 0 ? void 0 : _ICON_NAV$find2.icon), React__default.createElement(core.ListItemText, {
@@ -1607,6 +1607,9 @@ var MainLayout = function MainLayout(_ref) {
 
           var roles = [];
           var userData = info.data;
+          console.log({
+            userData: userData
+          });
 
           for (var _iterator = _createForOfIteratorHelperLoose(prioritizedRoles), _step; !(_step = _iterator()).done;) {
             var _userData$roles;