tbelway/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2025-07-07 10:17:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(web): handle non-http client side page error (#8901)

Browse Source 
handle non-http client side page error
This commit is contained in:
Nguyễn Hoàng Đức 2024-04-24 19:32:00 +07:00 committed by GitHub
parent 99ccf28bc6
commit aac789f788
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
web/src/hooks.client.ts
View File

@ -1,10 +1,9 @@
import { isHttpError } from '@immich/sdk'; import { isHttpError, type ApiHttpError } from '@immich/sdk';
import type { HandleClientError } from '@sveltejs/kit'; import type { HandleClientError } from '@sveltejs/kit';
const DEFAULT_MESSAGE = 'Hmm, not sure about that. Check the logs or open a ticket?'; const DEFAULT_MESSAGE = 'Hmm, not sure about that. Check the logs or open a ticket?';
const parseError = (error: unknown) => { const parseHTTPError = (httpError: ApiHttpError) => {
const httpError = isHttpError(error) ? error : undefined;
const statusCode = httpError?.status || httpError?.data?.statusCode || 500; const statusCode = httpError?.status || httpError?.data?.statusCode || 500;
const message = httpError?.data?.message || (httpError?.data && String(httpError.data)) || httpError?.message; const message = httpError?.data?.message || (httpError?.data && String(httpError.data)) || httpError?.message;
@ -20,8 +19,19 @@ const parseError = (error: unknown) => {
}; };
}; };
export const handleError: HandleClientError = ({ error }) => { const parseError = (error: unknown, status: number, message: string) => {
const result = parseError(error); if (isHttpError(error)) {
return parseHTTPError(error);
}
return {
message: message || DEFAULT_MESSAGE,
code: status,
};
};
export const handleError: HandleClientError = ({ error, status, message }) => {
const result = parseError(error, status, message);
console.error(`[hooks.client.ts]:handleError ${result.message}`); console.error(`[hooks.client.ts]:handleError ${result.message}`);
return result; return result;
}; };