mario-core 2.9.108-beta → 2.9.113-beta

package/dist/containers/Login/constant/type.d.ts

@@ -0,0 +1,5 @@
+export interface IModelSelectRoles {
+    isOpenModel: boolean;
+    userRoles: string[];
+    onSelectUserRoles: Function;
+}

package/dist/containers/Login/views/ModelSelectRole.d.ts

@@ -0,0 +1,4 @@
+/// <reference types="react" />
+import { IModelSelectRoles } from "../constant/type";
+declare const ModelSelectRole: ({ isOpenModel, userRoles, onSelectUserRoles }: IModelSelectRoles) => JSX.Element;
+export default ModelSelectRole;

package/dist/index.js

@@ -2602,6 +2602,9 @@ var QUESTION_TYPES_OPTIONS = [{
 }, {
   label: "Learning strategy",
   value: "LearningStrategy"
+}, {
+  label: "Dropdown",
+  value: "Dropdown"
 }];
 var QUESTION_TYPES = {
   SINGLE_CHOICE: "SingleChoice",
@@ -2614,7 +2617,8 @@ var QUESTION_TYPES = {
   EMOTIONAL: "Emotional",
   SUMMARIZE: "Summarize",
   RATING: "Rating",
-  LEARNING_STRATEGY: "LearningStrategy"
+  LEARNING_STRATEGY: "LearningStrategy",
+  DROPDOWN: "Dropdown"
 };
 var STAR_OPTIONS = [{
   label: 2,
@@ -7199,15 +7203,12 @@ var UserDetail = function UserDetail() {
         return;
       }
 
-      if ([ROLES.ADMIN, ROLES.STUDENT, ROLES.PARENT, ROLES.EDUTEACHER, ROLES.COUNSELOR, ROLES.SECONDARY_TEACHER].includes(role)) {
+      if ([ROLES.ADMIN, ROLES.STUDENT, ROLES.PARENT, ROLES.EDUTEACHER].includes(role)) {
         setFieldValue("roles", [role]);
         return;
       }
 
-      var teacherAssistantRoles = values.roles.filter(function (item) {
-        return ![ROLES.STUDENT, ROLES.ADMIN, ROLES.PARENT, ROLES.EDUTEACHER, ROLES.COUNSELOR, ROLES.SECONDARY_TEACHER].includes(item);
-      });
-      setFieldValue("roles", [].concat(teacherAssistantRoles, [role]));
+      setFieldValue("roles", [].concat(values.roles, [role]));
     }, [values.roles]);
     return React__default.createElement("div", {
       className: "animated fadeIn detail-buttons-padding"
@@ -8008,11 +8009,14 @@ var NEW_NOTIFICATION$1 = "NEW_NOTIFICATION";
 
 var useNotificationList = function useNotificationList() {
   var dispatch = reactRedux.useDispatch();
-  var userId = reactRedux.useSelector(function (state) {
-    var _state$common$user;
 
-    return (_state$common$user = state.common.user) === null || _state$common$user === void 0 ? void 0 : _state$common$user.id;
+  var _useParams = reactRouterDom.useParams(),
+      roles = _useParams.roles;
+
+  var user = reactRedux.useSelector(function (state) {
+    return state.common.user;
   });
+  var userId = user === null || user === void 0 ? void 0 : user.id;
   var notificationList = reactRedux.useSelector(function (state) {
     return state.notification.notificationList;
   });
@@ -8103,7 +8107,9 @@ var useNotificationList = function useNotificationList() {
       dispatch(setLoading(true));
 
       var _temp4 = _catch(function () {
-        return Promise.resolve(get(filters)).then(function (res) {
+        return Promise.resolve(get(_extends({}, filters, {
+          roles: !(roles !== null && roles !== void 0 && roles.trim()) ? user === null || user === void 0 ? void 0 : user.roles : [roles] || []
+        }))).then(function (res) {
           var _res$data = res.data,
               items = _res$data.items,
               totalItems = _res$data.totalItems;