Compare commits

...

2 Commits

Author SHA1 Message Date
Horatiu Muresan 374f56c8a8 fix eslint 2022-06-09 15:21:51 +03:00
Horatiu Muresan 3026c8d0db feat(deployment-urls): Whitelist deploymentUrls; remove JaaS restriction 2022-06-09 15:09:34 +03:00
3 changed files with 3 additions and 4 deletions

View File

@ -83,6 +83,7 @@ export default [
'debugAudioLevels',
'defaultLocalDisplayName',
'defaultRemoteDisplayName',
'deploymentUrls',
'desktopSharingFrameRate',
'desktopSharingSources',
'disable1On1Mode',

View File

@ -6,7 +6,6 @@ import { IconDownload } from '../../base/icons';
import { connect } from '../../base/redux';
import { AbstractButton, type AbstractButtonProps } from '../../base/toolbox/components';
import { openURLInBrowser } from '../../base/util';
import { isVpaasMeeting } from '../../jaas/functions';
type Props = AbstractButtonProps & {
@ -48,7 +47,7 @@ class DownloadButton extends AbstractButton<Props, *> {
*/
function _mapStateToProps(state: Object) {
const { downloadAppsUrl } = state['features/base/config'].deploymentUrls || {};
const visible = typeof downloadAppsUrl === 'string' && !isVpaasMeeting(state);
const visible = typeof downloadAppsUrl === 'string';
return {
_downloadAppsUrl: downloadAppsUrl,

View File

@ -7,7 +7,6 @@ import { IconHelp } from '../../base/icons';
import { connect } from '../../base/redux';
import { AbstractButton, type AbstractButtonProps } from '../../base/toolbox/components';
import { openURLInBrowser } from '../../base/util';
import { isVpaasMeeting } from '../../jaas/functions';
type Props = AbstractButtonProps & {
@ -50,7 +49,7 @@ class HelpButton extends AbstractButton<Props, *> {
function _mapStateToProps(state: Object) {
const { userDocumentationURL } = state['features/base/config'].deploymentUrls || {};
const enabled = getFeatureFlag(state, HELP_BUTTON_ENABLED, true);
const visible = typeof userDocumentationURL === 'string' && enabled && !isVpaasMeeting(state);
const visible = typeof userDocumentationURL === 'string' && enabled;
return {
_userDocumentationURL: userDocumentationURL,