watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-05 21:27:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Consistent error responses. Updated login page.

Browse source
This commit is contained in:
Mike Cao 2025-02-20 09:57:59 -08:00
parent 88f2ac20bc
commit 4c24e54fdd
17 changed files with 170 additions and 159 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/components/hooks/useApi.ts
View file

@ -9,7 +9,8 @@ const selector = (state: { shareToken: { token?: string } }) => state.shareToken
async function handleResponse(res: FetchResponse): Promise<any> {
if (!res.ok) {
return Promise.reject(new Error(res.error?.error || res.error || 'Unexpectd error.'));
const { message, code } = res?.error?.error || {};
return Promise.reject(new Error(code || message || 'Unexpectd error.'));
}
return Promise.resolve(res.data);
}

2
src/components/hooks/useMessages.ts
View file

@ -5,7 +5,7 @@ export function useMessages(): any {
const intl = useIntl();
const getMessage = (id: string) => {
const message = Object.values(messages).find(value => value.id === id);
const message = Object.values(messages).find(value => value.id === `message.${id}`);
return message ? formatMessage(message) : id;
};