@dexteel/mesf-core 7.4.0 → 7.5.1

package/dist/index.esm.js

@@ -5,9 +5,9 @@ import { styled, DialogTitle as DialogTitle$1, DialogContent as DialogContent$1,
 import { useMutation, useQueryClient, useQuery, QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import * as React from 'react';
 import React__default, { createContext, useContext, useState, useRef, useEffect, useMemo, Component, useCallback, lazy, Suspense } from 'react';
+import SearchIcon from '@mui/icons-material/Search';
+import { AgGridReact } from 'ag-grid-react';
 import CloseIcon from '@mui/icons-material/Close';
-import Alert$4 from '@mui/lab/Alert';
-import IconButton from '@mui/material/IconButton';
 import GetAppIcon from '@mui/icons-material/GetApp';
 import { ArrowRight, ArrowBackRounded, ArrowForwardRounded, SkipNext, ChevronLeft, ChevronRight, Cloud, Timeline, Send, Menu as Menu$1, People, Storage, Group, Assignment, Chat, ViewList, Build, Settings as Settings$2, FastRewind, FastForward, ZoomIn, Restore, Lock, Create, Delete, Folder, InsertChart, Search, PlaylistAdd, DragIndicator, Save, AttachFile, CloudUpload, GetApp } from '@mui/icons-material';
 import { DatePicker as DatePicker$1 } from '@mui/x-date-pickers/DatePicker';
@@ -17,11 +17,6 @@ import { values, get, isNil, isEmpty, round, isNaN as isNaN$1, isNumber } from '
 import moment$8 from 'moment';
 import SkipNextIcon from '@mui/icons-material/SkipNext';
 import { ClearIcon, DateTimePicker, LocalizationProvider, DatePicker, CalendarIcon, ArrowDropDownIcon } from '@mui/x-date-pickers';
-import { Alert as Alert$2, AlertTitle, Autocomplete } from '@mui/lab';
-import AccountCircleIcon from '@mui/icons-material/AccountCircle';
-import { Helmet, HelmetProvider } from 'react-helmet-async';
-import SearchIcon from '@mui/icons-material/Search';
-import { AgGridReact } from 'ag-grid-react';
 import { useForm, Controller } from 'react-hook-form';
 import { createPart, themeMaterial, provideGlobalGridOptions } from 'ag-grid-community';
 import DeleteIcon from '@mui/icons-material/Delete';
@@ -29,6 +24,19 @@ import EditIcon from '@mui/icons-material/Edit';
 import PlaylistAddIcon from '@mui/icons-material/PlaylistAdd';
 import FormatListBulletedSharpIcon from '@mui/icons-material/FormatListBulletedSharp';
 import LockOutlinedIcon from '@mui/icons-material/LockOutlined';
+import Alert$4 from '@mui/lab/Alert';
+import IconButton from '@mui/material/IconButton';
+import { Alert as Alert$2, AlertTitle, Autocomplete } from '@mui/lab';
+import AccountCircleIcon from '@mui/icons-material/AccountCircle';
+import { Helmet, HelmetProvider } from 'react-helmet-async';
+import { isAncestor, Tree, DndProvider as DndProvider$1 } from '@minoru/react-dnd-treeview';
+import AccountTreeIcon from '@mui/icons-material/AccountTree';
+import Settings$1 from '@mui/icons-material/Settings';
+import DescriptionIcon from '@mui/icons-material/Description';
+import FolderIcon from '@mui/icons-material/Folder';
+import ImageIcon from '@mui/icons-material/Image';
+import ListAltIcon from '@mui/icons-material/ListAlt';
+import FindInPageIcon from '@mui/icons-material/FindInPage';
 import PersonOutlineIcon from '@mui/icons-material/PersonOutline';
 import LockIcon from '@mui/icons-material/Lock';
 import PersonIcon from '@mui/icons-material/Person';
@@ -44,13 +52,10 @@ import { HTML5Backend } from 'react-dnd-html5-backend';
 import { useComplexState } from 'use-complex-state';
 import { createSlice } from '@reduxjs/toolkit';
 import MenuIcon from '@mui/icons-material/Menu';
-import Settings$1 from '@mui/icons-material/Settings';
 import ShowChartIcon from '@mui/icons-material/ShowChart';
 import axios from 'axios';
 import { LocalizationProvider as LocalizationProvider$1 } from '@mui/x-date-pickers/LocalizationProvider';
 import { DataGrid, GridOverlay } from '@mui/x-data-grid';
-import { isAncestor, Tree, DndProvider as DndProvider$1 } from '@minoru/react-dnd-treeview';
-import FolderIcon from '@mui/icons-material/Folder';
 import InsertChartIcon from '@mui/icons-material/InsertChart';
 import ReactECharts from 'echarts-for-react';
 import { _adapters, Chart, CategoryScale, LinearScale, PointElement, LineElement, Title, Tooltip as Tooltip$1, Legend, TimeScale } from 'chart.js';
@@ -66,7 +71,6 @@ import MarkdownIt from 'markdown-it';
 import MdEditor, { PluginComponent } from 'react-markdown-editor-lite';
 import 'react-markdown-editor-lite/lib/index.css';
 import { useDropzone } from 'react-dropzone';
-import AccountTreeIcon from '@mui/icons-material/AccountTree';
 import PersonPinCircleIcon from '@mui/icons-material/PersonPinCircle';
 import Dialog from '@mui/material/Dialog';
 import Typography from '@mui/material/Typography';
@@ -76,10 +80,6 @@ import { TreeItem, SimpleTreeView } from '@mui/x-tree-view';
 import '@react-spring/web';
 import { format, fromZonedTime, formatInTimeZone } from 'date-fns-tz';
 import { findIana } from 'windows-iana';
-import DescriptionIcon from '@mui/icons-material/Description';
-import ImageIcon from '@mui/icons-material/Image';
-import ListAltIcon from '@mui/icons-material/ListAlt';
-import FindInPageIcon from '@mui/icons-material/FindInPage';
 
 /******************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -958,24 +958,16 @@ function findNameById(node, id) {
     }
     return null;
 }
-function getNodePath(node, nodeId, parentPath, isRoot) {
+function getNodePath(node, nodeId, parentPath) {
     if (parentPath === void 0) { parentPath = ""; }
-    if (isRoot === void 0) { isRoot = true; }
+    var currentPath = parentPath ? "".concat(parentPath, "/").concat(node.name) : node.name;
     if (node.id === nodeId) {
-        if (isRoot) {
-            return "";
-        }
-        return parentPath ? "".concat(parentPath, "/").concat(node.name) : node.name;
+        return currentPath;
     }
     if (node.children && node.children.length > 0) {
         for (var _i = 0, _a = node.children; _i < _a.length; _i++) {
             var child = _a[_i];
-            var currentPath = isRoot
-                ? ""
-                : parentPath
-                    ? "".concat(parentPath, "/").concat(node.name)
-                    : node.name;
-            var foundPath = getNodePath(child, nodeId, currentPath, false);
+            var foundPath = getNodePath(child, nodeId, currentPath);
             if (foundPath !== null) {
                 return foundPath;
             }
@@ -1038,7 +1030,7 @@ var TreePickerControlV2 = function (props) {
                     left: 0,
                     right: 0,
                     cursor: "pointer",
-                }, onClick: handleClickListItem }))) : (React__default.createElement("div", null)),
+                }, title: fullPath, onClick: handleClickListItem }))) : (React__default.createElement("div", null)),
         React__default.createElement(Grid2, { size: { xs: 12, md: 12 } },
             React__default.createElement(ModalTreeFilterControl, __assign({ classes: {
                     paper: {
@@ -2833,7 +2825,7 @@ var CreateProfile = function (_a) {
                                     React.createElement(Button, { fullWidth: true, variant: "contained", color: "inherit", onClick: function () { return onHide(false); } }, "Cancel")),
                                 React.createElement(Grid2, { size: { md: 3, xs: 12 }, style: { margin: 0 } },
                                     React.createElement(Button, { fullWidth: true, startIcon: isSubmitLoading && React.createElement(CircularProgress, { size: "1rem" }), disabled: isSubmitLoading, variant: "contained", color: "primary", type: "submit" }, "Save")))))))),
-        React.createElement(Snackbar, { open: openSnackbar, autoHideDuration: 2500, onClose: handleClose },
+        React.createElement(Snackbar, { open: openSnackbar, autoHideDuration: 2500, onClose: handleClose, anchorOrigin: { vertical: "bottom", horizontal: "center" } },
             React.createElement(Alert, { severity: "success", onClose: handleClose }, message)),
         React.createElement(ErrorModal, { error: error, onHide: function () { return setError(""); }, title: "Error Creating Profile" })));
 };
@@ -2912,7 +2904,7 @@ var DeleteProfile = function (_a) {
                     React__default.createElement(DialogActions$1, { style: { padding: "16px 24px" } },
                         React__default.createElement(Button, { onClick: function () { return setDeleteAlert(false); }, autoFocus: true, color: "inherit" }, "CANCEL"),
                         React__default.createElement(Button, { startIcon: isSubmitLoading && React__default.createElement(CircularProgress, { size: "1rem" }), autoFocus: true, color: "secondary", onClick: function () { return onDelete(profile === null || profile === void 0 ? void 0 : profile.ProfileId); } }, "Delete"))))),
-        React__default.createElement(Snackbar, { open: open, autoHideDuration: 2500, onClose: handleClose },
+        React__default.createElement(Snackbar, { open: open, autoHideDuration: 2500, onClose: handleClose, anchorOrigin: { vertical: "bottom", horizontal: "center" } },
             React__default.createElement(Alert, { severity: "success", onClose: handleClose }, "The profile was deleted successfully")),
         React__default.createElement(ErrorModal, { error: error, onHide: function () { return setError(""); }, title: "Error Deleting Profile" })));
 };
@@ -3160,9 +3152,9 @@ var ActionsOfProfile = function (_a) {
                         React.createElement(Button, { fullWidth: true, variant: "contained", color: "inherit", onClick: function () { return onHide(false); } }, "Cancel")),
                     React.createElement(Grid2, { size: { md: 3, xs: 12 }, style: { margin: 0 } },
                         React.createElement(Button, { fullWidth: true, startIcon: isSubmitLoading && React.createElement(CircularProgress, { size: "1rem" }), disabled: isSubmitLoading, variant: "contained", color: "primary", type: "submit" }, "Save"))))))),
-        React.createElement(Snackbar, { open: showActionsSnackbar, autoHideDuration: 2500, onClose: handleClose },
+        React.createElement(Snackbar, { open: showActionsSnackbar, autoHideDuration: 2500, onClose: handleClose, anchorOrigin: { vertical: "bottom", horizontal: "center" } },
             React.createElement(Alert, { severity: "info", onClose: handleClose }, "The actions of the profile were edited successfully")),
-        React.createElement(Snackbar, { open: showNameSnackbar, autoHideDuration: 2500, onClose: handleClose },
+        React.createElement(Snackbar, { open: showNameSnackbar, autoHideDuration: 2500, onClose: handleClose, anchorOrigin: { vertical: "bottom", horizontal: "center" } },
             React.createElement(Alert, { severity: "success", onClose: handleClose }, "The name of the profile were edited successfully")),
         React.createElement(ErrorModal, { error: error, onHide: function () { return setError(""); }, title: "Error Editing Profile" }),
         React.createElement(ErrorModal, { error: nameError, onHide: function () { return setNameError(""); }, title: "Error Editing Profile" })));
@@ -3449,31 +3441,39 @@ var getShiftParameters = function () { return __awaiter(void 0, void 0, void 0,
         }
     });
 }); };
-var upsertShiftParameters = function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
-    var apiService, parameters, resp;
-    var PatternStart = _b.PatternStart, ShiftCodes = _b.ShiftCodes, Crews = _b.Crews, CrewRotation = _b.CrewRotation, Comments = _b.Comments;
-    return __generator(this, function (_c) {
-        switch (_c.label) {
-            case 0:
-                apiService = new MESApiService();
-                parameters = [
-                    { name: "AssetId", value: null },
-                    { name: "PatternStart", value: PatternStart },
-                    { name: "ShiftCodes", value: ShiftCodes },
-                    { name: "Crews", value: Crews },
-                    { name: "CrewRotation", value: CrewRotation },
-                    { name: "Comments", value: Comments },
-                ];
-                return [4 /*yield*/, apiService.callV2("[MES].[UpsertShiftParameters]", parameters)];
-            case 1:
-                resp = _c.sent();
-                if (!resp.ok) {
-                    throw new Error(resp.message || "Error when upsert shift");
-                }
-                return [2 /*return*/];
-        }
+var upsertShiftParameters = function (_a) {
+    var args_1 = [];
+    for (var _i = 1; _i < arguments.length; _i++) {
+        args_1[_i - 1] = arguments[_i];
+    }
+    return __awaiter(void 0, __spreadArray([_a], args_1, true), void 0, function (_b, isUpdate) {
+        var apiService, parameters, resp;
+        var PatternStart = _b.PatternStart, ShiftCodes = _b.ShiftCodes, Crews = _b.Crews, CrewRotation = _b.CrewRotation, Comments = _b.Comments;
+        if (isUpdate === void 0) { isUpdate = false; }
+        return __generator(this, function (_c) {
+            switch (_c.label) {
+                case 0:
+                    apiService = new MESApiService();
+                    parameters = [
+                        { name: "AssetId", value: null },
+                        { name: "PatternStart", value: PatternStart },
+                        { name: "ShiftCodes", value: ShiftCodes },
+                        { name: "Crews", value: Crews },
+                        { name: "CrewRotation", value: CrewRotation },
+                        { name: "Comments", value: Comments },
+                        { name: "IsUpdate", value: isUpdate },
+                    ];
+                    return [4 /*yield*/, apiService.callV2("[MES].[UpsertShiftParameters]", parameters)];
+                case 1:
+                    resp = _c.sent();
+                    if (!resp.ok) {
+                        throw new Error(resp.message || "Error when upsert shift");
+                    }
+                    return [2 /*return*/];
+            }
+        });
     });
-}); };
+};
 var deleteShiftParameters = function (PatternStart) { return __awaiter(void 0, void 0, void 0, function () {
     var apiService, parameters, resp;
     return __generator(this, function (_a) {
@@ -3721,7 +3721,7 @@ var CreateShift = function (_a) {
                         React.createElement(Grid2, { size: { md: 3, xs: 12 } },
                             React.createElement(Button, { fullWidth: true, startIcon: isSubmitLoading && React.createElement(CircularProgress, { size: "1rem" }), disabled: isSubmitLoading, variant: "contained", color: "primary", type: "submit" }, "Save")))))),
         React.createElement(ErrorModal, { error: error, onHide: function () { return setError(""); }, title: "Error Creating Shift" }),
-        React.createElement(Snackbar, { open: open, autoHideDuration: 2500, onClose: handleClose },
+        React.createElement(Snackbar, { open: open, autoHideDuration: 2500, onClose: handleClose, anchorOrigin: { vertical: "bottom", horizontal: "center" } },
             React.createElement(Alert, { severity: "success", onClose: handleClose }, "The shift was created successfully"))));
 };
 
