@dexteel/mesf-core 3.6.1 → 3.6.3

package/CHANGELOG.md

@@ -1,4 +1,8 @@
 # CHANGELOG
+## 3.6.3
+- Don't execute `searchAreas()` if `showAreaSelector` is false
+## 3.6.2
+- Bug fixed in Area Selector component
 ## 3.6.1
 - Fix exports of UserReducer by updating Typescript version
 ## 3.6.0

package/dist/index.esm.js

@@ -30,11 +30,11 @@ import Typography from '@material-ui/core/Typography';
 import { Modal as Modal$2, Alert as Alert$2, Navbar, Container, Nav, NavDropdown } from 'react-bootstrap';
 import { useMsal, MsalProvider } from '@azure/msal-react';
 import { LogLevel, PublicClientApplication } from '@azure/msal-browser';
+import { get, useForm, Controller } from 'react-hook-form';
 import MenuList from '@material-ui/core/MenuList';
 import PersonPinCircleIcon from '@material-ui/icons/PersonPinCircle';
 import { useComplexState } from 'use-complex-state';
 import { createSlice } from '@reduxjs/toolkit';
-import { get, useForm, Controller } from 'react-hook-form';
 import moment from 'moment';
 import DialogContentText from '@material-ui/core/DialogContentText';
 import Snackbar from '@material-ui/core/Snackbar';
@@ -5671,6 +5671,84 @@ var ConfigurationContext = React__default.createContext([
 ]);
 var NavbarContext = React__default.createContext(function () { return React__default.createElement(React__default.Fragment, null); });
 
+var UserInitialState = {
+    userLastName: "",
+    userId: null,
+    defaultAreaId: null,
+    defaultAreaName: "",
+    defaultTreeId: null,
+    defaultTreeName: null,
+    areasList: [],
+    treeIdChanged: false
+};
+var UserReducer = createSlice({
+    name: "__",
+    initialState: UserInitialState,
+    reducers: {
+        setUserId: function (state, _a) {
+            var payload = _a.payload;
+            state.userId = payload;
+        },
+        setUserLastName: function (state, _a) {
+            var payload = _a.payload;
+            state.userLastName = payload;
+        },
+        setDefaultAreaId: function (state, _a) {
+            var payload = _a.payload;
+            state.defaultAreaId = payload;
+        },
+        setDefaultAreaName: function (state, _a) {
+            var payload = _a.payload;
+            state.defaultAreaName = payload;
+        },
+        setDefaultTreeId: function (state, _a) {
+            var payload = _a.payload;
+            state.defaultTreeId = payload;
+        },
+        setDefaultTreeName: function (state, _a) {
+            var payload = _a.payload;
+            state.defaultTreeName = payload;
+        },
+        setTreeIdChanged: function (state, _a) {
+            var payload = _a.payload;
+            state.treeIdChanged = payload;
+        },
+        setAreasList: function (state, _a) {
+            var payload = _a.payload;
+            state.areasList = payload;
+        }
+    }
+});
+
+var UserContext = createContext({
+    state: UserReducer.getInitialState(),
+    actions: UserReducer.actions
+});
+var useUserContext = function () { return useContext(UserContext); };
+var UserProvider = function (_a) {
+    var children = _a.children;
+    var _b = useComplexState({
+        initialState: UserReducer.getInitialState(),
+        reducers: UserReducer.caseReducers
+    }), state = _b[0], actions = _b[1];
+    return (React__default.createElement(UserContext.Provider, { value: { state: state, actions: actions } }, children));
+};
+
+var useSearchAssets = function () {
+    var setAreasList = useUserContext().actions.setAreasList;
+    var searchAreas = function () {
+        getAreas().then(function (res) {
+            if (res) {
+                var areasSource = get(res, "data.tables[0].rows", []);
+                setAreasList(areasSource);
+            }
+        });
+    };
+    return {
+        searchAreas: searchAreas
+    };
+};
+
 var AreaSelector$1 = lazy(function () { return Promise.resolve().then(function () { return areaSelector; }).then(function (mod) { return ({ "default": mod.AreaSelector }); }); });
 function Header(_a) {
     var _b = _a.showAreaSelector, showAreaSelector = _b === void 0 ? false : _b;
@@ -5678,6 +5756,7 @@ function Header(_a) {
     var _c = useState(new Date()), date = _c[0], setDate = _c[1];
     var CustomNavbar = useContext(NavbarContext);
     var userName = useState(getUserName())[0];
+    var searchAreas = useSearchAssets().searchAreas;
     var tick = function () {
         setDate(new Date());
     };
@@ -5689,6 +5768,11 @@ function Header(_a) {
             clearTimeout(timerID);
         };
     });
