refactor(core): Remove roleId indirection (no-changelog) (#8413)

packages/editor-ui/src/components/InviteUsersModal.vue

@@ -109,7 +109,7 @@ export default defineComponent({
 			formBus: createEventBus(),
 			modalBus: createEventBus(),
 			emails: '',
-			role: 'member',
+			role: ROLE.Member,
 			showInviteUrls: null as IInviteResponse[] | null,
 			loading: false,
 			INVITE_USER_MODAL_KEY,
@@ -135,7 +135,7 @@ export default defineComponent({
 			},
 			{
 				name: 'role',
-				initialValue: 'member',
+				initialValue: ROLE.Member,
 				properties: {
 					label: this.$locale.baseText('auth.role'),
 					required: true,

packages/editor-ui/src/components/MainHeader/CollaborationPane.vue

@@ -16,7 +16,7 @@ const activeUsersSorted = computed(() => {
 	const currentWorkflowUsers = (collaborationStore.getUsersForCurrentWorkflow ?? []).map(
 		(userInfo) => userInfo.user,
 	);
-	const owner = currentWorkflowUsers.find((user) => user.globalRoleId === 1);
+	const owner = currentWorkflowUsers.find((user) => user.role === 'global:owner');
 	return {
 		defaultGroup: owner
 			? [owner, ...currentWorkflowUsers.filter((user) => user.id !== owner.id)]

packages/editor-ui/src/components/__tests__/BannersStack.test.ts

@@ -26,20 +26,11 @@ const initialState = {
 		users: {
 			'aaa-bbb': {
 				id: 'aaa-bbb',
-				globalRole: {
-					id: '1',
-					name: 'owner',
-					scope: 'global',
-				},
+				role: 'global:owner',
 			},
 			'bbb-bbb': {
 				id: 'bbb-bbb',
-				globalRoleId: 2,
-				globalRole: {
-					id: '2',
-					name: 'member',
-					scope: 'global',
-				},
+				role: 'global:member',
 			},
 		},
 	},

packages/editor-ui/src/components/__tests__/CollaborationPane.test.ts

@@ -13,13 +13,8 @@ const OWNER_USER = {
 	email: 'owner@user.com',
 	firstName: 'Owner',
 	lastName: 'User',
-	globalRoleId: 1,
+	role: 'global:owner',
 	disabled: false,
-	globalRole: {
-		id: '1',
-		name: 'owner',
-		scope: 'global',
-	},
 	isPending: false,
 	isOwner: true,
 	fullName: 'Owner User',
@@ -31,13 +26,8 @@ const MEMBER_USER = {
 	email: 'member@user.com',
 	firstName: 'Member',
 	lastName: 'User',
-	globalRoleId: 2,
+	role: 'global:member',
 	disabled: false,
-	globalRole: {
-		id: '2',
-		name: 'member',
-		scope: 'global',
-	},
 	isPending: false,
 	isOwner: false,
 	fullName: 'Member User',
@@ -49,13 +39,8 @@ const MEMBER_USER_2 = {
 	email: 'member2@user.com',
 	firstName: 'Another Member',
 	lastName: 'User',
-	globalRoleId: 2,
+	role: 'global:member',
 	disabled: false,
-	globalRole: {
-		id: '2',
-		name: 'member',
-		scope: 'global',
-	},
 	isPending: false,
 	isOwner: false,
 	fullName: 'Another Member User',

packages/editor-ui/src/components/banners/__tests__/V1Banner.spec.ts

@@ -22,11 +22,7 @@ describe('V1 Banner', () => {
 
 	it('should render banner with dismiss call if user is owner', () => {
 		vi.spyOn(usersStore, 'currentUser', 'get').mockReturnValue({
-			globalRole: {
-				id: 0,
-				name: 'owner',
-				createdAt: '2021-08-09T14:00:00.000Z',
-			},
+			role: 'global:owner',
 		});
 
 		const { container } = render(V1Banner);