[NEW] Handle endCall and expandView control buttons (#633)

* [NEW] Handle endCall and expandView control buttons * [FIX] Lint errors * [FIX] Join Call Button giving call ended even when call inProgress * [FIX] slash omitted in the url * [REF] Remove redundant async keyword * [REF] Use spread operator, set ongoingCall status when expanding * [FIX] String enclosed within double quotes Co-authored-by: Murtaza Patrawala <34130764+murtaza98@users.noreply.github.com> * [FIX] ongoingCall variable not destructured but used Co-authored-by: Murtaza Patrawala <34130764+murtaza98@users.noreply.github.com>
RocketChat · Nov 16, 2021 · b52f484 · b52f484
1 parent a02f241
commit b52f484
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/src/components/Calls/CallIFrame.js b/src/components/Calls/CallIFrame.js
@@ -7,8 +7,19 @@ import styles from './styles.scss';
 
 
 export const CallIframe = () => {
-	const { token, room } = store.state;
-	const url = `${ Livechat.client.host }/meet/${ room._id }?token=${ token }`;
+	const { token, room, incomingCallAlert, ongoingCall } = store.state;
+	const url = `${ Livechat.client.host }/meet/${ room._id }?token=${ token }&layout=embedded`;
+	window.handleIframeClose = () => store.setState({ incomingCallAlert: { ...incomingCallAlert, show: false } });
+	window.expandCall = () => {
+		window.open(
+			`${ Livechat.client.host }/meet/${ room._id }?token=${ token }`,
+			room._id,
+		);
+		return store.setState({
+			incomingCallAlert: { ...incomingCallAlert, show: false },
+			ongoingCall: { ...ongoingCall, callStatus: 'ongoingCallInNewTab' },
+		});
+	};
 	return (
 		<div className={createClassName(styles, 'call-iframe')}>
 			<iframe className={createClassName(styles, 'call-iframe__content')} allow='camera;microphone' src={url} />

diff --git a/src/routes/Chat/component.js b/src/routes/Chat/component.js
@@ -150,7 +150,7 @@ export default class Chat extends Component {
 			>
 				<Screen.Content nopadding>
 					{ incomingCallAlert && !!incomingCallAlert.show && <CallNotification { ...incomingCallAlert } dispatch={dispatch} />}
-					{ ongoingCall && ongoingCall.callStatus === 'accept' ? <CallIframe { ...incomingCallAlert } /> : null }
+					{ incomingCallAlert?.show && ongoingCall && ongoingCall.callStatus === 'accept' ? <CallIframe { ...incomingCallAlert } /> : null }
 					<div className={createClassName(styles, 'chat__messages', { atBottom, loading })}>
 						<MessageList
 							ref={this.handleMessagesContainerRef}