Răsfoiți Sursa

change err msg

yusuketk 5 ani în urmă
părinte
comite
d80bcb9296

+ 7 - 5
src/client/js/components/Admin/Customize/Customize.jsx

@@ -7,6 +7,7 @@ import AdminCustomizeContainer from '../../../services/AdminCustomizeContainer';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
 import { toastError } from '../../../util/apiNotification';
+import toArrayIfNot from '../../../../../lib/util/toArrayIfNot';
 
 import CustomizeLayoutSetting from './CustomizeLayoutSetting';
 import CustomizeFunctionSetting from './CustomizeFunctionSetting';
@@ -32,7 +33,7 @@ function CustomizePageWithContainerWithSusupense(props) {
   );
 }
 
-let retrieveError = null;
+let retrieveErrors = null;
 function Customize(props) {
   const { adminCustomizeContainer } = props;
 
@@ -42,16 +43,17 @@ function Customize(props) {
         await adminCustomizeContainer.retrieveCustomizeData();
       }
       catch (err) {
-        toastError(err);
+        const errs = toArrayIfNot(err);
+        toastError(errs);
+        logger.error(errs);
+        retrieveErrors = errs;
         adminCustomizeContainer.setState({ currentTheme: adminCustomizeContainer.dummyCurrentThemeForError });
-        retrieveError = err;
-        logger.error(err);
       }
     })();
   }
 
   if (adminCustomizeContainer.state.currentTheme === adminCustomizeContainer.dummyCurrentThemeForError) {
-    throw new Error(retrieveError[0].message);
+    throw new Error(`${retrieveErrors.length} errors occured`);
   }
 
   return (

+ 7 - 5
src/client/js/components/Admin/ImportDataPage.jsx

@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import loggerFactory from '@alias/logger';
 
 import { withUnstatedContainers } from '../UnstatedUtils';
+import toArrayIfNot from '../../../../lib/util/toArrayIfNot';
 
 import AdminImportContainer from '../../services/AdminImportContainer';
 import { toastError } from '../../util/apiNotification';
@@ -25,7 +26,7 @@ function ImportDataPageWithContainerWithSuspense(props) {
   );
 }
 
-let retrieveError = null;
+let retrieveErrors = null;
 function ImportDataPage(props) {
   const { adminImportContainer } = props;
 
@@ -35,16 +36,17 @@ function ImportDataPage(props) {
         await adminImportContainer.retrieveImportSettingsData();
       }
       catch (err) {
-        toastError(err);
+        const errs = toArrayIfNot(err);
+        toastError(errs);
+        logger.error(errs);
+        retrieveErrors = errs;
         adminImportContainer.setState({ esaTeamName: adminImportContainer.dummyEsaTeamNameForError });
-        retrieveError = err;
-        logger.error(err);
       }
     })();
   }
 
   if (adminImportContainer.state.esaTeamName === adminImportContainer.dummyEsaTeamNameForError) {
-    throw new Error(retrieveError[0].message);
+    throw new Error(`${retrieveErrors.length} errors occured`);
   }
 
   return <ImportDataPageContents />;

+ 7 - 5
src/client/js/components/Admin/MarkdownSetting/MarkDownSetting.jsx

@@ -5,6 +5,7 @@ import loggerFactory from '@alias/logger';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
 import { toastError } from '../../../util/apiNotification';
+import toArrayIfNot from '../../../../../lib/util/toArrayIfNot';
 
 import MarkDownSettingContents from './MarkDownSettingContents';
 import AdminMarkDownContainer from '../../../services/AdminMarkDownContainer';
@@ -25,7 +26,7 @@ function MarkdownSettingWithContainerWithSuspense(props) {
   );
 }
 
