Mostly working mediasoup v3

app/src/components/MeetingDrawer/FileSharing/File.js

@@ -55,7 +55,7 @@ class File extends React.PureComponent
 	{
 		const {
 			roomClient,
-			torrentSupport,
+			canShareFiles,
 			file,
 			classes
 		} = this.props;
@@ -105,7 +105,7 @@ class File extends React.PureComponent
 							<Typography className={classes.text}>
 								{magnet.decode(file.magnetUri).dn}
 							</Typography>
-							{ torrentSupport ?
+							{ canShareFiles ?
 								<Button
 									variant='contained'
 									component='span'
@@ -145,17 +145,17 @@ class File extends React.PureComponent
 }
 
 File.propTypes = {
-	roomClient     : PropTypes.object.isRequired,
-	torrentSupport : PropTypes.bool.isRequired,
-	file           : PropTypes.object.isRequired,
-	classes        : PropTypes.object.isRequired
+	roomClient    : PropTypes.object.isRequired,
+	canShareFiles : PropTypes.bool.isRequired,
+	file          : PropTypes.object.isRequired,
+	classes       : PropTypes.object.isRequired
 };
 
 const mapStateToProps = (state, { magnetUri }) =>
 {
 	return {
-		file           : state.files[magnetUri],
-		torrentSupport : state.room.torrentSupport
+		file          : state.files[magnetUri],
+		canShareFiles : state.me.canShareFiles
 	};
 };
 

app/src/components/MeetingDrawer/FileSharing/FileSharing.js

@@ -46,11 +46,11 @@ class FileSharing extends React.PureComponent
 	render()
 	{
 		const {
-			torrentSupport,
+			canShareFiles,
 			classes
 		} = this.props;
 
-		const buttonDescription = torrentSupport ?
+		const buttonDescription = canShareFiles ?
 			'Share file' : 'File sharing not supported';
 
 		return (
@@ -67,7 +67,7 @@ class FileSharing extends React.PureComponent
 						variant='contained'
 						component='span'
 						className={classes.button}
-						disabled={!torrentSupport}
+						disabled={!canShareFiles}
 					>
 						{buttonDescription}
 					</Button>
@@ -80,17 +80,17 @@ class FileSharing extends React.PureComponent
 }
 
 FileSharing.propTypes = {
-	roomClient     : PropTypes.any.isRequired,
-	torrentSupport : PropTypes.bool.isRequired,
-	tabOpen        : PropTypes.bool.isRequired,
-	classes        : PropTypes.object.isRequired
+	roomClient    : PropTypes.any.isRequired,
+	canShareFiles : PropTypes.bool.isRequired,
+	tabOpen       : PropTypes.bool.isRequired,
+	classes       : PropTypes.object.isRequired
 };
 
 const mapStateToProps = (state) =>
 {
 	return {
-		torrentSupport : state.room.torrentSupport,
-		tabOpen        : state.toolarea.currentToolTab === 'files'
+		canShareFiles : state.me.canShareFiles,
+		tabOpen       : state.toolarea.currentToolTab === 'files'
 	};
 };
 

app/src/components/MeetingDrawer/ParticipantList/ListPeer.js

@@ -185,8 +185,8 @@ const ListPeer = (props) =>
 						{
 							e.stopPropagation();
 							screenVisible ?
-								roomClient.modifyPeerConsumer(peer.name, 'screen', true) :
-								roomClient.modifyPeerConsumer(peer.name, 'screen', false);
+								roomClient.modifyPeerConsumer(peer.id, 'screen', true) :
+								roomClient.modifyPeerConsumer(peer.id, 'screen', false);
 						}}
 					>
 						{ screenVisible ?
@@ -207,8 +207,8 @@ const ListPeer = (props) =>
 					{
 						e.stopPropagation();
 						micEnabled ?
-							roomClient.modifyPeerConsumer(peer.name, 'mic', true) :
-							roomClient.modifyPeerConsumer(peer.name, 'mic', false);
+							roomClient.modifyPeerConsumer(peer.id, 'mic', true) :
+							roomClient.modifyPeerConsumer(peer.id, 'mic', false);
 					}}
 				>
 					{ micEnabled ?
@@ -241,7 +241,7 @@ const makeMapStateToProps = (initialState, props) =>
 	const mapStateToProps = (state) =>
 	{
 		return {
-			peer : state.peers[props.name],
+			peer : state.peers[props.id],
 			...getPeerConsumers(state, props)
 		};
 	};

app/src/components/MeetingDrawer/ParticipantList/ParticipantList.js

@@ -76,7 +76,7 @@ class ParticipantList extends React.PureComponent
 			roomClient,
 			advancedMode,
 			passivePeers,
-			selectedPeerName,
+			selectedPeerId,
 			spotlightPeers,
 			classes
 		} = this.props;
@@ -92,14 +92,14 @@ class ParticipantList extends React.PureComponent
 					<li className={classes.listheader}>Participants in Spotlight:</li>
 					{ spotlightPeers.map((peer) => (
 						<li
-							key={peer.name}
+							key={peer.id}
 							className={classNames(classes.listItem, {
-								selected : peer.name === selectedPeerName
+								selected : peer.id === selectedPeerId
 							})}
-							onClick={() => roomClient.setSelectedPeer(peer.name)}
+							onClick={() => roomClient.setSelectedPeer(peer.id)}
 						>
-							<ListPeer name={peer.name} advancedMode={advancedMode}>
-								<Volume small name={peer.name} />
+							<ListPeer id={peer.id} advancedMode={advancedMode}>
+								<Volume small id={peer.id} />
 							</ListPeer>
 						</li>
 					))}
@@ -107,15 +107,15 @@ class ParticipantList extends React.PureComponent
 				<br />
 				<ul className={classes.list}>
 					<li className={classes.listheader}>Passive Participants:</li>
-					{ passivePeers.map((peerName) => (
+					{ passivePeers.map((peerId) => (
 						<li
-							key={peerName}
+							key={peerId}
 							className={classNames(classes.listItem, {
-								selected : peerName === selectedPeerName
+								selected : peerId === selectedPeerId
 							})}
-							onClick={() => roomClient.setSelectedPeer(peerName)}
+							onClick={() => roomClient.setSelectedPeer(peerId)}
 						>
-							<ListPeer name={peerName} advancedMode={advancedMode} />
+							<ListPeer id={peerId} advancedMode={advancedMode} />
 						</li>
 					))}
 				</ul>
@@ -126,20 +126,20 @@ class ParticipantList extends React.PureComponent
 
 ParticipantList.propTypes =
 {
-	roomClient       : PropTypes.any.isRequired,
-	advancedMode     : PropTypes.bool,
-	passivePeers     : PropTypes.array,
-	selectedPeerName : PropTypes.string,
-	spotlightPeers   : PropTypes.array,
-	classes          : PropTypes.object.isRequired
+	roomClient     : PropTypes.any.isRequired,
+	advancedMode   : PropTypes.bool,
+	passivePeers   : PropTypes.array,
+	selectedPeerId : PropTypes.string,
+	spotlightPeers : PropTypes.array,
+	classes        : PropTypes.object.isRequired
 };
 
 const mapStateToProps = (state) =>
 {
 	return {
-		passivePeers     : passivePeersSelector(state),
-		selectedPeerName : state.room.selectedPeerName,
-		spotlightPeers   : spotlightPeersSelector(state)
+		passivePeers   : passivePeersSelector(state),
+		selectedPeerId : state.room.selectedPeerId,
+		spotlightPeers : spotlightPeersSelector(state)
 	};
 };
 
@@ -153,7 +153,7 @@ const ParticipantListContainer = withRoomContext(connect(
 			return (
 				prev.peers === next.peers &&
 				prev.room.spotlights === next.room.spotlights &&
-				prev.room.selectedPeerName === next.room.selectedPeerName
+				prev.room.selectedPeerId === next.room.selectedPeerId
 			);
 		}
 	}