manage retrieveError in each component

src/client/js/components/Admin/App/AppSettingsPage.jsx

@@ -25,6 +25,7 @@ function AppSettingsPageWithContainerWithSuspense(props) {
   );
 }
 
+let retrieveError = null;
 function AppSettingsPage(props) {
   if (props.adminAppContainer.state.title === props.adminAppContainer.dummyTitle) {
     throw (async() => {
@@ -36,14 +37,14 @@ function AppSettingsPage(props) {
         logger.error(err);
         props.adminAppContainer.setState({
           title: props.adminAppContainer.dummyTitleForError,
-          retrieveError: err[0].message,
         });
+        retrieveError = err;
       }
     })();
   }
 
   if (props.adminAppContainer.state.title === props.adminAppContainer.dummyTitleForError) {
-    throw new Error(props.adminAppContainer.state.retrieveError);
+    throw new Error(retrieveError[0].message);
   }
 
   return <AppSettingsPageContents />;

src/client/js/components/Admin/Customize/Customize.jsx

@@ -32,6 +32,7 @@ function CustomizePageWithContainerWithSusupense(props) {
   );
 }
 
+let retrieveError = null;
 function Customize(props) {
   const { adminCustomizeContainer } = props;
 
@@ -42,14 +43,15 @@ function Customize(props) {
       }
       catch (err) {
         toastError(err);
-        adminCustomizeContainer.setState({ currentTheme: adminCustomizeContainer.dummyCurrentThemeForError, retrieveError: err[0].message });
+        adminCustomizeContainer.setState({ currentTheme: adminCustomizeContainer.dummyCurrentThemeForError });
+        retrieveError = err;
         logger.error(err);
       }
     })();
   }
 
   if (adminCustomizeContainer.state.currentTheme === adminCustomizeContainer.dummyCurrentThemeForError) {
-    throw new Error(adminCustomizeContainer.state.retrieveError);
+    throw new Error(retrieveError[0].message);
   }
 
   return (

src/client/js/components/Admin/ImportDataPage.jsx

@@ -25,6 +25,7 @@ function ImportDataPageWithContainerWithSuspense(props) {
   );
 }
 
+let retrieveError = null;
 function ImportDataPage(props) {
   const { adminImportContainer } = props;
 
@@ -35,14 +36,15 @@ function ImportDataPage(props) {
       }
       catch (err) {
         toastError(err);
-        adminImportContainer.setState({ esaTeamName: adminImportContainer.dummyEsaTeamNameForError, retrieveError: err[0].message });
+        adminImportContainer.setState({ esaTeamName: adminImportContainer.dummyEsaTeamNameForError });
+        retrieveError = err;
         logger.error(err);
       }
     })();
   }
 
   if (adminImportContainer.state.esaTeamName === adminImportContainer.dummyEsaTeamNameForError) {
-    throw new Error(adminImportContainer.state.retrieveError);
+    throw new Error(retrieveError[0].message);
   }
 
   return <ImportDataPageContents />;

src/client/js/components/Admin/MarkdownSetting/MarkDownSetting.jsx

@@ -25,6 +25,7 @@ function MarkdownSettingWithContainerWithSuspense(props) {
   );
 }
 
+let retrieveError = null;
 function MarkdownSetting(props) {
   const { adminMarkDownContainer } = props;
 
@@ -35,14 +36,15 @@ function MarkdownSetting(props) {
       }
       catch (err) {
         toastError(err);
-        adminMarkDownContainer.setState({ isEnabledLinebreaks: adminMarkDownContainer.dummyIsEnabledLinebreaksForError, retrieveError: err[0].message });
+        adminMarkDownContainer.setState({ isEnabledLinebreaks: adminMarkDownContainer.dummyIsEnabledLinebreaksForError });
+        retrieveError = err;
         logger.error(err);
       }
     })();
   }
 
   if (adminMarkDownContainer.state.isEnabledLinebreaks === adminMarkDownContainer.dummyIsEnabledLinebreaksForError) {
-    throw new Error(adminMarkDownContainer.state.retrieveError);
+    throw new Error(retrieveError[0].message);
   }
 
   return <MarkDownSettingContents />;

src/client/js/components/Admin/Notification/NotificationSetting.jsx

@@ -26,6 +26,7 @@ function NotificationSettingWithContainerWithSuspense(props) {
   );
 }
 
