Merge pull request #8521 from matrix-org/travis/remove-unused-labs-1

Remove some labs features which don't get used or create maintenance burden: custom status, multiple integration managers, and do not disturb

Author: turt2live

res/css/_components.scss

@@ -126,7 +126,6 @@
 @import "./views/dialogs/_SpacePreferencesDialog.scss";
 @import "./views/dialogs/_SpaceSettingsDialog.scss";
 @import "./views/dialogs/_SpotlightDialog.scss";
-@import "./views/dialogs/_TabbedIntegrationManagerDialog.scss";
 @import "./views/dialogs/_TermsDialog.scss";
 @import "./views/dialogs/_UntrustedDeviceDialog.scss";
 @import "./views/dialogs/_UploadConfirmDialog.scss";

res/css/views/dialogs/_TabbedIntegrationManagerDialog.scss

@@ -408,10 +408,6 @@ export const Notifier = {
                 // don't bother notifying as user was recently active in this room
                 return;
             }
-            if (SettingsStore.getValue("doNotDisturb")) {
-                // Don't bother the user if they didn't ask to be bothered
-                return;
-            }
 
             if (this.isEnabled()) {
                 this._displayPopupNotification(ev, room);

src/Notifier.ts

@@ -14,9 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, { createRef, useContext, useRef, useState } from "react";
+import React, { createRef } from "react";
 import { Room } from "matrix-js-sdk/src/models/room";
-import classNames from "classnames";
 
 import { MatrixClientPeg } from "../../MatrixClientPeg";
 import defaultDispatcher from "../../dispatcher/dispatcher";
@@ -32,9 +31,7 @@ import LogoutDialog from "../views/dialogs/LogoutDialog";
 import SettingsStore from "../../settings/SettingsStore";
 import { findHighContrastTheme, getCustomTheme, isHighContrastTheme } from "../../theme";
 import {
-    RovingAccessibleButton,
     RovingAccessibleTooltipButton,
-    useRovingTabIndex,
 } from "../../accessibility/RovingTabIndex";
 import AccessibleButton, { ButtonEvent } from "../views/elements/AccessibleButton";
 import SdkConfig from "../../SdkConfig";
@@ -44,73 +41,17 @@ import { UPDATE_EVENT } from "../../stores/AsyncStore";
 import BaseAvatar from '../views/avatars/BaseAvatar';
 import { SettingLevel } from "../../settings/SettingLevel";
 import IconizedContextMenu, {
-    IconizedContextMenuCheckbox,
     IconizedContextMenuOption,
     IconizedContextMenuOptionList,
 } from "../views/context_menus/IconizedContextMenu";
 import { UIFeature } from "../../settings/UIFeature";
 import HostSignupAction from "./HostSignupAction";
 import SpaceStore from "../../stores/spaces/SpaceStore";
 import { UPDATE_SELECTED_SPACE } from "../../stores/spaces";
-import MatrixClientContext from "../../contexts/MatrixClientContext";
-import { SettingUpdatedPayload } from "../../dispatcher/payloads/SettingUpdatedPayload";
 import UserIdentifierCustomisations from "../../customisations/UserIdentifier";
 import PosthogTrackers from "../../PosthogTrackers";
 import { ViewHomePagePayload } from "../../dispatcher/payloads/ViewHomePagePayload";
 
-const CustomStatusSection = () => {
-    const cli = useContext(MatrixClientContext);
-    const setStatus = cli.getUser(cli.getUserId()).unstable_statusMessage || "";
-    const [value, setValue] = useState(setStatus);
-
-    const ref = useRef<HTMLInputElement>(null);
-    const [onFocus, isActive] = useRovingTabIndex(ref);
-
-    const classes = classNames({
-        'mx_UserMenu_CustomStatusSection_field': true,
-        'mx_UserMenu_CustomStatusSection_field_hasQuery': value,
-    });
-
-    let details: JSX.Element;
-    if (value !== setStatus) {
-        details = <>
-            <p>{ _t("Your status will be shown to people you have a DM with.") }</p>
-
-            <RovingAccessibleButton
-                onClick={() => cli._unstable_setStatusMessage(value)}
-                kind="primary_outline"
-            >
-                { value ? _t("Set status") : _t("Clear status") }
-            </RovingAccessibleButton>
-        </>;
-    }
-
-    return <form className="mx_UserMenu_CustomStatusSection">
-        <div className={classes}>
-            <input
-                type="text"
-                value={value}
-                className="mx_UserMenu_CustomStatusSection_input"
-                onChange={e => setValue(e.target.value)}
-                placeholder={_t("Set a new status")}
-                autoComplete="off"
-                onFocus={onFocus}
-                ref={ref}
-                tabIndex={isActive ? 0 : -1}
-            />
-            <AccessibleButton
-                // The clear button is only for mouse users
-                tabIndex={-1}
-                title={_t("Clear")}
-                className="mx_UserMenu_CustomStatusSection_clear"
-                onClick={() => setValue("")}
-            />
-        </div>
-
-        { details }
-    </form>;
-};
-
 interface IProps {
     isPanelCollapsed: boolean;
 }
@@ -122,7 +63,6 @@ interface IState {
     isDarkTheme: boolean;
     isHighContrast: boolean;
     selectedSpace?: Room;
-    dndEnabled: boolean;
 }
 
 const toRightOf = (rect: PartialDOMRect) => {
@@ -154,19 +94,11 @@ export default class UserMenu extends React.Component<IProps, IState> {
             contextMenuPosition: null,
             isDarkTheme: this.isUserOnDarkTheme(),
             isHighContrast: this.isUserOnHighContrastTheme(),
-            dndEnabled: this.doNotDisturb,
             selectedSpace: SpaceStore.instance.activeSpaceRoom,
         };
 
         OwnProfileStore.instance.on(UPDATE_EVENT, this.onProfileUpdate);
         SpaceStore.instance.on(UPDATE_SELECTED_SPACE, this.onSelectedSpaceUpdate);
-
-        SettingsStore.monitorSetting("feature_dnd", null);
-        SettingsStore.monitorSetting("doNotDisturb", null);
-    }
-
-    private get doNotDisturb(): boolean {
-        return SettingsStore.getValue("doNotDisturb");
     }
 
     private get hasHomePage(): boolean {
@@ -239,20 +171,6 @@ export default class UserMenu extends React.Component<IProps, IState> {
                     if (this.buttonRef.current) this.buttonRef.current.click();
                 }
                 break;
-
-            case Action.SettingUpdated: {
-                const settingUpdatedPayload = payload as SettingUpdatedPayload;
-                switch (settingUpdatedPayload.settingName) {
-                    case "feature_dnd":
-                    case "doNotDisturb": {
-                        const dndEnabled = this.doNotDisturb;
-                        if (this.state.dndEnabled !== dndEnabled) {
-                            this.setState({ dndEnabled });
-                        }
-                        break;
-                    }
-                }
-            }
         }
     };
 