+    useEffect(function () {
+        if (showAreaSelector) {
+            searchAreas();
+        }
+    }, []);
     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" }, "MESF"),
@@ -5819,69 +5903,6 @@ var Navigation = function (_a) {
         React__default.createElement(MESFMainContainer, null)));
 };
 
-var UserInitialState = {
-    userLastName: "",
-    userId: null,
-    defaultAreaId: null,
-    defaultAreaName: "",
-    defaultTreeId: null,
-    defaultTreeName: null,
-    areasList: [],
-    treeIdChanged: false
-};
-var UserReducer = createSlice({
-    name: "__",
-    initialState: UserInitialState,
-    reducers: {
-        setUserId: function (state, _a) {
-            var payload = _a.payload;
-            state.userId = payload;
-        },
-        setUserLastName: function (state, _a) {
-            var payload = _a.payload;
-            state.userLastName = payload;
-        },
-        setDefaultAreaId: function (state, _a) {
-            var payload = _a.payload;
-            state.defaultAreaId = payload;
-        },
-        setDefaultAreaName: function (state, _a) {
-            var payload = _a.payload;
-            state.defaultAreaName = payload;
-        },
-        setDefaultTreeId: function (state, _a) {
-            var payload = _a.payload;
-            state.defaultTreeId = payload;
-        },
-        setDefaultTreeName: function (state, _a) {
-            var payload = _a.payload;
-            state.defaultTreeName = payload;
-        },
-        setTreeIdChanged: function (state, _a) {
-            var payload = _a.payload;
-            state.treeIdChanged = payload;
-        },
-        setAreasList: function (state, _a) {
-            var payload = _a.payload;
-            state.areasList = payload;
-        }
-    }
-});
-
-var UserContext = createContext({
-    state: UserReducer.getInitialState(),
-    actions: UserReducer.actions
-});
-var useUserContext = function () { return useContext(UserContext); };
-var UserProvider = function (_a) {
-    var children = _a.children;
-    var _b = useComplexState({
-        initialState: UserReducer.getInitialState(),
-        reducers: UserReducer.caseReducers
-    }), state = _b[0], actions = _b[1];
-    return (React__default.createElement(UserContext.Provider, { value: { state: state, actions: actions } }, children));
-};
-
 var css = "body {\n  margin: 0;\n  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',\n    'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',\n    sans-serif;\n  -webkit-font-smoothing: antialiased;\n  -moz-osx-font-smoothing: grayscale;\n  background-color: #fafbfc !important;\n}\n.container-fluid-main{\n  padding-right: 0px !important; \n  padding-left: 0px !important;\n}\n\ncode {\n  font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',\n    monospace;\n}\n\n.mes-primary-color {\n  background-color: #479dc4 !important;\n}\n.mes-button-primary{\n  background-color: #479dc4 !important;\n  border-color: #479dc4 !important;\n}\n\n.mes-selectable-datagrid .MuiDataGrid-row{\n  cursor: pointer;\n}\n\n.mes-menu-top .navbar-brand{\n  color: #FFFF !important;\n}\n.mes-menu-top .nav-link {\n  color: #FFFF !important;\n}\n.mes-menu-top .navbar-toggler {\n  color: #FFFF !important;\n}\n.mes-menu-top .navbar-text {\n  color: #FFFF !important;\n}\n.mes-footer-login{\n  position: absolute;\n  bottom: 0;\n  width: 100%;\n  height: 10em;\n  line-height: 60px;\n  text-align:center;\n}\n.mes-filter-datepicker{\n  padding: unset !important;\n  border-top-left-radius: 0 !important;\n  border-bottom-left-radius: 0 !important;\n  padding-top: 0.375rem !important;\n  padding-bottom: 0.375rem !important;\n  padding-left: 0.75rem !important;\n  cursor: pointer !important;\n  max-width: 120px;\n}\n.mes-filter-datetimepicker{\n  max-width: 97px;\n}\n.mes-not-rounded{\n  border-radius: unset !important;\n}\n\n.mes-numeric{\n  text-align: right;\n}\n.mes-drag-over{\n  border: 3px dotted #666;\n  background-color: #479dc4 !important;\n}\n.mes-drag-start{\n  border: 3px solid #666;\n}\n\n.mes-selectable{\n  cursor: pointer !important;\n}\n\n.mes-custom-select{\n  width: auto !important;\n  padding: 0.375rem 0 0.375rem 0 !important;\n  background: unset !important;\n  font-family: inherit !important;\n}\n.mes-custom-select .MuiSelect-select{\n  padding-left: 14px;\n}\n\n.mes-custom-select::before{\n  border-bottom: unset !important;\n}\n.mes-custom-select::after{\n  border-bottom: unset !important;\n}\n.mes-no-border{\n  border: unset;\n}\n.mes-no-border:focus-visible {\n  outline: unset;\n}\n.mes-div-submenu{\n  border-right: 1px solid #cfdbe2; \n}\n.mes-submenu a{\n  width: 100% !important;\n  /* color: rgba(0, 0, 0, 0.87); */\n  color: #479dc4\n}\n.mes-submenu .Mui-selected{\n  border-right: 3px solid #479dc4; \n}\n.mes-menu-group{\n    font-size: 20px;\n    line-height: 1.1;\n    color: #929292;  \n    font-weight: normal;    \n}\n\n/********************MUI DATAGRID*****************************/\n.Mui-selected{\n  font-weight: bolder !important;\n  opacity: 1 !important;\n}\n\n.mes-upload-control{\n\n}\n.mes-upload-control .file-box{\n  /* border : 1px solid black; */\n  height : 100px;\n  position: relative;  \n}\n.mes-upload-control .file-detail{\n  position: absolute;\n  left: 0px;\n  top: 0px; \n  z-index: 1;\n  height: 100%;\n  width: 100%;\n}\n\n.mes-upload-control input[type=file]{\n  left: 0px;\n  top: 0px;\n  opacity: 0;\n  z-index: 10000;\n  height: 100%;\n  cursor: pointer;\n}\n.mes-upload-control table{\n  width: 100%;\n}\n.mes-upload-control td{\n  font-size: 0.8rem !important;\n  max-width:0;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;\n}\n\n\n.input-group-text{\n  background-color: #ced2cc !important;\n  /* border: 1px solid #ced4da !important; */\n  /* color: #000000 !important; */\n}\n\n\n\n\n.content-wrapper {\n  padding: 15px;\n  width: 100%;\n  border-top: 1px solid rgba(0, 0, 0, 0.15);\n  margin-top: -1px;\n}\n.content-wrapper > .unwrap {\n  margin: -15px;\n}\n@media only screen and (min-width: 768px) {\n  .content-wrapper > .unwrap {\n    margin: -20px;\n  }\n}\n.content-wrapper > h3,\n.content-wrapper > .content-heading {\n  font-size: 24px;\n  line-height: 1.1;\n  color: #929292;\n  margin: -15px;\n  margin-bottom: 20px;\n  padding: 15px;\n  font-weight: normal;\n  background-color: #fafbfc;\n  border-bottom: 1px solid #cfdbe2;\n}\n.content-wrapper > h3 > small,\n.content-wrapper > .content-heading > small {\n  display: block;\n  font-size: 12px;\n  color: #909fa7;\n}\n.content-wrapper > button,\n.content-wrapper > .btn {\n  margin: 10px 10px 0 0;\n}\n.content-wrapper .container,\n.content-wrapper .container-fluid {\n  padding-left: 0;\n  padding-right: 0;\n}\n@media only screen and (min-width: 768px) {\n  .content-wrapper {\n    padding: 20px;\n  }\n  .content-wrapper > h3,\n  .content-wrapper > .content-heading {\n    margin: -20px;\n    margin-bottom: 5px;\n    padding: 15px;\n  }\n  .content-wrapper > button,\n  .content-wrapper > .btn {\n    margin: 0;\n  }\n}\n\n  @media print {\n    .sidebar,\n    .topnavbar,\n    .offsidebar,\n    .btn {\n      display: none !important;\n      width: 0 !important;\n      height: 0 !important;\n    }\n    .wrapper,\n    .wrapper > section,\n    .content-wrapper {\n      margin: 0 !important;\n      /* remove margin used for sidebar and expand the content */\n      padding: 0 !important;\n      width: 100% !important;\n    }\n    .content-wrapper {\n      overflow: hidden !important;\n    }\n  }\n  ";
 n(css,{});
 