+let retrieveError = null;
 function NotificationSetting(props) {
   const { adminNotificationContainer } = props;
   if (adminNotificationContainer.state.webhookUrl === adminNotificationContainer.dummyWebhookUrl) {
@@ -35,14 +36,15 @@ function NotificationSetting(props) {
       }
       catch (err) {
         toastError(err);
-        adminNotificationContainer.setState({ webhookUrl: adminNotificationContainer.dummyWebhookUrlForError, retrieveError: err[0].message });
+        adminNotificationContainer.setState({ webhookUrl: adminNotificationContainer.dummyWebhookUrlForError });
+        retrieveError = err;
         logger.error(err);
       }
     })();
   }
 
   if (adminNotificationContainer.state.webhookUrl === adminNotificationContainer.dummyWebhookUrlForError) {
-    throw new Error(adminNotificationContainer.state.retrieveError);
+    throw new Error(retrieveError[0].message);
   }
 
   return <NotificationSettingContents />;

src/client/js/components/Admin/Security/BasicSecuritySetting.jsx

@@ -9,6 +9,7 @@ import AdminBasicSecurityContainer from '../../../services/AdminBasicSecurityCon
 
 import BasicSecurityManagementContents from './BasicSecuritySettingContents';
 
+let retrieveError = null;
 function BasicSecurityManagement(props) {
   const { adminBasicSecurityContainer } = props;
   if (adminBasicSecurityContainer.state.isSameUsernameTreatedAsIdenticalUser === adminBasicSecurityContainer.dummyIsSameUsernameTreatedAsIdenticalUser) {
@@ -19,8 +20,8 @@ function BasicSecurityManagement(props) {
       catch (err) {
         adminBasicSecurityContainer.setState({
           isSameUsernameTreatedAsIdenticalUser: adminBasicSecurityContainer.dummyIsSameUsernameTreatedAsIdenticalUser,
-          retrieveError: err.message,
         });
+        retrieveError = err;
         toastError(err);
       }
     })();
@@ -29,7 +30,7 @@ function BasicSecurityManagement(props) {
   if (
     adminBasicSecurityContainer.state.isSameUsernameTreatedAsIdenticalUser === adminBasicSecurityContainer.dummyIsSameUsernameTreatedAsIdenticalUserForError
   ) {
-    throw new Error(adminBasicSecurityContainer.state.retrieveError);
+    throw new Error(retrieveError[0].message);
   }
 
   return <BasicSecurityManagementContents />;

src/client/js/components/Admin/Security/GitHubSecuritySetting.jsx

@@ -9,8 +9,8 @@ import AdminGitHubSecurityContainer from '../../../services/AdminGitHubSecurityC
 
 import GitHubSecuritySettingContents from './GitHubSecuritySettingContents';
 
+let retrieveError = null;
 function GitHubSecurityManagement(props) {
-
   const { adminGitHubSecurityContainer } = props;
   if (adminGitHubSecurityContainer.state.githubClientId === adminGitHubSecurityContainer.dummyGithubClientId) {
     throw (async() => {
@@ -19,13 +19,14 @@ function GitHubSecurityManagement(props) {
       }
       catch (err) {
         toastError(err);
-        adminGitHubSecurityContainer.setState({ githubClientId: adminGitHubSecurityContainer.dummyGithubClientIdForError, retrieveError: err });
+        retrieveError = err;
+        adminGitHubSecurityContainer.setState({ githubClientId: adminGitHubSecurityContainer.dummyGithubClientIdForError });
       }
     })();
   }
 
   if (adminGitHubSecurityContainer.state.githubClientId === adminGitHubSecurityContainer.dummyGithubClientIdForError) {
-    throw new Error(adminGitHubSecurityContainer.state.retrieveError);
+    throw new Error(retrieveError[0].message);
   }
 
   return <GitHubSecuritySettingContents />;

src/client/js/components/Admin/Security/GoogleSecuritySetting.jsx

@@ -8,8 +8,8 @@ import { toastError } from '../../../util/apiNotification';
 import AdminGoogleSecurityContainer from '../../../services/AdminGoogleSecurityContainer';
 import GoogleSecurityManagementContents from './GoogleSecuritySettingContents';
 
+let retrieveError = null;
 function GoogleSecurityManagement(props) {
-
   const { adminGoogleSecurityContainer } = props;
   if (adminGoogleSecurityContainer.state.googleClientId === adminGoogleSecurityContainer.dummyGoogleClientId) {
     throw (async() => {
@@ -18,13 +18,14 @@ function GoogleSecurityManagement(props) {
       }
       catch (err) {
         toastError(err);
-        adminGoogleSecurityContainer.setState({ googleClientId: adminGoogleSecurityContainer.dummyGoogleClientIdForError, retrieveError: err[0].message });
+        retrieveError = err;
+        adminGoogleSecurityContainer.setState({ googleClientId: adminGoogleSecurityContainer.dummyGoogleClientIdForError });
       }
     })();
   }
 
   if (adminGoogleSecurityContainer.state.googleClientId === adminGoogleSecurityContainer.dummyGoogleClientIdForError) {
-    throw new Error(adminGoogleSecurityContainer.state.retrieveError);
+    throw new Error(retrieveError[0].message);
   }
 
   return <GoogleSecurityManagementContents />;

src/client/js/components/Admin/Security/LdapSecuritySetting.jsx

@@ -8,8 +8,8 @@ import AdminLdapSecurityContainer from '../../../services/AdminLdapSecurityConta
 
 import LdapSecuritySettingContents from './LdapSecuritySettingContents';
 
+let retrieveError = null;
 function LdapSecuritySetting(props) {
-
   const { adminLdapSecurityContainer } = props;
   if (adminLdapSecurityContainer.state.serverUrl === adminLdapSecurityContainer.dummyServerUrl) {
     throw (async() => {
@@ -18,13 +18,14 @@ function LdapSecuritySetting(props) {
       }
       catch (err) {
         toastError(err);
-        adminLdapSecurityContainer.setState({ serverUrl: adminLdapSecurityContainer.dummyServerUrlForError, retrieveError: err[0].message });
+        retrieveError = err;
+        adminLdapSecurityContainer.setState({ serverUrl: adminLdapSecurityContainer.dummyServerUrlForError });
       }
     })();
   }
 
   if (adminLdapSecurityContainer.state.serverUrl === adminLdapSecurityContainer.dummyServerUrlForError) {
-    throw new Error(adminLdapSecurityContainer.state.retrieveError);
+    throw new Error(retrieveError[0].message);
   }
 
   return <LdapSecuritySettingContents />;

src/client/js/components/Admin/Security/LocalSecuritySetting.jsx

@@ -9,8 +9,8 @@ import AdminLocalSecurityContainer from '../../../services/AdminLocalSecurityCon
 
 import LocalSecuritySettingContents from './LocalSecuritySettingContents';
 
+let retrieveError = null;
 function LocalSecuritySetting(props) {
-
   const { adminLocalSecurityContainer } = props;
   if (adminLocalSecurityContainer.state.registrationMode === adminLocalSecurityContainer.dummyRegistrationMode) {
     throw (async() => {
@@ -19,13 +19,14 @@ function LocalSecuritySetting(props) {
       }
       catch (err) {
         toastError(err);
-        adminLocalSecurityContainer.setState({ registrationMode: adminLocalSecurityContainer.dummyRegistrationModeForError, retrieveError: err[0].message });
+        retrieveError = err;
+        adminLocalSecurityContainer.setState({ registrationMode: adminLocalSecurityContainer.dummyRegistrationModeForError });
       }
     })();
   }
 
   if (adminLocalSecurityContainer.state.registrationMode === adminLocalSecurityContainer.dummyRegistrationModeForError) {
-    throw new Error(adminLocalSecurityContainer.state.retrieveError);
+    throw new Error(retrieveError[0].message);
   }
 
   return <LocalSecuritySettingContents />;

src/client/js/components/Admin/Security/OidcSecuritySetting.jsx

@@ -9,8 +9,8 @@ import AdminOidcSecurityContainer from '../../../services/AdminOidcSecurityConta
 
 import OidcSecurityManagementContents from './OidcSecuritySettingContents';
 
+let retrieveError = null;
 function OidcSecurityManagement(props) {
-
   const { adminOidcSecurityContainer } = props;
   if (adminOidcSecurityContainer.state.oidcProviderName === adminOidcSecurityContainer.dummyOidcProviderName) {
     throw (async() => {
@@ -19,13 +19,14 @@ function OidcSecurityManagement(props) {
       }
       catch (err) {
         toastError(err);
-        adminOidcSecurityContainer.setState({ oidcProviderName: adminOidcSecurityContainer.dummyOidcProviderNameForError, retrieveError: err[0].message });
+        retrieveError = err;
+        adminOidcSecurityContainer.setState({ oidcProviderName: adminOidcSecurityContainer.dummyOidcProviderNameForError });
       }
     })();
   }
 
   if (adminOidcSecurityContainer.state.oidcProviderName === adminOidcSecurityContainer.dummyOidcProviderNameForError) {
-    throw new Error(adminOidcSecurityContainer.state.retrieveError);
+    throw new Error(retrieveError[0].message);
   }
 
   return <OidcSecurityManagementContents />;

src/client/js/components/Admin/Security/SamlSecuritySetting.jsx

@@ -9,8 +9,8 @@ import AdminSamlSecurityContainer from '../../../services/AdminSamlSecurityConta
 
 import SamlSecuritySettingContents from './SamlSecuritySettingContents';
 
+let retrieveError = null;
 function SamlSecurityManagement(props) {
-
   const { adminSamlSecurityContainer } = props;
   if (adminSamlSecurityContainer.state.samlEntryPoint === adminSamlSecurityContainer.dummySamlEntryPoint) {
     throw (async() => {
@@ -19,13 +19,14 @@ function SamlSecurityManagement(props) {
       }
       catch (err) {
         toastError(err);
-        adminSamlSecurityContainer.setState({ samlEntryPoint: adminSamlSecurityContainer.dummySamlEntryPointForError, retrieveError: err[0].message });
+        retrieveError = err;
+        adminSamlSecurityContainer.setState({ samlEntryPoint: adminSamlSecurityContainer.dummySamlEntryPointForError });
       }
     })();
   }
 
   if (adminSamlSecurityContainer.state.samlEntryPoint === adminSamlSecurityContainer.dummySamlEntryPointForError) {
-    throw new Error(adminSamlSecurityContainer.state.retrieveError);
+    throw new Error(retrieveError[0].message);
   }
 
   return <SamlSecuritySettingContents />;

src/client/js/components/Admin/Security/SecurityManagement.jsx

@@ -6,8 +6,8 @@ import { withUnstatedContainers } from '../../UnstatedUtils';
 import AdminGeneralSecurityContainer from '../../../services/AdminGeneralSecurityContainer';
 import SecurityManagementContents from './SecurityManagementContents';
 
+let retrieveError = null;
 function SecurityManagement(props) {
-
   const { adminGeneralSecurityContainer } = props;
 
   if (adminGeneralSecurityContainer.state.currentRestrictGuestMode === adminGeneralSecurityContainer.dummyCurrentRestrictGuestMode) {
@@ -17,16 +17,16 @@ function SecurityManagement(props) {
       }
       catch (err) {
         toastError(err);
+        retrieveError = err;
         adminGeneralSecurityContainer.setState({
           currentRestrictGuestMode: adminGeneralSecurityContainer.dummyCurrentRestrictGuestModeForError,
-          retrieveError: err.message,
         });
       }
     })();
   }
 
   if (adminGeneralSecurityContainer.state.currentRestrictGuestMode === adminGeneralSecurityContainer.dummyCurrentRestrictGuestModeForError) {
-    throw new Error(adminGeneralSecurityContainer.state.retrieveError);
+    throw new Error(retrieveError[0].message);
   }
 
   return <SecurityManagementContents />;

src/client/js/components/Admin/Security/TwitterSecuritySetting.jsx

@@ -9,8 +9,8 @@ import AdminTwitterSecurityContainer from '../../../services/AdminTwitterSecurit
 
 import TwitterSecuritySettingContents from './TwitterSecuritySettingContents';
 
+let retrieveError = null;
 function TwitterSecurityManagement(props) {
-
   const { adminTwitterSecurityContainer } = props;
   if (adminTwitterSecurityContainer.state.twitterConsumerKey === adminTwitterSecurityContainer.dummyTwitterConsumerKey) {
     throw (async() => {
@@ -21,14 +21,14 @@ function TwitterSecurityManagement(props) {
         toastError(err);
         adminTwitterSecurityContainer.setState({
           twitterConsumerKey: adminTwitterSecurityContainer.dummyTwitterConsumerKeyForError,
-          retrieveError: err[0].message,
         });
+        retrieveError = err;
       }
     })();
   }
 
   if (adminTwitterSecurityContainer.state.twitterConsumerKey === adminTwitterSecurityContainer.dummyTwitterConsumerKeyForError) {
-    throw new Error(adminTwitterSecurityContainer.state.retrieveError);
+    throw new Error(retrieveError[0].message);
   }
 
   return <TwitterSecuritySettingContents />;