@@ -3877,7 +3877,7 @@ var DeleteShift = function (_a) {
                         React.createElement(Button, { onClick: function () { return setDeleteAlert(false); }, autoFocus: true, color: "inherit" }, "CANCEL"),
                         React.createElement(Button, { startIcon: isSubmitLoading && React.createElement(CircularProgress, { size: "1rem" }), autoFocus: true, color: "secondary", onClick: function () { return onDelete(patternStart); } }, "Delete"))))),
         React.createElement(ErrorModal, { error: error, onHide: function () { return setError(""); } }),
-        React.createElement(Snackbar, { open: open, autoHideDuration: 2500, onClose: handleClose },
+        React.createElement(Snackbar, { open: open, autoHideDuration: 2500, onClose: handleClose, anchorOrigin: { vertical: "bottom", horizontal: "center" } },
             React.createElement(Alert, { severity: "warning", onClose: handleClose }, "The shift was deleted successfully"))));
 };
 
@@ -3894,7 +3894,10 @@ var EditShift = function (_a) {
         return ((crewRotation === null || crewRotation === void 0 ? void 0 : crewRotation.length) / maxCrewRotationLength) * 100;
     };
     var createShift = useMutation({
-        mutationFn: upsertShiftParameters,
+        mutationFn: function (_a) {
+            var shiftData = _a.shiftData, isUpdate = _a.isUpdate;
+            return upsertShiftParameters(shiftData, isUpdate);
+        },
         onSuccess: function () {
             setOpen(true);
             onHide(true);
@@ -3911,7 +3914,7 @@ var EditShift = function (_a) {
             switch (_a.label) {
                 case 0:
                     setIsSubmitLoading(true);
-                    return [4 /*yield*/, createShift.mutate(data)];
+                    return [4 /*yield*/, createShift.mutate({ shiftData: data, isUpdate: true })];
                 case 1:
                     _a.sent();
                     return [2 /*return*/];
@@ -4106,7 +4109,7 @@ var EditShift = function (_a) {
                         React.createElement(Grid2, { size: { md: 3, xs: 12 }, style: { margin: 0 } },
                             React.createElement(Button, { fullWidth: true, startIcon: isSubmitLoading && React.createElement(CircularProgress, { size: "1rem" }), disabled: isSubmitLoading, variant: "contained", color: "primary", type: "submit" }, "Save")))))),
         React.createElement(ErrorModal, { error: error, onHide: function () { return setError(""); } }),
-        React.createElement(Snackbar, { open: open, autoHideDuration: 2500, onClose: handleClose },
+        React.createElement(Snackbar, { open: open, autoHideDuration: 2500, onClose: handleClose, anchorOrigin: { vertical: "bottom", horizontal: "center" } },
             React.createElement(Alert, { severity: "success", onClose: handleClose }, "The shift was created successfully"))));
 };
 
