acsi-core 1.1.3 → 1.2.1

package/dist/containers/Login/apiClient/index.d.ts

@@ -1,5 +1,5 @@
-export declare const getGoogleClientId: () => Promise<import("axios").AxiosResponse<any, any, {}>>;
-export declare const apiLoginGoogle: (body: any) => Promise<import("axios").AxiosResponse<any, any, {}>>;
-export declare const apiSendEmailCode: (body: any) => Promise<import("axios").AxiosResponse<any, any, {}>>;
-export declare const apiCheckEmailCode: (params: any) => Promise<import("axios").AxiosResponse<any, any, {}>>;
-export declare const apiGetImage: () => Promise<import("axios").AxiosResponse<any, any, {}>>;
+export declare const getGoogleClientId: () => Promise<import("axios").AxiosResponse<any, any>>;
+export declare const apiLoginGoogle: (body: any) => Promise<import("axios").AxiosResponse<any, any>>;
+export declare const apiSendEmailCode: (body: any) => Promise<import("axios").AxiosResponse<any, any>>;
+export declare const apiCheckEmailCode: (params: any) => Promise<import("axios").AxiosResponse<any, any>>;
+export declare const apiGetImage: () => Promise<import("axios").AxiosResponse<any, any>>;

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 declare const historyCore: import("history").History<unknown>;
 import { setLoading, setAlert, setTenant, setAddTenant, setTeam, setUser, setMenuCollapse, setIsRefetchSidebar, setLoadingPage, setIsFirstCalendar } from "./redux/commons/action";
-import { BASE_URL, ACCESS_TOKEN, DATE_TIME_MIN_VALUE, OPENSALT_BASE_URL, ORGANIZATION_TEAM, ORGANIZATION_TENANT } from "./utils/constants";
+import { BASE_URL, ACCESS_TOKEN, DATE_TIME_MIN_VALUE, OPENSALT_BASE_URL, ORGANIZATION_TEAM, ORGANIZATION_TENANT, TIMEZONE_ID } from "./utils/constants";
 import Login from "./containers/Login/views/Login";
 import store from "./store";
 import getAccessToken from "./utils/getAccessToken";
@@ -30,4 +30,4 @@ import CustomSelectOption from "./components/Selects/CustomSelectOption";
 import utcToLocalTime from "./utils/utcToLocalTime";
 import timeSpanToLocalMoment from "./utils/timeSpanToLocalMoment";
 import Cookies from "js-cookie";
-export { setLoading, setLoadingPage, setIsFirstCalendar, BASE_URL, OPENSALT_BASE_URL, ACCESS_TOKEN, DATE_TIME_MIN_VALUE, ORGANIZATION_TEAM, ORGANIZATION_TENANT, firstCheckToken, getImageUrl, Login, utcToLocalTime, timeSpanToLocalMoment, getAccessToken, store, historyCore, setAlert, setUser, setTenant, setAddTenant, setTeam, setMenuCollapse, setIsRefetchSidebar, Loading, NotFound, LayoutContext, api, apiUpload, ConfirmDialog, CommonDialog, ToastContainer, toast, Role, Cookies, CustomPagination, useGoogleSignOut, CoreButton, CoreInput, CoreSelect, CoreCheckbox, CoreRadio, CoreError, CoreModal, CoreRange, CoreTextArea, CoreSearch, CoreSelectCompact, CoreInputCompact, CoreTitleInput, CoreTooltip, getErrorMessage, MarkdownLatexRender, CustomSelect, CustomAsyncSelect, CustomCreatable, CustomSelectOption, GoogleOAuthProvider, useAmplitude, AmplitudeEvent, initializeAmplitude, initSentry };
+export { setLoading, setLoadingPage, setIsFirstCalendar, BASE_URL, OPENSALT_BASE_URL, ACCESS_TOKEN, DATE_TIME_MIN_VALUE, ORGANIZATION_TEAM, ORGANIZATION_TENANT, TIMEZONE_ID, firstCheckToken, getImageUrl, Login, utcToLocalTime, timeSpanToLocalMoment, getAccessToken, store, historyCore, setAlert, setUser, setTenant, setAddTenant, setTeam, setMenuCollapse, setIsRefetchSidebar, Loading, NotFound, LayoutContext, api, apiUpload, ConfirmDialog, CommonDialog, ToastContainer, toast, Role, Cookies, CustomPagination, useGoogleSignOut, CoreButton, CoreInput, CoreSelect, CoreCheckbox, CoreRadio, CoreError, CoreModal, CoreRange, CoreTextArea, CoreSearch, CoreSelectCompact, CoreInputCompact, CoreTitleInput, CoreTooltip, getErrorMessage, MarkdownLatexRender, CustomSelect, CustomAsyncSelect, CustomCreatable, CustomSelectOption, GoogleOAuthProvider, useAmplitude, AmplitudeEvent, initializeAmplitude, initSentry };

package/dist/index.js

@@ -87,6 +87,7 @@ var COLORS = {
 };
 var ORGANIZATION_TENANT = "ORGANIZATION_TENANT";
 var ORGANIZATION_TEAM = "ORGANIZATION_TEAM";
