imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace console.error with logger.error

Browse source 
Related https://github.com/vector-im/element-web/issues/18425
This commit is contained in:
Dariusz Niemczyk 2021-10-15 16:30:53 +02:00 • committed by Dariusz Niemczyk
parent 9c594a8a96
commit 5e73a212f4
124 changed files with 417 additions and 250 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/components/structures/FilePanel.tsx
View file

@ -39,6 +39,8 @@ import { TileShape } from '../views/rooms/EventTile';
import { Layout } from "../../settings/Layout";
import RoomContext, { TimelineRenderingType } from '../../contexts/RoomContext';
import { logger } from "matrix-js-sdk/src/logger";
interface IProps {
roomId: string;
onClose: () => void;
@ -210,10 +212,10 @@ class FilePanel extends React.Component<IProps, IState> {
this.setState({ timelineSet: timelineSet });
} catch (error) {
console.error("Failed to get or create file panel filter", error);
logger.error("Failed to get or create file panel filter", error);
}
} else {
console.error("Failed to add filtered timelineSet for FilePanel as no room!");
logger.error("Failed to add filtered timelineSet for FilePanel as no room!");
}
}

14
src/components/structures/GroupView.js
View file

@ -45,6 +45,8 @@ import { createSpaceFromCommunity } from "../../utils/space";
import { Action } from "../../dispatcher/actions";
import { RightPanelPhases } from "../../stores/RightPanelStorePhases";
import { logger } from "matrix-js-sdk/src/logger";
const LONG_DESC_PLACEHOLDER = _td(
`<h1>HTML for your community's page</h1>
<p>
@ -186,7 +188,7 @@ class FeaturedRoom extends React.Component {
this.props.groupId,
this.props.summaryInfo.room_id,
).catch((err) => {
console.error('Error whilst removing room from group summary', err);
logger.error('Error whilst removing room from group summary', err);
const roomName = this.props.summaryInfo.name ||
this.props.summaryInfo.canonical_alias ||
this.props.summaryInfo.room_id;
@ -352,7 +354,7 @@ class FeaturedUser extends React.Component {
this.props.groupId,
this.props.summaryInfo.user_id,
).catch((err) => {
console.error('Error whilst removing user from group summary', err);
logger.error('Error whilst removing user from group summary', err);
const displayName = this.props.summaryInfo.displayname || this.props.summaryInfo.user_id;
const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
Modal.createTrackedDialog(
@ -551,7 +553,7 @@ export default class GroupView extends React.Component {
},
});
}).catch((e) => {
console.error('Error getting group inviter profile', e);
logger.error('Error getting group inviter profile', e);
}).finally(() => {
if (this._unmounted) return;
this.setState({
@ -641,7 +643,7 @@ export default class GroupView extends React.Component {
}).catch((e) => {
this.setState({ uploadingAvatar: false });
const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
console.error("Failed to upload avatar image", e);
logger.error("Failed to upload avatar image", e);
Modal.createTrackedDialog('Failed to upload image', '', ErrorDialog, {
title: _t('Error'),
description: _t('Failed to upload image'),
@ -675,7 +677,7 @@ export default class GroupView extends React.Component {
saving: false,
});
const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
console.error("Failed to save community profile", e);
logger.error("Failed to save community profile", e);
Modal.createTrackedDialog('Failed to update group', '', ErrorDialog, {
title: _t('Error'),
description: _t('Failed to update community'),
@ -1421,7 +1423,7 @@ export default class GroupView extends React.Component {
);
}
} else {
console.error("Invalid state for GroupView");
logger.error("Invalid state for GroupView");
return <div />;
}
}

4
src/components/structures/InteractiveAuth.tsx
View file

@ -29,6 +29,8 @@ import getEntryComponentForLoginType, { IStageComponent } from '../views/auth/In
import Spinner from "../views/elements/Spinner";
import { replaceableComponent } from "../../utils/replaceableComponent";
import { logger } from "matrix-js-sdk/src/logger";
export const ERROR_USER_CANCELLED = new Error("User cancelled auth session");
interface IProps {
@ -137,7 +139,7 @@ export default class InteractiveAuthComponent extends React.Component<IProps, IS
this.props.onAuthFinished(true, result, extra);
}).catch((error) => {
this.props.onAuthFinished(false, error);
console.error("Error during user-interactive auth:", error);
logger.error("Error during user-interactive auth:", error);
if (this.unmounted) {
return;
}

4
src/components/structures/MatrixChat.tsx
View file

@ -1580,7 +1580,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
newVersionInfo = await MatrixClientPeg.get().getKeyBackupVersion();
if (newVersionInfo !== null) haveNewVersion = true;
} catch (e) {
console.error("Saw key backup error but failed to check backup version!", e);
logger.error("Saw key backup error but failed to check backup version!", e);
return;
}
}
@ -2121,7 +2121,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
/>
);
} else {
console.error(`Unknown view ${this.state.view}`);
logger.error(`Unknown view ${this.state.view}`);
}
return <ErrorBoundary>

4
src/components/structures/NotificationPanel.tsx
View file

@ -26,6 +26,8 @@ import { TileShape } from "../views/rooms/EventTile";
import { Layout } from "../../settings/Layout";
import RoomContext, { TimelineRenderingType } from "../../contexts/RoomContext";
import { logger } from "matrix-js-sdk/src/logger";
interface IProps {
onClose(): void;
}
@ -59,7 +61,7 @@ export default class NotificationPanel extends React.PureComponent<IProps> {
/>
);
} else {
console.error("No notifTimelineSet available!");
logger.error("No notifTimelineSet available!");
content = <Spinner />;
}

6
src/components/structures/RoomDirectory.tsx
View file

@ -48,6 +48,8 @@ import Spinner from "../views/elements/Spinner";
import { ActionPayload } from "../../dispatcher/payloads";
import { getDisplayAliasForAliasSet } from "../../Rooms";
import { logger } from "matrix-js-sdk/src/logger";
const MAX_NAME_LENGTH = 80;
const MAX_TOPIC_LENGTH = 800;
@ -285,7 +287,7 @@ export default class RoomDirectory extends React.Component<IProps, IState> {
return false;
}
console.error("Failed to get publicRooms: %s", JSON.stringify(err));
logger.error("Failed to get publicRooms: %s", JSON.stringify(err));
track('Failed to get public room list');
const brand = SdkConfig.get().brand;
this.setState({
@ -335,7 +337,7 @@ export default class RoomDirectory extends React.Component<IProps, IState> {
}, (err) => {
modal.close();
this.refreshRoomList();
console.error("Failed to " + step + ": " + err);
logger.error("Failed to " + step + ": " + err);
Modal.createTrackedDialog('Remove from Directory Error', '', ErrorDialog, {
title: _t('Error'),
description: (err && err.message)

12
src/components/structures/RoomView.tsx
View file

@ -963,8 +963,8 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
} catch (err) {
const errorMessage = `Fetching room members for ${room.roomId} failed.` +
" Room members will appear incomplete.";
console.error(errorMessage);
console.error(err);
logger.error(errorMessage);
logger.error(err);
}
}
}
@ -1315,7 +1315,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
return searchPromise.then((results) => {
debuglog("search complete");
if (this.unmounted || !this.state.searching || this.searchId != localSearchId) {
console.error("Discarding stale search results");
logger.error("Discarding stale search results");
return false;
}
@ -1341,7 +1341,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
searchResults: results,
});
}, (error) => {
console.error("Search failed", error);
logger.error("Search failed", error);
Modal.createTrackedDialog('Search failed', '', ErrorDialog, {
title: _t("Search failed"),
description: ((error && error.message) ? error.message :
@ -1472,7 +1472,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
rejecting: false,
});
}, (error) => {
console.error("Failed to reject invite: %s", error);
logger.error("Failed to reject invite: %s", error);
const msg = error.message ? error.message : JSON.stringify(error);
Modal.createTrackedDialog('Failed to reject invite', '', ErrorDialog, {
@ -1505,7 +1505,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
rejecting: false,
});
} catch (error) {
console.error("Failed to reject invite: %s", error);
logger.error("Failed to reject invite: %s", error);
const msg = error.message ? error.message : JSON.stringify(error);
Modal.createTrackedDialog('Failed to reject invite', '', ErrorDialog, {

2
src/components/structures/ScrollPanel.tsx
View file

@ -408,7 +408,7 @@ export default class ScrollPanel extends React.Component<IProps> {
try {
await Promise.all(fillPromises);
} catch (err) {
console.error(err);
logger.error(err);
}
}
if (isFirstCall) {

4
src/components/structures/SpaceRoomView.tsx
View file

@ -536,7 +536,7 @@ const SpaceSetupFirstRooms = ({ space, title, description, onFinished }) => {
}));
onFinished(roomIds[0]);
} catch (e) {
console.error("Failed to create initial space rooms", e);
logger.error("Failed to create initial space rooms", e);
setError(_t("Failed to create initial space rooms"));
}
setBusy(false);
@ -713,7 +713,7 @@ const SpaceSetupPrivateInvite = ({ space, onFinished }) => {
onFinished();
}
} catch (err) {
console.error("Failed to invite users to space: ", err);
logger.error("Failed to invite users to space: ", err);
setError(_t("We couldn't invite those users. Please check the users you want to invite and try again."));
}
setBusy(false);

4
src/components/structures/TabbedView.tsx
View file

@ -23,6 +23,8 @@ import { replaceableComponent } from "../../utils/replaceableComponent";
import classNames from "classnames";
import AccessibleButton from "../views/elements/AccessibleButton";
import { logger } from "matrix-js-sdk/src/logger";
/**
* Represents a tab for the TabbedView.
*/
@ -90,7 +92,7 @@ export default class TabbedView extends React.Component<IProps, IState> {
if (this.props.onChange) this.props.onChange(tab.id);
this.setState({ activeTabIndex: idx });
} else {
console.error("Could not find tab " + tab.label + " in tabs");
logger.error("Could not find tab " + tab.label + " in tabs");
}
}

6
src/components/structures/TimelinePanel.tsx
View file

@ -799,11 +799,11 @@ class TimelinePanel extends React.Component<IProps, IState> {
lastReadEvent,
{},
).catch((e) => {
console.error(e);
logger.error(e);
this.lastRRSentEventId = undefined;
});
} else {
console.error(e);
logger.error(e);
}
// it failed, so allow retries next time the user is active
this.lastRRSentEventId = undefined;
@ -1121,7 +1121,7 @@ class TimelinePanel extends React.Component<IProps, IState> {
if (this.unmounted) return;
this.setState({ timelineLoading: false });
console.error(
logger.error(
`Error loading timeline panel at ${eventId}: ${error}`,
);

4
src/components/structures/auth/ForgotPassword.tsx
View file

@ -33,6 +33,8 @@ import { PASSWORD_MIN_SCORE } from '../../views/auth/RegistrationForm';
import { IValidationResult } from "../../views/elements/Validation";
import InlineSpinner from '../../views/elements/InlineSpinner';
import { logger } from "matrix-js-sdk/src/logger";
enum Phase {
// Show the forgot password inputs
Forgot = 1,
@ -147,7 +149,7 @@ export default class ForgotPassword extends React.Component<IProps, IState> {
private onVerify = async (ev: React.MouseEvent): Promise<void> => {
ev.preventDefault();
if (!this.reset) {
console.error("onVerify called before submitPasswordReset!");
logger.error("onVerify called before submitPasswordReset!");
return;
}
if (this.state.currentHttpRequest) return;

2
src/components/structures/auth/Login.tsx
View file

@ -309,7 +309,7 @@ export default class LoginComponent extends React.PureComponent<IProps, IState>
busy: false,
});
} catch (e) {
console.error("Problem parsing URL or unhandled error doing .well-known discovery:", e);
logger.error("Problem parsing URL or unhandled error doing .well-known discovery:", e);
let message = _t("Failed to perform homeserver discovery");
if (e.translatedMessage) {

6
src/components/structures/auth/Registration.tsx
View file

@ -195,7 +195,7 @@ export default class Registration extends React.Component<IProps, IState> {
const loginFlows = await this.loginLogic.getFlows();
ssoFlow = loginFlows.find(f => f.type === "m.login.sso" || f.type === "m.login.cas") as ISSOFlow;
} catch (e) {
console.error("Failed to get login flows to check for SSO support", e);
logger.error("Failed to get login flows to check for SSO support", e);
}
this.setState({
@ -370,12 +370,12 @@ export default class Registration extends React.Component<IProps, IState> {
matrixClient.setPusher(emailPusher).then(() => {
logger.log("Set email branding to " + this.props.brand);
}, (error) => {
console.error("Couldn't set email branding: " + error);
logger.error("Couldn't set email branding: " + error);
});
}
}
}, (error) => {
console.error("Couldn't get pushers: " + error);
logger.error("Couldn't get pushers: " + error);
});
}

6
src/components/structures/auth/SoftLogout.tsx
View file

@ -173,7 +173,7 @@ export default class SoftLogout extends React.Component<IProps, IState> {
}
Lifecycle.hydrateSession(credentials).catch((e) => {
console.error(e);
logger.error(e);
this.setState({ busy: false, errorText: _t("Failed to re-authenticate") });
});
};
@ -193,7 +193,7 @@ export default class SoftLogout extends React.Component<IProps, IState> {
try {
credentials = await sendLoginRequest(hsUrl, isUrl, loginType, loginParams);
} catch (e) {
console.error(e);
logger.error(e);
this.setState({ busy: false, loginView: LOGIN_VIEW.UNSUPPORTED });
return;
}
@ -201,7 +201,7 @@ export default class SoftLogout extends React.Component<IProps, IState> {
Lifecycle.hydrateSession(credentials).then(() => {
if (this.props.onTokenLoginCompleted) this.props.onTokenLoginCompleted();
}).catch((e) => {
console.error(e);
logger.error(e);
this.setState({ busy: false, loginView: LOGIN_VIEW.UNSUPPORTED });
});
}