Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(sh-admin): alert the user while deleting users who are team owners #3937

Merged
merged 6 commits into from Mar 28, 2024
Merged

chore(sh-admin): alert the user while deleting users who are team owners #3937

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
80b9941
chore: alert the user while deleting users who are team owners
jamesgeorge007 Mar 26, 2024
17db483
refactor: leverage helpers
jamesgeorge007 Mar 27, 2024
8a8cdcf
chore: more specific error message while removing Admin status
jamesgeorge007 Mar 27, 2024
dee7864
chore: address CR comments
jamesgeorge007 Mar 27, 2024
986a4b1
refactor: remove metadata + simplify types
amk-dev Mar 28, 2024
d6babae
chore: redirect to users page only in error case after user deletion
nivedin Mar 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
34 changes: 10 additions & 24 deletions packages/hoppscotch-sh-admin/src/helpers/userManagement.ts
View file
Open in desktop
Expand Up @@ -3,17 +3,6 @@ import { getI18n } from '~/modules/i18n';
import { UserDeletionResult } from './backend/graphql';
import { ADMIN_CANNOT_BE_DELETED, USER_IS_OWNER } from './errors';

type IndividualActionMetadata = null;
type BulkActionMetadata = {
areMultipleUsersSelected: boolean;
deletedUserIDs: string[];
};
type ActionMetadata = IndividualActionMetadata | BulkActionMetadata;

type HandleUserDeletion = {
(deletedUsersList: UserDeletionResult[], metadata: ActionMetadata): void;
};

type ToastMessage = {
message: string;
state: 'success' | 'error';
Expand All @@ -38,21 +27,22 @@ const displayToastMessages = (
});
};

export const handleUserDeletion: HandleUserDeletion = (
deletedUsersList,
metadata
) => {
export const handleUserDeletion = (deletedUsersList: UserDeletionResult[]) => {
const uniqueErrorMessages = new Set(
deletedUsersList.map(({ errorMessage }) => errorMessage).filter(Boolean)
) as Set<string>;

const isBulkAction = deletedUsersList.length > 1;

const deletedUserIDs = deletedUsersList
.filter((user) => user.isDeleted)
.map((user) => user.userUID);

// Show the success toast based on the action type if there are no errors
if (uniqueErrorMessages.size === 0) {
if (isBulkAction) {
toast.success(
(metadata as BulkActionMetadata).areMultipleUsersSelected
isBulkAction
? t('state.delete_user_success')
: t('state.delete_users_success')
);
jamesgeorge007 marked this conversation as resolved.
Show resolved Hide resolved
Expand All @@ -78,13 +68,10 @@ export const handleUserDeletion: HandleUserDeletion = (
const toastMessages: ToastMessage[] = [];

if (isBulkAction) {
const { areMultipleUsersSelected, deletedUserIDs } =
metadata as BulkActionMetadata;

// Indicates the actual count of users deleted (filtered via the `isDeleted` field)
const deletedUsersCount = deletedUserIDs.length;

if (areMultipleUsersSelected && deletedUsersCount > 0) {
if (isBulkAction && deletedUsersCount > 0) {
toastMessages.push({
message: t('state.delete_some_users_success', {
count: deletedUsersCount,
Expand Down Expand Up @@ -118,10 +105,9 @@ export const handleUserDeletion: HandleUserDeletion = (
(key) => !((key as string) in errMsgMap)
)
) {
const fallbackErrMsg =
isBulkAction && (metadata as BulkActionMetadata).areMultipleUsersSelected
? t('state.delete_users_failure')
: t('state.delete_user_failure');
const fallbackErrMsg = isBulkAction
? t('state.delete_users_failure')
: t('state.delete_user_failure');

toastMessages.push({
message: fallbackErrMsg,
Expand Down
2 changes: 1 addition & 1 deletion packages/hoppscotch-sh-admin/src/pages/users/_id.vue
View file
Open in desktop
Expand Up @@ -210,7 +210,7 @@ const deleteUserMutation = async (id: string | null) => {
} else {
const deletedUsers = result.data?.removeUsersByAdmin || [];

handleUserDeletion(deletedUsers, null);
handleUserDeletion(deletedUsers);
}
confirmDeletion.value = false;
deleteUserUID.value = null;
Expand Down
5 changes: 1 addition & 4 deletions packages/hoppscotch-sh-admin/src/pages/users/index.vue
View file
Open in desktop
Expand Up @@ -584,10 +584,7 @@ const deleteUsers = async (id: string | null) => {
.filter((user) => user.isDeleted)
.map((user) => user.userUID);

handleUserDeletion(deletedUsers, {
areMultipleUsersSelected: areMultipleUsersSelected.value,
deletedUserIDs,
});
handleUserDeletion(deletedUsers);

usersList.value = usersList.value.filter(
(user) => !deletedUserIDs.includes(user.uid)
Expand Down