@@ -5756,7 +5759,7 @@ var TreeAsset = function () {
                                         }
                                         return (React__default.createElement(CustomDragPreview$1, { monitorProps: monitorProps }));
                                     } }))))))),
-            React__default.createElement(Snackbar, { open: updatedSuccessfullyMessage, autoHideDuration: 2500, onClose: handleClose },
+            React__default.createElement(Snackbar, { open: updatedSuccessfullyMessage, autoHideDuration: 2500, onClose: handleClose, anchorOrigin: { vertical: "bottom", horizontal: "center" } },
                 React__default.createElement(Alert$2, { severity: "success", onClose: handleClose }, "Asset updated successfully")),
             React__default.createElement(CreateNewAssetDialog, { assetNodeSelectedInTree: assetNodeSelectedInTree, show: showDialog === "new", onHide: function (shouldUpdate) { return __awaiter(void 0, void 0, void 0, function () {
                     return __generator(this, function (_a) {
@@ -7740,79 +7743,34 @@ var INITIAL_VALUES$1 = {
     Permissions: [],
 };
 
-var AssetInitialState = {
-    areasList: [],
-    allAssets: [],
-    plantAssetId: 1,
-};
-var AssetReducer = createSlice({
-    name: "__",
-    initialState: AssetInitialState,
-    reducers: {
-        setAreasList: function (state, _a) {
-            var payload = _a.payload;
-            state.areasList = payload;
-        },
-        setAllAssets: function (state, _a) {
-            var payload = _a.payload;
-            state.allAssets = payload;
-        },
-        setPlantAssetId: function (state, _a) {
-            var payload = _a.payload;
-            state.plantAssetId = payload;
-        },
-    },
-});
-
-var AssetContext = createContext({
-    state: AssetReducer.getInitialState(),
-    actions: AssetReducer.actions,
-});
-var useAssetContext = function () { return useContext(AssetContext); };
-var AssetProvider = function (_a) {
-    var children = _a.children, _b = _a.plantAssetId, plantAssetId = _b === void 0 ? 1 : _b;
-    var _c = useComplexState({
-        initialState: {
-            areasList: [],
-            allAssets: [],
-            plantAssetId: plantAssetId,
-        },
-        reducers: AssetReducer.caseReducers,
-    }), state = _c[0], actions = _c[1];
-    return (React__default.createElement(AssetContext.Provider, { value: { state: state, actions: actions } }, children));
-};
-
 var AssetSelector = function (_a) {
     var value = _a.value, onChange = _a.onChange, _b = _a.disabled, disabled = _b === void 0 ? false : _b;
-    var _c = useAssetContext().state, areasList = _c.areasList, plantAssetId = _c.plantAssetId;
-    var hasAssets = areasList && areasList.length > 0;
-    var displayValue = React__default.useMemo(function () {
-        if (!hasAssets) {
-            return "";
-        }
-        if (isNil(value)) {
-            return plantAssetId;
-        }
-        return value;
-    }, [value, hasAssets, plantAssetId]);
+    var _c = searchAssets(), assets = _c.data, isLoading = _c.isLoading;
+    var areasList = React__default.useMemo(function () { var _a; return (_a = assets === null || assets === void 0 ? void 0 : assets.filter(function (a) { return a.CanBeDefaultAsset; })) !== null && _a !== void 0 ? _a : []; }, [assets]);
+    var hasAssets = areasList.length > 0;
     var handleChange = function (event) {
         var selectedValue = event.target.value;
-        if (selectedValue === "") {
+        if (selectedValue === "" || selectedValue === 0) {
             onChange(null);
         }
         else {
             onChange(Number(selectedValue));
         }
     };
-    React__default.useEffect(function () {
-        if (isNil(value)) {
-            onChange(plantAssetId);
-        }
-    }, [value, onChange, plantAssetId]);
+    if (isLoading) {
+        return (React__default.createElement(FormControl, { variant: "outlined", fullWidth: true, size: "small", disabled: true },
+            React__default.createElement(InputLabel, null, "Default Asset"),
+            React__default.createElement(Select, { value: "", label: "Default Asset" },
+                React__default.createElement(MenuItem, { value: "" },
+                    React__default.createElement(CircularProgress, { size: 20 })))));
+    }
     return (React__default.createElement(FormControl, { variant: "outlined", fullWidth: true, size: "small", disabled: disabled },
         React__default.createElement(InputLabel, null, "Default Asset"),
-        React__default.createElement(Select, { value: displayValue, onChange: handleChange, label: "Default Asset" }, !hasAssets ? (React__default.createElement(MenuItem, { value: "" },
-            React__default.createElement("em", null, "None"))) : (areasList.map(function (area) { return (React__default.createElement(MenuItem, { key: area === null || area === void 0 ? void 0 : area.AssetId, value: area === null || area === void 0 ? void 0 : area.AssetId }, area === null || area === void 0 ? void 0 : area.AssetName)); })))));
+        React__default.createElement(Select, { value: isNil(value) ? "" : value, onChange: handleChange, label: "Default Asset" },
+            React__default.createElement(MenuItem, { value: "" },
+                React__default.createElement("em", null, "None")),
+            hasAssets &&
+                areasList.map(function (area) { return (React__default.createElement(MenuItem, { key: area === null || area === void 0 ? void 0 : area.AssetId, value: area === null || area === void 0 ? void 0 : area.AssetId }, area === null || area === void 0 ? void 0 : area.AssetName)); }))));
 };
 
 var searchAuthTypes = function () {
@@ -7936,12 +7894,36 @@ var CreateUser = function (_a) {
         setOpen(false);
     };
     var UserName = watch("UserName");
+    var profilesIds = watch("ProfilesId");
+    var setProfiles = useMutation({
+        mutationFn: setProfilesToUser,
+        onError: function (error) {
+            setError(error.message);
+        },
+    });
     var createUser = useMutation({
         mutationFn: upsertUser,
-        onSuccess: function () {
-            setOpen(true);
-            onHide(true);
-        },
+        onSuccess: function (userCreatedId) { return __awaiter(void 0, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        _a.trys.push([0, 2, , 3]);
+                        return [4 /*yield*/, setProfiles.mutateAsync({
+                                UserId: userCreatedId,
+                                profileIds: profilesIds,
+                            })];
+                    case 1:
+                        _a.sent();
+                        setOpen(true);
+                        onHide(true);
+                        return [3 /*break*/, 3];
+                    case 2:
+                        _a.sent();
+                        return [3 /*break*/, 3];
+                    case 3: return [2 /*return*/];
+                }
+            });
+        }); },
         onError: function (error) {
             setError(error.message);
         },
@@ -8017,7 +7999,7 @@ var CreateUser = function (_a) {
                             React.createElement(Button, { fullWidth: true, startIcon: isSubmitLoading && React.createElement(CircularProgress, { size: "1rem" }), disabled: isSubmitLoading, variant: "contained", color: "primary", type: "submit" }, "Save"))))),
             React.createElement(ErrorModal, { error: error, onHide: function () { return setError(""); }, title: "Error Creating User" }),
             React.createElement(ErrorModal, { error: profileError, onHide: function () { return setprofileError(""); }, title: "Error Choosing Profile" })),
-        React.createElement(Snackbar, { open: open, autoHideDuration: 2500, onClose: handleClose },
+        React.createElement(Snackbar, { open: open, autoHideDuration: 2500, onClose: handleClose, anchorOrigin: { vertical: "bottom", horizontal: "center" } },
             React.createElement(Alert, { severity: "success", onClose: handleClose }, "The user was created successfully"))));
 };
 
