@dexteel/mesf-core 5.5.0 → 5.5.1

package/.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "5.5.0"
+  ".": "5.5.1"
 }

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# Changelog
+
+## [5.5.1](https://github.com/dexteel/mesf-core-frontend/compare/@dexteel/mesf-core-v5.5.0...@dexteel/mesf-core-v5.5.1) (2025-06-24)
+
+
+### Bug Fixes
+
+* **ApiService:** replace fetch with axios for file upload ([a29ceb9](https://github.com/dexteel/mesf-core-frontend/commit/a29ceb9b1a251cf2664975cdae0dab4ed396ff00))
+* enhance app initialization ([9e3eb46](https://github.com/dexteel/mesf-core-frontend/commit/9e3eb46550ae1e88d83739a84b1467fd2d547e21))
+
+## [5.5.0] - 2025-06-18
+
+
+
 # Changelog
 
 ## [5.5.0](https://github.com/dexteel/mesf-core-frontend/compare/@dexteel/mesf-core-v5.4.2...@dexteel/mesf-core-v5.5.0) (2025-06-18)

package/dist/context/ProvidersLoader.d.ts

@@ -0,0 +1,4 @@
+import React from "react";
+export declare const ProvidersLoader: ({ children, }: {
+    children: React.ReactNode;
+}) => React.JSX.Element;

package/dist/context/UTLSettingContext.d.ts

@@ -35,6 +35,7 @@ export declare const useUTLSettingsContext: () => {
             type: string;
         }): void;
     }, "__">;
+    isLoading: boolean;
 };
 export declare const UTLSettingsProvider: ({ children }: {
     children: ReactNode;

package/dist/context/userContext.d.ts

@@ -76,6 +76,7 @@ export declare const useUserContext: () => {
             type: string;
         }): void;
     }, "__">;
+    isLoading: boolean;
 };
 export declare const useHasPermission: () => (permission: string) => boolean;
 export declare const UserProvider: ({ children }: {

package/dist/index.esm.js

@@ -15,8 +15,6 @@ import { AdapterMoment } from '@mui/x-date-pickers/AdapterMoment';
 import MenuIcon from '@material-ui/icons/Menu';
 import SettingsIcon from '@material-ui/icons/Settings';
 import ShowChartIcon from '@material-ui/icons/ShowChart';
-import { useComplexState } from 'use-complex-state';
-import { createSlice } from '@reduxjs/toolkit';
 import AccountCircleIcon from '@material-ui/icons/AccountCircle';
 import { DndProvider } from 'react-dnd';
 import { HTML5Backend } from 'react-dnd-html5-backend';
@@ -33,6 +31,8 @@ export * from '@microsoft/signalr';
 import { Alert as Alert$2, Autocomplete } from '@material-ui/lab';
 import { useForm, Controller } from 'react-hook-form';
 import SearchIcon from '@material-ui/icons/Search';
+import { useComplexState } from 'use-complex-state';
+import { createSlice } from '@reduxjs/toolkit';
 import DeleteIcon from '@material-ui/icons/Delete';
 import FormatListBulletedSharpIcon from '@material-ui/icons/FormatListBulletedSharp';
 import LockOutlinedIcon from '@material-ui/icons/LockOutlined';
@@ -8236,22 +8236,22 @@ var MESApiService = /** @class */ (function () {
     };
     MESApiService.prototype.uploadFiles = function (selectedFiles_1) {
         return __awaiter(this, arguments, void 0, function (selectedFiles, folderName) {
-            var formData, _i, selectedFiles_2, file;
+            var formData, _i, selectedFiles_2, file, response;
             if (folderName === void 0) { folderName = ""; }
             return __generator(this, function (_a) {
-                formData = new FormData();
-                for (_i = 0, selectedFiles_2 = selectedFiles; _i < selectedFiles_2.length; _i++) {
-                    file = selectedFiles_2[_i];
-                    formData.append("files", file, file.name);
+                switch (_a.label) {
+                    case 0:
+                        formData = new FormData();
+                        for (_i = 0, selectedFiles_2 = selectedFiles; _i < selectedFiles_2.length; _i++) {
+                            file = selectedFiles_2[_i];
+                            formData.append("files", file, file.name);
+                        }
+                        formData.append("folderName", folderName);
+                        return [4 /*yield*/, axiosInstance.post("/backend/uploadFiles", formData)];
+                    case 1:
+                        response = _a.sent();
+                        return [2 /*return*/, response.data];
                 }
-                formData.append("folderName", folderName);
-                return [2 /*return*/, fetch(this.config.API_PROCEDURE_URL + "/uploadFiles", {
-                        method: "POST",
-                        headers: {
-                            Authorization: "Bearer " + this.TOKEN,
-                        },
-                        body: formData,
-                    }).then(function (res) { return res.json(); })];
             });
         });
     };
@@ -9004,6 +9004,7 @@ var UserReducer = createSlice({
 var UserContext = createContext({
     state: UserReducer.getInitialState(),
     actions: UserReducer.actions,
+    isLoading: true,
 });
 var useUserContext = function () { return useContext(UserContext); };
 var useHasPermission = function () {
@@ -9064,16 +9065,7 @@ var UserProvider = function (_a) {
             }
         },
     });
-    if (!permissionsLoaded) {
-        return (React__default.createElement("div", { style: {
-                display: "flex",
-                justifyContent: "center",
-                alignItems: "center",
-                height: "100vh",
-            } },
-            React__default.createElement(CircularProgress, null)));
-    }
-    return (React__default.createElement(UserContext.Provider, { value: { state: state, actions: actions } }, children));
+    return (React__default.createElement(UserContext.Provider, { value: { state: state, actions: actions, isLoading: !permissionsLoaded } }, children));
 };
 
 var getTokenFromLS = function () {
@@ -9683,74 +9675,6 @@ var useSearchAssets = function (setError) {
     return { searchAssets: searchAssets };
 };
 
-var UTLSettingsInitialState = {
-    serverTimeZone: Intl.DateTimeFormat().resolvedOptions().timeZone,
-    settings: {},
-};
-var UTLSettingsReducer = createSlice({
-    name: "__",
-    initialState: UTLSettingsInitialState,
-    reducers: {
-        setServerTimeZone: function (state, _a) {
-            var payload = _a.payload;
-            state.serverTimeZone = payload;
-        },
-        setSetting: function (state, _a) {
-            var payload = _a.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;
-            }, {});
-        },
-    },
-});
-
-var UTLSettingsContext = createContext({
-    state: UTLSettingsReducer.getInitialState(),
-    actions: UTLSettingsReducer.actions,
-});
-var useUTLSettingsContext = function () { return useContext(UTLSettingsContext); };
-var UTLSettingsProvider = function (_a) {
-    var children = _a.children;
-    var _b = useComplexState({
-        initialState: UTLSettingsReducer.getInitialState(),
-        reducers: UTLSettingsReducer.caseReducers,
-    }), state = _b[0], actions = _b[1];
-    return (React__default.createElement(UTLSettingsContext.Provider, { value: { state: state, actions: actions } }, children));
-};
-
-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 };
-};
-
 var useStyles$7 = makeStyles(function (theme) { return ({
     container: {
         display: "flex",
@@ -9872,22 +9796,13 @@ function Header$1(_a) {
     var CustomNavbar = useContext(NavbarContext);
     var searchAssets = useSearchAssets(setError).searchAssets;
     var _f = useState(false), drawerOpen = _f[0], setDrawerOpen = _f[1];
-    var _g = useState(false), settingsIsReady = _g[0], setSettingsIsReady = _g[1];
     var hasPermissionTo = useHasPermission();
-    var searchUTLSettings = useSearchUTLSettings({
-        onError: setError,
-    }).searchUTLSettings;
     var userLogged = useUserContext().state.userLogged;
     useEffect(function () {
-        searchUTLSettings().then(function () {
-            setSettingsIsReady(true);
-        });
-    }, []);
-    useEffect(function () {
-        if (showAreaSelector && userLogged && settingsIsReady) {
+        if (showAreaSelector && userLogged) {
             searchAssets();
         }
-    }, [userLogged, settingsIsReady]);
+    }, [userLogged]);
     var handleDrawerToggle = function () {
         setDrawerOpen(!drawerOpen);
     };
@@ -14163,6 +14078,110 @@ var Navigation = function (_a) {
         React__default.createElement(MESFMainContainer, null)));
 };
 
+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 };
+};
+
+var UTLSettingsInitialState = {
+    serverTimeZone: Intl.DateTimeFormat().resolvedOptions().timeZone,
+    settings: {},
+};
+var UTLSettingsReducer = createSlice({
+    name: "__",
+    initialState: UTLSettingsInitialState,
+    reducers: {
+        setServerTimeZone: function (state, _a) {
+            var payload = _a.payload;
+            state.serverTimeZone = payload;
+        },
+        setSetting: function (state, _a) {
+            var payload = _a.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;
+            }, {});
+        },
+    },
+});
+
+var UTLSettingsContext = createContext({
+    state: UTLSettingsReducer.getInitialState(),
+    actions: UTLSettingsReducer.actions,
+    isLoading: true,
+});
+var useUTLSettingsContext = function () { return useContext(UTLSettingsContext); };
+var UTLSettingsProvider = function (_a) {
+    var children = _a.children;
+    var _b = useComplexState({
+        initialState: UTLSettingsReducer.getInitialState(),
+        reducers: UTLSettingsReducer.caseReducers,
+    }), state = _b[0], actions = _b[1];
+    var _c = useState(true), isLoading = _c[0], setIsLoading = _c[1];
+    var searchUTLSettings = useSearchUTLSettings({
+        onError: console.error,
+    }).searchUTLSettings;
+    useEffect(function () {
+        setIsLoading(true);
+        searchUTLSettings().then(function () {
+            setIsLoading(false);
+        });
+    }, []);
+    useMesfRealtime({
+        onReceiveMessage: function (author, message) {
+            if (message === "UTL.GetSettings") {
+                searchUTLSettings().then(function () {
+                    // setIsLoading(false);
+                });
+            }
+        },
+    });
+    return (React__default.createElement(UTLSettingsContext.Provider, { value: { state: state, actions: actions, isLoading: isLoading } }, children));
+};
+
+var ProvidersLoader = function (_a) {
+    var children = _a.children;
+    var isUsersLoading = useUserContext().isLoading;
+    var isSettingsLoading = useUTLSettingsContext().isLoading;
+    if (isUsersLoading || isSettingsLoading) {
+        return (React__default.createElement("div", { style: {
+                display: "flex",
+                justifyContent: "center",
+                alignItems: "center",
+                height: "100vh",
+            } },
+            React__default.createElement(CircularProgress, null)));
+    }
+    return React__default.createElement(React__default.Fragment, null, children);
+};
+
 var themeMESF = createTheme({
     palette: {
         type: "light",
@@ -14222,17 +14241,18 @@ function MESFMain(_a) {
             React__default.createElement(AuthProvider, { authConfig: authentication },
                 React__default.createElement(LocalizationProvider, { dateAdapter: AdapterMoment, dateLibInstance: moment$2 },
                     React__default.createElement(UserProvider, null,
-                        React__default.createElement(AssetProvider, { plantAssetId: plantAssetId },
-                            React__default.createElement(UTLSettingsProvider, null,
-                                React__default.createElement(RouterContext.Provider, { value: routes },
-                                    React__default.createElement(NavbarContext.Provider, { value: navbar },
-                                        React__default.createElement(ConfigurationContext.Provider, { value: configurations },
-                                            React__default.createElement(ShiftNavigatorProvider, null,
-                                                React__default.createElement(ContextMenuMESFProvider, null,
-                                                    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, showTrendingsIcon: showTrendingsIcon, navbarTitle: navbarTitle, byPassHeaderRoutes: byPassHeaderRoutes })))))))))))))));
+                        React__default.createElement(UTLSettingsProvider, null,
+                            React__default.createElement(ProvidersLoader, null,
+                                React__default.createElement(AssetProvider, { plantAssetId: plantAssetId },
+                                    React__default.createElement(RouterContext.Provider, { value: routes },
+                                        React__default.createElement(NavbarContext.Provider, { value: navbar },
+                                            React__default.createElement(ConfigurationContext.Provider, { value: configurations },
+                                                React__default.createElement(ShiftNavigatorProvider, null,
+                                                    React__default.createElement(ContextMenuMESFProvider, null,
+                                                        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, showTrendingsIcon: showTrendingsIcon, navbarTitle: navbarTitle, byPassHeaderRoutes: byPassHeaderRoutes }))))))))))))))));
 }
 
 var useDefaultAreaId = function (setError) {