fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-05-05 13:39:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: optimize 502 error message (#6547)

Browse Source 
* fix: app error

* fix: app warning
This commit is contained in:
chenos 2025-03-26 09:39:57 +08:00 committed by GitHub
parent 1dd47e7571
commit f43ed88eba
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/core/client/src/api-client/APIClient.ts
View File

@ -139,7 +139,16 @@ export class APIClient extends APIClientSDK {
if (typeof error?.response?.data === 'string') {
const tempElement = document.createElement('div');
tempElement.innerHTML = error?.response?.data;
return [{ message: tempElement.textContent || tempElement.innerText }];
let message = tempElement.textContent || tempElement.innerText;
if (message.includes('Error occurred while trying')) {
message = 'The application may be starting up. Please try again later.';
return [{ code: 'APP_WARNING', message }];
}
if (message.includes('502 Bad Gateway')) {
message = 'The application may be starting up. Please try again later.';
return [{ code: 'APP_WARNING', message }];
}
return [{ message }];
}
return (
error?.response?.data?.errors ||

16
packages/core/client/src/application/Application.tsx
View File

@ -350,23 +350,9 @@ export class Application {
setTimeout(() => resolve(null), 1000);
});
}
const toError = (error) => {
if (typeof error?.response?.data === 'string') {
const tempElement = document.createElement('div');
tempElement.innerHTML = error?.response?.data;
return { message: tempElement.textContent || tempElement.innerText };
}
if (error?.response?.data?.error) {
return error?.response?.data?.error;
}
if (error?.response?.data?.errors?.[0]) {
return error?.response?.data?.errors?.[0];
}
return { message: error?.message };
};
this.error = {
code: 'LOAD_ERROR',
...toError(error),
...this.apiClient.toErrMessages(error)?.[0],
};
console.error(error, this.error);
}

11
packages/core/client/src/nocobase-buildin-plugin/index.tsx
View File

@ -76,7 +76,7 @@ const useErrorProps = (app: Application, error: any) => {
const AppError: FC<{ error: Error; app: Application }> = observer(
({ app, error }) => {
const props = useErrorProps(app, error);
const props = getProps(app);
return (
<div>
<Result
@ -89,6 +89,7 @@ const AppError: FC<{ error: Error; app: Application }> = observer(
status="error"
title={app.i18n.t('App error')}
subTitle={app.i18n.t(error?.message)}
{...props}
extra={[
<Button type="primary" key="try" onClick={() => window.location.reload()}>
{app.i18n.t('Try again')}
@ -124,6 +125,14 @@ const getProps = (app: Application) => {
};
}
if (app.error.code === 'APP_WARNING') {
return {
status: 'warning',
title: 'App warning',
subTitle: app.error?.message,
};
}
if (app.error.code === 'APP_INITIALIZING') {
return {
status: 'info',