@@ -8135,7 +8117,7 @@ var DeleteUser = function (_a) {
                             React__default.createElement(Button, { fullWidth: true, variant: "contained", color: "inherit", onClick: function () { return onHide(false); } }, "CANCEL")),
                         React__default.createElement(Grid2, { size: { md: 3, xs: 12 }, style: { margin: 0 } },
                             React__default.createElement(Button, { fullWidth: true, variant: "contained", color: "secondary", onClick: function () { return setDeleteAlert(true); } }, "DELETE")))))),
-        React__default.createElement(Snackbar, { open: open, autoHideDuration: 2500, onClose: handleClose },
+        React__default.createElement(Snackbar, { open: open, autoHideDuration: 2500, onClose: handleClose, anchorOrigin: { vertical: "bottom", horizontal: "center" } },
             React__default.createElement(Alert, { severity: "warning", onClose: handleClose }, "The user was deleted successfully")),
         React__default.createElement(MesfModal, { open: deleteAlert, title: "WARNING", handleClose: function () { return handleClose(); }, id: "responsive-dialog-title" },
             React__default.createElement(MesfModal.Content, null, "Be careful, once deleted you will not be able to recover this user, are you sure you want to delete it?"),
@@ -8254,15 +8236,15 @@ var UserProvider = function (_a) {
         return get(userData, "id", null);
     };
     var getUserPermissions = function () { return __awaiter(void 0, void 0, void 0, function () {
-        var userId, resp, permissionsArray, profilesArray, error_1;
+        var userId, resp, permissionsArray, profilesArray, userDataResp, userData, error_1;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     userId = getUserId();
-                    if (!userId) return [3 /*break*/, 4];
+                    if (!userId) return [3 /*break*/, 5];
                     _a.label = 1;
                 case 1:
-                    _a.trys.push([1, 3, , 4]);
+                    _a.trys.push([1, 4, , 5]);
                     return [4 /*yield*/, getUserPermissionsFromAPI({
                             UserId: userId,
                         })];
@@ -8278,12 +8260,22 @@ var UserProvider = function (_a) {
                         actions.setProfiles(profilesArray);
                         setProfilesLoaded(true);
                     }
-                    return [3 /*break*/, 4];
+                    return [4 /*yield*/, getDataUser({ userId: userId })];
                 case 3:
+                    userDataResp = _a.sent();
+                    if (userDataResp && userDataResp.length > 0) {
+                        userData = userDataResp[0];
+                        if (typeof userData.DefaultAssetId === "number") {
+                            actions.setDefaultAreaId(userData.DefaultAssetId);
+                        }
+                        actions.setUserId(userId);
+                    }
+                    return [3 /*break*/, 5];
+                case 4:
                     error_1 = _a.sent();
                     console.error("Failed to load permissions:", error_1);
-                    return [3 /*break*/, 4];
-                case 4: return [2 /*return*/];
+                    return [3 /*break*/, 5];
+                case 5: return [2 /*return*/];
             }
         });
     }); };
