Hide MSC3827 behind a labs flag

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

Author: SimonBrandner

src/components/views/dialogs/spotlight/SpotlightDialog.tsx

@@ -641,7 +641,7 @@ const SpotlightDialog: React.FC<IProps> = ({ initialText = "", initialFilter = n
                     <div className="mx_SpotlightDialog_sectionHeader">
                         <h4>{ _t("Suggestions") }</h4>
                         <div className="mx_SpotlightDialog_options">
-                            { cli.doesServerSupportUnstableFeature("org.matrix.msc3827") && <>
+                            { SettingsStore.getValue("feature_exploring_public_spaces") && <>
                                 <LabelledCheckbox
                                     label={_t("Show rooms")}
                                     value={showRooms}

src/components/views/settings/tabs/user/LabsUserSettingsTab.tsx

@@ -49,6 +49,7 @@ export class LabsSettingToggle extends React.Component<ILabsSettingToggleProps>
 interface IState {
     showHiddenReadReceipts: boolean;
     showJumpToDate: boolean;
+    showExploringPublicSpaces: boolean;
 }
 
 export default class LabsUserSettingsTab extends React.Component<{}, IState> {
@@ -63,9 +64,13 @@ export default class LabsUserSettingsTab extends React.Component<{}, IState> {
             this.setState({ showJumpToDate });
         });
 
+        MatrixClientPeg.get().doesServerSupportUnstableFeature("org.matrix.msc3827").
+            then((showExploringPublicSpaces) => this.setState({ showExploringPublicSpaces }));
+
         this.state = {
             showHiddenReadReceipts: false,
             showJumpToDate: false,
+            showExploringPublicSpaces: false,
         };
     }
 
@@ -133,6 +138,16 @@ export default class LabsUserSettingsTab extends React.Component<{}, IState> {
                 );
             }
 
+            if (this.state.showExploringPublicSpaces) {
+                groups.getOrCreate(LabGroup.Spaces, []).push(
+                    <SettingsFlag
+                        key="feature_exploring_public_spaces"
+                        name="feature_exploring_public_spaces"
+                        level={SettingLevel.DEVICE}
+                    />,
+                );
+            }
+
             labsSections = <>
                 { sortBy(Array.from(groups.entries()), "0").map(([group, flags]) => (
                     <div className="mx_SettingsTab_section" key={group}>

src/settings/Settings.tsx

@@ -220,6 +220,11 @@ export const SETTINGS: {[setting: string]: ISetting} = {
             requiresRefresh: true,
         },
     },
+    "feature_exploring_public_spaces": {
+        displayName: _td("Explore public spaces in the new search dialog"),
+        supportedLevels: LEVELS_FEATURE,
+        default: false,
+    },
     "feature_msc3531_hide_messages_pending_moderation": {
         isFeature: true,
         labsGroup: LabGroup.Moderation,