@dexteel/mesf-core 3.1.0 → 3.2.1

package/dist/account/login.d.ts

@@ -1,9 +1,3 @@
 /// <reference types="react" />
-import PropTypes from 'prop-types';
 import { LoginParams } from "./models/login.models";
 export declare function Login({ authConfig }: LoginParams): JSX.Element;
-export declare namespace Login {
-    var propTypes: {
-        setToken: PropTypes.Requireable<(...args: any[]) => any>;
-    };
-}

package/dist/account/logout.d.ts

@@ -1,8 +1,2 @@
 /// <reference types="react" />
-import PropTypes from 'prop-types';
 export declare function Logout(): JSX.Element;
-export declare namespace Logout {
-    var propTypes: {
-        clearEvent: PropTypes.Requireable<(...args: any[]) => any>;
-    };
-}

package/dist/index.esm.js

@@ -29,7 +29,7 @@ import MomentUtils from '@date-io/moment';
 import Select from '@material-ui/core/Select';
 import MenuItem from '@material-ui/core/MenuItem';
 import InputLabel from '@material-ui/core/InputLabel';
-import { FormHelperText, TextField as TextField$1, CircularProgress as CircularProgress$1, Typography as Typography$1 } from '@material-ui/core';
+import { FormHelperText, TextField as TextField$1, CircularProgress as CircularProgress$1, Typography as Typography$1, Snackbar as Snackbar$1 } from '@material-ui/core';
 import FormControl from '@material-ui/core/FormControl';
 import FormGroup from '@material-ui/core/FormGroup';
 import FormControlLabel from '@material-ui/core/FormControlLabel';
@@ -38,7 +38,7 @@ import FormHelperText$1 from '@material-ui/core/FormHelperText';
 import stc from 'string-to-color';
 import DeleteIcon from '@material-ui/icons/Delete';
 import EditIcon from '@material-ui/icons/Edit';
-import { Outlet, useNavigate, Link, useParams, Navigate, Routes, Route, BrowserRouter } from 'react-router-dom';
+import { Outlet, useNavigate, useSearchParams, Link, useParams, Navigate, Routes, Route, BrowserRouter } from 'react-router-dom';
 import PropTypes from 'prop-types';
 import { ResponsiveBar } from '@nivo/bar';
 import DatePicker from 'react-datepicker';
@@ -3820,6 +3820,7 @@ var Configuration$1 = /** @class */ (function () {
     return Configuration;
 }());
 
+var base$1 = document.getElementsByTagName('base')[0].getAttribute('href') || '/';
 var MESApiService = /** @class */ (function () {
     function MESApiService() {
         this.config = new Configuration$1();
@@ -3982,6 +3983,9 @@ var MESApiService = /** @class */ (function () {
                         throw new FetchError(errorMsg.message, 404, "ERR_CONNECTION_REFUSED");
                     })
                         .then(function (response) {
+                        if (response.status === 401) {
+                            window.location.href = "".concat(base$1, "logout?message=Session%20expired&redirectTo=").concat(window.location.href);
+                        }
                         isError = { ok: response.ok, status: response.status, statusText: response.statusText };
                         return response.json();
                     })
@@ -4031,6 +4035,9 @@ var MESApiService = /** @class */ (function () {
                         throw new FetchError(errorMsg.message, 404, "ERR_CONNECTION_REFUSED");
                     })
                         .then(function (response) {
+                        if (response.status === 401) {
+                            window.location.href = "".concat(base$1, "logout?message=Session%20expired&redirectTo=").concat(window.location.href);
+                        }
                         isError = { ok: response.ok, status: response.status, statusText: response.statusText };
                         return response.json();
                     })
@@ -4083,6 +4090,9 @@ var MESApiService = /** @class */ (function () {
                         throw new FetchError(errorMsg.message, 404, "ERR_CONNECTION_REFUSED");
                     })
                         .then(function (response) {
+                        if (response.status === 401) {
+                            window.location.href = "".concat(base$1, "logout?message=Session%20expired&redirectTo=").concat(window.location.href);
+                        }
                         isError = { ok: response.ok, status: response.status, statusText: response.statusText };
                         return response.json();
                     })
@@ -4133,6 +4143,9 @@ var MESApiService = /** @class */ (function () {
                         throw new FetchError(errorMsg.message, 404, "ERR_CONNECTION_REFUSED");
                     })
                         .then(function (response) {
+                        if (response.status === 401) {
+                            window.location.href = "".concat(base$1, "logout?message=Session%20expired&redirectTo=").concat(window.location.href);
+                        }
                         isError = { ok: response.ok, status: response.status, statusText: response.statusText };
                         if (!isError.ok)
                             return response.json();
@@ -4199,6 +4212,9 @@ var MESApiService = /** @class */ (function () {
                         throw new FetchError(errorMsg.message, 404, "ERR_CONNECTION_REFUSED");
                     })
                         .then(function (response) {
+                        if (response.status === 401) {
+                            window.location.href = "".concat(base$1, "logout?message=Session%20expired&redirectTo=").concat(window.location.href);
+                        }
                         isError = { ok: response.ok, status: response.status, statusText: response.statusText };
                         if (!isError.ok)
                             return response.json();
@@ -5239,8 +5255,7 @@ var Authenticated = function (_a) {
 };
 var Unauthenticated = function (_a) {
     var authConfig = _a.authConfig;
-    return (React__default.createElement(React__default.Fragment, null,
-        React__default.createElement(Login, { authConfig: authConfig })));
+    return (React__default.createElement(Login, { authConfig: authConfig }));
 };
 
 var LoginWithEmailAndPassword = function () {
@@ -5440,9 +5455,26 @@ var LoginAsGuest = function () {
 
 function Login(_a) {
     var authConfig = _a.authConfig;
+    var params = useRef((new URL(document.location)).searchParams);
+    var _b = useState(false), open = _b[0], setOpen = _b[1];
+    var _c = useState(''), message = _c[0], setMessage = _c[1];
     var useEmailAndPassword = get$1(authConfig, 'useEmailAndPassword', true);
     var useAzureAD = get$1(authConfig, 'useAzureAD', false);
     var guestIsEnabled = get$1(authConfig, 'guestIsEnabled', false);
+    var handleClose = function () {
+        setOpen(false);
+        params.current["delete"]('message');
+        var newUrl = window.location.origin
+            + window.location.pathname
+            + '?' + params.current.toString();
+        window.history.replaceState({ path: newUrl }, '', newUrl);
+    };
+    useEffect(function () {
+        if (params.current.has('message')) {
+            setMessage(params.current.get('message'));
+            setOpen(true);
+        }
+    }, [params.toString()]);
     return (React__default.createElement(React__default.Fragment, null,
         React__default.createElement("header", null,
             React__default.createElement(Navbar, { variant: "dark", expand: "lg", className: "mes-primary-color mes-menu-top" },
@@ -5455,20 +5487,19 @@ function Login(_a) {
                         React__default.createElement("div", { className: "card-body m-3" },
                             useEmailAndPassword && React__default.createElement(LoginWithEmailAndPassword, null),
                             useAzureAD && React__default.createElement(LoginWithAzureAD, { config: authConfig.AzureConfig }),
-                            guestIsEnabled && React__default.createElement(LoginAsGuest, null))))))));
-}
-Login.propTypes = {
-    setToken: PropTypes.func
-};
+                            guestIsEnabled && React__default.createElement(LoginAsGuest, null)))))),
+        React__default.createElement(Snackbar$1, { open: open, autoHideDuration: 6000, onClose: handleClose, message: message })));
+}
 
 function Logout() {
     var _this = this;
     var clearToken = useContext(AuthContext).clearToken;
     var navigate = useNavigate();
+    var _a = useSearchParams(), params = _a[0]; _a[1];
     var logout = function () { return __awaiter(_this, void 0, void 0, function () {
         return __generator(this, function (_a) {
             clearToken();
-            navigate("/");
+            navigate("/?".concat(params.toString()));
             return [2 /*return*/];
         });
     }); };
@@ -5477,10 +5508,7 @@ function Logout() {
     }, []);
     return (React__default.createElement(React__default.Fragment, null,
         React__default.createElement("div", null, "logging out!!!")));
