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

package/dist/containers/Goals/components/GoalProgress.d.ts

@@ -2,6 +2,7 @@
 interface GoalProgressProps {
     studentId: any;
     classFontSize: string;
+    isAdmin?: boolean;
 }
 declare const GoalProgress: (props: GoalProgressProps) => JSX.Element;
 export default GoalProgress;

package/dist/containers/MyStudent/hooks/useOverview.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="react" />
 import { FILTER_STUDENT_WELLBEING } from "../constants/types";
 declare const useOverview: (studentId: number) => {
+    isAdmin: any;
     partnerData: any;
     informationDashboard: any;
     filters: FILTER_STUDENT_WELLBEING;

package/dist/index.js

@@ -688,7 +688,7 @@ var STEP_PROFILE = {
 
 var prioritizedRoles = ["Admin", "Teacher", "Assistant", "EduTeacher", "Student", "Parent"];
 var handleUserRole = function handleUserRole(userRoles) {
-  if (userRoles.includes("Teacher") && userRoles.includes("Assistant")) {
+  if (userRoles !== null && userRoles !== void 0 && userRoles.includes("Teacher") && userRoles !== null && userRoles !== void 0 && userRoles.includes("Assistant")) {
     var roles = userRoles.filter(function (r) {
       return r !== "Teacher" && r !== "Assistant";
     });
@@ -714,7 +714,7 @@ var defaultFontLarge = 20;
 var LOGO = "/images/logo.svg";
 
 var HeaderSideBar = function HeaderSideBar(_ref) {
-  var _currentUrl$split, _clsx;
+  var _user$roles, _currentUrl$split, _handleUserRole, _clsx;
 
   var children = _ref.children,
       navigations = _ref.navigations,
@@ -732,6 +732,7 @@ var HeaderSideBar = function HeaderSideBar(_ref) {
 
     return (_state$common = state.common) === null || _state$common === void 0 ? void 0 : _state$common.user;
   });
+  var isAdmin = user === null || user === void 0 ? void 0 : (_user$roles = user.roles) === null || _user$roles === void 0 ? void 0 : _user$roles.includes("Admin");
   var userId = user === null || user === void 0 ? void 0 : user.id;
   var defaultFont = reactRedux.useSelector(function (state) {
     var _state$common2;
@@ -751,11 +752,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;
 
@@ -1025,7 +1026,7 @@ var HeaderSideBar = function HeaderSideBar(_ref) {
   return React__default.createElement("div", null, React__default.createElement(AppBar, {
     position: "fixed",
     className: classes.header
-  }, React__default.createElement(Toolbar, null, !isParentPage && React__default.createElement(IconButton, {
+  }, React__default.createElement(Toolbar, null, !isParentPage && !isAdmin && React__default.createElement(IconButton, {
     edge: "start",
     className: classes.menuButton,
     color: "inherit",
@@ -1062,7 +1063,7 @@ var HeaderSideBar = function HeaderSideBar(_ref) {
     "aria-label": "show 17 new notifications",
     color: "inherit",
     onClick: handleMenu
-  }, React__default.createElement(icons.AccountCircle, null)), React__default.createElement(IconButton, {
+  }, React__default.createElement(icons.AccountCircle, null)), !isAdmin && React__default.createElement(IconButton, {
     edge: "end",
     "aria-label": "account of current user",
     "aria-haspopup": "true",
@@ -1124,14 +1125,14 @@ var HeaderSideBar = function HeaderSideBar(_ref) {
     onClose: handleClose
   }, !!isTeacher && React__default.createElement(core.MenuItem, {
     onClick: openProfile
-  }, "Profile"), handleUserRole(user === null || user === void 0 ? void 0 : user.userRoles).length > 1 && React__default.createElement(core.MenuItem, {
+  }, "Profile"), ((_handleUserRole = handleUserRole((user === null || user === void 0 ? void 0 : user.userRoles) || [])) === null || _handleUserRole === void 0 ? void 0 : _handleUserRole.length) > 1 && React__default.createElement(core.MenuItem, {
     onClick: function onClick() {
       onToggleModel === null || onToggleModel === void 0 ? void 0 : onToggleModel();
       handleClose();
     }
   }, "Role change"), React__default.createElement(core.MenuItem, {
     onClick: signOut
-  }, "Logout")))), screenWidth > 600 && isOpenSideBar ? React__default.createElement("div", {
+  }, "Logout")))), !isAdmin && React__default.createElement(React__default.Fragment, null, screenWidth > 600 && isOpenSideBar ? React__default.createElement("div", {
     className: classes.positionBox
   }, React__default.createElement(core.Drawer, {
     id: "menu-sidebar",
@@ -1147,7 +1148,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 +1193,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 +1213,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,14 +1222,14 @@ 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, {
       primary: navigation === null || navigation === void 0 ? void 0 : navigation.name
     }));
-  }))), React__default.createElement("main", {
-    className: clsx(classes.content, (_clsx = {}, _clsx[classes.contentShift] = isOpenSideBar && isOpenSideBar, _clsx))
+  })))), React__default.createElement("main", {
+    className: clsx(classes.content, (_clsx = {}, _clsx[classes.contentShift] = isAdmin ? false : isOpenSideBar, _clsx))
   }, children));
 };
 var useStyles = styles$O.makeStyles(function (theme) {
@@ -1593,6 +1594,8 @@ 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;
+
           function _temp4() {
             dispatch(marioCore.setUser(_extends({}, user, userData, {
               email: userData.email,
@@ -1616,7 +1619,7 @@ var MainLayout = function MainLayout(_ref) {
             if (userData !== null && userData !== void 0 && (_userData$roles = userData.roles) !== null && _userData$roles !== void 0 && _userData$roles.includes(r)) {
               var _userData$roles2;
 
-              if (r.includes("Teacher") && userData !== null && userData !== void 0 && (_userData$roles2 = userData.roles) !== null && _userData$roles2 !== void 0 && _userData$roles2.includes("Assistant")) {
+              if (r === "Teacher" && userData !== null && userData !== void 0 && (_userData$roles2 = userData.roles) !== null && _userData$roles2 !== void 0 && _userData$roles2.includes("Assistant")) {
                 roles = ["Teacher", "Assistant"];
               } else {
                 roles = [r];
@@ -1626,10 +1629,10 @@ var MainLayout = function MainLayout(_ref) {
             }
           }
 
-          var isTeacher = roles.includes("Teacher") || roles.includes("Assistant");
+          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 isStudent = roles.includes("Student");
-          var isAssistant = !roles.includes("Teacher") && roles.includes("Assistant");
-          var isTeacherAssistant = roles.includes("Teacher") && roles.includes("Assistant");
+          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 _temp3 = function () {
             if (isTeacher || isStudent || isTeacherAssistant) {
@@ -17341,7 +17344,7 @@ var TabPanel$3 = function TabPanel(props) {
 };
 
 var StudentTabs = function StudentTabs(props) {
-  var _useSelector, _useSelector$roles;
+  var _user$roles, _useSelector, _useSelector$roles;
 
   var history = reactRouterDom.useHistory();
   var location = reactRouterDom.useLocation();
@@ -17362,6 +17365,7 @@ var StudentTabs = function StudentTabs(props) {
 
     return (_state$common = state.common) === null || _state$common === void 0 ? void 0 : _state$common.user;
   });
+  var isAdmin = user === null || user === void 0 ? void 0 : (_user$roles = user.roles) === null || _user$roles === void 0 ? void 0 : _user$roles.includes("Admin");
   var dispatch = reactRedux.useDispatch();
   var useStyles = styles$O.makeStyles(function (theme) {
     var _divDiv, _theme$breakpoints$do, _tabLabel;
@@ -17469,7 +17473,7 @@ var StudentTabs = function StudentTabs(props) {
       className: classes.header
     }, React__default.createElement(core.Typography, {
       className: classes.title
-    }, React__default.createElement(BiArrowBack, {
+    }, !isAdmin && React__default.createElement(BiArrowBack, {
       className: classes.iconArr,
       onClick: function onClick() {
         return goBack();
@@ -17490,7 +17494,7 @@ var StudentTabs = function StudentTabs(props) {
       variant: "scrollable",
       scrollButtons: "on"
     }, tabs.map(function (tab, index) {
-      return React__default.createElement(Tab, {
+      return !isAdmin ? React__default.createElement(React__default.Fragment, null, React__default.createElement(Tab, {
         key: index,
         label: tab.title,
         onClick: function onClick() {
@@ -17514,7 +17518,31 @@ var StudentTabs = function StudentTabs(props) {
           toggle(tab.path + ("" + studentId));
         },
         className: classes.tabLabel + " " + (activeTab === index ? classes.tabLabelActive : "")
-      });
+      })) : React__default.createElement(React__default.Fragment, null, isAdmin == tab.showForAdmin && React__default.createElement(Tab, {
+        key: index,
+        label: tab.title,
+        onClick: function onClick() {
+          if (EVENT_LOG_TAB.some(function (i) {
+            return tab.title.includes(i.tabName);
+          })) {
+            var _EVENT_LOG_TAB$find2;
+
+            dispatch(marioCore.initAmplitude({
+              name: user.email,
+              event: "plp: view page",
+              student_id: studentInfo === null || studentInfo === void 0 ? void 0 : studentInfo.email,
+              page: EVENT_LOG_TAB !== null && EVENT_LOG_TAB !== void 0 && EVENT_LOG_TAB.find(function (i) {
+                return tab.title.includes(i.tabName);
+              }) ? (_EVENT_LOG_TAB$find2 = EVENT_LOG_TAB.find(function (i) {
+                return tab.title.includes(i.tabName);
+              })) === null || _EVENT_LOG_TAB$find2 === void 0 ? void 0 : _EVENT_LOG_TAB$find2.pageName : ""
+            }));
+          }
+
+          toggle(tab.path + ("" + studentId));
+        },
+        className: classes.tabLabel + " " + (activeTab === index ? classes.tabLabelActive : "")
+      }));
     }))), tabs.map(function (tab, index) {
       return React__default.createElement(TabPanel$3, {
         value: activeTab,
@@ -17713,7 +17741,8 @@ var handleShowStatus = function handleShowStatus(status) {
 
 var GoalProgress = function GoalProgress(props) {
   var studentId = props.studentId,
-      classFontSize = props.classFontSize;
+      classFontSize = props.classFontSize,
+      isAdmin = props.isAdmin;
   var history = reactRouterDom.useHistory();
 
   var _useGoalProgress = useGoalProgress(),
@@ -17748,7 +17777,7 @@ var GoalProgress = function GoalProgress(props) {
     className: "" + styles$8["box-header"]
   }, React__default.createElement(core.Typography, {
     className: "" + styles$8["box-header-title"]
-  }, "Goal Process"), React__default.createElement(core.Grid, {
+  }, "Goal Process"), !isAdmin && React__default.createElement(core.Grid, {
     onClick: function onClick() {
       return handleClickOpen();
     },
@@ -18007,7 +18036,7 @@ var TabPanel$4 = function TabPanel(props) {
 };
 
 var OverviewLeft = function OverviewLeft(props) {
-  var _useSelector, _useSelector$roles, _partnerData$meetingS, _partnerData$meetingS2, _partnerData$classSch, _partnerData$classSch2, _partnerData$meetingS3, _partnerData$meetingS4, _partnerData$classSch3, _partnerData$classSch4;
+  var _useSelector, _useSelector$roles, _useSelector2, _useSelector2$roles, _partnerData$meetingS, _partnerData$meetingS2, _partnerData$classSch, _partnerData$classSch2, _partnerData$meetingS3, _partnerData$meetingS4, _partnerData$classSch3, _partnerData$classSch4;
 
   var history = reactRouterDom.useHistory();
   var partnerData = props.partnerData,
@@ -18028,6 +18057,11 @@ var OverviewLeft = function OverviewLeft(props) {
 
     return (_state$common = state.common) === null || _state$common === void 0 ? void 0 : _state$common.user;
   })) === null || _useSelector === void 0 ? void 0 : (_useSelector$roles = _useSelector.roles) === null || _useSelector$roles === void 0 ? void 0 : _useSelector$roles.includes("EduTeacher");
+  var isAdmin = (_useSelector2 = reactRedux.useSelector(function (state) {
+    var _state$common2;
+
+    return (_state$common2 = state.common) === null || _state$common2 === void 0 ? void 0 : _state$common2.user;
+  })) === null || _useSelector2 === void 0 ? void 0 : (_useSelector2$roles = _useSelector2.roles) === null || _useSelector2$roles === void 0 ? void 0 : _useSelector2$roles.includes("Admin");
 
   var openEdit = function openEdit() {
     var url = "/student-detail/profile/" + studentId + "/update";
@@ -18079,7 +18113,7 @@ var OverviewLeft = function OverviewLeft(props) {
       paddingRight: "15px",
       textAlign: "right"
     }
-  }, !isEduTeacher && React__default.createElement(core.Button, {
+  }, !isEduTeacher && !isAdmin && React__default.createElement(core.Button, {
     variant: "contained",
     color: "primary",
     style: {
@@ -18227,7 +18261,8 @@ var OverviewLeft = function OverviewLeft(props) {
     }
   }, "No Schedule"))))))))), React__default.createElement(GoalProgress, {
     studentId: studentId,
-    classFontSize: classFontSize
+    classFontSize: classFontSize,
+    isAdmin: isAdmin
   }), !isEduTeacher && React__default.createElement(MyNote, {
     studentId: studentId,
     classFontSize: classFontSize
@@ -18413,7 +18448,8 @@ var OverviewLeft = function OverviewLeft(props) {
     }
   }, "No Schedule"))))))))), React__default.createElement(GoalProgress, {
     studentId: studentId,
-    classFontSize: classFontSize
+    classFontSize: classFontSize,
+    isAdmin: isAdmin
   }), !isEduTeacher && React__default.createElement(MyNote, {
     studentId: studentId,
     classFontSize: classFontSize
@@ -19800,6 +19836,8 @@ var defaultFontSmall$a = 12;
 var defaultFontLarge$a = 20;
 
 var useOverview = function useOverview(studentId) {
+  var _useSelector, _useSelector$roles;
+
   var dispatch = reactRedux.useDispatch();
 
   var _useRedinessToLearn = useRedinessToLearn(studentId),
@@ -19894,6 +19932,11 @@ var useOverview = function useOverview(studentId) {
 
     return (_state$common = state.common) === null || _state$common === void 0 ? void 0 : _state$common.defaultFontSize;
   });
+  var isAdmin = (_useSelector = reactRedux.useSelector(function (state) {
+    var _state$common2;
+
+    return (_state$common2 = state.common) === null || _state$common2 === void 0 ? void 0 : _state$common2.user;
+  })) === null || _useSelector === void 0 ? void 0 : (_useSelector$roles = _useSelector.roles) === null || _useSelector$roles === void 0 ? void 0 : _useSelector$roles.includes("Admin");
   var classFontSize = React.useMemo(function () {
     if (defaultFont == defaultFontLarge$a) {
       return "font-large";
@@ -20035,6 +20078,7 @@ var useOverview = function useOverview(studentId) {
     }
   }, []);
   return {
+    isAdmin: isAdmin,
     partnerData: partnerData,
     informationDashboard: informationDashboard,
     filters: filters,
@@ -35558,33 +35602,40 @@ var PersonalLearningGoal = function PersonalLearningGoal() {
 var tabs$2 = [{
   path: "/student-detail/overview/",
   title: "Overview",
-  component: Overview
+  component: Overview,
+  showForAdmin: true
 }, {
   path: "/personal-learning-plan/",
   title: "PLP",
-  component: PersonalLearningGoal
+  component: PersonalLearningGoal,
+  showForAdmin: false
 }, {
   path: "/student-detail/one-to-one/",
   title: "1-TO-1",
-  component: OneToOne
+  component: OneToOne,
+  showForAdmin: false
 }, {
   path: "/student-detail/conferences/",
   title: "CONFERENCES",
-  component: Conferences
+  component: Conferences,
+  showForAdmin: false
 }, {
   path: "/student-detail/class-reflections/",
   title: "CLASS REFLECTIONS",
-  component: ClassReflection
+  component: ClassReflection,
+  showForAdmin: false
 }];
 var tabIEP = {
   path: "/student-detail/learning-plan/",
   title: "IEP",
-  component: LearningPlan
+  component: LearningPlan,
+  showForAdmin: false
 };
 var tabConversation = {
   path: "/student-detail/one-to-one-conversation/",
   title: "1-TO-1 Conversation",
-  component: OneToOneConversation
+  component: OneToOneConversation,
+  showForAdmin: false
 };
 
 var StudentDetail = function StudentDetail() {