@@ -8380,9 +8372,8 @@ var EditUser = function (_a) {
         userId: userId,
     }), rows = _j.data, isLoading = _j.isLoading, isError = _j.isError, e = _j.error, isSuccess = _j.isSuccess;
     var getUserId = useToken().getUserId;
-    var areasList = useAssetContext().state.areasList;
-    var _k = useUserContext().actions, setDefaultAreaId = _k.setDefaultAreaId, setDefaultAreaName = _k.setDefaultAreaName;
-    var _l = useForm({ defaultValues: INITIAL_VALUES$1 }), register = _l.register, control = _l.control, setValue = _l.setValue, handleSubmit = _l.handleSubmit, watch = _l.watch, errors = _l.formState.errors;
+    var setDefaultAreaId = useUserContext().actions.setDefaultAreaId;
+    var _k = useForm({ defaultValues: INITIAL_VALUES$1 }), register = _k.register, control = _k.control, setValue = _k.setValue, handleSubmit = _k.handleSubmit, watch = _k.watch, errors = _k.formState.errors;
     var profilesIds = watch("ProfilesId");
     var defaultAssetId = watch("DefaultAssetId");
     var handleClose = function (event, reason) {
@@ -8400,26 +8391,29 @@ var EditUser = function (_a) {
     var editUser = useMutation({
         mutationFn: upsertUser,
         onSuccess: function (userUpdatedId) { return __awaiter(void 0, void 0, void 0, function () {
-            var currentLoggedUserId, selectedArea;
+            var currentLoggedUserId;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, setProfiles.mutate({
-                            UserId: userUpdatedId,
-                            profileIds: profilesIds,
-                        })];
+                    case 0:
+                        _a.trys.push([0, 2, , 3]);
+                        return [4 /*yield*/, setProfiles.mutateAsync({
+                                UserId: userUpdatedId,
+                                profileIds: profilesIds,
+                            })];
                     case 1:
                         _a.sent();
                         currentLoggedUserId = getUserId();
-                        if (currentLoggedUserId === userUpdatedId && defaultAssetId) {
-                            selectedArea = areasList.find(function (area) { return (area === null || area === void 0 ? void 0 : area.AssetId) === defaultAssetId; });
-                            if (selectedArea) {
-                                setDefaultAreaId(defaultAssetId);
-                                setDefaultAreaName(selectedArea.AssetName);
-                            }
+                        if (currentLoggedUserId === userUpdatedId) {
+                            // Update context - the area-selector effect will update the name
+                            setDefaultAreaId(defaultAssetId);
                         }
                         onHide(true);
                         setOpen(true);
-                        return [2 /*return*/];
+                        return [3 /*break*/, 3];
+                    case 2:
+                        _a.sent();
+                        return [3 /*break*/, 3];
+                    case 3: return [2 /*return*/];
                 }
             });
         }); },
@@ -8516,7 +8510,7 @@ var EditUser = function (_a) {
                             React.createElement(Button, { fullWidth: true, variant: "contained", color: "inherit", onClick: function () { return onHide(false); } }, "Cancel")),
                         React.createElement(Grid2, { size: { md: 3, xs: 12 }, style: { margin: 0 } },
                             React.createElement(Button, { fullWidth: true, startIcon: isSubmitLoading ? React.createElement(CircularProgress, { size: "1rem" }) : React.createElement(React.Fragment, null), disabled: isSubmitLoading, variant: "contained", color: "primary", type: "submit" }, "Save")))))),
-        React.createElement(Snackbar, { open: open, autoHideDuration: 2500, onClose: handleClose },
+        React.createElement(Snackbar, { open: open, autoHideDuration: 2500, onClose: handleClose, anchorOrigin: { vertical: "bottom", horizontal: "center" } },
             React.createElement(Alert, { severity: "info", onClose: handleClose }, "The user was edited successfully")),
         React.createElement(ErrorModal, { error: error, onHide: function () { return setError(""); }, title: "Error Editing User" }),
         React.createElement(ErrorModal, { error: profileError, onHide: function () { return setprofileError(""); }, title: "Error Choosing Profile" })));
@@ -8853,12 +8847,8 @@ var searchUser = function (_a) {
     var userId = _a.userId;
     return useQuery({
         queryKey: ["user", userId],
-        queryFn: function () {
-            if (userId) {
-                return getDataUser({ userId: userId });
-            }
-            return [];
-        },
+        queryFn: function () { return getDataUser({ userId: userId }); },
+        enabled: !!userId,
     });
 };
 var Users = function () {
@@ -9306,7 +9296,7 @@ var LoginWithEmailAndPassword = function () {
                         boxShadow: function (theme) { return theme.shadows[4]; },
                     },
                 }, disabled: password.length === 0 || username.length === 0 }, "Login"),
