itizawa пре 6 година
родитељ
комит
e7808183b2

+ 2 - 1
resource/locales/en-US/translation.json

@@ -719,7 +719,8 @@
     "remove_user_admin": "Remove {{username}} admin success",
     "activate_user_success": "Activating {{username}} success",
     "deactivate_user_success": "Deactivating {{username}} success",
-    "remove_user_success": "Removing {{username}} success"
+    "remove_user_success": "Removing {{username}} success",
+    "remove_external_user_success": "Succeeded to remove {{accountId}} "
   },
 
   "user_group_management": {

+ 3 - 1
resource/locales/ja/translation.json

@@ -703,7 +703,9 @@
     "remove_user_admin": "{{username}}を管理者から外しました",
     "activate_user_success": "{{username}}を有効化しました",
     "deactivate_user_success": "{{username}}を無効化しました",
-    "remove_user_success": "{{username}}を削除しました"
+    "remove_user_success": "{{username}}を削除しました",
+    "remove_external_user_success": "{{accountId}}を削除しました "
+
   },
 
   "user_group_management": {

+ 2 - 2
src/client/js/components/Admin/Users/ExternalAccountTable.jsx

@@ -25,8 +25,8 @@ class ExternalAccountTable extends React.Component {
     const { t } = this.props;
 
     try {
-      const username = await this.props.adminExternalAccountsContainer.removeExternalAccountById(externalAccountId);
-      toastSuccess(t('user_management.remove_user_success', { username }));
+      const accountId = await this.props.adminExternalAccountsContainer.removeExternalAccountById(externalAccountId);
+      toastSuccess(t('user_management.remove_external_user_success', { accountId }));
     }
     catch (err) {
       toastError(err);

+ 4 - 3
src/client/js/services/AdminExternalAccountsContainer.js

@@ -65,14 +65,15 @@ export default class AdminExternalAccountsContainer extends Container {
    */
   async removeExternalAccountById(externalAccountId) {
     const res = await this.appContainer.apiv3.delete(`/users/external-accounts/${externalAccountId}/remove`);
-    const externalAccountData = res.data.externalAccount;
+    const deletedUserData = res.data.externalAccount;
 
     this.setState((prevState) => {
       return {
-        externalAccounts: prevState.externalAccounts.filter((user) => { return user._id !== externalAccountData._id }),
+        externalAccounts: prevState.externalAccounts.filter((user) => { return user._id !== deletedUserData._id }),
       };
     });
-    return externalAccountData;
+    // pass the accountId for display on the screen
+    return deletedUserData.accountId;
   }
 
 }