@agilemotion/oui-react-js 1.5.8 → 1.6.0

package/dist/view/security/{LoginBusinessPortal.js → LoginInteractionPortal.js}

@@ -41,13 +41,16 @@ var _Footer = _interopRequireDefault(require("../../components/footer/Footer"));
 
 var _Alert = _interopRequireDefault(require("react-bootstrap/Alert"));
 
-var _loginBusinessPortalStyle = _interopRequireDefault(require("../../assets/jss/views/loginBusinessPortalStyle"));
+var _loginBasicStyle = _interopRequireDefault(require("../../assets/jss/views/loginBasicStyle"));
 
-var _colors = require("material-ui/styles/colors");
+var _reactRouterDom = require("react-router-dom");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const Login = props => {
+const LoginInteractionPortal = props => {
+  const navigate = (0, _reactRouterDom.useNavigate)();
+  const location = (0, _reactRouterDom.useLocation)();
+
   const [errorMessage, setErrorMessage] = _react.default.useState(null);
 
   const [usernameError, setUsernameError] = _react.default.useState(false);
@@ -72,12 +75,24 @@ const Login = props => {
 
   _react.default.useEffect(() => {
     _ApplicationManager.default.clear();
-  });
+
+    let username = new URLSearchParams(location.search).get("userName");
+
+    if (username) {
+      setUsername(username);
+    }
+
+    let code = new URLSearchParams(location.search).get("code");
+
+    if (code) {
+      setPassword(code);
+    }
+  }, []);
 
   return /*#__PURE__*/_react.default.createElement("div", {
     style: {
       backgroundColor: props.background,
-      color: props.textColor ? props.textColor : _colors.black,
+      color: props.textColor,
       height: '100%',
       width: '100%'
     }
@@ -94,42 +109,38 @@ const Login = props => {
       margin: 'auto'
     }
   }, /*#__PURE__*/_react.default.createElement("div", {
-    style: _loginBusinessPortalStyle.default.loginContainer
-  }, /*#__PURE__*/_react.default.createElement(_Paper.default, {
-    style: _loginBusinessPortalStyle.default.paper
-  }, /*#__PURE__*/_react.default.createElement("div", {
-    className: "row",
-    style: _loginBusinessPortalStyle.default.title
+    className: "row no-margin no-padding",
+    style: _loginBasicStyle.default.title
   }, /*#__PURE__*/_react.default.createElement("div", {
     style: {
-      width: '30%',
-      textAlign: 'right'
-    },
-    className: 'col-*-*'
+      textAlign: 'right',
+      maxWidth: '60%'
+    }
   }, /*#__PURE__*/_react.default.createElement("img", {
     src: props.logo,
     alt: "..."
   })), /*#__PURE__*/_react.default.createElement("div", {
     style: {
-      width: '70%',
+      width: props.title.length === 0 ? '0' : '70%',
       textAlign: 'left',
       margin: 'auto',
       paddingLeft: '16px',
-      fontSize: "20pt",
-      color: props.textColor ? props.textColor : _colors.black
+      color: props.titleColor
+    },
+    className: 'col'
+  }, props.title)), !_Utils.default.isNull(errorMessage) ? /*#__PURE__*/_react.default.createElement(_Alert.default, {
+    style: {
+      marginTop: '16px',
+      marginBottom: '0'
     },
-    className: 'col-*-*'
-  }, props.title)), !_Utils.default.isNull(errorMessage) ? /*#__PURE__*/_react.default.createElement("div", {
-    style: _loginBusinessPortalStyle.default.componentWrapper,
-    className: "w-100 row-*-*"
-  }, /*#__PURE__*/_react.default.createElement(_Alert.default, {
     variant: "danger",
     show: !_Utils.default.isNull(errorMessage),
     onClose: () => setErrorMessage(null),
     dismissible: true
-  }, /*#__PURE__*/_react.default.createElement(_Alert.default.Heading, null, "Login error!"), /*#__PURE__*/_react.default.createElement("p", null, errorMessage))) : "", /*#__PURE__*/_react.default.createElement("div", {
-    style: _loginBusinessPortalStyle.default.componentWrapper,
-    className: "w-100 row-*-*"
+  }, /*#__PURE__*/_react.default.createElement(_Alert.default.Heading, null, "Login error!"), /*#__PURE__*/_react.default.createElement("p", null, errorMessage)) : "", /*#__PURE__*/_react.default.createElement("div", {
+    style: _loginBasicStyle.default.loginContainer
+  }, /*#__PURE__*/_react.default.createElement(_Paper.default, {
+    style: _loginBasicStyle.default.paper
   }, /*#__PURE__*/_react.default.createElement("form", null, /*#__PURE__*/_react.default.createElement(_TextField.default, {
     id: "username",
     required: true,
@@ -175,9 +186,8 @@ const Login = props => {
       minWidth: "200px",
       width: "100%"
     }
-  }))), /*#__PURE__*/_react.default.createElement("div", {
-    style: _loginBusinessPortalStyle.default.componentWrapper,
-    className: "w-100 row-*-*"
+  }), /*#__PURE__*/_react.default.createElement("div", {
+    className: "w-100"
   }, /*#__PURE__*/_react.default.createElement(_Button.default, {
     disabled: isLoading,
     onClick: () => {
@@ -191,10 +201,9 @@ const Login = props => {
         (0, _Security.login)(props.url, username, password, (authenticated, message, response) => {
           if (authenticated) {
             if (!_Utils.default.isNull(response) && response.forcePasswordChange === true) {
-              props.history.push("/change-password?username=".concat(username, "&sessionId=").concat(response.sessionId, "&challengeParamenters=").concat(encodeURI(JSON.stringify(response.challangeParameters))));
+              navigate("/change-password?username=".concat(username, "&sessionId=").concat(response.sessionId, "&challengeParamenters=").concat(encodeURI(JSON.stringify(response.challangeParameters))));
             } else {
-              sessionStorage.setItem("username", username);
-              props.history.push('/home');
+              navigate('/');
             }
           } else {
             setErrorMessage(message);
@@ -206,23 +215,22 @@ const Login = props => {
     variant: "contained",
     color: "primary",
     fullWidth: true,
-    style: _loginBusinessPortalStyle.default.loginBtn
+    style: _loginBasicStyle.default.loginBtn
   }, isLoading && /*#__PURE__*/_react.default.createElement("i", {
     className: "fa fa-refresh fa-spin",
     style: {
       marginRight: "8px"
     }
-  }), isLoading && /*#__PURE__*/_react.default.createElement("span", null, "LOADING..."), !isLoading && /*#__PURE__*/_react.default.createElement("span", null, "LOGIN"))), /*#__PURE__*/_react.default.createElement("div", {
-    style: _loginBusinessPortalStyle.default.buttonsDiv,
-    className: "w-100 row-*-*"
+  }), isLoading && /*#__PURE__*/_react.default.createElement("span", null, "LOADING..."), !isLoading && /*#__PURE__*/_react.default.createElement("span", null, "LOGIN"))))), /*#__PURE__*/_react.default.createElement("div", {
+    style: _loginBasicStyle.default.buttonsDiv
   }, /*#__PURE__*/_react.default.createElement(_Button.default, {
     disabled: isLoading,
     label: "Forgot Password?",
     href: "/forgot-password",
-    style: _loginBusinessPortalStyle.default.flatButton,
+    style: _loginBasicStyle.default.flatButton,
     startIcon: /*#__PURE__*/_react.default.createElement(_Help.default, null)
-  }, "Forgot Password?")))))), /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_Footer.default, {
-    black: true,
+  }, "Forgot Password?"))))), /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_Footer.default, {
+    white: true,
     logo: props.footerLogo,
     text: props.footerText,
     width: props.footerWidth,
@@ -230,6 +238,6 @@ const Login = props => {
   })));
 };
 
