Merge pull request #1354 from weseek/fix/Re-acquire-users-after-remove

Fix/re acquire users after remove

resource/locales/en-US/translation.json

@@ -715,11 +715,12 @@
     "current_users": "Current users:",
     "valid_email": "Valid email address is required",
     "existing_email": "The following emails already exist",
-    "give_user_admin": "Give {{username}} admin success",
-    "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"
+    "give_user_admin": "Succeeded to give {{username}} admin",
+    "remove_user_admin": "Succeeded to remove {{username}} admin ",
+    "activate_user_success": "Succeeded to activating {{username}}",
+    "deactivate_user_success": "Succeeded to deactivate {{username}}",
+    "remove_user_success": "Succeeded to removing {{username}} ",
+    "remove_external_user_success": "Succeeded to remove {{accountId}} "
   },
 
   "user_group_management": {

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": {

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.removeExternal(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);

src/client/js/services/AdminExternalAccountsContainer.js

@@ -63,10 +63,11 @@ export default class AdminExternalAccountsContainer extends Container {
    * @memberOf AdminExternalAccountsContainer
    * @param {string} externalAccountId id of the External Account to be removed
    */
-  async removeExternal(externalAccountId) {
+  async removeExternalAccountById(externalAccountId) {
     const res = await this.appContainer.apiv3.delete(`/users/external-accounts/${externalAccountId}/remove`);
-    const externalAccountData = res.data.externalAccount.user;
-    return externalAccountData;
+    const deletedUserData = res.data.externalAccount;
+    await this.retrieveExternalAccountsByPagingNum(this.state.activePage);
+    return deletedUserData.accountId;
   }
 
 }