mario-education 2.4.603-feedback → 2.4.605-feedback

package/dist/containers/FrequencyAndSetup/hooks/useFrequencyAndSetup.d.ts

@@ -8,7 +8,7 @@ declare const useFrequencyAndSetup: () => {
     openModalDelete: boolean;
     setOpenModalDelete: import("react").Dispatch<import("react").SetStateAction<boolean>>;
     setup: IWellBeingSetup;
-    onChangeSetup: <K extends "id" | "contacts" | "sections" | "frequencyMode" | "frequencyType" | "customFrequencyDays" | "isContactFlowEnabled">(key: K, value: IWellBeingSetup[K]) => void;
+    onChangeSetup: <K extends "id" | "frequencyMode" | "frequencyType" | "customFrequencyDays" | "isContactFlowEnabled" | "sections" | "contacts">(key: K, value: IWellBeingSetup[K]) => void;
     contacts: IWellBeingFlowContact[];
     sections: IWellBeingSection[];
     onChangeSections: (orderSections: IWellBeingSection[]) => void;

package/dist/index.js

@@ -16386,7 +16386,7 @@ var SurveyQuestionsList = function SurveyQuestionsList(_ref) {
     className: "d-flex align-items-center mr-3 " + stylesDetail["btn-remove"]
   }, React__default.createElement(fa.FaTrashAlt, null), React__default.createElement("span", {
     className: "ml-2 " + stylesDetail["btn-content"]
-  }, "Delete Bulk (" + questionSelected.questionCheckedIds.length + ")")), React__default.createElement(marioCore.AddButton, {
+  }, "Remove Bulk (" + questionSelected.questionCheckedIds.length + ")")), React__default.createElement(marioCore.AddButton, {
     text: t("create_question"),
     onClick: function onClick() {
       return goToDetailSurvey();
@@ -31186,8 +31186,6 @@ var Loading = function Loading(_ref) {
 };
 
 var StudentMultiSelector = function StudentMultiSelector(_ref) {
-  var _grades$filter$, _grades$filter;
-
   var student = _ref.student,
       setStudent = _ref.setStudent,
       studentData = _ref.studentData,
@@ -31201,17 +31199,16 @@ var StudentMultiSelector = function StudentMultiSelector(_ref) {
       t = _useTranslation.t;
 
   var classes = useAutoCompleteStyle();
-  var studentList = studentData || [];
-  var grade = (_grades$filter$ = grades === null || grades === void 0 ? void 0 : (_grades$filter = grades.filter(function (r) {
-    return r !== "All";
-  })) === null || _grades$filter === void 0 ? void 0 : _grades$filter[0]) != null ? _grades$filter$ : "";
-
-  if (!!grade) {
-    studentList = studentList.filter(function (r) {
-      return grade == r.gradeLevel;
-    }) || [];
-  }
-
+  var studentList = React.useMemo(function () {
+    if (!grades || grades.length === 0) return studentData || [];
+    var selectedGrades = grades.filter(function (g) {
+      return g !== 'All';
+    });
+    if (selectedGrades.length === 0) return studentData || [];
+    return (studentData || []).filter(function (s) {
+      return s.gradeLevel && selectedGrades.includes(s.gradeLevel);
+    });
+  }, [studentData, grades]);
   return React__default.createElement(core$1.Grid, null, React__default.createElement(core$1.FormControl, {
     fullWidth: true
   }, React__default.createElement(Autocomplete, {
@@ -31838,7 +31835,10 @@ var useStyles$6 = core$1.makeStyles({
   selectOutlined: {
     height: 48,
     display: 'flex',
-    alignItems: 'center'
+    alignItems: 'center',
+    '& .MuiSelect-select:focus': {
+      backgroundColor: 'transparent'
+    }
   }
 });
 
@@ -31876,6 +31876,7 @@ var DesktopFilterComponent = function DesktopFilterComponent(_ref) {
       t = _useTranslation.t;
 
   var classesSelect = useStyles$6();
+  var applyRef = React.useRef(false);
 
   var handleToggle = function handleToggle(grade) {
     setSelected(function (prev) {
@@ -31886,10 +31887,24 @@ var DesktopFilterComponent = function DesktopFilterComponent(_ref) {
   };
 
   var handleApplyFilterGrade = function handleApplyFilterGrade() {
+    applyRef.current = true;
     onChangeFilterGrade(selected);
     setOpen(false);
   };
 
+  var handleOpen = function handleOpen() {
+    applyRef.current = false;
+    setOpen(true);
+  };
+
+  var handleClose = function handleClose() {
+    setOpen(false);
+
+    if (!applyRef.current) {
+      setSelected(gradeFilter);
+    }
+  };
+
   var unDisabled = React.useMemo(function () {
     return (loadingComplete === null || loadingComplete === void 0 ? void 0 : loadingComplete.allStudent) && (loadingComplete === null || loadingComplete === void 0 ? void 0 : loadingComplete.dataChart) && (loadingComplete === null || loadingComplete === void 0 ? void 0 : loadingComplete.dataConversationGoal) && (loadingComplete === null || loadingComplete === void 0 ? void 0 : loadingComplete.dataDistribution) && (loadingComplete === null || loadingComplete === void 0 ? void 0 : loadingComplete.dataMetric) && (loadingComplete === null || loadingComplete === void 0 ? void 0 : loadingComplete.dataOverview) && (loadingComplete === null || loadingComplete === void 0 ? void 0 : loadingComplete.dataStatics) && (loadingComplete === null || loadingComplete === void 0 ? void 0 : loadingComplete.dataStudentPressure) && (loadingComplete === null || loadingComplete === void 0 ? void 0 : loadingComplete.gradeList) && (loadingComplete === null || loadingComplete === void 0 ? void 0 : loadingComplete.skillQuestion) && (loadingComplete === null || loadingComplete === void 0 ? void 0 : loadingComplete.summarizeReport);
   }, [loadingComplete]);
@@ -31909,12 +31924,8 @@ var DesktopFilterComponent = function DesktopFilterComponent(_ref) {
     htmlFor: "filter_grade_dashboard_label"
   }, t("grade")), React__default.createElement(core$1.Select, {
     open: open,
-    onOpen: function onOpen() {
-      return setOpen(true);
-    },
-    onClose: function onClose() {
-      return setOpen(false);
-    },
+    onOpen: handleOpen,
+    onClose: handleClose,
     labelId: "filter_grade_dashboard_label",
     id: "filter_grade_dashboard",
     multiple: true,
@@ -53077,9 +53088,11 @@ var ConfirmDeleteSelectedModal = function ConfirmDeleteSelectedModal(_ref) {
     className: styled['delete-survey-modal']
   }, React__default.createElement("h2", {
     className: styled['delete-survey-modal__title']
-  }, "Delete survey"), React__default.createElement("div", {
+  }, t('delete_survey')), React__default.createElement("div", {
     className: styled['delete-survey-modal__description']
-  }, "Are you sure to delete ", selectedIds.length, " survey(s)?"), React__default.createElement("div", {
+  }, t("are_you_sure_to_delete_selected_survey", {
+    number: (selectedIds === null || selectedIds === void 0 ? void 0 : selectedIds.length) || 0
+  })), React__default.createElement("div", {
     className: styled['delete-survey-modal__group-btn']
   }, React__default.createElement("button", {
     type: 'button',
@@ -53095,7 +53108,7 @@ var ConfirmDeleteSelectedModal = function ConfirmDeleteSelectedModal(_ref) {
     }
   }, React__default.createElement(DoneCheckInIcon, {
     color: '#fff'
-  }), "yes, i'm sure!"))));
+  }), t('yes_im_sure')))));
 };
 
 var ConfirmDeleteSelectedModal$1 = React.memo(ConfirmDeleteSelectedModal);