mario-core 2.9.34-beta → 2.9.35-admin

package/dist/index.d.ts

@@ -101,8 +101,8 @@ import { setDataPlayer, answerQuestionDataPlayer } from "./redux/dataPlayer/acti
 import { setFilterWidget } from "./redux/widget/action";
 import { setBandScoreList } from "./redux/bandScores/action";
 import { setStudentIdSelectedByTeacher } from "./redux/navMobile/action";
-import { setEnableIEP, setEnableSurvey, setConversationOneToOne } from "./redux/commons/action";
+import { setEnableIEP, setConversationOneToOne } from "./redux/commons/action";
 import useFilters from "./hooks/useFilters";
 import amplitude from "amplitude-js";
 declare const amplitudeClient: amplitude.AmplitudeClient;
-export { Login, Dashboard, TheLayout, TheContent, NotFound, EmailTemplateList, EmailTemplateDetail, FaqList, SkillList, UserList, UserDetail, Loading, NotificationModal, CommonHeader, CommonModal, AddButton, DeleteButtonIcon, EditButtonIcon, LinkEditButton, ToggleButton, EmptyDataAlert, CreatableSelector, CustomPagination, SearchBox, FileInput, QuitPrompt, QuestionTypeSelector, QuestionCategorySelector, SuggestionCategorySelector, ErrorHandler, DetailActionButtons, RequiredLabel, StarRatingSelector, ReactNotification, NotificationList, CustomSelector, UploadFileButton, SearchBoxContainer, CustomTab, CommonAlert, GalleryList, MediaList, useGalleryList, AcademicClassSelector, SchoolList, store, showMenuBar, showFontSize, setLoading, setModal, setAlert, setClassList, setConferenceRubricList, setSuggestionList, setStrategyList, setSubjectList, setLearningSupportCategoryList, setQuestionList, setUserList, setStudentList, setBadgeList, setGoalExampleList, setSemesterList, setFeedbackList, setAssessmentList, setQuestionByCategory, setSelectQuestion, setMoveItemQuestion, setReflectionList, setReflectionResultList, setEditItemQuesion, setResetQuestionList, setMailCategory, setUser, setAssignmentList, setAssistantList, setSessionTemplateList, setTutorialScreenList, setSessionTemplateGeneralClassList, setCustomAlertList, setCertificateList, closeTab, addTab, editTab, clearTab, changeNote, changeTags, answerQuestion, setSessionPlayer, setStartTime, setTurnOffPassWhenChangeMode, reset, setImproveMyClass, setSchoolBlankDayList, setEnableIEP, setEnableSurvey, setConversationOneToOne, api, apiUpload, uploadFile, systemStudentBadge, systemCertificateUpload, BASE_URL, DEFAULT_FILTER, LICENSE_AGGRID, TINY_MCE_API_KEY, QUESTION_TYPES, QUESTION_TYPES_OPTIONS, ANSWER_EDITOR_HEIGHT, CHAT_CHANNEL, NOTIFICATION_CHANNEL, DATE_RESULT, DATE_FORMAT, FULL_DATE_RESULT, ACCESS_TOKEN, GOOGLE_RECAPTCHA_KEY, EMOTIONS, TAB_COLORS, Filter, Conversation, Message, ConversationMember, NavbarTab, editorConfig, generateRandomString, isInViewport, debounce, firstCheckToken, canAccessRoute, getFileUrl, getTextFromHTML, utcToLocalTime, getInfo, Images, setQuestionCateList, setMyStudent, setDataPlayer, answerQuestionDataPlayer, setCurrentStudentUserId, setCurrentStudentId, setCurrentStudentName, setFilterWidget, setBandScoreList, setStudentIdSelectedByTeacher, useFilters, ScrollToTop, initAmplitude, amplitudeClient, INIT_AMPLITUDE_KEY };
+export { Login, Dashboard, TheLayout, TheContent, NotFound, EmailTemplateList, EmailTemplateDetail, FaqList, SkillList, UserList, UserDetail, Loading, NotificationModal, CommonHeader, CommonModal, AddButton, DeleteButtonIcon, EditButtonIcon, LinkEditButton, ToggleButton, EmptyDataAlert, CreatableSelector, CustomPagination, SearchBox, FileInput, QuitPrompt, QuestionTypeSelector, QuestionCategorySelector, SuggestionCategorySelector, ErrorHandler, DetailActionButtons, RequiredLabel, StarRatingSelector, ReactNotification, NotificationList, CustomSelector, UploadFileButton, SearchBoxContainer, CustomTab, CommonAlert, GalleryList, MediaList, useGalleryList, AcademicClassSelector, SchoolList, store, showMenuBar, showFontSize, setLoading, setModal, setAlert, setClassList, setConferenceRubricList, setSuggestionList, setStrategyList, setSubjectList, setLearningSupportCategoryList, setQuestionList, setUserList, setStudentList, setBadgeList, setGoalExampleList, setSemesterList, setFeedbackList, setAssessmentList, setQuestionByCategory, setSelectQuestion, setMoveItemQuestion, setReflectionList, setReflectionResultList, setEditItemQuesion, setResetQuestionList, setMailCategory, setUser, setAssignmentList, setAssistantList, setSessionTemplateList, setTutorialScreenList, setSessionTemplateGeneralClassList, setCustomAlertList, setCertificateList, closeTab, addTab, editTab, clearTab, changeNote, changeTags, answerQuestion, setSessionPlayer, setStartTime, setTurnOffPassWhenChangeMode, reset, setImproveMyClass, setSchoolBlankDayList, setEnableIEP, setConversationOneToOne, api, apiUpload, uploadFile, systemStudentBadge, systemCertificateUpload, BASE_URL, DEFAULT_FILTER, LICENSE_AGGRID, TINY_MCE_API_KEY, QUESTION_TYPES, QUESTION_TYPES_OPTIONS, ANSWER_EDITOR_HEIGHT, CHAT_CHANNEL, NOTIFICATION_CHANNEL, DATE_RESULT, DATE_FORMAT, FULL_DATE_RESULT, ACCESS_TOKEN, GOOGLE_RECAPTCHA_KEY, EMOTIONS, TAB_COLORS, Filter, Conversation, Message, ConversationMember, NavbarTab, editorConfig, generateRandomString, isInViewport, debounce, firstCheckToken, canAccessRoute, getFileUrl, getTextFromHTML, utcToLocalTime, getInfo, Images, setQuestionCateList, setMyStudent, setDataPlayer, answerQuestionDataPlayer, setCurrentStudentUserId, setCurrentStudentId, setCurrentStudentName, setFilterWidget, setBandScoreList, setStudentIdSelectedByTeacher, useFilters, ScrollToTop, initAmplitude, amplitudeClient, INIT_AMPLITUDE_KEY };

package/dist/index.js

@@ -245,7 +245,6 @@ var reset = toolkit.createAction("common/reset");
 var showMenuBar = toolkit.createAction("common/showMenuBar");
 var showFontSize = toolkit.createAction("common/showFontSize");
 var setEnableIEP = toolkit.createAction("common/setEnableIEP");
-var setEnableSurvey = toolkit.createAction("common/setEnableSurvey");
 var setConversationOneToOne = toolkit.createAction("common/setConversationOneToOne");
 var setCurrentStudentId = toolkit.createAction("common/setCurrentStudentId");
 var setCurrentStudentUserId = toolkit.createAction("common/setCurrentStudentUserId");
@@ -306,10 +305,12 @@ var apiUpload = axios.create({
         if (!key.includes('learning-plan')) delete localStorage[key];
       });
       var userEmail = localStorage.getItem("USER_EMAIL");
+      var hostName = window.location.hostname;
 
       if (userEmail) {
         amplitude.getInstance().logEvent("general: session end", {
-          user_id: userEmail
+          user_id: userEmail,
+          domain: hostName
         });
         amplitude.getInstance().resetSessionId();
       }
@@ -442,17 +443,20 @@ var useLogin = function useLogin() {
 
           if (data !== null && data !== void 0 && data.email && !roles.includes("Admin")) {
             amplitude.getInstance().init(INIT_AMPLITUDE_KEY, data.email, {
-              includeReferrer: true,
-              includeUtm: true
+              includeReferrer: false,
+              includeUtm: false
             });
+            var hostName = window.location.hostname;
             amplitude.getInstance().logEvent("general: session start", {
-              user_id: data.email
+              user_id: data.email,
+              domain: hostName
             });
             localStorage.setItem("USER_EMAIL", data.email);
 
             if (isLoginFirst) {
               amplitude.getInstance().logEvent("general: first login", {
-                user_id: data.email
+                user_id: data.email,
+                domain: hostName
               });
             }
           }
@@ -7130,7 +7134,6 @@ var initialState = {
   menuBar: true,
   defaultFontSize: 16,
   isEnableIEP: true,
-  isEnableSurvey: false,
   isConversationOneToOne: false,
   amplitude: {
     user_id: "",
@@ -7174,8 +7177,6 @@ var commonReducer = toolkit.createReducer(initialState, function (builder) {
     state.menuBar = action.payload;
   }).addCase(setEnableIEP, function (state, action) {
     state.isEnableIEP = action.payload;
-  }).addCase(setEnableSurvey, function (state, action) {
-    state.isEnableSurvey = action.payload;
   }).addCase(setConversationOneToOne, function (state, action) {
     state.isConversationOneToOne = action.payload;
   }).addCase(showFontSize, function (state, action) {
@@ -7183,6 +7184,7 @@ var commonReducer = toolkit.createReducer(initialState, function (builder) {
   }).addCase(initAmplitude, function (state, action) {
     var _action$payload, _action$payload2, _action$payload3, _action$payload4, _action$payload5, _action$payload6, _action$payload7, _action$payload8, _action$payload9, _action$payload10, _action$payload11;
 
+    var hostName = window.location.hostname;
     var eventProperties = {
       user_id: (_action$payload = action.payload) === null || _action$payload === void 0 ? void 0 : _action$payload.name,
       status: (_action$payload2 = action.payload) !== null && _action$payload2 !== void 0 && _action$payload2.status ? (_action$payload3 = action.payload) === null || _action$payload3 === void 0 ? void 0 : _action$payload3.status : "",
@@ -7194,7 +7196,8 @@ var commonReducer = toolkit.createReducer(initialState, function (builder) {
       first_login: (_action$payload9 = action.payload) !== null && _action$payload9 !== void 0 && _action$payload9.first_login ? action.payload.first_login : "",
       duration_since: (_action$payload10 = action.payload) !== null && _action$payload10 !== void 0 && _action$payload10.duration_since ? action.payload.duration_since : 0,
       last_page: (_action$payload11 = action.payload) !== null && _action$payload11 !== void 0 && _action$payload11.last_page ? action.payload.last_page : "",
-      event: action.payload.event
+      event: action.payload.event,
+      domain: !!hostName ? hostName : ""
     };
     state.amplitude = eventProperties;
   });
@@ -8211,7 +8214,6 @@ exports.setCustomAlertList = setCustomAlertList;
 exports.setDataPlayer = setDataPlayer;
 exports.setEditItemQuesion = setEditItemQuesion;
 exports.setEnableIEP = setEnableIEP;
-exports.setEnableSurvey = setEnableSurvey;
 exports.setFeedbackList = setFeedbackList;
 exports.setFilterWidget = setFilterWidget;
 exports.setGoalExampleList = setGoalExampleList;