OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Add mechanism for disabling Betas

pull/21833/head
Michael Telatynski 2021-04-30 12:30:05 +01:00
parent 158a0f90cb
commit d2959e1acc
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/views/beta/BetaCard.tsx
View File

@ -60,7 +60,10 @@ export const BetaPill = ({ onClick }: { onClick?: () => void }) => {
};
const BetaCard = ({ title: titleOverride, featureId }: IProps) => {
const { title, caption, disclaimer, image } = SettingsStore.getBetaInfo(featureId);
const info = SettingsStore.getBetaInfo(featureId);
if (!info) return null; // Beta is invalid/disabled
const { title, caption, disclaimer, image } = info;
const value = SettingsStore.getValue(featureId);
return <div className="mx_BetaCard">

7
src/settings/SettingsStore.ts
View File

@ -258,7 +258,12 @@ export default class SettingsStore {
}
public static getBetaInfo(settingName: string) {
return SETTINGS[settingName]?.betaInfo;
// consider a beta disabled if the config is explicitly set to false, in which case treat as normal Labs flag
if (SettingsStore.isFeature(settingName)
&& SettingsStore.getValueAt(SettingLevel.CONFIG, settingName, null, true, true) !== false
) {
return SETTINGS[settingName]?.betaInfo;
}
}
/**