@dexteel/mesf-core 4.10.5 → 4.11.1

package/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [4.11.1](https://github.com/dexteel/mesf-core-frontend/compare/v4.11.0...v4.11.1) (2024-05-05)
+
+
+### Bug Fixes
+
+* **TimeService:** Add some try catches and handle utc datetime strings ([b073cd1](https://github.com/dexteel/mesf-core-frontend/commit/b073cd1e1fc3dcceed7a2155ab1a33e21e962805))
+
+## [4.11.0](https://github.com/dexteel/mesf-core-frontend/compare/v4.10.5...v4.11.0) (2024-05-02)
+
+
+### Features
+
+* Implement TimeService and timezone from server ([8861ab6](https://github.com/dexteel/mesf-core-frontend/commit/8861ab619c10426e85b4671819bfb74b303a4f8f))
+
 ### [4.10.5](https://github.com/dexteel/mesf-core-frontend/compare/v4.10.4...v4.10.5) (2024-05-02)
 
 

package/dist/MESFMain.d.ts

@@ -7,6 +7,7 @@ interface Props {
     navbarTitle?: string;
     configurations: any;
     showAreaSelector?: boolean;
+    showTrendingsIcon?: boolean;
 }
-declare function MESFMain({ authentication, routes, navbar, navbarTitle, configurations, showAreaSelector, }: Props): React.JSX.Element;
+declare function MESFMain({ authentication, routes, navbar, navbarTitle, configurations, showAreaSelector, showTrendingsIcon, }: Props): React.JSX.Element;
 export { MESFMain };

package/dist/components/navigation/Header.d.ts

@@ -1,5 +1,6 @@
 import React from "react";
-export default function Header({ showAreaSelector, navbarTitle, }: {
+export default function Header({ showAreaSelector, showTrendingsIcon, navbarTitle, }: {
     showAreaSelector?: boolean;
+    showTrendingsIcon?: boolean;
     navbarTitle?: string;
 }): React.JSX.Element;

package/dist/components/navigation/Navigation.d.ts

@@ -1,6 +1,7 @@
 import React from "react";
-declare const Navigation: ({ showAreaSelector, navbarTitle, }: {
+declare const Navigation: ({ showAreaSelector, showTrendingsIcon, navbarTitle, }: {
     showAreaSelector?: boolean | undefined;
+    showTrendingsIcon?: boolean | undefined;
     navbarTitle?: string | undefined;
 }) => React.JSX.Element;
 export default Navigation;

package/dist/context/UTLSettingContext.d.ts

@@ -1,11 +1,35 @@
 import { default as React, ReactNode } from "react";
 export declare const useUTLSettingsContext: () => {
     state: {
-        hideBlueBoxes: any;
+        serverTimeZone: string;
+        settings: {
+            [key: string]: any;
+        };
     };
     actions: import("@reduxjs/toolkit").CaseReducerActions<{
-        setHideBlueBoxes(state: import("immer/dist/internal").WritableDraft<{
-            hideBlueBoxes: any;
+        setServerTimeZone(state: import("immer/dist/internal").WritableDraft<{
+            serverTimeZone: string;
+            settings: {
+                [key: string]: any;
+            };
+        }>, { payload }: {
+            payload: any;
+            type: string;
+        }): void;
+        setSetting(state: import("immer/dist/internal").WritableDraft<{
+            serverTimeZone: string;
+            settings: {
+                [key: string]: any;
+            };
+        }>, { payload }: {
+            payload: any;
+            type: string;
+        }): void;
+        initSettings(state: import("immer/dist/internal").WritableDraft<{
+            serverTimeZone: string;
+            settings: {
+                [key: string]: any;
+            };
         }>, { payload }: {
             payload: any;
             type: string;

package/dist/hooks/useSearchUTLSetting.d.ts

@@ -1,3 +1,5 @@
-export declare const useSearchUTLSettings: (setError: (err: string) => void) => {
-    searchUTLSettings: () => void;
+export declare const useSearchUTLSettings: ({ onError }: {
+    onError: (err: string) => void;
+}) => {
+    searchUTLSettings: () => Promise<void>;
 };

package/dist/index.esm.js

@@ -77,6 +77,8 @@ import 'ag-grid-community/styles/ag-theme-alpine.css';
 import ImageIcon from '@material-ui/icons/Image';
 import ListAltIcon from '@material-ui/icons/ListAlt';
 import DescriptionIcon from '@material-ui/icons/Description';
+import { format, fromZonedTime, formatInTimeZone } from 'date-fns-tz';
+import { findIana } from 'windows-iana';
 import FormControlLabel$1 from '@material-ui/core/FormControlLabel';
 import Checkbox$1 from '@material-ui/core/Checkbox';
 import Input from '@material-ui/core/Input';
@@ -7297,6 +7299,62 @@ var MESApiService = /** @class */ (function () {
     return MESApiService;
 }());
 
+var TimeService = /** @class */ (function () {
+    function TimeService() {
+        this.timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone;
+    }
+    TimeService.getInstance = function () {
+        if (!TimeService.instance) {
+            TimeService.instance = new TimeService();
+        }
+        return TimeService.instance;
+    };
+    TimeService.prototype.setTimeZone = function (timeZone) {
+        var ianaTimeZones = findIana(timeZone);
+        if (ianaTimeZones.length) {
+            this.timeZone = ianaTimeZones[0];
+        }
+        else {
+            this.timeZone = timeZone;
+        }
+    };
+    TimeService.prototype.toUTC = function (datetime, format$1) {
+        try {
+            if (datetime instanceof Date) {
+                return format(datetime, format$1);
+            }
+            return format(fromZonedTime(datetime, TimeService.instance.timeZone), format$1);
+        }
+        catch (e) {
+            console.log({ datetime: datetime, e: e });
+            return '';
+        }
+    };
+    TimeService.prototype.toLocalServerTime = function (datetime, format) {
+        try {
+            if (isNil$1(datetime) || !datetime) {
+                return '';
+            }
+            if (typeof datetime === 'string') {
+                if (datetime.includes('Z')) {
+                    datetime = new Date(datetime);
+                }
+                else {
+                    datetime = new Date("".concat(datetime, "Z"));
+                }
+            }
+            return formatInTimeZone(datetime, TimeService.instance.timeZone, format);
+        }
+        catch (e) {
+            console.log({ datetime: datetime, e: e });
+            return '';
+        }
+    };
+    return TimeService;
+}());
+var dxtToUTC = TimeService.getInstance().toUTC;
+var dxtToLocalServerTime = TimeService.getInstance().toLocalServerTime;
+
 var getUser = function (UserId, UserName) { return __awaiter(void 0, void 0, void 0, function () {
     var apiService, parameters, resp;
     return __generator(this, function (_a) {
@@ -8138,15 +8196,32 @@ var useSearchAssets = function (setError) {
 };
 
 var UTLSettingsInitialState = {
-    hideBlueBoxes: {}
+    serverTimeZone: Intl.DateTimeFormat().resolvedOptions().timeZone,
+    settings: {}
 };
 var UTLSettingsReducer = createSlice({
     name: "__",
     initialState: UTLSettingsInitialState,
     reducers: {
-        setHideBlueBoxes: function (state, _a) {
+        setServerTimeZone: function (state, _a) {
+            var payload = _a.payload;
+            state.serverTimeZone = payload;
+        },
+        setSetting: function (state, _a) {
             var payload = _a.payload;
-            state.hideBlueBoxes = payload;
+            state.settings[payload.key] = payload.value;
+        },
+        initSettings: function (state, _a) {
+            var payload = _a.payload;
+            state.settings = payload
+                .reduce(function (acc, cur) {
+                if (cur.SettingName.trim() === 'TimeZone') {
+                    var timeService = TimeService.getInstance();
+                    timeService.setTimeZone(cur.Value);
+                }
+                acc[cur.SettingName.trim()] = cur.Value;
+                return acc;
+            }, {});
         }
     }
 });
@@ -8165,24 +8240,27 @@ var UTLSettingsProvider = function (_a) {
     return (React__default.createElement(UTLSettingsContext.Provider, { value: { state: state, actions: actions } }, children));
 };
 
-var useSearchUTLSettings = function (setError) {
-    var setHideBlueBoxes = useUTLSettingsContext().actions.setHideBlueBoxes;
-    var searchUTLSettings = function () {
-        getUTLSettings().then(function (res) { return __awaiter(void 0, void 0, void 0, function () {
-            var hideBlueBoxesSetting;
-            return __generator(this, function (_a) {
-                if (res.ok) {
-                    hideBlueBoxesSetting = get(res, "data.tables[0].rows[4]", {});
-                    hideBlueBoxesSetting.SettingName =
-                        hideBlueBoxesSetting === null || hideBlueBoxesSetting === void 0 ? void 0 : hideBlueBoxesSetting.SettingName.trim();
-                    setHideBlueBoxes(hideBlueBoxesSetting);
-                }
-                else
-                    setError(res.message);
-                return [2 /*return*/];
-            });
-        }); });
-    };
+var useSearchUTLSettings = function (_a) {
+    var onError = _a.onError;
+    var initSettings = useUTLSettingsContext().actions.initSettings;
+    var searchUTLSettings = function () { return __awaiter(void 0, void 0, void 0, function () {
+        var res, settings;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, getUTLSettings()];
+                case 1:
+                    res = _a.sent();
+                    if (res.ok) {
+                        settings = get(res, "data.tables[0].rows", []);
+                        initSettings(settings);
+                    }
+                    else {
+                        onError(res.message);
+                    }
+                    return [2 /*return*/];
+            }
+        });
+    }); };
     return { searchUTLSettings: searchUTLSettings };
 };
 
@@ -8192,14 +8270,17 @@ var AreaSelector$1 = lazy(function () {
     }); });
 });
 function Header$1(_a) {
-    var _b = _a.showAreaSelector, showAreaSelector = _b === void 0 ? false : _b, _c = _a.navbarTitle, navbarTitle = _c === void 0 ? "MESF" : _c;
+    var _b = _a.showAreaSelector, showAreaSelector = _b === void 0 ? false : _b, _c = _a.showTrendingsIcon, showTrendingsIcon = _c === void 0 ? true : _c, _d = _a.navbarTitle, navbarTitle = _d === void 0 ? "MESF" : _d;
     var getUserName = useToken().getUserName;
-    var _d = useState(""), error = _d[0], setError = _d[1];
-    var _e = useState(new Date()), date = _e[0], setDate = _e[1];
+    var _e = useState(""), error = _e[0], setError = _e[1];
+    var _f = useState(new Date()), date = _f[0], setDate = _f[1];
     var CustomNavbar = useContext(NavbarContext);
     var userName = useState(getUserName())[0];
     var searchAssets = useSearchAssets(setError).searchAssets;
-    var searchUTLSettings = useSearchUTLSettings(setError).searchUTLSettings;
+    var _g = useState(false), settingsIsReady = _g[0], setSettingsIsReady = _g[1];
+    var searchUTLSettings = useSearchUTLSettings({
+        onError: setError
+    }).searchUTLSettings;
     var userLogged = useUserContext().state.userLogged;
     var tick = function () {
         setDate(new Date());
@@ -8213,11 +8294,15 @@ function Header$1(_a) {
         };
     });
     useEffect(function () {
-        if (showAreaSelector && userLogged) {
+        searchUTLSettings().then(function () {
+            setSettingsIsReady(true);
+        });
+    }, []);
+    useEffect(function () {
+        if (showAreaSelector && userLogged && settingsIsReady) {
             searchAssets();
-            searchUTLSettings();
         }
-    }, [userLogged]);
+    }, [userLogged, settingsIsReady]);
     return (React__default.createElement(Navbar, { variant: "dark", expand: "lg", className: "mes-primary-color mes-menu-top" },
         React__default.createElement(Container, { fluid: true },
             React__default.createElement(Navbar.Brand, { as: Link, to: "/home" }, navbarTitle),
@@ -8226,12 +8311,12 @@ function Header$1(_a) {
                 React__default.createElement(Nav, { className: "me-auto" },
                     React__default.createElement(CustomNavbar, null)),
                 React__default.createElement(Nav, { className: "ml-auto", style: { alignItems: "baseline" } },
-                    React__default.createElement(Nav, { className: "mx-2" },
+                    showTrendingsIcon ? (React__default.createElement(Nav, { className: "mx-2" },
                         React__default.createElement(Nav.Link, { as: Link, to: "/trendings" },
                             React__default.createElement(Tooltip, { title: 'Trendings', placement: "top", arrow: true, interactive: true, enterDelay: 1500 },
-                                React__default.createElement(ShowChartIcon, null)))),
+                                React__default.createElement(ShowChartIcon, null))))) : null,
                     React__default.createElement(Nav, null,
-                        React__default.createElement("span", { className: "navbar-text" }, date.toLocaleTimeString())),
+                        React__default.createElement("span", { className: "navbar-text" }, dxtToLocalServerTime(date, 'HH:mm:ss z'))),
                     React__default.createElement(Nav, { className: "mx-2" },
                         React__default.createElement(Nav.Link, { as: Link, to: "/configuration" },
                             React__default.createElement("i", { className: "fas fa-cog" }))),
@@ -11091,8 +11176,8 @@ var MESFMainContainer = function () { return (React__default.createElement("div"
     React__default.createElement(MESFMainRouter, null))); };
 
 var Navigation = function (_a) {
-    var _b = _a.showAreaSelector, showAreaSelector = _b === void 0 ? false : _b, _c = _a.navbarTitle, navbarTitle = _c === void 0 ? "MESF" : _c;
-    var _d = useSearchParams(), params = _d[0]; _d[1];
+    var _b = _a.showAreaSelector, showAreaSelector = _b === void 0 ? false : _b, _c = _a.showTrendingsIcon, showTrendingsIcon = _c === void 0 ? true : _c, _d = _a.navbarTitle, navbarTitle = _d === void 0 ? "MESF" : _d;
+    var _e = useSearchParams(), params = _e[0]; _e[1];
     var mounted = useRef(true);
     useEffect(function () {
         if (params.has("redirectTo")) {
@@ -11107,7 +11192,7 @@ var Navigation = function (_a) {
         };
     }, [params.toString()]);
     return (React__default.createElement("div", { className: "wrapper" },
-        React__default.createElement(Header$1, { showAreaSelector: showAreaSelector, navbarTitle: navbarTitle }),
+        React__default.createElement(Header$1, { showAreaSelector: showAreaSelector, navbarTitle: navbarTitle, showTrendingsIcon: showTrendingsIcon }),
         React__default.createElement(MESFMainContainer, null)));
 };
 
@@ -11116,7 +11201,7 @@ n(css,{});
 
 var base = document.getElementsByTagName("base")[0].getAttribute("href") || "/";
 function MESFMain(_a) {
-    var authentication = _a.authentication, routes = _a.routes, navbar = _a.navbar, _b = _a.navbarTitle, navbarTitle = _b === void 0 ? "MESF" : _b, configurations = _a.configurations, _c = _a.showAreaSelector, showAreaSelector = _c === void 0 ? false : _c;
+    var authentication = _a.authentication, routes = _a.routes, navbar = _a.navbar, _b = _a.navbarTitle, navbarTitle = _b === void 0 ? "MESF" : _b, configurations = _a.configurations, _c = _a.showAreaSelector, showAreaSelector = _c === void 0 ? false : _c, _d = _a.showTrendingsIcon, showTrendingsIcon = _d === void 0 ? true : _d;
     return (React__default.createElement(AuthProvider, { authConfig: authentication },
         React__default.createElement(UserProvider, null,
             React__default.createElement(AssetProvider, null,
@@ -11127,7 +11212,7 @@ function MESFMain(_a) {
                                 React__default.createElement(BrowserRouter, { basename: base },
                                     React__default.createElement(Routes, null,
                                         React__default.createElement(Route, { path: "/logout", element: React__default.createElement(Logout, null) })),
-                                    React__default.createElement(Navigation, { showAreaSelector: showAreaSelector, navbarTitle: navbarTitle }))))))))));
+                                    React__default.createElement(Navigation, { showAreaSelector: showAreaSelector, showTrendingsIcon: showTrendingsIcon, navbarTitle: navbarTitle }))))))))));
 }
 
 var useDefaultAreaId = function (setError) {
@@ -11269,5 +11354,5 @@ var areaSelector = /*#__PURE__*/Object.freeze({
     AreaSelector: AreaSelector
 });
 
-export { Account, AssetProvider, AuthContext, AuthProvider, BarChartControl, ButtonWithLoading, ChangePassword, CheckBoxControl, Configuration$1 as Configuration, CurrencyFormatter, DataGridControl, DateFormatter, DateTimeFormatter, ErrorModal, FetchError, FilterPanel, GenericPanel, GenericTable, GetCrewColor, GetShiftColor, HorizontalTextControl, IntegerFormatter, Login, Logout, LongFilterPanel, MESApiService, MESFMain, MESSAGE_API, MESSAGE_ERRORS, MasterDetailPanel, MesfModal, ModalTreeFilterControl, MultipleSelectorControl, NumberFormatter, NumericTextControl, SimplePasswordControl, SimpleSelectorControl, SimpleTextAreaControl, SimpleTextControl, TimeFormatter, TreePickerControl, TrendingsPage, USER_LABELS, UTLSettingsProvider, UploadFileControl, UserProvider, axiosInstance, deleteUser, formatNumber, getAuthTypes, getCrewStyle, getDataUser, getError, getProfiles, getShiftStyle, getTokenFromLS, getUsers, renewToken, setPassword, setProfilesToUser, upsertUser, useAssetContext, useToken, useUTLSettingsContext, useUserContext };
+export { Account, AssetProvider, AuthContext, AuthProvider, BarChartControl, ButtonWithLoading, ChangePassword, CheckBoxControl, Configuration$1 as Configuration, CurrencyFormatter, DataGridControl, DateFormatter, DateTimeFormatter, ErrorModal, FetchError, FilterPanel, GenericPanel, GenericTable, GetCrewColor, GetShiftColor, HorizontalTextControl, IntegerFormatter, Login, Logout, LongFilterPanel, MESApiService, MESFMain, MESSAGE_API, MESSAGE_ERRORS, MasterDetailPanel, MesfModal, ModalTreeFilterControl, MultipleSelectorControl, NumberFormatter, NumericTextControl, SimplePasswordControl, SimpleSelectorControl, SimpleTextAreaControl, SimpleTextControl, TimeFormatter, TimeService, TreePickerControl, TrendingsPage, USER_LABELS, UTLSettingsProvider, UploadFileControl, UserProvider, axiosInstance, deleteUser, dxtToLocalServerTime, dxtToUTC, formatNumber, getAuthTypes, getCrewStyle, getDataUser, getError, getProfiles, getShiftStyle, getTokenFromLS, getUsers, renewToken, setPassword, setProfilesToUser, upsertUser, useAssetContext, useToken, useUTLSettingsContext, useUserContext };
 //# sourceMappingURL=index.esm.js.map