Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15175

Conflicts: src/settings/Settings.ts src/settings/UIFeature.ts
2020-09-17 11:58:26 +01:00 · 2020-09-17 11:58:26 +01:00 · 4213a557f2
commit 4213a557f2
parent dfabe79335 2ad08c8394
11 changed files with 105 additions and 73 deletions
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@ -1234,8 +1234,8 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {

        StorageManager.tryPersistStorage();

-        if (SettingsStore.getValue("showCookieBar") && this.props.config.piwik && navigator.doNotTrack !== "1") {
-            showAnalyticsToast(this.props.config.piwik && this.props.config.piwik.policyUrl);
+        if (SettingsStore.getValue("showCookieBar") && Analytics.canEnable()) {
+            showAnalyticsToast(this.props.config.piwik?.policyUrl);
        }
    }

--- a/src/components/structures/RoomDirectory.js
+++ b/src/components/structures/RoomDirectory.js
@ -70,10 +70,10 @@ export default class RoomDirectory extends React.Component {
        this.scrollPanel = null;
        this.protocols = null;

-        this.setState({protocolsLoading: true});
+        this.state.protocolsLoading = true;
        if (!MatrixClientPeg.get()) {
            // We may not have a client yet when invoked from welcome page
-            this.setState({protocolsLoading: false});
+            this.state.protocolsLoading = false;
            return;
        }

@ -102,14 +102,16 @@ export default class RoomDirectory extends React.Component {
            });
        } else {
            // We don't use the protocols in the communities v2 prototype experience
-            this.setState({protocolsLoading: false});
+            this.state.protocolsLoading = false;

            // Grab the profile info async
            FlairStore.getGroupProfileCached(MatrixClientPeg.get(), this.state.selectedCommunityId).then(profile => {
                this.setState({communityName: profile.name});
            });
        }
+    }

+    componentDidMount() {
        this.refreshRoomList();
    }

--- a/src/components/structures/UserMenu.tsx
+++ b/src/components/structures/UserMenu.tsx
@ -50,6 +50,7 @@ import dis from "../../dispatcher/dispatcher";
 import { RightPanelPhases } from "../../stores/RightPanelStorePhases";
 import ErrorDialog from "../views/dialogs/ErrorDialog";
 import EditCommunityPrototypeDialog from "../views/dialogs/EditCommunityPrototypeDialog";
+import {UIFeature} from "../../settings/UIFeature";

 interface IProps {
    isMinimized: boolean;
@ -285,6 +286,15 @@ export default class UserMenu extends React.Component<IProps, IState> {
            );
        }