-var _default = (0, _WithRouter.default)((0, _reactRedux.connect)(dispatch => (0, _redux.bindActionCreators)(_DashboardStore.actionCreators, dispatch))(Login));
+var _default = (0, _WithRouter.default)((0, _reactRedux.connect)(dispatch => (0, _redux.bindActionCreators)(_DashboardStore.actionCreators, dispatch))(LoginInteractionPortal));
 
 exports.default = _default;

package/dist/view/security/ResetPasswordBasic.js

@@ -175,7 +175,8 @@ const ResetPassword = props => {
       width: props.title.length === 0 ? '0' : '70%',
       textAlign: 'left',
       margin: 'auto',
-      paddingLeft: '16px'
+      paddingLeft: '16px',
+      color: props.titleColor
     },
     className: 'col'
   }, props.title)), !_Utils.default.isNull(message) ? /*#__PURE__*/_react.default.createElement(_Alert.default, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agilemotion/oui-react-js",
-  "version": "1.5.8",
+  "version": "1.6.0",
   "babel": {
     "presets": [
       "@babel/preset-env",
@@ -29,6 +29,10 @@
     "@material-ui/lab": "^4.0.0-alpha.57",
     "@material-ui/pickers": "^3.3.10",
     "@material-ui/styles": "^4.11.3",
+    "@syncfusion/ej2-base": "^26.1.37",
+    "@syncfusion/ej2-react-popups": "^26.1.35",
+    "@syncfusion/ej2-react-richtexteditor": "^26.2.7",
+    "@syncfusion/ej2-react-splitbuttons": "^26.1.35",
     "async-mutex": "^0.2.6",
     "caniuse-lite": "^1.0.30001623",
     "classnames": "^2.3.1",
@@ -40,6 +44,7 @@
     "install": "^0.13.0",
     "jquery": "^3.6.0",
     "js-base64": "^3.6.0",
+    "mammoth": "^1.8.0",
     "material-ui": "^0.20.2",
     "mediasoup-client": "^3.7.8",
     "mobx": "^5.15.4",