-}
-Logout.propTypes = {
-    clearEvent: PropTypes.func
-};
+}
 
 var RouterContext = React__default.createContext(function () { return React__default.createElement(React__default.Fragment, null); });
 var ConfigurationContext = React__default.createContext([
@@ -5611,16 +5639,31 @@ var MESFMainRouter = function () {
 var MESFMainContainer = function () { return (React__default.createElement("div", { id: "mainSection", className: "container-fluid container-fluid-main" },
     React__default.createElement(MESFMainRouter, null))); };
 
-var Navigation = function () { return (React__default.createElement(React__default.Fragment, null,
-    React__default.createElement("div", { className: "wrapper" },
+var Navigation = function () {
+    var _a = useSearchParams(), params = _a[0]; _a[1];
+    var mounted = useRef(true);
+    useEffect(function () {
+        mounted.current = true;
+        if (params.has('redirectTo')) {
+            setTimeout(function () {
+                if (mounted.current) {
+                    window.location.href = decodeURI(params.get('redirectTo'));
+                }
+            }, 100);
+        }
+        return function () {
+            mounted.current = false;
+        };
+    }, [params.toString()]);
+    return (React__default.createElement("div", { className: "wrapper" },
         React__default.createElement(Header, null),
-        React__default.createElement(MESFMainContainer, null)))); };
+        React__default.createElement(MESFMainContainer, null)));
+};
 
 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,{});
 
-var _a;
-var base = ((_a = document.getElementsByTagName('base')[0].getAttribute('href')) === null || _a === void 0 ? void 0 : _a.replace(/\/$/, "")) || '/';
+var base = document.getElementsByTagName('base')[0].getAttribute('href') || '/';
 function MESFMain(props) {
     return (React__default.createElement(AuthProvider, { authConfig: props.authentication },
         React__default.createElement(RouterContext.Provider, { value: props.routes },

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@dexteel/mesf-core",
-  "version": "3.1.0",
+  "version": "3.2.1",
   "author": "Lucas Rueda",
   "module": "dist/index.esm.js",
   "typings": "dist/index.d.ts",
   "scripts": {
     "prepublish": "rimraf -rf ./dist && npm run build",
     "build": "rimraf -rf ./dist && rollup -c",
-    "watch": "rollup -wc",
-    "start": "rollup -wc"
+    "watch": "cross-env rollup -wc",
+    "start": "cross-env rollup -wc"
   },
   "license": "ISC",
   "devDependencies": {