Browse Source

feat: add retry button for chunk errors, simplify DOM, rename pwa→network

- Add Retry button for chunk load errors that remounts children via
  key increment, forcing React.lazy to re-execute import() without
  a full page reload
- Remove wrapper divs: Card padding applied directly via style,
  Alert positioned directly without outer container
- Rename pwa.ts → network.ts across all 8 locales (keys no longer
  PWA-specific) and update imports in locale index files
- Add app.error.retry locale key to all 8 locales

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
pull/11756/head
afc163 5 months ago
parent
commit
07a5638d8d
  1. 110
      src/components/ErrorBoundary/index.tsx
  2. 37
      src/components/OfflineBanner/index.tsx
  3. 4
      src/locales/bn-BD.ts
  4. 1
      src/locales/bn-BD/network.ts
  5. 4
      src/locales/en-US.ts
  6. 1
      src/locales/en-US/network.ts
  7. 4
      src/locales/fa-IR.ts
  8. 1
      src/locales/fa-IR/network.ts
  9. 4
      src/locales/id-ID.ts
  10. 1
      src/locales/id-ID/network.ts
  11. 4
      src/locales/ja-JP.ts
  12. 1
      src/locales/ja-JP/network.ts
  13. 4
      src/locales/pt-BR.ts
  14. 1
      src/locales/pt-BR/network.ts
  15. 4
      src/locales/zh-CN.ts
  16. 1
      src/locales/zh-CN/network.ts
  17. 4
      src/locales/zh-TW.ts
  18. 1
      src/locales/zh-TW/network.ts

110
src/components/ErrorBoundary/index.tsx