+        let feedbackButton;
+        if (SettingsStore.getValue(UIFeature.Feedback)) {
+            feedbackButton = <IconizedContextMenuOption
+                iconClassName="mx_UserMenu_iconMessage"
+                label={_t("Feedback")}
+                onClick={this.onProvideFeedback}
+            />;
+        }
+
        let primaryHeader = (
            <div className="mx_UserMenu_contextMenu_name">
                <span className="mx_UserMenu_contextMenu_displayName">
@ -319,11 +329,7 @@ export default class UserMenu extends React.Component<IProps, IState> {
                        label={_t("Archived rooms")}
                        onClick={this.onShowArchived}
                    /> */}
-                    <IconizedContextMenuOption
-                        iconClassName="mx_UserMenu_iconMessage"
-                        label={_t("Feedback")}
-                        onClick={this.onProvideFeedback}
-                    />
+                    { feedbackButton }
                </IconizedContextMenuOptionList>
                <IconizedContextMenuOptionList red>
                    <IconizedContextMenuOption
@ -384,11 +390,7 @@ export default class UserMenu extends React.Component<IProps, IState> {
                            aria-label={_t("User settings")}
                            onClick={(e) => this.onSettingsOpen(e, null)}
                        />
-                        <IconizedContextMenuOption
-                            iconClassName="mx_UserMenu_iconMessage"
-                            label={_t("Feedback")}
-                            onClick={this.onProvideFeedback}
-                        />
+                        { feedbackButton }
                    </IconizedContextMenuOptionList>
                    <IconizedContextMenuOptionList red>
                        <IconizedContextMenuOption
--- a/src/components/views/elements/ErrorBoundary.js
+++ b/src/components/views/elements/ErrorBoundary.js
@ -20,6 +20,7 @@ import { _t } from '../../../languageHandler';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import PlatformPeg from '../../../PlatformPeg';
 import Modal from '../../../Modal';
+import SdkConfig from "../../../SdkConfig";

 /**
 * This error boundary component can be used to wrap large content areas and
@ -73,9 +74,10 @@ export default class ErrorBoundary extends React.PureComponent {
        if (this.state.error) {
            const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
            const newIssueUrl = "https://github.com/vector-im/element-web/issues/new";
-            return <div className="mx_ErrorBoundary">
-                <div className="mx_ErrorBoundary_body">
-                    <h1>{_t("Something went wrong!")}</h1>
+
+            let bugReportSection;
+            if (SdkConfig.get().bug_report_endpoint_url) {
+                bugReportSection = <React.Fragment>
                    <p>{_t(
                        "Please <newIssueLink>create a new issue</newIssueLink> " +
                        "on GitHub so that we can investigate this bug.", {}, {
@ -94,6 +96,13 @@ export default class ErrorBoundary extends React.PureComponent {
                    <AccessibleButton onClick={this._onBugReport} kind='primary'>
                        {_t("Submit debug logs")}
                    </AccessibleButton>
+                </React.Fragment>;
+            }
+
+            return <div className="mx_ErrorBoundary">
+                <div className="mx_ErrorBoundary_body">
+                    <h1>{_t("Something went wrong!")}</h1>
+                    { bugReportSection }
                    <AccessibleButton onClick={this._onClearCacheAndReload} kind='danger'>
                        {_t("Clear cache and reload")}
                    </AccessibleButton>
--- a/src/components/views/messages/TileErrorBoundary.js
+++ b/src/components/views/messages/TileErrorBoundary.js
@ -19,6 +19,7 @@ import classNames from 'classnames';
 import { _t } from '../../../languageHandler';
 import * as sdk from '../../../index';
 import Modal from '../../../Modal';
+import SdkConfig from "../../../SdkConfig";

 export default class TileErrorBoundary extends React.Component {
    constructor(props) {
@ -54,14 +55,20 @@ export default class TileErrorBoundary extends React.Component {
                mx_EventTile_content: true,
                mx_EventTile_tileError: true,
            };
+
+            let submitLogsButton;
+            if (SdkConfig.get().bug_report_endpoint_url) {
+                submitLogsButton = <a onClick={this._onBugReport} href="#">
+                    {_t("Submit logs")}
+                </a>;
+            }
+
            return (<div className={classNames(classes)}>
                <div className="mx_EventTile_line">
                    <span>
                        {_t("Can't load this message")}
                        { mxEvent && ` (${mxEvent.getType()})` }
-                        <a onClick={this._onBugReport} href="#">
-                            {_t("Submit logs")}
-                        </a>
+                        { submitLogsButton }
                    </span>
                </div>
            </div>);
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@ -952,30 +952,26 @@ function useRoomPermissions(cli, room, user) {

 const PowerLevelSection = ({user, room, roomPermissions, powerLevels}) => {
    const [isEditing, setEditing] = useState(false);
-    if (room && user.roomId) { // is in room
-        if (isEditing) {
-            return (<PowerLevelEditor
-                user={user} room={room} roomPermissions={roomPermissions}
-                onFinished={() => setEditing(false)} />);
-        } else {
-            const IconButton = sdk.getComponent('elements.IconButton');
-            const powerLevelUsersDefault = powerLevels.users_default || 0;
-            const powerLevel = parseInt(user.powerLevel, 10);
-            const modifyButton = roomPermissions.canEdit ?
-                (<IconButton icon="edit" onClick={() => setEditing(true)} />) : null;
-            const role = textualPowerLevel(powerLevel, powerLevelUsersDefault);
-            const label = _t("<strong>%(role)s</strong> in %(roomName)s",
-                {role, roomName: room.name},
-                {strong: label => <strong>{label}</strong>},
-            );
-            return (
-                <div className="mx_UserInfo_profileField">
-                    <div className="mx_UserInfo_roleDescription">{label}{modifyButton}</div>
-                </div>
-            );
-        }
+    if (isEditing) {
+        return (<PowerLevelEditor
+            user={user} room={room} roomPermissions={roomPermissions}
+            onFinished={() => setEditing(false)} />);
    } else {
-        return null;
+        const IconButton = sdk.getComponent('elements.IconButton');
+        const powerLevelUsersDefault = powerLevels.users_default || 0;
+        const powerLevel = parseInt(user.powerLevel, 10);
+        const modifyButton = roomPermissions.canEdit ?
+            (<IconButton icon="edit" onClick={() => setEditing(true)} />) : null;
+        const role = textualPowerLevel(powerLevel, powerLevelUsersDefault);
+        const label = _t("<strong>%(role)s</strong> in %(roomName)s",
+            {role, roomName: room.name},
+            {strong: label => <strong>{label}</strong>},
+        );
+        return (
+            <div className="mx_UserInfo_profileField">
+                <div className="mx_UserInfo_roleDescription">{label}{modifyButton}</div>
+            </div>
+        );
    }
 };

@ -1268,14 +1264,15 @@ const BasicUserInfo = ({room, member, groupId, devices, isRoomEncrypted}) => {
        spinner = <Loader imgClassName="mx_ContextualMenu_spinner" />;
    }

-    const memberDetails = (
-        <PowerLevelSection
+    let memberDetails;
+    if (room && member.roomId) {
+        memberDetails = <PowerLevelSection
            powerLevels={powerLevels}
            user={member}
            room={room}
            roomPermissions={roomPermissions}
-        />
-    );
+        />;
+    }

    // only display the devices list if our client supports E2E
    const cryptoEnabled = cli.isCryptoEnabled();
--- a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
@ -329,6 +329,29 @@ export default class SecurityUserSettingsTab extends React.Component {
            </div>;
        }

+        let privacySection;
+        if (Analytics.canEnable()) {
+            privacySection = <React.Fragment>
+                <div className="mx_SettingsTab_heading">{_t("Privacy")}</div>
+                <div className="mx_SettingsTab_section">
+                    <span className="mx_SettingsTab_subheading">{_t("Analytics")}</span>
+                    <div className="mx_SettingsTab_subsectionText">
+                        {_t(
+                            "%(brand)s collects anonymous analytics to allow us to improve the application.",
+                            { brand },
+                        )}
+                        &nbsp;
+                        {_t("Privacy is important to us, so we don't collect any personal or " +
+                            "identifiable data for our analytics.")}
+                        <AccessibleButton className="mx_SettingsTab_linkBtn" onClick={Analytics.showDetailsModal}>
+                            {_t("Learn more about how we use analytics.")}
+                        </AccessibleButton>
+                    </div>
+                    <SettingsFlag name="analyticsOptIn" level={SettingLevel.DEVICE} onChange={this._updateAnalytics} />
+                </div>
+            </React.Fragment>;
+        }
+
        return (
            <div className="mx_SettingsTab mx_SecurityUserSettingsTab">
                {warning}
@ -357,24 +380,7 @@ export default class SecurityUserSettingsTab extends React.Component {
                    {crossSigning}
                    {this._renderCurrentDeviceInfo()}
                </div>
-                <div className="mx_SettingsTab_heading">{_t("Privacy")}</div>
-                <div className="mx_SettingsTab_section">
-                    <span className="mx_SettingsTab_subheading">{_t("Analytics")}</span>
-                    <div className='mx_SettingsTab_subsectionText'>
-                        {_t(
-                            "%(brand)s collects anonymous analytics to allow us to improve the application.",
-                            { brand },
-                        )}
-                        &nbsp;
-                        {_t("Privacy is important to us, so we don't collect any personal or " +
-                            "identifiable data for our analytics.")}
-                        <AccessibleButton className="mx_SettingsTab_linkBtn" onClick={Analytics.showDetailsModal}>
-                            {_t("Learn more about how we use analytics.")}
-                        </AccessibleButton>
-                    </div>
-                    <SettingsFlag name='analyticsOptIn' level={SettingLevel.DEVICE}
-                                  onChange={this._updateAnalytics} />
-                </div>
+                { privacySection }
                <div className="mx_SettingsTab_heading">{_t("Advanced")}</div>
                <div className="mx_SettingsTab_section">
                    {this._renderIgnoredUsers()}