From 9b139b632098e6741b10fa87ff6224dcb5045947 Mon Sep 17 00:00:00 2001
From: f0x52 <f0x@cthu.lu>
Date: Wed, 18 Jan 2023 14:45:14 +0100
Subject: [frogend] Settings refactor (#1318)

* yakshave new form field structure

* fully refactor user profile settings form

* use rtk query api for profile settings

* refactor user post settings

* refactor password change form

* refactor admin settings

* FormWithData structure for user forms

* admin actions refactor

* whitespace

* fix user settings data prop

* remove superfluous logging

* cleanup old code

* refactor federation/suspend (overview, detail)

* mostly abstracted (emoji) checkbox list

* refactor parse-from-toot

* refactor custom-emoji, progress on federation bulk

* loading icon styling to prevent big spinny

* refactor federation import-export interface

* cleanup old files

* [chore] Update/add license headers for 2023

* redux fixes

* text-field exports

* appease the linter

* refactor authentication with RTK Query

* fix login/logout state transition weirdness

* fixes/cleanup

* small linter-related fixes

* add eslint license header check, fix existing files

* remove old code, clarify comment

* clarify suspend on subdomains

* collapse if/else

* fa-fw width info comment
---
 web/source/settings/components/error.jsx | 45 +++++++++++++++++++++++++++++---
 1 file changed, 42 insertions(+), 3 deletions(-)

(limited to 'web/source/settings/components/error.jsx')

diff --git a/web/source/settings/components/error.jsx b/web/source/settings/components/error.jsx
index 5d808c467..bc64bf9ec 100644
--- a/web/source/settings/components/error.jsx
+++ b/web/source/settings/components/error.jsx
@@ -20,7 +20,7 @@
 
 const React = require("react");
 
-module.exports = function ErrorFallback({error, resetErrorBoundary}) {
+function ErrorFallback({ error, resetErrorBoundary }) {
 	return (
 		<div className="error">
 			<p>
@@ -28,7 +28,7 @@ module.exports = function ErrorFallback({error, resetErrorBoundary}) {
 				<a href="https://github.com/superseriousbusiness/gotosocial/issues">GoToSocial issue tracker</a>
 				{" or "}
 				<a href="https://matrix.to/#/#gotosocial-help:superseriousbusiness.org">Matrix support room</a>.
-				<br/>Include the details below:
+				<br />Include the details below:
 			</p>
 			<pre>
 				{error.name}: {error.message}
@@ -41,4 +41,43 @@ module.exports = function ErrorFallback({error, resetErrorBoundary}) {
 			</p>
 		</div>
 	);
-};
\ No newline at end of file
+}
+
+function Error({ error }) {
+	/* eslint-disable-next-line no-console */
+	console.error("Rendering error:", error);
+	let message;
+
+	if (error.data != undefined) { // RTK Query error with data
+		if (error.status) {
+			message = (<>
+				<b>{error.status}:</b> {error.data.error}
+				{error.data.error_description &&
+					<p>
+						{error.data.error_description}
+					</p>
+				}
+			</>);
+		} else {
+			message = error.data.error;
+		}
+	} else if (error.name != undefined || error.type != undefined) { // JS error
+		message = (<>
+			<b>{error.type && error.name}:</b> {error.message}
+		</>);
+	} else if (error.status && typeof error.error == "string") {
+		message = (<>
+			<b>{error.status}:</b> {error.error}
+		</>);
+	} else {
+		message = error.message ?? error;
+	}
+
+	return (
+		<div className="error">
+			{message}
+		</div>
+	);
+}
+
+module.exports = { ErrorFallback, Error };
\ No newline at end of file
-- 
cgit v1.2.3

