feat: add moderated service link to welcome page

This commit is contained in:
Bettenbuk Zoltan
2020-06-30 12:39:46 +02:00
committed by Zoltan Bettenbuk
parent 7d18183bf9
commit 7d62020787
5 changed files with 43 additions and 9 deletions
@@ -25,6 +25,11 @@ type Props = {
*/
_enableInsecureRoomNameWarning: boolean,
/**
* URL for the moderated rooms microservice, if available.
*/
_moderatedRoomServiceUrl: ?string,
/**
* Whether the recent list is enabled
*/
@@ -269,16 +274,13 @@ export class AbstractWelcomePage extends Component<Props, *> {
*
* @param {Object} state - The redux state.
* @protected
* @returns {{
* _calendarEnabled: boolean,
* _room: string,
* _settings: Object
* }}
* @returns {Props}
*/
export function _mapStateToProps(state: Object) {
return {
_calendarEnabled: isCalendarEnabled(state),
_enableInsecureRoomNameWarning: state['features/base/config'].enableInsecureRoomNameWarning || false,
_moderatedRoomServiceUrl: state['features/base/config'].moderatedRoomServiceUrl,
_recentListEnabled: isRecentListEnabled(),
_room: state['features/base/conference'].room,
_settings: state['features/base/settings']
@@ -3,7 +3,7 @@
import React from 'react';
import { isMobileBrowser } from '../../base/environment/utils';
import { translate } from '../../base/i18n';
import { translate, translateToHTML } from '../../base/i18n';
import { Icon, IconWarning } from '../../base/icons';
import { Watermarks } from '../../base/react';
import { connect } from '../../base/redux';
@@ -158,7 +158,7 @@ class WelcomePage extends AbstractWelcomePage {
* @returns {ReactElement|null}
*/
render() {
const { t } = this.props;
const { _moderatedRoomServiceUrl, t } = this.props;
const { APP_NAME } = interfaceConfig;
const showAdditionalContent = this._shouldShowAdditionalContent();
const showAdditionalToolbarContent = this._shouldShowAdditionalToolbarContent();
@@ -224,6 +224,16 @@ class WelcomePage extends AbstractWelcomePage {
}
</div>
</div>
{ _moderatedRoomServiceUrl && (
<div id = 'moderated-meetings'>
<p>
{
translateToHTML(
t, 'welcomepage.moderatedMessage', { url: _moderatedRoomServiceUrl })
}
</p>
</div>
) }
{ this._renderTabs() }
</div>
{ showAdditionalContent