+var TIMEZONE_ID = "TIMEZONE_ID";
 
 var styleGlobal = {"signup_wrap":"_1KLz9","box-signin":"_2Jo1o","signin_title":"_3egBO","signup_link":"_1DoIT","google_button":"_34hK_","microsoft_button":"_19ESb","box-field":"_2e9xO","box-input":"_3zXRp","box-text":"_8NJga","box-button-email":"_21FPk","box-signin-container":"_1QERu","box-signin-text":"_2-znH","box-signin-logo":"_1aB2m","box-right":"_3qndF","image-slideshow":"_1aM7m","active":"_Vx1zf","box-right-body":"_JzdCr","box-right-footer":"_19aCA","pr-30":"_2HB5r","width-400":"_4ehXP"};
 
@@ -1712,6 +1713,7 @@ var apiUpload = axios.create({
       var domain = parts.slice(-2).join('.');
       localStorage.removeItem(ACCESS_TOKEN);
       localStorage.removeItem(ORGANIZATION_TENANT);
+      localStorage.removeItem(TIMEZONE_ID);
       localStorage.removeItem(ORGANIZATION_TEAM);
       Cookies.remove('auth', {
         path: '/',
@@ -1933,7 +1935,8 @@ var BlockLogin = function BlockLogin(_ref) {
   });
   var fnLoginMicrosoft = function fnLoginMicrosoft() {
     try {
-      var msalInstance = new msalBrowser.PublicClientApplication(msalConfig(MICROSOFT_CLIENT_ID, MICROSOFT_URL_DIRECT));
+      var redirectUri = window.location.origin + "/auth-redirect.html";
+      var msalInstance = new msalBrowser.PublicClientApplication(msalConfig(MICROSOFT_CLIENT_ID, redirectUri));
       if (!msalInstance) {
         console.error("MSAL instance not initialized");
         return Promise.resolve();
@@ -1941,7 +1944,8 @@ var BlockLogin = function BlockLogin(_ref) {
       return Promise.resolve(_catch(function () {
         return Promise.resolve(msalInstance.initialize()).then(function () {
           var loginRequest = {
-            scopes: ["openid", "profile", "email"]
+            scopes: ["openid", "profile", "email"],
+            redirectUri: redirectUri
           };
           var silentRequest = _extends({}, loginRequest, {
             prompt: "select_account"
@@ -3462,8 +3466,23 @@ var CustomSelectOption = function CustomSelectOption(_ref) {
 
 var utcToLocalTime = (function (time, FORMAT) {
   if (time === DATE_MIN_VALUE || time == null) return "";
+  var timezone = localStorage.getItem(TIMEZONE_ID) || "";
   try {
-    return moment.utc(time).local().format(FORMAT || "yyyy-MM-DD");
+    if (!timezone) {
+      return moment.utc(time).local().format(FORMAT || "yyyy-MM-DD");
+    }
+    var isOffset = /^(UTC|GMT)?[+-]/.test(timezone);
+    if (isOffset) {
+      var cleanOffset = timezone.replace(/UTC|GMT/gi, "").trim();
+      var offsetMinutes;
+      if (/^[+-]?\d+$/.test(cleanOffset)) {
+        offsetMinutes = parseInt(cleanOffset, 10) * 60;
+      } else {
+        offsetMinutes = cleanOffset;
+      }
+      return moment.utc(time).utcOffset(offsetMinutes).format(FORMAT || "yyyy-MM-DD");
+    }
+    return moment.utc(time).tz(timezone).format(FORMAT || "yyyy-MM-DD");
   } catch (_unused) {
     return "";
   }
@@ -3480,19 +3499,18 @@ var timeSpanToLocalMoment = (function (time, timezone) {
   }
   var dateTime;
   var isOffset = /^(UTC|GMT)?[+-]/.test(timezone);
-  console.log({
-    isOffset: isOffset
-  });
   if (isOffset) {
     var cleanOffset = timezone.replace(/UTC|GMT/gi, '').trim();
-    console.log({
-      cleanOffset: cleanOffset
-    });
-    dateTime = moment$1.utc(time, "HH:mm:ss").utcOffset(cleanOffset, true);
+    var offsetMinutes;
+    if (/^[+-]?\d+$/.test(cleanOffset)) {
+      offsetMinutes = parseInt(cleanOffset, 10) * 60;
+    } else {
+      offsetMinutes = cleanOffset;
+    }
+    dateTime = moment$1.utc(time, "HH:mm:ss").utcOffset(offsetMinutes);
   } else {
-    dateTime = moment$1.tz(time, "HH:mm:ss", timezone);
+    dateTime = moment$1.utc(time, "HH:mm:ss").tz(timezone);
   }
-  console.log("run time", dateTime.format("HH:mm:ss"), timezone);
   return dateTime;
 });
 
@@ -3549,6 +3567,7 @@ exports.NotFound = NotFound;
 exports.OPENSALT_BASE_URL = OPENSALT_BASE_URL;
 exports.ORGANIZATION_TEAM = ORGANIZATION_TEAM;
 exports.ORGANIZATION_TENANT = ORGANIZATION_TENANT;
+exports.TIMEZONE_ID = TIMEZONE_ID;
 exports.api = api;
 exports.apiUpload = apiUpload;
 exports.firstCheckToken = firstCheckToken;