@agilemotion/oui-react-js 1.5.7 → 1.5.8

package/dist/BasicApp.js

@@ -58,7 +58,9 @@ const BasicApp = props => {
   const navigate = (0, _reactRouterDom.useNavigate)();
 
   _react.default.useEffect(() => {
-    navigate("/");
+    if (window.location.pathname !== '/reset-password' && window.location.pathname !== '/login') {
+      navigate("/");
+    }
   }, []);
 
   return /*#__PURE__*/_react.default.createElement(_MuiThemeProvider.default, {
@@ -98,6 +100,7 @@ const BasicApp = props => {
       logo: props.logo
     })
   }), /*#__PURE__*/_react.default.createElement(_reactRouterDom.Route, {
+    exact: true,
     path: "/reset-password",
     element: /*#__PURE__*/_react.default.createElement(_ResetPasswordBasic.default, {
       url: location + props.contextRoot + props.authUrl + "/password/confirmForgot",
@@ -111,6 +114,7 @@ const BasicApp = props => {
       logo: props.logo
     })
   }), /*#__PURE__*/_react.default.createElement(_reactRouterDom.Route, {
+    exact: true,
     path: "/change-password",
     element: /*#__PURE__*/_react.default.createElement(_ChangePasswordBasic.default, {
       url: location + props.contextRoot + props.authUrl + "/password/challenge",

package/dist/components/Icon.js

@@ -45,6 +45,8 @@ var _Notifications = _interopRequireDefault(require("@material-ui/icons/Notifica
 
 var _Person = _interopRequireDefault(require("@material-ui/icons/Person"));
 
+var _Refresh = _interopRequireDefault(require("@material-ui/icons/Refresh"));
+
 var _Folder = _interopRequireDefault(require("@material-ui/icons/Folder"));
 
 var _AttachFile = _interopRequireDefault(require("@material-ui/icons/AttachFile"));
@@ -101,6 +103,12 @@ class Icon extends _react.Component {
           color: this.props.color
         }
       });
+    } else if (this.props.id === 'REFRESH') {
+      return /*#__PURE__*/_react.default.createElement(_Refresh.default, {
+        style: {
+          color: this.props.color
+        }
+      });
     } else if (this.props.id === 'SETTINGS') {
       return /*#__PURE__*/_react.default.createElement(_Settings.default, {
         style: {

package/dist/components/Portlet.css

@@ -0,0 +1,18 @@
+.iframe_container {
+    padding: 0;
+    height: 100%;
+    width: 100%;
+}
+
+.portlet-iframe {
+    overflow: scroll;
+    border: 0;
+    width: 100%;
+    height: 100%;
+    transform: scale(1);
+    -ms-transform-origin: 0 0;
+    -moz-transform-origin: 0 0;
+    -o-transform-origin: 0 0;
+    -webkit-transform-origin: 0 0;
+    transform-origin: 0 0;
+}

package/dist/components/Portlet.js

@@ -11,6 +11,8 @@ var _Utils = _interopRequireDefault(require("../Utils"));
 
 var _Observable = _interopRequireDefault(require("../event/Observable"));
 
+require("./Portlet.css");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const Portlet = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_react.default.forwardRef((props, ref) => {
@@ -18,6 +20,8 @@ const Portlet = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_react.default.fo
 
   const [visible, setVisible] = _react.default.useState(true);
 
+  const urlTemp = _react.default.useRef(null);
+
   _react.default.useEffect(() => {
     props.handle.api = api();
   });
@@ -36,6 +40,13 @@ const Portlet = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_react.default.fo
     };
   }, []);
 
+  _react.default.useEffect(() => {
+    if (url === 'reload') {
+      setUrl(urlTemp.current);
+      urlTemp.current = null;
+    }
+  }, [url]);
+
   const api = () => {
     return {
       get id() {
@@ -52,6 +63,11 @@ const Portlet = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_react.default.fo
 
       refresh() {},
 
+      reload() {
+        urlTemp.current = url;
+        setUrl('reload');
+      },
+
       getChildren: () => {
         return [];
       },
@@ -65,12 +81,11 @@ const Portlet = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_react.default.fo
 
   return /*#__PURE__*/_react.default.createElement("div", {
     ref: ref,
+    className: 'iframe_container',
     style: {
-      display: visible ? 'block' : 'none',
-      width: '100%',
-      height: '100%'
+      display: visible ? 'block' : 'none'
     }
-  }, !url && /*#__PURE__*/_react.default.createElement("div", {
+  }, (!url || url === 'reload') && /*#__PURE__*/_react.default.createElement("div", {
     className: "centered-flex-box w-100 h-100",
     style: {
       fontSize: '20px'
@@ -78,12 +93,9 @@ const Portlet = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_react.default.fo
   }, "Loading..."), url && /*#__PURE__*/_react.default.createElement("iframe", {
     src: url,
     title: "eProcurement",
-    style: {
-      width: '100%',
-      height: '99%',
-      borderWidth: '0'
-    },
-    allow: "camera;microphone"
+    className: 'portlet-iframe',
+    allow: "camera;microphone",
+    id: props.config.id
   }));
 }));
 

package/dist/components/media/TrainingRoom.js

@@ -116,7 +116,7 @@ const TrainingRoom = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_react.defau
             break;
 
           case _VCEventType.VCEventType.AUDIO_VISUAL_SETTINGS_CHANGED:
-            onAVSettingsChange(be.payload);
+            onAVSettingsChange(be === null || be === void 0 ? void 0 : be.payload);
             break;
 
           case _VCEventType.VCEventType.SYSTEM_EVENT:
@@ -169,14 +169,16 @@ const TrainingRoom = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_react.defau
   };
 
   const onAVSettingsChange = payload => {
-    let participant = participants.find(p => p.userId === payload.userId);
+    if (payload) {
+      let participant = participants.find(p => p.userId === payload.userId);
 
-    if (participant) {
-      participant.audioMuted = payload.audioMuted;
-      participant.videoMuted = payload.videoMuted;
-    }
+      if (participant) {
+        participant.audioMuted = payload.audioMuted;
+        participant.videoMuted = payload.videoMuted;
+      }
 
-    _VCEventManager.default.fireEvent(_VCEventType.VCEventType.AUDIO_VISUAL_SETTINGS_CHANGED, payload);
+      _VCEventManager.default.fireEvent(_VCEventType.VCEventType.AUDIO_VISUAL_SETTINGS_CHANGED, payload);
+    }
   };
 
   function emitAVSettingsChange() {
@@ -305,7 +307,7 @@ const TrainingRoom = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_react.defau
       setDisplayState(initialContext ? initialContext.windowDisplayState : 'MAXIMIZED');
     });
 
-    _VCEventManager.default.addSubscriptions(eventHandler, _VCEventType.VCEventType.REQUEST_TO_JOIN_MEETING, _VCEventType.VCEventType.USER_JOINED, _VCEventType.VCEventType.USER_LEFT_MEETING, _VCEventType.VCEventType.SYSTEM_EVENT, _VCEventType.VCEventType.SOCKET_CONNECT, _VCEventType.VCEventType.SOCKET_DISCONNECT, _VCEventType.VCEventType.RAISE_HAND, _VCEventType.VCEventType.LOWER_HAND, _VCEventType.VCEventType.PEER_DISCONNECT, _VCEventType.VCEventType.CONSUMER_TRANSPORT_FAILED, _VCEventType.VCEventType.CREATE_TRANSPORT_FAILED, _VCEventType.VCEventType.SHARING_STOPPED, _VCEventType.VCEventType.END_SESSION);
+    _VCEventManager.default.addSubscriptions(eventHandler, _VCEventType.VCEventType.REQUEST_TO_JOIN_MEETING, _VCEventType.VCEventType.USER_JOINED, _VCEventType.VCEventType.USER_LEFT_MEETING, _VCEventType.VCEventType.SYSTEM_EVENT, _VCEventType.VCEventType.SOCKET_CONNECT, _VCEventType.VCEventType.SOCKET_DISCONNECT, _VCEventType.VCEventType.RAISE_HAND, _VCEventType.VCEventType.LOWER_HAND, _VCEventType.VCEventType.PEER_DISCONNECT, _VCEventType.VCEventType.CONSUMER_TRANSPORT_FAILED, _VCEventType.VCEventType.CREATE_TRANSPORT_FAILED, _VCEventType.VCEventType.SHARING_STOPPED, _VCEventType.VCEventType.END_SESSION, _VCEventType.VCEventType.AUDIO_VISUAL_SETTINGS_CHANGED);
 
     document.addEventListener('sideBarToggleEvent', handleSidebarToggle);
 

package/dist/components/media/VCRoomWorkspace.js

@@ -420,7 +420,7 @@ const VCRoomWorkspace = props => {
 
       setupGrid(inViewParticipants);
     }
-  }, [props.participants, props.currentUserFullName]);
+  }, [props.participants, props.currentUserFullName, props.displayState]);
 
   const setupGrid = () => {
     let inViewGrid = [];

package/dist/js/Calendar.js

@@ -57,7 +57,7 @@ class Calendar {
 
       if (schedule.endTime <= schedule.startTime) {
         let endTime = new Date(schedule.endTime);
-        endTime.setHours(schedule.startTime.getHours() + 1);
+        endTime.setHours(this.getDateTime(schedule.startDate, schedule.startTime).getHours() + 1);
         return endTime;
       }
 
@@ -71,7 +71,7 @@ class Calendar {
 
       if (schedule.endTime <= schedule.startTime) {
         let startTime = new Date(schedule.startTime);
-        startTime.setHours(schedule.endTime.getHours() - 1);
+        startTime.setHours(this.getDateTime(schedule.endDate, schedule.endTime).getHours() - 1);
         return startTime;
       }
 

package/dist/js/Windows.js

@@ -0,0 +1,66 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = exports.Windows = void 0;
+
+var _moment = _interopRequireDefault(require("moment/moment"));
+
+var _Utils = _interopRequireDefault(require("../Utils"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+class Windows {
+  constructor(resolver) {
+    _defineProperty(this, "zoomIn", windowId => {
+      let el = document.getElementById(windowId);
+      let scale = el.scale;
+
+      if (!scale) {
+        scale = 1;
+      }
+
+      if (scale < 1) {
+        scale = scale * 1.1;
+        let w = el.style.width ? el.style.width.replace('px', '') : el.getBoundingClientRect().width;
+        let h = el.style.height ? el.style.height.replace('px', '') : el.getBoundingClientRect().height;
+        el.style.width = w * 1.1 + "px";
+        el.style.height = h * 1.1 + "px";
+        el.style.transform = "scale(".concat(scale, ")");
+      }
+
+      el.scale = scale;
+    });
+
+    _defineProperty(this, "zoomOut", windowId => {
+      let el = document.getElementById(windowId);
+      let scale = el.scale;
+
+      if (!scale) {
+        scale = 1;
+      }
+
+      if (scale > 0) {
+        scale = scale * 0.9;
+        let w = el.style.width || el.style.width.includes("%") ? el.style.width.replace('px', '') : el.getBoundingClientRect().width;
+        let h = el.style.height || el.style.height.includes("%") ? el.style.height.replace('px', '') : el.getBoundingClientRect().height;
+        el.style.width = w * 0.9 + "px";
+        el.style.height = h * 0.9 + "px";
+        el.style.transform = "scale(".concat(scale, ")");
+      }
+
+      el.scale = scale;
+    });
+
+    this.resolver = resolver;
+  }
+
+}
+
+exports.Windows = Windows;
+const instance = new Windows();
+var _default = instance;
+exports.default = _default;

package/dist/view/security/ChangePasswordBasic.js

@@ -46,6 +46,7 @@ var _reactRouterDom = require("react-router-dom");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const ChangePassword = props => {
+  const navigate = (0, _reactRouterDom.useNavigate)();
   const location = (0, _reactRouterDom.useLocation)();
 
   const [username, setUsername] = _react.default.useState(null);
@@ -114,11 +115,11 @@ const ChangePassword = props => {
 
       setIsLoading(true);
       (0, _Security.changePassword)(props.url, username, password, sessionId, challengeParamenters, () => {
-        _ApplicationManager.default.navigate('/');
+        navigate('/');
       }, errorMessage => {
         setIsLoading(false);
         setMessageTitle("Password Change Error!");
-        setMessage(errorMessage);
+        setMessage(!errorMessage ? _Utils.default.SYSTEM_ERROR_MESSAGE : errorMessage);
         setAlertVariant('danger');
       });
     } else {
@@ -178,6 +179,10 @@ const ChangePassword = props => {
     },
     className: 'col'
   }, props.title)), !_Utils.default.isNull(message) ? /*#__PURE__*/_react.default.createElement(_Alert.default, {
+    style: {
+      marginTop: '16px',
+      marginBottom: '0'
+    },
     variant: alertVariant,
     show: !_Utils.default.isNull(message),
     onClose: () => setMessage(null),

package/dist/view/security/ForgotPasswordBasic.js

@@ -35,9 +35,13 @@ var _TextField = _interopRequireDefault(require("@material-ui/core/TextField"));
 
 var _Lock = _interopRequireDefault(require("@material-ui/icons/Lock"));
 
+var _reactRouterDom = require("react-router-dom");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const ResetPassword = props => {
+  const navigate = (0, _reactRouterDom.useNavigate)();
+
   const [username, setUsername] = _react.default.useState("");
 
   const [message, setMessage] = _react.default.useState(null);
@@ -68,7 +72,7 @@ const ResetPassword = props => {
       }, errorMessage => {
         setIsLoading(false);
         setMessageTitle("Password Reset Error!");
-        setMessage(errorMessage);
+        setMessage(!errorMessage ? _Utils.default.SYSTEM_ERROR_MESSAGE : errorMessage);
         setAlertVariant('danger');
       });
     } else {
@@ -82,7 +86,7 @@ const ResetPassword = props => {
 
   _react.default.useEffect(() => {
     _ApplicationManager.default.clear();
-  });
+  }, []);
 
   return /*#__PURE__*/_react.default.createElement("div", {
     style: {
@@ -123,6 +127,10 @@ const ResetPassword = props => {
     },
     className: 'col'
   }, props.title)), !_Utils.default.isNull(message) ? /*#__PURE__*/_react.default.createElement(_Alert.default, {
+    style: {
+      marginTop: '16px',
+      marginBottom: '0'
+    },
     variant: alertVariant,
     show: !_Utils.default.isNull(message),
     onClose: () => setMessage(null),
@@ -166,7 +174,7 @@ const ResetPassword = props => {
     style: _loginBasicStyle.default.buttonsDiv
   }, /*#__PURE__*/_react.default.createElement(_Button.default, {
     label: "Back to Login",
-    href: "/login",
+    onClick: e => navigate("/login"),
     style: _loginBasicStyle.default.flatButton,
     startIcon: /*#__PURE__*/_react.default.createElement(_Lock.default, null)
   }, "Back to Login"))))), /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_Footer.default, {

package/dist/view/security/LoginBasic.js

@@ -43,9 +43,14 @@ var _Alert = _interopRequireDefault(require("react-bootstrap/Alert"));
 
 var _loginBasicStyle = _interopRequireDefault(require("../../assets/jss/views/loginBasicStyle"));
 
+var _reactRouterDom = require("react-router-dom");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const Login = 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);
@@ -70,7 +75,19 @@ 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: {
@@ -111,6 +128,10 @@ const Login = props => {
     },
     className: 'col'
   }, props.title)), !_Utils.default.isNull(errorMessage) ? /*#__PURE__*/_react.default.createElement(_Alert.default, {
+    style: {
+      marginTop: '16px',
+      marginBottom: '0'
+    },
     variant: "danger",
     show: !_Utils.default.isNull(errorMessage),
     onClose: () => setErrorMessage(null),
@@ -179,9 +200,9 @@ const Login = props => {
         (0, _Security.login)(props.url, username, password, (authenticated, message, response) => {
           if (authenticated) {
             if (!_Utils.default.isNull(response) && response.forcePasswordChange === true) {
-              _ApplicationManager.default.navigate("/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 {
-              _ApplicationManager.default.navigate('/');
+              navigate('/');
             }
           } else {
             setErrorMessage(message);
@@ -204,7 +225,7 @@ const Login = props => {
   }, /*#__PURE__*/_react.default.createElement(_Button.default, {
     disabled: isLoading,
     label: "Forgot Password?",
-    href: "/forgot-password",
+    onClick: e => _ApplicationManager.default.navigate("/forgot-password"),
     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, {

package/dist/view/security/ResetPasswordBasic.js

@@ -43,6 +43,8 @@ var _IconButton = _interopRequireDefault(require("@material-ui/core/IconButton")
 
 var _reactRouterDom = require("react-router-dom");
 
+var _Lock = _interopRequireDefault(require("@material-ui/icons/Lock"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const ResetPassword = props => {
@@ -77,7 +79,9 @@ const ResetPassword = props => {
   _react.default.useEffect(() => {
     let code = new URLSearchParams(location.search).get("code");
     setCode(code);
-  });
+    let username = new URLSearchParams(location.search).get("userName");
+    setUsername(username);
+  }, []);
 
   const handleClickShowPassword = () => {
     setShowPassword(!showPassword);
@@ -115,7 +119,7 @@ const ResetPassword = props => {
       }, errorMessage => {
         setIsLoading(false);
         setMessageTitle("Password Reset Error!");
-        setMessage(errorMessage);
+        setMessage(!errorMessage ? _Utils.default.SYSTEM_ERROR_MESSAGE : errorMessage);
         setAlertVariant('danger');
       });
     } else {
@@ -134,7 +138,7 @@ const ResetPassword = props => {
 
   _react.default.useEffect(() => {
     _ApplicationManager.default.clear();
-  });
+  }, []);
 
   return /*#__PURE__*/_react.default.createElement("div", {
     style: {
@@ -175,6 +179,10 @@ const ResetPassword = props => {
     },
     className: 'col'
   }, props.title)), !_Utils.default.isNull(message) ? /*#__PURE__*/_react.default.createElement(_Alert.default, {
+    style: {
+      marginTop: '16px',
+      marginBottom: '0'
+    },
     variant: alertVariant,
     show: !_Utils.default.isNull(message),
     onClose: () => setMessage(null),
@@ -186,6 +194,7 @@ const ResetPassword = props => {
   }, /*#__PURE__*/_react.default.createElement("form", null, /*#__PURE__*/_react.default.createElement(_TextField.default, {
     id: "username",
     required: true,
+    disabled: true,
     error: usernameError,
     label: "Username",
     value: username || '',
@@ -271,7 +280,14 @@ const ResetPassword = props => {
     style: {
       marginRight: "8px"
     }
-  }), isLoading && /*#__PURE__*/_react.default.createElement("span", null, "LOADING..."), !isLoading && /*#__PURE__*/_react.default.createElement("span", null, "RESET PASSWORD")))))))), /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_Footer.default, {
+  }), isLoading && /*#__PURE__*/_react.default.createElement("span", null, "LOADING..."), !isLoading && /*#__PURE__*/_react.default.createElement("span", null, "RESET PASSWORD"))))), /*#__PURE__*/_react.default.createElement("div", {
+    style: _loginBasicStyle.default.buttonsDiv
+  }, /*#__PURE__*/_react.default.createElement(_Button.default, {
+    label: "Go to Login",
+    href: "/login",
+    style: _loginBasicStyle.default.flatButton,
+    startIcon: /*#__PURE__*/_react.default.createElement(_Lock.default, null)
+  }, "Go to Login"))))), /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_Footer.default, {
     white: true,
     logo: props.footerLogo,
     text: props.footerText,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agilemotion/oui-react-js",
-  "version": "1.5.7",
+  "version": "1.5.8",
   "babel": {
     "presets": [
       "@babel/preset-env",