WNomunomu 2 лет назад
Родитель
Сommit
9c39e0221a

+ 0 - 6
apps/app/src/components/Admin/UserGroupDetail/UserGroupDetailPage.tsx

@@ -21,13 +21,9 @@ import {
   useSWRxUserGroupPages, useSWRxUserGroupRelationList, useSWRxChildUserGroupList, useSWRxUserGroup,
   useSWRxSelectableParentUserGroups, useSWRxSelectableChildUserGroups, useSWRxAncestorUserGroups, useSWRxUserGroupRelations,
 } from '~/stores/user-group';
-import loggerFactory from '~/utils/logger';
 
 import styles from './UserGroupDetailPage.module.scss';
 
-
-const logger = loggerFactory('growi:stores:personal-settings');
-
 const UserGroupPageList = dynamic(() => import('./UserGroupPageList'), { ssr: false });
 const UserGroupUserTable = dynamic(() => import('./UserGroupUserTable'), { ssr: false });
 
@@ -140,8 +136,6 @@ const UserGroupDetailPage = (props: Props): JSX.Element => {
   );
 
   const onClickSubmitForm = useCallback(async(targetGroup: IUserGroupHasId, userGroupData: Partial<IUserGroupHasId>): Promise<void> => {
-    logger.error(userGroupData?.parent);
-    logger.error(typeof userGroupData?.parent);
     if (typeof userGroupData?.parent === 'string') {
       toastError(t('Something went wrong. Please try again.'));
       return;

+ 4 - 2
apps/app/src/server/routes/apiv3/personal-setting.js

@@ -1,5 +1,7 @@
+import { ErrorV3 } from '@growi/core';
 import { body } from 'express-validator';
 
+
 import { i18n } from '^/config/next-i18next.config';
 
 import { SupportedAction } from '~/interfaces/activity';
@@ -242,7 +244,7 @@ module.exports = (crowi) => {
 
       if (!isUniqueEmail) {
         logger.error('email-is-not-unique');
-        return res.apiv3Err('email-is-already-in-use');
+        return res.apiv3Err(new ErrorV3('The email is already in use', 'email-is-already-in-use'));
       }
 
       const updatedUser = await user.save();
@@ -254,7 +256,7 @@ module.exports = (crowi) => {
     }
     catch (err) {
       logger.error(err);
-      return res.apiv3Err('update-personal-data-failed');
+      return res.apiv3Err(new ErrorV3(err.message, 'update-personal-settings-failed'));
     }
 
   });

+ 5 - 3
apps/app/src/stores/personal-settings.tsx

@@ -66,9 +66,11 @@ export const usePersonalSettings = (config?: SWRConfiguration): SWRResponse<IUse
       await apiv3Put('/personal-setting/', updateData);
       i18n.changeLanguage(updateData.lang);
     }
-    catch (err) {
-      logger.error(err);
-      const code = err[0].message;
+    catch (errs) {
+      logger.error(errs);
+
+      const err = errs[0];
+      const code = err.code;
 
       if (code === 'email-is-already-in-use') {
         throw new Error('The email is already in use');