Merge pull request #5362 from matrix-org/travis/ui-feat/history

Add a UI Feature flag for room history settings
matrix-org · Oct 29, 2020 · ac3414b · ac3414b
2 parents a708dbf + 09b02d0
commit ac3414b
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 5 deletions.
diff --git a/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.js b/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.js
@@ -25,6 +25,7 @@ import QuestionDialog from "../../../dialogs/QuestionDialog";
 import StyledRadioGroup from '../../../elements/StyledRadioGroup';
 import {SettingLevel} from "../../../../../settings/SettingLevel";
 import SettingsStore from "../../../../../settings/SettingsStore";
+import {UIFeature} from "../../../../../settings/UIFeature";
 
 export default class SecurityRoomSettingsTab extends React.Component {
     static propTypes = {
@@ -350,6 +351,16 @@ export default class SecurityRoomSettingsTab extends React.Component {
             />;
         }
 
+        let historySection = (<>
+            <span className='mx_SettingsTab_subheading'>{_t("Who can read history?")}</span>
+            <div className='mx_SettingsTab_section mx_SettingsTab_subsectionText'>
+                {this._renderHistory()}
+            </div>
+        </>);
+        if (!SettingsStore.getValue(UIFeature.RoomHistorySettings)) {
+            historySection = null;
+        }
+
         return (
             <div className="mx_SettingsTab mx_SecurityRoomSettingsTab">
                 <div className="mx_SettingsTab_heading">{_t("Security & Privacy")}</div>
@@ -371,10 +382,7 @@ export default class SecurityRoomSettingsTab extends React.Component {
                     {this._renderRoomAccess()}
                 </div>
 
-                <span className='mx_SettingsTab_subheading'>{_t("Who can read history?")}</span>
-                <div className='mx_SettingsTab_section mx_SettingsTab_subsectionText'>
-                    {this._renderHistory()}
-                </div>
+                {historySection}
             </div>
         );
     }

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
@@ -1000,11 +1000,11 @@
     "Members only (since the point in time of selecting this option)": "Members only (since the point in time of selecting this option)",
     "Members only (since they were invited)": "Members only (since they were invited)",
     "Members only (since they joined)": "Members only (since they joined)",
+    "Who can read history?": "Who can read history?",
     "Security & Privacy": "Security & Privacy",
     "Once enabled, encryption cannot be disabled.": "Once enabled, encryption cannot be disabled.",
     "Encrypted": "Encrypted",
     "Who can access this room?": "Who can access this room?",
-    "Who can read history?": "Who can read history?",
     "Unable to revoke sharing for email address": "Unable to revoke sharing for email address",
     "Unable to share email address": "Unable to share email address",
     "Your email address hasn't been verified yet": "Your email address hasn't been verified yet",

diff --git a/src/settings/Settings.ts b/src/settings/Settings.ts
@@ -630,6 +630,10 @@ export const SETTINGS: {[setting: string]: ISetting} = {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
         default: null,
     },
+    [UIFeature.RoomHistorySettings]: {
+        supportedLevels: LEVELS_UI_FEATURE,
+        default: true,
+    },
     [UIFeature.AdvancedEncryption]: {
         supportedLevels: LEVELS_UI_FEATURE,
         default: true,

diff --git a/src/settings/UIFeature.ts b/src/settings/UIFeature.ts
@@ -31,4 +31,5 @@ export enum UIFeature {
     Flair = "UIFeature.flair",
     Communities = "UIFeature.communities",
     AdvancedSettings = "UIFeature.advancedSettings",
+    RoomHistorySettings = "UIFeature.roomHistorySettings",
 }