-            React__default.createElement(Snackbar, { open: showError, autoHideDuration: 6000, onClose: handleCloseError, anchorOrigin: { vertical: "top", horizontal: "center" } },
+            React__default.createElement(Snackbar, { open: showError, autoHideDuration: 6000, onClose: handleCloseError, anchorOrigin: { vertical: "bottom", horizontal: "center" } },
                 React__default.createElement(Alert$2, { severity: "error", variant: "filled", onClose: handleCloseError, action: React__default.createElement(IconButton$1, { size: "small", "aria-label": "close", color: "inherit", onClick: handleCloseError },
                         React__default.createElement(CloseIcon, { fontSize: "small" })) },
                     React__default.createElement(Typography$1, { variant: "subtitle2", style: { fontWeight: "bold" } }, "Bad credentials"),
@@ -9632,7 +9622,7 @@ function Login(_a) {
                                 React__default.createElement(LoginWithWindowsAuthentication, null),
                                 useAzureAD && (React__default.createElement(LoginWithAzureAD, { config: authConfig.AzureConfig })),
                                 guestIsEnabled && React__default.createElement(LoginAsGuest, null))))))))),
-        React__default.createElement(Snackbar, { open: open, autoHideDuration: 6000, onClose: handleClose, anchorOrigin: { vertical: "top", horizontal: "center" } },
+        React__default.createElement(Snackbar, { open: open, autoHideDuration: 6000, onClose: handleClose, anchorOrigin: { vertical: "bottom", horizontal: "center" } },
             React__default.createElement(Alert$2, { onClose: handleClose, severity: "info", variant: "filled" }, message))));
 }
 
@@ -9736,6 +9726,48 @@ var ButtonWithLoading = function (_a) {
         children));
 };
 
+var AssetInitialState = {
+    areasList: [],
+    allAssets: [],
+    plantAssetId: 1,
+};
+var AssetReducer = createSlice({
+    name: "__",
+    initialState: AssetInitialState,
+    reducers: {
+        setAreasList: function (state, _a) {
+            var payload = _a.payload;
+            state.areasList = payload;
+        },
+        setAllAssets: function (state, _a) {
+            var payload = _a.payload;
+            state.allAssets = payload;
+        },
+        setPlantAssetId: function (state, _a) {
+            var payload = _a.payload;
+            state.plantAssetId = payload;
+        },
+    },
+});
+
+var AssetContext = createContext({
+    state: AssetReducer.getInitialState(),
+    actions: AssetReducer.actions,
+});
+var useAssetContext = function () { return useContext(AssetContext); };
+var AssetProvider = function (_a) {
+    var children = _a.children, _b = _a.plantAssetId, plantAssetId = _b === void 0 ? 1 : _b;
+    var _c = useComplexState({
+        initialState: {
+            areasList: [],
+            allAssets: [],
+            plantAssetId: plantAssetId,
+        },
+        reducers: AssetReducer.caseReducers,
+    }), state = _c[0], actions = _c[1];
+    return (React__default.createElement(AssetContext.Provider, { value: { state: state, actions: actions } }, children));
+};
+
 var LogbookSettingsInitialState = {
     entry: {
         withAssetFilter: undefined,
@@ -10022,10 +10054,6 @@ var CreateSetting = function (_a) {
                                 React.createElement(Grid2, { size: { xs: 12, md: 6 } },
                                     React.createElement(Controller, { name: "Value", control: control, rules: {
                                             required: "Value is required",
-                                            pattern: {
-                                                value: /^[A-Za-z0-9]+$/,
-                                                message: "Only letters and numbers are allowed",
-                                            },
                                         }, render: function (_a) {
                                             var field = _a.field, error = _a.fieldState.error;
                                             return (React.createElement(TextField, __assign({}, field, { label: "Value", error: !!error, helperText: error ? error.message : null, autoComplete: "off" })));
@@ -10045,7 +10073,7 @@ var CreateSetting = function (_a) {
                                 React.createElement(Grid2, { size: { md: 3, xs: 12 } },
                                     React.createElement(Button, { fullWidth: true, startIcon: isSubmitLoading && React.createElement(CircularProgress, { size: "1rem" }), disabled: isSubmitLoading, variant: "contained", color: "primary", type: "submit" }, "Save")))))))),
         React.createElement(ErrorModal, { error: error, onHide: function () { return setError(""); }, title: "Error Creating Setting" }),
-        React.createElement(Snackbar, { open: open, autoHideDuration: 2500, onClose: handleClose },
+        React.createElement(Snackbar, { open: open, autoHideDuration: 2500, onClose: handleClose, anchorOrigin: { vertical: "bottom", horizontal: "center" } },
             React.createElement(Alert, { severity: "success", onClose: handleClose }, "The setting was created successfully"))));
 };
 
@@ -10131,7 +10159,7 @@ var DeleteSetting = function (_a) {
                                 React.createElement(Grid2, { size: { md: 3, xs: 12 } },
                                     React.createElement(Button, { fullWidth: true, startIcon: isSubmitLoading && React.createElement(CircularProgress, { size: "1rem" }), disabled: isSubmitLoading, variant: "contained", color: "secondary", type: "submit" }, "Delete")))))))),
         React.createElement(ErrorModal, { error: error, onHide: function () { return setError(""); }, title: "Error deleting Setting" }),
-        React.createElement(Snackbar, { open: open, autoHideDuration: 2500, onClose: handleClose },
+        React.createElement(Snackbar, { open: open, autoHideDuration: 2500, onClose: handleClose, anchorOrigin: { vertical: "bottom", horizontal: "center" } },
             React.createElement(Alert, { severity: "success", onClose: handleClose }, "The setting was deleted successfully"))));
 };
 
@@ -10204,10 +10232,6 @@ var EditSetting = function (_a) {
                         React.createElement(Grid2, { size: { xs: 12, md: 6 } },
                             React.createElement(Controller, { name: "Value", control: control, rules: {
                                     required: "Value is required",
-                                    pattern: {
-                                        value: /^[A-Za-z0-9]+$/,
-                                        message: "Only letters and numbers are allowed",
-                                    },
                                 }, render: function (_a) {
                                     var field = _a.field, error = _a.fieldState.error;
                                     return (React.createElement(TextField, __assign({}, field, { label: "Value", error: !!error, helperText: error ? error.message : null, autoComplete: "off" })));
@@ -10227,7 +10251,7 @@ var EditSetting = function (_a) {
                         React.createElement(Grid2, { size: { md: 3, xs: 12 } },
                             React.createElement(Button, { fullWidth: true, startIcon: isSubmitLoading && React.createElement(CircularProgress, { size: "1rem" }), disabled: isSubmitLoading, variant: "contained", color: "primary", type: "submit" }, "Save")))))),
         React.createElement(ErrorModal, { error: error, onHide: function () { return setError(""); }, title: "Error updating Setting" }),
-        React.createElement(Snackbar, { open: open, autoHideDuration: 2500, onClose: handleClose },
+        React.createElement(Snackbar, { open: open, autoHideDuration: 2500, onClose: handleClose, anchorOrigin: { vertical: "bottom", horizontal: "center" } },
             React.createElement(Alert, { severity: "success", onClose: handleClose }, "The setting was edited successfully"))));
 };
 
