Commit 4a7f36ee authored by Nick Thomas's avatar Nick Thomas

Merge branch '262096-change-graphql-id-types-for-global-ids' into 'master'

Fix GraphQL IDType arguments

See merge request gitlab-org/gitlab!45398
parents 97838e65 64d3eff0
...@@ -1274,18 +1274,14 @@ Graphql/IDType: ...@@ -1274,18 +1274,14 @@ Graphql/IDType:
Exclude: Exclude:
- 'ee/app/graphql/ee/mutations/issues/update.rb' - 'ee/app/graphql/ee/mutations/issues/update.rb'
- 'ee/app/graphql/ee/types/boards/board_issue_input_base_type.rb' - 'ee/app/graphql/ee/types/boards/board_issue_input_base_type.rb'
- 'ee/app/graphql/mutations/issues/set_epic.rb'
- 'ee/app/graphql/mutations/iterations/update.rb' - 'ee/app/graphql/mutations/iterations/update.rb'
- 'ee/app/graphql/resolvers/iterations_resolver.rb' - 'ee/app/graphql/resolvers/iterations_resolver.rb'
- 'app/graphql/mutations/boards/create.rb'
- 'app/graphql/mutations/boards/issues/issue_move_list.rb' - 'app/graphql/mutations/boards/issues/issue_move_list.rb'
- 'app/graphql/mutations/boards/lists/update.rb'
- 'app/graphql/mutations/issues/update.rb' - 'app/graphql/mutations/issues/update.rb'
- 'app/graphql/mutations/metrics/dashboard/annotations/delete.rb' - 'app/graphql/mutations/metrics/dashboard/annotations/delete.rb'
- 'app/graphql/mutations/snippets/destroy.rb' - 'app/graphql/mutations/snippets/destroy.rb'
- 'app/graphql/mutations/snippets/mark_as_spam.rb' - 'app/graphql/mutations/snippets/mark_as_spam.rb'
- 'app/graphql/mutations/snippets/update.rb' - 'app/graphql/mutations/snippets/update.rb'
- 'app/graphql/resolvers/board_lists_resolver.rb'
- 'app/graphql/resolvers/boards_resolver.rb' - 'app/graphql/resolvers/boards_resolver.rb'
- 'app/graphql/resolvers/design_management/design_at_version_resolver.rb' - 'app/graphql/resolvers/design_management/design_at_version_resolver.rb'
- 'app/graphql/resolvers/design_management/design_resolver.rb' - 'app/graphql/resolvers/design_management/design_resolver.rb'
......
...@@ -28,7 +28,7 @@ module Mutations ...@@ -28,7 +28,7 @@ module Mutations
required: false, required: false,
description: 'The ID of the user to be assigned to the board.' description: 'The ID of the user to be assigned to the board.'
argument :milestone_id, argument :milestone_id,
GraphQL::ID_TYPE, Types::GlobalIDType[Milestone],
required: false, required: false,
description: 'The ID of the milestone to be assigned to the board.' description: 'The ID of the milestone to be assigned to the board.'
argument :weight, argument :weight,
...@@ -36,7 +36,7 @@ module Mutations ...@@ -36,7 +36,7 @@ module Mutations
required: false, required: false,
description: 'The weight of the board.' description: 'The weight of the board.'
argument :label_ids, argument :label_ids,
[GraphQL::ID_TYPE], [Types::GlobalIDType[Label]],
required: false, required: false,
description: 'The IDs of labels to be added to the board.' description: 'The IDs of labels to be added to the board.'
......
...@@ -6,7 +6,7 @@ module Mutations ...@@ -6,7 +6,7 @@ module Mutations
class Update < BaseMutation class Update < BaseMutation
graphql_name 'UpdateBoardList' graphql_name 'UpdateBoardList'
argument :list_id, GraphQL::ID_TYPE, argument :list_id, Types::GlobalIDType[List],
required: true, required: true,
loads: Types::BoardListType, loads: Types::BoardListType,
description: 'Global ID of the list.' description: 'Global ID of the list.'
......
...@@ -7,7 +7,7 @@ module Resolvers ...@@ -7,7 +7,7 @@ module Resolvers
type Types::BoardListType, null: true type Types::BoardListType, null: true
argument :id, GraphQL::ID_TYPE, argument :id, Types::GlobalIDType[List],
required: false, required: false,
description: 'Find a list by its global ID' description: 'Find a list by its global ID'
......
---
title: Update GraphQL input ids for Board Lists and Issues to be more type specific
merge_request: 45398
author:
type: changed
...@@ -1134,7 +1134,7 @@ type Board { ...@@ -1134,7 +1134,7 @@ type Board {
""" """
Find a list by its global ID Find a list by its global ID
""" """
id: ID id: ListID
""" """
Filters applied when getting issue metadata in the board list Filters applied when getting issue metadata in the board list
...@@ -3119,12 +3119,12 @@ input CreateBoardInput { ...@@ -3119,12 +3119,12 @@ input CreateBoardInput {
""" """
The IDs of labels to be added to the board. The IDs of labels to be added to the board.
""" """
labelIds: [ID!] labelIds: [LabelID!]
""" """
The ID of the milestone to be assigned to the board. The ID of the milestone to be assigned to the board.
""" """
milestoneId: ID milestoneId: MilestoneID
""" """
The board name. The board name.
...@@ -9568,7 +9568,7 @@ input IssueSetEpicInput { ...@@ -9568,7 +9568,7 @@ input IssueSetEpicInput {
""" """
Global ID of the epic to be assigned to the issue, epic will be removed if absent or set to null Global ID of the epic to be assigned to the issue, epic will be removed if absent or set to null
""" """
epicId: ID epicId: EpicID
""" """
The IID of the issue to mutate The IID of the issue to mutate
...@@ -19553,7 +19553,7 @@ input UpdateBoardListInput { ...@@ -19553,7 +19553,7 @@ input UpdateBoardListInput {
""" """
Global ID of the list. Global ID of the list.
""" """
listId: ID! listId: ListID!
""" """
Position of list within the board Position of list within the board
......
...@@ -2936,7 +2936,7 @@ ...@@ -2936,7 +2936,7 @@
"description": "Find a list by its global ID", "description": "Find a list by its global ID",
"type": { "type": {
"kind": "SCALAR", "kind": "SCALAR",
"name": "ID", "name": "ListID",
"ofType": null "ofType": null
}, },
"defaultValue": null "defaultValue": null
...@@ -8349,7 +8349,7 @@ ...@@ -8349,7 +8349,7 @@
"description": "The ID of the milestone to be assigned to the board.", "description": "The ID of the milestone to be assigned to the board.",
"type": { "type": {
"kind": "SCALAR", "kind": "SCALAR",
"name": "ID", "name": "MilestoneID",
"ofType": null "ofType": null
}, },
"defaultValue": null "defaultValue": null
...@@ -8375,7 +8375,7 @@ ...@@ -8375,7 +8375,7 @@
"name": null, "name": null,
"ofType": { "ofType": {
"kind": "SCALAR", "kind": "SCALAR",
"name": "ID", "name": "LabelID",
"ofType": null "ofType": null
} }
} }
...@@ -26137,7 +26137,7 @@ ...@@ -26137,7 +26137,7 @@
"description": "Global ID of the epic to be assigned to the issue, epic will be removed if absent or set to null", "description": "Global ID of the epic to be assigned to the issue, epic will be removed if absent or set to null",
"type": { "type": {
"kind": "SCALAR", "kind": "SCALAR",
"name": "ID", "name": "EpicID",
"ofType": null "ofType": null
}, },
"defaultValue": null "defaultValue": null
...@@ -56828,7 +56828,7 @@ ...@@ -56828,7 +56828,7 @@
"name": null, "name": null,
"ofType": { "ofType": {
"kind": "SCALAR", "kind": "SCALAR",
"name": "ID", "name": "ListID",
"ofType": null "ofType": null
} }
}, },
...@@ -6,7 +6,7 @@ module Mutations ...@@ -6,7 +6,7 @@ module Mutations
graphql_name 'IssueSetEpic' graphql_name 'IssueSetEpic'
argument :epic_id, argument :epic_id,
GraphQL::ID_TYPE, ::Types::GlobalIDType[::Epic],
required: false, required: false,
loads: Types::EpicType, loads: Types::EpicType,
description: 'Global ID of the epic to be assigned to the issue, ' \ description: 'Global ID of the epic to be assigned to the issue, ' \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment