mario-core 2.9.26-beta → 2.9.27-admin

package/dist/index.d.ts

@@ -45,6 +45,7 @@ import useGalleryList from "./containers/Gallery/hooks/useGalleryList";
 import QuitPrompt from "./components/Others/QuitPrompt";
 import AcademicClassSelector from "./components/Selectors/AcademicClassSelector";
 import SchoolList from "./containers/DistrictSchools/views/SchoolList";
+import { INIT_AMPLITUDE_KEY } from "./utils/constants";
 import store from "./store";
 import { api, apiUpload } from "./services/api";
 import editorConfig from "./configs/editorConfig";
@@ -104,4 +105,4 @@ 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, 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 };
+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

@@ -10,6 +10,7 @@ var yup = require('yup');
 var reactRedux = require('react-redux');
 var toolkit = require('@reduxjs/toolkit');
 var axios = _interopDefault(require('axios'));
+var amplitude = _interopDefault(require('amplitude-js'));
 var reactGoogleRecaptchaV3 = require('react-google-recaptcha-v3');
 var GoogleLogin = _interopDefault(require('react-google-login'));
 var Select = _interopDefault(require('react-select'));
@@ -29,7 +30,6 @@ var ReactNotification$1 = _interopDefault(require('react-notifications-component
 require('react-notifications-component/dist/theme.css');
 var ai = require('react-icons/ai');
 var moment = _interopDefault(require('moment'));
-var amplitude = _interopDefault(require('amplitude-js'));
 
 // A type of promise-like that resolves synchronously and supports only one observer
 
@@ -108,6 +108,7 @@ var PasswordInput = function PasswordInput(_ref) {
 
 var TINY_MCE_API_KEY = "adpshj9swgsscf83gw4gs2f74nx0vicpd5ydka20iqjd7l8r";
 var GOOGLE_RECAPTCHA_KEY = "6LfNtLUaAAAAAL24lbBV11jS-gBtt1mhtxb4NXs0";
+var INIT_AMPLITUDE_KEY = "860fa99c52ae79d98e904b4c862ddaac";
 var ACCESS_TOKEN = "ACCESS_TOKEN";
 var DEFAULT_PAGE_SIZE_VALUES = [{
   label: "10",
@@ -303,6 +304,16 @@ var apiUpload = axios.create({
       Object.keys(localStorage).forEach(function (key) {
         if (!key.includes('learning-plan')) delete localStorage[key];
       });
+      var userEmail = localStorage.getItem("USER_EMAIL");
+
+      if (userEmail) {
+        amplitude.getInstance().logEvent("general: session end", {
+          user_id: userEmail
+        });
+        amplitude.getInstance().resetSessionId();
+      }
+
+      localStorage.setItem("USER_EMAIL", "");
       window.location.href = "/login";
     }
 
@@ -416,7 +427,8 @@ var useLogin = function useLogin() {
               lastName = _res$data.lastName,
               roles = _res$data.roles,
               email = _res$data.email,
-              profileImageFileName = _res$data.profileImageFileName;
+              profileImageFileName = _res$data.profileImageFileName,
+              isLoginFirst = _res$data.isLoginFirst;
           localStorage.setItem(ACCESS_TOKEN, token);
           dispatch(setUser({
             id: id,
@@ -427,6 +439,26 @@ var useLogin = function useLogin() {
             profileImageFileName: profileImageFileName
           }));
 
+          if (data !== null && data !== void 0 && data.email && !roles.includes("Admin")) {
+            amplitude.getInstance().init(INIT_AMPLITUDE_KEY, data.email, {
+              includeReferrer: false,
+              includeUtm: false
+            });
+            var hostName = window.location.hostname;
+            amplitude.getInstance().logEvent("general: session start", {
+              user_id: data.email,
+              domain: hostName
+            });
+            localStorage.setItem("USER_EMAIL", data.email);
+
+            if (isLoginFirst) {
+              amplitude.getInstance().logEvent("general: first login", {
+                user_id: data.email,
+                domain: hostName
+              });
+            }
+          }
+
           if (isDistrict) {
             history.push(HOMEPAGE_DISTRICT);
           } else if (roles.includes("Admin")) {
@@ -7150,6 +7182,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 : "",
@@ -7161,7 +7194,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;
   });
@@ -8106,6 +8140,7 @@ exports.FaqList = FaqList;
 exports.FileInput = InputFile;
 exports.GOOGLE_RECAPTCHA_KEY = GOOGLE_RECAPTCHA_KEY;
 exports.GalleryList = GalleryList;
+exports.INIT_AMPLITUDE_KEY = INIT_AMPLITUDE_KEY;
 exports.Images = Images;
 exports.LICENSE_AGGRID = LICENSE_AGGRID;
 exports.LinkEditButton = LinkEditButton;