diff --git a/backend/src/schema/resolvers/users.spec.js b/backend/src/schema/resolvers/users.spec.js index 102d2f6fe..9a88dc945 100644 --- a/backend/src/schema/resolvers/users.spec.js +++ b/backend/src/schema/resolvers/users.spec.js @@ -45,7 +45,7 @@ const deleteUserMutation = gql` } ` const switchUserRoleMutation = gql` - mutation ($role: UserGroup!, $id: ID!) { + mutation ($role: UserRole!, $id: ID!) { switchUserRole(role: $role, id: $id) { name role diff --git a/backend/src/schema/types/enum/UserGroup.gql b/backend/src/schema/types/enum/UserRole.gql similarity index 63% rename from backend/src/schema/types/enum/UserGroup.gql rename to backend/src/schema/types/enum/UserRole.gql index 587e90c71..846afde13 100644 --- a/backend/src/schema/types/enum/UserGroup.gql +++ b/backend/src/schema/types/enum/UserRole.gql @@ -1,4 +1,4 @@ -enum UserGroup { +enum UserRole { admin moderator user diff --git a/backend/src/schema/types/type/User.gql b/backend/src/schema/types/type/User.gql index 772dedf6b..871e73ad8 100644 --- a/backend/src/schema/types/type/User.gql +++ b/backend/src/schema/types/type/User.gql @@ -28,7 +28,7 @@ type User { avatar: Image @relation(name: "AVATAR_IMAGE", direction: "OUT") deleted: Boolean disabled: Boolean - role: UserGroup! + role: UserRole! publicKey: String invitedBy: User @relation(name: "INVITED", direction: "IN") invited: [User] @relation(name: "INVITED", direction: "OUT") @@ -151,7 +151,7 @@ input _UserFilter { followedBy_none: _UserFilter followedBy_single: _UserFilter followedBy_every: _UserFilter - role_in: [UserGroup!] + role_in: [UserRole!] } type Query { @@ -160,7 +160,7 @@ type Query { email: String # admins need to search for a user sometimes name: String slug: String - role: UserGroup + role: UserRole locationName: String about: String createdAt: String @@ -171,7 +171,7 @@ type Query { filter: _UserFilter ): [User] - availableRoles: [UserGroup]! + availableRoles: [UserRole]! mutedUsers: [User] blockedUsers: [User] isLoggedIn: Boolean! @@ -219,5 +219,5 @@ type Mutation { blockUser(id: ID!): User unblockUser(id: ID!): User - switchUserRole(role: UserGroup!, id: ID!): User + switchUserRole(role: UserRole!, id: ID!): User } diff --git a/webapp/graphql/admin/Roles.js b/webapp/graphql/admin/Roles.js index 8c1a9f412..4365cb533 100644 --- a/webapp/graphql/admin/Roles.js +++ b/webapp/graphql/admin/Roles.js @@ -10,7 +10,7 @@ export const FetchAllRoles = () => { export const updateUserRole = (role, id) => { return gql` - mutation($role: UserGroup!, $id: ID!) { + mutation($role: UserRole!, $id: ID!) { switchUserRole(role: $role, id: $id) { name role