-let retrieveError = null;
+let retrieveErrors = null;
 function MarkdownSetting(props) {
   const { adminMarkDownContainer } = props;
 
@@ -35,16 +36,17 @@ function MarkdownSetting(props) {
         await adminMarkDownContainer.retrieveMarkdownData();
       }
       catch (err) {
-        toastError(err);
+        const errs = toArrayIfNot(err);
+        toastError(errs);
+        logger.error(errs);
+        retrieveErrors = errs;
         adminMarkDownContainer.setState({ isEnabledLinebreaks: adminMarkDownContainer.dummyIsEnabledLinebreaksForError });
-        retrieveError = err;
-        logger.error(err);
       }
     })();
   }
 
   if (adminMarkDownContainer.state.isEnabledLinebreaks === adminMarkDownContainer.dummyIsEnabledLinebreaksForError) {
-    throw new Error(retrieveError[0].message);
+    throw new Error(`${retrieveErrors.length} errors occured`);
   }
 
   return <MarkDownSettingContents />;

+ 7 - 5
src/client/js/components/Admin/Notification/NotificationSetting.jsx

@@ -5,6 +5,7 @@ import loggerFactory from '@alias/logger';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
 import { toastError } from '../../../util/apiNotification';
+import toArrayIfNot from '../../../../../lib/util/toArrayIfNot';
 
 import AdminNotificationContainer from '../../../services/AdminNotificationContainer';
 
@@ -26,7 +27,7 @@ function NotificationSettingWithContainerWithSuspense(props) {
   );
 }
 
-let retrieveError = null;
+let retrieveErrors = null;
 function NotificationSetting(props) {
   const { adminNotificationContainer } = props;
   if (adminNotificationContainer.state.webhookUrl === adminNotificationContainer.dummyWebhookUrl) {
@@ -35,16 +36,17 @@ function NotificationSetting(props) {
         await adminNotificationContainer.retrieveNotificationData();
       }
       catch (err) {
-        toastError(err);
+        const errs = toArrayIfNot(err);
+        toastError(errs);
+        logger.error(errs);
+        retrieveErrors = errs;
         adminNotificationContainer.setState({ webhookUrl: adminNotificationContainer.dummyWebhookUrlForError });
-        retrieveError = err;
-        logger.error(err);
       }
     })();
   }
 
   if (adminNotificationContainer.state.webhookUrl === adminNotificationContainer.dummyWebhookUrlForError) {
-    throw new Error(retrieveError[0].message);
+    throw new Error(`${retrieveErrors.length} errors occured`);
   }
 
   return <NotificationSettingContents />;

+ 7 - 4
src/client/js/components/Admin/Security/BasicSecuritySetting.jsx

@@ -4,12 +4,13 @@ import PropTypes from 'prop-types';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
 import { toastError } from '../../../util/apiNotification';
+import toArrayIfNot from '../../../../../lib/util/toArrayIfNot';
 
 import AdminBasicSecurityContainer from '../../../services/AdminBasicSecurityContainer';
 
 import BasicSecurityManagementContents from './BasicSecuritySettingContents';
 
-let retrieveError = null;
+let retrieveErrors = null;
 function BasicSecurityManagement(props) {
   const { adminBasicSecurityContainer } = props;
   if (adminBasicSecurityContainer.state.isSameUsernameTreatedAsIdenticalUser === adminBasicSecurityContainer.dummyIsSameUsernameTreatedAsIdenticalUser) {
@@ -18,11 +19,13 @@ function BasicSecurityManagement(props) {
         await adminBasicSecurityContainer.retrieveSecurityData();
       }
       catch (err) {
+        const errs = toArrayIfNot(err);
+        toastError(errs);
+        retrieveErrors = errs;
         adminBasicSecurityContainer.setState({
           isSameUsernameTreatedAsIdenticalUser: adminBasicSecurityContainer.dummyIsSameUsernameTreatedAsIdenticalUser,
         });
-        retrieveError = err;
-        toastError(err);
+
       }
     })();
   }
