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

This commit is contained in:
कारतोफ्फेलस्क्रिप्ट™
2024-01-24 13:38:57 +01:00
committed by GitHub
parent 1affebd85e
commit d6deceacde
139 changed files with 922 additions and 1684 deletions

View File

@@ -65,7 +65,7 @@
<template #actions="{ user }">
<n8n-select
v-if="user.id !== usersStore.currentUserId"
:model-value="user?.globalRole?.name || 'member'"
:model-value="user?.role || 'global:member'"
:disabled="!canUpdateRole"
data-test-id="user-role-select"
@update:modelValue="onRoleChange(user, $event)"
@@ -207,14 +207,14 @@ export default defineComponent({
},
async onReinvite(userId: string) {
const user = this.usersStore.getUserById(userId);
if (user?.email && user?.globalRole) {
if (!['admin', 'member'].includes(user.globalRole.name)) {
if (user?.email && user?.role) {
if (!['global:admin', 'global:member'].includes(user.role)) {
throw new Error('Invalid role name on reinvite');
}
try {
await this.usersStore.reinviteUser({
email: user.email,
role: user.globalRole.name as InvitableRoleName,
role: user.role as InvitableRoleName,
});
this.showToast({
type: 'success',