PLT-4550 move webrtc to TE (#4440)
* PLT-4550 move webrtc to TE * remove webrtc from makefile enterprise tests
Этот коммит содержится в:
коммит произвёл
Harrison Healey
родитель
6289c72686
Коммит
772b57386f
@@ -193,7 +193,6 @@ export default class AdminSidebar extends React.Component {
|
||||
let samlSettings = null;
|
||||
let clusterSettings = null;
|
||||
let complianceSettings = null;
|
||||
let webrtcSettings = null;
|
||||
|
||||
let license = null;
|
||||
let audits = null;
|
||||
@@ -270,20 +269,6 @@ export default class AdminSidebar extends React.Component {
|
||||
);
|
||||
}
|
||||
|
||||
if (global.window.mm_license.Webrtc === 'true') {
|
||||
webrtcSettings = (
|
||||
<AdminSidebarSection
|
||||
name='webrtc'
|
||||
title={
|
||||
<FormattedMessage
|
||||
id='admin.sidebar.webrtc'
|
||||
defaultMessage='WebRTC (Beta)'
|
||||
/>
|
||||
}
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
||||
oauthSettings = (
|
||||
<AdminSidebarSection
|
||||
name='oauth'
|
||||
@@ -370,6 +355,18 @@ export default class AdminSidebar extends React.Component {
|
||||
);
|
||||
}
|
||||
|
||||
const webrtcSettings = (
|
||||
<AdminSidebarSection
|
||||
name='webrtc'
|
||||
title={
|
||||
<FormattedMessage
|
||||
id='admin.sidebar.webrtc'
|
||||
defaultMessage='WebRTC (Beta)'
|
||||
/>
|
||||
}
|
||||
/>
|
||||
);
|
||||
|
||||
return (
|
||||
<div className='admin-sidebar'>
|
||||
<AdminSidebarHeader/>
|
||||
|
||||
@@ -290,8 +290,7 @@ export default class ChannelHeader extends React.Component {
|
||||
const teammateId = Utils.getUserIdFromChannelName(channel);
|
||||
channelTitle = Utils.displayUsername(teammateId);
|
||||
|
||||
const webrtcEnabled = global.mm_config.EnableWebrtc === 'true' && global.mm_license.Webrtc === 'true' &&
|
||||
global.mm_config.EnableDeveloper === 'true' && userMedia && Utils.isFeatureEnabled(PreReleaseFeatures.WEBRTC_PREVIEW);
|
||||
const webrtcEnabled = global.mm_config.EnableWebrtc === 'true' && userMedia && Utils.isFeatureEnabled(PreReleaseFeatures.WEBRTC_PREVIEW);
|
||||
|
||||
if (webrtcEnabled) {
|
||||
const isOffline = UserStore.getStatus(contact.id) === UserStatuses.OFFLINE;
|
||||
|
||||
@@ -90,8 +90,7 @@ export default class UserProfile extends React.Component {
|
||||
let webrtc;
|
||||
const userMedia = navigator.getUserMedia || navigator.webkitGetUserMedia || navigator.mozGetUserMedia;
|
||||
|
||||
const webrtcEnabled = global.mm_config.EnableWebrtc === 'true' && global.mm_license.Webrtc === 'true' &&
|
||||
global.mm_config.EnableDeveloper === 'true' && userMedia && Utils.isFeatureEnabled(PreReleaseFeatures.WEBRTC_PREVIEW);
|
||||
const webrtcEnabled = global.mm_config.EnableWebrtc === 'true' && userMedia && Utils.isFeatureEnabled(PreReleaseFeatures.WEBRTC_PREVIEW);
|
||||
|
||||
if (webrtcEnabled && this.props.user.id !== this.state.currentUserId) {
|
||||
const isOnline = this.props.status !== UserStatuses.OFFLINE;
|
||||
|
||||
@@ -55,8 +55,7 @@ export default class AdvancedSettingsDisplay extends React.Component {
|
||||
|
||||
let enabledFeatures = 0;
|
||||
for (const [name, value] of advancedSettings) {
|
||||
const webrtcEnabled = global.mm_config.EnableWebrtc === 'true' && global.mm_license.Webrtc === 'true' &&
|
||||
global.mm_config.EnableDeveloper === 'true';
|
||||
const webrtcEnabled = global.mm_config.EnableWebrtc === 'true';
|
||||
|
||||
if (!webrtcEnabled) {
|
||||
preReleaseFeaturesKeys = preReleaseFeaturesKeys.filter((f) => f !== 'WEBRTC_PREVIEW');
|
||||
|
||||
Ссылка в новой задаче
Block a user