@@ -5899,21 +5920,6 @@ function MESFMain(_a) {
                             React__default.createElement(Navigation, { showAreaSelector: showAreaSelector }))))))));
 }
 
-var useSearchAssets = function () {
-    var setAreasList = useUserContext().actions.setAreasList;
-    var searchAreas = function () {
-        getAreas().then(function (res) {
-            if (res) {
-                var areasSource = get(res, "data.tables[0].rows", []);
-                setAreasList(areasSource);
-            }
-        });
-    };
-    return {
-        searchAreas: searchAreas
-    };
-};
-
 var useDefaultAreaId = function () {
     var _a = useUserContext(), userId = _a.state.userId, setDefaultAreaId = _a.actions.setDefaultAreaId;
     return function () {
@@ -5959,7 +5965,6 @@ var AreaSelector = function () {
     var _b = useState(false); _b[0]; _b[1];
     var _c = useState(''); _c[0]; _c[1];
     var _d = useState(false), areaChanged = _d[0], setAreaChanged = _d[1];
-    var searchAreas = useSearchAssets().searchAreas;
     var getUserId = useToken().getUserId;
     var _e = useUserContext(), _f = _e.state, userId = _f.userId, defaultAreaId = _f.defaultAreaId, defaultAreaName = _f.defaultAreaName, areasList = _f.areasList, defaultTreeId = _f.defaultTreeId, _g = _e.actions, setDefaultAreaId = _g.setDefaultAreaId, setDefaultAreaName = _g.setDefaultAreaName, setUserId = _g.setUserId, setDefaultTreeId = _g.setDefaultTreeId, setDefaultTreeName = _g.setDefaultTreeName, setTreeIdChanged = _g.setTreeIdChanged;
     var _h = React__default.useState(true), fullWidth = _h[0]; _h[1];
@@ -5999,7 +6004,6 @@ var AreaSelector = function () {
     useEffect(function () {
         setUserId(getUserId());
     }, []);
-    useEffect(searchAreas, []);
     useEffect(function () {
         defaultAreaIdFromAPI();
     }, [userId]);
@@ -6010,13 +6014,14 @@ var AreaSelector = function () {
                 setDefaultTreeId(areaSelected === null || areaSelected === void 0 ? void 0 : areaSelected.DefaultTreeId);
                 setDefaultAreaName(areaSelected === null || areaSelected === void 0 ? void 0 : areaSelected.AssetName);
                 setDefaultTreeName(areaSelected === null || areaSelected === void 0 ? void 0 : areaSelected.Title);
+                setDefaultAreaNameToChange(areaSelected === null || areaSelected === void 0 ? void 0 : areaSelected.AssetName);
             }
         }
         else {
             setAreaChanged(false);
             setTreeIdChanged(true);
         }
-    }, [defaultAreaId]);
+    }, [defaultAreaId, userId]);
     return (React__default.createElement(React__default.Fragment, null,
         React__default.createElement(Nav, { className: "mx-2" },
             React__default.createElement(Nav.Link, null,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dexteel/mesf-core",
-  "version": "3.6.1",
+  "version": "3.6.3",
   "author": "Dexteel Team",
   "module": "dist/index.esm.js",
   "typings": "dist/index.d.ts",