@@ -348,12 +266,6 @@ export default class UserMenu extends React.Component<IProps, IState> {
         this.setState({ contextMenuPosition: null }); // also close the menu
     };
 
-    private onDndToggle = (ev: ButtonEvent) => {
-        ev.stopPropagation();
-        const current = SettingsStore.getValue("doNotDisturb");
-        SettingsStore.setValue("doNotDisturb", null, SettingLevel.DEVICE, !current);
-    };
-
     private renderContextMenu = (): React.ReactNode => {
         if (!this.state.contextMenuPosition) return null;
 
@@ -400,24 +312,6 @@ export default class UserMenu extends React.Component<IProps, IState> {
             );
         }
 
-        let customStatusSection: JSX.Element;
-        if (SettingsStore.getValue("feature_custom_status")) {
-            customStatusSection = <CustomStatusSection />;
-        }
-
-        let dndButton: JSX.Element;
-        if (SettingsStore.getValue("feature_dnd")) {
-            dndButton = (
-                <IconizedContextMenuCheckbox
-                    iconClassName={this.state.dndEnabled ? "mx_UserMenu_iconDnd" : "mx_UserMenu_iconDndOff"}
-                    label={_t("Do not disturb")}
-                    onClick={this.onDndToggle}
-                    active={this.state.dndEnabled}
-                    words
-                />
-            );
-        }
-
         let feedbackButton;
         if (SettingsStore.getValue(UIFeature.Feedback)) {
             feedbackButton = <IconizedContextMenuOption
@@ -430,7 +324,6 @@ export default class UserMenu extends React.Component<IProps, IState> {
         let primaryOptionList = (
             <IconizedContextMenuOptionList>
                 { homeButton }
-                { dndButton }
                 <IconizedContextMenuOption
                     iconClassName="mx_UserMenu_iconBell"
                     label={_t("Notifications")}
@@ -502,7 +395,6 @@ export default class UserMenu extends React.Component<IProps, IState> {
                     />
                 </RovingAccessibleTooltipButton>
             </div>
-            { customStatusSection }
             { topSection }
             { primaryOptionList }
         </IconizedContextMenu>;
@@ -515,11 +407,6 @@ export default class UserMenu extends React.Component<IProps, IState> {
         const displayName = OwnProfileStore.instance.displayName || userId;
         const avatarUrl = OwnProfileStore.instance.getHttpAvatarUrl(avatarSize);
 
-        let badge: JSX.Element;
-        if (this.state.dndEnabled) {
-            badge = <div className="mx_UserMenu_dndBadge" />;
-        }
-
         let name: JSX.Element;
         if (!this.props.isPanelCollapsed) {
             name = <div className="mx_UserMenu_name">
@@ -534,9 +421,6 @@ export default class UserMenu extends React.Component<IProps, IState> {
                 label={_t("User menu")}
                 isExpanded={!!this.state.contextMenuPosition}
                 onContextMenu={this.onContextMenu}
-                className={classNames({
-                    mx_UserMenu_cutout: badge,
-                })}
             >
                 <div className="mx_UserMenu_userAvatar">
                     <BaseAvatar
@@ -548,7 +432,6 @@ export default class UserMenu extends React.Component<IProps, IState> {
                         resizeMethod="crop"
                         className="mx_UserMenu_userAvatar_BaseAvatar"
                     />
-                    { badge }
                 </div>
                 { name }