Add setting to disable TagPanel

lukebarnard1 · lukebarnard1 · commit 174061db570f · 2018-02-28T18:16:37.000Z
diff --git a/src/components/structures/BottomLeftMenu.js b/src/components/structures/BottomLeftMenu.js
@@ -168,6 +168,10 @@ module.exports = React.createClass({
         const RoomDirectoryButton = sdk.getComponent('elements.RoomDirectoryButton');
         const CreateRoomButton = sdk.getComponent('elements.CreateRoomButton');
         const SettingsButton = sdk.getComponent('elements.SettingsButton');
+        const GroupsButton = sdk.getComponent('elements.GroupsButton');
+
+        const groupsButton = SettingsStore.getValue("TagPanel.disableTagPanel") ?
+            <GroupsButton tooltip={true} /> : null;
 
         return (
             <div className="mx_BottomLeftMenu">
@@ -182,6 +186,7 @@ module.exports = React.createClass({
                     <div ref={this._collectCreateRoomButton}>
                         <CreateRoomButton tooltip={true} />
                     </div>
+                    { groupsButton }
                     <span className="mx_BottomLeftMenu_settings">
                         <SettingsButton tooltip={true} />
                     </span>
diff --git a/src/components/structures/LeftPanel.js b/src/components/structures/LeftPanel.js
@@ -194,7 +194,9 @@ var LeftPanel = React.createClass({
             }
         );
 
-        const tagPanelEnabled = SettingsStore.isFeatureEnabled("feature_tag_panel");
+        const tagPanelEnabled =
+            SettingsStore.isFeatureEnabled("feature_tag_panel") &&
+            !SettingsStore.getValue("TagPanel.disableTagPanel");
         const tagPanel = tagPanelEnabled ? <TagPanel /> : <div />;
 
         const containerClasses = classNames(

Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,9 @@ var LeftPanel = React.createClass({`
`194`	`194`	`}`
`195`	`195`	`);`
`196`	`196`
`197`		`- const tagPanelEnabled = SettingsStore.isFeatureEnabled("feature_tag_panel");`
	`197`	`+ const tagPanelEnabled =`
	`198`	`+ SettingsStore.isFeatureEnabled("feature_tag_panel") &&`
	`199`	`+ !SettingsStore.getValue("TagPanel.disableTagPanel");`
`198`	`200`	`const tagPanel = tagPanelEnabled ? <TagPanel /> : <div />;`
`199`	`201`
`200`	`202`	`const containerClasses = classNames(`