From 14ea920a248f4f1e7d3d1d5e2b99584e0d23661f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Mon, 23 May 2022 06:57:43 +0200 Subject: [PATCH] Remove ObjectType from SearchUsersFilters and rename SearchUsersFiltersInput to the same name --- admin/src/graphql/searchUsers.js | 7 +------ backend/src/graphql/arg/SearchUsersFilters.ts | 5 ++--- backend/src/seeds/graphql/mutations.ts | 7 +------ 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/admin/src/graphql/searchUsers.js b/admin/src/graphql/searchUsers.js index 5740e24cc..cc7f83b1c 100644 --- a/admin/src/graphql/searchUsers.js +++ b/admin/src/graphql/searchUsers.js @@ -1,12 +1,7 @@ import gql from 'graphql-tag' export const searchUsers = gql` - query ( - $searchText: String! - $currentPage: Int - $pageSize: Int - $filters: SearchUsersFiltersInput - ) { + query ($searchText: String!, $currentPage: Int, $pageSize: Int, $filters: SearchUsersFilters) { searchUsers( searchText: $searchText currentPage: $currentPage diff --git a/backend/src/graphql/arg/SearchUsersFilters.ts b/backend/src/graphql/arg/SearchUsersFilters.ts index 8cc1426b3..efcdfa00d 100644 --- a/backend/src/graphql/arg/SearchUsersFilters.ts +++ b/backend/src/graphql/arg/SearchUsersFilters.ts @@ -1,7 +1,6 @@ -import { Field, InputType, ObjectType } from 'type-graphql' +import { Field, InputType } from 'type-graphql' -@ObjectType() -@InputType('SearchUsersFiltersInput') +@InputType() export default class SearchUsersFilters { @Field(() => Boolean, { nullable: true, defaultValue: null }) byActivated?: boolean | null diff --git a/backend/src/seeds/graphql/mutations.ts b/backend/src/seeds/graphql/mutations.ts index 4598cbbe2..982de3bcc 100644 --- a/backend/src/seeds/graphql/mutations.ts +++ b/backend/src/seeds/graphql/mutations.ts @@ -108,12 +108,7 @@ export const unDeleteUser = gql` ` export const searchUsers = gql` - query ( - $searchText: String! - $currentPage: Int - $pageSize: Int - $filters: SearchUsersFiltersInput - ) { + query ($searchText: String!, $currentPage: Int, $pageSize: Int, $filters: SearchUsersFilters) { searchUsers( searchText: $searchText currentPage: $currentPage