@@ -11914,7 +11938,7 @@ var SaveUpdateDeleteViewModalV2 = function (_a) {
                                     ? "Save"
                                     : "Save")))))),
         React__default.createElement(ConfirmationDialogRaw, { title: "Confirmation", message: "Are you sure you want to delete permanently the view: ".concat((_d = (view || viewSelected)) === null || _d === void 0 ? void 0 : _d.ViewName, "?"), open: openDeleteDialog, onClose: deleteViewAction }),
-        React__default.createElement(Snackbar, { open: snackbarOpen, autoHideDuration: 2500, onClose: handleSnackbarClose },
+        React__default.createElement(Snackbar, { open: snackbarOpen, autoHideDuration: 2500, onClose: handleSnackbarClose, anchorOrigin: { vertical: "bottom", horizontal: "center" } },
             React__default.createElement(Alert$4, { elevation: 6, variant: "filled", severity: "success", onClose: handleSnackbarClose }, snackbarMessage)),
         React__default.createElement(ErrorModal, { error: error, onHide: function () { return setError(""); } })));
 };
@@ -14536,11 +14560,17 @@ var TrendingChartV2 = function (_a) {
     var useSeparateGrids = !opts.combinedView &&
         processedData.analogTags.length > 0 &&
         processedData.digitalTags.length > 0;
-    // Generate a key that changes when grid structure changes
+    // Generate a key that changes when grid structure changes or series count changes
     // This forces React to remount the entire chart component, avoiding merge conflicts
+    // Including series count ensures chart remounts when tags are added/removed
     var chartKey = useMemo(function () {
-        return "chart-".concat(useSeparateGrids ? "separate" : "combined");
-    }, [useSeparateGrids]);
+        var seriesCount = processedData.analogSeries.length + processedData.digitalSeries.length;
+        return "chart-".concat(useSeparateGrids ? "separate" : "combined", "-").concat(seriesCount);
+    }, [
+        useSeparateGrids,
+        processedData.analogSeries.length,
+        processedData.digitalSeries.length,
+    ]);
     // Calculate cursor data (Y1, Y2, etc.)
     var cursorData = useCursorData(cursor1Time, cursor2Time, series, viewTags);
     // Update context with cursor data (use ref to prevent infinite loop)
@@ -17369,7 +17399,7 @@ var TableComponent = function (_a) {
                     setLoadViewOpen(false);
                 } })),
         React__default.createElement(ErrorModal, { error: error, onHide: function () { return setError(""); } }),
-        React__default.createElement(Snackbar, { open: !!snackbarMessage, autoHideDuration: 800, onClose: handleCloseSnackbar },
+        React__default.createElement(Snackbar, { open: !!snackbarMessage, autoHideDuration: 800, onClose: handleCloseSnackbar, anchorOrigin: { vertical: "bottom", horizontal: "center" } },
             React__default.createElement(Alert$3, { onClose: handleCloseSnackbar, severity: "success" }, snackbarMessage))));
 };
 
