@agilemotion/oui-react-js 1.4.3 → 1.4.4

package/dist/components/media/VCRoomWorkspace.js

@@ -31,6 +31,8 @@ var _LobbyWaitingList = _interopRequireDefault(require("./LobbyWaitingList"));
 
 var _VCRoom = require("./VCRoom");
 
+var _SideBarContent = _interopRequireDefault(require("./SideBarContent"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
@@ -55,8 +57,6 @@ const VCRoomWorkspace = props => {
 
   const [producerTransport, setProducerTransport] = _react.default.useState(null);
 
-  const [shareScreenSource, setShareScreenSource] = _react.default.useState(null);
-
   const [screenShared, setScreenShared] = _react.default.useState(null);
 
   const [someoneSharing, setSomeoneSharing] = _react.default.useState(null);
@@ -77,15 +77,17 @@ const VCRoomWorkspace = props => {
     waitingList,
     roomStatus,
     meetingId,
+    meetingChat,
+    sideBarTab,
     meetingTitle,
     whiteBoardShown,
     videoMuted,
     audioMuted,
     isHost,
-    autoPermit,
     rtpCapabilities,
     onloadScreenShareData,
-    displayState
+    displayState,
+    startScreenSharing
   } = props;
 
   const startShareScreen = () => {
@@ -157,41 +159,46 @@ const VCRoomWorkspace = props => {
       monitorTypeSurfaces: 'exclude'
     };
     navigator.mediaDevices.getDisplayMedia(videoConstraints).then(async stream => {
-      const track = stream.getVideoTracks()[0];
+      _SocketManager.default.emitEvent(_VCEventType.VCEventType.CANCEL_SCREEN_SHARE, {
+        roomId: props.meetingId
+      }).then(async result => {
+        const track = stream.getVideoTracks()[0];
 
-      track.onended = e => {
-        track.stop();
-        stopShareScreen();
-      };
-
-      const params = {
-        track,
-        appData: {
-          screenSharing: true
+        track.onended = e => {
+          track.stop();
+          stopShareScreen();
+        };
+
+        const params = {
+          track,
+          appData: {
+            screenSharing: true
+          }
+        };
+        let producer = await producerTransport.produce(params);
+        setShareScreenProducer(producer);
+        shareScreenStream.current = stream;
+
+        if (showSharedScreen) {
+          shareScreenVideoRef.current.srcObject = stream;
         }
-      };
-      let producer = await producerTransport.produce(params);
-      setShareScreenProducer(producer);
-      shareScreenStream.current = stream;
 
-      if (showSharedScreen) {
-        shareScreenVideoRef.current.srcObject = stream;
-      }
-
-      producer.on('transportclose', () => {
-        stream.srcObject.getTracks().forEach(function (track) {
-          track.stop();
+        producer.on('transportclose', () => {
+          stream.srcObject.getTracks().forEach(function (track) {
+            track.stop();
+          });
+          setShareScreenProducer(null);
         });
-        setShareScreenProducer(null);
-      });
-      producer.on('close', () => {
-        stream.srcObject.getTracks().forEach(function (track) {
-          track.stop();
+        producer.on('close', () => {
+          stream.srcObject.getTracks().forEach(function (track) {
+            track.stop();
+          });
+          setShareScreenProducer(null);
         });
-        setShareScreenProducer(null);
-      });
+        props.onStartSharing();
+      }).catch(e => console.log('ERROR CANCELLING SCREEN SHARE : ', e));
     }).catch(e => {
-      console.error(e);
+      props.onStopSharing();
     });
   };
 
@@ -212,9 +219,8 @@ const VCRoomWorkspace = props => {
 
     shareScreenProducer.close();
     stopShareScreen();
-    setShareScreenProducer(null);
-    setSomeoneSharing(false);
-    setShareScreenSource(null);
+    setShareScreenProducer(null); //setSomeoneSharing(false);
+
     setScreenShared(false);
 
     if (shareScreenStream.current) {
@@ -253,7 +259,6 @@ const VCRoomWorkspace = props => {
         setScreenShared(true);
         setSomeoneSharing(true); //setShowSharedScreen(true);
 
-        setShareScreenSource(null);
         setMessage(producer.username + ' is sharing');
         shareScreenVideoRef.current.srcObject = stream;
         shareScreenStream.current = stream; //setVideoRefresher(!videoRefresher);
@@ -350,12 +355,15 @@ const VCRoomWorkspace = props => {
   }, [grid]);*/
 
   (0, _react.useEffect)(() => {
-    if (screenShared && shareScreenSource) {
-      produceScreenShare();
-    } else {
+    if (!screenShared) {
       stopProducingScreenShare();
     }
-  }, [screenShared, shareScreenSource]);
+  }, [screenShared]);
+  (0, _react.useEffect)(() => {
+    if (startScreenSharing) {
+      produceScreenShare();
+    }
+  }, [startScreenSharing]);
   (0, _react.useEffect)(() => {
     if (onloadScreenShareData && device && consumerTransport) {
       consume(onloadScreenShareData);
@@ -545,7 +553,7 @@ const VCRoomWorkspace = props => {
     return (!screenShared && !whiteBoardShown || screenShared && !showSharedScreen && !someoneSharing) && /*#__PURE__*/_react.default.createElement(_Box.default, {
       style: {
         flexGrow: 1,
-        height: displayState === 'MAXIMIZED' ? 'calc(100% - 216px)' : '100%',
+        height: displayState === 'MAXIMIZED' ? 'calc(100% - 232px)' : '100%',
         width: '100%',
         justifyContent: 'center',
         alignItems: 'center',
@@ -579,13 +587,13 @@ const VCRoomWorkspace = props => {
   return device ? /*#__PURE__*/_react.default.createElement("div", {
     className: 'row-*-* grid',
     style: {
-      height: displayState === 'MAXIMIZED' ? '100%' : 'calc(100% - 100px)',
+      height: displayState === 'MAXIMIZED' ? '100%' : displayState === 'MINIMIZED' ? 'calc(100% - 100px)' : 'calc(100% - 200px)',
       width: '100%',
       display: displayState === 'MAXIMIZED' ? null : 'table'
     }
   }, (roomStatus === 'LOBBY' || props.allUserParticipantsLeft) && /*#__PURE__*/_react.default.createElement("div", {
     style: {
-      height: displayState === 'MAXIMIZED' ? 'calc(100% - 216px)' : '100%',
+      height: displayState === 'MAXIMIZED' ? 'calc(100% - 232px)' : '100%',
       fontSize: '28px',
       width: '100%',
       justifyContent: 'center',
@@ -597,7 +605,19 @@ const VCRoomWorkspace = props => {
       width: 'calc(100% - 200px)',
       display: 'table-cell'
     }
-  }, renderParticipantGrid()), /*#__PURE__*/_react.default.createElement("div", {
+  }, renderParticipantGrid()), displayState === 'PINNED' && /*#__PURE__*/_react.default.createElement("div", {
+    style: {
+      width: '100%'
+    }
+  }, /*#__PURE__*/_react.default.createElement(_SideBarContent.default, {
+    meetingChat: meetingChat,
+    isHost: isHost,
+    tab: sideBarTab,
+    meetingId: meetingId,
+    participants: props.participants,
+    onHostAudioMute: props.onHostAudioMute,
+    onHostVideoMute: props.onHostVideoMute
+  })), /*#__PURE__*/_react.default.createElement("div", {
     className: 'content-box',
     style: {
       display: !(screenShared && showSharedScreen || someoneSharing) ? 'none' : null
@@ -621,13 +641,16 @@ const VCRoomWorkspace = props => {
     className: "".concat(displayState === 'MAXIMIZED' ? 'row-*-*' : ''),
     style: {
       width: displayState === 'MAXIMIZED' ? '100%' : '200px',
-      height: displayState === 'MAXIMIZED' ? '152px' : '100%',
+      height: displayState === 'MAXIMIZED' ? '152px' : displayState === 'MINIMIZED' ? '100%' : null,
       marginRight: '0',
-      display: screenShared && showSharedScreen || someoneSharing ? 'none' : displayState === 'MAXIMIZED' ? 'flex' : 'table-cell',
+      display: screenShared && showSharedScreen || someoneSharing ? 'none' : displayState === 'MAXIMIZED' ? 'flex' : displayState === 'MINIMIZED' ? 'table-cell' : '',
       alignItems: 'center',
-      verticalAlign: 'top'
+      verticalAlign: 'top',
+      bottom: '8px',
+      right: '8px'
     }
   }, /*#__PURE__*/_react.default.createElement("div", {
+    className: ' strip-participants',
     style: {
       width: displayState === 'MAXIMIZED' ? 'calc(100% - 232px)' : '100%',
       height: '148px',

package/dist/components/signatures/SignatureTemplateDesigner.js

@@ -199,7 +199,7 @@ const SignatureTemplateDesigner = /*#__PURE__*/_react.default.memo( /*#__PURE__*
             }, e => {
               console.error(e);
 
-              _Utils.default.publishSystemErrorMessage(props.viewId);
+              _Utils.default.publishErrorMessage(e, props.viewId);
             }, parameter => {
               setLoading(false);
             });

package/dist/event/ServiceCallActionHandler.js

@@ -47,13 +47,7 @@ class ServiceCallActionHandler {
           successCallback(result);
         }
       }, e => {
-        if (!e.dataType) {
-          _Utils.default.publishSystemErrorMessage(currentViewId, component);
-        } else {
-          if (e.message) {
-            _Utils.default.publishErrorMessage(e.message, currentViewId, component);
-          }
-        }
+        _Utils.default.publishErrorMessage(e, currentViewId, component);
 
         if (!_Utils.default.isNull(errorCallback)) {
           errorCallback(e);

package/dist/js/Media.js

@@ -39,7 +39,7 @@ class Media {
             _Observable.default.fireEvent(_VCEventType.VCEventType.JOIN_MEETING_PERMIT, event);
           } else {
             _SocketManager.default.emitEvent(_SocketRequest.default.REQUEST_TO_JOIN_MEETING, {
-              userId: sessionStorage.getItem("username"),
+              userId: sessionStorage.getItem('username'),
               hostId: calendarEvent.host.username,
               askToJoin: calendarEvent.askToJoin,
               meetingId: calendarEvent.id
@@ -61,46 +61,50 @@ class Media {
     _defineProperty(this, "joinMeeting", (calendarEvent, settings, userFullName) => {
       let result = {};
       return new Promise((resolve, reject) => {
-        try {
-          _SocketManager.default.emitEvent(_SocketRequest.default.JOIN_MEETING, {
-            meetingId: calendarEvent.id,
-            userFullName: userFullName,
-            userId: sessionStorage.getItem("username"),
-            avatarId: sessionStorage.getItem("userAvataId"),
-            isHost: sessionStorage.getItem("username") === calendarEvent.host.username,
-            settings: settings,
-            profile: _SocketManager.default.getProfile()
-          }).then(response => {
-            result.status = response.status;
-
-            if (response.status === 'SUCCESS') {
-              result.rtpCapabilities = response.data.rtpCapabilities;
-              result.shareScreenProducerData = response.data.shareScreenProducerData;
-              result.participants = response.data.usersInRoom;
-
-              if (sessionStorage.getItem("username") === calendarEvent.host.username) {
-                _SocketManager.default.emitEvent(_SocketRequest.default.GET_LOBBY, {
-                  meetingId: calendarEvent.id
-                }).then(getLobbyResponse => {
-                  if (getLobbyResponse.status === 'SUCCESS' && getLobbyResponse.lobby && getLobbyResponse.lobby.people) {
-                    result.lobby = [];
-
-                    for (const person of getLobbyResponse.lobby.people) {
-                      result.lobby.push(person);
+        if (!_SocketManager.default.getProfile()) {
+          reject(new Error('No user profile'));
+        } else {
+          try {
+            _SocketManager.default.emitEvent(_SocketRequest.default.JOIN_MEETING, {
+              meetingId: calendarEvent.id,
+              userFullName: userFullName,
+              userId: sessionStorage.getItem('username'),
+              avatarId: sessionStorage.getItem('userAvataId'),
+              isHost: sessionStorage.getItem('username') === calendarEvent.host.username,
+              settings: settings,
+              profile: _SocketManager.default.getProfile()
+            }).then(response => {
+              result.status = response.status;
+
+              if (response.status === 'SUCCESS') {
+                result.rtpCapabilities = response.data.rtpCapabilities;
+                result.shareScreenProducerData = response.data.shareScreenProducerData;
+                result.participants = response.data.usersInRoom;
+
+                if (sessionStorage.getItem('username') === calendarEvent.host.username) {
+                  _SocketManager.default.emitEvent(_SocketRequest.default.GET_LOBBY, {
+                    meetingId: calendarEvent.id
+                  }).then(getLobbyResponse => {
+                    if (getLobbyResponse.status === 'SUCCESS' && getLobbyResponse.lobby && getLobbyResponse.lobby.people) {
+                      result.lobby = [];
+
+                      for (const person of getLobbyResponse.lobby.people) {
+                        result.lobby.push(person);
+                      }
                     }
-                  }
-                });
-              }
+                  });
+                }
 
-              resolve(result);
-            } else {
-              reject(result);
-            }
-          }).catch(error => {
-            reject(error);
-          });
-        } catch (e) {
-          reject(e);
+                resolve(result);
+              } else {
+                reject(result);
+              }
+            }).catch(error => {
+              reject(error);
+            });
+          } catch (e) {
+            reject(e);
+          }
         }
       });
     });

package/dist/view/security/ChangePasswordBasic.js

@@ -114,7 +114,7 @@ const ChangePassword = props => {
 
       setIsLoading(true);
       (0, _Security.changePassword)(props.url, username, password, sessionId, challengeParamenters, () => {
-        props.history.push('/home');
+        _ApplicationManager.default.navigate('/');
       }, errorMessage => {
         setIsLoading(false);
         setMessageTitle("Password Change Error!");

package/dist/view/security/LoginBasic.js

@@ -180,7 +180,7 @@ 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))));
+              _ApplicationManager.default.navigate("/change-password?username=".concat(username, "&sessionId=").concat(response.sessionId, "&challengeParamenters=").concat(encodeURI(JSON.stringify(response.challangeParameters))));
             } else {
               _ApplicationManager.default.navigate('/');
             }

package/dist/view/security/Security.js

@@ -70,6 +70,7 @@ exports.resetPassword = resetPassword;
 
 const changePassword = (url, username, password, sessionId, challengeParamenters, callback, errorCallback) => {
   (0, _RestUtils.sendRequest)("".concat(url, "?newPassword=").concat(password, "&username=").concat(username, "&sessionId=").concat(sessionId, "&challengeParamenters=").concat(challengeParamenters), response => {
+    sessionStorage.setItem("username", username);
     sessionStorage.setItem("accessToken", response.accessToken);
     sessionStorage.setItem("refreshToken", response.refreshToken);
     sessionStorage.setItem("idToken", response.idToken);

package/package.json

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