ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5143 from Ocelot-Social-Community/5142-rename-UserGroup-to-UserRole

Browse Source 
refactor: 🍰 Rename `UserGroup` To `UserRole`
This commit is contained in:
Wolfgang Huß 2022-08-09 09:02:27 +02:00 committed by GitHub
commit f6bfc8aa7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/schema/resolvers/users.spec.js
View File

@ -45,7 +45,7 @@ const deleteUserMutation = gql`
} }
` `
const switchUserRoleMutation = gql` const switchUserRoleMutation = gql`
mutation ($role: UserGroup!, $id: ID!) { mutation ($role: UserRole!, $id: ID!) {
switchUserRole(role: $role, id: $id) { switchUserRole(role: $role, id: $id) {
name name
role role

2
backend/src/schema/types/enum/UserGroup.gql → backend/src/schema/types/enum/UserRole.gql
View File

@ -1,4 +1,4 @@
enum UserGroup { enum UserRole {
admin admin
moderator moderator
user user

10
backend/src/schema/types/type/User.gql
View File

@ -28,7 +28,7 @@ type User {
avatar: Image @relation(name: "AVATAR_IMAGE", direction: "OUT") avatar: Image @relation(name: "AVATAR_IMAGE", direction: "OUT")
deleted: Boolean deleted: Boolean
disabled: Boolean disabled: Boolean
role: UserGroup! role: UserRole!
publicKey: String publicKey: String
invitedBy: User @relation(name: "INVITED", direction: "IN") invitedBy: User @relation(name: "INVITED", direction: "IN")
invited: [User] @relation(name: "INVITED", direction: "OUT") invited: [User] @relation(name: "INVITED", direction: "OUT")
@ -151,7 +151,7 @@ input _UserFilter {
followedBy_none: _UserFilter followedBy_none: _UserFilter
followedBy_single: _UserFilter followedBy_single: _UserFilter
followedBy_every: _UserFilter followedBy_every: _UserFilter
role_in: [UserGroup!] role_in: [UserRole!]
} }
type Query { type Query {
@ -160,7 +160,7 @@ type Query {
email: String # admins need to search for a user sometimes email: String # admins need to search for a user sometimes
name: String name: String
slug: String slug: String
role: UserGroup role: UserRole
locationName: String locationName: String
about: String about: String
createdAt: String createdAt: String
@ -171,7 +171,7 @@ type Query {
filter: _UserFilter filter: _UserFilter
): [User] ): [User]
availableRoles: [UserGroup]! availableRoles: [UserRole]!
mutedUsers: [User] mutedUsers: [User]
blockedUsers: [User] blockedUsers: [User]
isLoggedIn: Boolean! isLoggedIn: Boolean!
@ -219,5 +219,5 @@ type Mutation {
blockUser(id: ID!): User blockUser(id: ID!): User
unblockUser(id: ID!): User unblockUser(id: ID!): User
switchUserRole(role: UserGroup!, id: ID!): User switchUserRole(role: UserRole!, id: ID!): User
} }

2
webapp/graphql/admin/Roles.js
View File

@ -10,7 +10,7 @@ export const FetchAllRoles = () => {
export const updateUserRole = (role, id) => { export const updateUserRole = (role, id) => {
return gql` return gql`
mutation($role: UserGroup!, $id: ID!) { mutation($role: UserRole!, $id: ID!) {
switchUserRole(role: $role, id: $id) { switchUserRole(role: $role, id: $id) {
name name
role role