Merge pull request #5062 from matrix-org/travis/settings/ts

Convert SettingsStore to TypeScript

src/components/structures/MatrixChat.tsx

@@ -51,7 +51,7 @@ import { getHomePageUrl } from '../../utils/pages';
 
 import createRoom from "../../createRoom";
 import {_t, _td, getCurrentLanguage} from '../../languageHandler';
-import SettingsStore, { SettingLevel } from "../../settings/SettingsStore";
+import SettingsStore from "../../settings/SettingsStore";
 import ThemeController from "../../settings/controllers/ThemeController";
 import { startAnyRegistrationFlow } from "../../Registration.js";
 import { messageForSyncError } from '../../utils/ErrorUtils';
@@ -75,6 +75,7 @@ import {showToast as showNotificationsToast} from "../../toasts/DesktopNotificat
 import { OpenToTabPayload } from "../../dispatcher/payloads/OpenToTabPayload";
 import ErrorDialog from "../views/dialogs/ErrorDialog";
 import { RoomNotificationStateStore } from "../../stores/notifications/RoomNotificationStateStore";
+import { SettingLevel } from "../../settings/SettingLevel";
 
 /** constants for MatrixChat.state.view */
 export enum Views {

src/components/structures/RoomView.js

@@ -48,7 +48,7 @@ import RightPanel from './RightPanel';
 import RoomViewStore from '../../stores/RoomViewStore';
 import RoomScrollStateStore from '../../stores/RoomScrollStateStore';
 import WidgetEchoStore from '../../stores/WidgetEchoStore';
-import SettingsStore, {SettingLevel} from "../../settings/SettingsStore";
+import SettingsStore from "../../settings/SettingsStore";
 import AccessibleButton from "../views/elements/AccessibleButton";
 import RightPanelStore from "../../stores/RightPanelStore";
 import {haveTileForEvent} from "../views/rooms/EventTile";
@@ -56,6 +56,7 @@ import RoomContext from "../../contexts/RoomContext";
 import MatrixClientContext from "../../contexts/MatrixClientContext";
 import { shieldStatusForRoom } from '../../utils/ShieldUtils';
 import {Action} from "../../dispatcher/actions";
+import {SettingLevel} from "../../settings/SettingLevel";
 
 const DEBUG = false;
 let debuglog = function() {};

src/components/structures/UserMenu.tsx

@@ -26,7 +26,7 @@ import { OpenToTabPayload } from "../../dispatcher/payloads/OpenToTabPayload";
 import RedesignFeedbackDialog from "../views/dialogs/RedesignFeedbackDialog";
 import Modal from "../../Modal";
 import LogoutDialog from "../views/dialogs/LogoutDialog";
-import SettingsStore, {SettingLevel} from "../../settings/SettingsStore";
+import SettingsStore from "../../settings/SettingsStore";
 import {getCustomTheme} from "../../theme";
 import {getHostingLink} from "../../utils/HostingLink";
 import {ButtonEvent} from "../views/elements/AccessibleButton";
@@ -37,6 +37,7 @@ import { UPDATE_EVENT } from "../../stores/AsyncStore";
 import BaseAvatar from '../views/avatars/BaseAvatar';
 import classNames from "classnames";
 import AccessibleTooltipButton from "../views/elements/AccessibleTooltipButton";
+import { SettingLevel } from "../../settings/SettingLevel";
 
 interface IProps {
     isMinimized: boolean;

src/components/views/auth/LanguageSelector.js

@@ -16,10 +16,11 @@ limitations under the License.
 
 import SdkConfig from "../../../SdkConfig";
 import {getCurrentLanguage} from "../../../languageHandler";
-import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
+import SettingsStore from "../../../settings/SettingsStore";
 import PlatformPeg from "../../../PlatformPeg";
 import * as sdk from '../../../index';
 import React from 'react';
+import {SettingLevel} from "../../../settings/SettingLevel";
 
 function onChange(newLang) {
     if (getCurrentLanguage() !== newLang) {

src/components/views/dialogs/AskInviteAnywayDialog.js

@@ -19,8 +19,8 @@ import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
-import {SettingLevel} from "../../../settings/SettingsStore";
 import SettingsStore from "../../../settings/SettingsStore";
+import {SettingLevel} from "../../../settings/SettingLevel";
 
 export default createReactClass({
     propTypes: {

src/components/views/dialogs/WidgetOpenIDPermissionsDialog.js

@@ -17,10 +17,11 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import {_t} from "../../../languageHandler";
-import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
+import SettingsStore from "../../../settings/SettingsStore";
 import * as sdk from "../../../index";
 import LabelledToggleSwitch from "../elements/LabelledToggleSwitch";
 import WidgetUtils from "../../../utils/WidgetUtils";
+import {SettingLevel} from "../../../settings/SettingLevel";
 
 export default class WidgetOpenIDPermissionsDialog extends React.Component {
     static propTypes = {

src/components/views/elements/AppTile.js

@@ -35,12 +35,13 @@ import dis from '../../../dispatcher/dispatcher';
 import ActiveWidgetStore from '../../../stores/ActiveWidgetStore';
 import classNames from 'classnames';
 import {IntegrationManagers} from "../../../integrations/IntegrationManagers";
-import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
+import SettingsStore from "../../../settings/SettingsStore";
 import {aboveLeftOf, ContextMenu, ContextMenuButton} from "../../structures/ContextMenu";
 import PersistedElement from "./PersistedElement";
 import {WidgetType} from "../../../widgets/WidgetType";
 import {Capability} from "../../../widgets/WidgetApi";
 import {sleep} from "../../../utils/promise";
+import {SettingLevel} from "../../../settings/SettingLevel";
 
 const ALLOWED_APP_URL_SCHEMES = ['https:', 'http:'];
 const ENABLE_REACT_PERF = false;

src/components/views/elements/IRCTimelineProfileResizer.tsx

@@ -15,8 +15,9 @@ limitations under the License.
 */
 
 import React from 'react';
-import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
+import SettingsStore from "../../../settings/SettingsStore";
 import Draggable, {ILocationState} from './Draggable';
+import { SettingLevel } from "../../../settings/SettingLevel";
 
 interface IProps {
     // Current room

src/components/views/elements/SettingsFlag.tsx

@@ -20,11 +20,12 @@ import SettingsStore from "../../../settings/SettingsStore";
 import { _t } from '../../../languageHandler';
 import ToggleSwitch from "./ToggleSwitch";
 import StyledCheckbox from "./StyledCheckbox";
+import { SettingLevel } from "../../../settings/SettingLevel";
 
 interface IProps {
     // The setting must be a boolean
     name: string;
-    level: string;
+    level: SettingLevel;
     roomId?: string; // for per-room settings
     label?: string; // untranslated
     isExplicit?: boolean;
@@ -52,8 +53,8 @@ export default class SettingsFlag extends React.Component<IProps, IState> {
         };
     }
 
-    private onChange = (checked: boolean): void => {
-        this.save(checked);
+    private onChange = async (checked: boolean) => {
+        await this.save(checked);
         this.setState({ value: checked });
         if (this.props.onChange) this.props.onChange(checked);
     };
@@ -62,8 +63,8 @@ export default class SettingsFlag extends React.Component<IProps, IState> {
         this.onChange(e.target.checked);
     };
 
-    private save = (val?: boolean): void => {
-        return SettingsStore.setValue(
+    private save = async (val?: boolean) => {
+        await SettingsStore.setValue(
             this.props.name,
             this.props.roomId,
             this.props.level,

src/components/views/room_settings/ColorSettings.js

@@ -20,7 +20,8 @@ import createReactClass from 'create-react-class';
 
 import Tinter from '../../../Tinter';
 import dis from '../../../dispatcher/dispatcher';
-import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
+import SettingsStore from "../../../settings/SettingsStore";
+import {SettingLevel} from "../../../settings/SettingLevel";
 
 const ROOM_COLORS = [
     // magic room default values courtesy of Ribot

src/components/views/room_settings/UrlPreviewSettings.js

@@ -22,10 +22,11 @@ import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import * as sdk from "../../../index";
 import { _t, _td } from '../../../languageHandler';
-import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
+import SettingsStore from "../../../settings/SettingsStore";
 import dis from "../../../dispatcher/dispatcher";
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import {Action} from "../../../dispatcher/actions";
+import {SettingLevel} from "../../../settings/SettingLevel";
 
 
 export default createReactClass({

src/components/views/rooms/RoomRecoveryReminder.js

@@ -21,7 +21,8 @@ import * as sdk from "../../../index";
 import { _t } from "../../../languageHandler";
 import Modal from "../../../Modal";
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
-import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
+import SettingsStore from "../../../settings/SettingsStore";
+import {SettingLevel} from "../../../settings/SettingLevel";
 
 export default class RoomRecoveryReminder extends React.PureComponent {
     static propTypes = {

src/components/views/settings/E2eAdvancedPanel.js

@@ -18,7 +18,7 @@ import React from 'react';
 
 import * as sdk from '../../../index';
 import {_t} from "../../../languageHandler";
-import {SettingLevel} from "../../../settings/SettingsStore";
+import {SettingLevel} from "../../../settings/SettingLevel";
 
 const SETTING_MANUALLY_VERIFY_ALL_SESSIONS = "e2ee.manuallyVerifyAllSessions";
 

src/components/views/settings/EventIndexPanel.js

@@ -20,10 +20,11 @@ import { _t } from '../../../languageHandler';
 import SdkConfig from "../../../SdkConfig";
 import * as sdk from '../../../index';
 import Modal from '../../../Modal';
-import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
+import SettingsStore from "../../../settings/SettingsStore";
 import AccessibleButton from "../elements/AccessibleButton";
 import {formatBytes, formatCountLong} from "../../../utils/FormattingUtils";
 import EventIndexPeg from "../../../indexing/EventIndexPeg";
+import {SettingLevel} from "../../../settings/SettingLevel";
 
 export default class EventIndexPanel extends React.Component {
     constructor() {

src/components/views/settings/Notifications.js

@@ -20,7 +20,7 @@ import createReactClass from 'create-react-class';
 import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
-import SettingsStore, {SettingLevel} from '../../../settings/SettingsStore';
+import SettingsStore from '../../../settings/SettingsStore';
 import Modal from '../../../Modal';
 import {
     NotificationUtils,
@@ -31,6 +31,7 @@ import {
 import SdkConfig from "../../../SdkConfig";
 import LabelledToggleSwitch from "../elements/LabelledToggleSwitch";
 import AccessibleButton from "../elements/AccessibleButton";
+import {SettingLevel} from "../../../settings/SettingLevel";
 
 // TODO: this "view" component still has far too much application logic in it,
 // which should be factored out to other files.

src/components/views/settings/SetIntegrationManager.js

@@ -18,7 +18,8 @@ import React from 'react';
 import {_t} from "../../../languageHandler";
 import {IntegrationManagers} from "../../../integrations/IntegrationManagers";
 import * as sdk from '../../../index';
-import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
+import SettingsStore from "../../../settings/SettingsStore";
+import {SettingLevel} from "../../../settings/SettingLevel";
 
 export default class SetIntegrationManager extends React.Component {
     constructor() {

src/components/views/settings/tabs/room/NotificationSettingsTab.js

@@ -21,7 +21,7 @@ import {MatrixClientPeg} from "../../../../../MatrixClientPeg";
 import AccessibleButton from "../../../elements/AccessibleButton";
 import Notifier from "../../../../../Notifier";
 import SettingsStore from '../../../../../settings/SettingsStore';
-import { SettingLevel } from '../../../../../settings/SettingsStore';
+import {SettingLevel} from "../../../../../settings/SettingLevel";
 
 export default class NotificationsSettingsTab extends React.Component {
     static propTypes = {

src/components/views/settings/tabs/room/SecurityRoomSettingsTab.js

@@ -20,9 +20,9 @@ import {_t} from "../../../../../languageHandler";
 import {MatrixClientPeg} from "../../../../../MatrixClientPeg";
 import * as sdk from "../../../../..";
 import LabelledToggleSwitch from "../../../elements/LabelledToggleSwitch";
-import {SettingLevel} from "../../../../../settings/SettingsStore";
 import Modal from "../../../../../Modal";
 import QuestionDialog from "../../../dialogs/QuestionDialog";
+import {SettingLevel} from "../../../../../settings/SettingLevel";
 
 export default class SecurityRoomSettingsTab extends React.Component {
     static propTypes = {

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

@@ -18,7 +18,7 @@ limitations under the License.
 import React from 'react';
 import {_t} from "../../../../../languageHandler";
 import SdkConfig from "../../../../../SdkConfig";
-import SettingsStore, {SettingLevel} from "../../../../../settings/SettingsStore";
+import SettingsStore from "../../../../../settings/SettingsStore";
 import { enumerateThemes } from "../../../../../theme";
 import ThemeWatcher from "../../../../../settings/watchers/ThemeWatcher";
 import Slider from "../../../elements/Slider";
@@ -35,6 +35,7 @@ import Field from '../../../elements/Field';
 import EventTilePreview from '../../../elements/EventTilePreview';
 import StyledRadioGroup from "../../../elements/StyledRadioGroup";
 import classNames from 'classnames';
+import { SettingLevel } from "../../../../../settings/SettingLevel";
 
 interface IProps {
 }

src/components/views/settings/tabs/user/GeneralUserSettingsTab.js

@@ -20,7 +20,6 @@ import React from 'react';
 import {_t} from "../../../../../languageHandler";
 import ProfileSettings from "../../ProfileSettings";
 import * as languageHandler from "../../../../../languageHandler";
-import {SettingLevel} from "../../../../../settings/SettingsStore";
 import SettingsStore from "../../../../../settings/SettingsStore";
 import LanguageDropdown from "../../../elements/LanguageDropdown";
 import AccessibleButton from "../../../elements/AccessibleButton";
@@ -37,6 +36,7 @@ import IdentityAuthClient from "../../../../../IdentityAuthClient";
 import {abbreviateUrl} from "../../../../../utils/UrlUtils";
 import { getThreepidsWithBindStatus } from '../../../../../boundThreepids';
 import Spinner from "../../../elements/Spinner";
+import {SettingLevel} from "../../../../../settings/SettingLevel";
 
 export default class GeneralUserSettingsTab extends React.Component {
     static propTypes = {

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

@@ -17,9 +17,10 @@ limitations under the License.
 import React from 'react';
 import {_t} from "../../../../../languageHandler";
 import PropTypes from "prop-types";
-import SettingsStore, {SettingLevel} from "../../../../../settings/SettingsStore";
+import SettingsStore from "../../../../../settings/SettingsStore";
 import LabelledToggleSwitch from "../../../elements/LabelledToggleSwitch";
 import * as sdk from "../../../../../index";
+import {SettingLevel} from "../../../../../settings/SettingLevel";
 
 export class LabsSettingToggle extends React.Component {
     static propTypes = {

src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js

@@ -17,12 +17,12 @@ limitations under the License.
 
 import React from 'react';
 import {_t} from "../../../../../languageHandler";
-import {SettingLevel} from "../../../../../settings/SettingsStore";
 import LabelledToggleSwitch from "../../../elements/LabelledToggleSwitch";
 import SettingsStore from "../../../../../settings/SettingsStore";
 import Field from "../../../elements/Field";
 import * as sdk from "../../../../..";
 import PlatformPeg from "../../../../../PlatformPeg";
+import {SettingLevel} from "../../../../../settings/SettingLevel";
 
 export default class PreferencesUserSettingsTab extends React.Component {
     static ROOM_LIST_SETTINGS = [

src/components/views/settings/tabs/user/SecurityUserSettingsTab.js

@@ -19,7 +19,6 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import {_t} from "../../../../../languageHandler";
 import SdkConfig from "../../../../../SdkConfig";
-import {SettingLevel} from "../../../../../settings/SettingsStore";
 import {MatrixClientPeg} from "../../../../../MatrixClientPeg";
 import * as FormattingUtils from "../../../../../utils/FormattingUtils";
 import AccessibleButton from "../../../elements/AccessibleButton";
@@ -29,6 +28,7 @@ import * as sdk from "../../../../..";
 import {sleep} from "../../../../../utils/promise";
 import dis from "../../../../../dispatcher/dispatcher";
 import {privateShouldBeEncrypted} from "../../../../../createRoom";
+import {SettingLevel} from "../../../../../settings/SettingLevel";
 
 export class IgnoredUser extends React.Component {
     static propTypes = {

src/components/views/settings/tabs/user/VoiceUserSettingsTab.js

@@ -21,10 +21,10 @@ import SdkConfig from "../../../../../SdkConfig";
 import CallMediaHandler from "../../../../../CallMediaHandler";
 import Field from "../../../elements/Field";
 import AccessibleButton from "../../../elements/AccessibleButton";
-import {SettingLevel} from "../../../../../settings/SettingsStore";
 import {MatrixClientPeg} from "../../../../../MatrixClientPeg";
 import * as sdk from "../../../../../index";
 import Modal from "../../../../../Modal";
+import {SettingLevel} from "../../../../../settings/SettingLevel";
 
 export default class VoiceUserSettingsTab extends React.Component {
     constructor() {