From 95da4d4797e800c04b2b17c23c941c785dd62393 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20G=C3=B3mez=20Morales?= <raul00gm@gmail.com>
Date: Thu, 29 Aug 2024 12:37:21 +0200
Subject: [PATCH] fix(editor): Add confirmation toast when changing user role
 (#10592)

---
 .../src/plugins/i18n/locales/en.json          |  3 ++
 .../src/views/SettingsUsersView.test.ts       | 37 +++++++++++++++++++
 .../editor-ui/src/views/SettingsUsersView.vue | 19 +++++++++-
 3 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json
index 551f99beae1f0..89d317d64ea74 100644
--- a/packages/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/editor-ui/src/plugins/i18n/locales/en.json
@@ -1678,6 +1678,9 @@
 	"settings.users.usersInvitedError": "Could not invite users",
 	"settings.users.advancedPermissions.warning": "{link} to unlock the ability to create additional admin users",
 	"settings.users.advancedPermissions.warning.link": "Upgrade",
+	"settings.users.userRoleUpdated": "Changes saved",
+	"settings.users.userRoleUpdated.message": "{user} has been successfully updated to a {role}",
+	"settings.users.userRoleUpdatedError": "Unable to updated role",
 	"settings.api": "API",
 	"settings.n8napi": "n8n API",
 	"settings.log-streaming": "Log Streaming",
diff --git a/packages/editor-ui/src/views/SettingsUsersView.test.ts b/packages/editor-ui/src/views/SettingsUsersView.test.ts
index 7a74341e7677a..7a4fe732a6788 100644
--- a/packages/editor-ui/src/views/SettingsUsersView.test.ts
+++ b/packages/editor-ui/src/views/SettingsUsersView.test.ts
@@ -17,6 +17,16 @@ import { useSettingsStore } from '@/stores/settings.store';
 import { defaultSettings } from '@/__tests__/defaults';
 import { ProjectTypes } from '@/types/projects.types';
 
+const showToast = vi.fn();
+const showError = vi.fn();
+
+vi.mock('@/composables/useToast', () => ({
+	useToast: () => ({
+		showToast,
+		showError,
+	}),
+}));
+
 const wrapperComponentWithModal = {
 	components: { SettingsUsersView, ModalRoot, DeleteUserModal },
 	template: `
@@ -71,6 +81,9 @@ describe('SettingsUsersView', () => {
 		vi.spyOn(projectsStore, 'projects', 'get').mockReturnValue(projects);
 
 		usersStore.currentUserId = loggedInUser.id;
+
+		showToast.mockReset();
+		showError.mockReset();
 	});
 
 	afterEach(() => {
@@ -156,4 +169,28 @@ describe('SettingsUsersView', () => {
 			id: users[0].id,
 		});
 	});
+
+	it("should show success toast when changing a user's role", async () => {
+		const updateGlobalRoleSpy = vi.spyOn(usersStore, 'updateGlobalRole').mockResolvedValue();
+
+		const { getByTestId } = createComponentRenderer(SettingsUsersView)({
+			pinia,
+		});
+
+		const userListItem = getByTestId(`user-list-item-${users.at(-1)?.email}`);
+		expect(userListItem).toBeInTheDocument();
+
+		const roleSelect = within(userListItem).getByTestId('user-role-select');
+
+		const roleDropdownItems = await getDropdownItems(roleSelect);
+		await userEvent.click(roleDropdownItems[0]);
+
+		expect(updateGlobalRoleSpy).toHaveBeenCalledWith(
+			expect.objectContaining({ newRoleName: 'global:member' }),
+		);
+
+		expect(showToast).toHaveBeenCalledWith(
+			expect.objectContaining({ type: 'success', message: expect.stringContaining('Member') }),
+		);
+	});
 });
diff --git a/packages/editor-ui/src/views/SettingsUsersView.vue b/packages/editor-ui/src/views/SettingsUsersView.vue
index fe45f63c8552f..a0fea3b4b8ded 100644
--- a/packages/editor-ui/src/views/SettingsUsersView.vue
+++ b/packages/editor-ui/src/views/SettingsUsersView.vue
@@ -211,7 +211,24 @@ function goToUpgradeAdvancedPermissions() {
 	void uiStore.goToUpgrade('settings-users', 'upgrade-advanced-permissions');
 }
 async function onRoleChange(user: IUser, newRoleName: UpdateGlobalRolePayload['newRoleName']) {
-	await usersStore.updateGlobalRole({ id: user.id, newRoleName });
+	try {
+		await usersStore.updateGlobalRole({ id: user.id, newRoleName });
+
+		const role = userRoles.value.find(({ value }) => value === newRoleName)?.label || newRoleName;
+
+		showToast({
+			type: 'success',
+			title: i18n.baseText('settings.users.userRoleUpdated'),
+			message: i18n.baseText('settings.users.userRoleUpdated.message', {
+				interpolate: {
+					user: user.fullName ?? '',
+					role,
+				},
+			}),
+		});
+	} catch (e) {
+		showError(e, i18n.baseText('settings.users.userReinviteError'));
+	}
 }
 </script>