@@ -30,7 +33,7 @@ function BasicSecurityManagement(props) {
   if (
     adminBasicSecurityContainer.state.isSameUsernameTreatedAsIdenticalUser === adminBasicSecurityContainer.dummyIsSameUsernameTreatedAsIdenticalUserForError
   ) {
-    throw new Error(retrieveError[0].message);
+    throw new Error(`${retrieveErrors.length} errors occured`);
   }
 
   return <BasicSecurityManagementContents />;

+ 6 - 4
src/client/js/components/Admin/Security/GitHubSecuritySetting.jsx

@@ -4,12 +4,13 @@ import PropTypes from 'prop-types';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
 import { toastError } from '../../../util/apiNotification';
+import toArrayIfNot from '../../../../../lib/util/toArrayIfNot';
 
 import AdminGitHubSecurityContainer from '../../../services/AdminGitHubSecurityContainer';
 
 import GitHubSecuritySettingContents from './GitHubSecuritySettingContents';
 
-let retrieveError = null;
+let retrieveErrors = null;
 function GitHubSecurityManagement(props) {
   const { adminGitHubSecurityContainer } = props;
   if (adminGitHubSecurityContainer.state.githubClientId === adminGitHubSecurityContainer.dummyGithubClientId) {
@@ -18,15 +19,16 @@ function GitHubSecurityManagement(props) {
         await adminGitHubSecurityContainer.retrieveSecurityData();
       }
       catch (err) {
-        toastError(err);
-        retrieveError = err;
+        const errs = toArrayIfNot(err);
+        toastError(errs);
+        retrieveErrors = errs;
         adminGitHubSecurityContainer.setState({ githubClientId: adminGitHubSecurityContainer.dummyGithubClientIdForError });
       }
     })();
   }
 
   if (adminGitHubSecurityContainer.state.githubClientId === adminGitHubSecurityContainer.dummyGithubClientIdForError) {
-    throw new Error(retrieveError[0].message);
+    throw new Error(`${retrieveErrors.length} errors occured`);
   }
 
   return <GitHubSecuritySettingContents />;

+ 6 - 4
src/client/js/components/Admin/Security/GoogleSecuritySetting.jsx

@@ -4,11 +4,12 @@ import PropTypes from 'prop-types';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
 import { toastError } from '../../../util/apiNotification';
+import toArrayIfNot from '../../../../../lib/util/toArrayIfNot';
 
 import AdminGoogleSecurityContainer from '../../../services/AdminGoogleSecurityContainer';
 import GoogleSecurityManagementContents from './GoogleSecuritySettingContents';
 
-let retrieveError = null;
+let retrieveErrors = null;
 function GoogleSecurityManagement(props) {
   const { adminGoogleSecurityContainer } = props;
   if (adminGoogleSecurityContainer.state.googleClientId === adminGoogleSecurityContainer.dummyGoogleClientId) {
@@ -17,15 +18,16 @@ function GoogleSecurityManagement(props) {
         await adminGoogleSecurityContainer.retrieveSecurityData();
       }
       catch (err) {
-        toastError(err);
-        retrieveError = err;
+        const errs = toArrayIfNot(err);
+        toastError(errs);
+        retrieveErrors = errs;
         adminGoogleSecurityContainer.setState({ googleClientId: adminGoogleSecurityContainer.dummyGoogleClientIdForError });
       }
     })();
   }
 
   if (adminGoogleSecurityContainer.state.googleClientId === adminGoogleSecurityContainer.dummyGoogleClientIdForError) {
-    throw new Error(retrieveError[0].message);
+    throw new Error(`${retrieveErrors.length} errors occured`);
   }
 
   return <GoogleSecurityManagementContents />;

+ 6 - 4
src/client/js/components/Admin/Security/LdapSecuritySetting.jsx

@@ -3,12 +3,13 @@ import PropTypes from 'prop-types';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
 import { toastError } from '../../../util/apiNotification';
+import toArrayIfNot from '../../../../../lib/util/toArrayIfNot';
 
 import AdminLdapSecurityContainer from '../../../services/AdminLdapSecurityContainer';
 
 import LdapSecuritySettingContents from './LdapSecuritySettingContents';
 
-let retrieveError = null;
+let retrieveErrors = null;
 function LdapSecuritySetting(props) {
   const { adminLdapSecurityContainer } = props;
   if (adminLdapSecurityContainer.state.serverUrl === adminLdapSecurityContainer.dummyServerUrl) {
@@ -17,15 +18,16 @@ function LdapSecuritySetting(props) {
         await adminLdapSecurityContainer.retrieveSecurityData();
       }
       catch (err) {
-        toastError(err);
-        retrieveError = err;
+        const errs = toArrayIfNot(err);
+        toastError(errs);
+        retrieveErrors = errs;
         adminLdapSecurityContainer.setState({ serverUrl: adminLdapSecurityContainer.dummyServerUrlForError });
       }
     })();
   }
 
   if (adminLdapSecurityContainer.state.serverUrl === adminLdapSecurityContainer.dummyServerUrlForError) {
-    throw new Error(retrieveError[0].message);
+    throw new Error(`${retrieveErrors.length} errors occured`);
   }
 
   return <LdapSecuritySettingContents />;

