fix: redirect to the users list view on successful deletion from the …

…profile view SH Admin dashboard
hoppscotch · Mar 28, 2024 · 787aab6 · 787aab6
1 parent 1f7a8ed
commit 787aab6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/packages/hoppscotch-sh-admin/src/helpers/userManagement.ts b/packages/hoppscotch-sh-admin/src/helpers/userManagement.ts
@@ -40,17 +40,11 @@ export const handleUserDeletion = (deletedUsersList: UserDeletionResult[]) => {
 
  // Show the success toast based on the action type if there are no errors
  if (uniqueErrorMessages.size === 0) {
- if (isBulkAction) {
- toast.success(
- isBulkAction
- ? t('state.delete_user_success')
- : t('state.delete_users_success')
- );
-
- return;
- }
-
- toast.success(t('state.delete_user_success'));
+ toast.success(
+ isBulkAction
+ ? t('state.delete_users_success')
+ : t('state.delete_user_success')
+ );
  return;
  }
 

diff --git a/packages/hoppscotch-sh-admin/src/pages/users/_id.vue b/packages/hoppscotch-sh-admin/src/pages/users/_id.vue
@@ -207,13 +207,14 @@ const deleteUserMutation = async (id: string | null) => {
 
  if (result.error) {
  toast.error(t('state.delete_user_failure'));
- router.push('/users');
  } else {
  const deletedUsers = result.data?.removeUsersByAdmin || [];
 
  handleUserDeletion(deletedUsers);
  }
  confirmDeletion.value = false;
  deleteUserUID.value = null;
+
+ !result.error && router.push('/users');
 };
 </script>