@@ -19137,7 +19167,7 @@ var NotificationSnackBar = function (_a) {
     useEffect(function () {
         setOpen(!!message);
     }, [message]);
-    return (React__default.createElement(Snackbar, { open: open, autoHideDuration: 2500, onClose: handleClose },
+    return (React__default.createElement(Snackbar, { open: open, autoHideDuration: 2500, onClose: handleClose, anchorOrigin: { vertical: "bottom", horizontal: "center" } },
         React__default.createElement(Alert$4, { elevation: 6, variant: "filled", severity: severity, onClose: handleClose }, message)));
 };
 
@@ -20048,6 +20078,7 @@ var Filters$1 = function (_a) {
 var moment$3 = getMomentTz();
 var Logbook$1 = function () {
     var entry = useLogbookSettings().entry;
+    var defaultAreaId = useUserContext().state.defaultAreaId;
     var withAssetFilter = entry.withAssetFilter;
     var filterAssets = entry.filterAssets;
     var canEditAsset = entry.canEditAsset;
@@ -20069,7 +20100,8 @@ var Logbook$1 = function () {
     var _b = useState(""), error = _b[0], setError = _b[1];
     var _c = useState(""), show = _c[0], setShow = _c[1];
     var _d = useState(""), quickFilter = _d[0], setQuickFilter = _d[1];
-    var _e = useState(presetAssetId !== null && presetAssetId !== void 0 ? presetAssetId : null), assetId = _e[0], setAssetId = _e[1];
+    var _e = useState(presetAssetId !== null && presetAssetId !== void 0 ? presetAssetId : (typeof defaultAreaId === "number" ? defaultAreaId : null)), assetId = _e[0], setAssetId = _e[1];
+    var initializedAssetRef = useRef(false);
     var _f = useState(null), selectedRowData = _f[0], setSelectedRowData = _f[1];
     var _g = useState(false), showRemoveDialog = _g[0], setShowRemoveDialog = _g[1];
     var _h = useContextMenuMESF(), registerConfig = _h.registerConfig, showContextMenu = _h.showContextMenu;
@@ -20210,6 +20242,15 @@ var Logbook$1 = function () {
             setError(e.message);
         }
     }, [isError, e]);
+    // Sync assetId with defaultAreaId when it becomes available (only once on initial load)
+    useEffect(function () {
+        if (!initializedAssetRef.current &&
+            !presetAssetId &&
+            typeof defaultAreaId === "number") {
+            setAssetId(defaultAreaId);
+            initializedAssetRef.current = true;
+        }
+    }, [defaultAreaId, presetAssetId]);
     useEffect(function () {
         if (shiftInfo) {
             setShow("");
@@ -20670,6 +20711,7 @@ var Filters = function (_a) {
 var moment$1 = getMomentTz();
 var Logbook = function () {
     var report = useLogbookSettings().report;
+    var defaultAreaId = useUserContext().state.defaultAreaId;
     var withAssetFilter = report.withAssetFilter;
     var filterAssets = report.filterAssets;
     var showAttachments = report.showAttachments;
@@ -20681,7 +20723,8 @@ var Logbook = function () {
     var gridApiRef = useRef(null);
     var _b = useState(""), error = _b[0], setError = _b[1];
     var _c = useState(""), show = _c[0], setShow = _c[1];
-    var _d = useState(null), assetId = _d[0], setAssetId = _d[1];
+    var _d = useState(typeof defaultAreaId === "number" ? defaultAreaId : null), assetId = _d[0], setAssetId = _d[1];
+    var initializedAssetRef = useRef(false);
     var _e = useState(function () {
         var startShiftIdParam = searchParams.get("startShiftId");
         var endShiftIdParam = searchParams.get("endShiftId");
@@ -20808,6 +20851,13 @@ var Logbook = function () {
             setError(e.message);
         }
     }, [isError, e]);
+    // Sync assetId with defaultAreaId when it becomes available (only once on initial load)
+    useEffect(function () {
+        if (!initializedAssetRef.current && typeof defaultAreaId === "number") {
+            setAssetId(defaultAreaId);
+            initializedAssetRef.current = true;
+        }
+    }, [defaultAreaId]);
     useEffect(function () {
         var _a;
         var startShiftIdParam = searchParams.get("startShiftId");
@@ -20988,35 +21038,15 @@ var logbookNavbar = [
     },
 ];
 
-var useDefaultAreaId = function (setError) {
-    var _a = useUserContext(), userId = _a.state.userId, setDefaultAreaId = _a.actions.setDefaultAreaId;
-    var _b = searchUser({ userId: userId }), rows = _b.data, isError = _b.isError, e = _b.error;
-    useEffect(function () {
-        if (e && isError) {
-            setError(e.message);
-        }
-    }, [e, isError]);
-    return function () {
-        if (userId && rows) {
-            var userDefaultAreaId = get(rows, "[0]", null);
-            if (userDefaultAreaId) {
-                setDefaultAreaId(userDefaultAreaId);
-            }
-        }
-    };
-};
-
 var AreaSelector = function () {
     var _a = useState(false), open = _a[0], setOpen = _a[1];
     var _b = useState(""), error = _b[0], setError = _b[1];
-    var getUserId = useToken().getUserId;
-    var _c = useUserContext(), _d = _c.state, userId = _d.userId, defaultAreaId = _d.defaultAreaId, defaultAreaName = _d.defaultAreaName, _e = _c.actions, setDefaultAreaId = _e.setDefaultAreaId, setDefaultAreaName = _e.setDefaultAreaName, setUserId = _e.setUserId;
-    var _f = searchAssets(), rows = _f.data; _f.isLoading; var isError = _f.isError, e = _f.error;
+    var _c = useUserContext(), _d = _c.state, userId = _d.userId, defaultAreaId = _d.defaultAreaId, defaultAreaName = _d.defaultAreaName, _e = _c.actions, setDefaultAreaId = _e.setDefaultAreaId, setDefaultAreaName = _e.setDefaultAreaName;
+    var _f = searchAssets(), rows = _f.data, isError = _f.isError, e = _f.error;
     var areasList = rows === null || rows === void 0 ? void 0 : rows.filter(function (a) { return a.CanBeDefaultAsset; });
     var fullWidth = React__default.useState(true)[0];
     var _g = useState(defaultAreaId), defaultAreaIdToChange = _g[0], setDefaultAreaIdToChange = _g[1];
     var _h = useState(defaultAreaName), defaultAreaNameToChange = _h[0], setDefaultAreaNameToChange = _h[1];
-    var defaultAreaIdFromAPI = useDefaultAreaId(setError);
     var onClose = function (value) { return setOpen(value); };
     var changeAreaActive = function () {
         setOpen(true);
@@ -21050,29 +21080,35 @@ var AreaSelector = function () {
             return [2 /*return*/];
         });
     }); };
-    useEffect(function () {
-        setUserId(getUserId());
-    }, []);
-    useEffect(function () {
-        defaultAreaIdFromAPI();
-    }, [userId]);
     useEffect(function () {
         if (e && isError) {
             setError(e.message);
         }
     }, [e, isError]);
     useEffect(function () {
-        if (defaultAreaId && areasList) {
-            var areaSelected = areasList.find(function (area) { return (area === null || area === void 0 ? void 0 : area.AssetId) === defaultAreaId; });
-            setDefaultAreaName(areaSelected === null || areaSelected === void 0 ? void 0 : areaSelected.AssetName);
-            setDefaultAreaNameToChange(areaSelected === null || areaSelected === void 0 ? void 0 : areaSelected.AssetName);
+        if (!areasList) {
+            return;
         }
-        else {
-            setDefaultAreaId(0);
-            setDefaultAreaName("Plant");
-            setDefaultAreaNameToChange("Plant");
+        // Only update when defaultAreaId is explicitly set (not null/undefined)
+        // This prevents resetting to "Plant" while data is still loading
+        if (defaultAreaId !== null && defaultAreaId !== undefined) {
+            var areaSelected = areasList.find(function (area) { return (area === null || area === void 0 ? void 0 : area.AssetId) === defaultAreaId; });
+            if (areaSelected) {
+                setDefaultAreaName(areaSelected.AssetName);
+            }
+            else {
+                // Asset not found in list, default to Plant
+                setDefaultAreaName("Plant");
+            }
         }
     }, [defaultAreaId, areasList]);
+    // Sync local state when modal opens
+    useEffect(function () {
+        if (open) {
+            setDefaultAreaIdToChange(defaultAreaId);
+            setDefaultAreaNameToChange(defaultAreaName || "Plant");
+        }
+    }, [open]);
     return (React__default.createElement(React__default.Fragment, null,
         React__default.createElement(Box, { mx: 2 },
             React__default.createElement(IconButton$1, { color: "inherit", onClick: changeAreaActive, size: "small" },
@@ -21102,7 +21138,7 @@ var AreaSelector = function () {
                 },
             } },
             React__default.createElement(DialogTitle$1, { id: "confirmation-dialog-title" }, "AREA"),
-            React__default.createElement(DialogContent$1, { dividers: true },
+            React__default.createElement(DialogContent$1, { dividers: true, sx: { overflowY: "hidden" } },
                 React__default.createElement(Typography$1, { fontSize: 15, variant: "subtitle1", style: { marginBottom: 0 } }, "Current Area"),
                 React__default.createElement(Grid2, { container: true },
                     React__default.createElement(Grid2, { size: { xs: 12 }, style: { marginTop: 5 } },
@@ -21113,7 +21149,7 @@ var AreaSelector = function () {
                                     height: "45vh",
                                     border: "1px solid rgba(0, 0, 0, 0.26)",
                                     borderRadius: "2px",
-                                    overflowY: "scroll",
+                                    overflowY: "auto",
                                 } },
                                 React__default.createElement(List, { dense: true, style: { padding: 0 } }, areasList === null || areasList === void 0 ? void 0 : areasList.map(function (area) { return (React__default.createElement(ListItemButton, { key: "Area-".concat(area === null || area === void 0 ? void 0 : area.AssetId), onClick: function () {
                                         return handleChangeAreaId(area === null || area === void 0 ? void 0 : area.AssetId, area === null || area === void 0 ? void 0 : area.AssetName);