mirror of
https://github.com/IT4Change/gradido.git
synced 2026-02-06 01:46:07 +00:00
Fix emit and role as uppercase
This commit is contained in:
elweyn
parent
19ba385e46
commit
03ae59627d
@ -182,8 +182,7 @@ describe('ChangeUserRoleFormular', () => {
|
||||
mutation: setUserRole,
|
||||
variables: {
|
||||
userId: 1,
|
||||
// isAdmin: true,
|
||||
role: 'moderator',
|
||||
role: 'MODERATOR',
|
||||
},
|
||||
}),
|
||||
)
|
||||
@ -195,8 +194,7 @@ describe('ChangeUserRoleFormular', () => {
|
||||
expect.arrayContaining([
|
||||
{
|
||||
userId: 1,
|
||||
// isAdmin: true,
|
||||
role: 'moderator',
|
||||
role: 'MODERATOR',
|
||||
},
|
||||
]),
|
||||
]),
|
||||
@ -255,8 +253,7 @@ describe('ChangeUserRoleFormular', () => {
|
||||
mutation: setUserRole,
|
||||
variables: {
|
||||
userId: 1,
|
||||
// isAdmin: true,
|
||||
role: 'admin',
|
||||
role: 'ADMIN',
|
||||
},
|
||||
}),
|
||||
)
|
||||
@ -268,8 +265,7 @@ describe('ChangeUserRoleFormular', () => {
|
||||
expect.arrayContaining([
|
||||
{
|
||||
userId: 1,
|
||||
// isAdmin: true,
|
||||
role: 'admin',
|
||||
role: 'ADMIN',
|
||||
},
|
||||
]),
|
||||
]),
|
||||
@ -308,7 +304,6 @@ describe('ChangeUserRoleFormular', () => {
|
||||
propsData = {
|
||||
item: {
|
||||
userId: 1,
|
||||
// isAdmin: new Date(),
|
||||
roles: ['MODERATOR'],
|
||||
},
|
||||
}
|
||||
@ -365,7 +360,7 @@ describe('ChangeUserRoleFormular', () => {
|
||||
mutation: setUserRole,
|
||||
variables: {
|
||||
userId: 1,
|
||||
role: 'user',
|
||||
role: 'USER',
|
||||
},
|
||||
}),
|
||||
)
|
||||
@ -377,7 +372,7 @@ describe('ChangeUserRoleFormular', () => {
|
||||
expect.arrayContaining([
|
||||
{
|
||||
userId: 1,
|
||||
role: 'user',
|
||||
role: 'USER',
|
||||
},
|
||||
]),
|
||||
]),
|
||||
@ -436,7 +431,7 @@ describe('ChangeUserRoleFormular', () => {
|
||||
mutation: setUserRole,
|
||||
variables: {
|
||||
userId: 1,
|
||||
role: 'admin',
|
||||
role: 'ADMIN',
|
||||
},
|
||||
}),
|
||||
)
|
||||
@ -448,7 +443,7 @@ describe('ChangeUserRoleFormular', () => {
|
||||
expect.arrayContaining([
|
||||
{
|
||||
userId: 1,
|
||||
role: 'admin',
|
||||
role: 'ADMIN',
|
||||
},
|
||||
]),
|
||||
]),
|
||||
@ -487,7 +482,6 @@ describe('ChangeUserRoleFormular', () => {
|
||||
propsData = {
|
||||
item: {
|
||||
userId: 1,
|
||||
// isAdmin: new Date(),
|
||||
roles: ['ADMIN'],
|
||||
},
|
||||
}
|
||||
@ -544,7 +538,7 @@ describe('ChangeUserRoleFormular', () => {
|
||||
mutation: setUserRole,
|
||||
variables: {
|
||||
userId: 1,
|
||||
role: 'user',
|
||||
role: 'USER',
|
||||
},
|
||||
}),
|
||||
)
|
||||
@ -556,7 +550,7 @@ describe('ChangeUserRoleFormular', () => {
|
||||
expect.arrayContaining([
|
||||
{
|
||||
userId: 1,
|
||||
role: 'user',
|
||||
role: 'USER',
|
||||
},
|
||||
]),
|
||||
]),
|
||||
@ -615,7 +609,7 @@ describe('ChangeUserRoleFormular', () => {
|
||||
mutation: setUserRole,
|
||||
variables: {
|
||||
userId: 1,
|
||||
role: 'moderator',
|
||||
role: 'MODERATOR',
|
||||
},
|
||||
}),
|
||||
)
|
||||
@ -627,7 +621,7 @@ describe('ChangeUserRoleFormular', () => {
|
||||
expect.arrayContaining([
|
||||
{
|
||||
userId: 1,
|
||||
role: 'moderator',
|
||||
role: 'MODERATOR',
|
||||
},
|
||||
]),
|
||||
]),
|
||||
|
||||
@ -64,8 +64,10 @@ export default {
|
||||
this.$t('overlay.changeUserRole.question', {
|
||||
username: `${this.item.firstName} ${this.item.lastName}`,
|
||||
newRole:
|
||||
this.roleSelected === 'admin'
|
||||
this.roleSelected === rolesValues.admin
|
||||
? this.$t('userRole.selectRoles.admin')
|
||||
: this.roleSelected === rolesValues.moderator
|
||||
? this.$t('userRole.selectRoles.moderator')
|
||||
: this.$t('userRole.selectRoles.user'),
|
||||
}),
|
||||
{
|
||||
@ -87,32 +89,27 @@ export default {
|
||||
})
|
||||
},
|
||||
setUserRole(newRole, oldRole) {
|
||||
let role
|
||||
switch (newRole) {
|
||||
case rolesValues.admin:
|
||||
case rolesValues.moderator:
|
||||
case rolesValues.user:
|
||||
role = newRole
|
||||
break
|
||||
default:
|
||||
role = 'USER'
|
||||
}
|
||||
const role = this.roles.find((role) => {
|
||||
return role.value === newRole
|
||||
})
|
||||
const roleText = role.text
|
||||
const roleValue = role.value.toUpperCase()
|
||||
this.$apollo
|
||||
.mutate({
|
||||
mutation: setUserRole,
|
||||
variables: {
|
||||
userId: this.item.userId,
|
||||
role,
|
||||
role: role.value.toUpperCase(),
|
||||
},
|
||||
})
|
||||
.then((result) => {
|
||||
this.$emit('updateIsAdmin', {
|
||||
userId: this.item.userId,
|
||||
role,
|
||||
role: roleValue,
|
||||
})
|
||||
this.toastSuccess(
|
||||
this.$t('userRole.successfullyChangedTo', {
|
||||
role: role.text,
|
||||
role: roleText,
|
||||
}),
|
||||
)
|
||||
})
|
||||
|
||||
@ -102,12 +102,13 @@ describe('SearchUserTable', () => {
|
||||
beforeEach(async () => {
|
||||
await wrapper.find('div.change-user-role-formular').vm.$emit('updateIsAdmin', {
|
||||
userId: 1,
|
||||
isAdmin: new Date(),
|
||||
// isAdmin: new Date(),
|
||||
role: 'ADMIN',
|
||||
})
|
||||
})
|
||||
|
||||
it('emits updateIsAdmin', () => {
|
||||
expect(wrapper.emitted('updateIsAdmin')).toEqual([[1, expect.any(Date)]])
|
||||
expect(wrapper.emitted('updateIsAdmin')).toEqual([[1, 'ADMIN']])
|
||||
})
|
||||
})
|
||||
|
||||
|
||||
@ -127,8 +127,8 @@ export default {
|
||||
updateUserData(rowItem, newCreation) {
|
||||
rowItem.creation = newCreation
|
||||
},
|
||||
updateIsAdmin({ userId, isAdmin }) {
|
||||
this.$emit('updateIsAdmin', userId, isAdmin)
|
||||
updateIsAdmin({ userId, role }) {
|
||||
this.$emit('updateIsAdmin', userId, role)
|
||||
},
|
||||
updateDeletedAt({ userId, deletedAt }) {
|
||||
this.$emit('updateDeletedAt', userId, deletedAt)
|
||||
|
||||
@ -16,6 +16,7 @@ const apolloQueryMock = jest.fn().mockResolvedValue({
|
||||
email: 'new@user.ch',
|
||||
creation: [1000, 1000, 1000],
|
||||
emailChecked: false,
|
||||
roles: [],
|
||||
deletedAt: null,
|
||||
},
|
||||
{
|
||||
@ -24,6 +25,7 @@ const apolloQueryMock = jest.fn().mockResolvedValue({
|
||||
lastName: 'Lustig',
|
||||
email: 'peter@lustig.de',
|
||||
creation: [0, 0, 0],
|
||||
roles: ['ADMIN'],
|
||||
emailChecked: true,
|
||||
deletedAt: null,
|
||||
},
|
||||
@ -33,6 +35,7 @@ const apolloQueryMock = jest.fn().mockResolvedValue({
|
||||
lastName: 'Blümchen',
|
||||
email: 'benjamin@bluemchen.de',
|
||||
creation: [1000, 1000, 1000],
|
||||
roles: ['USER'],
|
||||
emailChecked: true,
|
||||
deletedAt: new Date(),
|
||||
},
|
||||
@ -42,6 +45,7 @@ const apolloQueryMock = jest.fn().mockResolvedValue({
|
||||
lastName: 'Bloxberg',
|
||||
email: 'bibi@bloxberg.de',
|
||||
creation: [200, 400, 600],
|
||||
roles: ['USER'],
|
||||
emailChecked: true,
|
||||
deletedAt: null,
|
||||
},
|
||||
@ -212,10 +216,10 @@ describe('UserSearch', () => {
|
||||
it('updates user role to admin', async () => {
|
||||
await wrapper
|
||||
.findComponent({ name: 'SearchUserTable' })
|
||||
.vm.$emit('updateIsAdmin', userId, new Date())
|
||||
expect(wrapper.vm.searchResult.find((obj) => obj.userId === userId).isAdmin).toEqual(
|
||||
expect.any(Date),
|
||||
)
|
||||
.vm.$emit('updateIsAdmin', userId, 'ADMIN')
|
||||
expect(wrapper.vm.searchResult.find((obj) => obj.userId === userId).roles).toEqual([
|
||||
'ADMIN',
|
||||
])
|
||||
})
|
||||
})
|
||||
|
||||
@ -223,8 +227,10 @@ describe('UserSearch', () => {
|
||||
it('updates user role to usual user', async () => {
|
||||
await wrapper
|
||||
.findComponent({ name: 'SearchUserTable' })
|
||||
.vm.$emit('updateIsAdmin', userId, null)
|
||||
expect(wrapper.vm.searchResult.find((obj) => obj.userId === userId).isAdmin).toEqual(null)
|
||||
.vm.$emit('updateIsAdmin', userId, 'USER')
|
||||
expect(wrapper.vm.searchResult.find((obj) => obj.userId === userId).roles).toEqual([
|
||||
'USER',
|
||||
])
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
@ -101,8 +101,8 @@ export default {
|
||||
this.toastError(error.message)
|
||||
})
|
||||
},
|
||||
updateIsAdmin(userId, isAdmin) {
|
||||
this.searchResult.find((obj) => obj.userId === userId).isAdmin = isAdmin
|
||||
updateIsAdmin(userId, role) {
|
||||
this.searchResult.find((obj) => obj.userId === userId).roles = [role]
|
||||
},
|
||||
updateDeletedAt(userId, deletedAt) {
|
||||
this.searchResult.find((obj) => obj.userId === userId).deletedAt = deletedAt
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user