From a1a5d1e7f8d4d280a3afac71c1fae635fda785cd Mon Sep 17 00:00:00 2001 From: hmuresan Date: Tue, 11 May 2021 12:17:55 +0300 Subject: [PATCH] fix(deploymentUrls): Disable help and download apps buttons for JaaS --- react/features/toolbox/components/DownloadButton.js | 4 ++-- react/features/toolbox/components/HelpButton.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/react/features/toolbox/components/DownloadButton.js b/react/features/toolbox/components/DownloadButton.js index 36b85a317..264b118e8 100644 --- a/react/features/toolbox/components/DownloadButton.js +++ b/react/features/toolbox/components/DownloadButton.js @@ -6,7 +6,7 @@ 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 '../../billing-counter/functions'; type Props = AbstractButtonProps & { @@ -45,7 +45,7 @@ class DownloadButton extends AbstractButton { */ function _mapStateToProps(state: Object) { const { downloadAppsUrl } = state['features/base/config'].deploymentUrls || {}; - const visible = typeof downloadAppsUrl === 'string'; + const visible = typeof downloadAppsUrl === 'string' && !isVpaasMeeting(state); return { _downloadAppsUrl: downloadAppsUrl, diff --git a/react/features/toolbox/components/HelpButton.js b/react/features/toolbox/components/HelpButton.js index e8d2558ea..2115c20ab 100644 --- a/react/features/toolbox/components/HelpButton.js +++ b/react/features/toolbox/components/HelpButton.js @@ -7,7 +7,7 @@ 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 '../../billing-counter/functions'; type Props = AbstractButtonProps & { @@ -47,7 +47,7 @@ class HelpButton extends AbstractButton { 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; + const visible = typeof userDocumentationURL === 'string' && enabled && !isVpaasMeeting(state); return { _userDocumentationURL: userDocumentationURL,