diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-12 12:13:02 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-12 12:13:02 +0300 |
commit | fc52f69f815eecbad9fcfe6b974f0c3e9c553828 (patch) | |
tree | 272c001c47ada803eb2844caa24a916b55f6f2d9 /app/assets/javascripts/graphql_shared | |
parent | 04cc67da3e796c95dd72a3b725cc48f1e44bea3a (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/graphql_shared')
-rw-r--r-- | app/assets/javascripts/graphql_shared/issuable_client.js | 13 | ||||
-rw-r--r-- | app/assets/javascripts/graphql_shared/queries/users_search.query.graphql | 14 |
2 files changed, 25 insertions, 2 deletions
diff --git a/app/assets/javascripts/graphql_shared/issuable_client.js b/app/assets/javascripts/graphql_shared/issuable_client.js index 991572958c3..e86103c332b 100644 --- a/app/assets/javascripts/graphql_shared/issuable_client.js +++ b/app/assets/javascripts/graphql_shared/issuable_client.js @@ -1,5 +1,6 @@ import produce from 'immer'; import VueApollo from 'vue-apollo'; +import { concatPagination } from '@apollo/client/utilities'; import getIssueStateQuery from '~/issues/show/queries/get_issue_state.query.graphql'; import createDefaultClient from '~/lib/graphql'; import typeDefs from '~/work_items/graphql/typedefs.graphql'; @@ -13,6 +14,13 @@ export const temporaryConfig = { LocalWorkItemWidget: ['LocalWorkItemLabels'], }, typePolicies: { + Project: { + fields: { + projectMembers: { + keyArgs: ['fullPath', 'search', 'relations', 'first'], + }, + }, + }, WorkItem: { fields: { mockWidgets: { @@ -36,6 +44,11 @@ export const temporaryConfig = { }, }, }, + MemberInterfaceConnection: { + fields: { + nodes: concatPagination(), + }, + }, }, }, }; diff --git a/app/assets/javascripts/graphql_shared/queries/users_search.query.graphql b/app/assets/javascripts/graphql_shared/queries/users_search.query.graphql index bb34e4032f4..f64c4276deb 100644 --- a/app/assets/javascripts/graphql_shared/queries/users_search.query.graphql +++ b/app/assets/javascripts/graphql_shared/queries/users_search.query.graphql @@ -1,10 +1,20 @@ #import "../fragments/user.fragment.graphql" #import "~/graphql_shared/fragments/user_availability.fragment.graphql" -query projectUsersSearch($search: String!, $fullPath: ID!) { +query projectUsersSearch($search: String!, $fullPath: ID!, $after: String, $first: Int) { workspace: project(fullPath: $fullPath) { id - users: projectMembers(search: $search, relations: [DIRECT, INHERITED, INVITED_GROUPS]) { + users: projectMembers( + search: $search + relations: [DIRECT, INHERITED, INVITED_GROUPS] + first: $first + after: $after + ) { + pageInfo { + hasNextPage + endCursor + startCursor + } nodes { id user { |