+ 6 - 4
src/client/js/components/Admin/Security/LocalSecuritySetting.jsx

@@ -4,12 +4,13 @@ import PropTypes from 'prop-types';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
 import { toastError } from '../../../util/apiNotification';
+import toArrayIfNot from '../../../../../lib/util/toArrayIfNot';
 
 import AdminLocalSecurityContainer from '../../../services/AdminLocalSecurityContainer';
 
 import LocalSecuritySettingContents from './LocalSecuritySettingContents';
 
-let retrieveError = null;
+let retrieveErrors = null;
 function LocalSecuritySetting(props) {
   const { adminLocalSecurityContainer } = props;
   if (adminLocalSecurityContainer.state.registrationMode === adminLocalSecurityContainer.dummyRegistrationMode) {
@@ -18,15 +19,16 @@ function LocalSecuritySetting(props) {
         await adminLocalSecurityContainer.retrieveSecurityData();
       }
       catch (err) {
-        toastError(err);
-        retrieveError = err;
+        const errs = toArrayIfNot(err);
+        toastError(errs);
+        retrieveErrors = errs;
         adminLocalSecurityContainer.setState({ registrationMode: adminLocalSecurityContainer.dummyRegistrationModeForError });
       }
     })();
   }
 
   if (adminLocalSecurityContainer.state.registrationMode === adminLocalSecurityContainer.dummyRegistrationModeForError) {
-    throw new Error(retrieveError[0].message);
+    throw new Error(`${retrieveErrors.length} errors occured`);
   }
 
   return <LocalSecuritySettingContents />;

+ 6 - 4
src/client/js/components/Admin/Security/OidcSecuritySetting.jsx

@@ -4,12 +4,13 @@ import PropTypes from 'prop-types';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
 import { toastError } from '../../../util/apiNotification';
+import toArrayIfNot from '../../../../../lib/util/toArrayIfNot';
 
 import AdminOidcSecurityContainer from '../../../services/AdminOidcSecurityContainer';
 
 import OidcSecurityManagementContents from './OidcSecuritySettingContents';
 
-let retrieveError = null;
+let retrieveErrors = null;
 function OidcSecurityManagement(props) {
   const { adminOidcSecurityContainer } = props;
   if (adminOidcSecurityContainer.state.oidcProviderName === adminOidcSecurityContainer.dummyOidcProviderName) {
@@ -18,15 +19,16 @@ function OidcSecurityManagement(props) {
         await adminOidcSecurityContainer.retrieveSecurityData();
       }
       catch (err) {
-        toastError(err);
-        retrieveError = err;
+        const errs = toArrayIfNot(err);
+        toastError(errs);
+        retrieveErrors = errs;
         adminOidcSecurityContainer.setState({ oidcProviderName: adminOidcSecurityContainer.dummyOidcProviderNameForError });
       }
     })();
   }
 
   if (adminOidcSecurityContainer.state.oidcProviderName === adminOidcSecurityContainer.dummyOidcProviderNameForError) {
-    throw new Error(retrieveError[0].message);
+    throw new Error(`${retrieveErrors.length} errors occured`);
   }
 
   return <OidcSecurityManagementContents />;

+ 6 - 4
src/client/js/components/Admin/Security/SamlSecuritySetting.jsx

@@ -6,10 +6,11 @@ import { withUnstatedContainers } from '../../UnstatedUtils';
 import { toastError } from '../../../util/apiNotification';
 
 import AdminSamlSecurityContainer from '../../../services/AdminSamlSecurityContainer';
+import toArrayIfNot from '../../../../../lib/util/toArrayIfNot';
 
 import SamlSecuritySettingContents from './SamlSecuritySettingContents';
 
