Remove ErrorBoundary onError callbacks and recovery buttons

WordPress · Jan 30, 2023 · 1638d6a · 1638d6a
1 parent aa9cd41
commit 1638d6a
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 93 deletions.
diff --git a/packages/edit-post/src/editor.js b/packages/edit-post/src/editor.js
@@ -25,14 +25,7 @@ import { unlock } from './experiments';
 
 const { ExperimentalEditorProvider } = unlock( editorExperiments );
 
-function Editor( {
-	postId,
-	postType,
-	settings,
-	initialEdits,
-	onError,
-	...props
-} ) {
+function Editor( { postId, postType, settings, initialEdits, ...props } ) {
 	const {
 		hasFixedToolbar,
 		focusMode,
@@ -190,7 +183,7 @@ function Editor( {
 					__unstableTemplate={ isTemplateMode ? template : undefined }
 					{ ...props }
 				>
-					<ErrorBoundary onError={ onError }>
+					<ErrorBoundary>
 						<EditorInitialization postId={ postId } />
 						<Layout styles={ styles } />
 					</ErrorBoundary>

diff --git a/packages/edit-site/src/components/app/index.js b/packages/edit-site/src/components/app/index.js
@@ -15,7 +15,7 @@ import { PluginArea } from '@wordpress/plugins';
 import { Routes } from '../routes';
 import Layout from '../layout';
 
-export default function App( { onError } ) {
+export default function App() {
 	const { createErrorNotice } = useDispatch( noticesStore );
 
 	function onPluginAreaError( name ) {
@@ -37,7 +37,7 @@ export default function App( { onError } ) {
 				<UnsavedChangesWarning />
 
 				<Routes>
-					<Layout onError={ onError } />
+					<Layout />
 					<PluginArea onError={ onPluginAreaError } />
 				</Routes>
 			</SlotFillProvider>

diff --git a/packages/edit-site/src/components/error-boundary/index.js b/packages/edit-site/src/components/error-boundary/index.js
@@ -38,7 +38,6 @@ export default class ErrorBoundary extends Component {
 					'The editor has encountered an unexpected error.'
 				) }
 				error={ this.state.error }
-				reboot={ this.props.onError }
 			/>
 		);
 	}

diff --git a/packages/edit-site/src/components/error-boundary/warning.js b/packages/edit-site/src/components/error-boundary/warning.js
@@ -15,41 +15,12 @@ function CopyButton( { text, children } ) {
 	);
 }
 
-export default function ErrorBoundaryWarning( {
-	message,
-	error,
-	reboot,
-	dashboardLink,
-} ) {
-	const actions = [];
-
-	if ( reboot ) {
-		actions.push(
-			<Button key="recovery" onClick={ reboot } variant="secondary">
-				{ __( 'Attempt Recovery' ) }
-			</Button>
-		);
-	}
-
-	if ( error ) {
-		actions.push(
-			<CopyButton key="copy-error" text={ error.stack }>
-				{ __( 'Copy Error' ) }
-			</CopyButton>
-		);
-	}
-
-	if ( dashboardLink ) {
-		actions.push(
-			<Button
-				key="back-to-dashboard"
-				variant="secondary"
-				href={ dashboardLink }
-			>
-				{ __( 'Back to dashboard' ) }
-			</Button>
-		);
-	}
+export default function ErrorBoundaryWarning( { message, error } ) {
+	const actions = [
+		<CopyButton key="copy-error" text={ error.stack }>
+			{ __( 'Copy Error' ) }
+		</CopyButton>,
+	];
 
 	return (
 		<Warning className="editor-error-boundary" actions={ actions }>

diff --git a/packages/edit-site/src/components/layout/index.js b/packages/edit-site/src/components/layout/index.js
@@ -52,7 +52,7 @@ const emptyResizeHandleStyles = {
 	left: undefined,
 };
 
-export default function Layout( { onError } ) {
+export default function Layout() {
 	// This ensures the edited entity id and type are initialized properly.
 	useInitEditedEntityFromURL();
 	useSyncCanvasModeWithURL();
@@ -314,7 +314,7 @@ export default function Layout( { onError } ) {
 											ease: 'easeOut',
 										} }
 									>
-										<ErrorBoundary onError={ onError }>
+										<ErrorBoundary>
 											{ isEditorPage && <Editor /> }
 											{ isListPage && <ListPage /> }
 										</ErrorBoundary>

diff --git a/packages/edit-widgets/src/components/error-boundary/index.js b/packages/edit-widgets/src/components/error-boundary/index.js
@@ -17,24 +17,12 @@ function CopyButton( { text, children } ) {
 	);
 }
 
-function ErrorBoundaryWarning( { message, error, reboot } ) {
-	const actions = [];
-
-	if ( reboot ) {
-		actions.push(
-			<Button key="recovery" onClick={ reboot } variant="secondary">
-				{ __( 'Attempt Recovery' ) }
-			</Button>
-		);
-	}
-
-	if ( error ) {
-		actions.push(
-			<CopyButton key="copy-error" text={ error.stack }>
-				{ __( 'Copy Error' ) }
-			</CopyButton>
-		);
-	}
+function ErrorBoundaryWarning( { message, error } ) {
+	const actions = [
+		<CopyButton key="copy-error" text={ error.stack }>
+			{ __( 'Copy Error' ) }
+		</CopyButton>,
+	];
 
 	return (
 		<Warning className="edit-widgets-error-boundary" actions={ actions }>
@@ -71,7 +59,6 @@ export default class ErrorBoundary extends Component {
 					'The editor has encountered an unexpected error.'
 				) }
 				error={ this.state.error }
-				reboot={ this.props.onError }
 			/>
 		);
 	}

diff --git a/packages/edit-widgets/src/components/layout/index.js b/packages/edit-widgets/src/components/layout/index.js
@@ -17,7 +17,7 @@ import Interface from './interface';
 import UnsavedChangesWarning from './unsaved-changes-warning';
 import WelcomeGuide from '../welcome-guide';
 
-function Layout( { blockEditorSettings, onError } ) {
+function Layout( { blockEditorSettings } ) {
 	const { createErrorNotice } = useDispatch( noticesStore );
 
 	function onPluginAreaError( name ) {
@@ -33,7 +33,7 @@ function Layout( { blockEditorSettings, onError } ) {
 	}
 
 	return (
-		<ErrorBoundary onError={ onError }>
+		<ErrorBoundary>
 			<WidgetAreasBlockEditorProvider
 				blockEditorSettings={ blockEditorSettings }
 			>

diff --git a/packages/editor/src/components/error-boundary/index.js b/packages/editor/src/components/error-boundary/index.js
@@ -39,8 +39,6 @@ class ErrorBoundary extends Component {
 	constructor() {
 		super( ...arguments );
 
-		this.getContent = this.getContent.bind( this );
-
 		this.state = {
 			error: null,
 		};
@@ -60,31 +58,14 @@ class ErrorBoundary extends Component {
 			return this.props.children;
 		}
 
-		const actions = [];
-
-		if ( this.props.onError ) {
-			actions.push(
-				<Button
-					key="recovery"
-					onClick={ this.props.onError }
-					variant="secondary"
-				>
-					{ __( 'Attempt Recovery' ) }
-				</Button>
-			);
-		}
-
-		actions.push(
+		const actions = [
 			<CopyButton key="copy-post" text={ getContent }>
 				{ __( 'Copy Post Text' ) }
-			</CopyButton>
-		);
-
-		actions.push(
+			</CopyButton>,
 			<CopyButton key="copy-error" text={ error.stack }>
 				{ __( 'Copy Error' ) }
-			</CopyButton>
-		);
+			</CopyButton>,
+		];
 
 		return (
 			<Warning className="editor-error-boundary" actions={ actions }>