@ -20,6 +20,7 @@ function getSubTitleId(isChunkError: boolean, isOffline: boolean): string {
function renderErrorFallback(
error: Error,
isOnline: boolean,
onRetry: () => void,
onReload: () => void,
) {
const intl = getIntl();
@ -27,65 +28,71 @@ function renderErrorFallback(
const isChunkError = isChunkLoadError(error);
return (
<div style={{ padding: 24 }}>
<Card variant="borderless">
<Result
status="error"
title={intl.formatMessage({
id: isChunkError
? 'app.error.chunk.title'
: 'app.error.render.title',
defaultMessage: isChunkError
? 'Failed to load page'
: 'Something went wrong',
})}
subTitle={intl.formatMessage({
id: getSubTitleId(isChunkError, isOffline),
defaultMessage:
isChunkError && isOffline
? 'Your network connection has been lost. Please check your connection and reload.'
: isChunkError
? 'Page resources failed to load. Please reload and try again.'
: 'Sorry, an error occurred on this page. Please reload or go back to the home page.',
})}
extra={[
<Button type="primary" key="reload" onClick={onReload}>
<Card variant="borderless" style={{ margin: 24 }}>
<Result
status="error"
title={intl.formatMessage({
id: isChunkError ? 'app.error.chunk.title' : 'app.error.render.title',
defaultMessage: isChunkError
? 'Failed to load page'
: 'Something went wrong',
})}
subTitle={intl.formatMessage({
id: getSubTitleId(isChunkError, isOffline),
defaultMessage:
isChunkError && isOffline
? 'Your network connection has been lost. Please check your connection and reload.'
: isChunkError
? 'Page resources failed to load. Please reload and try again.'
: 'Sorry, an error occurred on this page. Please reload or go back to the home page.',
})}
extra={[
isChunkError && (
<Button type="primary" key="retry" onClick={onRetry}>
{intl.formatMessage({
id: 'app.error.reload',
defaultMessage: 'Reload Page',
id: 'app.error.retry',
defaultMessage: 'Retry',
})}
</Button>,
<Button href="/" key="home">
{intl.formatMessage({
id: 'app.error.home',
defaultMessage: 'Back Home',
})}
</Button>,
]}
/>
</Card>
</div>
</Button>
),
<Button
type={isChunkError ? 'default' : 'primary'}
key="reload"
onClick={onReload}
>
{intl.formatMessage({
id: 'app.error.reload',
defaultMessage: 'Reload Page',
})}
</Button>,
<Button href="/" key="home">
{intl.formatMessage({
id: 'app.error.home',
defaultMessage: 'Back Home',
})}
</Button>,
].filter(Boolean)}
/>
</Card>
);
}
interface ErrorBoundaryProps {
children: React.ReactNode;
}
interface ErrorBoundaryState {
hasError: boolean;
error: Error | null;
isOnline: boolean;
retryCount: number;
}
export default class ErrorBoundary extends React.Component<
ErrorBoundaryProps,
{ children: React.ReactNode },
ErrorBoundaryState
> {
state: ErrorBoundaryState = {
hasError: false,
error: null,
isOnline: typeof navigator !== 'undefined' ? navigator.onLine : true,
retryCount: 0,
};
static getDerivedStateFromError(error: Error): Partial<ErrorBoundaryState> {
@ -121,15 +128,34 @@ export default class ErrorBoundary extends React.Component<
console.error('[ErrorBoundary]', error, info.componentStack);
}
/** Retry loading the failed module without a full page reload. */
handleRetry = () => {
// Incrementing retryCount changes the key on the children fragment,
// forcing React to unmount and remount all lazy components.
// This causes React.lazy to re-execute import() for the failed chunk.
this.setState((prev) => ({
hasError: false,
error: null,
retryCount: prev.retryCount + 1,
}));
};
handleReload = () => {
window.location.reload();
};
render() {
if (!this.state.hasError || !this.state.error) return this.props.children;
if (!this.state.hasError || !this.state.error) {
return (
<React.Fragment key={this.state.retryCount}>
{this.props.children}
</React.Fragment>
);
}
return renderErrorFallback(
this.state.error,
this.state.isOnline,
this.handleRetry,
this.handleReload,
);
}

37
src/components/OfflineBanner/index.tsx

@ -21,33 +21,24 @@ const OfflineBanner: React.FC = () => {
if (isOnline) return null;
return (
<div
<Alert
type="warning"
showIcon
closable={false}
style={{
position: 'fixed',
top: 0,
insetInline: 0,
top: 8,
left: '50%',
transform: 'translateX(-50%)',
zIndex: 999,
display: 'flex',
justifyContent: 'center',
pointerEvents: 'none',
maxWidth: 480,
}}
>
<Alert
type="warning"
showIcon
closable={false}
style={{
margin: 8,
pointerEvents: 'auto',
maxWidth: 480,
}}
message={getIntl().formatMessage({
id: 'app.network.offline',
defaultMessage:
'You are currently offline. Some features may be unavailable.',
})}
/>
</div>
message={getIntl().formatMessage({
id: 'app.network.offline',
defaultMessage:
'You are currently offline. Some features may be unavailable.',
})}
/>
);
};

4
src/locales/bn-BD.ts

@ -1,8 +1,8 @@
import component from './bn-BD/component';
import globalHeader from './bn-BD/globalHeader';
import menu from './bn-BD/menu';
import network from './bn-BD/network';
import pages from './bn-BD/pages';
import pwa from './bn-BD/pwa';
import settingDrawer from './bn-BD/settingDrawer';
import settings from './bn-BD/settings';
@ -16,7 +16,7 @@ export default {
...menu,
...settingDrawer,
...settings,
...pwa,
...network,
...component,
...pages,
};

1
src/locales/bn-BD/pwa.ts → src/locales/bn-BD/network.ts

@ -8,6 +8,7 @@ export default {
'app.error.render.title': 'কিছু ভুল হয়েছে',
'app.error.render.description':
'দুঃখিত, এই পৃষ্ঠায় একটি ত্রুটি ঘটেছে। দয়া করে রিফ্রেশ করুন বা হোম পৃষ্ঠায় ফিরে যান।',
'app.error.retry': 'আবার চেষ্টা করুন',
'app.error.reload': 'পৃষ্ঠা রিফ্রেশ করুন',
'app.error.home': 'হোমে ফিরে যান',
'app.request.offline':

4
src/locales/en-US.ts

@ -1,8 +1,8 @@
import component from './en-US/component';
import globalHeader from './en-US/globalHeader';
import menu from './en-US/menu';
import network from './en-US/network';
import pages from './en-US/pages';
import pwa from './en-US/pwa';
import settingDrawer from './en-US/settingDrawer';
import settings from './en-US/settings';
@ -16,7 +16,7 @@ export default {
...menu,
...settingDrawer,
...settings,
...pwa,
...network,
...component,
...pages,
};

1
src/locales/en-US/pwa.ts → src/locales/en-US/network.ts

@ -9,6 +9,7 @@ export default {
'app.error.render.title': 'Something went wrong',
'app.error.render.description':
'Sorry, an error occurred on this page. Please reload or go back to the home page.',
'app.error.retry': 'Retry',
'app.error.reload': 'Reload Page',
'app.error.home': 'Back Home',
'app.request.offline':

4
src/locales/fa-IR.ts

@ -1,8 +1,8 @@
import component from './fa-IR/component';
import globalHeader from './fa-IR/globalHeader';
import menu from './fa-IR/menu';
import network from './fa-IR/network';
import pages from './fa-IR/pages';
import pwa from './fa-IR/pwa';
import settingDrawer from './fa-IR/settingDrawer';
import settings from './fa-IR/settings';
@ -16,7 +16,7 @@ export default {
...menu,
...settingDrawer,
...settings,
...pwa,
...network,
...component,
...pages,
};

1
src/locales/fa-IR/pwa.ts → src/locales/fa-IR/network.ts

@ -9,6 +9,7 @@ export default {
'app.error.render.title': 'خطایی رخ داد',
'app.error.render.description':
'متأسفانه، در این صفحه خطایی رخ داد. لطفاً صفحه را بارگذاری مجدد کنید یا به صفحه اصلی بازگردید.',
'app.error.retry': 'تلاش مجدد',
'app.error.reload': 'بارگذاری مجدد صفحه',
'app.error.home': 'بازگشت به صفحه اصلی',
'app.request.offline':

4
src/locales/id-ID.ts

@ -1,8 +1,8 @@
import component from './id-ID/component';
import globalHeader from './id-ID/globalHeader';
import menu from './id-ID/menu';
import network from './id-ID/network';
import pages from './id-ID/pages';
import pwa from './id-ID/pwa';
import settingDrawer from './id-ID/settingDrawer';
import settings from './id-ID/settings';
@ -16,7 +16,7 @@ export default {
...menu,
...settingDrawer,
...settings,
...pwa,
...network,
...component,
...pages,
};

1
src/locales/id-ID/pwa.ts → src/locales/id-ID/network.ts

@ -9,6 +9,7 @@ export default {
'app.error.render.title': 'Terjadi kesalahan',
'app.error.render.description':
'Maaf, terjadi kesalahan pada halaman ini. Muat ulang halaman atau kembali ke beranda.',
'app.error.retry': 'Coba Lagi',
'app.error.reload': 'Muat Ulang Halaman',
'app.error.home': 'Kembali ke Beranda',
'app.request.offline':

4
src/locales/ja-JP.ts

@ -1,8 +1,8 @@
import component from './ja-JP/component';
import globalHeader from './ja-JP/globalHeader';
import menu from './ja-JP/menu';
import network from './ja-JP/network';
import pages from './ja-JP/pages';
import pwa from './ja-JP/pwa';
import settingDrawer from './ja-JP/settingDrawer';
import settings from './ja-JP/settings';
@ -17,7 +17,7 @@ export default {
...menu,
...settingDrawer,
...settings,
...pwa,
...network,
...component,
...pages,
};

1
src/locales/ja-JP/pwa.ts → src/locales/ja-JP/network.ts

@ -9,6 +9,7 @@ export default {
'app.error.render.title': 'エラーが発生しました',
'app.error.render.description':
'申し訳ありません、ページでエラーが発生しました。ページを再読み込みするか、ホームに戻ってください。',
'app.error.retry': '再試行',
'app.error.reload': 'ページを再読み込み',
'app.error.home': 'ホームに戻る',
'app.request.offline':

4
src/locales/pt-BR.ts

@ -1,8 +1,8 @@
import component from './pt-BR/component';
import globalHeader from './pt-BR/globalHeader';
import menu from './pt-BR/menu';
import network from './pt-BR/network';
import pages from './pt-BR/pages';
import pwa from './pt-BR/pwa';
import settingDrawer from './pt-BR/settingDrawer';
import settings from './pt-BR/settings';
@ -16,7 +16,7 @@ export default {
...menu,
...settingDrawer,
...settings,
...pwa,
...network,
...component,
...pages,
};

1
src/locales/pt-BR/pwa.ts → src/locales/pt-BR/network.ts

@ -9,6 +9,7 @@ export default {
'app.error.render.title': 'Algo deu errado',
'app.error.render.description':
'Desculpe, ocorreu um erro nesta página. Atualize a página ou volte para a página inicial.',
'app.error.retry': 'Tentar novamente',
'app.error.reload': 'Atualizar página',
'app.error.home': 'Voltar ao Início',
'app.request.offline':

4
src/locales/zh-CN.ts

@ -1,8 +1,8 @@
import component from './zh-CN/component';
import globalHeader from './zh-CN/globalHeader';
import menu from './zh-CN/menu';
import network from './zh-CN/network';
import pages from './zh-CN/pages';
import pwa from './zh-CN/pwa';
import settingDrawer from './zh-CN/settingDrawer';
import settings from './zh-CN/settings';
@ -17,6 +17,6 @@ export default {
...menu,
...settingDrawer,
...settings,
...pwa,
...network,
...component,
};

1
src/locales/zh-CN/pwa.ts → src/locales/zh-CN/network.ts

@ -7,6 +7,7 @@ export default {
'app.error.render.title': '页面出现错误',
'app.error.render.description':
'抱歉,页面遇到了一些问题,请刷新页面或返回首页。',
'app.error.retry': '重试',
'app.error.reload': '刷新页面',
'app.error.home': '返回首页',
'app.request.offline': '网络不可用,请检查网络连接后重试。',

4
src/locales/zh-TW.ts

@ -1,8 +1,8 @@
import component from './zh-TW/component';
import globalHeader from './zh-TW/globalHeader';
import menu from './zh-TW/menu';
import network from './zh-TW/network';
import pages from './zh-TW/pages';
import pwa from './zh-TW/pwa';
import settingDrawer from './zh-TW/settingDrawer';
import settings from './zh-TW/settings';
@ -17,6 +17,6 @@ export default {
...menu,
...settingDrawer,
...settings,
...pwa,
...network,
...component,
};

1
src/locales/zh-TW/pwa.ts → src/locales/zh-TW/network.ts

@ -8,6 +8,7 @@ export default {
'app.error.render.title': '頁面出現錯誤',
'app.error.render.description':
'抱歉,頁面遇到了一些問題,請重新整理頁面或返回首頁。',
'app.error.retry': '重試',
'app.error.reload': '重新整理頁面',
'app.error.home': '返回首頁',
'app.request.offline': '網路不可用,請檢查網路連線後重試。',
Loading…
Cancel
Save