djkato/saleor-dashboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix types and error messages

Browse source
This commit is contained in:
dominik-zeglen 2019-09-04 12:28:04 +02:00
parent 427d231b35
commit e660612b7e
2 changed files with 9 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/mutations.tsx
View file

@ -5,6 +5,7 @@ import { Mutation, MutationFunction, MutationResult } from "react-apollo";
import { useIntl } from "react-intl"; import { useIntl } from "react-intl";
import useNotifier from "./hooks/useNotifier"; import useNotifier from "./hooks/useNotifier";
import { commonMessages } from "./intl";
export interface TypedMutationInnerProps<TData, TVariables> { export interface TypedMutationInnerProps<TData, TVariables> {
children: ( children: (
@ -30,17 +31,10 @@ export function TypedMutation<TData, TVariables>(
<Mutation <Mutation
mutation={mutation} mutation={mutation}
onCompleted={onCompleted} onCompleted={onCompleted}
onError={err => { onError={(err: ApolloError) => {
const msg = intl.formatMessage( notify({
{ text: intl.formatMessage(commonMessages.somethingWentWrong)
defaultMessage: "Something went wrong. {errorMessage}", });
description: "error message"
},
{
errorMessage: err.message
}
);
notify({ text: msg });
if (onError) { if (onError) {
onError(err); onError(err);
} }

14
src/queries.tsx
View file

@ -9,6 +9,7 @@ import AppProgress from "./components/AppProgress";
import ErrorPage from "./components/ErrorPage/ErrorPage"; import ErrorPage from "./components/ErrorPage/ErrorPage";
import useNavigator from "./hooks/useNavigator"; import useNavigator from "./hooks/useNavigator";
import useNotifier from "./hooks/useNotifier"; import useNotifier from "./hooks/useNotifier";
import { commonMessages } from "./intl";
import { RequireAtLeastOne } from "./misc"; import { RequireAtLeastOne } from "./misc";
export interface LoadMore<TData, TVariables> { export interface LoadMore<TData, TVariables> {
@ -83,16 +84,9 @@ export function TypedQuery<TData, TVariables>(
> >
{queryData => { {queryData => {
if (queryData.error) { if (queryData.error) {
const msg = intl.formatMessage( pushMessage({
{ text: intl.formatMessage(commonMessages.somethingWentWrong)
defaultMessage: "Something went wrong. {errorMessage}", });
description: "error message"
},
{
message: queryData.error.message
}
);
pushMessage({ text: msg });
} }
const loadMore = ( const loadMore = (