c1e7905ddc
* Properly translate errors in AddThreepid.ts Part of https://github.com/vector-im/element-web/issues/9597 * Use translated message * Avoid returning undefined ever * More usage * Introduce UserFriendlyError * Use UserFriendlyError * Add more usage instead of normal error * Use types and translatedMessage * Fix lints * Update i18n although it's wrong * Use unknown for easier creation from try/catch * Use types * Use error types * Use types * Update i18n strings * Remove generic re-label of HTTPError See https://github.com/matrix-org/matrix-react-sdk/pull/10432#discussion_r1156468143 The HTTPError already has a good label and it isn't even translated if we re-label it here in this way generically Probably best to just remove in favor of thinking about a translations in general from the `matrix-js-sdk`, see https://github.com/matrix-org/matrix-js-sdk/issues/1309 * Make error message extraction generic * Update i18n strings * Add tests for email addresses * More consistent error logging to actually see error in logs * Consistent error handling * Any is okay because we have a fallback * Check error type * Use dedicated mockResolvedValue function See https://github.com/matrix-org/matrix-react-sdk/pull/10432#discussion_r1163344034
92 lines
3 KiB
TypeScript
92 lines
3 KiB
TypeScript
/*
|
|
Copyright 2015, 2016 OpenMarket Ltd
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
/*
|
|
* Usage:
|
|
* Modal.createDialog(ErrorDialog, {
|
|
* title: "some text", (default: "Error")
|
|
* description: "some more text",
|
|
* button: "Button Text",
|
|
* onFinished: someFunction,
|
|
* focus: true|false (default: true)
|
|
* });
|
|
*/
|
|
|
|
import React from "react";
|
|
|
|
import { _t, UserFriendlyError } from "../../../languageHandler";
|
|
import BaseDialog from "./BaseDialog";
|
|
|
|
/**
|
|
* Get a user friendly error message string from a given error. Useful for the
|
|
* `description` prop of the `ErrorDialog`
|
|
* @param err Error object in question to extract a useful message from. To make it easy
|
|
* to use with try/catch, this is typed as `any` because try/catch will type
|
|
* the error as `unknown`. And in any case we can use the fallback message.
|
|
* @param translatedFallbackMessage The fallback message to be used if the error doesn't have any message
|
|
* @returns a user friendly error message string from a given error
|
|
*/
|
|
export function extractErrorMessageFromError(err: any, translatedFallbackMessage: string): string {
|
|
return (
|
|
(err instanceof UserFriendlyError && err.translatedMessage) ||
|
|
(err instanceof Error && err.message) ||
|
|
translatedFallbackMessage
|
|
);
|
|
}
|
|
|
|
interface IProps {
|
|
onFinished: (success?: boolean) => void;
|
|
title?: string;
|
|
description?: React.ReactNode;
|
|
button?: string;
|
|
focus?: boolean;
|
|
headerImage?: string;
|
|
}
|
|
|
|
interface IState {
|
|
onFinished: (success: boolean) => void;
|
|
}
|
|
|
|
export default class ErrorDialog extends React.Component<IProps, IState> {
|
|
public static defaultProps: Partial<IProps> = {
|
|
focus: true,
|
|
};
|
|
|
|
private onClick = (): void => {
|
|
this.props.onFinished(true);
|
|
};
|
|
|
|
public render(): React.ReactNode {
|
|
return (
|
|
<BaseDialog
|
|
className="mx_ErrorDialog"
|
|
onFinished={this.props.onFinished}
|
|
title={this.props.title || _t("Error")}
|
|
headerImage={this.props.headerImage}
|
|
contentId="mx_Dialog_content"
|
|
>
|
|
<div className="mx_Dialog_content" id="mx_Dialog_content">
|
|
{this.props.description || _t("An error has occurred.")}
|
|
</div>
|
|
<div className="mx_Dialog_buttons">
|
|
<button className="mx_Dialog_primary" onClick={this.onClick} autoFocus={this.props.focus}>
|
|
{this.props.button || _t("OK")}
|
|
</button>
|
|
</div>
|
|
</BaseDialog>
|
|
);
|
|
}
|
|
}
|