De-labs Metaspaces (#7613)

matrix-org · Jan 25, 2022 · 8ddd677 · 8ddd677
1 parent ecd5be8
commit 8ddd677
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 45 deletions.
diff --git a/res/css/views/settings/tabs/user/_SidebarUserSettingsTab.scss b/res/css/views/settings/tabs/user/_SidebarUserSettingsTab.scss
@@ -15,6 +15,10 @@ limitations under the License.
 */
 
 .mx_SidebarUserSettingsTab {
+    .mx_SettingsTab_section {
+        margin-top: 10px;
+    }
+
     .mx_SidebarUserSettingsTab_subheading {
         font-size: $font-15px;
         line-height: $font-24px;

diff --git a/src/components/views/dialogs/UserSettingsDialog.tsx b/src/components/views/dialogs/UserSettingsDialog.tsx
@@ -127,15 +127,12 @@ export default class UserSettingsDialog extends React.Component<IProps, IState>
             "mx_UserSettingsDialog_keyboardIcon",
             <KeyboardUserSettingsTab />,
         ));
-
-        if (SettingsStore.getValue("feature_spaces_metaspaces")) {
-            tabs.push(new Tab(
-                UserTab.Sidebar,
-                _td("Sidebar"),
-                "mx_UserSettingsDialog_sidebarIcon",
-                <SidebarUserSettingsTab />,
-            ));
-        }
+        tabs.push(new Tab(
+            UserTab.Sidebar,
+            _td("Sidebar"),
+            "mx_UserSettingsDialog_sidebarIcon",
+            <SidebarUserSettingsTab />,
+        ));
 
         if (SettingsStore.getValue(UIFeature.Voip)) {
             tabs.push(new Tab(

diff --git a/src/components/views/spaces/SpacePanel.tsx b/src/components/views/spaces/SpacePanel.tsx
@@ -303,7 +303,6 @@ const InnerSpacePanel = React.memo<IInnerSpacePanelProps>(({ children, isPanelCo
 });
 
 const SpacePanel = () => {
-    const metaSpacesEnabled = useSettingValue("feature_spaces_metaspaces");
     const [isPanelCollapsed, setPanelCollapsed] = useState(true);
     const ref = useRef<HTMLUListElement>();
     useLayoutEffect(() => {
@@ -366,7 +365,7 @@ const SpacePanel = () => {
                             ) }
                         </Droppable>
 
-                        { metaSpacesEnabled && <QuickSettingsButton isPanelCollapsed={isPanelCollapsed} /> }
+                        <QuickSettingsButton isPanelCollapsed={isPanelCollapsed} />
                     </ul>
                 ) }
             </RovingTabIndexProvider>

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
@@ -885,7 +885,6 @@
     "Show extensible event representation of events": "Show extensible event representation of events",
     "Location sharing (under active development)": "Location sharing (under active development)",
     "Show info about bridges in room settings": "Show info about bridges in room settings",
-    "Meta Spaces": "Meta Spaces",
     "Use new room breadcrumbs": "Use new room breadcrumbs",
     "New spotlight search experience": "New spotlight search experience",
     "Right panel stays open (defaults to room member list)": "Right panel stays open (defaults to room member list)",

diff --git a/src/settings/Settings.tsx b/src/settings/Settings.tsx
@@ -332,17 +332,6 @@ export const SETTINGS: {[setting: string]: ISetting} = {
         displayName: _td("Show info about bridges in room settings"),
         default: false,
     },
-    "feature_spaces_metaspaces": {
-        isFeature: true,
-        labsGroup: LabGroup.Spaces,
-        supportedLevels: LEVELS_FEATURE,
-        displayName: _td("Meta Spaces"),
-        default: false,
-        controller: new OrderedMultiController([
-            new IncompatibleController("showCommunitiesInsteadOfSpaces"),
-            new ReloadOnChangeController(),
-        ]),
-    },
     "feature_breadcrumbs_v2": {
         isFeature: true,
         labsGroup: LabGroup.Rooms,
@@ -863,9 +852,6 @@ export const SETTINGS: {[setting: string]: ISetting} = {
         default: {
             [MetaSpace.Home]: true,
         },
-        controller: new IncompatibleController("feature_spaces_metaspaces", {
-            [MetaSpace.Home]: true,
-        }, false),
     },
     "Spaces.showPeopleInSpace": {
         supportedLevels: [SettingLevel.ROOM_ACCOUNT],

diff --git a/test/stores/SpaceStore-test.ts b/test/stores/SpaceStore-test.ts
@@ -17,7 +17,6 @@ limitations under the License.
 import { EventType } from "matrix-js-sdk/src/@types/event";
 import { RoomMember } from "matrix-js-sdk/src/models/room-member";
 
-import "./enable-metaspaces-labs";
 import "../skinned-sdk"; // Must be first for skinning to work
 import SpaceStore from "../../src/stores/spaces/SpaceStore";
 import {

diff --git a/test/stores/enable-metaspaces-labs.ts b/test/stores/enable-metaspaces-labs.ts
diff --git a/test/stores/room-list/SpaceWatcher-test.ts b/test/stores/room-list/SpaceWatcher-test.ts
@@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import "../enable-metaspaces-labs";
 import "../../skinned-sdk"; // Must be first for skinning to work
 import { SpaceWatcher } from "../../../src/stores/room-list/SpaceWatcher";
 import type { RoomListStoreClass } from "../../../src/stores/room-list/RoomListStore";