@dexteel/mesf-core 3.9.1 → 3.9.2

package/CHANGELOG.md

@@ -1,4 +1,6 @@
 # CHANGELOG
+## 3.9.2
+- Area selector fixed
 ## 3.9.1
 - When creating axiosInstance, add token
 ## 3.9.0

package/dist/context/userContext.d.ts

@@ -5,6 +5,7 @@ export declare const useUserContext: () => {
         userId: number | null;
         defaultAreaId: string | number | null;
         defaultAreaName: string | null;
+        userLogged: boolean;
     };
     actions: import("@reduxjs/toolkit").CaseReducerActions<{
         setUserId(state: import("immer/dist/internal").WritableDraft<{
@@ -12,6 +13,7 @@ export declare const useUserContext: () => {
             userId: number | null;
             defaultAreaId: string | number | null;
             defaultAreaName: string | null;
+            userLogged: boolean;
         }>, { payload }: {
             payload: any;
             type: string;
@@ -21,6 +23,7 @@ export declare const useUserContext: () => {
             userId: number | null;
             defaultAreaId: string | number | null;
             defaultAreaName: string | null;
+            userLogged: boolean;
         }>, { payload }: {
             payload: any;
             type: string;
@@ -30,6 +33,7 @@ export declare const useUserContext: () => {
             userId: number | null;
             defaultAreaId: string | number | null;
             defaultAreaName: string | null;
+            userLogged: boolean;
         }>, { payload }: {
             payload: any;
             type: string;
@@ -39,6 +43,17 @@ export declare const useUserContext: () => {
             userId: number | null;
             defaultAreaId: string | number | null;
             defaultAreaName: string | null;
+            userLogged: boolean;
+        }>, { payload }: {
+            payload: any;
+            type: string;
+        }): void;
+        setUserLogged(state: import("immer/dist/internal").WritableDraft<{
+            userLastName: string;
+            userId: number | null;
+            defaultAreaId: string | number | null;
+            defaultAreaName: string | null;
+            userLogged: boolean;
         }>, { payload }: {
             payload: any;
             type: string;

package/dist/index.esm.js

@@ -6076,15 +6076,14 @@ var useStyles = makeStyles$1(function (theme) {
 });
 var AreaSelector = function () {
     var _a = useState(false), open = _a[0], setOpen = _a[1];
-    var _b = useState(false), areaChanged = _b[0], setAreaChanged = _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 _b = useUserContext(), _c = _b.state, userId = _c.userId, defaultAreaId = _c.defaultAreaId, defaultAreaName = _c.defaultAreaName, _d = _b.actions, setDefaultAreaId = _d.setDefaultAreaId, setDefaultAreaName = _d.setDefaultAreaName, setUserId = _d.setUserId;
     var areasList = useAssetContext().state.areasList;
-    var _f = React__default.useState(true), fullWidth = _f[0]; _f[1];
-    var _g = React__default.useState('sm'), maxWidth = _g[0]; _g[1];
+    var _e = React__default.useState(true), fullWidth = _e[0]; _e[1];
+    var _f = React__default.useState('sm'), maxWidth = _f[0]; _f[1];
     var classes = useStyles();
-    var _h = useState(defaultAreaId), defaultAreaIdToChange = _h[0], setDefaultAreaIdToChange = _h[1];
-    var _j = useState(defaultAreaName), defaultAreaNameToChange = _j[0], setDefaultAreaNameToChange = _j[1];
+    var _g = useState(defaultAreaId), defaultAreaIdToChange = _g[0], setDefaultAreaIdToChange = _g[1];
+    var _h = useState(defaultAreaName), defaultAreaNameToChange = _h[0], setDefaultAreaNameToChange = _h[1];
     var defaultAreaIdFromAPI = useDefaultAreaId();
     var onClose = function (value) { return setOpen(value); };
     var changeAreaActive = function () {
@@ -6107,9 +6106,7 @@ var AreaSelector = function () {
     var handleChangeDefaultAreaId = function () { return __awaiter(void 0, void 0, void 0, function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0:
-                    setAreaChanged(true);
-                    return [4 /*yield*/, upsertDefaultAreaId(userId, defaultAreaIdToChange)];
+                case 0: return [4 /*yield*/, upsertDefaultAreaId(userId, defaultAreaIdToChange)];
                 case 1:
                     _a.sent();
                     setDefaultAreaId(defaultAreaIdToChange);
@@ -6126,17 +6123,12 @@ var AreaSelector = function () {
         defaultAreaIdFromAPI();
     }, [userId]);
     useEffect(function () {
-        if (!areaChanged) {
-            if (defaultAreaId) {
-                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);
-            }
-        }
-        else {
-            setAreaChanged(false);
+        if (defaultAreaId) {
+            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);
         }
-    }, [defaultAreaId, userId]);
+    }, [defaultAreaId, areasList]);
     return (React__default.createElement(React__default.Fragment, null,
         React__default.createElement(Nav, { className: "mx-2" },
             React__default.createElement(Nav.Link, null,
@@ -6146,7 +6138,7 @@ var AreaSelector = function () {
                         "textOverflow": "ellipsis", "whiteSpace": "nowrap"
                     }, onClick: changeAreaActive },
                     React__default.createElement(PersonPinCircleIcon, { style: { marginLeft: "-5px" } }),
-                    defaultAreaName || "Pick Area"))),
+                    defaultAreaName))),
         React__default.createElement(Dialog$1, { fullWidth: fullWidth, maxWidth: maxWidth, onClose: handleClose, "aria-labelledby": "confirmation-dialog-title", open: open, className: classes.root },
             React__default.createElement(DialogTitle$2, { id: "confirmation-dialog-title" }, "AREA"),
             React__default.createElement(DialogContent$2, { dividers: true },

package/package.json

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