-let retrieveError = null;
+let retrieveErrors = null;
 function SamlSecurityManagement(props) {
   const { adminSamlSecurityContainer } = props;
   if (adminSamlSecurityContainer.state.samlEntryPoint === adminSamlSecurityContainer.dummySamlEntryPoint) {
@@ -18,15 +19,16 @@ function SamlSecurityManagement(props) {
         await adminSamlSecurityContainer.retrieveSecurityData();
       }
       catch (err) {
-        toastError(err);
-        retrieveError = err;
+        const errs = toArrayIfNot(err);
+        toastError(errs);
+        retrieveErrors = errs;
         adminSamlSecurityContainer.setState({ samlEntryPoint: adminSamlSecurityContainer.dummySamlEntryPointForError });
       }
     })();
   }
 
   if (adminSamlSecurityContainer.state.samlEntryPoint === adminSamlSecurityContainer.dummySamlEntryPointForError) {
-    throw new Error(retrieveError[0].message);
+    throw new Error(`${retrieveErrors.length} errors occured`);
   }
 
   return <SamlSecuritySettingContents />;

+ 6 - 4
src/client/js/components/Admin/Security/SecurityManagement.jsx

@@ -3,10 +3,11 @@ import PropTypes from 'prop-types';
 import { toastError } from '../../../util/apiNotification';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
+import toArrayIfNot from '../../../../../lib/util/toArrayIfNot';
 import AdminGeneralSecurityContainer from '../../../services/AdminGeneralSecurityContainer';
 import SecurityManagementContents from './SecurityManagementContents';
 
-let retrieveError = null;
+let retrieveErrors = null;
 function SecurityManagement(props) {
   const { adminGeneralSecurityContainer } = props;
 
@@ -16,8 +17,9 @@ function SecurityManagement(props) {
         await adminGeneralSecurityContainer.retrieveSecurityData();
       }
       catch (err) {
-        toastError(err);
-        retrieveError = err;
+        const errs = toArrayIfNot(err);
+        toastError(errs);
+        retrieveErrors = errs;
         adminGeneralSecurityContainer.setState({
           currentRestrictGuestMode: adminGeneralSecurityContainer.dummyCurrentRestrictGuestModeForError,
         });
@@ -26,7 +28,7 @@ function SecurityManagement(props) {
   }
 
   if (adminGeneralSecurityContainer.state.currentRestrictGuestMode === adminGeneralSecurityContainer.dummyCurrentRestrictGuestModeForError) {
-    throw new Error(retrieveError[0].message);
+    throw new Error(`${retrieveErrors.length} errors occured`);
   }
 
   return <SecurityManagementContents />;

+ 6 - 4
src/client/js/components/Admin/Security/TwitterSecuritySetting.jsx

@@ -4,12 +4,13 @@ import PropTypes from 'prop-types';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
 import { toastError } from '../../../util/apiNotification';
+import toArrayIfNot from '../../../../../lib/util/toArrayIfNot';
 
 import AdminTwitterSecurityContainer from '../../../services/AdminTwitterSecurityContainer';
 
 import TwitterSecuritySettingContents from './TwitterSecuritySettingContents';
 
-let retrieveError = null;
+let retrieveErrors = null;
 function TwitterSecurityManagement(props) {
   const { adminTwitterSecurityContainer } = props;
   if (adminTwitterSecurityContainer.state.twitterConsumerKey === adminTwitterSecurityContainer.dummyTwitterConsumerKey) {
@@ -18,17 +19,18 @@ function TwitterSecurityManagement(props) {
         await adminTwitterSecurityContainer.retrieveSecurityData();
       }
       catch (err) {
-        toastError(err);
+        const errs = toArrayIfNot(err);
+        toastError(errs);
+        retrieveErrors = errs;
         adminTwitterSecurityContainer.setState({
           twitterConsumerKey: adminTwitterSecurityContainer.dummyTwitterConsumerKeyForError,
         });
-        retrieveError = err;
       }
     })();
   }
 
   if (adminTwitterSecurityContainer.state.twitterConsumerKey === adminTwitterSecurityContainer.dummyTwitterConsumerKeyForError) {
-    throw new Error(retrieveError[0].message);
+    throw new Error(`${retrieveErrors.length} errors occured`);
   }
 
   return <TwitterSecuritySettingContents />;