ZF/jitsi-meet
1
0
Fork 0
mirror of https://gitcode.com/GitHub_Trending/ji/jitsi-meet.git synced 2025-12-30 11:22:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(supportURL): Override true dynamic branding only.

Browse Source
This commit is contained in:
Hristo Terezov
2024-11-22 14:35:15 -06:00
parent 67c3a50412
commit c2f4dd9dea
7 changed files with 42 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
react/features/base/config/extraInterfaceConfigWhitelist.ts Normal file
View File

@@ -0,0 +1,4 @@
/**
* Deploy-specific interface_config whitelists.
*/
export default [];

5
react/features/base/config/interfaceConfigWhitelist.ts
View File

@@ -1,3 +1,5 @@
import extraInterfaceConfigWhitelistCopy from './extraInterfaceConfigWhitelist';
/**
* The interface config keys to whitelist, the keys that can be overridden.
*
@@ -45,7 +47,6 @@ export default [
'SHARING_FEATURES',
'SHOW_CHROME_EXTENSION_BANNER',
'SHOW_POWERED_BY',
'SUPPORT_URL',
'TILE_VIEW_MAX_COLUMNS',
'TOOLBAR_ALWAYS_VISIBLE',
'TOOLBAR_BUTTONS',
@@ -54,4 +55,4 @@ export default [
'VERTICAL_FILMSTRIP',
'VIDEO_LAYOUT_FIT',
'VIDEO_QUALITY_LABEL_DISABLED'
];
].concat(extraInterfaceConfigWhitelistCopy);

4
react/features/base/react/components/web/InlineDialogFailure.tsx
View File

@@ -1,9 +1,11 @@
import React from 'react';
import { useTranslation } from 'react-i18next';
import { useSelector } from 'react-redux';
import { makeStyles } from 'tss-react/mui';
import { withPixelLineHeight } from '../../../styles/functions.web';
import Button from '../../../ui/components/web/Button';
import { getSupportUrl } from '../../functions';
const useStyles = makeStyles()(theme => {
return {
@@ -50,7 +52,7 @@ const InlineDialogFailure = ({
const { t } = useTranslation();
const { classes } = useStyles();
const supportLink = interfaceConfig.SUPPORT_URL;
const supportLink = useSelector(getSupportUrl);
const supportString = t('inlineDialogFailure.supportMsg');
const supportLinkElem = supportLink && showSupportLink
? (

16
react/features/base/react/functions.ts
View File

@@ -1,5 +1,8 @@
import punycode from 'punycode';
import { IStateful } from '../app/types';
import { toState } from '../redux/functions';
/**
* Returns the field value in a platform generic way.
*
@@ -47,3 +50,16 @@ export function formatURLText(text = '') {
return result;
}
/**
* Returns the configured support URL.
*
* @param {IStateful} stateful - The redux state.
* @returns {string|undefined} - The configured support link.
*/
export function getSupportUrl(stateful: IStateful) {
// TODO: Once overwriting trough interface config is completelly gone we should think of a way to be able to set
// the value in the branding and not return the default value from interface config.
return toState(stateful)['features/dynamic-branding'].supportUrl || interfaceConfig?.SUPPORT_URL;
}